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

b8d74781

Unverified Commit b8d74781 authored 7 years ago by Lars Bilke Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #2042 from bilke/conan-1.0

Conan 1.0

parents f1cdbbd0 5163400c

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 3 additions, 0 deletions

CMakeLists.txt
scripts/cmake/ConanSetup.cmake 1 addition, 1 deletion

scripts/cmake/ConanSetup.cmake
scripts/cmake/conan/conan.cmake 85 additions, 66 deletions

scripts/cmake/conan/conan.cmake
scripts/docker/Dockerfile.clang.minimal 1 addition, 1 deletion

scripts/docker/Dockerfile.clang.minimal
scripts/docker/Dockerfile.gcc.full 1 addition, 1 deletion

scripts/docker/Dockerfile.gcc.full
scripts/docker/Dockerfile.gcc.minimal 1 addition, 1 deletion

scripts/docker/Dockerfile.gcc.minimal

with 92 additions and 70 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