Skip to content

Commit

Permalink
Merge branch 'exprtk-update' into 'master'
Browse files Browse the repository at this point in the history
[cmake] Use upstream exprtk repo.

See merge request ogs/ogs!5163
  • Loading branch information
bilke committed Dec 10, 2024
2 parents 4853b06 + 24c2231 commit ed33460
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ProcessLib/HydroMechanics/Tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ AddTest(
EXECUTABLE_ARGS one_anchor_cube.prj
WRAPPER time
TESTER vtkdiff
REQUIREMENTS NOT OGS_USE_MPI
REQUIREMENTS NOT OGS_USE_MPI AND NOT OGS_COVERAGE
RUNTIME 5
DIFF_DATA
expected_one_anchor_cube_ts_10_t_1.000000.vtu one_anchor_cube_ts_10_t_1.000000.vtu pressure pressure 1.0e-10 1.e-10
Expand Down
1 change: 1 addition & 0 deletions ProcessLib/ThermoRichardsMechanics/Tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,7 @@ if(OGS_USE_MFRONT)
RUNTIME 1
EXECUTABLE ogs
EXECUTABLE_ARGS A2_effective_stress0.xml
REQUIREMENTS NOT OGS_COVERAGE
WRAPPER time
TESTER vtkdiff
DIFF_DATA
Expand Down
5 changes: 3 additions & 2 deletions scripts/cmake/Dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,9 @@ if(GUIX_BUILD OR CONDA_BUILD)
else()
CPMAddPackage(
NAME exprtk
GIT_REPOSITORY https://gitlab.opengeosys.org/ogs/libs/exprtk.git
GIT_TAG 2a5c62b93c9661470e69be572f22d821308b6f61
GITHUB_REPOSITORY ArashPartow/exprtk
VERSION 0.0.3
GIT_TAG 0.0.3
DOWNLOAD_ONLY YES
)
if(exprtk_ADDED)
Expand Down

0 comments on commit ed33460

Please sign in to comment.