Przeglądaj źródła

V0.3.2
1、修改了一些库的.cmake文件,提示更规范了

Apple 5 miesięcy temu
rodzic
commit
5f6eefcde3

+ 1 - 1
Libraries/LHHTTPAPI/FindLHHTTPAPI.cmake

@@ -73,4 +73,4 @@ message(STATUS "LHHTTPAPI include: LHHTTPAPI_INCLUDE_DIRS")
 message(STATUS "LHHTTPAPI source: LHHTTPAPI_SOURCE_DIRS")
 # message(STATUS "LHHTTPAPI library: LHHTTPAPI_LIBRARY")
 
-message(STATUS "---------------------------------------------")
+message(STATUS "--------------------------------------------------")

+ 1 - 1
Libraries/LHQLog/FindLHQLog.cmake

@@ -109,4 +109,4 @@ message(STATUS "LHQLog include: LHQLog_INCLUDE_DIRS")
 message(STATUS "LHQLog source: LHQLog_SOURCE_DIRS")
 # message(STATUS "LHQLog library: LHQLog_LIBRARY")
 
-message("----------------------------------------------")
+message(STATUS "--------------------------------------------------")

+ 13 - 4
Libraries/Libraries.cmake

@@ -3,6 +3,7 @@
 
 #在外面使用时,只需要包含这个文件即可
 
+message(STATUS "==================================================")
 message(STATUS "系统: ${CMAKE_SYSTEM_NAME}")
 message(STATUS "编译器: ${CMAKE_CXX_COMPILER_ID} 版本: ${CMAKE_CXX_COMPILER_VERSION}")
 message(STATUS "编译类型: ${CMAKE_BUILD_TYPE}")
@@ -12,6 +13,15 @@ elseif(CMAKE_SIZEOF_VOID_P MATCHES 4)
     message(STATUS "系统位数: 32-bit")
 endif()
 
+#区分是Qt5还是Qt6
+if(Qt5_FOUND)
+    message(STATUS "Qt 版本: ${Qt5_VERSION}")
+elseif(Qt6_FOUND)
+    message(STATUS "Qt 版本: ${Qt6_VERSION}")
+endif()
+
+
+message(STATUS "==================================================")
 
 #=========================================================
 #*********************  搜索所有的库 *********************
@@ -53,7 +63,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
     endif()
 #Linux只有64位,动态库和静态库都可以选择
 elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    message(STATUS "Using ${CMAKE_SYSTEM_NAME} System")
+    # message(STATUS "Using ${CMAKE_SYSTEM_NAME} System")
     #添加Curl库
     # set(CURL_DIR ${CMAKE_CURRENT_LIST_DIR}/linux_gcc8.3/lib/cmake/CURL)
     set(hiredis_DIR ${CMAKE_CURRENT_LIST_DIR}/linux_gcc8.3/lib/cmake/hiredis)
@@ -75,7 +85,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/qmqtt)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/LHQLog)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/LHHTTPAPI)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/OpenSSL-1.1.1)
-#添加CURL的路径,目前Linux shying单独编译的,使用上面的OpenSSL库
+#添加CURL的路径,目前Linux 使用单独编译的,使用上面的OpenSSL库
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/CURL)
 
 #搜索所有的库
@@ -96,13 +106,12 @@ find_package(SM REQUIRED)
 #LHLog和LHHTTP使用动态加载的方式调用,在工程中不需要连接库,只需要包含头文件即可
 find_package(LHQLog REQUIRED)
 find_package(LHHTTPAPI REQUIRED)
-# find_package(CURL REQUIRED)
 
 #=========================================================
 #*******************  打印搜索到的信息 *******************
 #=========================================================
 #打印搜索到的信息
-message(STATUS "--------------------------------------------------")
+message(STATUS "==================================================")
 message(STATUS "fmt Found: ${fmt_FOUND}")
 message(STATUS "fmt Version: ${fmt_VERSION}")
 message(STATUS "--------------------------------------------------")

+ 4 - 4
Libraries/qmqtt/Findqmqtt.cmake

@@ -16,7 +16,7 @@ find_path(qmqtt_INCLUDE_DIR
 
 #区分Qt版本
 if(Qt5Core_FOUND)
-    message(STATUS "Qt Version : ${Qt5Core_VERSION}")
+    # message(STATUS "Qt Version : ${Qt5Core_VERSION}")
     if(${Qt5Core_VERSION} VERSION_LESS 5.15.0 AND ${Qt5Core_VERSION} VERSION_GREATER 5.12.0)
         set(QtVersion 5.12)
     elseif(${Qt5Core_VERSION} VERSION_GREATER_EQUAL 5.15.0)
@@ -45,7 +45,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
             endif()
         endif()
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-        message(STATUS "MSVC")
+        # message(STATUS "MSVC")
         if(QtVersion STREQUAL "5.12")
             if(CMAKE_BUILD_TYPE STREQUAL "Debug")
                 set(qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/msvc/5.12.12/Qt5Qmqttd.lib)
@@ -63,7 +63,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
     endif()
 #添加Linux库
 elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    message(STATUS "Using ${CMAKE_SYSTEM_NAME} System")
+    # message(STATUS "Using ${CMAKE_SYSTEM_NAME} System")
     if(QtVersion STREQUAL "5.12")
         if(CMAKE_BUILD_TYPE STREQUAL "Debug")
             set(qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/linux_gcc8.3/5.12.12/debug/libQt5Qmqtt.so)
@@ -86,7 +86,7 @@ else()
     set(qmqtt_FOUND FALSE)
 endif()
 
-message(STATUS "qmqtt Version : ${qmqtt_VERSION}")
+# message(STATUS "qmqtt Version : ${qmqtt_VERSION}")
 message(STATUS "include : qmqtt_INCLUDE_DIR")
 message(STATUS "Library : qmqtt_LIBRARY")