V0.6

1、Libraries全面搞成了自己做的.cmake
2、Curl可以使用sftp下载了
3、CurlFtp支持使用sftp下载了，但是速度不快

Libraries/CURL/bin/curl-config

@@ -23,7 +23,7 @@
 #
 ###########################################################################
 
-prefix="/home/Apple/Lib/SRC/CURL"
+prefix="/home/Apple/Design/Library_Project/Library_Project/External/Libraries/CURL"
 exec_prefix=${prefix}
 includedir=${prefix}/include
 cppflag_curl_staticlib=
@@ -92,7 +92,7 @@ while test $# -gt 0; do
         ;;
 
     --protocols)
-        for protocol in DICT FILE FTP FTPS GOPHER GOPHERS HTTP HTTPS IMAP IMAPS MQTT POP3 POP3S RTSP SMB SMBS SMTP SMTPS TELNET TFTP; do
+        for protocol in DICT FILE FTP FTPS GOPHER GOPHERS HTTP HTTPS IMAP IMAPS MQTT POP3 POP3S RTSP SCP SFTP SMB SMBS SMTP SMTPS TELNET TFTP; do
             echo "$protocol"
         done
         ;;
@@ -163,7 +163,7 @@ while test $# -gt 0; do
            CURLLIBDIR=""
         fi
         if test "Xyes" = "Xno"; then
-          echo ${CURLLIBDIR}-lcurl -lidn2 -lssl -lcrypto -lbrotlidec -lz -ldl -lpthread -pthread
+          echo ${CURLLIBDIR}-lcurl -lidn2 -lssh2 -L/home/Apple/Design/Library_Project/Library_Project/External/Libraries/libssh2/lib -lssh2 -lssl -lcrypto -lssl -lcrypto -lbrotlidec -lz -pthread
         else
           echo ${CURLLIBDIR}-lcurl
         fi
@@ -174,7 +174,7 @@ while test $# -gt 0; do
 
     --static-libs)
         if test "Xyes" != "Xno" ; then
-          echo "${exec_prefix}/lib/libcurl.a" -L/home/Apple/Lib/SRC/zlib/lib -L/home/Apple/Lib/SRC/openssl/lib -lidn2 -lssl -lcrypto -lbrotlidec -lz -ldl -lpthread -pthread
+          echo "${exec_prefix}/lib/libcurl.a" -L/home/Apple/Design/Library_Project/Library_Project/External/Libraries/OpenSSL-1.1.1/lib -L/home/Apple/Design/Library_Project/Library_Project/External/Libraries/libssh2/lib -lidn2 -lssh2 -L/home/Apple/Design/Library_Project/Library_Project/External/Libraries/libssh2/lib -lssh2 -lssl -lcrypto -lssl -lcrypto -lbrotlidec -lz -pthread
         else
           echo "curl was built with static libraries disabled" >&2
           exit 1
@@ -182,7 +182,7 @@ while test $# -gt 0; do
         ;;
 
     --configure)
-        echo " '--with-pic' '--prefix=/home/Apple/Lib/SRC/CURL' 'CC=/usr/bin/gcc' '--with-openssl=/home/Apple/Lib/SRC/openssl' '--with-zlib=/home/Apple/Lib/SRC/zlib'"
+        echo " '--with-pic' '--prefix=/home/Apple/Design/Library_Project/Library_Project/External/Libraries/CURL' 'CC=/usr/bin/gcc' '--with-openssl' '--with-libssh2'"
         ;;
 
     *)

Libraries/CURL/linux/gcc8.3/libcurl.la

@@ -17,7 +17,7 @@ old_library='libcurl.a'
 inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/Apple/Lib/SRC/zlib/lib -L/home/Apple/Lib/SRC/openssl/lib -lidn2 -lssl -lcrypto -lbrotlidec -lz -ldl -lpthread'
+dependency_libs=' -R/data/home/Apple/Design/Library_Project/Library_Project/External/Libraries/OpenSSL-1.1.1/lib -R/home/Apple/Design/Library_Project/Library_Project/External/Libraries/zlib/lib -L/home/Apple/Design/Library_Project/Library_Project/External/Libraries/OpenSSL-1.1.1/lib -L/home/Apple/Design/Library_Project/Library_Project/External/Libraries/libssh2/lib -lidn2 /home/Apple/Lib/SRC/libssh2-1.11.1/lib/libssh2.la -L/data/home/Apple/Design/Library_Project/Library_Project/External/Libraries/OpenSSL-1.1.1/lib -L/home/Apple/Design/Library_Project/Library_Project/External/Libraries/zlib/lib -lssl -lcrypto -lbrotlidec -lz'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/Apple/Lib/SRC/CURL/lib'
+libdir='/home/Apple/Design/Library_Project/Library_Project/External/Libraries/CURL/lib'

Libraries/CURL/linux/pkgconfig/libcurl.pc

@@ -25,11 +25,11 @@
 # This should most probably benefit from getting a "Requires:" field added
 # dynamically by configure.
 #
-prefix=/home/Apple/Lib/SRC/CURL
+prefix=/home/Apple/Design/Library_Project/Library_Project/External/Libraries/CURL
 exec_prefix=${prefix}
 libdir=${exec_prefix}/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_protocols="DICT FILE FTP FTPS GOPHER GOPHERS HTTP HTTPS IMAP IMAPS MQTT POP3 POP3S RTSP SCP SFTP SMB SMBS SMTP SMTPS TELNET TFTP"
 supported_features="AsynchDNS HSTS HTTPS-proxy IDN IPv6 Largefile NTLM NTLM_WB SSL TLS-SRP UnixSockets alt-svc brotli libz threadsafe"
 
 Name: libcurl
@@ -37,5 +37,5 @@ URL: https://curl.se/
 Description: Library to transfer files with ftp, http, etc.
 Version: 7.88.1
 Libs: -L${libdir} -lcurl 
-Libs.private: -lidn2 -lssl -lcrypto -lbrotlidec -lz -ldl -lpthread -pthread
+Libs.private: -lidn2 -lssh2 -L/home/Apple/Design/Library_Project/Library_Project/External/Libraries/libssh2/lib -lssh2 -lssl -lcrypto -lssl -lcrypto -lbrotlidec -lz -pthread
 Cflags: -I${includedir} 

Libraries/FreeType/FindFreeType.cmake

@@ -0,0 +1,62 @@
+
+
+#国密加解密库
+
+message(STATUS "***** Find FreeType Library *****")
+
+#寻找头文件
+unset(ssh2_INCLUDE_DIR CACHE)
+unset(INCLUDE_PATH)
+find_path(INCLUDE_PATH
+    NAMES freetype2/freetype/freetype.h
+    PATHS ${CMAKE_CURRENT_LIST_DIR}/include
+    NO_DEFAULT_PATH
+)
+list(APPEND FreeType_INCLUDE_DIR ${INCLUDE_PATH})
+unset(INCLUDE_DIR CACHE)
+find_path(INCLUDE_PATH
+    NAMES freetype2/dlg/dlg.h
+    PATHS ${CMAKE_CURRENT_LIST_DIR}/include
+    NO_DEFAULT_PATH
+)
+list(APPEND FreeType_INCLUDE_DIR ${INCLUDE_PATH})
+
+
+#查找库文件，需要判断操作系统，位数
+if(CMAKE_SYSTEM_NAME MATCHES "Windows")
+
+    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+        if(CMAKE_BUILD_TYPE MATCHES "Debug")
+            list(APPEND FreeType_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/windows/gcc7.3/libfreetyped.dll)
+        else()
+            llist(APPEND FreeType_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/windows/gcc7.3/libfreetype.dll)
+        endif()
+    elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+        if(CMAKE_BUILD_TYPE MATCHES "Debug")
+            list(APPEND FreeType_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/windows/msvc/libfreetyped.lib)
+        else()
+            list(APPEND FreeType_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/windows/msvc/libfreetype.lib)
+        endif()
+    endif()
+#添加Linux版本
+elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    message(WARNING "Linux is not supported yet")
+        # list(APPEND ssh2_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/linux/libssh2.so)
+        # list(APPEND ssh2_STATIC_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/linux/libssh2.a)
+endif()
+
+
+
+#设置查找到后的变量
+if(FreeType_INCLUDE_DIR AND FreeType_LIBRARY) 
+    set(FreeType_FOUND TRUE)
+    set(FreeType_VERSION "2")
+else()
+    set(FreeType_FOUND FALSE)
+endif()
+
+message(STATUS "include : FreeType_INCLUDE_DIR")
+message(STATUS "Library : FreeType_LIBRARY")
+# message(STATUS "Static Library : ssh2_STATIC_LIBRARY")
+
+message(STATUS "---------------------------------")

Libraries/Libraries.cmake

@@ -40,7 +40,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
         #64位的spdlog有两个版本，一个是静态库，一个是动态库
         if(CMAKE_SIZEOF_VOID_P MATCHES 8)
             #添加Curl库
-            set(CURL_DIR ${CMAKE_CURRENT_LIST_DIR}/gcc7.3/lib/cmake/CURL)
+            # set(CURL_DIR ${CMAKE_CURRENT_LIST_DIR}/gcc7.3/lib/cmake/CURL)
             #判断有没有设置静态库标志，64位默认使用动态库
             # if(ENABLE_SPDLOG_STATIC_LIB)
             #     set(fmt_DIR ${CMAKE_CURRENT_LIST_DIR}/gcc7.3_static/lib/cmake/fmt)
@@ -51,7 +51,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
             # endif()
         #32位
         elseif(CMAKE_SIZEOF_VOID_P MATCHES 4)
-            set(CURL_DIR ${CMAKE_CURRENT_LIST_DIR}/gcc7.3_32/lib/cmake/CURL)
+            # set(CURL_DIR ${CMAKE_CURRENT_LIST_DIR}/gcc7.3_32/lib/cmake/CURL)
             #fmt和spdlog的32位只有静态库
             # set(fmt_DIR ${CMAKE_CURRENT_LIST_DIR}/gcc7.3_static_32/lib/cmake/fmt)
             # set(spdlog_DIR ${CMAKE_CURRENT_LIST_DIR}/gcc7.3_static_32/lib/cmake/spdlog)
@@ -65,8 +65,8 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
 elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
     # message(STATUS "Using ${CMAKE_SYSTEM_NAME} System")
     #添加Curl库
-    set(CURL_DIR ${CMAKE_CURRENT_LIST_DIR}/linux_gcc8.3/lib/cmake/CURL)
-    set(hiredis_DIR ${CMAKE_CURRENT_LIST_DIR}/linux_gcc8.3/lib/cmake/hiredis)
+    # set(CURL_DIR ${CMAKE_CURRENT_LIST_DIR}/linux_gcc8.3/lib/cmake/CURL)
+    # set(hiredis_DIR ${CMAKE_CURRENT_LIST_DIR}/linux_gcc8.3/lib/cmake/hiredis)
     # if(ENABLE_SPDLOG_STATIC_LIB)
     #     set(fmt_DIR ${CMAKE_CURRENT_LIST_DIR}/linux_gcc8.3_static/lib/cmake/fmt)
     #     set(spdlog_DIR ${CMAKE_CURRENT_LIST_DIR}/linux_gcc8.3_static/lib/cmake/spdlog)
@@ -74,7 +74,7 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
     #     set(fmt_DIR ${CMAKE_CURRENT_LIST_DIR}/linux_gcc8.3/lib/cmake/fmt)
     #     set(spdlog_DIR ${CMAKE_CURRENT_LIST_DIR}/linux_gcc8.3/lib/cmake/spdlog)
     # endif()
-    set(freetype_DIR ${CMAKE_CURRENT_LIST_DIR}/linux_gcc8.3/lib/cmake/freetype)
+    # set(freetype_DIR ${CMAKE_CURRENT_LIST_DIR}/linux_gcc8.3/lib/cmake/freetype)
 endif()
 
 
@@ -87,14 +87,20 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/qmqtt)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/LHQLog)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/LHHTTPAPI)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/OpenSSL-1.1.1)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/ssh2)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/hiredis)
 #添加CURL的路径，目前Linux 使用单独编译的，使用上面的OpenSSL库
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/CURL)
+#链接FreeType库，目前只支持Windows
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/FreeType)
 
 #搜索所有的库
 # find_package(fmt REQUIRED)
 find_package(spdlog REQUIRED)
 #链接OpenSSL-1.1.1库
 find_package(OpenSSL-1.1.1 REQUIRED)
+#链接ssh2库
+find_package(ssh2 REQUIRED)
 #链接curl库，使用的是CURL::libcurl
 find_package(CURL REQUIRED)
 #在Windows中可能有冲突的地方，直接指明路径
@@ -106,8 +112,12 @@ find_package(SM REQUIRED)
 find_package(LHQLog REQUIRED)
 find_package(LHHTTPAPI REQUIRED)
 
+#FreeType库
+
+
 #有些库缺少某些平台、编译器的库，所以这里也根据平台、编译器进行搜索
 if(CMAKE_SYSTEM_NAME MATCHES "Windows")
+    find_package(FreeType REQUIRED)
     if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
         
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
@@ -133,9 +143,9 @@ message(STATUS "--------------------------------------------------")
 message(STATUS "spdlog FOUND: ${spdlog_FOUND}")
 message(STATUS "spdlog Version: ${spdlog_VERSION}")
 message(STATUS "--------------------------------------------------")
-# message(STATUS "FreeType Found : ${Freetype_FOUND}")
-# message(STATUS "FreeType Version : ${Freetype_VERSION}")
-# message(STATUS "--------------------------------------------------")
+message(STATUS "FreeType Found : ${Freetype_FOUND}")
+message(STATUS "FreeType Version : ${Freetype_VERSION}")
+message(STATUS "--------------------------------------------------")
 message(STATUS "qmqtt Found : ${qmqtt_FOUND}")
 message(STATUS "qmqtt Version : ${qmqtt_VERSION}")
 message(STATUS "--------------------------------------------------")
@@ -151,6 +161,9 @@ message(STATUS "--------------------------------------------------")
 message(STATUS "OpenSSL Found : ${OpenSSL-1.1.1_FOUND}")
 message(STATUS "OpenSSL Version : ${OpenSSL-1.1.1_VERSION}")
 message(STATUS "--------------------------------------------------")
+message(STATUS "ssh2 Found : ${ssh2_FOUND}")
+message(STATUS "ssh2 Version : ${ssh2_VERSION}")
+message(STATUS "--------------------------------------------------")
 message(STATUS "CURL Found : ${CURL_FOUND}")
 message(STATUS "CURL Version : ${CURL_VERSION}")
 message(STATUS "--------------------------------------------------")

Libraries/OpenSSL-1.1.1/FindOpenSSL-1.1.1.cmake

@@ -6,7 +6,7 @@ message(STATUS "***** Find OpenSSL-1.1.1 Library *****")
 
 #寻找头文件
 find_path(OpenSSL-1.1.1_INCLUDE_DIR
-    NAMES openssl/ssl.h
+    NAMES ssl.h
     PATHS ${CMAKE_CURRENT_LIST_DIR}/include
     NO_DEFAULT_PATH
 )
@@ -14,25 +14,18 @@ find_path(OpenSSL-1.1.1_INCLUDE_DIR
 
 #查找库文件，需要判断操作系统，位数
 if(CMAKE_SYSTEM_NAME MATCHES "Windows")
+    message(WARNING "Windows is not supported")
     # if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    #     if(CMAKE_BUILD_TYPE MATCHES "Debug")
-    #         list(APPEND SM_LIB_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/libs/win/x64/with_debug_info/libSM_DLL.lib)
-    #         list(APPEND SM_LIB_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/libs/win/x64/ucrtbased.dll)
-    #         list(APPEND SM_LIB_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/libs/win/x64/vcruntime140d.dll)
-    #     else()
-    #         list(APPEND SM_LIB_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/libs/win/x64/libSM_DLL.lib)
-    #         list(APPEND SM_LIB_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/libs/win/x64/ucrtbase.dll)
-    #         list(APPEND SM_LIB_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/libs/win/x64/vcruntime140.dll)
-    #     endif()
+    #     # if(CMAKE_BUILD_TYPE MATCHES "Debug")
+    #     list(APPEND OpenSSL-1.1.1_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/windwos/libssl.so)
+    #     list(APPEND OpenSSL-1.1.1_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/lib/windwos/libcrypto.so)
+    #     # else()
+    #     # endif()
     # elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
     #     if(CMAKE_BUILD_TYPE MATCHES "Debug")
-    #         list(APPEND SM_LIB_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/libs/win/x86/with_debug_info/libSM_DLL.lib)
-    #         list(APPEND SM_LIB_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/libs/win/x86/ucrtbased.dll)
-    #         list(APPEND SM_LIB_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/libs/win/x86/vcruntime140d.dll)
+
     #     else()
-    #         list(APPEND SM_LIB_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/libs/win/x86/libSM_DLL.lib)
-    #         list(APPEND SM_LIB_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/libs/win/x86/ucrtbase.dll)
-    #         list(APPEND SM_LIB_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/libs/win/x86/vcruntime140.dll)
+
     #     endif()
     # endif()
 #添加Linux版本