diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-02-26 16:08:23 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-02-27 18:19:31 +0200 |
| commit | 427d785848ba1cbf8df095ebe75c8731f30dfb5e (patch) | |
| tree | 317eb2ba3ba7078f13f00cd83a0368d76f6b949f /platform | |
| parent | 242b719f0cbb24b485e439edd0da5aedee87f444 (diff) | |
| download | qtlocation-mapboxgl-427d785848ba1cbf8df095ebe75c8731f30dfb5e.tar.gz | |
[build] Make csscolorparser and parsedate vendors
They have a different license from the rest of the code
and this will make it explicit. Also the script for generating
the license will dectect them correctly.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/android.cmake | 16 | ||||
| -rw-r--r-- | platform/ios/ios.cmake | 2 |
2 files changed, 8 insertions, 10 deletions
diff --git a/platform/android/android.cmake b/platform/android/android.cmake index fafaefd264..1fbe67836d 100644 --- a/platform/android/android.cmake +++ b/platform/android/android.cmake @@ -10,17 +10,13 @@ target_compile_definitions( include(${PROJECT_SOURCE_DIR}/vendor/icu.cmake) include(${PROJECT_SOURCE_DIR}/vendor/sqlite.cmake) +# cmake-format: off +target_compile_options(mbgl-vendor-csscolorparser PRIVATE $<$<CONFIG:Release>:-Oz> $<$<CONFIG:Release>:-Qunused-arguments> $<$<CONFIG:Release>:-flto>) target_compile_options(mbgl-vendor-icu PRIVATE $<$<CONFIG:Release>:-Oz> $<$<CONFIG:Release>:-Qunused-arguments> $<$<CONFIG:Release>:-flto>) - -target_compile_options( - mbgl-vendor-sqlite - PRIVATE $<$<CONFIG:Release>:-Oz> $<$<CONFIG:Release>:-Qunused-arguments> $<$<CONFIG:Release>:-flto> -) - -target_compile_options( - mbgl-compiler-options - INTERFACE $<$<CONFIG:Release>:-Oz> $<$<CONFIG:Release>:-Qunused-arguments> $<$<CONFIG:Release>:-flto> -) +target_compile_options(mbgl-vendor-parsedate PRIVATE $<$<CONFIG:Release>:-Oz> $<$<CONFIG:Release>:-Qunused-arguments> $<$<CONFIG:Release>:-flto>) +target_compile_options(mbgl-vendor-sqlite PRIVATE $<$<CONFIG:Release>:-Oz> $<$<CONFIG:Release>:-Qunused-arguments> $<$<CONFIG:Release>:-flto>) +target_compile_options(mbgl-compiler-options INTERFACE $<$<CONFIG:Release>:-Oz> $<$<CONFIG:Release>:-Qunused-arguments> $<$<CONFIG:Release>:-flto>) +# cmake-format: on target_link_libraries( mbgl-compiler-options diff --git a/platform/ios/ios.cmake b/platform/ios/ios.cmake index f27196c580..91489dbba9 100644 --- a/platform/ios/ios.cmake +++ b/platform/ios/ios.cmake @@ -80,7 +80,9 @@ include(${PROJECT_SOURCE_DIR}/platform/ios/ccache.cmake) include(${PROJECT_SOURCE_DIR}/platform/ios/ios-test-runners.cmake) initialize_ios_target(mbgl-core) +initialize_ios_target(mbgl-vendor-csscolorparser) initialize_ios_target(mbgl-vendor-icu) +initialize_ios_target(mbgl-vendor-parsedate) target_link_libraries( mbgl-core |