External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use CMAKE_MODULE_PATH

Browse Source
This commit is contained in:
Florian Albrechtskirchinger 2022-03-13 09:19:41 +01:00
parent 00c4a4d066
commit 61a7d65def
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -19,6 +19,7 @@ endif()
## INCLUDE ## INCLUDE
## ##
## ##
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
include(ExternalProject) include(ExternalProject)
## ##
@ -45,7 +46,7 @@ option(JSON_MultipleHeaders "Use non-amalgamated version of the library." OF
option(JSON_SystemInclude "Include as system headers (skip for clang-tidy)." OFF) option(JSON_SystemInclude "Include as system headers (skip for clang-tidy)." OFF)
if (JSON_CI) if (JSON_CI)
include(cmake/ci.cmake) include(ci)
endif () endif ()
## ##

2
benchmarks/CMakeLists.txt
View File

@ -23,7 +23,7 @@ if(NOT benchmark_POPULATED)
endif() endif()
# download test data # download test data
include(${CMAKE_SOURCE_DIR}/../cmake/download_test_data.cmake) include(download_test_data)
# benchmark binary # benchmark binary
add_executable(json_benchmarks src/benchmarks.cpp) add_executable(json_benchmarks src/benchmarks.cpp)

2
cmake/test.cmake
View File

@ -4,7 +4,7 @@ set(_json_test_cmake_list_file ${CMAKE_CURRENT_LIST_FILE})
# download test data # download test data
############################################################################# #############################################################################
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/download_test_data.cmake) include(download_test_data)
# test fixture to download test data # test fixture to download test data
add_test(NAME "download_test_data" COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} add_test(NAME "download_test_data" COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}

2
test/CMakeLists.txt
View File

@ -5,7 +5,7 @@ option(JSON_FastTests "Skip expensive/slow tests." OFF)
set(JSON_TestStandards "" CACHE STRING "The list of standards to test explicitly.") set(JSON_TestStandards "" CACHE STRING "The list of standards to test explicitly.")
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/test.cmake) include(test)
############################################################################# #############################################################################
# override standard support # override standard support