From 570af0fd346347196d4c58552482fff5cc4a7da8 Mon Sep 17 00:00:00 2001 From: Pascal Thomet Date: Sun, 8 Dec 2024 13:16:00 +0100 Subject: [PATCH] cmake: private include nlohmann-json / install path = lib --- hello_imgui_cmake/hello_imgui_build_lib.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hello_imgui_cmake/hello_imgui_build_lib.cmake b/hello_imgui_cmake/hello_imgui_build_lib.cmake index b3453ece..8dbbde0f 100644 --- a/hello_imgui_cmake/hello_imgui_build_lib.cmake +++ b/hello_imgui_cmake/hello_imgui_build_lib.cmake @@ -294,7 +294,7 @@ function(him_install_imgui) return() endif() - install(TARGETS imgui DESTINATION ./lib/) + install(TARGETS imgui DESTINATION lib) file(GLOB imgui_headers ${HELLOIMGUI_IMGUI_SOURCE_DIR}/*.h ${HELLOIMGUI_IMGUI_SOURCE_DIR}/misc/cpp/*.h @@ -1192,7 +1192,7 @@ function(him_add_nlohmann_json) find_package(nlohmann_json CONFIG QUIET) if(nlohmann_json_FOUND) message(STATUS "HelloImGui: using nlohmann_json from find_package(nlohmann_json)") - target_link_libraries(${HELLOIMGUI_TARGET} PUBLIC nlohmann_json::nlohmann_json) + target_link_libraries(${HELLOIMGUI_TARGET} PRIVATE nlohmann_json::nlohmann_json) set(HELLOIMGUI_NLOHMANN_JSON_SELECTED_INFO "Found via find_package(nlohmann_json)" CACHE INTERNAL "" FORCE) else() message(STATUS "HelloImGui: using nlohmann_json from external/nlohmann_json") @@ -1200,7 +1200,7 @@ function(him_add_nlohmann_json) add_library(nlohmann_json INTERFACE) target_include_directories(nlohmann_json INTERFACE $) # target_compile_definitions(nlohmann_json INTERFACE NLOHMANN_JSON_NOEXCEPTION) - target_link_libraries(${HELLOIMGUI_TARGET} PUBLIC nlohmann_json) + target_link_libraries(${HELLOIMGUI_TARGET} PRIVATE nlohmann_json) set(HELLOIMGUI_NLOHMANN_JSON_SELECTED_INFO "Using external/nlohmann_json" CACHE INTERNAL "" FORCE) him_add_installable_dependency(nlohmann_json)