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

7cc0723b

Commit 7cc0723b authored 7 years ago by Lars Bilke Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #1966 from bilke/win-fixes

Some more Conan Windows fixes.

parents cdbb24dc a6fd2fd7

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

Applications/CLI/CMakeLists.txt 1 addition, 1 deletion

Applications/CLI/CMakeLists.txt
Applications/DataExplorer/DataExplorer.cmake 1 addition, 1 deletion

Applications/DataExplorer/DataExplorer.cmake
CMakeLists.txt 2 additions, 1 deletion

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

scripts/cmake/CMakeSetup.cmake
scripts/cmake/CompilerSetup.cmake 0 additions, 4 deletions

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

scripts/cmake/ConanSetup.cmake
scripts/cmake/conan/conan.cmake 1 addition, 1 deletion

scripts/cmake/conan/conan.cmake
scripts/jenkins/gcc-conan.groovy 2 additions, 1 deletion

scripts/jenkins/gcc-conan.groovy
scripts/jenkins/gcc.groovy 2 additions, 1 deletion

scripts/jenkins/gcc.groovy
scripts/jenkins/msvc.groovy 2 additions, 1 deletion

scripts/jenkins/msvc.groovy
scripts/jenkins/msvc32.groovy 1 addition, 0 deletions

scripts/jenkins/msvc32.groovy

with 18 additions and 12 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