Browse Source

V0.2.5
1、修改了LHLog日志初始化文件
2、修改了CURL加载库方式,都使用Release模式的库

Apple 6 months ago
parent
commit
c160cb6cbf

BIN
Libraries/linux_gcc8.3/lib.7z


BIN
Libraries/linux_gcc8.3/lib.zip


+ 3 - 3
Libraries/linux_gcc8.3/lib/cmake/CURL/CURLTargets-debug.cmake

@@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 # Import target "CURL::libcurl" for configuration "Debug"
 # Import target "CURL::libcurl" for configuration "Debug"
 set_property(TARGET CURL::libcurl APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
 set_property(TARGET CURL::libcurl APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
 set_target_properties(CURL::libcurl PROPERTIES
 set_target_properties(CURL::libcurl PROPERTIES
-  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/libcurl-d.so.4.8.0"
-  IMPORTED_SONAME_DEBUG "libcurl-d.so.4"
+  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/libcurl.so.4.8.0"
+  IMPORTED_SONAME_DEBUG "libcurl.so.4"
   )
   )
 
 
 list(APPEND _IMPORT_CHECK_TARGETS CURL::libcurl )
 list(APPEND _IMPORT_CHECK_TARGETS CURL::libcurl )
-list(APPEND _IMPORT_CHECK_FILES_FOR_CURL::libcurl "${_IMPORT_PREFIX}/lib/libcurl-d.so.4.8.0" )
+list(APPEND _IMPORT_CHECK_FILES_FOR_CURL::libcurl "${_IMPORT_PREFIX}/lib/libcurl.so.4.8.0" )
 
 
 # Import target "CURL::curl" for configuration "Debug"
 # Import target "CURL::curl" for configuration "Debug"
 set_property(TARGET CURL::curl APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
 set_property(TARGET CURL::curl APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)

+ 8 - 4
common/LHLog/LHLogInit.cpp

@@ -20,10 +20,14 @@ void initLog(QString ModuleName, CLHQLogApi& lhQLog)
         /* 创建一个文件sink,每天一个,00:00创建新的 */
         /* 创建一个文件sink,每天一个,00:00创建新的 */
         // auto sink_file = std::make_shared<spdlog::sinks::daily_file_sink_mt>("FlowChartLog/log.txt",0,0);
         // auto sink_file = std::make_shared<spdlog::sinks::daily_file_sink_mt>("FlowChartLog/log.txt",0,0);
         /* 自定义的sink */
         /* 自定义的sink */
-    #if C_DEBUG
-        QString libName = QCoreApplication::applicationDirPath() + "/LHQLogd.dll";
-    #elif C_RELEASE
-        QString libName = QCoreApplication::applicationDirPath() + "/LHQLog.dll";
+    #if defined(Q_OS_WIN32)
+        #if C_DEBUG
+            QString libName = QApplication::applicationDirPath() + "/LHQLogd.dll";
+        #elif C_RELEASE
+            QString libName = QApplication::applicationDirPath() + "/LHQLog.dll";
+        #endif
+    #elif defined(Q_OS_LINUX)
+        QString libName = QApplication::applicationDirPath() + "/libLHQLog.so";
     #endif
     #endif
         auto sink_custom = std::make_shared<spdlog::sinks::LHLog_file_sink_mt>(&lhQLog, libName, ModuleName);
         auto sink_custom = std::make_shared<spdlog::sinks::LHLog_file_sink_mt>(&lhQLog, libName, ModuleName);
         /* 给默认记录器用的sink */
         /* 给默认记录器用的sink */

+ 1 - 1
common/Thread/threadcontroller.cpp

@@ -1,4 +1,4 @@
-#include "threadcontroller.h"
+#include "threadcontroller.h"
 #include <QDebug>
 #include <QDebug>
 
 
 #if defined(Q_OS_WIN32)
 #if defined(Q_OS_WIN32)

+ 1 - 1
common/Thread/threadcontroller.h

@@ -1,4 +1,4 @@
-/*----------------------------------------------------------------
+/*----------------------------------------------------------------
  *      概述
  *      概述
  * 1, 使用movetothread的方式执行工作线程(因为这种方式是官方推荐)
  * 1, 使用movetothread的方式执行工作线程(因为这种方式是官方推荐)
  * 2, 这种方式可以同时实现线程主动运行并且可以接收到Qt的事件循环
  * 2, 这种方式可以同时实现线程主动运行并且可以接收到Qt的事件循环