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/CMakeLists.txt |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index d3a4388..462686e 100644
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -1,30 +1,53 @@
 add_subdirectory("base")
+add_subdirectory("os")
+add_subdirectory("locate")
+add_subdirectory("hw_identifier")
 
 ADD_LIBRARY(licensecc_static STATIC
+
     licensecc.cpp
     LicenseReader.cpp
-    pc-identifiers.c
     limits/license_verifier.cpp
-    ini/ConvertUTF.c
+    ini/ConvertUTF.cpp
+    $<TARGET_OBJECTS:hw_identifier>
+    $<TARGET_OBJECTS:locate>
+    $<TARGET_OBJECTS:os>
+    $<TARGET_OBJECTS:base>
 )
 
-add_subdirectory("locate")
-add_subdirectory("os")
+if(CODE_COVERAGE AND UNIX)
+	  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13)
+	    target_link_options(licensecc_static PUBLIC --coverage)
+	  endif()
+	  list(APPEND EXTERNAL_LIBS gcov)
+endif(CODE_COVERAGE AND UNIX)
 
 define_property(TARGET PROPERTY WITH_OPENSSL BRIEF_DOCS "need openssl to compile" FULL_DOCS "ff")
+
 IF(UNIX OR OPENSSL_FOUND)
 	target_compile_definitions(licensecc_static PUBLIC HAS_OPENSSL)
 	set_target_properties(licensecc_static PROPERTIES WITH_OPENSSL 1)
-	target_link_libraries(licensecc_static PUBLIC base OpenSSL::Crypto ${EXTERNAL_LIBS} ${CMAKE_DL_LIBS})
+	target_link_libraries(licensecc_static PUBLIC
+
+		OpenSSL::Crypto
+		${EXTERNAL_LIBS} ${CMAKE_DL_LIBS}
+
+	)
 ELSE(UNIX OR OPENSSL_FOUND)
 	set_target_properties(licensecc_static PROPERTIES WITH_OPENSSL 0)
-	target_link_libraries(licensecc_static ${EXTERNAL_LIBS})
+	target_link_libraries(licensecc_static PUBLIC ${EXTERNAL_LIBS})
 ENDIF(UNIX OR OPENSSL_FOUND)
 
+
+
+#set_property(TARGET licensecc_static PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+
 target_include_directories(licensecc_static
-    INTERFACE 
+    PUBLIC 
         $<INSTALL_INTERFACE:include>
+        $<INSTALL_INTERFACE:include/${PROJECT_NAME}/${LCC_PROJECT_NAME}>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
+        $<BUILD_INTERFACE:${LCC_INCLUDE_DIR}>
 )
 
 add_library(licensecc::licensecc_static ALIAS licensecc_static)

--
Gitblit v1.9.1