Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

otb
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

752e8e3b

Commit 752e8e3b authored 6 years ago by Julien Michel

Downloads
- Plain Diff

Merge branch 'develop' into patch_locS1

parents d9ffaca6 caad42d6

Branches

Tags

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 36 additions, 22 deletions

.gitlab-ci.yml
.gitlab/merge_request_templates/request_for_changes.md 1 addition, 0 deletions

.gitlab/merge_request_templates/request_for_changes.md
CI/configure_option.cmake 3 additions, 3 deletions

CI/configure_option.cmake
CI/macros.cmake 53 additions, 0 deletions

CI/macros.cmake
CI/main_ci.cmake 4 additions, 18 deletions

CI/main_ci.cmake
CI/main_superbuild.cmake 31 additions, 19 deletions

CI/main_superbuild.cmake
CI/prepare_superbuild.cmake 31 additions, 15 deletions

CI/prepare_superbuild.cmake
CI/ubuntu-18.04-llvm-nodoc.cmake 32 additions, 0 deletions

CI/ubuntu-18.04-llvm-nodoc.cmake
CI/ubuntu-18.04-llvm.cmake 2 additions, 1 deletion

CI/ubuntu-18.04-llvm.cmake
Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetSpinBoxes.cxx 9 additions, 6 deletions

...les/Wrappers/QtWidget/src/otbWrapperQtWidgetSpinBoxes.cxx
SuperBuild/CI/configure_options.cmake 3 additions, 2 deletions

SuperBuild/CI/configure_options.cmake
SuperBuild/CMakeLists.txt 2 additions, 0 deletions

SuperBuild/CMakeLists.txt

with 207 additions and 86 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