summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2018-09-26 00:48:50 -0700
committerMinh Nguyễn <mxn@1ec5.org>2018-09-26 11:08:39 -0700
commit871aebffca39d5c92fd4e2debce0864ff62f1017 (patch)
tree0d2bf931a06a66789342097c00eb15be6103a0e3
parenta9959773128f57e05f278d4d67ea167b8b6f73f5 (diff)
downloadqtlocation-mapboxgl-871aebffca39d5c92fd4e2debce0864ff62f1017.tar.gz
[ios] Static framework defines module
Fixed build errors in the dynamic+static scheme by ensuring that both the dynamic and static targets have the same DEFINES_MODULE build setting.
-rw-r--r--platform/ios/Mapbox-iOS-SDK-static-part.podspec2
-rw-r--r--platform/ios/ios.xcodeproj/project.pbxproj2
2 files changed, 4 insertions, 0 deletions
diff --git a/platform/ios/Mapbox-iOS-SDK-static-part.podspec b/platform/ios/Mapbox-iOS-SDK-static-part.podspec
index bd98bb7272..b82c2bb24f 100644
--- a/platform/ios/Mapbox-iOS-SDK-static-part.podspec
+++ b/platform/ios/Mapbox-iOS-SDK-static-part.podspec
@@ -9,4 +9,6 @@
m.module_name = 'Mapbox'
m.xcconfig = { 'OTHER_LDFLAGS' => '-ObjC' }
+ m.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
+
end
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj
index 0951a94218..d773033658 100644
--- a/platform/ios/ios.xcodeproj/project.pbxproj
+++ b/platform/ios/ios.xcodeproj/project.pbxproj
@@ -3783,6 +3783,7 @@
baseConfigurationReference = 55D8C9941D0F133500F42F10 /* config.xcconfig */;
buildSettings = {
BITCODE_GENERATION_MODE = bitcode;
+ DEFINES_MODULE = YES;
HEADER_SEARCH_PATHS = (
"$(mbgl_core_INCLUDE_DIRECTORIES)",
"$(mbgl_filesource_INCLUDE_DIRECTORIES)",
@@ -3814,6 +3815,7 @@
baseConfigurationReference = 55D8C9941D0F133500F42F10 /* config.xcconfig */;
buildSettings = {
BITCODE_GENERATION_MODE = bitcode;
+ DEFINES_MODULE = YES;
HEADER_SEARCH_PATHS = (
"$(mbgl_core_INCLUDE_DIRECTORIES)",
"$(mbgl_filesource_INCLUDE_DIRECTORIES)",