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 | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/src/library/os/CMakeLists.txt b/src/library/os/CMakeLists.txt
index 487213a..ef19453 100644
--- a/src/library/os/CMakeLists.txt
+++ b/src/library/os/CMakeLists.txt
@@ -4,34 +4,31 @@
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)
-
- target_link_libraries(os PUBLIC OpenSSL::Crypto)
+ 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
- windows/os-win.cpp
+ execution_environment_common.cpp
+ windows/execution_environment.cpp
+ windows/os_win.cpp
windows/network.cpp)
-
- target_link_libraries(os PUBLIC OpenSSL::Crypto)
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/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
- windows/os-win.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