From f733fa9e418bb3eebb097548dea65f2b2d049d5d Mon Sep 17 00:00:00 2001 From: Pere Mato <pere.mato@cern.ch> Date: Mon, 13 Jul 2020 14:34:59 +0200 Subject: [PATCH 1/2] Upgrade version of LCIO --- cmake/toolchain/heptools-dev-base.cmake | 2 +- projects/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake index 0a35708565..0eb0b17a02 100644 --- a/cmake/toolchain/heptools-dev-base.cmake +++ b/cmake/toolchain/heptools-dev-base.cmake @@ -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 ) diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index bd8d61a993..11b0ba32f4 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -405,7 +405,7 @@ LCGPackage_add( 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------------------------------------------------------------------------------------------ -- GitLab From 759f4006cfb26f53a4d051ab310f3145bc072363 Mon Sep 17 00:00:00 2001 From: Pere Mato <pere.mato@cern.ch> Date: Mon, 13 Jul 2020 15:10:03 +0200 Subject: [PATCH 2/2] Better wau to set the C++ standard in LCIO --- projects/CMakeLists.txt | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index 11b0ba32f4..72ac114aa4 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -382,25 +382,15 @@ 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" -- GitLab