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

fe7ee57c

Commit fe7ee57c authored 7 years ago by Dmitri Naumov Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #1774 from bilke/mac-qt-fix

Conan Mac Qt PCH fix

parents dc91751a b170da9f

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

Applications/FileIO/CMakeLists.txt 3 additions, 11 deletions

Applications/FileIO/CMakeLists.txt
Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp 1 addition, 1 deletion

Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp
Documentation/README.txt.in 6 additions, 0 deletions

Documentation/README.txt.in
Jenkinsfile 1 addition, 1 deletion

Jenkinsfile
conanfile.py 14 additions, 10 deletions

conanfile.py
scripts/cmake/packaging/Pack.cmake 3 additions, 0 deletions

scripts/cmake/packaging/Pack.cmake
scripts/cmake/packaging/PackagingLinux.cmake 5 additions, 0 deletions

scripts/cmake/packaging/PackagingLinux.cmake
scripts/jenkins/gcc-conan.groovy 1 addition, 0 deletions

scripts/jenkins/gcc-conan.groovy
scripts/jenkins/msvc.groovy 1 addition, 0 deletions

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

scripts/jenkins/msvc32.groovy

with 36 additions and 23 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