From a7d354a72d22cde4de1494bf3475d8ea49e9cd2d Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 15 3月 2020 11:00:39 +0800
Subject: [PATCH] fix compilation errors

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

diff --git a/src/library/os/CMakeLists.txt b/src/library/os/CMakeLists.txt
index 986550f..42bf47d 100644
--- a/src/library/os/CMakeLists.txt
+++ b/src/library/os/CMakeLists.txt
@@ -2,21 +2,40 @@
 	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/network.cpp
-		    linux/os-linux.c) 
+		    linux/os-linux.cpp) 
 	ELSE(UNIX)
+	    #windows and openssl
   	    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.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/signature_verifier.cpp windows/os-win.c)
+        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)
-	  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