From b68bf53bb796cbe83d623126a61b3b060a70ea42 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 14 3月 2020 12:15:04 +0800
Subject: [PATCH] improve includes

---
 src/library/os/CMakeLists.txt |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/library/os/CMakeLists.txt b/src/library/os/CMakeLists.txt
index 897adb2..ca9ba79 100644
--- a/src/library/os/CMakeLists.txt
+++ b/src/library/os/CMakeLists.txt
@@ -2,20 +2,38 @@
 	IF(UNIX)
 		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/os-linux.c 
-		    linux/network_id.c)
+		    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)
+  	    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(os OBJECT
-        cpu_info_common.cpp windows/signature_verifier.cpp windows/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)
 
+#dependency of signature_verifier.cpp
+add_dependencies( os project_initialize )
+
 if(CODE_COVERAGE AND UNIX)
 	  MESSAGE(STATUS "Enabling code coverage")
 	  target_compile_options(os PUBLIC -O0 -g --coverage)

--
Gitblit v1.9.1