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

🔨 fix paths

Browse source
This commit is contained in:
Niels Lohmann 2020-05-02 10:56:01 +02:00
parent 08c9472184
commit bec554936c
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/download_test_data.cmake
View file

@ -8,4 +8,4 @@ add_custom_target(download_test_data
) )
# create a header with the path to the downloaded test data # create a header with the path to the downloaded test data
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/include/test_data.hpp "#define TEST_DATA_DIRECTORY \"${CMAKE_BINARY_DIR}/json_test_data\"") file(WRITE ${CMAKE_BINARY_DIR}/include/test_data.hpp "#define TEST_DATA_DIRECTORY \"${CMAKE_BINARY_DIR}/json_test_data\"")

4
test/CMakeLists.txt
View file

@ -4,7 +4,7 @@ option(JSON_NoExceptions "Build test suite without exceptions" OFF)
option(JSON_Coverage "Build test suite with coverage information" OFF) option(JSON_Coverage "Build test suite with coverage information" OFF)
# download test data # download test data
include(${CMAKE_SOURCE_DIR}/cmake/download_test_data.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/download_test_data.cmake)
# 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} --target download_test_data) add_test(NAME "download_test_data" COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target download_test_data)
@ -164,7 +164,7 @@ foreach(file ${files})
$<$<CXX_COMPILER_ID:GNU>:-Wno-deprecated-declarations> $<$<CXX_COMPILER_ID:GNU>:-Wno-deprecated-declarations>
) )
target_include_directories(${testcase} PRIVATE target_include_directories(${testcase} PRIVATE
${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_BINARY_DIR}/include
thirdparty/doctest thirdparty/doctest
thirdparty/fifo_map thirdparty/fifo_map
) )