diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2022-03-29 02:53:16 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-03-29 09:50:36 +0200 |
| commit | 2988432a72a28f15a292d79f3c6b6d11b294899c (patch) | |
| tree | 076d291f80748cf39ae9ffa6c0f457da959659cc /tdescreensaver/kxsconfig/CMakeL10n.txt | |
| parent | cf8c057b08d378085d81c4c6f39eb3a7cdb1c299 (diff) | |
| download | tdeartwork-2988432a72a28f15a292d79f3c6b6d11b294899c.tar.gz tdeartwork-2988432a72a28f15a292d79f3c6b6d11b294899c.zip | |
Modify screen savers detection that the XSCREENSAVER_DIRSr14.0.12
and XSCREENSAVER_CONFIG_DIRS variables allow multiple paths.
Likewise, the XSCREENSAVER HACKS DIRS variable used to search
for an screen saver executable can contain multiple paths.
This relates to #19.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit b0eb71dedfc68ca5ce981b2853af9a64b2c2e67f)
Diffstat (limited to 'tdescreensaver/kxsconfig/CMakeL10n.txt')
| -rw-r--r-- | tdescreensaver/kxsconfig/CMakeL10n.txt | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tdescreensaver/kxsconfig/CMakeL10n.txt b/tdescreensaver/kxsconfig/CMakeL10n.txt index a3a99e44..b7099c1b 100644 --- a/tdescreensaver/kxsconfig/CMakeL10n.txt +++ b/tdescreensaver/kxsconfig/CMakeL10n.txt @@ -16,13 +16,15 @@ endif( ) message( STATUS "Prepare to extract strings from xscreensaver data files..." ) include( ${CMAKE_SOURCE_DIR}/FindXscreensaver.cmake ) +string( REPLACE ":" ";" SEARCH_XSCREENSAVER_CONFIG_DIRS "${XSCREENSAVER_CONFIG_DIRS}" ) unset( _xsavers_l10n ) -file( GLOB _xsaver_files - RELATIVE "${XSCREENSAVER_CONFIG_DIR}" - ${XSCREENSAVER_CONFIG_DIR}*.xml ) -list( SORT _xsaver_files ) -foreach( _xsaver_file ${_xsaver_files} ) +foreach( XSCREENSAVER_CONFIG_DIR IN LISTS SEARCH_XSCREENSAVER_CONFIG_DIRS ) + file( GLOB _xsaver_files + RELATIVE "${XSCREENSAVER_CONFIG_DIR}" + ${XSCREENSAVER_CONFIG_DIR}*.xml ) + list( SORT _xsaver_files ) + foreach( _xsaver_file ${_xsaver_files} ) string( REGEX REPLACE "\\.xml\$" "" _xsaver_name "${_xsaver_file}" ) if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ScreenSavers/${_xsaver_name}.desktop" ) file( READ "${XSCREENSAVER_CONFIG_DIR}${_xsaver_file}" _xsaver_xml ) @@ -60,6 +62,7 @@ foreach( _xsaver_file ${_xsaver_files} ) "${CMAKE_CURRENT_SOURCE_DIR}/ScreenSavers/${_xsaver_file}.h" "${CMAKE_CURRENT_SOURCE_DIR}/ScreenSavers/${_xsaver_file}.h.tde_l10n" ) list( APPEND _xsavers_l10n "ScreenSavers/${_xsaver_file}.h.tde_l10n" ) + endforeach( ) endforeach( ) |