Unverified Commit 2fc1f694 authored by Niels Lohmann's avatar Niels Lohmann Committed by GitHub

Merge pull request #2514 from globberwops/develop

Add MAIN_PROJECT check for test and install options
parents 85ffc85a 1771e924
...@@ -6,6 +6,15 @@ cmake_minimum_required(VERSION 3.1) ...@@ -6,6 +6,15 @@ cmake_minimum_required(VERSION 3.1)
## ##
project(nlohmann_json VERSION 3.9.1 LANGUAGES CXX) project(nlohmann_json VERSION 3.9.1 LANGUAGES CXX)
##
## MAIN_PROJECT CHECK
## determine if nlohmann_json is built as a subproject (using add_subdirectory) or if it is the main project
##
set(MAIN_PROJECT OFF)
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
set(MAIN_PROJECT ON)
endif()
## ##
## INCLUDE ## INCLUDE
## ##
...@@ -21,8 +30,8 @@ if (POLICY CMP0077) ...@@ -21,8 +30,8 @@ if (POLICY CMP0077)
cmake_policy(SET CMP0077 NEW) cmake_policy(SET CMP0077 NEW)
endif () endif ()
option(JSON_BuildTests "Build the unit tests when BUILD_TESTING is enabled." ON) option(JSON_BuildTests "Build the unit tests when BUILD_TESTING is enabled." ${MAIN_PROJECT})
option(JSON_Install "Install CMake targets during install step." ON) option(JSON_Install "Install CMake targets during install step." ${MAIN_PROJECT})
option(JSON_MultipleHeaders "Use non-amalgamated version of the library." OFF) option(JSON_MultipleHeaders "Use non-amalgamated version of the library." OFF)
option(JSON_ImplicitConversions "Enable implicit conversions." ON) option(JSON_ImplicitConversions "Enable implicit conversions." ON)
...@@ -101,9 +110,8 @@ CONFIGURE_FILE( ...@@ -101,9 +110,8 @@ CONFIGURE_FILE(
## TESTS ## TESTS
## create and configure the unit test target ## create and configure the unit test target
## ##
include(CTest) #adds option BUILD_TESTING (default ON) if (JSON_BuildTests)
include(CTest)
if(BUILD_TESTING AND JSON_BuildTests)
enable_testing() enable_testing()
add_subdirectory(test) add_subdirectory(test)
endif() endif()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment