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

CMake: 3.8+ is Sufficient

Browse source 
The current CMake scripts depend on CMake 3.8+.
This allows us to remove previous work-arounds.
This commit is contained in:
Axel Huebl 2018-04-07 13:15:44 +02:00
parent 495436a5d5
commit e439a1a9a7
No known key found for this signature in database
GPG key ID: 472D2C364E21D94B
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -53,8 +53,8 @@ target_include_directories(
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
) )
## add debug view defintion file for msvc (natvis) [cmake <= 3.2.2 does not support export of source files] ## add debug view defintion file for msvc (natvis)
if (MSVC AND CMAKE_VERSION VERSION_GREATER "3.2.2") if (MSVC)
set(NLOHMANN_ADD_NATVIS TRUE) set(NLOHMANN_ADD_NATVIS TRUE)
set(NLOHMANN_NATVIS_FILE "nlohmann_json.natvis") set(NLOHMANN_NATVIS_FILE "nlohmann_json.natvis")
target_sources( target_sources(
@ -64,7 +64,7 @@ if (MSVC AND CMAKE_VERSION VERSION_GREATER "3.2.2")
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${NLOHMANN_NATVIS_FILE}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${NLOHMANN_NATVIS_FILE}>
) )
endif() endif()
## ##
## TESTS ## TESTS
## create and configure the unit test target ## create and configure the unit test target