[Cmake-commits] [cmake-commits] hoffman committed FindGettext.cmake 1.2 1.2.12.1 FindKDE4.cmake 1.10.2.3 1.10.2.4

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	FindGettext.cmake FindKDE4.cmake 
Log Message:
ENH: check in RC 6 merges from trunk


Index: FindGettext.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGettext.cmake,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -C 2 -d -r1.2 -r1.2.12.1
*** FindGettext.cmake	26 Feb 2007 00:22:59 -0000	1.2
--- FindGettext.cmake	30 Jun 2008 20:10:27 -0000	1.2.12.1
***************
*** 31,35 ****
     ENDIF(${_firstPoFile} STREQUAL "ALL")
  
!    FOREACH (_currentPoFile ${ARGN})
        GET_FILENAME_COMPONENT(_absFile ${_currentPoFile} ABSOLUTE)
        GET_FILENAME_COMPONENT(_abs_PATH ${_absFile} PATH)
--- 31,35 ----
     ENDIF(${_firstPoFile} STREQUAL "ALL")
  
!    FOREACH (_currentPoFile ${_firstPoFile} ${ARGN})
        GET_FILENAME_COMPONENT(_absFile ${_currentPoFile} ABSOLUTE)
        GET_FILENAME_COMPONENT(_abs_PATH ${_absFile} PATH)

Index: FindKDE4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE4.cmake,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -C 2 -d -r1.10.2.3 -r1.10.2.4
*** FindKDE4.cmake	13 Jun 2008 12:55:15 -0000	1.10.2.3
--- FindKDE4.cmake	30 Jun 2008 20:10:27 -0000	1.10.2.4
***************
*** 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)