[Cmake-commits] [cmake-commits] hoffman committed FindKDE3.cmake 1.21 1.22

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Feb 3 08:38:36 EST 2009


Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv24796

Modified Files:
	FindKDE3.cmake 
Log Message:
BUG: fix potential issue with empty strings


Index: FindKDE3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE3.cmake,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** FindKDE3.cmake	16 Aug 2008 23:11:53 -0000	1.21
--- FindKDE3.cmake	3 Feb 2009 13:38:34 -0000	1.22
***************
*** 107,117 ****
                     OUTPUT_VARIABLE kde_config_version )
  
!    STRING(REGEX MATCH "KDE: .\\." kde_version ${kde_config_version})
!    IF (${kde_version} MATCHES "KDE: 3\\.")
        EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --prefix
                          OUTPUT_VARIABLE kdedir )
        STRING(REGEX REPLACE "\n" "" KDE3PREFIX "${kdedir}")
  
!     ENDIF (${kde_version} MATCHES "KDE: 3\\.")
  ENDIF(KDECONFIG_EXECUTABLE)
  
--- 107,117 ----
                     OUTPUT_VARIABLE kde_config_version )
  
!    STRING(REGEX MATCH "KDE: .\\." kde_version "${kde_config_version}")
!    IF ("${kde_version}" MATCHES "KDE: 3\\.")
        EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --prefix
                          OUTPUT_VARIABLE kdedir )
        STRING(REGEX REPLACE "\n" "" KDE3PREFIX "${kdedir}")
  
!     ENDIF ("${kde_version}" MATCHES "KDE: 3\\.")
  ENDIF(KDECONFIG_EXECUTABLE)
  



More information about the Cmake-commits mailing list