Fixing cmake targets for XCode 12 - making sure unit tests can be run from macos project workspace.

This commit is contained in:
Petr Pokorny
2021-02-07 20:53:38 +01:00
parent 62ab3e4340
commit 62c6178029
6 changed files with 36 additions and 3 deletions

View File

@@ -1,7 +1,5 @@
cmake_minimum_required(VERSION 3.19)
message(source-dir=${CMAKE_SOURCE_DIR} current-dir=${CMAKE_CURRENT_SOURCE_DIR} current-binary-dir=${CMAKE_CURRENT_BINARY_DIR})
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../ ${CMAKE_CURRENT_BINARY_DIR}/mapbox-gl-native )
project (mbgl)

View File

@@ -3712,7 +3712,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 15256;
DEBUG_INFORMATION_FORMAT = dwarf;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_TESTABILITY = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (

View File

@@ -1,3 +1,4 @@
cmake_minimum_required(VERSION 3.19)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11")
# Override default CMake NATIVE_ARCH_ACTUAL
@@ -149,6 +150,7 @@ target_link_libraries(
set_property(TARGET mbgl-benchmark-runner PROPERTY FOLDER Executables)
set_property(TARGET mbgl-test-runner PROPERTY FOLDER Executables)
set_property(TARGET mbgl-render-test-runner PROPERTY FOLDER Executables)
set_target_properties(mbgl-benchmark-runner mbgl-test-runner mbgl-render-test-runner PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH[variant=Debug] "YES")
# Disable benchmarks in CI as they run in VM environment
if(NOT DEFINED ENV{CI})