From d61b871865504198205f72fd1c26f2e8c1a1057e Mon Sep 17 00:00:00 2001
From: Pere Mato <pere.mato@cern.ch>
Date: Tue, 12 Jun 2018 15:35:08 +0200
Subject: [PATCH 01/15] Building up the HSF set of packages (part1)
---
cmake/toolchain/heptools-hsf.cmake | 216 +++++++++++++++++++++++++++++
externals/CMakeLists.txt | 21 +++
projects/CMakeLists.txt | 18 ++-
3 files changed, 248 insertions(+), 7 deletions(-)
create mode 100644 cmake/toolchain/heptools-hsf.cmake
diff --git a/cmake/toolchain/heptools-hsf.cmake b/cmake/toolchain/heptools-hsf.cmake
new file mode 100644
index 0000000000..acc07ba3df
--- /dev/null
+++ b/cmake/toolchain/heptools-hsf.cmake
@@ -0,0 +1,216 @@
+cmake_minimum_required(VERSION 2.8.5)
+
+# Declare the version of HEP Tools we use
+# (must be done before including heptools-common to allow evolution of the
+# structure)
+set(heptools_version hsf)
+
+include(${CMAKE_CURRENT_LIST_DIR}/heptools-common.cmake)
+
+# please keep alphabetic order and the structure (tabbing).
+# it makes it much easier to edit/read this file!
+
+
+# Application Area Projects
+LCG_AA_project(ROOT v6.12.06)
+LCG_AA_project(Geant4 10.04.p01)
+LCG_AA_project(HepMC 2.06.09)
+LCG_AA_project(DD4hep 00-20)
+
+# Externals
+LCG_external_package(ponder 2.1.1 )
+LCG_external_package(CMake 3.8.2 )
+LCG_external_package(CppUnit 1.12.1_p1 author=1.12.1 )
+LCG_external_package(doxygen 1.8.11 )
+LCG_external_package(eigen 3.2.9 )
+LCG_external_package(HepPDT 2.06.01 )
+LCG_external_package(icu4c 61_1 )
+LCG_external_package(jsoncpp 1.7.2 )
+
+
+# ROOT Dependencies
+LCG_external_package(Python 2.7.14 )
+LCG_external_package(fftw 3.3.4 fftw3 )
+LCG_external_package(graphviz 2.28.0 )
+LCG_external_package(GSL 2.4 )
+LCG_external_package(xrootd 4.8.2 )
+LCG_external_package(numpy 1.14.2 )
+LCG_external_package(tbb 2018_U1 )
+LCG_external_package(blas 3.8.0 )
+LCG_external_package(zlib 1.2.11 )
+LCG_external_package(libxml2 2.9.7 )
+LCG_external_package(cfitsio 3410 )
+#LCG_external_package(oracle 11.2.0.3.0 )
+LCG_external_package(Vc 1.3.2 )
+
+# Root binary Dependencies
+if(${LCG_OS} STREQUAL slc OR ${LCG_OS} STREQUAL centos)
+ if (NOT ${LCG_HOST_ARCH} STREQUAL i686)
+ LCG_external_package(CASTOR 2.1.13-6 castor )
+ LCG_external_package(cream 1.14.0-4 Grid/cream )
+ LCG_external_package(dcap 2.47.7-1 Grid/dcap )
+ LCG_external_package(dm-util 1.15.0-0 Grid/dm-util )
+ LCG_external_package(dpm 1.8.5-1 Grid/DPM )
+ LCG_external_package(epel 20130408 Grid/epel )
+ LCG_external_package(FTS 2.2.8emi2 Grid/FTS )
+ if(${LCG_OS}${LCG_OSVERS} STREQUAL slc6)
+ LCG_external_package(FTS3 0.0.1-88 Grid/FTS3 )
+ endif()
+ LCG_external_package(gfal 1.13.0-0 Grid/gfal )
+## LCG_external_package(gfal2 2.2.0-1 Grid/gfal2 )
+ LCG_external_package(gridftp_ifce 2.3.1-0 Grid/gridftp-ifce )
+ LCG_external_package(gridsite 1.7.25-1.emi2 Grid/gridsite )
+ LCG_external_package(is_ifce 1.15.0-0 Grid/is-ifce )
+ LCG_external_package(lb 3.2.9 Grid/lb )
+ LCG_external_package(lcgdmcommon 1.8.5-1 Grid/lcg-dm-common)
+ LCG_external_package(lcginfosites 3.1.0-3 Grid/lcg-infosites)
+ LCG_external_package(lfc 1.8.5-1 Grid/LFC )
+ LCG_external_package(srm_ifce 1.13.0-0 Grid/srm-ifce )
+ LCG_external_package(voms 2.0.9-1 Grid/voms )
+ LCG_external_package(WMS 3.4.0 Grid/WMS )
+ LCG_external_package(neurobayes 3.7.0 )
+ LCG_external_package(neurobayes_expert 3.7.0 )
+ endif()
+endif()
+
+
+# Geant4 Dependencies
+LCG_external_package(Qt5 5.9.2 qt5 )
+LCG_external_package(XercesC 3.1.4 author=3.1.4 )
+LCG_external_package(CLHEP 2.4.0.1 clhep )
+LCG_external_package(VecGeom v00.05.01 )
+LCG_external_package(expat 2.2.5 )
+
+# Boost
+LCG_external_package(Boost 1.65.0 )
+
+# xerces-c Dependencies
+if(${LCG_OS}${LCG_OSVERS} STREQUAL slc6)
+ LCG_external_package(curl 7.19.7 )
+else()
+ LCG_external_package(curl 7.59.0 )
+endif()
+
+# Qt5 Dependencies
+if (NOT (${LCG_OS} STREQUAL ubuntu ))
+ LCG_external_package(libxkbcommon 0.7.1 )
+endif()
+LCG_external_package(glib 2.52.2 )
+
+# numpy Dependencies
+LCG_external_package(setuptools 36.0.1 )
+
+# graphviz Dependencies
+LCG_external_package(libtool 2.4.2 )
+LCG_external_package(pango 1.40.13 )
+LCG_external_package(fontconfig 2.12.6 )
+
+# Python Dependencies
+LCG_external_package(sqlite 3210000 )
+if(${LCG_OS} MATCHES mac)
+ LCG_external_package(openssl 1.0.2d )
+endif()
+
+# glib Dependencies
+LCG_external_package(libffi 3.2.1 )
+LCG_external_package(pcre 8.38 )
+LCG_external_package(pkg_config 0.28 )
+
+# pango Dependencies
+LCG_external_package(cairo 1.15.8 )
+LCG_external_package(harfbuzz 1.6.3 )
+LCG_external_package(freetype 2.6.3 )
+
+# fontconfig Dependencies
+LCG_external_package(gperf 3.1 )
+
+# cairo Dependencies
+LCG_external_package(png 1.6.17 )
+LCG_external_package(pixman 0.34.0 )
+
+# R Dependencies
+LCG_external_package(zeromq 4.1.6 )
+
+# VecGeom Dependencies
+LCG_external_package(veccore 0.4.2 )
+LCG_external_package(umesimd 0.8.1 )
+
+LCG_external_package(cython 0.27.3 )
+
+# Doxygen dependencies
+LCG_external_package(xapian 1.2.21 )
+
+# MonteCarlo Generators
+LCG_external_package(lhapdf 5.9.1 ${MCGENPATH}/lhapdf )
+LCG_external_package(lhapdfsets 5.9.1 lhapdfsets )
+
+LCG_external_package(lhapdf 6.1.5 ${MCGENPATH}/lhapdf )
+LCG_external_package(lhapdf 6.1.5.cxxstd ${MCGENPATH}/lhapdf author=6.1.5 usecxxstd=1 )
+LCG_external_package(lhapdf 6.1.6 ${MCGENPATH}/lhapdf )
+LCG_external_package(lhapdf 6.1.6.cxxstd ${MCGENPATH}/lhapdf author=6.1.6 usecxxstd=1 )
+LCG_external_package(lhapdf 6.2.0 ${MCGENPATH}/lhapdf )
+LCG_external_package(lhapdf 6.2.1 ${MCGENPATH}/lhapdf )
+
+LCG_external_package(pythia8 210 ${MCGENPATH}/pythia8 )
+LCG_external_package(pythia8 223 ${MCGENPATH}/pythia8 )
+LCG_external_package(pythia8 219 ${MCGENPATH}/pythia8 author=219 )
+LCG_external_package(pythia8 219.pdf6plugin ${MCGENPATH}/pythia8 author=219 lhapdf6plugin=LHAPDF6.h )
+LCG_external_package(pythia8 230 ${MCGENPATH}/pythia8 )
+LCG_external_package(pythia8 235 ${MCGENPATH}/pythia8 )
+
+LCG_external_package(pythia6 427.2 ${MCGENPATH}/pythia6 author=6.4.27 hepevt=10000 )
+LCG_external_package(pythia6 428.2 ${MCGENPATH}/pythia6 author=6.4.28 hepevt=10000 )
+LCG_external_package(pythia6 429.2 ${MCGENPATH}/pythia6 author=6.4.28 hepevt=10000 )
+
+# Prepare the search paths according to the versions above
+LCG_prepare_paths()
+
+
+#-----------Original List ------------------------------------------
+#acts
+#-->boost >=1.60, 1.63.0, >=1.64.0, 1.65.1
+#-->camp (being replaced with ponder)
+#-->cfitsio 3.410
+#clang python bindings with libclang.dylib from homebrew llvm 4.0.1.
+#-->clhep 2.3.4.2, >=2.3.4.4, 2.3.4.5
+#-->cmake >=3.5, >=3.9.2
+#-->cppunit 1.3.2
+#dd4hep
+#-->doxygen >= 1.8
+#-->eigen3 >= 3.3.0
+#expat 2.2.2
+#-->fftw >= 3.3.0, 3.3.6, 3.3.6.pl2
+#fireworks-data
+#-->freetype 2.7.2
+#gaudi >= v29v1
+#gcc >= 4.9, >= 6.2, >= 6.3.0
+#geant4 >= 9.6.4, >= 10, 10.3.p01, 10.2.p03
+#gmake 4.2.1
+#-->gsl >= 2, >= 2.1
+#-->hepmc 2.06.09
+#-->heppdt >= 2.06.01
+#-->icu4c
+#-->jsoncpp >= 1.7.7
+#jsonnet >= 0.9.4
+#libtiff 4.0.8
+#libuuid 1.0.3
+#libxml2 2.9.4, 2.9.5
+#linpng 1.6.29
+#md5-cms 1.0.0
+#openssl
+#pcre 8.40
+#podio
+#python >= 2.7, >= 2.7.13, 2.7.14
+#qt5base
+#qt5svg
+#rangev3
+#readline
+#root >= 6, >= 6.10, 6.10.06, 6.10.08, 6.11.02
+#scram 2.2.6
+#sqlite 3.20.01.00
+#tbb 20161128oss, 2018
+#tinyxml-cms 2.5.3
+#vdt 0.3.9
+#xcode, 8.1, >=9.0 (macOS only)
+#xerces-c >= 3.1.13, 3.1.4
+#xrootd 4.6.0, 4.7.0
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index aed7776a95..06f7bfed32 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -1931,3 +1931,24 @@ LCGPackage_Add(
INSTALL_COMMAND ""
DEPENDS gtest
)
+
+#---ponder----------------------------------------------------------
+LCGPackage_Add(
+ ponder
+ URL ${GenURL}/ponder-${ponder_native_version}.tar.gz
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+ -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+ DEPENDS Boost
+)
+
+#---icu4c----------------------------------------------------------
+LCGPackage_Add(
+ icu4c
+ URL ${GenURL}/icu4c-${icu4c_native_version}-src.tgz
+ CONFIGURE_COMMAND ${CMAKE_COMMAND} -E chdir <SOURCE_DIR>/source ./configure --prefix <INSTALL_DIR>
+ BUILD_COMMAND ${MAKE} -C source
+ INSTALL_COMMAND ${MAKE} -C source install
+ BUILD_IN_SOURCE 1
+)
diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt
index f502df48fe..1183a30e81 100644
--- a/projects/CMakeLists.txt
+++ b/projects/CMakeLists.txt
@@ -82,7 +82,9 @@ LCGPackage_Add(
-Dmathmore=ON
-Dmemstat=ON
-Dminuit2=ON
- -Dmysql=ON
+ IF DEFINED mysql_native_version THEN
+ -Dmysql=ON
+ ENDIF
-Dodbc=ON
-Dopengl=ON
-Dpgsql=OFF
@@ -112,10 +114,10 @@ LCGPackage_Add(
-Dc++14=ON
-Dcxx14=ON
ENDIF
- IF LCG_CPP17 THEN
+ IF LCG_CPP17 THEN
-Dc++17=ON
-Dcxx17=ON
- ENDIF
+ ENDIF
IF LCG_TARGET MATCHES x86_64-slc OR LCG_TARGET MATCHES x86_64-centos THEN
-Dcastor=ON
@@ -123,12 +125,14 @@ LCGPackage_Add(
-Dgfal=ON -DGFAL_DIR=${gfal_home}
-DSRM_IFCE_DIR=${srm_ifce_home}
ENDIF
- IF LCG_TARGET MATCHES slc OR LCG_TARGET MATCHES centos THEN
+ IF DEFINED oracle_native_version AND (LCG_TARGET MATCHES slc OR LCG_TARGET MATCHES centos) THEN
-Doracle=ON -DORACLE_HOME=${oracle_home}
-### -Dqt=ON
ENDIF
-Dpythia6=ON
- DEPENDS Python fftw graphviz GSL mysql xrootd numpy tbb blas pythia6 zlib libxml2
+ DEPENDS Python fftw graphviz GSL xrootd numpy tbb blas pythia6 zlib libxml2
+ IF DEFINED mysql_native_version THEN
+ mysql
+ ENDIF
IF DEFINED Davix_native_version THEN
Davix
ENDIF
@@ -138,7 +142,7 @@ LCGPackage_Add(
IF LCG_TARGET MATCHES x86_64-slc OR LCG_TARGET MATCHES x86_64-centos THEN
CASTOR dcap gfal srm_ifce
ENDIF
- IF LCG_TARGET MATCHES slc OR LCG_TARGET MATCHES centos AND NOT LCG_TARGET MATCHES "aarch64" THEN
+ IF DEFINED oracle_native_version AND (LCG_TARGET MATCHES slc OR LCG_TARGET MATCHES centos AND NOT LCG_TARGET MATCHES "aarch64") THEN
oracle
ENDIF
#IF LCG_TARGET MATCHES slc OR LCG_TARGET MATCHES centos THEN
--
GitLab
From 64e95e7684458fc2c95696151613864a7bfadb0b Mon Sep 17 00:00:00 2001
From: Pere Mato <pere.mato@cern.ch>
Date: Wed, 13 Jun 2018 10:41:50 +0200
Subject: [PATCH 02/15] More changes
---
cmake/toolchain/heptools-hsf.cmake | 66 +++++++-----------------------
externals/CMakeLists.txt | 29 +++++++++++++
2 files changed, 44 insertions(+), 51 deletions(-)
diff --git a/cmake/toolchain/heptools-hsf.cmake b/cmake/toolchain/heptools-hsf.cmake
index acc07ba3df..47239a97b8 100644
--- a/cmake/toolchain/heptools-hsf.cmake
+++ b/cmake/toolchain/heptools-hsf.cmake
@@ -26,6 +26,11 @@ LCG_external_package(eigen 3.2.9
LCG_external_package(HepPDT 2.06.01 )
LCG_external_package(icu4c 61_1 )
LCG_external_package(jsoncpp 1.7.2 )
+LCG_external_package(jsonnet 0.10.0 )
+LCG_external_package(tiff 4.0.9 )
+LCG_external_package(uuid 1.42 )
+LCG_external_package(range_v3 0.3.6 )
+LCG_external_package(readline 2.5.1p1 )
# ROOT Dependencies
@@ -47,33 +52,12 @@ LCG_external_package(Vc 1.3.2
if(${LCG_OS} STREQUAL slc OR ${LCG_OS} STREQUAL centos)
if (NOT ${LCG_HOST_ARCH} STREQUAL i686)
LCG_external_package(CASTOR 2.1.13-6 castor )
- LCG_external_package(cream 1.14.0-4 Grid/cream )
LCG_external_package(dcap 2.47.7-1 Grid/dcap )
- LCG_external_package(dm-util 1.15.0-0 Grid/dm-util )
- LCG_external_package(dpm 1.8.5-1 Grid/DPM )
- LCG_external_package(epel 20130408 Grid/epel )
- LCG_external_package(FTS 2.2.8emi2 Grid/FTS )
- if(${LCG_OS}${LCG_OSVERS} STREQUAL slc6)
- LCG_external_package(FTS3 0.0.1-88 Grid/FTS3 )
- endif()
LCG_external_package(gfal 1.13.0-0 Grid/gfal )
-## LCG_external_package(gfal2 2.2.0-1 Grid/gfal2 )
- LCG_external_package(gridftp_ifce 2.3.1-0 Grid/gridftp-ifce )
- LCG_external_package(gridsite 1.7.25-1.emi2 Grid/gridsite )
- LCG_external_package(is_ifce 1.15.0-0 Grid/is-ifce )
- LCG_external_package(lb 3.2.9 Grid/lb )
- LCG_external_package(lcgdmcommon 1.8.5-1 Grid/lcg-dm-common)
- LCG_external_package(lcginfosites 3.1.0-3 Grid/lcg-infosites)
- LCG_external_package(lfc 1.8.5-1 Grid/LFC )
LCG_external_package(srm_ifce 1.13.0-0 Grid/srm-ifce )
- LCG_external_package(voms 2.0.9-1 Grid/voms )
- LCG_external_package(WMS 3.4.0 Grid/WMS )
- LCG_external_package(neurobayes 3.7.0 )
- LCG_external_package(neurobayes_expert 3.7.0 )
endif()
endif()
-
# Geant4 Dependencies
LCG_external_package(Qt5 5.9.2 qt5 )
LCG_external_package(XercesC 3.1.4 author=3.1.4 )
@@ -141,31 +125,11 @@ LCG_external_package(cython 0.27.3
LCG_external_package(xapian 1.2.21 )
# MonteCarlo Generators
-LCG_external_package(lhapdf 5.9.1 ${MCGENPATH}/lhapdf )
-LCG_external_package(lhapdfsets 5.9.1 lhapdfsets )
-
-LCG_external_package(lhapdf 6.1.5 ${MCGENPATH}/lhapdf )
-LCG_external_package(lhapdf 6.1.5.cxxstd ${MCGENPATH}/lhapdf author=6.1.5 usecxxstd=1 )
-LCG_external_package(lhapdf 6.1.6 ${MCGENPATH}/lhapdf )
-LCG_external_package(lhapdf 6.1.6.cxxstd ${MCGENPATH}/lhapdf author=6.1.6 usecxxstd=1 )
-LCG_external_package(lhapdf 6.2.0 ${MCGENPATH}/lhapdf )
-LCG_external_package(lhapdf 6.2.1 ${MCGENPATH}/lhapdf )
-
-LCG_external_package(pythia8 210 ${MCGENPATH}/pythia8 )
-LCG_external_package(pythia8 223 ${MCGENPATH}/pythia8 )
-LCG_external_package(pythia8 219 ${MCGENPATH}/pythia8 author=219 )
-LCG_external_package(pythia8 219.pdf6plugin ${MCGENPATH}/pythia8 author=219 lhapdf6plugin=LHAPDF6.h )
-LCG_external_package(pythia8 230 ${MCGENPATH}/pythia8 )
-LCG_external_package(pythia8 235 ${MCGENPATH}/pythia8 )
-
-LCG_external_package(pythia6 427.2 ${MCGENPATH}/pythia6 author=6.4.27 hepevt=10000 )
-LCG_external_package(pythia6 428.2 ${MCGENPATH}/pythia6 author=6.4.28 hepevt=10000 )
LCG_external_package(pythia6 429.2 ${MCGENPATH}/pythia6 author=6.4.28 hepevt=10000 )
# Prepare the search paths according to the versions above
LCG_prepare_paths()
-
#-----------Original List ------------------------------------------
#acts
#-->boost >=1.60, 1.63.0, >=1.64.0, 1.65.1
@@ -191,16 +155,16 @@ LCG_prepare_paths()
#-->heppdt >= 2.06.01
#-->icu4c
#-->jsoncpp >= 1.7.7
-#jsonnet >= 0.9.4
-#libtiff 4.0.8
-#libuuid 1.0.3
-#libxml2 2.9.4, 2.9.5
-#linpng 1.6.29
+#-->jsonnet >= 0.9.4
+#-->libtiff 4.0.8
+#--->libuuid 1.0.3
+#-->libxml2 2.9.4, 2.9.5
+#-->libpng 1.6.29
#md5-cms 1.0.0
-#openssl
-#pcre 8.40
+#-->openssl
+#-->pcre 8.40
#podio
-#python >= 2.7, >= 2.7.13, 2.7.14
+#-->python >= 2.7, >= 2.7.13, 2.7.14
#qt5base
#qt5svg
#rangev3
@@ -212,5 +176,5 @@ LCG_prepare_paths()
#tinyxml-cms 2.5.3
#vdt 0.3.9
#xcode, 8.1, >=9.0 (macOS only)
-#xerces-c >= 3.1.13, 3.1.4
-#xrootd 4.6.0, 4.7.0
+#-->xerces-c >= 3.1.13, 3.1.4
+#-->xrootd 4.6.0, 4.7.0
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 06f7bfed32..01f6b174eb 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -1952,3 +1952,32 @@ LCGPackage_Add(
INSTALL_COMMAND ${MAKE} -C source install
BUILD_IN_SOURCE 1
)
+
+#---jsonnet----------------------------------------------------------
+LCGPackage_Add(
+ jsonnet
+ URL ${GenURL}/jsonnet-${jsonnet_native_version}.tar.gz
+ CONFIGURE_COMMAND <VOID>
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${CMAKE_COMMAND} -E copy jsonnet <INSTALL_DIR>/bin/jsonnet
+ BUILD_IN_SOURCE 1
+)
+
+#---tiff----------------------------------------------------------
+LCGPackage_Add(
+ tiff
+ URL ${GenURL}/tiff-${tiff_native_version}.tar.gz
+ CONFIGURE_COMMAND ./configure --prefix <INSTALL_DIR>
+ BUILD_IN_SOURCE 1
+)
+
+#---range_v3----------------------------------------------------------
+LCGPackage_Add(
+ range_v3
+ URL ${GenURL}/range_v3-${range_v3_native_version}.tar.gz
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+ -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+)
+
--
GitLab
From 148ae50fade3565bb078e821f5a028b34f984c24 Mon Sep 17 00:00:00 2001
From: Pere Mato <pere.mato@cern.ch>
Date: Wed, 13 Jun 2018 12:26:27 +0200
Subject: [PATCH 03/15] $SHELL is not always an env variable
---
pyexternals/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt
index 2118c2106a..ace412ef11 100644
--- a/pyexternals/CMakeLists.txt
+++ b/pyexternals/CMakeLists.txt
@@ -286,7 +286,7 @@ LCGPackage_Add(
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
- COMMAND $ENV{SHELL} -c "sed -i.bak -e 's:${Python_home}/bin/:/usr/bin/env :g' <INSTALL_DIR>/bin/cython"
+ COMMAND bash -c "sed -i.bak -e 's:${Python_home}/bin/:/usr/bin/env :g' <INSTALL_DIR>/bin/cython"
BUILD_IN_SOURCE 1
DEPENDS Python
REVISION 1
--
GitLab
From 549a5fb96af14e95a794643fc7e801525966ca75 Mon Sep 17 00:00:00 2001
From: Pere Mato <pere.mato@cern.ch>
Date: Wed, 13 Jun 2018 19:18:15 +0200
Subject: [PATCH 04/15] Remove unneeded packages for the HSF test
---
cmake/toolchain/heptools-hsf.cmake | 87 ++++++------------------------
1 file changed, 16 insertions(+), 71 deletions(-)
diff --git a/cmake/toolchain/heptools-hsf.cmake b/cmake/toolchain/heptools-hsf.cmake
index 47239a97b8..40509129ea 100644
--- a/cmake/toolchain/heptools-hsf.cmake
+++ b/cmake/toolchain/heptools-hsf.cmake
@@ -15,22 +15,22 @@ include(${CMAKE_CURRENT_LIST_DIR}/heptools-common.cmake)
LCG_AA_project(ROOT v6.12.06)
LCG_AA_project(Geant4 10.04.p01)
LCG_AA_project(HepMC 2.06.09)
-LCG_AA_project(DD4hep 00-20)
-
-# Externals
-LCG_external_package(ponder 2.1.1 )
-LCG_external_package(CMake 3.8.2 )
-LCG_external_package(CppUnit 1.12.1_p1 author=1.12.1 )
-LCG_external_package(doxygen 1.8.11 )
-LCG_external_package(eigen 3.2.9 )
-LCG_external_package(HepPDT 2.06.01 )
-LCG_external_package(icu4c 61_1 )
-LCG_external_package(jsoncpp 1.7.2 )
-LCG_external_package(jsonnet 0.10.0 )
-LCG_external_package(tiff 4.0.9 )
-LCG_external_package(uuid 1.42 )
-LCG_external_package(range_v3 0.3.6 )
-LCG_external_package(readline 2.5.1p1 )
+
+# Other externals for the complete HSF stack
+#LCG_AA_project(DD4hep 00-20)
+#LCG_external_package(ponder 2.1.1 )
+#LCG_external_package(CMake 3.8.2 )
+#LCG_external_package(CppUnit 1.12.1_p1 author=1.12.1 )
+#LCG_external_package(doxygen 1.8.11 )
+#LCG_external_package(eigen 3.2.9 )
+#LCG_external_package(HepPDT 2.06.01 )
+#LCG_external_package(icu4c 61_1 )
+#LCG_external_package(jsoncpp 1.7.2 )
+#LCG_external_package(jsonnet 0.10.0 )
+#LCG_external_package(tiff 4.0.9 )
+#LCG_external_package(uuid 1.42 )
+#LCG_external_package(range_v3 0.3.6 )
+#LCG_external_package(readline 2.5.1p1 )
# ROOT Dependencies
@@ -45,7 +45,6 @@ LCG_external_package(blas 3.8.0
LCG_external_package(zlib 1.2.11 )
LCG_external_package(libxml2 2.9.7 )
LCG_external_package(cfitsio 3410 )
-#LCG_external_package(oracle 11.2.0.3.0 )
LCG_external_package(Vc 1.3.2 )
# Root binary Dependencies
@@ -119,62 +118,8 @@ LCG_external_package(zeromq 4.1.6
LCG_external_package(veccore 0.4.2 )
LCG_external_package(umesimd 0.8.1 )
-LCG_external_package(cython 0.27.3 )
-
-# Doxygen dependencies
-LCG_external_package(xapian 1.2.21 )
-
# MonteCarlo Generators
LCG_external_package(pythia6 429.2 ${MCGENPATH}/pythia6 author=6.4.28 hepevt=10000 )
# Prepare the search paths according to the versions above
LCG_prepare_paths()
-
-#-----------Original List ------------------------------------------
-#acts
-#-->boost >=1.60, 1.63.0, >=1.64.0, 1.65.1
-#-->camp (being replaced with ponder)
-#-->cfitsio 3.410
-#clang python bindings with libclang.dylib from homebrew llvm 4.0.1.
-#-->clhep 2.3.4.2, >=2.3.4.4, 2.3.4.5
-#-->cmake >=3.5, >=3.9.2
-#-->cppunit 1.3.2
-#dd4hep
-#-->doxygen >= 1.8
-#-->eigen3 >= 3.3.0
-#expat 2.2.2
-#-->fftw >= 3.3.0, 3.3.6, 3.3.6.pl2
-#fireworks-data
-#-->freetype 2.7.2
-#gaudi >= v29v1
-#gcc >= 4.9, >= 6.2, >= 6.3.0
-#geant4 >= 9.6.4, >= 10, 10.3.p01, 10.2.p03
-#gmake 4.2.1
-#-->gsl >= 2, >= 2.1
-#-->hepmc 2.06.09
-#-->heppdt >= 2.06.01
-#-->icu4c
-#-->jsoncpp >= 1.7.7
-#-->jsonnet >= 0.9.4
-#-->libtiff 4.0.8
-#--->libuuid 1.0.3
-#-->libxml2 2.9.4, 2.9.5
-#-->libpng 1.6.29
-#md5-cms 1.0.0
-#-->openssl
-#-->pcre 8.40
-#podio
-#-->python >= 2.7, >= 2.7.13, 2.7.14
-#qt5base
-#qt5svg
-#rangev3
-#readline
-#root >= 6, >= 6.10, 6.10.06, 6.10.08, 6.11.02
-#scram 2.2.6
-#sqlite 3.20.01.00
-#tbb 20161128oss, 2018
-#tinyxml-cms 2.5.3
-#vdt 0.3.9
-#xcode, 8.1, >=9.0 (macOS only)
-#-->xerces-c >= 3.1.13, 3.1.4
-#-->xrootd 4.6.0, 4.7.0
--
GitLab
From 31316ca62d1e7d66e8e3711d64ca9a699e9f9441 Mon Sep 17 00:00:00 2001
From: Pere Mato <pere.mato@cern.ch>
Date: Wed, 13 Jun 2018 21:23:10 +0200
Subject: [PATCH 05/15] Added dependency of glib to gettext
---
cmake/toolchain/heptools-hsf.cmake | 1 +
externals/CMakeLists.txt | 47 +++++++++++++++---------------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/cmake/toolchain/heptools-hsf.cmake b/cmake/toolchain/heptools-hsf.cmake
index 40509129ea..f6b561eaa2 100644
--- a/cmake/toolchain/heptools-hsf.cmake
+++ b/cmake/toolchain/heptools-hsf.cmake
@@ -98,6 +98,7 @@ endif()
LCG_external_package(libffi 3.2.1 )
LCG_external_package(pcre 8.38 )
LCG_external_package(pkg_config 0.28 )
+LCG_external_package(gettext 0.19.8.1 )
# pango Dependencies
LCG_external_package(cairo 1.15.8 )
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 01f6b174eb..1701f227d6 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -808,6 +808,28 @@ LCGPackage_Add(
REVISION 1
)
+#----gettext-------------------------------------------------------------------------------
+LCGPackage_Add(
+ gettext
+ URL ${GenURL}/gettext-${gettext_native_version}.tar.gz
+ CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
+ --without-xz
+ --without-bzip2
+ --disable-curses
+ --disable-openmp
+ --enable-relocatable
+ --disable-rpath
+ --disable-nls
+ --disable-native-java
+ --disable-acl
+ --disable-java
+ --disable-dependency-tracking
+ --disable-silent-rules
+ --enable-static
+ --enable-shared
+ BUILD_IN_SOURCE 1
+)
+
#---glib-----------------------------------------------------------------------------------------------
LCGPackage_Add(
glib
@@ -816,7 +838,7 @@ LCGPackage_Add(
BUILD_COMMAND make
INSTALL_COMMAND make install -i
BUILD_IN_SOURCE 1
- DEPENDS libffi pcre pkg_config
+ DEPENDS libffi pcre pkg_config gettext
)
#---freetype--------------------------------------------------------------------------------------------
@@ -1439,29 +1461,6 @@ LCGPackage_Add(
DEPENDS autoconf
)
-#----gettext-------------------------------------------------------------------------------
-LCGPackage_Add(
- gettext
- URL ${GenURL}/gettext-${gettext_native_version}.tar.gz
- CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
- --without-xz
- --without-bzip2
- --disable-curses
- --disable-openmp
- --enable-relocatable
- --disable-rpath
- --disable-nls
- --disable-native-java
- --disable-acl
- --disable-java
- --disable-dependency-tracking
- --disable-silent-rules
- --enable-static
- --enable-shared
- BUILD_IN_SOURCE 1
-)
-
-
#---R----------------------------------------------------------------------------------------------------
LCGPackage_set_home(R)
LCGPackage_set_home(jupyter)
--
GitLab
From 4131082bda1c2e0eec302699f1cbe75290811737 Mon Sep 17 00:00:00 2001
From: Pere Mato <pere.mato@cern.ch>
Date: Wed, 13 Jun 2018 21:45:35 +0200
Subject: [PATCH 06/15] Use ${MAKE} to transmit -jN
---
externals/CMakeLists.txt | 150 +++++++++++++++++++--------------------
1 file changed, 75 insertions(+), 75 deletions(-)
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 1701f227d6..9d67698b9e 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -3,7 +3,7 @@ LCGPackage_Add(
sqlite
URL ${GenURL}/sqlite-autoconf-${sqlite_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
- BUILD_COMMAND make
+ BUILD_COMMAND ${MAKE}
FIND_PACKAGE SQLite
BUILD_IN_SOURCE 1
)
@@ -25,8 +25,8 @@ LCGPackage_Add(
libiodbc
URL ${GenURL}/libiodbc-${libiodbc_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
- BUILD_COMMAND make
- INSTALL_COMMAND make install -i
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install -i
BUILD_IN_SOURCE 1
)
#---texinfo-----------------------------------------------------------------------------------------------
@@ -34,8 +34,8 @@ LCGPackage_Add(
texinfo
URL ${GenURL}/texinfo-${texinfo_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
)
#---xapian-----------------------------------------------------------------------------------------------
@@ -43,8 +43,8 @@ LCGPackage_Add(
xapian
URL ${GenURL}/xapian-core-${xapian_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
COMMAND ${CMAKE_COMMAND} -E copy <INSTALL_DIR>/include/xapian.h <INSTALL_DIR>/include/xapian/.
BUILD_IN_SOURCE 1
)
@@ -53,8 +53,8 @@ LCGPackage_Add(
png
URL ${GenURL}/libpng-${png_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
- BUILD_COMMAND make IF NOT LCG_HOST_ARCH STREQUAL i686 THEN check ENDIF
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE} IF NOT LCG_HOST_ARCH STREQUAL i686 THEN check ENDIF
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
)
#---jpeg-----------------------------------------------------------------------------------------------
@@ -62,8 +62,8 @@ LCGPackage_Add(
jpeg
URL ${GenURL}/jpeg-${jpeg_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
- BUILD_COMMAND make test
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE} test
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
)
#---jemalloc-----------------------------------------------------------------------------------------------
@@ -71,8 +71,8 @@ LCGPackage_Add(
jemalloc
URL ${GenURL}/jemalloc-${jemalloc_native_version}.tar.bz2
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
)
#---gmp-----------------------------------------------------------------------------------------------
@@ -80,8 +80,8 @@ LCGPackage_Add(
gmp
URL ${GenURL}/gmp-${gmp_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --enable-cxx
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
REVISION 1
)
@@ -90,8 +90,8 @@ LCGPackage_Add(
mpfr
URL ${GenURL}/mpfr-${mpfr_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --with-gmp=${gmp_home}
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
DEPENDS gmp
)
@@ -100,8 +100,8 @@ LCGPackage_Add(
mpfi
URL ${GenURL}/mpfi-${mpfi_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --with-gmp=${gmp_home} --with-mpfr=${mpfr_home}
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
DEPENDS gmp mpfr
)
@@ -125,7 +125,7 @@ LCGPackage_Add(
URL ${GenURL}/libaio-${libaio_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
- INSTALL_COMMAND make prefix=<INSTALL_DIR> install
+ INSTALL_COMMAND ${MAKE} prefix=<INSTALL_DIR> install
BUILD_IN_SOURCE 1
)
@@ -134,8 +134,8 @@ LCGPackage_Add(
db
URL ${GenURL}/db-${db_native_version}.tar.gz
CONFIGURE_COMMAND dist/configure --prefix=<INSTALL_DIR>
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
)
@@ -144,8 +144,8 @@ LCGPackage_Add(
openldap
URL ${GenURL}/openldap-${openldap_native_version}.tgz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> CPPFLAGS=-I${db_home}/include LDFLAGS=-L${db_home}/lib
- BUILD_COMMAND make
- INSTALL_COMMAND make install -i
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install -i
BUILD_IN_SOURCE 1
DEPENDS db
)
@@ -163,8 +163,8 @@ LCGPackage_Add(
cfitsio
URL ${GenURL}/cfitsio${cfitsio_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
)
#---globus-------------------------------------------------------------------------------------------------
@@ -182,8 +182,8 @@ LCGPackage_Add(
gsoap
URL ${GenURL}/gsoap_${gsoap_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
)
#---nanomsg-----------------------------------------------------------------------------------------------
@@ -191,8 +191,8 @@ LCGPackage_Add(
nanomsg
URL ${GenURL}/nanomsg-${nanomsg_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
)
@@ -292,8 +292,8 @@ LCGPackage_Add(
URL ${GenURL}/gdb-${gdb_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --with-python=${Python_home}/bin/python${Python_config_version_twodigit} ${gdb_config_options}
ENVIRONMENT LD_LIBRARY_PATH=${Python_home}/lib:\$ENV{LD_LIBRARY_PATH}
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
DEPENDS texinfo Python
)
@@ -460,7 +460,7 @@ LCGPackage_Add(
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_WRAPPER}
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
${Vc_options}
- INSTALL_COMMAND make install
+ INSTALL_COMMAND ${MAKE} install
COMMAND ${CMAKE_COMMAND} -E make_directory <INSTALL_DIR>/cmake
COMMAND ${CMAKE_COMMAND} -E copy_directory <INSTALL_DIR>/lib/cmake/Vc <INSTALL_DIR>/cmake
BUILD_WITH_INSTRUCTION_SET 1
@@ -478,7 +478,7 @@ LCGPackage_Add(
uuid
URL ${GenURL}/e2fsprogs-${uuid_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix <INSTALL_DIR> ${uuid_config_options}
- BUILD_COMMAND make -j1 -C lib/uuid
+ BUILD_COMMAND ${MAKE} -j1 -C lib/uuid
INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory <INSTALL_DIR>/lib
COMMAND make -j1 -C lib/uuid install
FIND_PACKAGE UUID
@@ -645,7 +645,7 @@ LCGPackage_Add(
URL ${GenURL}/tbb${tbb_native_version}.tar.gz
ENDIF
CONFIGURE_COMMAND <VOID>
- BUILD_COMMAND make ${tbb_build_options}
+ BUILD_COMMAND ${MAKE} ${tbb_build_options}
INSTALL_COMMAND ${CMAKE_COMMAND} -Dinstall_dir=<INSTALL_DIR> -Dsource_dir=<SOURCE_DIR> -P ${CMAKE_SOURCE_DIR}/cmake/scripts/InstallTBB.cmake
BUILD_IN_SOURCE 1
)
@@ -791,8 +791,8 @@ LCGPackage_Add(
libffi
URL ${GenURL}/libffi-${libffi_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
- BUILD_COMMAND make
- INSTALL_COMMAND make install -i
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install -i
BUILD_IN_SOURCE 1
)
@@ -835,8 +835,8 @@ LCGPackage_Add(
glib
URL ${GenURL}/glib-${glib_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --disable-libmount --with-pcre=internal
- BUILD_COMMAND make
- INSTALL_COMMAND make install -i
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install -i
BUILD_IN_SOURCE 1
DEPENDS libffi pcre pkg_config gettext
)
@@ -865,8 +865,8 @@ LCGPackage_Add(
gperf
URL ${GenURL}/gperf-${gperf_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
)
@@ -876,8 +876,8 @@ LCGPackage_Add(
fontconfig
URL ${GenURL}/fontconfig-${fontconfig_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
DEPENDS freetype gperf expat pkg_config
)
@@ -888,8 +888,8 @@ LCGPackage_Add(
cairo
URL ${GenURL}/cairo-${cairo_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --enable-ft --enable-fc
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
DEPENDS png pixman pkg_config freetype fontconfig
)
@@ -900,8 +900,8 @@ LCGPackage_Add(
harfbuzz
URL ${GenURL}/harfbuzz-${harfbuzz_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --with-cairo --with-freetype --with-glib "LDFLAGS=-lz"
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
DEPENDS freetype glib cairo
)
@@ -912,8 +912,8 @@ LCGPackage_Add(
pango
URL ${GenURL}/pango-${pango_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
DEPENDS cairo harfbuzz freetype fontconfig glib
)
@@ -946,7 +946,7 @@ LCGPackage_Add(
URL ${GenURL}/graphviz-${graphviz_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix <INSTALL_DIR> --with-expatlibdir=${expat_home}/lib
--with-expatincludedir=${expat_home}/include ${graphviz_config_opts}
- BUILD_COMMAND make ${graphviz_build_opts}
+ BUILD_COMMAND ${MAKE} ${graphviz_build_opts}
BUILD_IN_SOURCE 1
DEPENDS libtool IF DEFINED pango_native_version THEN pango ENDIF expat fontconfig
)
@@ -968,7 +968,7 @@ LCGPackage_Add(
blas
URL ${GenURL}/blas-${blas_native_version}.tgz
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
- INSTALL_COMMAND make install
+ INSTALL_COMMAND ${MAKE} install
IF NOT APPLE THEN COMMAND ${CMAKE_COMMAND} -E chdir <INSTALL_DIR>/lib ${CMAKE_COMMAND} -E create_symlink libblas.so.3 libblas.so ENDIF
REVISION 1
)
@@ -977,8 +977,8 @@ LCGPackage_Add(
gtest
URL ${GenURL}/gtest-${gtest_native_version}.tgz
CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -Dgtest_build_samples=ON <SOURCE_DIR>
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
# INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory <INSTALL_DIR>/lib
# COMMAND ${CMAKE_COMMAND} -E make_directory <INSTALL_DIR>/include
# COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/googlemock/gtest/libgtest.a <INSTALL_DIR>/lib/.
@@ -1003,7 +1003,7 @@ LCGPackage_Add(
URL ${GenURL}/lapack-${lapack_native_version}.tgz
UPDATE_COMMAND ${CMAKE_COMMAND} -E touch <SOURCE_DIR>/make.inc
CONFIGURE_COMMAND <VOID>
- BUILD_COMMAND make FORTRAN=${lapack_fortran_compiler}
+ BUILD_COMMAND ${MAKE} FORTRAN=${lapack_fortran_compiler}
"OPTS=-O3 -fPIC" "DRVOPTS=-O3 -fPIC" "NOOPT=-fPIC"
LOADER=${lapack_fortran_compiler} TIMER=INT_ETIME
ARCH=ar ARCHFLAGS=cr RANLIB=ranlib
@@ -1069,8 +1069,8 @@ LCGPackage_Add(
libxkbcommon
URL ${GenURL}/libxkbcommon-${libxkbcommon_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
- BUILD_COMMAND make
- INSTALL_COMMAND make install -i
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install -i
BUILD_IN_SOURCE 1
)
#---Qt5---------------------------------------------------------------------------------------------------
@@ -1121,8 +1121,8 @@ LCGPackage_Add(
gnuplot
URL ${GenURL}/gnuplot-${gnuplot_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> ${with_qt_flag}
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
DEPENDS Qt5 cairo
)
@@ -1135,8 +1135,8 @@ LCGPackage_Add(
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> "CPPFLAGS=-I${pcre_home}/include" "LDFLAGS=-L${pcre_home}/lib"
--with-blas=${blas_home}/lib/libBLAS.a --with-lapack=${lapack_home}/lib/libLAPACK.a
${with_qt_flag} --libdir=<INSTALL_DIR>/lib --disable-rpath
- BUILD_COMMAND make
- INSTALL_COMMAND make install -i
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install -i
COMMAND ${CMAKE_COMMAND} -E copy_directory <INSTALL_DIR>/lib/octave/${octave_native_version} <INSTALL_DIR>/lib
BUILD_IN_SOURCE 1
DEPENDS pcre blas lapack Qt5 gnuplot texinfo
@@ -1183,8 +1183,8 @@ LCGPackage_Add(
pacparser
URL ${GenURL}/pacparser-${pacparser_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
- BUILD_COMMAND make -j1 -C src
- INSTALL_COMMAND make -j1 PREFIX=<INSTALL_DIR> -C src install
+ BUILD_COMMAND ${MAKE} -j1 -C src
+ INSTALL_COMMAND ${MAKE} -j1 PREFIX=<INSTALL_DIR> -C src install
BUILD_IN_SOURCE 1
)
@@ -1205,7 +1205,7 @@ LCGPackage_Add(
Frontier_Client
URL ${GenURL}/frontier_client__${Frontier_Client_native_version}__src.tar.gz
CONFIGURE_COMMAND <VOID>
- BUILD_COMMAND make -j1 dist PACPARSER_DIR=${pacparser_home}
+ BUILD_COMMAND ${MAKE} -j1 dist PACPARSER_DIR=${pacparser_home}
EXPAT_DIR=${expat_home}
${opt_Frontier_Client}
${library_path}=${expat_home}/lib:$ENV{${library_path}}
@@ -1221,7 +1221,7 @@ if(NOT APPLE) # There are problems building on MacOSX
URL ${GenURL}/lcov-${lcov_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
- INSTALL_COMMAND make install PREFIX=<INSTALL_DIR>
+ INSTALL_COMMAND ${MAKE} install PREFIX=<INSTALL_DIR>
COMMAND ${CMAKE_COMMAND} -E copy_directory <INSTALL_DIR>/usr/bin <INSTALL_DIR>/bin
COMMAND ${CMAKE_COMMAND} -E copy_directory <INSTALL_DIR>/usr/share/man <INSTALL_DIR>/man
COMMAND ${CMAKE_COMMAND} -E remove_directory <INSTALL_DIR>/usr/share
@@ -1333,7 +1333,7 @@ LCGPackage_Add(
fftw
URL ${GenURL}/fftw-${fftw_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --enable-shared IF <VERSION> VERSION_GREATER 3.3.0 THEN --enable-threads ENDIF
- BUILD_COMMAND make CFLAGS=-fPIC
+ BUILD_COMMAND ${MAKE} CFLAGS=-fPIC
BUILD_IN_SOURCE 1
)
@@ -1357,7 +1357,7 @@ LCGPackage_Add(
URL ${GenURL}/valgrind-${valgrind_native_version}.tar.bz2
CONFIGURE_COMMAND chmod +x ./configure
COMMAND ./configure --prefix=<INSTALL_DIR>
- BUILD_COMMAND make ${valgrind_build_opts}
+ BUILD_COMMAND ${MAKE} ${valgrind_build_opts}
BUILD_IN_SOURCE 1
)
@@ -1388,7 +1388,7 @@ LCGPackage_Add(
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
--with-xerces=${XercesC_home}
--disable-rpath
- BUILD_COMMAND make CXXFLAGS=${xqilla_CXXFLAGS}
+ BUILD_COMMAND ${MAKE} CXXFLAGS=${xqilla_CXXFLAGS}
BUILD_IN_SOURCE 1
DEPENDS XercesC
)
@@ -1529,7 +1529,7 @@ LCGPackage_Add(
URL ${GenURL}/R-${R_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --disable-R-framework --enable-R-shlib --without-x --with-cairo --with-libpng --with-libtiff --with-jpeglib
CXX=${CMAKE_CXX_COMPILER} CC=${CMAKE_C_COMPILER} CXXFLAGS=-I${zeromq_home}/include LDFLAGS=-L${zeromq_home}/lib LIBnn=${_LIBDIR}
- INSTALL_COMMAND make install
+ INSTALL_COMMAND ${MAKE} install
COMMAND ${EXEC} -u MAKEFLAGS <INSTALL_DIR>/bin/Rscript --vanilla --verbose ${CMAKE_CURRENT_BINARY_DIR}/install-packages.R
COMMAND ${CMAKE_COMMAND} -E chdir <INSTALL_DIR>/${_LIBDIR} find R/lib -type f -exec ln -s {} \\\\SEMICOLON
COMMAND ${CMAKE_COMMAND} -E chdir <INSTALL_DIR>/${_LIBDIR} find R/library/RInside/lib -type f -exec ln -s {} \\\\SEMICOLON
@@ -1545,7 +1545,7 @@ LCGPackage_Add(
opencascade
URL ${GenURL}/opencascade-${opencascade_native_version}.tgz
CMAKE_ARGS -DINSTALL_DIR=<INSTALL_DIR>
- INSTALL_COMMAND make install
+ INSTALL_COMMAND ${MAKE} install
COMMAND cmake -E chdir <INSTALL_DIR> cmake -E create_symlink mac64/clang lib
)
@@ -1638,8 +1638,8 @@ LCGPackage_Add(
URL ${GenURL}/fplll-${fplll_native_version}.tar.gz
CONFIGURE_COMMAND ./autogen.sh
COMMAND ./configure --prefix=<INSTALL_DIR> --with-mpfr=${mpfr_home} --with-gmp=${gmp_home}
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
DEPENDS gmp mpfr automake libtool
)
@@ -1649,8 +1649,8 @@ LCGPackage_Add(
sollya
URL ${GenURL}/sollya-${sollya_native_version}.tar.bz2
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --with-gmp=${gmp_home} --with-mpfr=${mpfr_home} --with-mpfi=${mpfi_home} --with-xml2=${libxml2_home} --with-fplll=${fplll_home}
- BUILD_COMMAND make
- INSTALL_COMMAND make install
+ BUILD_COMMAND ${MAKE}
+ INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
DEPENDS gmp mpfr mpfi libxml2 fplll
)
@@ -1705,7 +1705,7 @@ LCGPackage_Add(
-DBOOST_ROOT=${Boost_home}
${Boost_extra_configuration}
BUILD_IN_SOURCE 1
- INSTALL_COMMAND make install
+ INSTALL_COMMAND ${MAKE} install
DEPENDS Boost
)
@@ -1760,7 +1760,7 @@ LCGPackage_Add(
URL ${GenURL}/C50-${C50_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
- INSTALL_COMMAND make
+ INSTALL_COMMAND ${MAKE}
COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/c5.0 <INSTALL_DIR>/c5.0
BUILD_IN_SOURCE 1
)
--
GitLab
From 13e3f9798be7ee42245bfadce462ff68b18e0e5e Mon Sep 17 00:00:00 2001
From: SFT Nightlies <sftnight@lcgapp-centos7-jenkinslcgsoft.cern.ch>
Date: Mon, 11 Jun 2018 22:22:40 +0200
Subject: [PATCH 07/15] [Jenkins] update packages.json and releases.json
---
documentation/releases.json | 8 --------
1 file changed, 8 deletions(-)
diff --git a/documentation/releases.json b/documentation/releases.json
index 983dfd2393..ab78e9c1a4 100644
--- a/documentation/releases.json
+++ b/documentation/releases.json
@@ -3,18 +3,10 @@
"extra_notes": null,
"version": "devgeantv"
},
- {
- "extra_notes": null,
- "version": "dev4"
- },
{
"extra_notes": null,
"version": "dev3python3"
},
- {
- "extra_notes": null,
- "version": "dev3"
- },
{
"extra_notes": null,
"version": "93python3"
--
GitLab
From a744552d0c90be62c251d57603b83d1fb67cef1b Mon Sep 17 00:00:00 2001
From: SFT Nightlies <sftnight@lcgapp-centos7-jenkinslcgsoft.cern.ch>
Date: Tue, 12 Jun 2018 01:36:55 +0200
Subject: [PATCH 08/15] [Jenkins] update packages.json and releases.json
---
documentation/releases.json | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/documentation/releases.json b/documentation/releases.json
index ab78e9c1a4..7600d8f10a 100644
--- a/documentation/releases.json
+++ b/documentation/releases.json
@@ -3,6 +3,10 @@
"extra_notes": null,
"version": "devgeantv"
},
+ {
+ "extra_notes": null,
+ "version": "dev4"
+ },
{
"extra_notes": null,
"version": "dev3python3"
--
GitLab
From 1c243eab550a6e5b5f6614ec983941ef00fd0d6e Mon Sep 17 00:00:00 2001
From: SFT Nightlies <sftnight@lcgapp-centos7-jenkinslcgsoft.cern.ch>
Date: Tue, 12 Jun 2018 04:58:23 +0200
Subject: [PATCH 09/15] [Jenkins] update packages.json and releases.json
---
documentation/releases.json | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/documentation/releases.json b/documentation/releases.json
index 7600d8f10a..983dfd2393 100644
--- a/documentation/releases.json
+++ b/documentation/releases.json
@@ -11,6 +11,10 @@
"extra_notes": null,
"version": "dev3python3"
},
+ {
+ "extra_notes": null,
+ "version": "dev3"
+ },
{
"extra_notes": null,
"version": "93python3"
--
GitLab
From 7e49ba48fd71678120f47d3e95e6c50ef8253d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Pacho=C5=82ek?= <rafal.pacholek@cern.ch>
Date: Tue, 12 Jun 2018 10:20:20 +0200
Subject: [PATCH 10/15] Install headers and shared libs for tensorflow >1.7.0
---
pyexternals/CMakeLists.txt | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt
index ace412ef11..4ed0615901 100644
--- a/pyexternals/CMakeLists.txt
+++ b/pyexternals/CMakeLists.txt
@@ -2240,6 +2240,11 @@ LCGPackage_Add(
DOWNLOAD_COMMAND ${CMAKE_COMMAND} -Durl=${GenURL}/tensorflow-${tensorflow_native_version}-${PYTHON}.whl
-Dsource_dir=<SOURCE_DIR>
-P ${CMAKE_SOURCE_DIR}/cmake/scripts/DownloadURL.cmake
+ IF <VERSION> VERSION_GREATER 1.7.0 THEN
+ COMMAND ${CMAKE_COMMAND} -Durl=${GenURL}/tensorflow-${tensorflow_native_version}.tar.gz
+ -Dsource_dir=<SOURCE_DIR>
+ -P ${CMAKE_SOURCE_DIR}/cmake/scripts/DownloadURL.cmake
+ ENDIF
UPDATE_COMMAND ${CMAKE_COMMAND} -E rename <SOURCE_DIR>/tensorflow-${tensorflow_native_version}-${PYTHON}.whl
<SOURCE_DIR>/tensorflow-${tensorflow_native_version}-${py_tensorflow}-none-linux_x86_64.whl
CONFIGURE_COMMAND <VOID>
@@ -2248,7 +2253,11 @@ LCGPackage_Add(
COMMAND ${PYTHON} ${pip_home}/bin/pip install --no-deps --prefix=<INSTALL_DIR> --egg --no-binary :all: protobuf==3.5.2
COMMAND ${PYTHON} ${pip_home}/bin/pip install --no-deps --prefix=<INSTALL_DIR>
<SOURCE_DIR>/tensorflow-${tensorflow_native_version}-${py_tensorflow}-none-linux_x86_64.whl
+ IF <VERSION> VERSION_GREATER 1.7.0 THEN
+ COMMAND ${CMAKE_COMMAND} -E chdir <INSTALL_DIR> tar xf <SOURCE_DIR>/tensorflow-${tensorflow_native_version}.tar
+ ENDIF
BUILD_IN_SOURCE 1
+ REVISION 1
DEPENDS Python setuptools pip numpy six wheel mock tensorboard absl_py gast
IF Python_native_version VERSION_LESS 3 THEN enum34 ENDIF
)
--
GitLab
From 17845abfecb0c4c8be4365990b9cdde525cfcf53 Mon Sep 17 00:00:00 2001
From: SFT Nightlies <sftnight@lcgapp-centos7-jenkinslcgsoft.cern.ch>
Date: Tue, 12 Jun 2018 22:29:02 +0200
Subject: [PATCH 11/15] [Jenkins] update packages.json and releases.json
---
documentation/releases.json | 8 --------
1 file changed, 8 deletions(-)
diff --git a/documentation/releases.json b/documentation/releases.json
index 983dfd2393..ab78e9c1a4 100644
--- a/documentation/releases.json
+++ b/documentation/releases.json
@@ -3,18 +3,10 @@
"extra_notes": null,
"version": "devgeantv"
},
- {
- "extra_notes": null,
- "version": "dev4"
- },
{
"extra_notes": null,
"version": "dev3python3"
},
- {
- "extra_notes": null,
- "version": "dev3"
- },
{
"extra_notes": null,
"version": "93python3"
--
GitLab
From 65fa59843549db7c088f415108bc455812cd0854 Mon Sep 17 00:00:00 2001
From: SFT Nightlies <sftnight@lcgapp-centos7-jenkinslcgsoft.cern.ch>
Date: Wed, 13 Jun 2018 02:27:12 +0200
Subject: [PATCH 12/15] [Jenkins] update packages.json and releases.json
---
documentation/releases.json | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/documentation/releases.json b/documentation/releases.json
index ab78e9c1a4..7600d8f10a 100644
--- a/documentation/releases.json
+++ b/documentation/releases.json
@@ -3,6 +3,10 @@
"extra_notes": null,
"version": "devgeantv"
},
+ {
+ "extra_notes": null,
+ "version": "dev4"
+ },
{
"extra_notes": null,
"version": "dev3python3"
--
GitLab
From ecf29ac2d93362d8560e3f074cc45c19d1a1c155 Mon Sep 17 00:00:00 2001
From: SFT Nightlies <sftnight@lcgapp-centos7-jenkinslcgsoft.cern.ch>
Date: Wed, 13 Jun 2018 05:39:10 +0200
Subject: [PATCH 13/15] [Jenkins] update packages.json and releases.json
---
documentation/releases.json | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/documentation/releases.json b/documentation/releases.json
index 7600d8f10a..983dfd2393 100644
--- a/documentation/releases.json
+++ b/documentation/releases.json
@@ -11,6 +11,10 @@
"extra_notes": null,
"version": "dev3python3"
},
+ {
+ "extra_notes": null,
+ "version": "dev3"
+ },
{
"extra_notes": null,
"version": "93python3"
--
GitLab
From 67ebeeb2aec442b754005b3643745bda5bc138d2 Mon Sep 17 00:00:00 2001
From: Pere Mato <pere.mato@cern.ch>
Date: Wed, 13 Jun 2018 10:45:46 +0200
Subject: [PATCH 14/15] Created new set of Geant4 externals
---
.../heptools-geant4ext20180613.cmake | 88 +++++++++++++++++++
1 file changed, 88 insertions(+)
create mode 100644 cmake/toolchain/heptools-geant4ext20180613.cmake
diff --git a/cmake/toolchain/heptools-geant4ext20180613.cmake b/cmake/toolchain/heptools-geant4ext20180613.cmake
new file mode 100644
index 0000000000..a9a2996249
--- /dev/null
+++ b/cmake/toolchain/heptools-geant4ext20180613.cmake
@@ -0,0 +1,88 @@
+
+cmake_minimum_required(VERSION 2.8.5)
+
+# Declare the version of HEP Tools we use
+# (must be done before including heptools-common to allow evolution of the
+# structure)
+set(heptools_version geant4ext20180613)
+
+include(${CMAKE_CURRENT_LIST_DIR}/heptools-common.cmake)
+
+# please keep alphabetic order and the structure (tabbing).
+# it makes it much easier to edit/read this file!
+
+# Application Area Projects
+LCG_AA_project(ROOT 6.12.06)
+LCG_AA_project(HepMC 2.06.09)
+
+# Externals
+LCG_external_package(lcgenv 1.3.3 )
+LCG_external_package(hepmc3 3.0.0 )
+LCG_external_package(blas 20110419 )
+LCG_external_package(cairo 1.15.8 )
+LCG_external_package(ccache 3.3.4 )
+LCG_external_package(CLHEP 2.4.1.0 clhep )
+LCG_external_package(cmaketools 1.6 )
+LCG_external_package(CMake 3.8.2 )
+if(${LCG_OS}${LCG_OSVERS} STREQUAL slc6)
+ LCG_external_package(curl 7.19.7 )
+else()
+ LCG_external_package(curl 7.48.0 )
+endif()
+LCG_external_package(cython 0.27.3 )
+LCG_external_package(doxygen 1.8.11 )
+LCG_external_package(expat 2.2.5 )
+LCG_external_package(fftw 3.3.4 fftw3 )
+LCG_external_package(fontconfig 2.12.6 )
+LCG_external_package(freetype 2.6.3 )
+LCG_external_package(glib 2.52.2 )
+LCG_external_package(gperf 3.1 )
+LCG_external_package(graphviz 2.28.0 )
+LCG_external_package(GSL 2.1 )
+LCG_external_package(libffi 3.2.1 )
+LCG_external_package(libtool 2.4.2 )
+if (NOT (${LCG_OS} STREQUAL ubuntu ))
+LCG_external_package(libxkbcommon 0.7.1 )
+endif()
+LCG_external_package(mysql 5.7.20 )
+LCG_external_package(ninja 1.7.2.gcc0ea.kitware.dyndep )
+LCG_external_package(numpy 1.11.0 )
+if(${LCG_OS} MATCHES mac)
+ LCG_external_package(openssl 1.0.2d )
+endif()
+LCG_external_package(oracle 11.2.0.3.0 )
+LCG_external_package(pcre 8.38 )
+LCG_external_package(pixman 0.34.0 )
+LCG_external_package(pkg_config 0.28 )
+LCG_external_package(png 1.6.17 )
+LCG_external_package(Python 2.7.13 )
+LCG_external_package(PythonFWK 2.7.13 )
+LCG_external_package(Qt5 5.9.2 qt5 )
+#LCG_external_package(R 3.2.5 )
+LCG_external_package(setuptools 36.0.1 )
+LCG_external_package(sqlite 3210000 )
+LCG_external_package(tbb 2018_U1 )
+LCG_external_package(veccore 0.4.2 )
+LCG_external_package(VecGeom v00.05.01 )
+LCG_external_package(Vc 1.3.2 )
+LCG_external_package(xapian 1.2.21 )
+LCG_external_package(XercesC 3.1.3 author=3.1.3 )
+LCG_external_package(xrootd 4.7.0 )
+LCG_external_package(zeromq 4.1.4 )
+LCG_external_package(zlib 1.2.8 )
+if(${LCG_OS} STREQUAL slc OR ${LCG_OS} STREQUAL centos)
+ if (NOT ${LCG_HOST_ARCH} STREQUAL i686)
+ LCG_external_package(CASTOR 2.1.13-6 castor )
+ LCG_external_package(dcap 2.47.7-1 Grid/dcap )
+ LCG_external_package(gfal 1.13.0-0 Grid/gfal )
+ LCG_external_package(srm_ifce 1.13.0-0 Grid/srm-ifce )
+ endif()
+endif()
+#---Additional External packages------(Generators)-----------------
+set(MCGENPATH MCGenerators)
+LCG_external_package(lhapdf 6.2.0 ${MCGENPATH}/lhapdf )
+LCG_external_package(pythia6 429.2 ${MCGENPATH}/pythia6 author=6.4.28 hepevt=10000 )
+LCG_external_package(pythia8 230 ${MCGENPATH}/pythia8 )
+
+# Prepare the search paths according to the versions above
+LCG_prepare_paths()
--
GitLab
From 4d9797933abab353a280a62cbeeef497ee99df01 Mon Sep 17 00:00:00 2001
From: Pere Mato <pere.mato@cern.ch>
Date: Wed, 13 Jun 2018 11:03:29 +0200
Subject: [PATCH 15/15] Added meissing dependencies
---
cmake/toolchain/heptools-geant4ext20180613.cmake | 2 ++
1 file changed, 2 insertions(+)
diff --git a/cmake/toolchain/heptools-geant4ext20180613.cmake b/cmake/toolchain/heptools-geant4ext20180613.cmake
index a9a2996249..3b414fb102 100644
--- a/cmake/toolchain/heptools-geant4ext20180613.cmake
+++ b/cmake/toolchain/heptools-geant4ext20180613.cmake
@@ -44,6 +44,7 @@ LCG_external_package(libtool 2.4.2
if (NOT (${LCG_OS} STREQUAL ubuntu ))
LCG_external_package(libxkbcommon 0.7.1 )
endif()
+LCG_external_package(libxml2 2.9.3 )
LCG_external_package(mysql 5.7.20 )
LCG_external_package(ninja 1.7.2.gcc0ea.kitware.dyndep )
LCG_external_package(numpy 1.11.0 )
@@ -62,6 +63,7 @@ LCG_external_package(Qt5 5.9.2 qt5
LCG_external_package(setuptools 36.0.1 )
LCG_external_package(sqlite 3210000 )
LCG_external_package(tbb 2018_U1 )
+LCG_external_package(umesimd 0.8.1 )
LCG_external_package(veccore 0.4.2 )
LCG_external_package(VecGeom v00.05.01 )
LCG_external_package(Vc 1.3.2 )
--
GitLab