diff --git a/bin/lcgcmake b/bin/lcgcmake index 074f2ccd8537928feb36c42ab0d5c03293fa7206..bfa5b97432c5f54c51ab36334ad7bd03bf646923 100755 --- a/bin/lcgcmake +++ b/bin/lcgcmake @@ -545,7 +545,7 @@ def get_default_version(): def parse_info(text): data = {} - text = text.split(', ') + text = text.strip().split(', ') for key, value in [x.split(':') for x in text]: data.update({key.strip(): value.strip()}) # deps diff --git a/cmake/modules/lcgsoft-macros.cmake b/cmake/modules/lcgsoft-macros.cmake index 4ca08a529ddce561152564c86c29981eef2e7790..13d6fec42fd090d6c68ed8a7fdaadf5dff0424ca 100644 --- a/cmake/modules/lcgsoft-macros.cmake +++ b/cmake/modules/lcgsoft-macros.cmake @@ -153,8 +153,8 @@ macro(LCGPackage_Add name) #---Instruction set handling---------------------------------------------------------------------- set(instructionset OFF) + set(LCG_saved_system ${LCG_system}) if(NOT ARG_BUILD_WITH_INSTRUCTION_SET) - set(LCG_saved_system ${LCG_system}) set(LCG_system ${LCG_naked_system}) elseif(LCG_INSTRUCTIONSET) set(instructionset ON) @@ -292,7 +292,7 @@ macro(LCGPackage_Add name) COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/${tarname} COMMAND ${LOCKFILE} -l 120 ${CMAKE_BINARY_DIR}/summary.lock COMMAND ${CMAKE_COMMAND} -DNAME=${name} - -DSUMFILE=${CMAKE_BINARY_DIR}/LCG_${LCG_VERSION}_${LCG_system}.txt + -DSUMFILE=${CMAKE_BINARY_DIR}/LCG_${LCG_VERSION}_${LCG_saved_system}.txt -DINSTALLDIR=${CMAKE_INSTALL_PREFIX}/${install_path} -P ${CMAKE_SOURCE_DIR}/cmake/scripts/UpdateSummaryFile.cmake COMMAND ${LOCKFILE} --unlock ${CMAKE_BINARY_DIR}/summary.lock diff --git a/cmake/toolchain/heptools-contrib.cmake b/cmake/toolchain/heptools-contrib.cmake index cdc05feb6d8f8287459fdcd8817b4a47289ea487..c7a0edec06f247e33a32deed2bbd2ce271c787b7 100644 --- a/cmake/toolchain/heptools-contrib.cmake +++ b/cmake/toolchain/heptools-contrib.cmake @@ -5,3 +5,4 @@ LCG_external_package(gcc 7.3.0 LCG_external_package(gcc 8.1.0 ) LCG_external_package(clang 6.0.0 gcc=7.3.0 ) LCG_external_package(clang 7.0.0 gcc=8.1.0 ) +LCG_external_package(cuda 10.2 full=10.2.89_440.33.01 ) diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake index 6d78e35307878073fe1870506dbfbc82017fb396..6db9d3e2fec4b753e01cee1a3e43658d2d35b0b1 100644 --- a/cmake/toolchain/heptools-dev-base.cmake +++ b/cmake/toolchain/heptools-dev-base.cmake @@ -38,7 +38,6 @@ else() LCG_external_package(rpy2 2.8.6 ) LCG_external_package(networkx 2.2 ) LCG_external_package(matplotlib 2.2.4 ) - LCG_AA_project(DD4hep 01-10 ) LCG_external_package(4suite 1.0.2p1 ) LCG_external_package(astroid 1.6.6p1 author=1.6.6 ) LCG_external_package(contextlib2 0.5.5 ) @@ -83,13 +82,14 @@ if(NOT ${LCG_OS}${LCG_OSVERS} MATCHES ubuntu18|mac[0-9]+) endif() LCG_AA_project(RELAX root6) LCG_AA_project(HepMC 2.06.10) -LCG_AA_project(Geant4 10.05.p01) +LCG_AA_project(Geant4 10.06) LCG_AA_project(Garfield++ HEAD GIT=https://gitlab.cern.ch/garfield/garfieldpp.git) if(${LCG_OS}${LCG_OSVERS} MATCHES centos7 AND ${LCG_COMP}${LCG_COMPVERS} MATCHES gcc8 OR ${LCG_OS} STREQUAL mac) LCG_AA_project(Gaudi v32r2 GIT=https://gitlab.cern.ch/gaudi/Gaudi.git) endif() +LCG_AA_project(DD4hep 01-11 ) # Externals LCG_external_package(lcgenv 1.3.8 ) @@ -112,13 +112,13 @@ LCG_external_package(backports.shutil_get_terminal_size 1.0.0 LCG_external_package(backports.ssl_match_hostname 3.7.0.1 ) LCG_external_package(backports_abc 0.5 ) LCG_external_package(benchmark 1.5.0 ) -LCG_external_package(bison 3.0.4 ) +LCG_external_package(bison 3.4.1 ) #LCG_external_package(blas 3.8.0.netlib ) LCG_external_package(blas 0.3.5.openblas ) LCG_external_package(bleach 3.1.0 ) LCG_external_package(brotli 1.0.7 ) LCG_external_package(bzip2 1.0.6 ) -LCG_external_package(Boost 1.70.0 ) +LCG_external_package(Boost 1.72.0 ) LCG_external_package(caniusepython3 7.1.0 ) LCG_external_package(C50 2.07 ) LCG_external_package(cachetools 3.1.1 ) @@ -222,9 +222,7 @@ if(${LCG_OS} STREQUAL slc OR ${LCG_OS} STREQUAL centos OR ${LCG_OS} STREQUAL cc) endif() LCG_external_package(google_auth 1.6.3 ) LCG_external_package(gperf 3.1 ) -if(NOT LCG_COMP STREQUAL "clang") - LCG_external_package(gperftools 2.7 ) -endif() +LCG_external_package(gperftools 2.7 ) LCG_external_package(graphviz 2.40.1 ) LCG_external_package(grpcio 1.21.1 ) LCG_external_package(GSL 2.5 ) @@ -517,7 +515,7 @@ LCG_external_package(Vc 1.4.1 LCG_external_package(vcversioner 2.16.0.0 ) LCG_external_package(vdt 0.4.3 ) LCG_external_package(veccore 0.6.0 ) -LCG_external_package(VecGeom v1.1.0 ) +LCG_external_package(VecGeom v1.1.5 ) LCG_external_package(vectorclass 1.30p1 author=1.30 ) LCG_external_package(wcwidth 0.1.7 ) LCG_external_package(webencodings 0.5.1 ) diff --git a/cmake/toolchain/heptools-dev3cuda.cmake b/cmake/toolchain/heptools-dev3cuda.cmake index 32142b566ba5262cf2fd3db48fc2dbcedcd720b8..a39cc3cdc628edec5d2b72f152b360803b853ca8 100644 --- a/cmake/toolchain/heptools-dev3cuda.cmake +++ b/cmake/toolchain/heptools-dev3cuda.cmake @@ -17,7 +17,7 @@ endif() LCG_external_package(ROOT HEAD GIT=http://root.cern.ch/git/root.git ) LCG_external_package(hepmc3 HEAD GIT=https://gitlab.cern.ch/hepmc/HepMC3.git ) -LCG_external_package(cuda 10.0 ) +LCG_external_package(cuda 10.0 full=10.0.130_410.48 ) LCG_external_package(cudnn 7.6.1.34 ) LCG_external_package(appdirs 1.4.3 ) diff --git a/cmake/toolchain/heptools-dev3cuda101.cmake b/cmake/toolchain/heptools-dev3cuda101.cmake index d4081e950dd8df3d00e3b9ba57f15f8d91313eec..a515c4d96c08b1e85eed1dcbe0695009e2fdb92f 100644 --- a/cmake/toolchain/heptools-dev3cuda101.cmake +++ b/cmake/toolchain/heptools-dev3cuda101.cmake @@ -19,5 +19,5 @@ LCG_external_package(hepmc3 HEAD GIT=https://gitlab.cern.ch/hepmc/HepMC3 LCG_external_package(tensorflow 1.14.0 ) LCG_external_package(tensorflow_estimator 1.14.0 ) LCG_external_package(tensorboard 1.14.0 protobuf=3.6.1 ) -LCG_external_package(cuda 10.1 ) +LCG_external_package(cuda 10.1 full=10.1.168_418.67) LCG_external_package(cudnn 7.6.1.34 ) diff --git a/cmake/toolchain/heptools-dev4.cmake b/cmake/toolchain/heptools-dev4.cmake index b61097f0e3c8066089bfcd3b246f732addcd7dfb..cb6137380c093ad2eba85685027c2c51040007be 100644 --- a/cmake/toolchain/heptools-dev4.cmake +++ b/cmake/toolchain/heptools-dev4.cmake @@ -4,14 +4,14 @@ include(heptools-dev-base) #---Additional External packages------(Generators)----------------- include(heptools-dev-generators) - + LCG_external_package(ROOT v6-20-00-patches GIT=http://root.cern.ch/git/root.git ) LCG_external_package(hepmc3 3.1.1 ) # Latest tagged version of COOL, CORAL instead of master (if required) if(NOT ${LCG_OS}${LCG_OSVERS} MATCHES ubuntu18|mac[0-9]+) LCG_remove_package(CORAL) - LCG_AA_project(CORAL 3_2_2) + LCG_AA_project(CORAL 3_2_3) LCG_remove_package(COOL) - LCG_AA_project(COOL 3_2_2) + LCG_AA_project(COOL 3_2_3) endif() diff --git a/cmake/toolchain/heptools-devARM.cmake b/cmake/toolchain/heptools-devARM.cmake index 401243f2fde74d19527f1e63533398b64522af36..519dbdf098d37a4f51d75834f8fda9caf7292d58 100644 --- a/cmake/toolchain/heptools-devARM.cmake +++ b/cmake/toolchain/heptools-devARM.cmake @@ -38,7 +38,10 @@ LCG_external_package(rangev3 0.5.0 ) LCG_external_package(photos++ 3.56 ${MCGENPATH}/photos++ ) LCG_external_package(crmc 1.5.6 ${MCGENPATH}/crmc ) LCG_external_package(starlight r300 ${MCGENPATH}/starlight) +LCG_external_package(pythia8 240 ${MCGENPATH}/pythia8 ) +LCG_external_package(tauola++ 1.1.6b.lhcb ${MCGENPATH}/tauola++ author=1.1.6b ) +LCG_external_package(evtgen 1.7.0 ${MCGENPATH}/evtgen tag=R01-07-00 pythia8=240 tauola++=1.1.6b.lhcb) #---Define the top level packages for this stack------------------- LCG_top_packages(Geant4 ROOT CMake evtgen pythia8 lcgenv rangev3 cppgsl CppUnit QMtest nose gperftools six networkx ninja xenv - RELAX eigen vectorclass lxml rivet fastjet pythia6 crmc starlight) + RELAX eigen vectorclass lxml rivet fastjet pythia6 crmc starlight AIDA) diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 6a12f111a9be5f642207e225c09e2b6bf39cb6c8..a9f8eb84ce1f3212470b5e9df7b4fa1cc56404df 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -82,3 +82,26 @@ LCGPackage_Add( ) +#---cuda------------------------------------------------------------------------ +LCGPackage_Add( + cuda + DOWNLOAD_COMMAND ${CMAKE_COMMAND} -Durl=${GenURL}/cuda_<cuda_<VERSION>_full>_linux + -Dsource_dir=<SOURCE_DIR> + -P ${CMAKE_SOURCE_DIR}/cmake/scripts/DownloadURL.cmake + UPDATE_COMMAND chmod +x <SOURCE_DIR>/cuda_<cuda_<VERSION>_full>_linux + CONFIGURE_COMMAND <VOID> + BUILD_COMMAND <VOID> + INSTALL_COMMAND <SOURCE_DIR>/cuda_<cuda_<VERSION>_full>_linux + --silent # disable interactive prompts + --override # override compiler version checks + --toolkit # install CUDA Toolkit + --toolkitpath=<INSTALL_DIR> + IF ${cuda_native_version} VERSION_GREATER 10.0 THEN --defaultroot=<INSTALL_DIR> ENDIF + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/cuda-setup.sh <INSTALL_DIR>/setup.sh + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/cuda-setup.csh <INSTALL_DIR>/setup.csh + BUILD_IN_SOURCE 1 +) +# The setup[sh,csh] files uses cuda_home as base installation, which is defined after LCGPackage_Add(cuda) +configure_file(templates/cuda-setup.sh.in cuda-setup.sh @ONLY) +configure_file(templates/cuda-setup.csh.in cuda-setup.csh @ONLY) + diff --git a/contrib/templates/cuda-setup.csh.in b/contrib/templates/cuda-setup.csh.in new file mode 100644 index 0000000000000000000000000000000000000000..11b0a7d80c1dbec0a73079dbc9d820022f258e39 --- /dev/null +++ b/contrib/templates/cuda-setup.csh.in @@ -0,0 +1,24 @@ +# Simple bash script for setting up the CUDA installation for the +# runtime environment. + +# The directory of this script: +set BASE=@cuda_home@ + +# Set up the directories: +if ($?PATH) then + setenv PATH ${BASE}/bin:${PATH} +else + setenv PATH ${BASE}/bin +endif +if ($?LD_LIBRARY_PATH) then + setenv LD_LIBRARY_PATH ${BASE}/lib64:${LD_LIBRARY_PATH} +else + setenv LD_LIBRARY_PATH ${BASE}/lib64 +endif +echo "Configured CUDA from: ${BASE}" + +# Set up which CUDA compiler to use: +setenv CUDACXX `which nvcc` + +# Clean up: +unset BASE diff --git a/contrib/templates/cuda-setup.sh.in b/contrib/templates/cuda-setup.sh.in new file mode 100644 index 0000000000000000000000000000000000000000..e71b0a43e620293b965cb9309f94b10f24d1a9e3 --- /dev/null +++ b/contrib/templates/cuda-setup.sh.in @@ -0,0 +1,24 @@ +# Simple bash script for setting up the CUDA installation for the +# runtime environment. + +# The directory of this script: +BASE=@cuda_home@ + +# Set up the directories: +if [ -z "${PATH}" ]; then + export PATH=${BASE}/bin +else + export PATH=${BASE}/bin:$PATH +fi +if [ -z "${LD_LIBRARY_PATH}" ]; then + export LD_LIBRARY_PATH=${BASE}/lib64 +else + export LD_LIBRARY_PATH=${BASE}/lib64:$LD_LIBRARY_PATH +fi +echo "Configured CUDA from: ${BASE}" + +# Set up which CUDA compiler to use: +export CUDACXX=`which nvcc` + +# Clean up: +unset BASE diff --git a/documentation/releases.json b/documentation/releases.json index 90a2a95105385c4bf7261b243edef268dca330d4..5713856f72dc6239f8aad4c4abbd9d70ebb18a14 100644 --- a/documentation/releases.json +++ b/documentation/releases.json @@ -7,18 +7,10 @@ "extra_notes": null, "version": "devBE" }, - { - "extra_notes": null, - "version": "dev4cuda" - }, { "extra_notes": null, "version": "dev4" }, - { - "extra_notes": null, - "version": "dev3python3" - }, { "extra_notes": null, "version": "dev3cuda" diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index ec73dfc8479a9436b6c4c404df1ceee3c0ab54cc..fb912c05287d0cfd96902fdd07ca4436b6e3f825 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -1367,12 +1367,10 @@ LCGPackage_Add( ) #---bison------------------------------------------------------------------------------------------------- -# The relocationdir prefix and DESTDIR option are used to make bison relocatable to CVMFS -# More info about this technique in section 12.7 here: https://www.gnu.org/software/bison/manual/bison.html LCGPackage_Add( bison URL ${GenURL}/bison-${bison_native_version}.tar.gz - CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=/relocationdir --enable-relocatable CC=${CMAKE_C_COMPILER} + CONFIGURE_COMMAND <SOURCE_DIR>/configure --enable-relocatable CC=${CMAKE_C_COMPILER} --prefix="" BUILD_COMMAND ${MAKE} INSTALL_COMMAND ${MAKE} install DESTDIR=<INSTALL_DIR> BUILD_IN_SOURCE 1 @@ -1539,10 +1537,12 @@ LCGPackage_Add( #---gperftools-------------------------------------------------------------------------------------------- if(NOT APPLE) # There are problems building on MacOSX if(LCG_TARGET MATCHES "x86_64") - set(gperftools_config_options "--enable-frame-pointers;--disable-deprecated-pprof") + set(gperftools_config_options "--enable-frame-pointers;--enable-libunwind") endif() if(LCG_TARGET MATCHES "ubuntu") - set(gperftools_config_options ${gperftools_config_options} "CXXFLAGS=-fpermissive") + set(gperftools_config_options ${gperftools_config_options} "CXXFLAGS=-fpermissive -I${libunwind_home}/include -L${libunwind_home}/lib;CFLAGS=-fpermissive -I${libunwind_home}/include -L${libunwind_home}/lib") + else() + set(gperftools_config_options ${gperftools_config_options} "CXXFLAGS=-I${libunwind_home}/include -L${libunwind_home}/lib;CFLAGS=-I${libunwind_home}/include -L${libunwind_home}/lib") endif() LCGPackage_Add( gperftools @@ -1553,7 +1553,7 @@ if(NOT APPLE) # There are problems building on MacOSX ENDIF CONFIGURE_COMMAND ./configure --prefix <INSTALL_DIR> ${gperftools_config_options} BUILD_IN_SOURCE 1 - REVISION 2 + DEPENDS libunwind ) else() add_custom_target(gperftools ALL COMMENT "Dummy gperftools target") @@ -2421,36 +2421,6 @@ LCGPackage_Add( -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} ) -#---cuda------------------------------------------------------------------------ -if(cuda_native_version VERSION_EQUAL 10.1) - set(cuda_full_version 10.1.168_418.67) -elseif(cuda_native_version VERSION_EQUAL 10.0) - set(cuda_full_version 10.0.130_410.48) -elseif(cuda_native_version VERSION_EQUAL 9.2) - set(cuda_full_version 9.2.88_396.26) -elseif(cuda_native_version VERSION_EQUAL 9.0) - set(cuda_full_version 9.0.176_384.81) -else() - set(cuda_full_version ${cuda_native_version}) -endif() - -LCGPackage_Add( - cuda - DOWNLOAD_COMMAND ${CMAKE_COMMAND} -Durl=${GenURL}/cuda_${cuda_full_version}_linux - -Dsource_dir=<SOURCE_DIR> - -P ${CMAKE_SOURCE_DIR}/cmake/scripts/DownloadURL.cmake - UPDATE_COMMAND chmod +x <SOURCE_DIR>/cuda_${cuda_full_version}_linux - CONFIGURE_COMMAND <VOID> - BUILD_COMMAND <VOID> - INSTALL_COMMAND <SOURCE_DIR>/cuda_${cuda_full_version}_linux - --silent # disable interactive prompts - --override # override compiler version checks - --toolkit # install CUDA Toolkit - --toolkitpath=<INSTALL_DIR> - IF ${cuda_native_version} VERSION_GREATER 10.0 THEN --defaultroot=<INSTALL_DIR> ENDIF - BUILD_IN_SOURCE 1 -) - #---cudnn----------------------------------------------------------------------- LCGPackage_Add( cudnn diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt index 3d04f29a0e294a1807a05d8f3a0ad9ddb3a03824..ad87732d5b23b8782bb6b91a34646284333be70f 100644 --- a/generators/CMakeLists.txt +++ b/generators/CMakeLists.txt @@ -1525,7 +1525,7 @@ LCGPackage_Add( BUILD_COMMAND ./openloops libinstall pptttt pptt pptt_ew ppttbb ppttj ppttj_ew pptw pptj pptjj ppjj ppjj_ew ppjjj ppjjj_ew ppatt ppattj pplltt ppllttj pplntt pplnttj ppwtt ppwttj ppllaa pplllla ppvvv ppvvv_ew ppvvvj ppaaj ppaaj2 pplla pplla_ew ppllaj ppllll ppllll2 ppllll2_onlyh ppllll_ew ppllllj ppllllj2 ppllllj2_onlyh ppllnnjj_ew ppllnnjj_vbs pplnajj ppvv ppvv2 ppvv_ew ppvvj ppvvj2 ppvvj_ew ppajj ppajj_ew ppllj ppllj_ew pplljj pplljj_ew pplnjj pplnjj_ew ppnnjj_ew ppvj ppvj_ew ppwjj ppwjj_ew ppzjj ppzjj_ew pphtt pphtt_ew pphttj bbhj heftpphj heftpphjj pph2 pphbb pphbbj pphj2 pphjj_vbf pphjj_vbf_ew ELSE #ppaaj2 and ppllnnjj_ew commented out for now; causes error - process: ppllnnjj_ew ... ERROR: not available; - BUILD_COMMAND ./openloops libinstall pptttt pptt pptt_ew ppttbb ppttj ppttj_ew pptw pptj pptjj ppjj ppjj_ew ppjjj ppjjj_ew ppatt ppattj pplltt ppllttj pplntt pplnttj ppwtt ppwttj ppllaa pplllla ppvvv ppvvv_ew ppvvvj ppaaj #[[ppaaj2]] pplla pplla_ew ppllaj ppllll ppllll2 ppllll2_onlyh ppllll_ew ppllllj ppllllj2 ppllllj2_onlyh #[[ppllnnjj_ew]] ppllnnjj_vbs pplnajj ppvv ppvv2 ppvv_ew ppvvj ppvvj2 ppvvj_ew ppajj ppajj_ew ppllj ppllj_ew pplljj pplljj_ew pplnjj pplnjj_ew ppnnjj_ew ppvj ppvj_ew ppwjj ppwjj_ew ppzjj ppzjj_ew pphtt pphtt_ew pphttj bbhj heftpphj heftpphjj pph2 pphbb pphbbj pphj2 pphjj_vbf pphjj_vbf_ew + BUILD_COMMAND ./openloops libinstall pptttt pptt pptt_ew ppttbb ppttj ppttj_ew pptw pptj pptjj ppjj ppjj_ew ppjjj ppjjj_ew ppatt ppattj pplltt ppllttj pplntt pplnttj ppwtt ppwttj ppllaa pplllla ppvvv ppvvv_ew ppvvvj ppaaj compile_extra=1 #[[ppaaj2]] pplla pplla_ew ppllaj ppllll ppllll2 ppllll2_onlyh ppllll_ew ppllllj ppllllj2 ppllllj2_onlyh #[[ppllnnjj_ew]] ppllnnjj_vbs pplnajj ppvv ppvv2 ppvv_ew ppvvj ppvvj2 ppvvj_ew ppajj ppajj_ew ppllj ppllj_ew pplljj pplljj_ew pplnjj pplnjj_ew ppnnjj_ew ppvj ppvj_ew ppwjj ppwjj_ew ppzjj ppzjj_ew pphtt pphtt_ew pphttj bbhj heftpphj heftpphjj pph2 pphbb pphbbj pphj2 pphjj_vbf pphjj_vbf_ew ENDIF ENDIF COMMAND ${CMAKE_COMMAND} -E remove_directory <SOURCE_DIR>/process_obj diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index 8fd9fabba11a4eb8033fe75791da04869ef20a5f..3d368d88ec4ae304b03c0636c4cf80fab0f830d3 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -554,7 +554,7 @@ LCGPackage_add( ) #---hepmc3---------------------------------------------------------------------------- -string(REPLACE "." "" Python_config_version_twodigit_nodot ${Python_config_version_twodigit}) +string(REPLACE "." "" Python_config_version_twodigit_nodot "${Python_config_version_twodigit}") LCGPackage_Add( hepmc3 URL ${GenURL}/HepMC3-${hepmc3_native_version}.tar.gz diff --git a/projects/patches/Geant4-10.06.patch b/projects/patches/Geant4-10.06.patch new file mode 100644 index 0000000000000000000000000000000000000000..0eef7fabaff0168163197191addd6974a6a79ae1 --- /dev/null +++ b/projects/patches/Geant4-10.06.patch @@ -0,0 +1,11 @@ +--- cmake/Modules/G4VecGeomShim.cmake.orig 2020-01-14 18:38:43.000000000 +0100 ++++ cmake/Modules/G4VecGeomShim.cmake 2020-01-14 18:32:36.000000000 +0100 +@@ -11,7 +11,7 @@ + + string(REGEX REPLACE "^\-D|;-D" ";" VECGEOM_COMPILE_DEFINITIONS "${VECGEOM_DEFINITIONS}") + set_target_properties(VecGeom::VecGeom PROPERTIES +- INTERFACE_COMPILE_DEFINITIONS ${VECGEOM_COMPILE_DEFINITIONS} ++ INTERFACE_COMPILE_DEFINITIONS "${VECGEOM_COMPILE_DEFINITIONS}" + INTERFACE_INCLUDE_DIRECTORIES "${VECGEOM_INCLUDE_DIRS}" + INTERFACE_LINK_LIBRARIES "${VECGEOM_LIBRARIES}" + IMPORTED_LOCATION "${VECGEOM_LIBRARY}") diff --git a/projects/patches/ROOT-6.18.04.patch b/projects/patches/ROOT-6.18.04.patch index 4b338447e16a386925045beb59c9425abadfc6d8..05c309119327a214b4bda2b5c9546ed0ed46128c 100644 --- a/projects/patches/ROOT-6.18.04.patch +++ b/projects/patches/ROOT-6.18.04.patch @@ -43,3 +43,25 @@ TMVA ) +target_include_directories(RMVA BEFORE PRIVATE ${R_INCLUDE_DIR}) +From 41b424610d7c83b29869e841667617c2ef253f73 Mon Sep 17 00:00:00 2001 +From: Guilherme Amadio <amadio@cern.ch> +Date: Thu, 3 Oct 2019 10:55:38 +0200 +Subject: [PATCH] Fix FindOracle.cmake to find version 19.x + +--- + cmake/modules/FindOracle.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/modules/FindOracle.cmake b/cmake/modules/FindOracle.cmake +index f09e7491954..e3ea87da5cd 100644 +--- cmake/modules/FindOracle.cmake ++++ cmake/modules/FindOracle.cmake +@@ -55,7 +55,7 @@ FIND_LIBRARY( + ) + FIND_LIBRARY( + ORACLE_LIBRARY_LNNZ +- NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 nnz18 ociw32 ++ NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 nnz18 nnz19 ociw32 + PATHS ${ORACLE_LIB_LOCATION} + ) + \ No newline at end of file