diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-08-26 07:29:13 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-08-26 07:29:13 (GMT) |
| commit | 983e2a9a51939de3c65f22468ef6a47f3147feb5 (patch) | |
| tree | 2ce4619fedc7e1987ed3456f026225e72c465c20 /Modules | |
| parent | f55dd81190ba172da1498677513d261715b5b647 (diff) | |
| download | CMake-983e2a9a51939de3c65f22468ef6a47f3147feb5.zip CMake-983e2a9a51939de3c65f22468ef6a47f3147feb5.tar.gz CMake-983e2a9a51939de3c65f22468ef6a47f3147feb5.tar.bz2 | |
BUG: KDEDIRS contains the kde install locations, not the binary dirs, so
make KDEDIRS actually work in FindKDE4.cmake
Alex
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindKDE4.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Modules/FindKDE4.cmake b/Modules/FindKDE4.cmake index 1344d91..c4fd3fb 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 |