|
@@ -40,7 +40,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
|
|
|
|
|
|
if(CMAKE_SIZEOF_VOID_P MATCHES 8)
|
|
|
|
|
|
- set(CURL_DIR ${CMAKE_CURRENT_LIST_DIR}/gcc7.3/lib/cmake/CURL)
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
@@ -51,7 +51,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
|
|
|
|
|
|
|
|
|
elseif(CMAKE_SIZEOF_VOID_P MATCHES 4)
|
|
|
- set(CURL_DIR ${CMAKE_CURRENT_LIST_DIR}/gcc7.3_32/lib/cmake/CURL)
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
@@ -65,8 +65,8 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
|
|
|
elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
|
|
|
|
|
|
|
|
- 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)
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
@@ -74,7 +74,7 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
|
|
|
|
|
|
|
|
|
|
|
- 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)
|
|
|
|
|
|
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/CURL)
|
|
|
+
|
|
|
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/FreeType)
|
|
|
|
|
|
|
|
|
|
|
|
find_package(spdlog REQUIRED)
|
|
|
|
|
|
find_package(OpenSSL-1.1.1 REQUIRED)
|
|
|
+
|
|
|
+find_package(ssh2 REQUIRED)
|
|
|
|
|
|
find_package(CURL REQUIRED)
|
|
|
|
|
@@ -106,8 +112,12 @@ find_package(SM REQUIRED)
|
|
|
find_package(LHQLog REQUIRED)
|
|
|
find_package(LHHTTPAPI REQUIRED)
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
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 "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 "--------------------------------------------------")
|