Commit f1be4187 authored by Jan Möbius's avatar Jan Möbius

Updated to support Qt 5.9

parent c4b50e80
Pipeline #5197 canceled with stage
in 25 minutes and 25 seconds
......@@ -20,9 +20,9 @@ set( CMAKE_CXX_STANDARD 11 )
# ACG Environment default settings
# This is ugly but currently we need to work around the default installed 5.3 on debian
if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.8.0/5.8/gcc_64/ )
if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.9.0/5.9/gcc_64/ )
# Default to this install path for QT%_INSTALL_DIR
set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.8.0/5.8/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment" )
set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.9.0/5.9/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment" )
endif()
if ( WIN32 )
......@@ -64,9 +64,36 @@ file (
GLOB _more_macro_directories
"${CMAKE_SOURCE_DIR}/Package-*/cmake"
)
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${_more_macro_directories})
# ========================================================================
# QT Setup
# ========================================================================
# Qt setup
include(ACGQt)
acg_qt5 ()
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()
set (OF_MAX_QT_VERSION "5.9.0")
if (${Qt5Core_VERSION_STRING} STRGREATER ${OF_MAX_QT_VERSION})
message(WARNING "Detected QT Version higher than ${OF_MAX_QT_VERSION}!\n" "OpenFlipper has not been tested with this QT Version.")
endif()
# ========================================================================
# ========================================================================
# include our cmake files
include (ACGCommon)
include (MSVCMacros)
acg_get_version (OpenFlipper)
# ========================================================================
# Branding
# ========================================================================
......@@ -118,36 +145,6 @@ endif ()
add_definitions(-DPRODUCT_STRING=${OPENFLIPPER_PRODUCT_STRING})
add_definitions(-DPRODUCT_NAME=${OPENFLIPPER_PRODUCT_NAME})
# ========================================================================
# QT Setup
# ========================================================================
# Qt setup
include(ACGQt)
acg_qt5 ()
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()
set (OF_MAX_QT_VERSION "5.6.0")
if (${Qt5Core_VERSION_STRING} STRGREATER ${OF_MAX_QT_VERSION})
message(WARNING "Detected QT Version higher than ${OF_MAX_QT_VERSION}!\n" "OpenFlipper has not been tested with this QT Version.")
endif()
# ========================================================================
# ========================================================================
# include our cmake files
include (ACGCommon)
include (MSVCMacros)
acg_get_version (OpenFlipper)
# ========================================================================
# ========================================================================
......
Subproject commit edf2c337b5a6e2a1d8e4019f91b47a0a04dd5300
Subproject commit cb07a9a6f6eaf95e88fdd47bc99ceeaf896972b3
Subproject commit 9c05edd439a60dd93e9d6a3ddefdf08c4706b39a
Subproject commit 6064e66fe93e2a2a21d1af962e47003d13ce7115
Subproject commit 581c214047e6d145d78a490d04bfaa98a07fe0b1
Subproject commit 0ad773b639e8d1820c62bb2af228782cbed00d76
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