Skip to content
Snippets Groups Projects
Commit aa81b3f2 authored by Marilena Bandieramonte's avatar Marilena Bandieramonte
Browse files

Simplify geoModelG4 build chain, GeoModelIO not required

parent f9c93557
Branches
Tags
No related merge requests found
Pipeline #1658897 passed
stages:
- deps-geomodelcore
- deps-CLHEP
- deps-geomodelio
- deps-xerces-c
- deps-Geant4
- build
......@@ -61,23 +60,6 @@ variables:
paths:
- install
.geomodelio-build-template-job: &geomodelio-job
stage: deps-geomodelio
variables:
CMAKE_ARGS: ${CMAKE_BASE_ARGS}
script:
- pwd; ls
- git clone https://gitlab.cern.ch/GeoModelDev/GeoModelIO.git
- mkdir geomodelio-build
- cd geomodelio-build
- cmake ${CMAKE_ARGS} ../GeoModelIO
- make -j32
- make install
artifacts:
paths:
- install
.xerces-c-build-template-job: &xerces-c-job
stage: deps-xerces-c
variables:
......@@ -142,11 +124,6 @@ CLHEP-mac:
<<: *macos-job
<<: *CLHEP-job
geomodelio-mac:
<<: *macos-job
<<: *geomodelio-job
needs: ["geomodelcore-mac", "CLHEP-mac"]
xerces-c-mac:
<<: *macos-job
<<: *xerces-c-job
......@@ -159,7 +136,7 @@ Geant4-mac:
geomodelg4-mac:
<<: *macos-job
<<: *geomodelg4-job
needs: ["geomodelcore-mac", "geomodelio-mac", "CLHEP-mac", "Geant4-mac"]
needs: ["geomodelcore-mac", "CLHEP-mac", "Geant4-mac"]
### UBUNTU PATH
......@@ -171,10 +148,10 @@ geomodelcore-ubuntu:
# <<: *ubuntu-job
# <<: *CLHEP-job
geomodelio-ubuntu:
<<: *ubuntu-job
<<: *geomodelio-job
needs: ["geomodelcore-ubuntu"]
#geomodelio-ubuntu:
# <<: *ubuntu-job
# <<: *geomodelio-job
# needs: ["geomodelcore-ubuntu"]
# xerces-c-ubuntu:
# <<: *ubuntu-job
......@@ -188,4 +165,4 @@ geomodelio-ubuntu:
geomodelg4-ubuntu:
<<: *ubuntu-job
<<: *geomodelg4-job
needs: ["geomodelcore-ubuntu", "geomodelio-ubuntu"]
needs: ["geomodelcore-ubuntu"]
......@@ -12,7 +12,6 @@ find_package( Geant4 REQUIRED )
find_package( CLHEP )
# GeoModel dependencies
find_package( GeoModelCore REQUIRED )
find_package (GeoModelIO REQUIRED)
##########################################################
# NOTE! The original package also needs this Athena stuff:
......
......@@ -40,18 +40,7 @@ cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Release ../
make
make install
```
## GeoModelIO:
Clone the repository at this [address](https://gitlab.cern.ch/GeoModelDev/GeoModelIO).
```bash
git clone https://gitlab.cern.ch/GeoModelDev/GeoModelIO.git
cd GeoModelIO
mkdir build ; cd build
cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Release ../
make
make install
```
## GeoModelG4:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment