Răsfoiți Sursa

V0.6.9
1、更新了Windows下的spdlog库
2、修改了.cmake文件,将Windows没有的库添加到条件查找下面

Apple 4 luni în urmă
părinte
comite
23baffd35b

+ 5 - 4
Libraries/Libraries.cmake

@@ -97,10 +97,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/FreeType)
 #搜索所有的库
 # find_package(fmt REQUIRED)
 find_package(spdlog REQUIRED)
-#链接OpenSSL-1.1.1库
-find_package(OpenSSL-1.1.1 REQUIRED)
-#链接ssh2库
-find_package(ssh2 REQUIRED)
+
 #链接curl库,使用的是CURL::libcurl
 find_package(CURL REQUIRED)
 #在Windows中可能有冲突的地方,直接指明路径
@@ -125,6 +122,10 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
     endif()
 #Linux只有64位,动态库和静态库都可以选择
 elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    #链接OpenSSL-1.1.1库
+    find_package(OpenSSL-1.1.1 REQUIRED)
+    #链接ssh2库
+    find_package(ssh2 REQUIRED)
     #hiredis库
     find_package(hiredis REQUIRED)
 endif()

+ 2 - 2
Libraries/spdlog/Findspdlog.cmake

@@ -46,9 +46,9 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
         endif()
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
         if(CMAKE_BUILD_TYPE MATCHES "Debug")
-            list(APPEND spdlog_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/windows/msvc2022/libspdlog.lib)
+            list(APPEND spdlog_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/windows/msvc2022/spdlogd.lib)
         else()
-            list(APPEND spdlog_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/windows/msvc2022/libspdlog.lib)
+            list(APPEND spdlog_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/windows/msvc2022/spdlog.lib)
         endif()
     endif()
 #添加Linux版本

BIN
Libraries/spdlog/windows/gcc7.3/libspdlog.dll


BIN
Libraries/spdlog/windows/gcc7.3/libspdlog.dll.a


BIN
Libraries/spdlog/windows/gcc7.3/libspdlogd.dll


BIN
Libraries/spdlog/windows/gcc7.3/libspdlogd.dll.a


BIN
Libraries/spdlog/windows/mingw81/libspdlog.dll


BIN
Libraries/spdlog/windows/mingw81/libspdlogd.dll