V0.9.7

1、修改了查找qmqtt的路径
2、添加了一些提示

Libraries/LHHTTPAPI/FindLHHTTPAPI.cmake

@@ -60,7 +60,7 @@ endif()
 
 
 #定义变量
-if(LHHTTPAPI_INCLUDE_DIRS AND LHHTTPAPI_SOURCE_DIRS AND LHHTTPAPI_LIBRARY)
+if(LHHTTPAPI_INCLUDE_DIRS AND LHHTTPAPI_SOURCE_DIRS)
     set(LHHTTPAPI_FOUND TRUE)
     set(LHHTTPAPI_VERSION 1.0.9)
 

Libraries/Libraries.cmake

@@ -19,8 +19,15 @@ if(QT_VERSION_MAJOR EQUAL 5)
     message(STATUS "Qt 版本: ${Qt5_VERSION}")
 elseif(QT_VERSION_MAJOR EQUAL 6)
     message(STATUS "Qt 版本: ${Qt6_VERSION}")
+else()
+    message(STATUS "Qt 版本: Unknown")
+    message(STATUS "如果库依赖Qt版本，将include(Libraries.cmake)放在find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)后面")
 endif()
 
+message(STATUS " ")
+message(STATUS "如果添加的是源文件，需要在路径后面添加/*.cpp，如:")
+message(STATUS "\${LHHTTPAPI_INCLUDE_DIRS}/*.cpp)")
+
 
 message(STATUS "==================================================")
 

Libraries/qmqtt/Findqmqtt.cmake

@@ -4,7 +4,7 @@
 message(STATUS "***** Find qmqtt.cmake *****")
 
 # 0. 定义qmqtt版本
-set(qmqtt_VERSION 1.0.3)
+
 
 # 1. 指定头文件路径
 find_path(qmqtt_INCLUDE_DIR
@@ -15,49 +15,50 @@ find_path(qmqtt_INCLUDE_DIR
 
 
 #区分Qt版本
-if(Qt5Core_FOUND)
-    # message(STATUS "Qt Version : ${Qt5Core_VERSION}")
+if(QT_VERSION_MAJOR EQUAL 5)
+    # 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)
         set(QtVersion 5.15)
     endif()
-elseif(Qt6Core_FOUND)
+elseif(QT_VERSION_MAJOR EQUAL 6)
     message(STATUS "Qt Version : ${Qt6Core_VERSION}")
     message(STATUS "qmqtt not support Qt6")
 endif()
 
+
 # 2. 直接指定库文件，区分gcc，msvc，debug和release
+unset(qmqtt_LIBRARY CACHE)
 if(CMAKE_SYSTEM_NAME MATCHES "Windows")
-
     if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
         if(QtVersion STREQUAL "5.12")
             if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-                set(qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/gcc/5.12.12/Qt5Qmqttd.dll)
+                list(APPEND qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/gcc/5.12.12/Qt5Qmqttd.dll)
             else()
-                set(qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/gcc/5.12.12/Qt5Qmqtt.dll)
+                list(APPEND qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/gcc/5.12.12/Qt5Qmqtt.dll)
             endif()
         elseif(QtVersion STREQUAL "5.15")
             if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-                set(qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/gcc/5.15.2/debug/Qt5Qmqtt.dll)
+                list(APPEND qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/gcc/5.15.2/debug/Qt5Qmqtt.dll)
             else()
-                set(qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/gcc/5.15.2/release/Qt5Qmqtt.dll)
+                list(APPEND qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/gcc/5.15.2/release/Qt5Qmqtt.dll)
             endif()
         endif()
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "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)
+                list(APPEND qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/msvc/5.12.12/Qt5Qmqttd.lib)
             else()
-                set(qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/msvc/5.12.12/Qt5Qmqtt.lib)
+                list(APPEND qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/msvc/5.12.12/Qt5Qmqtt.lib)
             endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
             
         elseif(QtVersion STREQUAL "5.15")
             if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-                set(qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/msvc/5.15.2/Qt5Qmqttd.lib)
+                list(APPEND qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/msvc/5.15.2/Qt5Qmqttd.lib)
             else()
-                set(qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/msvc/5.15.2/Qt5Qmqtt.lib)
+                list(APPEND qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/msvc/5.15.2/Qt5Qmqtt.lib)
             endif()
         endif()
     endif()
@@ -66,22 +67,26 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
     # 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)
+            list(APPEND qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/linux_gcc8.3/5.12.12/debug/libQt5Qmqtt.so)
         else()
-            set(qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/linux_gcc8.3/5.12.12/release/libQt5Qmqtt.so)
+            list(APPEND qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/linux_gcc8.3/5.12.12/release/libQt5Qmqtt.so)
         endif()
     elseif(QtVersion STREQUAL "5.15")
         if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-            set(qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/linux_gcc8.3/5.15.14/debug/libQt5Qmqtt.so)
+            list(APPEND qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/linux_gcc8.3/5.15.14/debug/libQt5Qmqtt.so)
         else()
-            set(qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/linux_gcc8.3/5.15.14/debug/libQt5Qmqtt.so)
+            list(APPEND qmqtt_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/linux_gcc8.3/5.15.14/debug/libQt5Qmqtt.so)
         endif()
     endif()
 endif()
 
+
+# message("Include: " ${qmqtt_INCLUDE_DIR})
+# message("Library: " ${qmqtt_LIBRARY})
 # 3. 设置查找到了变量
 if(qmqtt_INCLUDE_DIR AND qmqtt_LIBRARY)
     set(qmqtt_FOUND TRUE)
+    set(qmqtt_VERSION 1.0.3)
 
     # message(STATUS "qmqtt Version : ${qmqtt_VERSION}")
     message(STATUS "include : qmqtt_INCLUDE_DIR")