[cmake-commits] alex committed FindKDE4.cmake 1.5 1.6

[cmake-commits at cmake.org]

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

Modified Files:
	FindKDE4.cmake 
Log Message:
ENH: kde-config has been renamed to kde4-config several weeks ago, so it's
not necessary anymore to use "kde-config" as fallback, since this will
surely be a wrong version

Alex


Index: FindKDE4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE4.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- FindKDE4.cmake	4 Jul 2006 12:38:47 -0000	1.5
+++ FindKDE4.cmake	23 Nov 2006 00:28:25 -0000	1.6
@@ -12,8 +12,8 @@
 
 FILE(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS)
 
-# First try to find kde-config, for KDE4 soon to be renamed to kde4-config
-FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config kde-config
+# For KDE4 kde-config has been renamed to kde4-config
+FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
    PATHS
    ${CMAKE_INSTALL_PREFIX}/bin
    ${_KDEDIRS}
@@ -23,11 +23,11 @@
 
 
 IF (NOT KDE4_KDECONFIG_EXECUTABLE)
-   FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config kde-config )
+   FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config )
 ENDIF (NOT KDE4_KDECONFIG_EXECUTABLE)
 
 IF (KDE4_KDECONFIG_EXECUTABLE)
-   # then ask kde-config for the kde data dirs
+   # then ask kde4-config for the kde data dirs
    EXEC_PROGRAM(${KDE4_KDECONFIG_EXECUTABLE} ARGS --path data OUTPUT_VARIABLE _data_DIR )
 
    FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
@@ -58,7 +58,7 @@
 
 ELSE (KDE4_KDECONFIG_EXECUTABLE)
    IF (KDE4_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "ERROR: Could not find KDE4 kde-config")
+      MESSAGE(FATAL_ERROR "ERROR: Could not find KDE4 kde4-config")
    ENDIF (KDE4_FIND_REQUIRED)
 ENDIF (KDE4_KDECONFIG_EXECUTABLE)