From fab0f33de434fbd293daf2142bfec04f403585a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 18 Jul 2024 00:55:31 +0200 Subject: [PATCH] tde_import: Always do 'include' because macro can be called in a scope that is not global. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- modules/TDEMacros.cmake | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake index 408f87b..3556731 100644 --- a/modules/TDEMacros.cmake +++ b/modules/TDEMacros.cmake @@ -880,14 +880,20 @@ macro( tde_import _library ) set( TDE_IMPORT_${_library} "build" CACHE INTERNAL "Library ${_library} activated for build" ) else() if( EXISTS "${TDE_CMAKE_DIR}/${_library}.cmake" ) - include( "${TDE_CMAKE_DIR}/${_library}.cmake" ) + set( tde_import_include "${TDE_CMAKE_DIR}/${_library}.cmake" ) elseif( EXISTS "${TQT_CMAKE_DIR}/${_library}.cmake" ) - include( "${TQT_CMAKE_DIR}/${_library}.cmake" ) + set( tde_import_include "${TQT_CMAKE_DIR}/${_library}.cmake" ) else() tde_message_fatal( "'${_library}' is required, but is not installed nor selected for build" ) endif() + include( "${tde_import_include}" ) message( STATUS "Checking for '${_library}' - ok, found import file" ) - set( TDE_IMPORT_${_library} "import" CACHE INTERNAL "Library ${_library} imported" ) + set( TDE_IMPORT_${_library} "import:${tde_import_include}" CACHE INTERNAL "Library ${_library} imported" ) + endif() + else() + if( "${TDE_IMPORT_${_library}}" MATCHES "^import:" ) + string( REGEX REPLACE "^import:" "" tde_import_include "${TDE_IMPORT_${_library}}" ) + include( "${tde_import_include}" ) endif() endif() endmacro()