- isolated namespace targets into separate file

993e4e28 · Sergey Rachev · Christopher Dunn · 2af4a4c6 · 993e4e28 · 993e4e28
Commit 993e4e28 authored 4 years ago by Sergey Rachev Committed by Christopher Dunn 4 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 9 additions and 8 deletions
+9 -8
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,6 +186,7 @@ if(JSONCPP_WITH_CMAKE_PACKAGE)
        COMPATIBILITY SameMajorVersion)
    install(FILES
        ${CMAKE_CURRENT_BINARY_DIR}/jsoncppConfigVersion.cmake ${CMAKE_CURRENT_BINARY_DIR}/jsoncppConfig.cmake
+        ${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp-namespaced-targets.cmake
        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/jsoncpp)
 endif()


--- a/jsoncpp-namespaced-targets.cmake
+++ b/jsoncpp-namespaced-targets.cmake
+if (TARGET jsoncpp_static)
+    add_library(JsonCpp::JsonCpp INTERFACE IMPORTED)
+    set_target_properties(JsonCpp::JsonCpp PROPERTIES INTERFACE_LINK_LIBRARIES "jsoncpp_static")
+elseif (TARGET jsoncpp_lib)
+    add_library(JsonCpp::JsonCpp INTERFACE IMPORTED)
+    set_target_properties(JsonCpp::JsonCpp PROPERTIES INTERFACE_LINK_LIBRARIES "jsoncpp_lib")
+endif ()
\ No newline at end of file
--- a/jsoncppConfig.cmake.in
+++ b/jsoncppConfig.cmake.in
@@ -4,14 +4,7 @@ cmake_policy(VERSION 3.0)
 @PACKAGE_INIT@

 include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-targets.cmake" )
-
-if(TARGET jsoncpp_static)
-    add_library(JsonCpp::JsonCpp INTERFACE IMPORTED )
-    set_target_properties(JsonCpp::JsonCpp PROPERTIES INTERFACE_LINK_LIBRARIES "jsoncpp_static")
-elseif(TARGET jsoncpp_lib)
-    add_library(JsonCpp::JsonCpp INTERFACE IMPORTED )
-    set_target_properties(JsonCpp::JsonCpp PROPERTIES INTERFACE_LINK_LIBRARIES "jsoncpp_lib")
-endif()
+include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-namespaced-targets.cmake" )

 check_required_components(JsonCpp)