Commit 17ee33b2 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'master' into Fix_branding

parents 3197a612 e694aae7
......@@ -79,6 +79,17 @@ if (NOT QT5_FOUND)
message(FATAL_ERROR "Could not found any QT Version. Please specify QT5_INSTALL_PATH (path to bin and include dir) to build with QT5")
endif()
if ( WIN32 )
OPTION(USE_UNSUPPORTED_QT "Build OpenFlipper with an unsupported version of Qt e.g. if you fixed the moc issue on 5.8.0 yourself" OFF)
if ( ${Qt5Core_VERSION_STRING} STREQUAL "5.8.0" )
if(USE_UNSUPPORTED_QT)
message(WARNING "You appear to be using Qt 5.8.0 on a Windows System.\n On Windows, this version of Qt causes a problem regarding moc generation.\n You are using this Qt Version on Windows at your own risk and without support." )
else()
message(FATAL_ERROR "You appear to be using Qt 5.8.0 on a Windows System.\n On Windows, this version of Qt causes a problem regarding moc generation.\n Please use another version of Qt, or set the USE_UNSUPPORTED_QT flag")
endif()
endif()
endif()
set (OF_MAX_QT_VERSION "5.9.0")
if (${Qt5Core_VERSION_STRING} STRGREATER ${OF_MAX_QT_VERSION})
......
Subproject commit b9a71409e9a4a2088e968c11b0ce24dfa57e8b19
Subproject commit 0170f762441c028e9abb8a51ae33a77a4c03798b
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