Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

O

ogs
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

14aacd10

Commit 14aacd10 authored 2 years ago by Dmitri Naumov

Downloads
- Plain Diff

Merge branch 'cpm-update' into 'master'

CPM update and fmt unbundling

See merge request ogs/ogs!4473

parents 1b68d8ac ca5877c0

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.pre-commit-config.yaml 4 additions, 4 deletions

.pre-commit-config.yaml
BaseLib/FileTools.cpp 1 addition, 1 deletion

BaseLib/FileTools.cpp
BaseLib/PrjProcessing.cpp 9 additions, 4 deletions

BaseLib/PrjProcessing.cpp
GeoLib/AABB.h 9 additions, 1 deletion

GeoLib/AABB.h
ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h 1 addition, 1 deletion

...ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h
Tests/MaterialLib/CheckStiffnessMatrixMFront.cpp 1 addition, 1 deletion

Tests/MaterialLib/CheckStiffnessMatrixMFront.cpp
scripts/ci/jobs/build-linux.yml 1 addition, 1 deletion

scripts/ci/jobs/build-linux.yml
scripts/cmake/CPM.cmake 135 additions, 37 deletions

scripts/cmake/CPM.cmake
scripts/cmake/Dependencies.cmake 7 additions, 1 deletion

scripts/cmake/Dependencies.cmake
web/data/versions.json 2 additions, 2 deletions

web/data/versions.json

with 170 additions and 53 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment