j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🔧 overworked maintaner targets

Browse source
This commit is contained in:
Niels Lohmann 2019-03-28 14:22:48 +01:00
parent d79c16801a
commit 191aa0fd6f
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
3 changed files with 146 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/CMakeLists.txt
View file

@ -6,7 +6,7 @@ option(JSON_Coverage "Build test suite with coverage information" OFF)
if(JSON_Sanitizer)
message(STATUS "Building test suite with Clang sanitizer")
if(NOT MSVC)
set(CMAKE_CXX_FLAGS "-g -O2 -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer")
set(CMAKE_CXX_FLAGS "-g -O2 -fsanitize=address -fsanitize=undefined -fsanitize=implicit-conversion -fsanitize=integer -fsanitize=nullability -fno-omit-frame-pointer")
endif()
endif()
@ -64,7 +64,7 @@ set_target_properties(catch_main PROPERTIES
COMPILE_DEFINITIONS "$<$<CXX_COMPILER_ID:MSVC>:_SCL_SECURE_NO_WARNINGS>"
COMPILE_OPTIONS "$<$<CXX_COMPILER_ID:MSVC>:/EHsc;$<$<CONFIG:Release>:/Od>>"
)
if (${CMAKE_VERSION} VERSION_LESS "3.8.0")
if (${CMAKE_VERSION} VERSION_LESS "3.8.0")
target_compile_features(catch_main PUBLIC cxx_range_for)
else()
target_compile_features(catch_main PUBLIC cxx_std_11)