Merge branch 'master' of https://gitlab.cern.ch/GeoModelDev/GeoModel

.gitlab-ci.yml

@@ -8,6 +8,7 @@ stages:
 variables:
   CMAKE_DEPS_BASE_ARGS: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../install
   CMAKE_BASE_ARGS: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../install
+  XERCESC_VERSION_BASE: 3.2.2
   # also, 'CMAKE_EXTRA_FLAGS' will be specified by specific jobs when needed, and used by job templates like 'geomodel-job'
   GIT_SUBMODULE_STRATEGY: recursive
 
@@ -56,7 +57,6 @@ variables:
     CMAKE_ARGS: ${CMAKE_DEPS_BASE_ARGS}
   script:
     - 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
     - unzip coin-4.0.0-src.zip -d coin-sources
     - mv coin-sources/* coin
@@ -75,12 +75,6 @@ variables:
     CMAKE_ARGS: ${CMAKE_DEPS_BASE_ARGS}
   script:
     - 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
     - unzip soqt.zip
     - mkdir build_soqt
@@ -101,13 +95,14 @@ variables:
   stage: step-A
   variables:
     CMAKE_ARGS: ${CMAKE_BASE_ARGS}
+    XERCESC_VERSION: ${XERCESC_VERSION_BASE}
   script:
     - pwd; ls
-    - wget https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-3.2.2.tar.gz
-    - tar -xf xerces-c-3.2.2.tar.gz
-    - mkdir xerces-c-build
-    - cd xerces-c-build
-    - cmake ${CMAKE_ARGS} ../xerces-c-3.2.2
+    - wget https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-${XERCESC_VERSION}.tar.gz
+    - tar -xf xerces-c-${XERCESC_VERSION}.tar.gz
+    - mkdir xerces-c-build-${XERCESC_VERSION}
+    - cd xerces-c-build-${XERCESC_VERSION}
+    - cmake ${CMAKE_ARGS} ../xerces-c-${XERCESC_VERSION}
     - make -j4
     - make install
   artifacts:
@@ -119,6 +114,7 @@ variables:
   stage: step-B
   variables:
     CMAKE_ARGS: ${CMAKE_BASE_ARGS}
+    XERCESC_VERSION: ${XERCESC_VERSION_BASE}
   script:
     - pwd; ls
     - git clone https://gitlab.cern.ch/geant4/geant4.git
@@ -127,7 +123,7 @@ variables:
     - cd ../
     - mkdir 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 install
   artifacts:
@@ -257,6 +253,13 @@ ubu-XercesC:
   <<: *ubuntu-job
   <<: *xercesc-job
 
+ubu-XercesC-323:
+  <<: *ubuntu-job
+  <<: *xercesc-job
+  variables:
+    CMAKE_ARGS: ${CMAKE_BASE_ARGS}
+    XERCESC_VERSION: 3.2.3
+
 ubu-geant4:
   <<: *ubuntu-job
   <<: *geant4-job
@@ -293,6 +296,17 @@ ubu-gm-fullsimlight-builtinjson:
     CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_FULLSIMLIGHT=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-323"]
+  variables:
+    XERCESC_VERSION: 3.2.3
+    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
 

cmake/SetupXercesC.cmake

@@ -37,8 +37,7 @@ if( GEOMODEL_USE_BUILTIN_XERCESC )
       PREFIX "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCBuild"
       INSTALL_DIR "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall"
       URL "https://cern.ch/lcgpackages/tarFiles/sources/xerces-c-${XercesC_VERSION}.tar.gz"
-      #URL_MD5 "70320ab0e3269e47d978a6ca0c0e1e2d"
-      URL_MD5 "87b994ba2cf95b43143335e390282a80"
+      URL_MD5 "a5fa4d920fce31c9ca3bfef241644494"
       CONFIGURE_COMMAND
       ${CMAKE_COMMAND} -E env CXXFLAGS=-std=c++${CMAKE_CXX_STANDARD}
       <SOURCE_DIR>/configure --disable-static --prefix=<INSTALL_DIR>