From 2f0b16f2300def79267512d1c6ebc4cf01ba011c Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 15 Oct 2018 21:38:30 +0200
Subject: [PATCH] [Conan] Bump Qt to 5.11.2.
See
https://bugreports.qt.io/browse/QTBUG-71004?jql=project%20%3D%20QTBUG%20AND%20fi
xVersion%20%3D%205.11.2
---
scripts/cmake/ConanSetup.cmake | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index edd4ac0194a..1a47200751d 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -59,10 +59,14 @@ if(OGS_USE_LIS)
endif()
if(OGS_BUILD_GUI)
+ set(QT_VERSION 5.11.0)
+ if(MSVC)
+ set(QT_VERSION 5.11.2)
+ endif()
set(CONAN_REQUIRES ${CONAN_REQUIRES}
Shapelib/1.3.0@bilke/stable
libgeotiff/1.4.2@bilke/stable
- Qt/5.11.0@bilke/stable
+ Qt/${QT_VERSION}@bilke/stable
)
set(CONAN_OPTIONS ${CONAN_OPTIONS}
VTK:minimal=False
--
GitLab