summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Guerra <fabian.guerra@mapbox.com>2019-10-18 11:37:51 -0700
committerFabian Guerra <fabian.guerra@mapbox.com>2019-10-18 11:37:51 -0700
commitc08fe760226f80a37a5e34616bfd44295774f023 (patch)
treec280d72179f32ef73191e33eb71e34a19d056e5e
parent3ac706edfefc9c8f2ee1ad9eb38bf688364cdb77 (diff)
downloadqtlocation-mapboxgl-upstream/fabian-fix-ios-build-conf.tar.gz
[ios] Add ARC config to the new build system.upstream/fabian-fix-ios-build-conf
-rw-r--r--next/CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/next/CMakeLists.txt b/next/CMakeLists.txt
index fb0779bea4..21cbc402f3 100644
--- a/next/CMakeLists.txt
+++ b/next/CMakeLists.txt
@@ -925,6 +925,10 @@ add_library(
Mapbox::Map ALIAS mbgl-core
)
+set_target_properties(mbgl-core PROPERTIES
+ XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES
+)
+
if(MBGL_WITH_CORE_ONLY)
return()
elseif(MBGL_WITH_QT)
@@ -936,7 +940,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL iOS)
elseif(CMAKE_SYSTEM_NAME STREQUAL Linux)
include(${PROJECT_SOURCE_DIR}/platform/linux/linux.cmake)
elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
- include(${PROJECT_SOURCE_DIR}/platform/macos/macos.cmake)
+ include(${PROJECT_SOURCE_DIR}/platform/ios/ios.cmake)
else()
message(FATAL_ERROR "Unsupported target platform: " ${CMAKE_SYSTEM_NAME})
endif()