Merge pull request #2005 from SCIInstitute/qt4-tag

Mark end of Qt4 compatibility

Author: dcwhite

Superbuild/CMakeLists.txt

@@ -1,21 +1,21 @@
 #  For more information, please see: http://software.sci.utah.edu
-# 
+#
 #  The MIT License
-# 
+#
 #  Copyright (c) 2015 Scientific Computing and Imaging Institute,
 #  University of Utah.
-# 
-#  
+#
+#
 #  Permission is hereby granted, free of charge, to any person obtaining a
 #  copy of this software and associated documentation files (the "Software"),
 #  to deal in the Software without restriction, including without limitation
 #  the rights to use, copy, modify, merge, publish, distribute, sublicense,
 #  and/or sell copies of the Software, and to permit persons to whom the
 #  Software is furnished to do so, subject to the following conditions:
-# 
+#
 #  The above copyright notice and this permission notice shall be included
-#  in all copies or substantial portions of the Software. 
-# 
+#  in all copies or substantial portions of the Software.
+#
 #  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 #  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 #  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@@ -24,8 +24,7 @@
 #  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 #  DEALINGS IN THE SOFTWARE.
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7 FATAL_ERROR)
-#CMAKE_MINIMUM_REQUIRED(VERSION 3.0 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.6 FATAL_ERROR)
 
 IF(POLICY CMP0043)
   CMAKE_POLICY(SET CMP0043 OLD)
@@ -37,4 +36,3 @@ ENDIF()
 PROJECT(Superbuild)
 
 INCLUDE(${CMAKE_SOURCE_DIR}/Superbuild.cmake)
-

Superbuild/Superbuild.cmake

@@ -44,13 +44,6 @@ ENDIF()
 
 INCLUDE( ExternalProject )
 
-# Compute -G arg for configuring external projects with the same CMake generator:
-#if(CMAKE_EXTRA_GENERATOR)
-#  set(gen "${CMAKE_EXTRA_GENERATOR} - ${CMAKE_GENERATOR}")
-#else()
-#  set(gen "${CMAKE_GENERATOR}" )
-#endif()
-
 ###########################################
 # DETERMINE ARCHITECTURE
 # In order for the code to depend on the architecture settings
@@ -99,9 +92,6 @@ OPTION(BUILD_HEADLESS "Build SCIRun without GUI." OFF)
 # Configure Qt version
 
 SET(QT5_BUILD_DEFAULT ON)
-IF(APPLE) # Until ViewScene works...
-  SET(QT5_BUILD_DEFAULT OFF)
-ENDIF()
 OPTION(QT5_BUILD "Qt 5 compatible build" ${QT5_BUILD_DEFAULT})
 MARK_AS_ADVANCED(QT5_BUILD)
 
@@ -132,17 +122,14 @@ ENDIF()
 # Configure Qt
 IF(NOT BUILD_HEADLESS)
   IF (NOT QT5_BUILD)
-    SET(QT_MIN_VERSION "4.8.1")
+    SET(QT_MIN_VERSION "4.8.6")
     INCLUDE(FindQt4)
     FIND_PACKAGE(Qt4 COMPONENTS QtMain QtCore QtGui QtNetwork REQUIRED)
     SET(QT_USE_QTOPENGL TRUE)
 
     IF(QT4_FOUND)
       MESSAGE(STATUS "QTVERSION=${QTVERSION}")
       MESSAGE(STATUS "Found use file: ${QT_USE_FILE}")
-      IF(APPLE AND ${QTVERSION} VERSION_EQUAL 4.8 AND ${QTVERSION} VERSION_LESS 4.8.5)
-        MESSAGE(WARNING "Qt 4.8 versions earlier than 4.8.3 contain a bug that disables menu items under some circumstances. Upgrade to a more recent version.")
-      ENDIF()
     ELSE()
       MESSAGE(FATAL_ERROR "QT ${QT_MIN_VERSION} or later is required for building the SCIRun GUI")
     ENDIF()

src/CMakeLists.txt

@@ -68,13 +68,6 @@ ENDIF()
 OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
 MARK_AS_ADVANCED(BUILD_SHARED_LIBS)
 
-########################################################################
-# Headless build
-#
-#OPTION(BUILD_HEADLESS "Build headless version, without Qt" OFF)
-#MARK_AS_ADVANCED(BUILD_HEADLESS)
-
-
 ########################################################################
 # Set default CMAKE_BUILD_TYPE
 # if empty for Unix Makefile builds
@@ -483,7 +476,6 @@ IF(QT5_BUILD)
   ADD_DEFINITIONS(-DQT5_BUILD)
 ENDIF()
 
-# TODO: exclude for headless
 IF(NOT BUILD_HEADLESS)
   IF(NOT QT5_BUILD)
     FIND_PACKAGE(Qt4 COMPONENTS QtMain QtCore QtGui QtNetwork QtOpenGL QtSvg REQUIRED)
@@ -508,34 +500,33 @@ IF(NOT BUILD_HEADLESS)
 
     IF(Qt5Core_FOUND)
       MESSAGE(STATUS "Found Qt version: ${Qt5Core_VERSION_STRING}")
-	  ADD_DEFINITIONS(-DQT5_VERSION=${Qt5Core_VERSION_STRING})
-	  INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})
+	    ADD_DEFINITIONS(-DQT5_VERSION=${Qt5Core_VERSION_STRING})
+	    INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})
   	  INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDE_DIRS})
       INCLUDE_DIRECTORIES(${Qt5Gui_INCLUDE_DIRS})
       INCLUDE_DIRECTORIES(${Qt5Network_INCLUDE_DIRS})
       INCLUDE_DIRECTORIES(${Qt5OpenGL_INCLUDE_DIRS})
       INCLUDE_DIRECTORIES(${Qt5Concurrent_INCLUDE_DIRS})
-	  INCLUDE_DIRECTORIES(${Qt5PrintSupport_INCLUDE_DIRS})
+	    INCLUDE_DIRECTORIES(${Qt5PrintSupport_INCLUDE_DIRS})
       INCLUDE_DIRECTORIES(${Qt5Svg_INCLUDE_DIRS})
       ADD_DEFINITIONS(${Qt5Core_DEFINITIONS})
       ADD_DEFINITIONS(${Qt5Widgets_DEFINITIONS})
       ADD_DEFINITIONS(${Qt5Gui_DEFINITIONS})
       ADD_DEFINITIONS(${Qt5Network_DEFINITIONS})
       ADD_DEFINITIONS(${Qt5OpenGL_DEFINITIONS})
       ADD_DEFINITIONS(${Qt5Concurrent_DEFINITIONS})
-	  ADD_DEFINITIONS(${Qt5PrintSupport_DEFINITIONS})
-	  ADD_DEFINITIONS(${Qt5Svg_DEFINITIONS})
+	    ADD_DEFINITIONS(${Qt5PrintSupport_DEFINITIONS})
+	    ADD_DEFINITIONS(${Qt5Svg_DEFINITIONS})
       SET(QT_LIBRARIES Qt5::Widgets)
     ELSE()
       MESSAGE(FATAL_ERROR "Qt5 is required for building the SCIRun GUI")
     ENDIF()
 
     IF(Qt5Core_FOUND)
       INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
-      #INCLUDE(${QT_USE_FILE})
       ADD_DEFINITIONS(${QT_DEFINITIONS})
     ELSE()
-      MESSAGE(FATAL_ERROR "QT 5.8 or greater is required to build SCIRun")
+      MESSAGE(FATAL_ERROR "QT 5.13 or greater is required to build SCIRun")
     ENDIF()
   ENDIF()