From 717474242f1e49978eeb4be78d1bc472aa8de9dd Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 13 Aug 2019 09:40:50 +0200
Subject: [PATCH] [Conan] Temp. fix for Conan bzip2 requirement.
https://github.com/bincrafters/conan-pcre/commit/e71042946a51c00f45e60c6f1696e3c47198965a
Fixes #2603.
---
scripts/cmake/ConanSetup.cmake | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index c28bb036dff..3235621be37 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -66,6 +66,8 @@ if(OGS_BUILD_GUI)
shapelib/1.3.0@bilke/stable
libgeotiff/1.4.2@bilke/stable
qt/5.12.4@bincrafters/stable
+ # Overwrite VTK requirement to match Qt requirement
+ bzip2/1.0.8@conan/stable
)
set(CONAN_OPTIONS ${CONAN_OPTIONS}
vtk:minimal=False
--
GitLab