From 65454077a8c63b50adda4e8c6095c8f00675c4d2 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 08 3月 2020 21:45:16 +0800
Subject: [PATCH] Merge branch 'feature/pc_identifiers' of https://github.com/open-license-manager/open-license-manager.git into feature/pc_identifiers
---
src/library/os/CMakeLists.txt | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/src/library/os/CMakeLists.txt b/src/library/os/CMakeLists.txt
index bd460a6..c22b806 100644
--- a/src/library/os/CMakeLists.txt
+++ b/src/library/os/CMakeLists.txt
@@ -1,27 +1,37 @@
IF(UNIX OR OPENSSL_FOUND)
IF(UNIX)
- ADD_LIBRARY(os STATIC openssl/signature_verifier.cpp os.c os-linux.c 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)
- ADD_LIBRARY(os STATIC openssl/signature_verifier.cpp os.c 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)
-
- 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}
- )
+#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)
-install(TARGETS os ARCHIVE DESTINATION lib/${PROJECT_NAME}/${LCC_PROJECT_NAME})
+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