From 896d16ec7b86efef3b676c049668628d36c12711 Mon Sep 17 00:00:00 2001 From: Zion Nimchuk Date: Mon, 10 Feb 2020 08:57:23 -0800 Subject: [PATCH] Bump minimum Qt5 version to 5.14.0 in CMake --- 3rdparty/qt5.cmake | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/3rdparty/qt5.cmake b/3rdparty/qt5.cmake index 904ce2b73b..1c728cc06e 100644 --- a/3rdparty/qt5.cmake +++ b/3rdparty/qt5.cmake @@ -1,11 +1,11 @@ add_library(3rdparty_qt5 INTERFACE) -find_package(Qt5 5.11 CONFIG COMPONENTS Widgets Network Qml Concurrent) +find_package(Qt5 5.14 CONFIG COMPONENTS Widgets Network Qml Concurrent) if(WIN32) - find_package(Qt5 5.11 COMPONENTS WinExtras REQUIRED) + find_package(Qt5 5.14 COMPONENTS WinExtras REQUIRED) target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::WinExtras Qt5::Network Qt5::Qml Qt5::Concurrent) else() - find_package(Qt5 5.11 COMPONENTS DBus Gui) + find_package(Qt5 5.14 COMPONENTS DBus Gui) if(Qt5DBus_FOUND) target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::DBus Qt5::Network Qt5::Qml Qt5::Concurrent) target_compile_definitions(3rdparty_qt5 INTERFACE -DHAVE_QTDBUS) @@ -16,15 +16,15 @@ else() endif() if(NOT Qt5Widgets_FOUND) - if(Qt5Widgets_VERSION VERSION_LESS 5.11.0) - message("Minimum supported Qt5 version is 5.11.0! You have version ${Qt5Widgets_VERSION} installed, please upgrade!") + if(Qt5Widgets_VERSION VERSION_LESS 5.14.0) + message("Minimum supported Qt5 version is 5.14.0! You have version ${Qt5Widgets_VERSION} installed, please upgrade!") if(CMAKE_SYSTEM MATCHES "Linux") message(FATAL_ERROR "Most distros do not provide an up-to-date version of Qt. If you're on Ubuntu or Linux Mint, there are PPAs you can use to install one of the latest qt5 versions. - https://launchpad.net/~beineri/+archive/ubuntu/opt-qt-5.11.0-bionic - https://launchpad.net/~beineri/+archive/ubuntu/opt-qt-5.11.0-xenial + https://launchpad.net/~beineri/+archive/ubuntu/opt-qt-5.14.1-bionic + https://launchpad.net/~beineri/+archive/ubuntu/opt-qt-5.14.1-xenial just make sure to run - source /opt/qt511/bin/qt511-env.sh + source /opt/qt514/bin/qt514-env.sh before re-running cmake") elseif(WIN32) message(FATAL_ERROR "You can download the latest version of Qt5 here: https://www.qt.io/download-open-source/") @@ -35,7 +35,7 @@ before re-running cmake") message("CMake was unable to find Qt5!") if(WIN32) - message(FATAL_ERROR "Make sure the QTDIR env variable has been set properly. (for example C:\\Qt\\5.11.1\\msvc2017_64\\) + message(FATAL_ERROR "Make sure the QTDIR env variable has been set properly. (for example C:\\Qt\\5.14.1\\msvc2017_64\\) You can also try setting the Qt5_DIR preprocessor definiton.") elseif(CMAKE_SYSTEM MATCHES "Linux") message(FATAL_ERROR "Make sure to install your distro's qt5 package!")