Преглед на файлове

Build: Use imported target `JsonCpp::JsonCpp` instead of variables

Alex Turbov преди 3 години
родител
ревизия
ddac6dcbe8
променени са 2 файла, в които са добавени 2 реда и са изтрити 3 реда
  1. 1 1
      Source/CMakeLists.txt
  2. 1 2
      Source/Modules/CMakeBuildUtilities.cmake

+ 1 - 1
Source/CMakeLists.txt

@@ -754,7 +754,7 @@ target_link_libraries(
     EXPAT::EXPAT
     LibArchive::LibArchive
     ZLIB::ZLIB
-    ${CMAKE_JSONCPP_LIBRARIES}
+    JsonCpp::JsonCpp
     ${CMAKE_LIBUV_LIBRARIES}
     ${CMAKE_LIBRHASH_LIBRARIES}
     ${CMake_KWIML_LIBRARIES}

+ 1 - 2
Source/Modules/CMakeBuildUtilities.cmake

@@ -318,10 +318,9 @@ if(CMAKE_USE_SYSTEM_JSONCPP)
     set_property(TARGET JsonCpp::JsonCpp APPEND PROPERTY
       INTERFACE_COMPILE_OPTIONS -Wno-deprecated-declarations)
   endif()
-  set(CMAKE_JSONCPP_LIBRARIES JsonCpp::JsonCpp)
 else()
-  set(CMAKE_JSONCPP_LIBRARIES cmjsoncpp)
   add_subdirectory(Utilities/cmjsoncpp)
+  add_library(JsonCpp::JsonCpp ALIAS cmjsoncpp)
   CMAKE_SET_TARGET_FOLDER(cmjsoncpp "Utilities/3rdParty")
 endif()