Annotation of /trunk/cmake/patches/cmake-2.4.7-findkde4.patch
Parent Directory | Revision Log
Revision 432 -
(hide annotations)
(download)
Sat Dec 15 12:03:06 2007 UTC (16 years, 9 months ago) by niro
File size: 1884 byte(s)
Sat Dec 15 12:03:06 2007 UTC (16 years, 9 months ago) by niro
File size: 1884 byte(s)
-some fixes for cmake
1 | niro | 432 | --- Modules/FindKDE4.cmake.orig 2007-09-05 19:34:40.000000000 +0200 |
2 | +++ Modules/FindKDE4.cmake 2007-09-05 19:34:46.000000000 +0200 | ||
3 | @@ -1,9 +1,8 @@ | ||
4 | # Find KDE4 and provide all necessary variables and macros to compile software for it. | ||
5 | # It looks for KDE 4 in the following directories in the given order: | ||
6 | -# - CMAKE_INSTALL_PREFIX | ||
7 | -# - KDEDIRS | ||
8 | -# - /opt/kde4 | ||
9 | -# - /opt/kde | ||
10 | +# CMAKE_INSTALL_PREFIX | ||
11 | +# KDEDIRS | ||
12 | +# /opt/kde4 | ||
13 | # | ||
14 | # Please look in FindKDE4Internal.cmake and KDE4Macros.cmake for more information. | ||
15 | # They are installed with the KDE 4 libraries in $KDEDIRS/share/apps/cmake/modules/. | ||
16 | @@ -14,6 +13,7 @@ | ||
17 | |||
18 | # For KDE4 kde-config has been renamed to kde4-config | ||
19 | FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config | ||
20 | + PATH_SUFFIXES bin # the suffix is for the paths coming from KDEDIRS | ||
21 | PATHS | ||
22 | ${CMAKE_INSTALL_PREFIX}/bin | ||
23 | ${_KDEDIRS} | ||
24 | @@ -21,14 +21,11 @@ | ||
25 | NO_DEFAULT_PATH | ||
26 | ) | ||
27 | |||
28 | - | ||
29 | -IF (NOT KDE4_KDECONFIG_EXECUTABLE) | ||
30 | - FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config ) | ||
31 | -ENDIF (NOT KDE4_KDECONFIG_EXECUTABLE) | ||
32 | +FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config ) | ||
33 | |||
34 | IF (KDE4_KDECONFIG_EXECUTABLE) | ||
35 | # then ask kde4-config for the kde data dirs | ||
36 | - EXEC_PROGRAM(${KDE4_KDECONFIG_EXECUTABLE} ARGS --path data OUTPUT_VARIABLE _data_DIR ) | ||
37 | + EXECUTE_PROCESS(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) | ||
38 | |||
39 | FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR) | ||
40 | |||
41 | @@ -52,7 +49,7 @@ | ||
42 | FIND_PACKAGE(KDE4Internal ${_req} ${_quiet}) | ||
43 | ELSE (KDE4_DATA_DIR) | ||
44 | IF (KDE4_FIND_REQUIRED) | ||
45 | - MESSAGE(FATAL_ERROR "ERROR: cmake/modules/FindKDE4Internal.cmake not found in ${_data_DIR}") | ||
46 | + MESSAGE(FATAL_ERROR "ERROR: cmake/modules/FindKDE4Internal.cmake not found in ${_data_DIR}") | ||
47 | ENDIF (KDE4_FIND_REQUIRED) | ||
48 | ENDIF (KDE4_DATA_DIR) | ||
49 |