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

[CMake] Workflow reqs are handled by Poetry.

parent e6988874
No related branches found
No related tags found
No related merge requests found
......@@ -4,12 +4,7 @@ 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})
find_program(CONAN_CMD conan HINTS
${PROJECT_BINARY_DIR}/.venv/bin
${PROJECT_BINARY_DIR}/.venv/Scripts
REQUIRED NO_DEFAULT_PATH
)
find_program(CONAN_CMD conan HINTS ${PROJECT_BINARY_DIR}/.venv/bin
find_program(CONAN_CMD conan HINTS ${LOCAL_VIRTUALENV_BIN_DIRS}
REQUIRED NO_DEFAULT_PATH
)
else()
......
......@@ -54,8 +54,8 @@ find_program(PANDOC_CITEPROC pandoc-citeproc)
find_program(MODULE_CMD modulecmd
PATHS /usr/local/modules/3.2.10-1/Modules/3.2.10/bin)
find_program(SNAKEMAKE snakemake)
find_program(PARSL parsl-visualize)
find_program(SNAKEMAKE snakemake HINTS ${LOCAL_VIRTUALENV_BIN_DIRS})
find_program(PARSL parsl-visualize HINTS ${LOCAL_VIRTUALENV_BIN_DIRS})
######################
### Find libraries ###
......
......@@ -32,3 +32,16 @@ if(POETRY)
${Python3_ROOT_DIR}/lib/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages)
endif()
endif()
set(LOCAL_VIRTUALENV_BIN_DIRS
${PROJECT_BINARY_DIR}/.venv/bin
${PROJECT_BINARY_DIR}/.venv/Scripts
CACHE INTERNAL ""
)
if(POETRY AND BUILD_TESTING)
execute_process(COMMAND ${CMD_COMMAND} poetry add
snakemake=${ogs.minimum_version.snakemake}
parsl=${ogs.minimum_version.parsl}
)
endif()
snakemake==5.19.3
parsl==1.0.0
......@@ -17,7 +17,9 @@
"vtk": "8.1.2",
"petsc": "3.11.2",
"qt": "5.12.4",
"python": "3.6"
"python": "3.6",
"snakemake": "5.19.3",
"parsl": "1.0.0"
},
"tested_version": {
"vtk": "8.2.0",
......
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