From 8553a8d63f97cfa8d64b5b2260e81f8c896a8398 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周五, 23 5月 2025 18:36:03 +0800
Subject: [PATCH] 修改部分因为标准原因的报错
---
src/library/CMakeLists.txt | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index f1dd442..462686e 100644
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -1,36 +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)
- if (CMAKE_VERSION VERSION_GREATER 3.5)
- target_link_libraries(licensecc_static PUBLIC base OpenSSL::Crypto ${EXTERNAL_LIBS} ${CMAKE_DL_LIBS})
- #patch for old cmake in Centos 7
- ELSE(CMAKE_VERSION VERSION_GREATER 3.5)
- target_link_libraries(licensecc_static PUBLIC base ${OPENSSL_CRYPTO_LIBRARY} ${EXTERNAL_LIBS} ${CMAKE_DL_LIBS})
- include_directories(${OPENSSL_INCLUDE_DIR})
- ENDIF(CMAKE_VERSION VERSION_GREATER 3.5)
+ 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
- $<INSTALL_INTERFACE:include/${PROJECT_NAME}>
+ 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)
@@ -38,4 +55,4 @@
ARCHIVE DESTINATION ${main_lib_dest}/${LCC_PROJECT_NAME})
install(EXPORT licensecc NAMESPACE licensecc:: DESTINATION ${main_lib_dest}/${LCC_PROJECT_NAME}/cmake)
-export(EXPORT licensecc NAMESPACE licensecc:: FILE ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-config.cmake)
+export(EXPORT licensecc NAMESPACE licensecc:: FILE ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.cmake)
--
Gitblit v1.9.1