From 11a0f65bae425baf09508e2d57c830f5cad69df5 Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周六, 14 12月 2019 09:42:26 +0800 Subject: [PATCH] cleanup and change license generation parameters --- src/library/os/CMakeLists.txt | 35 ++++++++++++----------------------- 1 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/library/os/CMakeLists.txt b/src/library/os/CMakeLists.txt index f2dc67b..1e3bc46 100644 --- a/src/library/os/CMakeLists.txt +++ b/src/library/os/CMakeLists.txt @@ -1,27 +1,16 @@ IF(UNIX OR OPENSSL_FOUND) - ADD_LIBRARY(os STATIC - openssl/signature_verifier.cpp - os.c - os-linux.c - network_id.c) - - 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) + IF(UNIX) + 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) + target_sources(licensecc_static PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os-win.c) + ENDIF(UNIX) 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 STATIC + ${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