Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

GeoModel
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

edca0bc7

Commit edca0bc7 authored 4 years ago by Riccardo Maria Bianchi

Downloads
- Plain Diff

Merge branch 'master' of ssh://gitlab.cern.ch:7999/GeoModelDev/GeoModel into master-ci

parents b627fcf6 0e9d84e3

No related branches found

No related tags found

1 merge request!2CI: set Ubuntu and macOS pipelines for the new monorepo

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 4 additions, 2 deletions

CMakeLists.txt
GeoModelTools/CMakeLists.txt 1 addition, 12 deletions

GeoModelTools/CMakeLists.txt
GeoModelTools/GeoModelJSONParser/CMakeLists.txt 1 addition, 9 deletions

GeoModelTools/GeoModelJSONParser/CMakeLists.txt
GeoModelVisualization/GXClashPointSystems/CMakeLists.txt 6 additions, 5 deletions

GeoModelVisualization/GXClashPointSystems/CMakeLists.txt
GeoModelVisualization/VP1GeometrySystems/CMakeLists.txt 8 additions, 6 deletions

GeoModelVisualization/VP1GeometrySystems/CMakeLists.txt
dependencies/Dependencies.cmake 0 additions, 0 deletions

dependencies/Dependencies.cmake
dependencies/SetupJSON.cmake 1 addition, 1 deletion

dependencies/SetupJSON.cmake

with 21 additions and 35 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