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

BUG: KDEDIRS contains the kde install locations, not the binary dirs, so 

make KDEDIRS actually work in FindKDE4.cmake

Alex
This commit is contained in:
Alexander Neundorf 2007-08-26 03:29:13 -04:00
parent f55dd81190
commit 983e2a9a51
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/FindKDE4.cmake
View File

@ -13,6 +13,7 @@ FILE(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS)
# For KDE4 kde-config has been renamed to kde4-config # For KDE4 kde-config has been renamed to kde4-config
FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
PATH_SUFFIXES bin # the suffix is for the paths coming from KDEDIRS
PATHS PATHS
${CMAKE_INSTALL_PREFIX}/bin ${CMAKE_INSTALL_PREFIX}/bin
${_KDEDIRS} ${_KDEDIRS}
@ -20,10 +21,7 @@ FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config )
IF (NOT KDE4_KDECONFIG_EXECUTABLE)
FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config )
ENDIF (NOT KDE4_KDECONFIG_EXECUTABLE)
IF (KDE4_KDECONFIG_EXECUTABLE) IF (KDE4_KDECONFIG_EXECUTABLE)
# then ask kde4-config for the kde data dirs # then ask kde4-config for the kde data dirs