0.1.7

1、修改了curl库加载方式，debug也加载的是release模式的curl库，方便LHHTTPAPI调用
2、取消了LHHTTPAPI内部的curl库，使用外部统一的curl库

Libraries/LHHTTPAPI/FindLHHttpAPI.cmake

@@ -23,7 +23,8 @@ find_path(SOURCE_DIR
 
 list(APPEND LHHTTPAPI_SOURCE_DIRS ${SOURCE_DIR})
 
-#查找库文件，在这里区分平台，Debug和Release，32位和64位
+# 查找库文件，在这里区分平台，Debug和Release，32位和64位
+# 这里没有使用这个文件夹内的curl库，而是使用了外部的curl库
 unset(LHHTTPAPI_LIBRARY CACHE)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Windows")
@@ -31,19 +32,19 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
     if(CMAKE_SIZEOF_VOID_P MATCHES 8)
         if(CMAKE_BUILD_TYPE MATCHES "Debug")
             list(APPEND LHHTTPAPI_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/MinGW_64/LHSqlWebInterfaced.dll)
-            list(APPEND LHHTTPAPI_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/MinGW_64/libcurl.dll)
+            # list(APPEND LHHTTPAPI_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/MinGW_64/libcurl.dll)
         else()
             list(APPEND LHHTTPAPI_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/MinGW_64/LHSqlWebInterface.dll)
-            list(APPEND LHHTTPAPI_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/MinGW_64/libcurl.dll)
+            # list(APPEND LHHTTPAPI_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/MinGW_64/libcurl.dll)
         endif()
     #32位
     elseif(CMAKE_SIZEOF_VOID_P MATCHES 4)
         if(CMAKE_BUILD_TYPE MATCHES "Debug")
             list(APPEND LHHTTPAPI_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/MinGW_32/LHSqlWebInterfaced.dll)
-            list(APPEND LHHTTPAPI_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/MinGW_32/libcurl.dll)
+            # list(APPEND LHHTTPAPI_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/MinGW_32/libcurl.dll)
         else()
             list(APPEND LHHTTPAPI_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/MinGW_32/LHSqlWebInterface.dll)
-            list(APPEND LHHTTPAPI_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/MinGW_32/libcurl.dll)
+            # list(APPEND LHHTTPAPI_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/MinGW_32/libcurl.dll)
         endif()
     endif()
 endif()

Libraries/Libraries.cmake

@@ -17,8 +17,12 @@ endif()
 #*********************  搜索所有的库 *********************
 #=========================================================
 
-# 这一段主要是搜索fmt和spdlog的库，64位支持动态库和静态库，32位只支持静态库
+# 这一段主要是搜索生成的标准开源库
-#设置 USING_SPDLOG_STATIC_LIB = TRUE，使用静态库，否则使用动态库，默认使用动态库
+# fmt、spdlog、CURL等
+# fmt和spdlog的64位支持动态库和静态库，32位只支持静态库
+# spdlog设置 USING_SPDLOG_STATIC_LIB = TRUE，使用静态库，否则使用动态库，默认使用动态库
+# CURL只支持动态库，debug版本的.cmake文件也经过修改，全部指向release版本的动态库，方便和LHHTTPAPI一起调用
+
 if(CMAKE_SYSTEM_NAME MATCHES "Windows")
     
     #spdlog和fmt区分位置，分为64位和32位，静态库和动态库，debug和release

Libraries/gcc7.3/lib/cmake/CURL/CURLTargets-debug.cmake

@@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 # Import target "CURL::libcurl" for configuration "Debug"
 set_property(TARGET CURL::libcurl APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
 set_target_properties(CURL::libcurl PROPERTIES
-  IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/libcurl-d.dll.a"
+  IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/libcurl.dll.a"
-  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/libcurl-d.dll"
+  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/libcurl.dll"
   )
 
 list(APPEND _cmake_import_check_targets CURL::libcurl )
-list(APPEND _cmake_import_check_files_for_CURL::libcurl "${_IMPORT_PREFIX}/lib/libcurl-d.dll.a" "${_IMPORT_PREFIX}/bin/libcurl-d.dll" )
+list(APPEND _cmake_import_check_files_for_CURL::libcurl "${_IMPORT_PREFIX}/lib/libcurl.dll.a" "${_IMPORT_PREFIX}/bin/libcurl.dll" )
 
 # Import target "CURL::curl" for configuration "Debug"
 set_property(TARGET CURL::curl APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)

Libraries/gcc7.3_32/lib/cmake/CURL/CURLTargets-debug.cmake

@@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 # Import target "CURL::libcurl" for configuration "Debug"
 set_property(TARGET CURL::libcurl APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
 set_target_properties(CURL::libcurl PROPERTIES
-  IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/libcurl-d.dll.a"
+  IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/libcurl.dll.a"
-  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/libcurl-d.dll"
+  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/libcurl.dll"
   )
 
 list(APPEND _cmake_import_check_targets CURL::libcurl )
-list(APPEND _cmake_import_check_files_for_CURL::libcurl "${_IMPORT_PREFIX}/lib/libcurl-d.dll.a" "${_IMPORT_PREFIX}/bin/libcurl-d.dll" )
+list(APPEND _cmake_import_check_files_for_CURL::libcurl "${_IMPORT_PREFIX}/lib/libcurl.dll.a" "${_IMPORT_PREFIX}/bin/libcurl.dll" )
 
 # Import target "CURL::curl" for configuration "Debug"
 set_property(TARGET CURL::curl APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)