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

0aec0104

Unverified Commit 0aec0104 authored 6 years ago by Lars Bilke Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #2207 from bilke/conan-default

Use Conan per default when available

parents 22600b08 8c8a4580

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
Jenkinsfile 0 additions, 8 deletions

Jenkinsfile
scripts/cmake/ConanSetup.cmake 10 additions, 1 deletion

scripts/cmake/ConanSetup.cmake
web/content/docs/devguide/advanced/conan-package-manager.pandoc 2 additions, 2 deletions

...ntent/docs/devguide/advanced/conan-package-manager.pandoc
web/content/docs/devguide/getting-started/build-configuration.pandoc 1 addition, 11 deletions

.../docs/devguide/getting-started/build-configuration.pandoc
web/content/docs/devguide/troubleshooting/conan.pandoc 1 addition, 1 deletion

web/content/docs/devguide/troubleshooting/conan.pandoc

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