diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindQt4.cmake | 22 | ||||
| -rw-r--r-- | modules/KDE4Macros.cmake | 3 |
2 files changed, 16 insertions, 9 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index cedcdb3c..b73ed284 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -167,6 +167,9 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake-qt4 PATHS $ENV{QTDIR}/bin ) +SET(QT4_INSTALLED_VERSION_TOO_OLD FALSE) + + IF (QT_QMAKE_EXECUTABLE) SET(QT4_QMAKE_FOUND FALSE) @@ -208,7 +211,7 @@ IF (QT_QMAKE_EXECUTABLE) IF (found_vers LESS req_vers) SET(QT4_QMAKE_FOUND FALSE) - MESSAGE(FATAL_ERROR "The installed QT version (${QTVERSION}) is to old , at least version (${QT_MIN_VERSION}) is required") + SET(QT4_INSTALLED_VERSION_TOO_OLD TRUE) ELSE (found_vers LESS req_vers) SET(QT4_QMAKE_FOUND TRUE) ENDIF (found_vers LESS req_vers) @@ -824,11 +827,16 @@ IF (QT4_QMAKE_FOUND) ELSE(QT4_QMAKE_FOUND) - IF(QT_QMAKE_EXECUTABLE) - MESSAGE("QT_QMAKE_EXECUTABLE set to qmake version: QTVERSION = ${QTVERSION}\nQT_QMAKE_EXECUTABLE = ${QT_QMAKE_EXECUTABLE}, please set to path to qmake from qt4.") - ENDIF(QT_QMAKE_EXECUTABLE) - IF(Qt4_FIND_REQUIRED) - MESSAGE( FATAL_ERROR "Qt qmake not found!") - ENDIF(Qt4_FIND_REQUIRED) + IF(Qt4_FIND_REQUIRED) + IF(QT4_INSTALLED_VERSION_TOO_OLD) + MESSAGE(FATAL_ERROR "The installed Qt version ${QTVERSION} is too old, at least version ${QT_MIN_VERSION} is required") + ELSE(QT4_INSTALLED_VERSION_TOO_OLD) + MESSAGE( FATAL_ERROR "Qt qmake not found!") + ENDIF(QT4_INSTALLED_VERSION_TOO_OLD) + ELSE(Qt4_FIND_REQUIRED) + IF(QT4_INSTALLED_VERSION_TOO_OLD AND NOT Qt4_FIND_QUIETLY) + MESSAGE(STATUS "The installed Qt version ${QTVERSION} is too old, at least version ${QT_MIN_VERSION} is required") + ENDIF(QT4_INSTALLED_VERSION_TOO_OLD AND NOT Qt4_FIND_QUIETLY) + ENDIF(Qt4_FIND_REQUIRED) ENDIF (QT4_QMAKE_FOUND) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 1a6a356f..716d6379 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -403,14 +403,13 @@ macro (KDE4_HANDLE_RPATH _target_NAME _type) get_target_property(_executable ${_target_NAME} LOCATION ) # use add_custom_target() to have the sh-wrapper generated during build time instead of cmake time - add_custom_target(${_target_NAME}sh_target + add_custom_command(TARGET ${_target_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -D_filename=${_executable}.sh -D_library_path_variable=${_library_path_variable} -D_ld_library_path="${_ld_library_path}" -D_executable=${_executable} -P ${KDE4_MODULE_DIR}/kde4_exec_via_sh.cmake ) - add_dependencies(${_target_NAME} ${_target_NAME}sh_target) macro_additional_clean_files(${_executable}.sh) endif (UNIX) |