From 550d42370135cad802074648756838cf7cd91e10 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 01 12月 2019 21:09:32 +0800
Subject: [PATCH] fix boost layout, update submodule
---
src/library/os/CMakeLists.txt | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/library/os/CMakeLists.txt b/src/library/os/CMakeLists.txt
index 45b1cd5..bd460a6 100644
--- a/src/library/os/CMakeLists.txt
+++ b/src/library/os/CMakeLists.txt
@@ -1,18 +1,27 @@
-IF(WIN32)
+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)
+
+ 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
os-win.c)
-ELSE(WIN32)
- ADD_LIBRARY(os STATIC
- os.c
- os-linux.c
- network_id.c)
-ENDIF(WIN32)
-target_link_libraries(
- os
- base
- ${EXTERNAL_LIBS}
-)
+ target_link_libraries(
+ os
+ base
+ ${EXTERNAL_LIBS}
+ )
+ENDIF(UNIX OR OPENSSL_FOUND)
-install(TARGETS os ARCHIVE DESTINATION lib)
+install(TARGETS os ARCHIVE DESTINATION lib/${PROJECT_NAME}/${LCC_PROJECT_NAME})
--
Gitblit v1.9.1