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

03148bf2

Commit 03148bf2 authored 2 years ago by Lars Bilke

Downloads
- Plain Diff

Merge branch 'fixes' into 'master'

Fixes for sanitizer job and MSVC release config

See merge request ogs/ogs!4432

parents b0756c39 0cc187d6

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CMakePresets.json 12 additions, 4 deletions

CMakePresets.json
MaterialLib/SolidModels/Ehlers.h 1 addition, 2 deletions

MaterialLib/SolidModels/Ehlers.h
scripts/ci/jobs/build-linux.yml 1 addition, 0 deletions

scripts/ci/jobs/build-linux.yml
scripts/ci/jobs/build-win.yml 15 additions, 0 deletions

scripts/ci/jobs/build-win.yml
scripts/cmake/BuildExternalProject.cmake 2 additions, 2 deletions

scripts/cmake/BuildExternalProject.cmake
scripts/cmake/DependenciesExternalProject.cmake 2 additions, 1 deletion

scripts/cmake/DependenciesExternalProject.cmake
scripts/cmake/packaging/Pack.cmake 1 addition, 1 deletion

scripts/cmake/packaging/Pack.cmake

with 34 additions and 10 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