Browse Source

V0.2.1
1、重新编译了spdlog库和curl库,带有软链接,不然编译会报错

Apple 6 tháng trước cách đây
mục cha
commit
efbfc97441

+ 2 - 2
Libraries/LHHTTPAPI/FindLHHTTPAPI.cmake

@@ -68,9 +68,9 @@ else()
     set(LHHTTPAPI_FOUND FALSE)
 endif()
 
-message(STATUS "LHHTTPAPI found: LHHTTPAPI")
+# message(STATUS "LHHTTPAPI found: LHHTTPAPI")
 message(STATUS "LHHTTPAPI include: LHHTTPAPI_INCLUDE_DIRS")
 message(STATUS "LHHTTPAPI source: LHHTTPAPI_SOURCE_DIRS")
-message(STATUS "LHHTTPAPI library: LHHTTPAPI_LIBRARY")
+# message(STATUS "LHHTTPAPI library: LHHTTPAPI_LIBRARY")
 
 message(STATUS "---------------------------------------------")

+ 4 - 2
Libraries/LHHTTPAPI/src/lhhttpapi.cpp

@@ -52,7 +52,7 @@ lhhttpapi::lhhttpapi(QObject *parent)
     fnDBDoInterface(nullptr),
     m_tUpToken(nullptr)
 {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN)
     QString exePath = QCoreApplication::applicationDirPath();
 
 #ifdef QT_DEBUG
@@ -63,9 +63,11 @@ lhhttpapi::lhhttpapi(QObject *parent)
     exePath += "/LHSqlWebInterface.dll";
     Load(exePath.toLatin1());
 #endif // debug
-#elif defined Q_OS_LINUX
+
+#elif defined (Q_OS_LINUX)
     Load(QString("%1/%2").arg(QCoreApplication::applicationDirPath(), "LHSqlWebInterface.so"));
 #endif // win
+
     m_tUpToken = new QTimer(this);
     m_tUpToken->setInterval(25 * 60 * 1000);
     m_tUpToken->start();

+ 10 - 8
Libraries/LHQLog/FindLHQLog.cmake

@@ -73,16 +73,18 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
             )
         endif()
     endif()
-#Linux
+#Linux,Linux直接指定库的名称,使用模糊搜索可能会把后缀版本号搜出来
 elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-        find_library(LIBRARY_DIR 
-            NAMES LHQLog
-            PATHS ${CMAKE_CURRENT_LIST_DIR}/lib/uos_x64/release
-            NO_DEFAULT_PATH
-        )
+        # find_library(LIBRARY_DIR 
+        #     NAMES LHQLog
+        #     PATHS ${CMAKE_CURRENT_LIST_DIR}/lib/uos_x64/release
+        #     NO_DEFAULT_PATH
+        # )
+    unset(LHQLog_LIBRARY CACHE)
+    list (APPEND LHQLog_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/uos_x64/release/libLHQLog.so)
 endif()
 
-list(APPEND LHQLog_LIBRARY ${LIBRARY_DIR})
+# list(APPEND LHQLog_LIBRARY ${LIBRARY_DIR})
 
 # message(STATUS "LHQLog library: ${LHQLog_LIBRARY}")
 
@@ -105,6 +107,6 @@ endif()
 
 message(STATUS "LHQLog include: LHQLog_INCLUDE_DIRS")
 message(STATUS "LHQLog source: LHQLog_SOURCE_DIRS")
-message(STATUS "LHQLog library: LHQLog_LIBRARY")
+# message(STATUS "LHQLog library: LHQLog_LIBRARY")
 
 message("----------------------------------------------")

+ 1 - 0
Libraries/Libraries.cmake

@@ -86,6 +86,7 @@ find_package(CURL REQUIRED)
 find_package(qmqtt REQUIRED)
 find_package(SM REQUIRED)
 
+#LHLog和LHHTTP使用动态加载的方式调用,在工程中不需要连接库,只需要包含头文件即可
 find_package(LHQLog REQUIRED)
 find_package(LHHTTPAPI REQUIRED)
 # find_package(CURL REQUIRED)

+ 4 - 4
Libraries/linux_gcc8.3/bin/curl-config

@@ -23,7 +23,7 @@
 #
 ###########################################################################
 
-prefix="/home/Apple/Libs/Standard_Library/Libraries/gcc8.3_linux"
+prefix="/home/Apple/Libs/Standard_Library/Libraries/linux_gcc8.3"
 exec_prefix=${prefix}
 includedir=${prefix}/include
 cppflag_curl_staticlib=
@@ -157,8 +157,8 @@ while test $# -gt 0; do
         ;;
 
     --libs)
-        if test "X/home/Apple/Libs/Standard_Library/Libraries/gcc8.3_linux/lib" != "X/usr/lib" -a "X/home/Apple/Libs/Standard_Library/Libraries/gcc8.3_linux/lib" != "X/usr/lib64"; then
-           CURLLIBDIR="-L/home/Apple/Libs/Standard_Library/Libraries/gcc8.3_linux/lib "
+        if test "X/home/Apple/Libs/Standard_Library/Libraries/linux_gcc8.3/lib" != "X/usr/lib" -a "X/home/Apple/Libs/Standard_Library/Libraries/linux_gcc8.3/lib" != "X/usr/lib64"; then
+           CURLLIBDIR="-L/home/Apple/Libs/Standard_Library/Libraries/linux_gcc8.3/lib "
         else
            CURLLIBDIR=""
         fi
@@ -174,7 +174,7 @@ while test $# -gt 0; do
 
     --static-libs)
         if test "Xno" != "Xno" ; then
-          echo "/home/Apple/Libs/Standard_Library/Libraries/gcc8.3_linux/lib/libcurl.a"   -lgcc -lgcc_s -lc -lgcc -lgcc_s -lidn2 -lpthread /usr/lib/x86_64-linux-gnu/libssl.so /usr/lib/x86_64-linux-gnu/libcrypto.so /usr/lib/x86_64-linux-gnu/libz.so
+          echo "/home/Apple/Libs/Standard_Library/Libraries/linux_gcc8.3/lib/libcurl.a"   -lgcc -lgcc_s -lc -lgcc -lgcc_s -lidn2 -lpthread /usr/lib/x86_64-linux-gnu/libssl.so /usr/lib/x86_64-linux-gnu/libcrypto.so /usr/lib/x86_64-linux-gnu/libz.so
         else
           echo "curl was built with static libraries disabled" >&2
           exit 1

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"
 set_property(TARGET CURL::libcurl APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
 set_target_properties(CURL::libcurl PROPERTIES
-  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/libcurl.so"
-  IMPORTED_SONAME_DEBUG "libcurl.so"
+  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/libcurl-d.so.4.8.0"
+  IMPORTED_SONAME_DEBUG "libcurl-d.so.4"
   )
 
 list(APPEND _IMPORT_CHECK_TARGETS CURL::libcurl )
-list(APPEND _IMPORT_CHECK_FILES_FOR_CURL::libcurl "${_IMPORT_PREFIX}/lib/libcurl.so" )
+list(APPEND _IMPORT_CHECK_FILES_FOR_CURL::libcurl "${_IMPORT_PREFIX}/lib/libcurl-d.so.4.8.0" )
 
 # Import target "CURL::curl" for configuration "Debug"
 set_property(TARGET CURL::curl APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)

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

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

BIN
Libraries/linux_gcc8.3/lib/libcurl-d.so


+ 1 - 0
Libraries/linux_gcc8.3/lib/libcurl-d.so

@@ -0,0 +1 @@
+libcurl-d.so.4

+ 1 - 0
Libraries/linux_gcc8.3/lib/libcurl-d.so.4

@@ -0,0 +1 @@
+libcurl-d.so.4.8.0

BIN
Libraries/linux_gcc8.3/lib/libcurl-d.so.4.8.0


BIN
Libraries/linux_gcc8.3/lib/libcurl.so


+ 1 - 0
Libraries/linux_gcc8.3/lib/libcurl.so

@@ -0,0 +1 @@
+libcurl.so.4

+ 1 - 0
Libraries/linux_gcc8.3/lib/libcurl.so.4

@@ -0,0 +1 @@
+libcurl.so.4.8.0

BIN
Libraries/linux_gcc8.3/lib/libcurl.so.4.8.0


+ 2 - 2
Libraries/linux_gcc8.3/lib/pkgconfig/libcurl.pc

@@ -25,9 +25,9 @@
 # This should most probably benefit from getting a "Requires:" field added
 # dynamically by configure.
 #
-prefix=/home/Apple/Libs/Standard_Library/Libraries/gcc8.3_linux
+prefix=/home/Apple/Libs/Standard_Library/Libraries/linux_gcc8.3
 exec_prefix=${prefix}
-libdir=/home/Apple/Libs/Standard_Library/Libraries/gcc8.3_linux/lib
+libdir=/home/Apple/Libs/Standard_Library/Libraries/linux_gcc8.3/lib
 includedir=${prefix}/include
 supported_protocols="DICT FILE FTP FTPS GOPHER GOPHERS HTTP HTTPS IMAP IMAPS MQTT POP3 POP3S RTSP SMB SMBS SMTP SMTPS TELNET TFTP"
 supported_features="SSL IPv6 unixsockets libz AsynchDNS IDN Largefile alt-svc HSTS NTLM HTTPS-proxy threadsafe"