summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2019-11-16 00:15:35 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2019-11-16 01:14:46 +0200
commit06e6f602e5c78689c7aa62b4755d2b3e53101c89 (patch)
tree1b5a0296e33d1cda0750af9b3ad81b6d9616af33
parentf73467786dff98fa2f7240c9a775dff047b29bbf (diff)
downloadqtlocation-mapboxgl-upstream/tmpsantos-sanitize_core.tar.gz
[build] Sanitize only mbgl-core and direct dependenciesupstream/tmpsantos-sanitize_core
Getting too many false positives from libraries like gtest.
-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)