From 6a99d07d4aad9f355d89e310b21ff4dff2e665aa Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Sun, 15 Feb 2026 12:23:05 +0100 Subject: tde_install_icons: Fix searching for icon files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- modules/TDEMacros.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'modules') 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}" ) -- cgit v1.2.3