From e3e83c70085d9a9c82b643b46d918fe3a2d21e03 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 14 12月 2019 11:35:52 +0800
Subject: [PATCH] fix windows compilation, better cmake output
---
src/library/os/CMakeLists.txt | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/src/library/os/CMakeLists.txt b/src/library/os/CMakeLists.txt
index bd460a6..e9e74df 100644
--- a/src/library/os/CMakeLists.txt
+++ b/src/library/os/CMakeLists.txt
@@ -1,27 +1,17 @@
IF(UNIX OR OPENSSL_FOUND)
IF(UNIX)
- ADD_LIBRARY(os STATIC openssl/signature_verifier.cpp os.c os-linux.c network_id.c)
+ target_sources(licensecc_static PRIVATE
+ ${CMAKE_CURRENT_SOURCE_DIR}/openssl/signature_verifier.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/os-linux.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/network_id.c)
ELSE(UNIX)
- ADD_LIBRARY(os STATIC openssl/signature_verifier.cpp os.c os-win.c)
+ target_sources(licensecc_static PRIVATE
+ ${CMAKE_CURRENT_SOURCE_DIR}/openssl/signature_verifier.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/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)
-
- target_link_libraries(
- os
- base
- ${EXTERNAL_LIBS}
- )
+ target_sources(licensecc_static PRIVATE
+ ${CMAKE_CURRENT_SOURCE_DIR}/windows/signature_verifier.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/os-win.c)
ENDIF(UNIX OR OPENSSL_FOUND)
-install(TARGETS os ARCHIVE DESTINATION lib/${PROJECT_NAME}/${LCC_PROJECT_NAME})
--
Gitblit v1.9.1