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 |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/library/os/CMakeLists.txt b/src/library/os/CMakeLists.txt
index 7244e0d..ef19453 100644
--- a/src/library/os/CMakeLists.txt
+++ b/src/library/os/CMakeLists.txt
@@ -4,18 +4,18 @@
 		    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.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
-  	    windows/isvm/Native.cpp
-        windows/isvm/BIOSReader.cpp
+        execution_environment_common.cpp 
+        windows/execution_environment.cpp
   	    windows/os_win.cpp
   	    windows/network.cpp)
 	ENDIF(UNIX)
@@ -23,12 +23,11 @@
 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
-        windows/isvm/Native.cpp
-        windows/isvm/BIOSReader.cpp
+        execution_environment_common.cpp 
+        windows/execution_environment.cpp
         windows/os_win.cpp
         windows/network.cpp)
 ENDIF(UNIX OR OPENSSL_FOUND)

--
Gitblit v1.9.1