Skip to content
Snippets Groups Projects
Commit cd5fff61 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

CMake: Unify Qt configuration; require Qt 5.5.1

parent bc12d249
No related branches found
No related tags found
No related merge requests found
......@@ -9,12 +9,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
add_compile_options(-Wall -Wextra -Wpedantic)
endif()
find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets OpenGL)
if(${Qt5Core_VERSION} VERSION_LESS "5.5.1")
message (FATAL_ERROR "Qt 5.5.1+ is required, have ${Qt5Core_VERSION_STRING}")
endif()
set(include_dirs ${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${include_dirs})
......
......@@ -9,16 +9,9 @@ find_package(Qt5Svg REQUIRED)
message(STATUS "Found Qt5 version ${Qt5Widgets_VERSION}")
if(${Qt5Widgets_VERSION_MINOR} LESS 4)
message(FATAL_ERROR "Qt5 version 5.4 required")
endif()
# checking 3D
if(BORNAGAIN_OPENGL)
if(${Qt5Widgets_VERSION_MINOR} LESS 5)
message(WARNING "3D in BornAgain requires Qt=5.5.1+. Switching 3D support off: BORNAGAIN_OPENGL=OFF.")
set(BORNAGAIN_OPENGL OFF)
endif()
if(${Qt5Core_VERSION} VERSION_LESS "5.5.1")
# required for OpenGL, hence for ba3d
message (FATAL_ERROR "Qt 5.5.1+ is required, have ${Qt5Core_VERSION_STRING}")
endif()
if(BORNAGAIN_OPENGL)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment