From e94fccbbd7d16d6075a1bfc38c06c8a2507ecf96 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 24 Feb 2021 20:17:51 +0100
Subject: [PATCH] [ogs] Bumped qt to 5.15.2
---
ogscm/recipes/ogs.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/ogscm/recipes/ogs.py b/ogscm/recipes/ogs.py
index a6230a3..fb021cf 100644
--- a/ogscm/recipes/ogs.py
+++ b/ogscm/recipes/ogs.py
@@ -284,7 +284,7 @@ if local_args.ogs != "clean":
)
# TODO: will not work with clang
qt_install_dir = "/opt/qt"
- qt_version = "5.14.2"
+ qt_version = "5.15.2"
qt_dir = f"{qt_install_dir}/{qt_version}/gcc_64"
Stage0 += pip(pip="pip3", packages=["aqtinstall"])
Stage0 += shell(
@@ -309,9 +309,7 @@ if local_args.ogs != "clean":
)
vtk_cmake_args = [
- "-DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF",
- "-DVTK_Group_Qt=ON",
- "-DVTK_QT_VERSION=5",
+ "-DVTK_GROUP_ENABLE_Qt=YES",
]
if hpccm.config.g_linux_distro == linux_distro.CENTOS:
# otherwise linker error, maybe due to gcc 10?
--
GitLab