From 7a8a37893107d4fce454794f7d41c810fa2b96db Mon Sep 17 00:00:00 2001 From: Joschka Lingemann Date: Tue, 12 Jan 2016 14:53:43 +0100 Subject: [PATCH 1/2] Updating ROOT and gcc versions. --- init.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.sh b/init.sh index 915c6b56..83e88b8a 100644 --- a/init.sh +++ b/init.sh @@ -1,6 +1,6 @@ export PATH=/afs/cern.ch/sw/lcg/contrib/CMake/2.8.9/Linux-i386/bin:${PATH} -source /afs/cern.ch/sw/lcg/contrib/gcc/4.8.1/x86_64-slc6/setup.sh -source /afs/cern.ch/sw/lcg/app/releases/ROOT/5.34.20/x86_64-slc6-gcc48-opt/root/bin/thisroot.sh +source /afs/cern.ch/sw/lcg/contrib/gcc/4.9.3/x86_64-slc6/setup.sh +source /afs/cern.ch/exp/fcc/sw/0.5/LCG_80/ROOT/6.04.06/x86_64-slc6-gcc49-opt/bin/thisroot.sh export FCCEDM=$PWD/install export LD_LIBRARY_PATH=$FCCEDM/lib:$LD_LIBRARY_PATH From 1506ccde7ead201139ba3d5383169c95e37796d5 Mon Sep 17 00:00:00 2001 From: Joschka Lingemann Date: Tue, 12 Jan 2016 14:54:02 +0100 Subject: [PATCH 2/2] Adding install targets for PCMs. --- datamodel/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/datamodel/CMakeLists.txt b/datamodel/CMakeLists.txt index bbbdd63c..c79414cd 100644 --- a/datamodel/CMakeLists.txt +++ b/datamodel/CMakeLists.txt @@ -21,3 +21,9 @@ install(TARGETS datamodel LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT shlib PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/datamodel" COMPONENT dev) + +if (${ROOT_VERSION} GREATER 6) + install(FILES + "${PROJECT_BINARY_DIR}/datamodel/ExampleDict_rdict.pcm" + DESTINATION "${INSTALL_LIB_DIR}" COMPONENT dev) +endif()