View | Details | Raw Unified
Collapse All | Expand All

(-) Modules/FindKDE4.cmake.orig (-10 / +7 lines)
 Lines 1-9    Link Here  
# Find KDE4 and provide all necessary variables and macros to compile software for it.
# Find KDE4 and provide all necessary variables and macros to compile software for it.
# It looks for KDE 4 in the following directories in the given order:
# It looks for KDE 4 in the following directories in the given order:
# - CMAKE_INSTALL_PREFIX
 
#  CMAKE_INSTALL_PREFIX
 
# - KDEDIRS
 
#  KDEDIRS
 
# - /opt/kde4
 
#  /opt/kde4
 
# - /opt/kde
 

            

        
#
#

        
# Please look in FindKDE4Internal.cmake and KDE4Macros.cmake for more information.
# Please look in FindKDE4Internal.cmake and KDE4Macros.cmake for more information.

        
# They are installed with the KDE 4 libraries in $KDEDIRS/share/apps/cmake/modules/.
# They are installed with the KDE 4 libraries in $KDEDIRS/share/apps/cmake/modules/.

  

    

    

       Lines 14-19
       
    
  Link Here 
    

  

        

        
# 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}

  

    

    

       Lines 21-34
       
    
  Link Here 
    

  

        
   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

            

              
   EXEC_PROGRAM(${KDE4_KDECONFIG_EXECUTABLE} ARGS --path data OUTPUT_VARIABLE _data_DIR )

              
   EXECUTE_PROCESS(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)

            

        

        
   FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
   FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)

        

  

    

    

       Lines 52-58
       
    
  Link Here 
    

  

        
      FIND_PACKAGE(KDE4Internal ${_req} ${_quiet})
      FIND_PACKAGE(KDE4Internal ${_req} ${_quiet})

        
   ELSE (KDE4_DATA_DIR)
   ELSE (KDE4_DATA_DIR)

        
      IF (KDE4_FIND_REQUIRED)
      IF (KDE4_FIND_REQUIRED)

            

              
      MESSAGE(FATAL_ERROR "ERROR: cmake/modules/FindKDE4Internal.cmake not found in ${_data_DIR}")

              
         MESSAGE(FATAL_ERROR "ERROR: cmake/modules/FindKDE4Internal.cmake not found in ${_data_DIR}")

            

        
      ENDIF (KDE4_FIND_REQUIRED)
      ENDIF (KDE4_FIND_REQUIRED)

        
   ENDIF (KDE4_DATA_DIR)
   ENDIF (KDE4_DATA_DIR)