aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2021-07-14 15:01:32 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-07-14 13:02:07 +0000
commit1cb0b8021f0640717356feaff38f99dd8cb9d26e (patch)
tree80c76be7a58fb3eac3ffa16d707158c76a97b5b9 /test
parent66f595e4856cdb43cc21d4bfa9d62608e17649c6 (diff)
downloadPROJ-1cb0b8021f0640717356feaff38f99dd8cb9d26e.tar.gz
PROJ-1cb0b8021f0640717356feaff38f99dd8cb9d26e.zip
Merge pull request #2780 from mwtoews/nlohmann_json_interface_lib
CMake: remove external nlohmann_json from INTERFACE_LINK_LIBRARIES target
Diffstat (limited to 'test')
-rw-r--r--test/unit/CMakeLists.txt8
1 files changed, 0 insertions, 8 deletions
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index 53a14ced..1a080ac5 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -166,10 +166,6 @@ add_executable(test_defmodel
target_link_libraries(test_defmodel
PRIVATE GTest::gtest
PRIVATE ${PROJ_LIBRARIES})
-if(NLOHMANN_JSON STREQUAL "external")
- target_compile_definitions(test_defmodel PRIVATE EXTERNAL_NLOHMANN_JSON)
- target_link_libraries(test_defmodel PRIVATE nlohmann_json::nlohmann_json)
-endif()
add_test(NAME test_defmodel COMMAND test_defmodel)
set_property(TEST test_defmodel
PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT})
@@ -180,10 +176,6 @@ add_executable(test_tinshift
target_link_libraries(test_tinshift
PRIVATE GTest::gtest
PRIVATE ${PROJ_LIBRARIES})
-if(NLOHMANN_JSON STREQUAL "external")
- target_compile_definitions(test_tinshift PRIVATE EXTERNAL_NLOHMANN_JSON)
- target_link_libraries(test_tinshift PRIVATE nlohmann_json::nlohmann_json)
-endif()
add_test(NAME test_tinshift COMMAND test_tinshift)
set_property(TEST test_tinshift
PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT})