diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-11-21 17:42:29 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-11-22 21:15:51 +0100 |
| commit | 5929fe95881e21160b0cda6bf57fb1e1333bc1b1 (patch) | |
| tree | 6f48340ae7ed35d25458aa747845511fd9324481 | |
| parent | c4ae93f80107df4f067fcde000816d40d2ad77c8 (diff) | |
| download | qtlocation-mapboxgl-5929fe95881e21160b0cda6bf57fb1e1333bc1b1.tar.gz | |
[build] disable bitcode generation for Debug builds on iOS
| -rw-r--r-- | platform/ios/config.cmake | 2 | ||||
| -rw-r--r-- | platform/ios/ios.xcodeproj/project.pbxproj | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake index 195687fea5..17bfaa8b93 100644 --- a/platform/ios/config.cmake +++ b/platform/ios/config.cmake @@ -2,7 +2,7 @@ add_definitions(-DMBGL_USE_GLES2=1) macro(mbgl_platform_core) set_xcode_property(mbgl-core IPHONEOS_DEPLOYMENT_TARGET "8.0") - set_xcode_property(mbgl-core ENABLE_BITCODE "YES") + set_xcode_property(mbgl-core ENABLE_BITCODE $<$<CONFIG:Release>:YES>) set_xcode_property(mbgl-core BITCODE_GENERATION_MODE bitcode) set_xcode_property(mbgl-core ONLY_ACTIVE_ARCH $<$<CONFIG:Debug>:YES>) diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index 9561c741a6..174d8269b9 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -2149,6 +2149,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + BITCODE_GENERATION_MODE = bitcode; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_CXX_LIBRARY = "libc++"; @@ -2171,6 +2172,7 @@ CURRENT_SEMANTIC_VERSION = 1.0.0; CURRENT_SHORT_VERSION = 1.0; DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -2200,6 +2202,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + BITCODE_GENERATION_MODE = bitcode; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_CXX_LIBRARY = "libc++"; @@ -2334,7 +2337,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 55D8C9941D0F133500F42F10 /* config.xcconfig */; buildSettings = { - BITCODE_GENERATION_MODE = bitcode; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -2367,7 +2369,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 55D8C9941D0F133500F42F10 /* config.xcconfig */; buildSettings = { - BITCODE_GENERATION_MODE = bitcode; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -2422,7 +2423,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 55D8C9941D0F133500F42F10 /* config.xcconfig */; buildSettings = { - BITCODE_GENERATION_MODE = bitcode; HEADER_SEARCH_PATHS = "$(mbgl_core_INCLUDE_DIRECTORIES)"; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -2447,7 +2447,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 55D8C9941D0F133500F42F10 /* config.xcconfig */; buildSettings = { - BITCODE_GENERATION_MODE = bitcode; HEADER_SEARCH_PATHS = "$(mbgl_core_INCLUDE_DIRECTORIES)"; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", |