From d4edbb5a0aae0211389ce86264809b4237c73769 Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周日, 08 3月 2020 21:27:16 +0800 Subject: [PATCH] Issues #14 and #6 --- src/library/os/CMakeLists.txt | 39 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/library/os/CMakeLists.txt b/src/library/os/CMakeLists.txt index 1e3bc46..c22b806 100644 --- a/src/library/os/CMakeLists.txt +++ b/src/library/os/CMakeLists.txt @@ -1,16 +1,37 @@ IF(UNIX OR OPENSSL_FOUND) 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) + add_library(os OBJECT + openssl/signature_verifier.cpp + execution_environment_common.cpp + linux/execution_environment.cpp + cpu_info_common.cpp + linux/cpu_info.cpp + linux/network.cpp + linux/os-linux.c) ELSE(UNIX) - target_sources(licensecc_static PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/os-win.c) + add_library(os OBJECT + cpu_info_common.cpp windows/cpu_info.cpp + openssl/signature_verifier.cpp + execution_environment_common.cpp windows/execution_environment.cpp + windows/isvm/Native.cpp + windows/isvm/BIOSReader.cpp + windows/os-win.c + windows/network.cpp) ENDIF(UNIX) ELSE(UNIX OR OPENSSL_FOUND) - target_sources(licensecc_static STATIC - ${CMAKE_CURRENT_SOURCE_DIR}/windows/signature_verifier.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os-win.c) +#windows no openssl + add_library(os OBJECT + cpu_info_common.cpp + windows/cpu_info.cpp + windows/signature_verifier.cpp + execution_environment_common.cpp windows/execution_environment.cpp + windows/isvm/Native.cpp + windows/isvm/BIOSReader.cpp + windows/os-win.c + windows/network.cpp) ENDIF(UNIX OR OPENSSL_FOUND) +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