diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 4e635f4821154b61551b9187e7a2c01db97d778a..1718ef41016fc49f0e50d3d3698f16385048b4ff 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -48,12 +48,16 @@ if(OGS_USE_MFRONT) endif() if(OGS_BUILD_GUI) + set(QT_VERSION ${ogs.minimum_version.qt}) + if(UNIX) + set(QT_VERSION ${ogs.tested_version.qt}) + endif() set(CONAN_REQUIRES ${CONAN_REQUIRES} # libgeotiff/1.4.2@bilke/stable # TODO # Overrides for dependency mismatches bzip2/1.0.8 zlib/1.2.11 - qt/${ogs.minimum_version.qt}@bincrafters/stable + qt/${QT_VERSION}@bincrafters/stable ) set(CONAN_OPTIONS ${CONAN_OPTIONS} qt:qtxmlpatterns=True @@ -71,6 +75,9 @@ if(OGS_BUILD_GUI) if(MSVC) set(CONAN_OPTIONS ${CONAN_OPTIONS} qt:with_harfbuzz=False) endif() + if(UNIX AND NOT APPLE) + list(APPEND CONAN_OPTIONS qt:qtx11extras=True) + endif() endif() if(OGS_USE_NETCDF) diff --git a/web/data/versions.json b/web/data/versions.json index dde12df8ea81025f3523aae31d7be7f3d4f87cc1..ba7c184a27140d5b1bf2cbe5cfb76c05d16e3a30 100644 --- a/web/data/versions.json +++ b/web/data/versions.json @@ -24,7 +24,8 @@ "libxml2": "2.9.10" }, "tested_version": { - "ubuntu": "20.04" + "ubuntu": "20.04", + "qt": "5.15.2" }, "ctest": { "large_runtime": 60