Merge pull request #885 from TinyTinni/develop
Includes CTest module/adds BUILD_TESTING option
This commit is contained in:
commit
184e9c6aa7
1 changed files with 4 additions and 2 deletions
|
@ -9,7 +9,7 @@ project(nlohmann_json VERSION 3.0.0 LANGUAGES CXX)
|
|||
##
|
||||
## OPTIONS
|
||||
##
|
||||
option(JSON_BuildTests "Build the unit tests" ON)
|
||||
option(JSON_BuildTests "Build the unit tests when BUILD_TESTING is enabled." ON)
|
||||
|
||||
##
|
||||
## CONFIGURATION
|
||||
|
@ -54,7 +54,9 @@ endif()
|
|||
## TESTS
|
||||
## create and configure the unit test target
|
||||
##
|
||||
if(JSON_BuildTests)
|
||||
include(CTest) #adds option BUILD_TESTING (default ON)
|
||||
|
||||
if(BUILD_TESTING AND JSON_BuildTests)
|
||||
enable_testing()
|
||||
include_directories(${NLOHMANN_JSON_SOURCE_DIR})
|
||||
add_subdirectory(test)
|
||||
|
|
Loading…
Reference in a new issue