From f5f5a9dfda4a2120f1a83693858b878ac39cadba Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 19 Apr 2021 23:15:36 +0200
Subject: [PATCH] [conan] Bump Qt to 5.15 on Linux and Mac.
---
scripts/cmake/ConanSetup.cmake | 9 ++++++++-
web/data/versions.json | 3 ++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index 4e635f48211..1718ef41016 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -48,12 +48,16 @@ if(OGS_USE_MFRONT)
endif()
if(OGS_BUILD_GUI)
+ set(QT_VERSION ${ogs.minimum_version.qt})
+ if(UNIX)
+ set(QT_VERSION ${ogs.tested_version.qt})
+ endif()
set(CONAN_REQUIRES ${CONAN_REQUIRES}
# libgeotiff/1.4.2@bilke/stable # TODO
# Overrides for dependency mismatches
bzip2/1.0.8
zlib/1.2.11
- qt/${ogs.minimum_version.qt}@bincrafters/stable
+ qt/${QT_VERSION}@bincrafters/stable
)
set(CONAN_OPTIONS ${CONAN_OPTIONS}
qt:qtxmlpatterns=True
@@ -71,6 +75,9 @@ if(OGS_BUILD_GUI)
if(MSVC)
set(CONAN_OPTIONS ${CONAN_OPTIONS} qt:with_harfbuzz=False)
endif()
+ if(UNIX AND NOT APPLE)
+ list(APPEND CONAN_OPTIONS qt:qtx11extras=True)
+ endif()
endif()
if(OGS_USE_NETCDF)
diff --git a/web/data/versions.json b/web/data/versions.json
index dde12df8ea8..ba7c184a271 100644
--- a/web/data/versions.json
+++ b/web/data/versions.json
@@ -24,7 +24,8 @@
"libxml2": "2.9.10"
},
"tested_version": {
- "ubuntu": "20.04"
+ "ubuntu": "20.04",
+ "qt": "5.15.2"
},
"ctest": {
"large_runtime": 60
--
GitLab