From 8d405b265285c368df2e9cf1c14acee7532e0ee7 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 摹曛, 29 5月 2025 18:14:38 +0800
Subject: [PATCH] Merge branch 'develop' of http://139.9.88.116:3000/r/module/open-license-manager into develop

---
 src/library/os/CMakeLists.txt |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/library/os/CMakeLists.txt b/src/library/os/CMakeLists.txt
index 897adb2..ef19453 100644
--- a/src/library/os/CMakeLists.txt
+++ b/src/library/os/CMakeLists.txt
@@ -2,21 +2,39 @@
 	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/dmi_info.cpp
+		    linux/network.cpp
+		    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)
+  	    windows/cpu_info.cpp
+  	    windows/dmi_info.cpp  
+  	    openssl/signature_verifier.cpp 
+        execution_environment_common.cpp 
+        windows/execution_environment.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(os OBJECT
-        cpu_info_common.cpp windows/signature_verifier.cpp windows/os-win.c)
+#windows no openssl
+    add_library(os OBJECT
+        windows/cpu_info.cpp
+        windows/dmi_info.cpp 
+        windows/signature_verifier.cpp 
+        execution_environment_common.cpp 
+        windows/execution_environment.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