diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-11-23 00:28:25 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-11-23 00:28:25 (GMT) |
| commit | 23fa16f6b47fd083b7f0ff5501edca2ade0f9d68 (patch) | |
| tree | e31946f0ceb2ee50a452f8fb9dfcf7e1da52428f /Modules | |
| parent | 05e12b0ba54056f0a6beddaf9343cd818c868caf (diff) | |
| download | CMake-23fa16f6b47fd083b7f0ff5501edca2ade0f9d68.zip CMake-23fa16f6b47fd083b7f0ff5501edca2ade0f9d68.tar.gz CMake-23fa16f6b47fd083b7f0ff5501edca2ade0f9d68.tar.bz2 | |
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
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindKDE4.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/FindKDE4.cmake b/Modules/FindKDE4.cmake index baebe5a..e71c1a4 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, 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 @@ FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config kde-config 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 @@ IF (KDE4_KDECONFIG_EXECUTABLE) 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) |