diff options
| author | Julian Rex <julian.rex@gmail.com> | 2020-05-13 14:17:16 -0400 |
|---|---|---|
| committer | Julian Rex <julian.rex@gmail.com> | 2020-05-13 14:17:16 -0400 |
| commit | 5b1b6f94666afe4a2a9ced2510ef7e03e46a8eb9 (patch) | |
| tree | c08c8d94484d989c576fdaddaa193803da406086 | |
| parent | 8aea69e69f18eebe6d9d942eee5882766bc722ab (diff) | |
| download | qtlocation-mapboxgl-5b1b6f94666afe4a2a9ced2510ef7e03e46a8eb9.tar.gz | |
Update release config settings for iOS and macOS.
| -rw-r--r-- | platform/ios/ios.cmake | 9 | ||||
| -rw-r--r-- | platform/macos/macos.cmake | 16 |
2 files changed, 13 insertions, 12 deletions
diff --git a/platform/ios/ios.cmake b/platform/ios/ios.cmake index a1dfc61c9b..34cb29005d 100644 --- a/platform/ios/ios.cmake +++ b/platform/ios/ios.cmake @@ -11,11 +11,12 @@ macro(initialize_ios_target target) set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH $<$<CONFIG:Debug>:YES>) # Enable LTO & -Os for Release and RelWithDebInfo (which is currently still used by iOS release packages) + set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL[variant=MinSizeRel] $<$<CONFIG:MINSIZEREL>:s>) + set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL[variant=RelWithDebInfo] $<$<CONFIG:RELWITHDEBINFO>:s>) + set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL[variant=Release] $<$<CONFIG:RELEASE>:s>) - set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL $<$<CONFIG:RELEASE>:s>) - set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL $<$<CONFIG:RELWITHDEBINFO>:s>) - set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_LLVM_LTO $<$<CONFIG:RELEASE>:YES>) - set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_LLVM_LTO $<$<CONFIG:RELWITHDEBINFO>:YES>) + set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_LLVM_LTO[variant=RelWithDebInfo] $<$<CONFIG:RELWITHDEBINFO>:YES>) + set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_LLVM_LTO[variant=Release] $<$<CONFIG:RELEASE>:YES>) endmacro() set_target_properties(mbgl-core PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES) diff --git a/platform/macos/macos.cmake b/platform/macos/macos.cmake index 86aafb6294..47b79282f3 100644 --- a/platform/macos/macos.cmake +++ b/platform/macos/macos.cmake @@ -3,17 +3,15 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11") set_target_properties(mbgl-core PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES) macro(initialize_macos_target target) - # Enable LTO & -Os for Release and RelWithDebInfo (which is currently still used by iOS release packages) + # Enable LTO & -Os for Release and RelWithDebInfo + set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL[variant=MinSizeRel] $<$<CONFIG:MINSIZEREL>:s>) + set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL[variant=RelWithDebInfo] $<$<CONFIG:RELWITHDEBINFO>:s>) + set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL[variant=Release] $<$<CONFIG:RELEASE>:s>) - set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL $<$<CONFIG:RELEASE>:s>) - set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL $<$<CONFIG:RELWITHDEBINFO>:s>) - set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_LLVM_LTO $<$<CONFIG:RELEASE>:YES>) - set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_LLVM_LTO $<$<CONFIG:RELWITHDEBINFO>:YES>) + set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_LLVM_LTO[variant=RelWithDebInfo] $<$<CONFIG:RELWITHDEBINFO>:YES>) + set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_LLVM_LTO[variant=Release] $<$<CONFIG:RELEASE>:YES>) endmacro() - - - if(MBGL_WITH_OPENGL) find_package(OpenGL REQUIRED) @@ -90,7 +88,9 @@ target_include_directories( include(${PROJECT_SOURCE_DIR}/vendor/icu.cmake) initialize_macos_target(mbgl-core) +initialize_macos_target(mbgl-vendor-csscolorparser) initialize_macos_target(mbgl-vendor-icu) +initialize_macos_target(mbgl-vendor-parsedate) target_link_libraries( mbgl-core |