From 983e2a9a51939de3c65f22468ef6a47f3147feb5 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 26 Aug 2007 03:29:13 -0400 Subject: [PATCH] BUG: KDEDIRS contains the kde install locations, not the binary dirs, so make KDEDIRS actually work in FindKDE4.cmake Alex --- Modules/FindKDE4.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Modules/FindKDE4.cmake b/Modules/FindKDE4.cmake index 1344d91df..c4fd3fb12 100644 --- a/Modules/FindKDE4.cmake +++ b/Modules/FindKDE4.cmake @@ -13,6 +13,7 @@ FILE(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS) # 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 @@ FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config 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