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"