Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 191412
Collapse All | Expand All

(-)Modules/FindKDE4.cmake.orig (-10 / +7 lines)
Lines 1-9 Link Here
1
# Find KDE4 and provide all necessary variables and macros to compile software for it.
1
# Find KDE4 and provide all necessary variables and macros to compile software for it.
2
# It looks for KDE 4 in the following directories in the given order:
2
# It looks for KDE 4 in the following directories in the given order:
3
# - CMAKE_INSTALL_PREFIX
3
#  CMAKE_INSTALL_PREFIX
4
# - KDEDIRS
4
#  KDEDIRS
5
# - /opt/kde4
5
#  /opt/kde4
6
# - /opt/kde
7
#
6
#
8
# Please look in FindKDE4Internal.cmake and KDE4Macros.cmake for more information.
7
# Please look in FindKDE4Internal.cmake and KDE4Macros.cmake for more information.
9
# They are installed with the KDE 4 libraries in $KDEDIRS/share/apps/cmake/modules/.
8
# They are installed with the KDE 4 libraries in $KDEDIRS/share/apps/cmake/modules/.
Lines 14-19 Link Here
14
13
15
# For KDE4 kde-config has been renamed to kde4-config
14
# For KDE4 kde-config has been renamed to kde4-config
16
FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
15
FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
16
   PATH_SUFFIXES bin               # the suffix is for the paths coming from KDEDIRS
17
   PATHS
17
   PATHS
18
   ${CMAKE_INSTALL_PREFIX}/bin
18
   ${CMAKE_INSTALL_PREFIX}/bin
19
   ${_KDEDIRS}
19
   ${_KDEDIRS}
Lines 21-34 Link Here
21
   NO_DEFAULT_PATH
21
   NO_DEFAULT_PATH
22
   )
22
   )
23
23
24
24
FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config )
25
IF (NOT KDE4_KDECONFIG_EXECUTABLE)
26
   FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config )
27
ENDIF (NOT KDE4_KDECONFIG_EXECUTABLE)
28
25
29
IF (KDE4_KDECONFIG_EXECUTABLE)
26
IF (KDE4_KDECONFIG_EXECUTABLE)
30
   # then ask kde4-config for the kde data dirs
27
   # then ask kde4-config for the kde data dirs
31
   EXEC_PROGRAM(${KDE4_KDECONFIG_EXECUTABLE} ARGS --path data OUTPUT_VARIABLE _data_DIR )
28
   EXECUTE_PROCESS(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
32
29
33
   FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
30
   FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
34
31
Lines 52-58 Link Here
52
      FIND_PACKAGE(KDE4Internal ${_req} ${_quiet})
49
      FIND_PACKAGE(KDE4Internal ${_req} ${_quiet})
53
   ELSE (KDE4_DATA_DIR)
50
   ELSE (KDE4_DATA_DIR)
54
      IF (KDE4_FIND_REQUIRED)
51
      IF (KDE4_FIND_REQUIRED)
55
      MESSAGE(FATAL_ERROR "ERROR: cmake/modules/FindKDE4Internal.cmake not found in ${_data_DIR}")
52
         MESSAGE(FATAL_ERROR "ERROR: cmake/modules/FindKDE4Internal.cmake not found in ${_data_DIR}")
56
      ENDIF (KDE4_FIND_REQUIRED)
53
      ENDIF (KDE4_FIND_REQUIRED)
57
   ENDIF (KDE4_DATA_DIR)
54
   ENDIF (KDE4_DATA_DIR)
58
55

Return to bug 191412