From b0eb71dedfc68ca5ce981b2853af9a64b2c2e67f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 29 Mar 2022 02:53:16 +0200 Subject: Modify screen savers detection that the XSCREENSAVER_DIRS and XSCREENSAVER_CONFIG_DIRS variables allow multiple paths. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- tdescreensaver/kxsconfig/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tdescreensaver/kxsconfig/CMakeLists.txt') diff --git a/tdescreensaver/kxsconfig/CMakeLists.txt b/tdescreensaver/kxsconfig/CMakeLists.txt index 05c0d6b5..103203db 100644 --- a/tdescreensaver/kxsconfig/CMakeLists.txt +++ b/tdescreensaver/kxsconfig/CMakeLists.txt @@ -49,12 +49,13 @@ tde_add_executable( ${target} AUTOMOC ##### install desktops ########################## # code from kde4 FILE(GLOB _desktopfiles "ScreenSavers/*.desktop" ) +string( REPLACE ":" ";" SEARCH_XSCREENSAVER_CONFIG_DIRS "${XSCREENSAVER_CONFIG_DIRS}" ) foreach(_currentdesktopfile ${_desktopfiles}) STRING(REGEX REPLACE ".desktop" "" _newitem "${_currentdesktopfile}" ) #MESSAGE(STATUS "newItem <${_newitem}>") GET_FILENAME_COMPONENT(_screensaverName ${_newitem} NAME_WE) #MESSAGE(STATUS "name without extension <${_screensaverName}>") - find_file(XSCREENSAVER_FILE_FOUND ${_screensaverName}.xml PATHS ${XSCREENSAVER_CONFIG_DIR} ) + find_file(XSCREENSAVER_FILE_FOUND ${_screensaverName}.xml PATHS ${SEARCH_XSCREENSAVER_CONFIG_DIRS} ) if(XSCREENSAVER_FILE_FOUND) MESSAGE(STATUS "xscreensaver name ${_screensaverName} found") else(XSCREENSAVER_FILE_FOUND) -- cgit v1.2.1