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

a2a002c2

Commit a2a002c2 authored 3 years ago by Dmitri Naumov

Downloads
- Plain Diff

Merge branch 'mfront-mac' into 'master'

[ci] Enable mfront on mac

See merge request ogs/ogs!3671

parents 6b67ad4b db2ec022

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.pre-commit-config.yaml 1 addition, 1 deletion

.pre-commit-config.yaml
CMakeLists.txt 2 additions, 2 deletions

CMakeLists.txt
ProcessLib/SmallDeformation/Tests.cmake 4 additions, 4 deletions

ProcessLib/SmallDeformation/Tests.cmake
Tests/Data/Mechanics/ModifiedCamClay/model_triaxtest.prj 5 additions, 5 deletions

Tests/Data/Mechanics/ModifiedCamClay/model_triaxtest.prj
Tests/MaterialLib/MFront.cpp 5 additions, 5 deletions

Tests/MaterialLib/MFront.cpp
scripts/ci/jobs/build-mac.yml 1 addition, 0 deletions

scripts/ci/jobs/build-mac.yml
scripts/cmake/BuildExternalProject.cmake 95 additions, 0 deletions

scripts/cmake/BuildExternalProject.cmake
scripts/cmake/ConanSetup.cmake 0 additions, 5 deletions

scripts/cmake/ConanSetup.cmake
scripts/cmake/Dependencies.cmake 15 additions, 0 deletions

scripts/cmake/Dependencies.cmake
scripts/cmake/packaging/Pack.cmake 0 additions, 29 deletions

scripts/cmake/packaging/Pack.cmake
scripts/cmake/packaging/PackagingDependencies.cmake 28 additions, 0 deletions

scripts/cmake/packaging/PackagingDependencies.cmake

with 156 additions and 51 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