From a1b64080d1525a7a65e53f33d1a3fd257957e732 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 15 3月 2020 11:00:39 +0800
Subject: [PATCH] fix compilation errors
---
src/library/os/CMakeLists.txt | 46 ++++++++++++++++++++++++++++++++++------------
1 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/src/library/os/CMakeLists.txt b/src/library/os/CMakeLists.txt
index 6648630..42bf47d 100644
--- a/src/library/os/CMakeLists.txt
+++ b/src/library/os/CMakeLists.txt
@@ -1,19 +1,41 @@
-target_sources(licensecc_static PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}/os.c)
-
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.cpp)
ELSE(UNIX)
- target_sources(licensecc_static PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}/os-win.c)
+ #windows and openssl
+ 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.cpp
+ windows/network.cpp)
ENDIF(UNIX)
+ target_include_directories(os PUBLIC ${OPENSSL_INCLUDE_DIR})
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.cpp
+ windows/network.cpp)
ENDIF(UNIX OR OPENSSL_FOUND)
+#dependency of signature_verifier.cpp
+add_dependencies( os project_initialize )
+
+if(CODE_COVERAGE AND UNIX)
+ target_compile_options(os PUBLIC -O0 -g --coverage)
+endif(CODE_COVERAGE AND UNIX)
\ No newline at end of file
--
Gitblit v1.9.1