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

0a99afc7

Commit 0a99afc7 authored 4 years ago by Dmitri Naumov

Downloads
- Plain Diff

Merge branch 'UpdateToNewestMGIS' into 'master'

Update to newest MGIS

See merge request ogs/ogs!3028

parents 0d5368db 08e52364

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

MaterialLib/SolidModels/MFront/CMakeLists.txt 6 additions, 0 deletions

MaterialLib/SolidModels/MFront/CMakeLists.txt
MaterialLib/SolidModels/MFront/MFront.cpp 11 additions, 19 deletions

MaterialLib/SolidModels/MFront/MFront.cpp
ThirdParty/MGIS 1 addition, 1 deletion

ThirdParty/MGIS
ThirdParty/container-maker 1 addition, 1 deletion

ThirdParty/container-maker
scripts/ci/jobs/build-linux.yml 1 addition, 0 deletions

scripts/ci/jobs/build-linux.yml
scripts/cmake/ConanSetup.cmake 1 addition, 1 deletion

scripts/cmake/ConanSetup.cmake
scripts/cmake/test/Test.cmake 3 additions, 0 deletions

scripts/cmake/test/Test.cmake

with 24 additions and 22 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