Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Özgür Ozan Sen
ogs
Commits
9790cda4
Commit
9790cda4
authored
1 year ago
by
Dmitri Naumov
Browse files
Options
Downloads
Patches
Plain Diff
Exclude CTests for TFEL build without python
Renaming internal variable to TFEL_WITH_PYTHON.
parent
47749fa1
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+3
-4
3 additions, 4 deletions
CMakeLists.txt
ProcessLib/SmallDeformation/Tests.cmake
+3
-1
3 additions, 1 deletion
ProcessLib/SmallDeformation/Tests.cmake
scripts/cmake/DependenciesExternalProject.cmake
+5
-6
5 additions, 6 deletions
scripts/cmake/DependenciesExternalProject.cmake
with
11 additions
and
11 deletions
CMakeLists.txt
+
3
−
4
View file @
9790cda4
...
@@ -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
}
"
)
...
...
This diff is collapsed.
Click to expand it.
ProcessLib/SmallDeformation/Tests.cmake
+
3
−
1
View file @
9790cda4
...
@@ -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
()
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/DependenciesExternalProject.cmake
+
5
−
6
View file @
9790cda4
...
@@ -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_
S
IT
E-PACKAGES_DIR
set
(
TFEL_
W
IT
H_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
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment