ENH: after searching for kde-config in the special dirs, search again in the
standard dirs BUG: handle paths on windows correctly Alex
This commit is contained in:
parent
520b792f6f
commit
779851f213
@ -21,14 +21,26 @@ FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde-config
|
|||||||
/usr/bin
|
/usr/bin
|
||||||
/usr/local/bin
|
/usr/local/bin
|
||||||
NO_SYSTEM_PATH
|
NO_SYSTEM_PATH
|
||||||
|
NO_CMAKE_SYSTEM_PATH
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
IF (NOT KDE4_KDECONFIG_EXECUTABLE)
|
||||||
|
FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde-config )
|
||||||
|
ENDIF (NOT KDE4_KDECONFIG_EXECUTABLE)
|
||||||
|
|
||||||
IF (KDE4_KDECONFIG_EXECUTABLE)
|
IF (KDE4_KDECONFIG_EXECUTABLE)
|
||||||
# then ask kde-config for the kde data dirs
|
# then ask kde-config for the kde data dirs
|
||||||
EXEC_PROGRAM(${KDE4_KDECONFIG_EXECUTABLE} ARGS --path data OUTPUT_VARIABLE _data_DIR )
|
EXEC_PROGRAM(${KDE4_KDECONFIG_EXECUTABLE} ARGS --path data OUTPUT_VARIABLE _data_DIR )
|
||||||
|
|
||||||
# replace the ":" with ";" so that it becomes a valid cmake list
|
|
||||||
STRING(REGEX REPLACE ":" ";" _data_DIR "${_data_DIR}")
|
IF(WIN32)
|
||||||
|
# cmake can't handle paths with '\' correct :-(
|
||||||
|
STRING(REGEX REPLACE "\\\\" "/" _data_DIR "${_data_DIR}")
|
||||||
|
ELSE(WIN32)
|
||||||
|
# replace the ":" with ";" so that it becomes a valid cmake list
|
||||||
|
STRING(REGEX REPLACE ":" ";" _data_DIR "${_data_DIR}")
|
||||||
|
ENDIF(WIN32)
|
||||||
|
|
||||||
# then check the data dirs for FindKDE4Internal.cmake
|
# then check the data dirs for FindKDE4Internal.cmake
|
||||||
FIND_PATH(KDE4_DATA_DIR cmake/modules/FindKDE4Internal.cmake ${_data_DIR})
|
FIND_PATH(KDE4_DATA_DIR cmake/modules/FindKDE4Internal.cmake ${_data_DIR})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user