|
@@ -55,7 +55,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
|
|
|
elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
|
elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
|
|
message(STATUS "Using ${CMAKE_SYSTEM_NAME} System")
|
|
message(STATUS "Using ${CMAKE_SYSTEM_NAME} System")
|
|
|
#添加Curl库
|
|
#添加Curl库
|
|
|
- # set(CURL_DIR ${CMAKE_CURRENT_LIST_DIR}/linux_gcc8.3/lib/cmake/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(hiredis_DIR ${CMAKE_CURRENT_LIST_DIR}/linux_gcc8.3/lib/cmake/hiredis)
|
|
|
if(ENABLE_SPDLOG_STATIC_LIB)
|
|
if(ENABLE_SPDLOG_STATIC_LIB)
|
|
|
set(fmt_DIR ${CMAKE_CURRENT_LIST_DIR}/linux_gcc8.3_static/lib/cmake/fmt)
|
|
set(fmt_DIR ${CMAKE_CURRENT_LIST_DIR}/linux_gcc8.3_static/lib/cmake/fmt)
|
|
@@ -76,7 +76,7 @@ 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}/LHHTTPAPI)
|
|
|
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/OpenSSL-1.1.1)
|
|
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/OpenSSL-1.1.1)
|
|
|
#添加CURL的路径，目前Linux shying单独编译的，使用上面的OpenSSL库
|
|
#添加CURL的路径，目前Linux shying单独编译的，使用上面的OpenSSL库
|
|
|
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/CURL)
|
|
|
|
|
|
|
+# list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/CURL)
|
|
|
|
|
|
|
|
#搜索所有的库
|
|
#搜索所有的库
|
|
|
find_package(fmt REQUIRED)
|
|
find_package(fmt REQUIRED)
|
