From 1cb0b8021f0640717356feaff38f99dd8cb9d26e Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 14 Jul 2021 15:01:32 +0200 Subject: Merge pull request #2780 from mwtoews/nlohmann_json_interface_lib CMake: remove external nlohmann_json from INTERFACE_LINK_LIBRARIES target --- src/bin_projsync.cmake | 4 ---- src/lib_proj.cmake | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src') 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 $) endif() if(TIFF_ENABLED) -- cgit v1.2.3