From f883b8ca17a43eaad35b3137cf9691ad709e14e4 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 10 Jun 2020 13:57:14 +0200
Subject: [PATCH] Fix qt packages on centos.
---
ogscm/cli.py | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/ogscm/cli.py b/ogscm/cli.py
index d7082dc..966b7e2 100644
--- a/ogscm/cli.py
+++ b/ogscm/cli.py
@@ -254,10 +254,16 @@ def main(): # pragma: no cover
Stage0 += ogs_base()
if args.gui:
- Stage0 += packages(ospackages=[
- 'mesa-common-dev', 'libgl1-mesa-dev', 'libglu1-mesa-dev',
- 'libxt-dev'
- ])
+ Stage0 += packages(
+ apt=[
+ 'mesa-common-dev', 'libgl1-mesa-dev', 'libglu1-mesa-dev',
+ 'libxt-dev'
+ ],
+ yum=[
+ 'mesa-libOSMesa-devel', 'mesa-libGL-devel',
+ 'mesa-libGLU-devel', 'libXt-devel'
+ ]
+ )
if ogscm.config.g_package_manager == package_manager.CONAN:
Stage0 += cmake(eula=True, version='3.16.6')
conan_user_home = '/opt/conan'
@@ -308,9 +314,9 @@ def main(): # pragma: no cover
yum=[
'libgeotiff-devel',
'shapelib-devel',
- 'qt5-qtbase',
- 'qt5-qtxmlpatterns',
- 'qt5-qtx11extras'
+ 'qt5-qtbase-devel',
+ 'qt5-qtxmlpatterns-devel',
+ 'qt5-qtx11extras-devel'
])
vtk_cmake_args = [
'-DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF',
--
GitLab