[Cmake-commits] [cmake-commits] hoffman committed FindKDE4.cmake 1.12 1.13

[cmake-commits at cmake.org]

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

Modified Files:
	FindKDE4.cmake 
Log Message:
BUG: don't run KDE4_KDECONFIG_EXECUTABLE if it is notfound


Index: FindKDE4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE4.cmake,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** FindKDE4.cmake	9 Jun 2008 20:04:05 -0000	1.12
--- FindKDE4.cmake	26 Jun 2008 17:14:28 -0000	1.13
***************
*** 43,50 ****
     ELSE(CMAKE_CROSSCOMPILING)
        # then ask kde4-config for the kde data dirs
!       EXECUTE_PROCESS(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
!       FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
!       # then check the data dirs for FindKDE4Internal.cmake
!       FIND_PATH(KDE4_DATA_DIR cmake/modules/FindKDE4Internal.cmake ${_data_DIR})
     ENDIF(CMAKE_CROSSCOMPILING)
  ENDIF(NOT KDE4_DATA_DIR)
--- 43,53 ----
     ELSE(CMAKE_CROSSCOMPILING)
        # then ask kde4-config for the kde data dirs
! 
!       IF(KDE4_KDECONFIG_EXECUTABLE)
!         EXECUTE_PROCESS(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
!         FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
!         # then check the data dirs for FindKDE4Internal.cmake
!         FIND_PATH(KDE4_DATA_DIR cmake/modules/FindKDE4Internal.cmake ${_data_DIR})
!       ENDIF(KDE4_KDECONFIG_EXECUTABLE)
     ENDIF(CMAKE_CROSSCOMPILING)
  ENDIF(NOT KDE4_DATA_DIR)