diff --git a/CMakeLists.txt b/CMakeLists.txt index 824930b64..b7cec8036 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,7 @@ ENDIF() # base string used in release and unstable builds SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH} ) -SET(TOMAHAWK_VERSION_SHORT "${TOMAHAWK_VERSION}") +SET( TOMAHAWK_VERSION_SHORT "${TOMAHAWK_VERSION}" ) IF( TOMAHAWK_VERSION_RC ) SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}rc${TOMAHAWK_VERSION_RC} ) ENDIF() @@ -108,32 +108,35 @@ else() endif() -find_package(Qt5Core QUIET) -if(Qt5Core_DIR) - find_package(Qt5Widgets QUIET) - message(STATUS "Found Qt5! Be aware that Qt5-support is still experimental and not officially supported!") +if(NOT BUILD_WITH_QT4) + find_package(Qt5Core QUIET) + if(Qt5Core_DIR) + find_package(Qt5Widgets QUIET) + message(STATUS "Found Qt5! Be aware that Qt5-support is still experimental and not officially supported!") - macro(qt_wrap_ui) - qt5_wrap_ui(${ARGN}) - endmacro() + macro(qt_wrap_ui) + qt5_wrap_ui(${ARGN}) + endmacro() - macro(qt_add_resources) - qt5_add_resources(${ARGN}) - endmacro() + macro(qt_add_resources) + qt5_add_resources(${ARGN}) + endmacro() - find_package(Qt5LinguistTools REQUIRED) - macro(qt_add_translation) - qt5_add_translation(${ARGN}) - endmacro() + find_package(Qt5LinguistTools REQUIRED) + macro(qt_add_translation) + qt5_add_translation(${ARGN}) + endmacro() - macro(setup_qt) - endmacro() + macro(setup_qt) + endmacro() - set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}") - #FIXME: CrashReporter depends on deprecated QHttp - set(WITH_CRASHREPORTER OFF) - set(WITH_BREAKPAD OFF) -else() + set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}") + #FIXME: CrashReporter depends on deprecated QHttp + set(WITH_CRASHREPORTER OFF) + set(WITH_BREAKPAD OFF) + endif() +endif() +if(NOT Qt5Core_DIR) message(STATUS "Could not find Qt5, searching for Qt4 instead...") set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork")