From ed8d5e30f05ad96e66ffdb209c7868f8ac8da4c1 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周一, 24 2月 2020 05:20:25 +0800
Subject: [PATCH] windows progress

---
 src/library/os/CMakeLists.txt |   64 +++++++++++++++++--------------
 1 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/library/os/CMakeLists.txt b/src/library/os/CMakeLists.txt
index 91e00fb..ef0fd62 100644
--- a/src/library/os/CMakeLists.txt
+++ b/src/library/os/CMakeLists.txt
@@ -1,30 +1,36 @@
-IF(UNIX)
-    ADD_LIBRARY(os STATIC
-        linux/verifier.cpp
-        os.c
-        os-linux.c
-        network_id.c)
-        
-	target_link_libraries(
-	     os
-	     base
-	     OpenSSL::Crypto
-	     ${EXTERNAL_LIBS}
-	     ##ZLIB::ZLIB
-	)
-	
-ELSE(UNIX)
-    ADD_LIBRARY(os STATIC
-        windows/verifier.cpp
-        os.c
-        os-win.c)
+IF(UNIX OR OPENSSL_FOUND)
+	IF(UNIX)
+		add_library(os OBJECT
+		    openssl/signature_verifier.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 OBJECT 
+  	    cpu_info_common.cpp windows/cpu_info.cpp 
+  	    openssl/signature_verifier.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)
+#windows no openssl
+    add_library(os OBJECT
+        cpu_info_common.cpp 
+        windows/cpu_info.cpp 
+        windows/signature_verifier.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)
 
-	target_link_libraries(
-	     os
-	     base
-	)
-ENDIF(UNIX)
-
-
-
-install(TARGETS os ARCHIVE DESTINATION lib)
+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