From d02fce46e19f1a7b77a952210974a875c493593f Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 01 12月 2019 21:09:32 +0800
Subject: [PATCH] fix boost layout, update submodule
---
src/library/os/CMakeLists.txt | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/library/os/CMakeLists.txt b/src/library/os/CMakeLists.txt
index fc525b4..bd460a6 100644
--- a/src/library/os/CMakeLists.txt
+++ b/src/library/os/CMakeLists.txt
@@ -1,20 +1,17 @@
-IF(UNIX)
- ADD_LIBRARY(os STATIC
- openssl/signature_verifier.cpp
- os.c
- os-linux.c
- network_id.c)
-
- target_link_libraries(
- os
- base
- OpenSSL::Crypto
- ${EXTERNAL_LIBS}
- ${CMAKE_DL_LIBS}
- ##ZLIB::ZLIB
- )
+IF(UNIX OR OPENSSL_FOUND)
+ IF(UNIX)
+ ADD_LIBRARY(os STATIC openssl/signature_verifier.cpp os.c os-linux.c network_id.c)
+ ELSE(UNIX)
+ ADD_LIBRARY(os STATIC openssl/signature_verifier.cpp os.c os-win.c)
+ ENDIF(UNIX)
-ELSE(UNIX)
+ if (CMAKE_VERSION VERSION_GREATER 3.5)
+ target_link_libraries(os base OpenSSL::Crypto ${EXTERNAL_LIBS} ${CMAKE_DL_LIBS})
+ #patch for old cmake in Centos 7
+ ELSE(CMAKE_VERSION VERSION_GREATER 3.5)
+ target_link_libraries(os base ${OPENSSL_CRYPTO_LIBRARY} ${EXTERNAL_LIBS} ${CMAKE_DL_LIBS})
+ ENDIF(CMAKE_VERSION VERSION_GREATER 3.5)
+ELSE(UNIX OR OPENSSL_FOUND)
ADD_LIBRARY(os STATIC
windows/signature_verifier.cpp
os.c
@@ -23,7 +20,8 @@
target_link_libraries(
os
base
+ ${EXTERNAL_LIBS}
)
-ENDIF(UNIX)
+ENDIF(UNIX OR OPENSSL_FOUND)
install(TARGETS os ARCHIVE DESTINATION lib/${PROJECT_NAME}/${LCC_PROJECT_NAME})
--
Gitblit v1.9.1