Ver Fonte

V2.2
1、新增了mqttWindows 32位版本的库

Apple há 3 semanas atrás
pai
commit
be8a093222

+ 14 - 3
TransmitterSwitch/common/qmqtt/Findqmqtt.cmake

@@ -59,10 +59,21 @@ 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")
-                list(APPEND QMQTT_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/gcc/5.12.12/Qt5Qmqttd.dll)
+        #区分64位和32位
+            if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+                # message(STATUS "GCC 64bit")
+                if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+                    list(APPEND QMQTT_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/gcc/5.12.12/Qt5Qmqttd.dll)
+                else()
+                    list(APPEND QMQTT_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/gcc/5.12.12/Qt5Qmqtt.dll)
+                endif()
             else()
-                list(APPEND QMQTT_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/gcc/5.12.12/Qt5Qmqtt.dll)
+                # message(STATUS "GCC 32bit")
+                if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+                    list(APPEND QMQTT_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/gcc73_32/Qt5Qmqttd.dll)
+                else()
+                    list(APPEND QMQTT_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/gcc73_32/Qt5Qmqtt.dll)
+                endif()
             endif()
         elseif(QtVersion STREQUAL "5.15")
             if(CMAKE_BUILD_TYPE STREQUAL "Debug")

BIN
TransmitterSwitch/common/qmqtt/lib/gcc73_32/Qt5Qmqtt.dll


BIN
TransmitterSwitch/common/qmqtt/lib/gcc73_32/Qt5Qmqttd.dll


BIN
TransmitterSwitch/common/qmqtt/lib/gcc73_32/libQt5Qmqtt.a


BIN
TransmitterSwitch/common/qmqtt/lib/gcc73_32/libQt5Qmqttd.a