diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2026-02-15 12:23:05 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2026-02-22 21:43:05 +0100 |
| commit | 6a99d07d4aad9f355d89e310b21ff4dff2e665aa (patch) | |
| tree | 124f96935e4144516c9af06e17db4430664c638d /modules | |
| parent | c25ffb3c894a2f9f5994960dd9b1c4c3aa5ea411 (diff) | |
| download | tde-cmake-fix/install-icons.tar.gz tde-cmake-fix/install-icons.zip | |
tde_install_icons: Fix searching for icon filesfix/install-icons
1. In the call to `file( GLOB ... )` the name of the output variable
(`_icon_files`) was repeated as the globbing expression.
2. For unknown reasons `file( GLOB ... )` sometimes fails and returns
nothing. This could lead to either FTBFS or to silently skipping
the installation of some icons. When the same `file( GLOB ... )`
is called again, it succeeds.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/TDEMacros.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake index a768814..ce9b4e5 100644 --- a/modules/TDEMacros.cmake +++ b/modules/TDEMacros.cmake @@ -279,7 +279,11 @@ macro( tde_install_icons ) foreach( _icon ${_icons} ) unset( _theme ) # clearing - file(GLOB _icon_files *-${_icon}.png *-${_icon}.mng _icon_files *-${_icon}.svg* *-${_icon}.xpm ) + file(GLOB _icon_files *-${_icon}.png *-${_icon}.mng *-${_icon}.svg* *-${_icon}.xpm ) + if( "${_icon_files}" STREQUAL "" ) + # strange, try it again! + file(GLOB _icon_files *-${_icon}.png *-${_icon}.mng *-${_icon}.svg* *-${_icon}.xpm ) + endif() foreach( _icon_file ${_icon_files} ) # FIXME need a review string( REGEX MATCH "^.*/([a-zA-Z][a-zA-Z])([0-9a-zA-Z]+)\\-([a-z]+)\\-([^/]+)$" _dummy "${_icon_file}" ) |