diff options
| author | Artem Pavlenko <artem@mapnik.org> | 2020-02-14 16:56:46 +0000 |
|---|---|---|
| committer | Artem Pavlenko <artem@mapnik.org> | 2020-02-14 16:56:46 +0000 |
| commit | 145c053a02d918d74002ea690dac398ee588a374 (patch) | |
| tree | c645ffaec12822f0668858181248cd7365fc4e20 /test/CMakeLists.txt | |
| parent | 37a4660ca367f141b9e0dedf3932c74f0ee0c920 (diff) | |
| parent | 59294aaef333bdd455bd13d6bab6fca730379b52 (diff) | |
| download | qtlocation-mapboxgl-145c053a02d918d74002ea690dac398ee588a374.tar.gz | |
Merge branch 'master' into galinelle_setStyle++_updatedupstream/galinelle_setStyle++_updated
Diffstat (limited to 'test/CMakeLists.txt')
| -rw-r--r-- | test/CMakeLists.txt | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index dcde7cd21a..a9ae0ac874 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -134,6 +134,12 @@ else() COMPILE_FLAGS -Wno-shadow ) + set_source_files_properties( + ${PROJECT_SOURCE_DIR}/test/src/mbgl/test/http_server.cpp + PROPERTIES + COMPILE_OPTIONS + $<$<STREQUAL:${CMAKE_SYSTEM_NAME},iOS>:-Wno-shorten-64-to-32> + ) target_include_directories( mbgl-test PRIVATE ${PROJECT_SOURCE_DIR}/vendor/cpp-httplib @@ -167,6 +173,18 @@ target_include_directories( include(${PROJECT_SOURCE_DIR}/vendor/googletest.cmake) +if(CMAKE_SYSTEM_NAME STREQUAL iOS) + set_target_properties(mbgl-vendor-googletest PROPERTIES XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${IOS_DEPLOYMENT_TARGET}") + set_target_properties(mbgl-vendor-googletest PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE "YES") + set_target_properties(mbgl-vendor-googletest PROPERTIES XCODE_ATTRIBUTE_BITCODE_GENERATION_MODE bitcode) + set_target_properties(mbgl-vendor-googletest PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH $<$<CONFIG:Debug>:YES>) + + set_target_properties(mbgl-test PROPERTIES XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${IOS_DEPLOYMENT_TARGET}") + set_target_properties(mbgl-test PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE "YES") + set_target_properties(mbgl-test PROPERTIES XCODE_ATTRIBUTE_BITCODE_GENERATION_MODE bitcode) + set_target_properties(mbgl-test PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH $<$<CONFIG:Debug>:YES>) +endif() + # Needed for testing private classes get_target_property(MBGL_CORE_PRIVATE_LIBRARIES mbgl-core LINK_LIBRARIES) |