kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Alexander Neundorf 2006-07-04 08:38:47 -04:00
parent dc727d7992
commit 205635dcd5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/FindKDE4.cmake
View File

@ -12,8 +12,8 @@
FILE(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS) FILE(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS)
# First try to find kde-config # First try to find kde-config, for KDE4 soon to be renamed to kde4-config
FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde-config FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config kde-config
PATHS PATHS
${CMAKE_INSTALL_PREFIX}/bin ${CMAKE_INSTALL_PREFIX}/bin
${_KDEDIRS} ${_KDEDIRS}
@ -23,7 +23,7 @@ FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde-config
IF (NOT KDE4_KDECONFIG_EXECUTABLE) 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) ENDIF (NOT KDE4_KDECONFIG_EXECUTABLE)
IF (KDE4_KDECONFIG_EXECUTABLE) IF (KDE4_KDECONFIG_EXECUTABLE)