Skip to content

Commit 2bf90d4

Browse files
committed
Use single module map file for sqlite3 shim
Per the following: https://twitter.com/jckarter/status/590928617770602496 Fixes stephencelis#116. Signed-off-by: Stephen Celis <[email protected]>
1 parent 213920b commit 2bf90d4

File tree

6 files changed

+10
-27
lines changed

6 files changed

+10
-27
lines changed

SQLite.xcodeproj/project.pbxproj

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,7 @@
140140
DCAD429919E2EE50004A51DF /* QueryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryTests.swift; sourceTree = "<group>"; };
141141
DCAE4D151ABE0B3300EFCE7A /* sqlite3.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = sqlite3.framework; sourceTree = BUILT_PRODUCTS_DIR; };
142142
DCAE4D181ABE0B3300EFCE7A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
143-
DCAE4D2E1ABE0B6300EFCE7A /* sqlite3.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = sqlite3.xcconfig; sourceTree = "<group>"; };
144-
DCAE4D2F1ABE0B8B00EFCE7A /* iphoneos.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = iphoneos.modulemap; sourceTree = "<group>"; };
145-
DCAE4D301ABE0B8B00EFCE7A /* iphonesimulator.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = iphonesimulator.modulemap; sourceTree = "<group>"; };
146-
DCAE4D311ABE0B8B00EFCE7A /* macosx.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = macosx.modulemap; sourceTree = "<group>"; };
143+
DCAE4D2F1ABE0B8B00EFCE7A /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
147144
DCAFEAD21AABC818000C21A1 /* FTS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FTS.swift; sourceTree = "<group>"; };
148145
DCAFEAD61AABEFA7000C21A1 /* FTSTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FTSTests.swift; sourceTree = "<group>"; };
149146
DCBE28401ABDF18F0042A3FC /* RTree.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RTree.swift; sourceTree = "<group>"; };
@@ -319,10 +316,7 @@
319316
children = (
320317
DCAE4D181ABE0B3300EFCE7A /* Info.plist */,
321318
DC5B12121ABE3298000DA146 /* libsqlite3.dylib */,
322-
DCAE4D2E1ABE0B6300EFCE7A /* sqlite3.xcconfig */,
323-
DCAE4D2F1ABE0B8B00EFCE7A /* iphoneos.modulemap */,
324-
DCAE4D301ABE0B8B00EFCE7A /* iphonesimulator.modulemap */,
325-
DCAE4D311ABE0B8B00EFCE7A /* macosx.modulemap */,
319+
DCAE4D2F1ABE0B8B00EFCE7A /* module.modulemap */,
326320
);
327321
name = "Supporting Files";
328322
sourceTree = "<group>";
@@ -799,7 +793,7 @@
799793
};
800794
DCAE4D291ABE0B3400EFCE7A /* Debug */ = {
801795
isa = XCBuildConfiguration;
802-
baseConfigurationReference = DCAE4D2E1ABE0B6300EFCE7A /* sqlite3.xcconfig */;
796+
baseConfigurationReference = DC37742E19C8CE67004FCF85 /* SQLite.xcconfig */;
803797
buildSettings = {
804798
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
805799
DEFINES_MODULE = YES;
@@ -811,14 +805,15 @@
811805
INFOPLIST_FILE = sqlite3/Info.plist;
812806
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
813807
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
808+
MODULEMAP_FILE = "$(SRCROOT)/sqlite3/module.modulemap";
814809
PRODUCT_NAME = "$(TARGET_NAME)";
815810
SKIP_INSTALL = YES;
816811
};
817812
name = Debug;
818813
};
819814
DCAE4D2A1ABE0B3400EFCE7A /* Release */ = {
820815
isa = XCBuildConfiguration;
821-
baseConfigurationReference = DCAE4D2E1ABE0B6300EFCE7A /* sqlite3.xcconfig */;
816+
baseConfigurationReference = DC37742E19C8CE67004FCF85 /* SQLite.xcconfig */;
822817
buildSettings = {
823818
COPY_PHASE_STRIP = NO;
824819
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -830,6 +825,7 @@
830825
INFOPLIST_FILE = sqlite3/Info.plist;
831826
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
832827
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
828+
MODULEMAP_FILE = "$(SRCROOT)/sqlite3/module.modulemap";
833829
PRODUCT_NAME = "$(TARGET_NAME)";
834830
SKIP_INSTALL = YES;
835831
};

sqlite3/iphoneos.modulemap

Lines changed: 0 additions & 4 deletions
This file was deleted.

sqlite3/iphonesimulator.modulemap

Lines changed: 0 additions & 4 deletions
This file was deleted.

sqlite3/macosx.modulemap

Lines changed: 0 additions & 4 deletions
This file was deleted.

sqlite3/module.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module sqlite3 [system] {
2+
header "/usr/include/sqlite3.h"
3+
export *
4+
}

sqlite3/sqlite3.xcconfig

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)