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

08e6faf5

Commit 08e6faf5 authored 3 years ago by Lars Bilke

Downloads
- Plain Diff

Merge branch 'lis' into 'master'

Moved LIS dependency from Conan to ExternalProject

See merge request ogs/ogs!3698

parents 03d91666 5dcf00c2

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

scripts/cmake/ConanSetup.cmake 1 addition, 6 deletions

scripts/cmake/ConanSetup.cmake
scripts/cmake/DependenciesExternalProject.cmake 17 additions, 0 deletions

scripts/cmake/DependenciesExternalProject.cmake
scripts/cmake/Find.cmake 0 additions, 5 deletions

scripts/cmake/Find.cmake
web/content/docs/devguide/getting-started/prerequisites.md 0 additions, 1 deletion

web/content/docs/devguide/getting-started/prerequisites.md
web/data/versions.json 2 additions, 1 deletion

web/data/versions.json

with 20 additions and 13 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