Skip to content
Snippets Groups Projects
Verified Commit 2da05e28 authored by Lars Bilke's avatar Lars Bilke
Browse files

Bump minimum Conan to 1.34 for Apple ARM support.

parent e2aa0a53
No related branches found
No related tags found
No related merge requests found
...@@ -21,6 +21,10 @@ if(OGS_USE_POETRY) ...@@ -21,6 +21,10 @@ if(OGS_USE_POETRY)
) )
endif() endif()
if(NOT EXISTS ${PROJECT_BINARY_DIR}/.venv) if(NOT EXISTS ${PROJECT_BINARY_DIR}/.venv)
execute_process(
COMMAND ${CMD_COMMAND} poetry env use ${Python3_EXECUTABLE}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)
execute_process( execute_process(
COMMAND ${CMD_COMMAND} poetry install COMMAND ${CMD_COMMAND} poetry install
WORKING_DIRECTORY ${PROJECT_BINARY_DIR} WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"toolset": "142", "toolset": "142",
"compiler": "19.24" "compiler": "19.24"
}, },
"conan": "1.33.0", "conan": "1.34.0",
"git": "2.14", "git": "2.14",
"cmake": "3.14", "cmake": "3.14",
"hugo": "0.64.1", "hugo": "0.64.1",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment