From 19ed45a5aa231dd6b17bbb36efed07601ee1f0a1 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 03 5月 2020 22:22:19 +0800
Subject: [PATCH] add test for multiple features
---
src/library/os/CMakeLists.txt | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/library/os/CMakeLists.txt b/src/library/os/CMakeLists.txt
index ca9ba79..1613ea6 100644
--- a/src/library/os/CMakeLists.txt
+++ b/src/library/os/CMakeLists.txt
@@ -4,30 +4,35 @@
openssl/signature_verifier.cpp
execution_environment_common.cpp
linux/execution_environment.cpp
- cpu_info_common.cpp
linux/cpu_info.cpp
+ linux/dmi_info.cpp
linux/network.cpp
- linux/os-linux.c)
+ linux/os_linux.cpp)
ELSE(UNIX)
+ #windows and openssl
add_library(os OBJECT
- cpu_info_common.cpp windows/cpu_info.cpp
+ windows/cpu_info.cpp
+ windows/dmi_info.cpp
openssl/signature_verifier.cpp
- execution_environment_common.cpp windows/execution_environment.cpp
+ execution_environment_common.cpp
+ windows/execution_environment.cpp
windows/isvm/Native.cpp
windows/isvm/BIOSReader.cpp
- windows/os-win.c
+ windows/os_win.cpp
windows/network.cpp)
ENDIF(UNIX)
+ target_include_directories(os PUBLIC ${OPENSSL_INCLUDE_DIR})
ELSE(UNIX OR OPENSSL_FOUND)
#windows no openssl
add_library(os OBJECT
- cpu_info_common.cpp
- windows/cpu_info.cpp
+ windows/cpu_info.cpp
+ windows/dmi_info.cpp
windows/signature_verifier.cpp
- execution_environment_common.cpp windows/execution_environment.cpp
+ execution_environment_common.cpp
+ windows/execution_environment.cpp
windows/isvm/Native.cpp
windows/isvm/BIOSReader.cpp
- windows/os-win.c
+ windows/os_win.cpp
windows/network.cpp)
ENDIF(UNIX OR OPENSSL_FOUND)
@@ -35,6 +40,5 @@
add_dependencies( os project_initialize )
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