From e95f3c6eb1ea91575e16b07ff223236554c1f64f Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Wed, 17 Jul 2019 15:11:01 +0200 Subject: [PATCH] [Conan] Try qt/5.12.4@bincrafters/stable --- scripts/cmake/ConanSetup.cmake | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index f6308fecbd7..52e0c235fe8 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -65,12 +65,24 @@ if(OGS_BUILD_GUI) set(CONAN_REQUIRES ${CONAN_REQUIRES} shapelib/1.3.0@bilke/stable libgeotiff/1.4.2@bilke/stable - qt/5.11.3@bincrafters/stable + qt/5.12.4@bincrafters/stable ) set(CONAN_OPTIONS ${CONAN_OPTIONS} vtk:minimal=False 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 + qt:with_mysql=False + qt:with_odbc=False + qt:with_openal=False + qt:with_pq=False + qt:with_sdl2=False + qt:with_sqlite3=False + qt:with_freetype=False ) endif() -- GitLab