diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker index a24d8405cdbb64e15d78a3f21f64c8fc84b82f76..4adc2e1845d38d05c1eefaf422ba431d90dc6002 160000 --- a/ThirdParty/container-maker +++ b/ThirdParty/container-maker @@ -1 +1 @@ -Subproject commit a24d8405cdbb64e15d78a3f21f64c8fc84b82f76 +Subproject commit 4adc2e1845d38d05c1eefaf422ba431d90dc6002 diff --git a/ThirdParty/xdmfdiff b/ThirdParty/xdmfdiff index 428760e717acef51fdedcc2bf3e56474c1b971ef..b2928dd75bbea23640438648b8a0170dc1ed752d 160000 --- a/ThirdParty/xdmfdiff +++ b/ThirdParty/xdmfdiff @@ -1 +1 @@ -Subproject commit 428760e717acef51fdedcc2bf3e56474c1b971ef +Subproject commit b2928dd75bbea23640438648b8a0170dc1ed752d diff --git a/scripts/ci/jobs/build-gui-mac.yml b/scripts/ci/jobs/build-gui-mac.yml index 1a6de27afbb3e38f6f65270cb89d17ceaabf81fb..9308780738d7014a04dac78fdeff7790e38343ab 100644 --- a/scripts/ci/jobs/build-gui-mac.yml +++ b/scripts/ci/jobs/build-gui-mac.yml @@ -12,8 +12,7 @@ build gui mac: BUILD_DIR: "build-gui-mac" BUILD_CTEST: "false" CMAKE_ARGS: >- - -DOGS_USE_CONAN=OFF - -DOGS_USE_PCH=OFF + -DOGS_USE_CONAN=auto -DOGS_BUILD_GUI=ON -DOGS_BUILD_UTILS=ON - -DOGS_USE_NETCDF=ON + -DOGS_USE_NETCDF=OFF diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 534bc04ac736c8f27c1c45317e885bc0d5c4d689..1ec95929224388493ea82952e05fc20154cb9189 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -3,7 +3,7 @@ if(NOT OGS_USE_CONAN) endif() string(TOLOWER ${OGS_USE_CONAN} OGS_USE_CONAN_lower) if(OGS_USE_CONAN_lower STREQUAL "auto" AND POETRY) - execute_process(COMMAND ${CMD_COMMAND} poetry add conan=${ogs.minimum_version.conan}) + execute_process(COMMAND ${CMD_COMMAND} poetry add conan) find_program(CONAN_CMD conan HINTS ${LOCAL_VIRTUALENV_BIN_DIRS} REQUIRED NO_DEFAULT_PATH ) diff --git a/web/data/versions.json b/web/data/versions.json index f72dc4a309aa4fa1d803e54291920e27c8365599..9542c740be3460862df52da4bbf49d27d5a28492 100644 --- a/web/data/versions.json +++ b/web/data/versions.json @@ -24,7 +24,7 @@ "tested_version": { "vtk": "8.2.0", "qt": { - "linux": "5.14.1", + "linux": "5.14.2", "win": "5.13.2" }, "ubuntu": "20.04"