Merge pull request #2780 from mwtoews/nlohmann_json_interface_lib

CMake: remove external nlohmann_json from INTERFACE_LINK_LIBRARIES target
OSGeo · Jul 14, 2021 · 1cb0b80 · 1cb0b80
1 parent 66f595e
commit 1cb0b80
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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})