diff options
Diffstat (limited to 'modules/FindKDE4Internal.cmake')
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 47 |
1 files changed, 10 insertions, 37 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index d8df175e..83213217 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -16,7 +16,7 @@ # compile KDE software: # # KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable -# KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable +# KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable # KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable # @@ -238,9 +238,10 @@ set(QT_MIN_VERSION "4.4.0") #this line includes FindQt4.cmake, which searches the Qt library and headers find_package(Qt4 REQUIRED) -# automoc4 (from kdesupport) is not yet required, but will be in June -# until then still automoc from kdelibs is used as fallback, Alex -find_package(Automoc4) +# automoc4 (from kdesupport) is now required, Alex +find_package(Automoc4 REQUIRED) +# use automoc4 from kdesupport +set(KDE4_AUTOMOC_EXECUTABLE "${AUTOMOC4_EXECUTABLE}" ) # Perl is required for building KDE software, find_package(Perl REQUIRED) @@ -287,26 +288,12 @@ if (_kdeBootStrapping) # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) - # use automoc4 from kdesupport if it has been found - if(AUTOMOC4_EXECUTABLE) - set(KDE4_AUTOMOC_EXECUTABLE "${AUTOMOC4_EXECUTABLE}" ) - else(AUTOMOC4_EXECUTABLE) - set(KDE4_AUTOMOC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc ) - endif(AUTOMOC4_EXECUTABLE) - set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 ) set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets ) else (WIN32) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell ) - # use automoc4 from kdesupport if it has been found - if(AUTOMOC4_EXECUTABLE) - set(KDE4_AUTOMOC_EXECUTABLE "${AUTOMOC4_EXECUTABLE}" ) - else(AUTOMOC4_EXECUTABLE) - set(KDE4_AUTOMOC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc.shell ) - endif(AUTOMOC4_EXECUTABLE) - set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell ) set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell ) endif (WIN32) @@ -318,19 +305,12 @@ if (_kdeBootStrapping) set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets) set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4) - if(AUTOMOC4_EXECUTABLE) - set( _KDE4_AUTOMOC_EXECUTABLE_DEP) - else(AUTOMOC4_EXECUTABLE) - set( _KDE4_AUTOMOC_EXECUTABLE_DEP kde4automoc) - endif(AUTOMOC4_EXECUTABLE) - set(KDE4_INSTALLED_VERSION_OK TRUE) else (_kdeBootStrapping) # ... but NOT otherwise set( _KDE4_KCONFIG_COMPILER_DEP) - set( _KDE4_AUTOMOC_EXECUTABLE_DEP) set( _KDE4_MAKEKDEWIDGETS_DEP) set( _KDE4_MEINPROC_EXECUTABLE_DEP) @@ -455,13 +435,6 @@ else (_kdeBootStrapping) find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler ) - if (AUTOMOC4_EXECUTABLE) - set(KDE4_AUTOMOC_EXECUTABLE "${AUTOMOC4_EXECUTABLE}") - else (AUTOMOC4_EXECUTABLE) - find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) - find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc ) - endif (AUTOMOC4_EXECUTABLE) - find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 ) @@ -1091,11 +1064,11 @@ macro (KDE4_PRINT_RESULTS) message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor") endif(KDE4_KCFGC_EXECUTABLE) - if(KDE4_AUTOMOC_EXECUTABLE) - message(STATUS "Found KDE4 automoc: ${KDE4_AUTOMOC_EXECUTABLE}") - else(KDE4_AUTOMOC_EXECUTABLE) - message(STATUS "Didn't find the KDE4 automoc") - endif(KDE4_AUTOMOC_EXECUTABLE) + if(AUTOMOC4_EXECUTABLE) + message(STATUS "Found automoc4: ${AUTOMOC4_EXECUTABLE}") + else(AUTOMOC4_EXECUTABLE) + message(STATUS "Didn't find the automoc4") + endif(AUTOMOC4_EXECUTABLE) endmacro (KDE4_PRINT_RESULTS) |