From 205635dcd5b65163859297547780c49cd4260527 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 4 Jul 2006 08:38:47 -0400 Subject: ENH: prefer kde4-config over kde-config, since for KDE 4 kde-config will be renamed to kde-config, and so cmake has to prefer this one over the old version Alex --- Modules/FindKDE4.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/FindKDE4.cmake b/Modules/FindKDE4.cmake index 94f29a6..baebe5a 100644 --- a/Modules/FindKDE4.cmake +++ b/Modules/FindKDE4.cmake @@ -12,8 +12,8 @@ FILE(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS) -# First try to find kde-config -FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde-config +# 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 PATHS ${CMAKE_INSTALL_PREFIX}/bin ${_KDEDIRS} @@ -23,7 +23,7 @@ FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde-config IF (NOT KDE4_KDECONFIG_EXECUTABLE) - FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde-config ) + FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config kde-config ) ENDIF (NOT KDE4_KDECONFIG_EXECUTABLE) IF (KDE4_KDECONFIG_EXECUTABLE) -- cgit v0.12