From 9119e2b9bbb11b4ae21618fbaacfe6edaeb2a62b Mon Sep 17 00:00:00 2001 From: Gabriele Contini <contini.mailing@gmail.com> Date: 周六, 15 2月 2020 23:49:50 +0800 Subject: [PATCH] pc identifiers work --- src/library/os/CMakeLists.txt | 51 +++++++++++++++++++++------------------------------ 1 files changed, 21 insertions(+), 30 deletions(-) diff --git a/src/library/os/CMakeLists.txt b/src/library/os/CMakeLists.txt index 861bf67..986550f 100644 --- a/src/library/os/CMakeLists.txt +++ b/src/library/os/CMakeLists.txt @@ -1,31 +1,22 @@ -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 - ) - -ELSE(UNIX) - ADD_LIBRARY(os STATIC - windows/signature_verifier.cpp - os.c - os-win.c) +IF(UNIX OR OPENSSL_FOUND) + IF(UNIX) + add_library(os OBJECT + openssl/signature_verifier.cpp + linux/execution_environment.cpp + cpu_info_common.cpp + linux/cpu_info.cpp + linux/network.cpp + linux/os-linux.c) + ELSE(UNIX) + add_library(os OBJECT + cpu_info_common.cpp openssl/signature_verifier.cpp windows/os-win.c) + ENDIF(UNIX) +ELSE(UNIX OR OPENSSL_FOUND) + add_library(os OBJECT + cpu_info_common.cpp windows/signature_verifier.cpp windows/os-win.c) +ENDIF(UNIX OR OPENSSL_FOUND) - target_link_libraries( - os - base - ) -ENDIF(UNIX) - - - -install(TARGETS os ARCHIVE DESTINATION lib) +if(CODE_COVERAGE AND UNIX) + MESSAGE(STATUS "Enabling code coverage") + target_compile_options(os PUBLIC -O0 -g --coverage) +endif(CODE_COVERAGE AND UNIX) \ No newline at end of file -- Gitblit v1.9.1