diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2024-07-18 00:55:31 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2024-07-18 01:40:26 +0200 |
| commit | 5283559e25aa4dfe02cf88399f5d24d3423604cb (patch) | |
| tree | 69dbcbf39f3fff6e9ac217d9dbc7f9fbed3dbddc | |
| parent | 5e1ef63e207f60116d161a8a18ef6cf226456b14 (diff) | |
| download | tde-cmake-r14.1.x.tar.gz tde-cmake-r14.1.x.zip | |
tde_import: Always do 'include' because macro can be called in a scope that is not global.r14.1.x
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit fab0f33de434fbd293daf2142bfec04f403585a6)
| -rw-r--r-- | modules/TDEMacros.cmake | 12 |
1 files 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() |