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/cmake/licensecc-config.cmake |   43 ++++++++++++++++++++++++++++---------------
 1 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/cmake/licensecc-config.cmake b/src/cmake/licensecc-config.cmake
index 9b12d05..ca6a5bf 100644
--- a/src/cmake/licensecc-config.cmake
+++ b/src/cmake/licensecc-config.cmake
@@ -1,34 +1,47 @@
 # licensecc-config.cmake - package configuration file
-
 get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+#TODO windows?
+set(LCC_PRJ_BASE "${SELF_DIR}/../../licensecc")
+set(LCC_FOUND false)
+
 if(licensecc_FIND_COMPONENTS)
 	foreach(component ${licensecc_FIND_COMPONENTS})
-		set(cmakefile "${SELF_DIR}/${component}/cmake/licensecc.cmake")
+		set(cmakefile "${LCC_PRJ_BASE}/${component}/cmake/licensecc.cmake")
 		if(EXISTS "${cmakefile}")
 			include("${cmakefile}")
 			set(${component}_FOUND true CACHE BOOL "Licensecc ${component} present")
+			set(LCC_FOUND true)
 		else(EXISTS "${cmakefile}")
 			set(${component}_FOUND false CACHE BOOL "Licensecc ${component} present")
+			message( WARNING "Component ${component} declared but not found." )
 		endif(EXISTS "${cmakefile}")
 		mark_as_advanced(${component}_FOUND)
 	endforeach(component)
 else(licensecc_FIND_COMPONENTS)
-	if(LCC_PROJECT_NAME AND (EXISTS "${SELF_DIR}/${LCC_PROJECT_NAME}/cmake/licensecc.cmake"))
-		include("${SELF_DIR}/${LCC_PROJECT_NAME}/cmake/licensecc.cmake")
-		set(${LCC_PROJECT_NAME}_FOUND true CACHE BOOL "Licensecc ${LCC_PROJECT_NAME} present")
+	if(LCC_PROJECT_NAME)
+		if(EXISTS "${LCC_PRJ_BASE}/${LCC_PROJECT_NAME}/cmake/licensecc.cmake")
+			include("${LCC_PRJ_BASE}/${LCC_PROJECT_NAME}/cmake/licensecc.cmake")
+			set(${LCC_PROJECT_NAME}_FOUND true CACHE BOOL "Licensecc ${LCC_PROJECT_NAME} present")
+			set(LCC_FOUND true)
+		else()
+			message( WARNING "Variable LCC_PROJECT_NAME declared but project ${LCC_PROJECT_NAME} not found.")
+		endif()
 		mark_as_advanced(${LCC_PROJECT_NAME}_FOUND)
-	else()
-		if(PROJECT_NAME AND (EXISTS "${SELF_DIR}/${PROJECT_NAME}/cmake/licensecc.cmake"))
-			include("${SELF_DIR}/${PROJECT_NAME}/cmake/licensecc.cmake")
+	else(LCC_PROJECT_NAME)
+		if(PROJECT_NAME AND (EXISTS "${LCC_PRJ_BASE}/${PROJECT_NAME}/cmake/licensecc.cmake"))
+			include("${LCC_PRJ_BASE}/${PROJECT_NAME}/cmake/licensecc.cmake")
 			set(${PROJECT_NAME}_FOUND true CACHE BOOL "Licensecc ${PROJECT_NAME} present")
 		    mark_as_advanced(${PROJECT_NAME}_FOUND)
+		    set(LCC_FOUND true)
 		endif()
-	endif()
+	endif(LCC_PROJECT_NAME)
 endif(licensecc_FIND_COMPONENTS)
 
-get_property(COMPILE_DEF TARGET licensecc::licensecc_static PROPERTY INTERFACE_COMPILE_DEFINITIONS)
-if("HAS_OPENSSL" IN_LIST COMPILE_DEF AND NOT OpenSSL_FOUND)
-	message(DEBUG "Trying to find openssl (required by the target)")
-    SET ( OPENSSL_USE_STATIC_LIBS ON )
-    find_package(OpenSSL REQUIRED COMPONENTS Crypto)
-endif()
\ No newline at end of file
+if(LCC_FOUND)
+	get_property(COMPILE_DEF TARGET licensecc::licensecc_static PROPERTY INTERFACE_COMPILE_DEFINITIONS)
+	if("HAS_OPENSSL" IN_LIST COMPILE_DEF AND NOT OpenSSL_FOUND)
+		#message( VERBOSE "Trying to find openssl (required by the target)")
+	    SET ( OPENSSL_USE_STATIC_LIBS ON )
+	    find_package(OpenSSL REQUIRED COMPONENTS Crypto)
+	endif()
+endif(LCC_FOUND)
\ No newline at end of file

--
Gitblit v1.9.1