diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-07-14 15:20:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-14 15:20:42 +0200 |
| commit | ff2d8357be7a2cf7d845aabca9f1141136c349be (patch) | |
| tree | 80c76be7a58fb3eac3ffa16d707158c76a97b5b9 | |
| parent | 66f595e4856cdb43cc21d4bfa9d62608e17649c6 (diff) | |
| parent | 1cb0b8021f0640717356feaff38f99dd8cb9d26e (diff) | |
| download | PROJ-ff2d8357be7a2cf7d845aabca9f1141136c349be.tar.gz PROJ-ff2d8357be7a2cf7d845aabca9f1141136c349be.zip | |
Merge pull request #2781 from OSGeo/backport-2780-to-8.1
[Backport 8.1] CMake: remove external nlohmann_json from INTERFACE_LINK_LIBRARIES target
| -rw-r--r-- | src/bin_projsync.cmake | 4 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 3 | ||||
| -rw-r--r-- | test/unit/CMakeLists.txt | 8 |
3 files changed, 2 insertions, 13 deletions
diff --git a/src/bin_projsync.cmake b/src/bin_projsync.cmake index c184a422..6486b5d4 100644 --- a/src/bin_projsync.cmake +++ b/src/bin_projsync.cmake @@ -8,10 +8,6 @@ set_target_properties(bin_projsync OUTPUT_NAME projsync) target_link_libraries(bin_projsync PRIVATE ${PROJ_LIBRARIES}) target_compile_options(bin_projsync PRIVATE ${PROJ_CXX_WARN_FLAGS}) -if(NLOHMANN_JSON STREQUAL "external") - target_compile_definitions(bin_projsync PRIVATE EXTERNAL_NLOHMANN_JSON) - target_link_libraries(bin_projsync PRIVATE nlohmann_json::nlohmann_json) -endif() install(TARGETS bin_projsync DESTINATION ${BINDIR}) diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index 71468c87..f2de1c10 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -398,7 +398,8 @@ target_link_libraries(proj PRIVATE ${SQLITE3_LIBRARY}) if(NLOHMANN_JSON STREQUAL "external") target_compile_definitions(proj PRIVATE EXTERNAL_NLOHMANN_JSON) - target_link_libraries(proj PRIVATE nlohmann_json::nlohmann_json) + target_link_libraries(proj + PRIVATE $<BUILD_INTERFACE:nlohmann_json::nlohmann_json>) endif() if(TIFF_ENABLED) 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}) |