1 files changed, 9 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6b86d9a8d..b007b541b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,7 @@ if(WITH_COVERAGE)
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --coverage")
 endif(WITH_COVERAGE)
 
-set(CMAKE_CONFIGURATION_TYPES Debug Release RelWithDebugInfo Sanitize)
+set(CMAKE_CONFIGURATION_TYPES Debug Release RelWithDebInfo Sanitize)
 
 # Compiler configuration
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -92,7 +92,6 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -DNDEBUG")
 set(CMAKE_CXX_FLAGS_SANITIZE "${CMAKE_CXX_FLAGS_SANITIZE} -O1 -g -fno-omit-frame-pointer -fno-optimize-sibling-calls")
 
-
 if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unknown-warning-option")
 elseif(CMAKE_COMPILER_IS_GNUCXX)
@@ -100,6 +99,9 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fext-numeric-literals")
 endif()
 
+set(CMAKE_SHARED_LINKER_FLAGS_SANITIZE "${CMAKE_SHARED_LINKER_FLAGS}")
+set(CMAKE_EXE_LINKER_FLAGS_SANITIZE "${CMAKE_EXE_LINKER_FLAGS}")
+
 # Technique from https://crascit.com/2016/04/09/using-ccache-with-cmake/
 find_program(CCACHE_PROGRAM ccache)
 if(CCACHE_PROGRAM)
@@ -146,16 +148,13 @@ if (COMMAND mbgl_filesource)
     include(cmake/filesource.cmake)
 endif()
 
-include(cmake/core-files.cmake)
 include(cmake/core.cmake)
 
 if(COMMAND mbgl_platform_test)
-    include(cmake/test-files.cmake)
     include(cmake/test.cmake)
 endif()
 
 if(COMMAND mbgl_platform_benchmark)
-    include(cmake/benchmark-files.cmake)
     include(cmake/benchmark.cmake)
 endif()
 
@@ -176,8 +175,10 @@ if(WITH_NODEJS AND COMMAND mbgl_platform_node)
 endif()
 
 if(CMAKE_GENERATOR STREQUAL "Xcode")
-    write_xcconfig_target_properties(
-        mbgl-core
-        mbgl-filesource
+    set_xcconfig_target_properties(mbgl-core)
+    set_xcconfig_target_properties(mbgl-filesource)
+    file(GENERATE
+        OUTPUT "${CMAKE_BINARY_DIR}/config.xcconfig"
+        INPUT "${CMAKE_SOURCE_DIR}/scripts/config.xcconfig.in"
     )
 endif()