Commit 41f01f5f authored by Andre Sailer's avatar Andre Sailer
Browse files

Merge branch 'root-fix' into 'master'

Add dependencies for ROOT to zeromq and new cppzmq

See merge request !1027
parents baca06c7 e86d7055
Pipeline #3299163 passed with stage
in 48 seconds
......@@ -89,6 +89,7 @@ LCG_external_package(control 0.8.2
LCG_external_package(CouchDB 1.2 )
LCG_external_package(coverage 4.5.3 )
LCG_external_package(cppgsl 3.1.0 )
LCG_external_package(cppzmq 4.8.1 )
LCG_external_package(CppUnit 1.14.0 author=1.14.0 )
LCG_external_package(cryptography 3.4.7 )
if(${LCG_OS}${LCG_OSVERS} STREQUAL slc6)
......
......@@ -3169,3 +3169,13 @@ LCGPackage_Add(
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy submit/batch_krb5_credential <INSTALL_DIR>/bin/batch_krb5_credential
BUILD_IN_SOURCE 1
)
#---cppzmq-------------------------------------------------------------------------------------------------------
LCGPackage_Add(
cppzmq
URL ${GenURL}/cppzmq-<VERSION>.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR> <INSTALL_DIR>
BUILD_IN_SOURCE 1
)
......@@ -195,6 +195,7 @@ if(ROOT_native_version)
-Dbuiltin_nlohmannjson=ON
ENDIF
ENDIF
-Droofit_multiprocess=OFF
DEPENDS Python fftw GSL xrootd numpy tbb blas zlib libxml2 vdt xz gl2ps cfitsio
IF DEFINED mysql_native_version THEN
mysql
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment