Skip to content
Snippets Groups Projects
Commit 9790cda4 authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

Exclude CTests for TFEL build without python

Renaming internal variable to TFEL_WITH_PYTHON.
parent 47749fa1
No related branches found
No related tags found
No related merge requests found
...@@ -236,10 +236,9 @@ set(_envrc_content ...@@ -236,10 +236,9 @@ set(_envrc_content
"[ -d \"${PROJECT_BINARY_DIR}/.venv\" ] && source ${PROJECT_BINARY_DIR}/.venv/bin/activate" "[ -d \"${PROJECT_BINARY_DIR}/.venv\" ] && source ${PROJECT_BINARY_DIR}/.venv/bin/activate"
"export PATH=$PATH:${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}" "export PATH=$PATH:${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}"
) )
if(_TFEL_SITE-PACKAGES_DIR) if(TFEL_WITH_PYTHON)
set(_envrc_content set(_envrc_content "${_envrc_content}"
"${_envrc_content}" "export PYTHONPATH=${TFEL_WITH_PYTHON}:$PYTHONPATH"
"export PYTHONPATH=${_TFEL_SITE-PACKAGES_DIR}:$PYTHONPATH"
) )
endif() endif()
string(REPLACE ";" "\n" _envrc_content "${_envrc_content}") string(REPLACE ";" "\n" _envrc_content "${_envrc_content}")
......
...@@ -278,7 +278,9 @@ if(NOT OGS_USE_PETSC) ...@@ -278,7 +278,9 @@ if(NOT OGS_USE_PETSC)
endif() endif()
if (OGS_USE_MFRONT) if (OGS_USE_MFRONT)
NotebookTest(NOTEBOOKFILE Mechanics/PLLC/PLLC.ipynb RUNTIME 7) NotebookTest(NOTEBOOKFILE Mechanics/PLLC/PLLC.ipynb RUNTIME 7)
NotebookTest(NOTEBOOKFILE Mechanics/HoekBrown/HoekBrownYieldCriterion.md RUNTIME 20) if(TFEL_WITH_PYTHON)
NotebookTest(NOTEBOOKFILE Mechanics/HoekBrown/HoekBrownYieldCriterion.md RUNTIME 20)
endif()
endif() endif()
endif() endif()
......
...@@ -106,17 +106,16 @@ if(OGS_USE_MFRONT) ...@@ -106,17 +106,16 @@ if(OGS_USE_MFRONT)
"ExternalProject_Add(): added package TFEL@rliv-${ogs.minimum_version.tfel-rliv}" "ExternalProject_Add(): added package TFEL@rliv-${ogs.minimum_version.tfel-rliv}"
) )
if(Boost_${_py_boost_comp}_FOUND) if(Boost_${_py_boost_comp}_FOUND)
set(_TFEL_SITE-PACKAGES_DIR set(TFEL_WITH_PYTHON
"${build_dir_TFEL}/lib/python${_py_version_major_minor}/site-packages" "${build_dir_TFEL}/lib/python${_py_version_major_minor}/site-packages"
CACHE INTERNAL "" CACHE PATH ""
) )
endif() endif()
set(TFELHOME ${build_dir_TFEL} CACHE PATH "" FORCE) set(TFELHOME ${build_dir_TFEL} CACHE PATH "" FORCE)
endif() endif()
if(_TFEL_SITE-PACKAGES_DIR) if(TFEL_WITH_PYTHON)
message( message(STATUS "TFEL build with Python bindings. To use them:\n "
STATUS "TFEL build with Python bindings. To use them:\n " " export PYTHONPATH=${TFEL_WITH_PYTHON}:$PYTHONPATH"
" export PYTHONPATH=${_TFEL_SITE-PACKAGES_DIR}:$PYTHONPATH"
) )
endif() endif()
endif() endif()
......
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