diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-07-14 15:01:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-14 15:01:32 +0200 |
| commit | 23636dede21c8c47e660dcd880c91bff9304d4ca (patch) | |
| tree | 59274805bcd67af3c996476567b947772287b97a /src | |
| parent | d902272785a55e48f6b46a907a34a71a5220fccc (diff) | |
| parent | dec2eac09811166761a625bb3efb1aeab4b96c27 (diff) | |
| download | PROJ-23636dede21c8c47e660dcd880c91bff9304d4ca.tar.gz PROJ-23636dede21c8c47e660dcd880c91bff9304d4ca.zip | |
Merge pull request #2780 from mwtoews/nlohmann_json_interface_lib
CMake: remove external nlohmann_json from INTERFACE_LINK_LIBRARIES target
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin_projsync.cmake | 4 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 3 |
2 files changed, 2 insertions, 5 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 9b6db385..3d764440 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -399,7 +399,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) |