Skip to content
Snippets Groups Projects
Commit ac56984d authored by Pere Mato Vila's avatar Pere Mato Vila
Browse files

Merge branch 'SPI-1671' into 'master'

Upgrade version of LCIO

Closes SPI-1671

See merge request !486
parents 1dc29458 759f4006
No related branches found
No related tags found
1 merge request!486Upgrade version of LCIO
Pipeline #1793085 passed
......@@ -338,7 +338,7 @@ if( NOT ${LCG_OS} MATCHES ubuntu|mac )
endif()
LCG_external_package(libxml2 2.9.9 )
LCG_external_package(libxslt 1.1.33 )
LCG_external_package(LCIO 02.13.03 )
LCG_external_package(LCIO 02.14.02 )
LCG_external_package(logilabcommon 1.4.2 )
LCG_external_package(lwtnn 2.8.1 )
LCG_external_package(lxml 4.3.3 )
......
......@@ -382,30 +382,20 @@ add_custom_target(Geant4-externals
#---LCIO-----------------------------------------------------------------------------------------------
LCGPackage_add(
LCIO
#SVN_REPOSITORY svn://svn.freehep.org/lcio/tags/<LCIO_native_version> --quiet
#UPDATE_COMMAND <VOID>
URL ${GenURL}/LCIO-${LCIO_native_version}.tar.gz
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-DLCIO_GENERATE_HEADERS=off
-DBUILD_ROOTDICT=ON
-DROOT_DIR=${ROOT_home}
IF LCG_CPP11 THEN
-DCMAKE_CXX_FLAGS=-std=c++11
ENDIF
IF LCG_CPP1Y THEN
-DCMAKE_CXX_FLAGS=-std=c++1y
ENDIF
IF LCG_CPP14 THEN
-DCMAKE_CXX_FLAGS=-std=c++14
ENDIF
IF LCG_CPP17 THEN
-DCMAKE_CXX_FLAGS=-std=c++17
ENDIF
BUILD_COMMAND ${MAKE} ROOTSYS=${ROOT_home}
INSTALL_COMMAND ${MAKE} install
COMMAND ${EXEC} bash -c "mkdir -p <INSTALL_DIR>/lib/cmake/LCIO"
COMMAND ${EXEC} bash -c "cp -n -r <INSTALL_DIR>/*.cmake <INSTALL_DIR>/lib/cmake/LCIO"
DEPENDS ROOT
DEPENDS ROOT clhep
)
#---VecGeom------------------------------------------------------------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment