Просмотр исходного кода

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

Alex Turbov 3 лет назад
Родитель
Сommit
df8ad72ffa

+ 1 - 1
Source/CMakeLists.txt

@@ -757,7 +757,7 @@ target_link_libraries(
     JsonCpp::JsonCpp
     LibUV::LibUV
     LibRHash::LibRHash
-    ${CMake_KWIML_LIBRARIES}
+    $<TARGET_NAME_IF_EXISTS:kwiml::kwiml>
     ${CMAKE_THREAD_LIBS_INIT}
   )
 

+ 0 - 2
Source/Modules/CMakeBuildUtilities.cmake

@@ -90,9 +90,7 @@ if(CMAKE_USE_SYSTEM_KWIML)
   if(NOT KWIML_FOUND)
     message(FATAL_ERROR "CMAKE_USE_SYSTEM_KWIML is ON but KWIML is not found!")
   endif()
-  set(CMake_KWIML_LIBRARIES kwiml::kwiml)
 else()
-  set(CMake_KWIML_LIBRARIES "")
   if(BUILD_TESTING)
     set(KWIML_TEST_ENABLE 1)
   endif()

+ 1 - 1
Utilities/cmjsoncpp/CMakeLists.txt

@@ -21,5 +21,5 @@ include_directories(
   )
 
 add_library(cmjsoncpp ${JSONCPP_SOURCES})
-target_link_libraries(cmjsoncpp ${CMake_KWIML_LIBRARIES})
+target_link_libraries(cmjsoncpp $<TARGET_NAME_IF_EXISTS:kwiml::kwiml>)
 set_property(TARGET cmjsoncpp PROPERTY CXX_INCLUDE_WHAT_YOU_USE "")