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

V1.4.6
1、修改了curl和hiredis的.cmake内容

Apple преди 1 седмица
родител
ревизия
e2c30fbd4f
променени са 2 файла, в които са добавени 32 реда и са изтрити 1 реда
  1. 31 0
      Libraries/CURL/FindCURL.cmake
  2. 1 1
      Libraries/hiredis/Findhiredis.cmake

+ 31 - 0
Libraries/CURL/FindCURL.cmake

@@ -57,6 +57,7 @@ if(CURL_INCLUDE_DIR AND ( CURL_LIBRARY OR CURL_STATIC_LIBRARY) )
         message(STATUS "include : CURL_INCLUDE_DIR")
         message(STATUS "Library : CURL_LIBRARY")
     endif()
+    message(STATUS "target_link_libraries(External::curl)")
 else()
     set(CURL_FOUND FALSE)
 endif()
@@ -66,3 +67,33 @@ message(STATUS "CURL Found : ${CURL_FOUND}")
 message(STATUS "CURL Version : ${CURL_VERSION}")
 message(STATUS "--------------------------------------------------")
 
+
+#导入目标
+if(CURL_FOUND)
+    if(NOT TARGET External::curl)
+        add_library(External::curl UNKNOWN IMPORTED)
+        #添加头文件
+        set_target_properties(External::curl PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIR}")
+
+        #添加库文件
+
+        set_target_properties(External::curl PROPERTIES
+            IMPORTED_LOCATION "${CURL_LIBRARY}")
+        #添加spdlog需要的依赖库
+        # set_target_properties(External::curl PROPERTIES
+        #     INTERFACE_LINK_LIBRARIES "pthread")
+
+
+        #添加源文件
+        # set_target_properties(External::curl PROPERTIES
+        #    INTERFACE_SOURCES "${hiredis_SOURCES}")
+    endif()
+endif()
+
+# 标记这些变量为高级变量
+mark_as_advanced(
+    CURL_INCLUDE_DIR
+    CURL_LIBRARY
+)
+

+ 1 - 1
Libraries/hiredis/Findhiredis.cmake

@@ -63,7 +63,7 @@ endif()
 # message(STATUS "Library : hiredis_LIBRARY")
 # message(STATUS "Static Library : ssh2_STATIC_LIBRARY")
 
-message(STATUS "target_link_hiredis(External::hiredis)")
+message(STATUS "target_link_libraries(External::hiredis)")
 
 
 message(STATUS "hiredis Found : ${hiredis_FOUND}")