From 2647fc6516db632e9dd1cf3603f36d1091c1bdff Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 18 Jul 2019 12:16:05 +0200
Subject: [PATCH] Test addition of pkg-config for qt.
---
scripts/cmake/ConanSetup.cmake | 2 --
scripts/docker/Dockerfile.gcc.gui | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index c5330982a70..78a3095a3d7 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -72,7 +72,6 @@ if(OGS_BUILD_GUI)
vtk:qt=True
qt:qtxmlpatterns=True
qt:openssl=False
- qt:with_harfbuzz=False
qt:with_libalsa=False
qt:with_libjpeg=False
#qt:with_libpng=False
@@ -82,7 +81,6 @@ if(OGS_BUILD_GUI)
qt:with_pq=False
qt:with_sdl2=False
qt:with_sqlite3=False
- qt:with_freetype=False
)
endif()
diff --git a/scripts/docker/Dockerfile.gcc.gui b/scripts/docker/Dockerfile.gcc.gui
index dcc34b8ebb8..32f2b16e04f 100644
--- a/scripts/docker/Dockerfile.gcc.gui
+++ b/scripts/docker/Dockerfile.gcc.gui
@@ -114,7 +114,7 @@ LABEL ccache.dir=/opt/cache \
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
- sudo && \
+ sudo pkg-config && \
rm -rf /var/lib/apt/lists/*
# Jenkins node
--
GitLab