[cmake-commits] alex committed FindKDE4.cmake 1.9 1.10

[cmake-commits at cmake.org]

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

Modified Files:
	FindKDE4.cmake 
Log Message:

BUG: KDEDIRS contains the kde install locations, not the binary dirs, so
make KDEDIRS actually work in FindKDE4.cmake

Alex


Index: FindKDE4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE4.cmake,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- FindKDE4.cmake	11 Jul 2007 01:38:34 -0000	1.9
+++ FindKDE4.cmake	26 Aug 2007 07:29:13 -0000	1.10
@@ -13,6 +13,7 @@
 
 # For KDE4 kde-config has been renamed to kde4-config
 FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
+   PATH_SUFFIXES bin               # the suffix is for the paths coming from KDEDIRS
    PATHS
    ${CMAKE_INSTALL_PREFIX}/bin
    ${_KDEDIRS}
@@ -20,10 +21,7 @@
    NO_DEFAULT_PATH
    )
 
-
-IF (NOT KDE4_KDECONFIG_EXECUTABLE)
-   FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config )
-ENDIF (NOT KDE4_KDECONFIG_EXECUTABLE)
+FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config )
 
 IF (KDE4_KDECONFIG_EXECUTABLE)
    # then ask kde4-config for the kde data dirs