From 871aebffca39d5c92fd4e2debce0864ff62f1017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Wed, 26 Sep 2018 00:48:50 -0700 Subject: [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. --- platform/ios/Mapbox-iOS-SDK-static-part.podspec | 2 ++ platform/ios/ios.xcodeproj/project.pbxproj | 2 ++ 2 files changed, 4 insertions(+) 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)", -- cgit v1.2.1