summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--next/CMakeLists.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/next/CMakeLists.txt b/next/CMakeLists.txt
index c9d07fd5f3..cf16399e7e 100644
--- a/next/CMakeLists.txt
+++ b/next/CMakeLists.txt
@@ -30,8 +30,8 @@ option(MBGL_WITH_SANITIZER "Use [address|thread|memory|undefined] here" OFF)
set(CMAKE_CXX_FLAGS_DEBUGCOVERAGE "${CMAKE_CXX_FLAGS_DEBUG} --coverage")
set(CMAKE_C_FLAGS_DEBUGCOVERAGE "${CMAKE_C_FLAGS_DEBUG} --coverage")
-set(CMAKE_CXX_FLAGS_SANITIZE "-DSANITIZE -g -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=${MBGL_WITH_SANITIZER}")
-set(CMAKE_C_FLAGS_SANITIZE "-DSANITIZE -g -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=${MBGL_WITH_SANITIZER}")
+set(CMAKE_CXX_FLAGS_SANITIZE "-DSANITIZE -g -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
+set(CMAKE_C_FLAGS_SANITIZE "-DSANITIZE -g -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
add_compile_options(
$<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>
@@ -895,10 +895,13 @@ target_include_directories(
PUBLIC ${MBGL_ROOT}/include
)
+target_compile_options(mbgl-core PUBLIC $<$<CONFIG:Sanitize>:-fsanitize=${MBGL_WITH_SANITIZER}>)
+target_link_options(mbgl-core PUBLIC $<$<CONFIG:Sanitize>:-fsanitize=${MBGL_WITH_SANITIZER}>)
+
if(NOT TARGET mapbox-base)
add_subdirectory(${PROJECT_SOURCE_DIR}/vendor/mapbox-base/mapbox)
add_subdirectory(${PROJECT_SOURCE_DIR}/vendor/mapbox-base/extras)
-endif(NOT TARGET mapbox-base)
+endif()
include(${PROJECT_SOURCE_DIR}/vendor/boost.cmake)
include(${PROJECT_SOURCE_DIR}/vendor/earcut.hpp.cmake)