Skip to content
Snippets Groups Projects
Commit 7ce38a18 authored by Riccardo Maria Bianchi's avatar Riccardo Maria Bianchi :sunny:
Browse files

CI: add ubuntu job to test FullSimLight with a custom Xerces-C

parent 77edf609
No related branches found
No related tags found
No related merge requests found
...@@ -57,7 +57,6 @@ variables: ...@@ -57,7 +57,6 @@ variables:
CMAKE_ARGS: ${CMAKE_DEPS_BASE_ARGS} CMAKE_ARGS: ${CMAKE_DEPS_BASE_ARGS}
script: script:
- pwd; ls - pwd; ls
#- wget https://bitbucket.org/Coin3D/coin/downloads/coin-4.0.0-src.zip
- wget https://atlas-vp1.web.cern.ch/atlas-vp1/sources/coin-4.0.0-src.zip - wget https://atlas-vp1.web.cern.ch/atlas-vp1/sources/coin-4.0.0-src.zip
- unzip coin-4.0.0-src.zip -d coin-sources - unzip coin-4.0.0-src.zip -d coin-sources
- mv coin-sources/* coin - mv coin-sources/* coin
...@@ -76,12 +75,6 @@ variables: ...@@ -76,12 +75,6 @@ variables:
CMAKE_ARGS: ${CMAKE_DEPS_BASE_ARGS} CMAKE_ARGS: ${CMAKE_DEPS_BASE_ARGS}
script: script:
- pwd; ls - pwd; ls
# - wget https://bitbucket.org/rmbianchi/soqt/downloads/soqt-1b4fe9d-macos-mojave-fix.zip
# - unzip soqt-1b4fe9d-macos-mojave-fix.zip
# - wget https://bitbucket.org/rmbianchi/soqt/get/CI-fix-25692a8.zip
# - unzip CI-fix-25692a8.zip
# - mv rmbianchi-soqt-25692a805a2c soqt
#- hg clone https://rmbianchi@bitbucket.org/rmbianchi/soqt
- wget https://atlas-vp1.web.cern.ch/atlas-vp1/sources/soqt.zip - wget https://atlas-vp1.web.cern.ch/atlas-vp1/sources/soqt.zip
- unzip soqt.zip - unzip soqt.zip
- mkdir build_soqt - mkdir build_soqt
...@@ -121,6 +114,7 @@ variables: ...@@ -121,6 +114,7 @@ variables:
stage: step-B stage: step-B
variables: variables:
CMAKE_ARGS: ${CMAKE_BASE_ARGS} CMAKE_ARGS: ${CMAKE_BASE_ARGS}
XERCESC_VERSION: ${XERCESC_VERSION_BASE}
script: script:
- pwd; ls - pwd; ls
- git clone https://gitlab.cern.ch/geant4/geant4.git - git clone https://gitlab.cern.ch/geant4/geant4.git
...@@ -129,7 +123,7 @@ variables: ...@@ -129,7 +123,7 @@ variables:
- cd ../ - cd ../
- mkdir Geant4-build - mkdir Geant4-build
- cd Geant4-build - cd Geant4-build
- cmake ${CMAKE_ARGS} -DGEANT4_INSTALL_DATA=ON -DGEANT4_USE_GDML=ON -DGEANT4_BUILD_MULTITHREADED=ON -DXERCESC_ROOT_DIR=../install/xerces-c/ ../geant4 -DGEANT4_USE_SYSTEM_EXPAT=OFF - cmake ${CMAKE_ARGS} -DGEANT4_INSTALL_DATA=ON -DGEANT4_USE_GDML=ON -DGEANT4_BUILD_MULTITHREADED=ON -DXERCESC_ROOT_DIR=../install/xerces-c-${XERCESC_VERSION}/ ../geant4 -DGEANT4_USE_SYSTEM_EXPAT=OFF
- make -j4 - make -j4
- make install - make install
artifacts: artifacts:
...@@ -302,6 +296,16 @@ ubu-gm-fullsimlight-builtinjson: ...@@ -302,6 +296,16 @@ ubu-gm-fullsimlight-builtinjson:
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_FULLSIMLIGHT=TRUE CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_FULLSIMLIGHT=TRUE
CMAKE_EXTRA_FLAGS: -DGEOMODEL_USE_BUILTIN_JSON=TRUE CMAKE_EXTRA_FLAGS: -DGEOMODEL_USE_BUILTIN_JSON=TRUE
ubu-gm-fullsimlight-customxercesc-builtinjson:
<<: *ubuntu-job
<<: *geomodel-job
stage: step-C
needs: ["ubu-geant4", "ubu-XercesC"]
variables:
CMAKE_ARGS: ${CMAKE_BASE_ARGS}
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_FULLSIMLIGHT=TRUE
CMAKE_EXTRA_FLAGS: -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DXercesC_INCLUDE_DIR=../install/xerces-c-${XERCESC_VERSION}/include -DXercesC_LIBRARY=../install/xerces-c-${XERCESC_VERSION}/lib/libxerces-c.dylib
### Documentation ### Documentation
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment