V1.3.1

1、修改了一些库的链接方式

Server/CMakeLists.txt

@@ -36,11 +36,11 @@ file(GLOB LOCAL_SRC
 
     ${CMAKE_SOURCE_DIR}/External/module/Logs/*.cpp
     ${CMAKE_SOURCE_DIR}/External/module/ThreadPool/*.cpp
-    ${CMAKE_SOURCE_DIR}/External/module/mqtt/*.cpp
+    # ${CMAKE_SOURCE_DIR}/External/module/mqtt/*.cpp
     
     
     ${LHHTTPAPI_SOURCE_DIRS}
-    ${LHQLog_SOURCE_DIRS}/*.cpp
+    ${LHQLog_SOURCE_DIRS}
 )
 
 
@@ -86,8 +86,8 @@ target_include_directories(${this_exe} PRIVATE
     ${CMAKE_SOURCE_DIR}/External/module
     ${CMAKE_SOURCE_DIR}/External/module/ThreadPool
     ${CMAKE_SOURCE_DIR}/External/module/RingQueue
-    ${CMAKE_SOURCE_DIR}/External/module/mqtt
-    ${CMAKE_SOURCE_DIR}/External/module/mqtt_cpp
+    # ${CMAKE_SOURCE_DIR}/External/module/mqtt
+    # ${CMAKE_SOURCE_DIR}/External/module/mqtt_cpp
     ${CMAKE_SOURCE_DIR}/External/module/OneThread
 
     ${CMAKE_SOURCE_DIR}/ThreeLib/signalstats/include
@@ -95,7 +95,6 @@ target_include_directories(${this_exe} PRIVATE
 
     ${LHQLog_INCLUDE_DIRS}
     ${LHHTTPAPI_INCLUDE_DIRS}
-    ${qmqtt_INCLUDE_DIR}
 )
 
 
@@ -110,8 +109,8 @@ target_link_libraries(${this_exe} PRIVATE
 )
 
 target_link_libraries(${this_exe} PRIVATE 
-    ${qmqtt_LIBRARY}
     External::spdlog
+    External::qmqtt
     libsignalstats.so
     asound
 )

SettingLibrary/CMakeLists.txt

@@ -8,13 +8,11 @@ set(libName ACAServerSetting)
 #包含源文件
 file(GLOB LOCAL_SRC
     ${CMAKE_SOURCE_DIR}/External/common/Shadow/*.cpp
-    # ${CMAKE_SOURCE_DIR}/External/common/WebAPI/*.cpp
     ${CMAKE_SOURCE_DIR}/External/common/Thread/*.cpp
     ${CMAKE_SOURCE_DIR}/External/common/combox/*.cpp
     ${CMAKE_SOURCE_DIR}/External/common/TipWidget/*.cpp
     ${CMAKE_SOURCE_DIR}/External/common/TipWidget/*.qrc
     ${CMAKE_SOURCE_DIR}/External/common/commonFunc/*.cpp
-    ${CMAKE_SOURCE_DIR}/External/module/mqtt/*.cpp
 
     ${CMAKE_SOURCE_DIR}/common/DataManager/*.cpp
     ${CMAKE_SOURCE_DIR}/common/Network/*.cpp
@@ -49,9 +47,8 @@ file(GLOB LOCAL_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/DialogBase/*.cpp
 
     
-    ${LHQLog_SOURCE_DIRS}/*.cpp
+    ${LHQLog_SOURCE_DIRS}
     ${LHHTTPAPI_SOURCE_DIRS}
-    ${SM_SOURCE_DIR}/*.cpp
 )
 
 
@@ -79,13 +76,11 @@ target_include_directories(${libName} PRIVATE
 
     ${CMAKE_SOURCE_DIR}/External/common
     ${CMAKE_SOURCE_DIR}/External/common/Shadow
-    # ${CMAKE_SOURCE_DIR}/External/common/WebAPI
     ${CMAKE_SOURCE_DIR}/External/common/Thread
     ${CMAKE_SOURCE_DIR}/External/common/combox
     ${CMAKE_SOURCE_DIR}/External/common/TipWidget
     ${CMAKE_SOURCE_DIR}/External/common/commonFunc
     ${CMAKE_SOURCE_DIR}/External/module
-    ${CMAKE_SOURCE_DIR}/External/module/mqtt
     ${CMAKE_SOURCE_DIR}/External/module/nlohmann
 
     ${CMAKE_SOURCE_DIR}/common/DataManager
@@ -118,8 +113,6 @@ target_include_directories(${libName} PRIVATE
 
     ${LHQLog_INCLUDE_DIRS}
     ${LHHTTPAPI_INCLUDE_DIRS}
-    ${qmqtt_INCLUDE_DIR}
-    ${SM_INCLUDE_DIR}
 )
 
 
@@ -131,9 +124,8 @@ target_link_libraries(${libName} PRIVATE
 )
 
 target_link_libraries(${libName} PRIVATE
-    # ${spdlog_STATIC_LIBRARY}
-    ${qmqtt_LIBRARY}
-    ${SM_LIB_LIBRARY}
     External::spdlog
+    External::qmqtt
+    External::sm
 )