Commit c6a04120 authored by jcfr's avatar jcfr

COMP: Add experimental support for Qt 4.8.4

The build system now checks with the discovered Qt version is either
Qt 4.7.4 or Qt 4.8.4.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21727 3bd1e089-480b-0410-8dfb-8563597acbee
parent fa248cf5
......@@ -26,12 +26,13 @@
macro(__SlicerBlockFindQtAndCheckVersion_find_qt)
find_package(Qt4)
if(NOT QT4_FOUND)
message(FATAL_ERROR "error: Qt ${Slicer_REQUIRED_QT_VERSION} was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable.")
message(FATAL_ERROR "error: Qt ${Slicer_REQUIRED_QT_VERSION} or Qt ${Slicer_EXPERIMENTAL_QT_VERSION} was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable.")
endif()
# Check version
if(NOT "${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}" VERSION_EQUAL "${Slicer_REQUIRED_QT_VERSION}")
message(FATAL_ERROR "error: Slicer requires Qt ${Slicer_REQUIRED_QT_VERSION} -- you cannot use Qt ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}. ${extra_error_message}")
if(NOT "${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}" VERSION_EQUAL "${Slicer_REQUIRED_QT_VERSION}"
AND NOT "${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}" VERSION_EQUAL "${Slicer_EXPERIMENTAL_QT_VERSION}")
message(FATAL_ERROR "error: Slicer requires Qt ${Slicer_REQUIRED_QT_VERSION} or Qt ${Slicer_EXPERIMENTAL_QT_VERSION}-- you cannot use Qt ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}. ${extra_error_message}")
endif()
set(command_separated_module_list)
......
......@@ -154,11 +154,12 @@ if(NOT GIT_FOUND)
endif()
#-----------------------------------------------------------------------------
# Qt - Slicer_REQUIRED_QT_VERSION
# Qt requirements
#-----------------------------------------------------------------------------
if(NOT DEFINED Slicer_REQUIRED_QT_VERSION)
set(Slicer_REQUIRED_QT_VERSION "4.7.4" CACHE STRING "Exact required Qt version" FORCE)
endif()
set(Slicer_EXPERIMENTAL_QT_VERSION "4.8.4")
#-----------------------------------------------------------------------------
# Superbuild Option - Enabled by default
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment