From 8cba753ff5afea7c18b43aa979db8606e28f24fa Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Thu, 24 Oct 2019 11:21:12 +0200 Subject: [PATCH] Get latest changes from master on cxxmodules --- root.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/root.spec b/root.spec index b1a32bf5807..19a08149aac 100644 --- a/root.spec +++ b/root.spec @@ -2,8 +2,8 @@ ## INITENV +PATH PYTHON27PATH %{i}/lib ## INITENV +PATH PYTHON3PATH %{i}/lib ## INITENV SET ROOTSYS %{i} -%define tag 58c5beaf073dd2a051ef997d6042f1f6f7874e47 -%define branch cmscxx/master/b311b9c +%define tag f441321e60ee4eaf9e74b22e9a1f259c21ddd2c4 +%define branch cmscxx/master/b265356 %define github_user cms-sw Source: git+https://github.com/%{github_user}/root.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz @@ -12,7 +12,7 @@ Source: git+https://github.com/%{github_user}/root.git?obj=%{branch}/%{tag}&expo BuildRequires: cmake ninja -Requires: gsl libjpeg-turbo libpng libtiff giflib pcre python fftw3 xz xrootd libxml2 openssl zlib davix tbb OpenBLAS py2-numpy lz4 freetype +Requires: gsl libjpeg-turbo libpng libtiff giflib pcre python fftw3 xz xrootd libxml2 openssl zlib davix tbb OpenBLAS py2-numpy lz4 zstd freetype %if %islinux Requires: dcap @@ -138,7 +138,8 @@ cmake ../%{n}-%{realversion} \ -DLZ4_LIBRARY="${LZ4_ROOT}/lib/liblz4.%{soext}" \ -DZLIB_ROOT="${ZLIB_ROOT}" \ -DZLIB_INCLUDE_DIR="${ZLIB_ROOT}/include" \ - -DCMAKE_PREFIX_PATH="${LZ4_ROOT}/include;${LZ4_ROOT}/lib;${GSL_ROOT};${XZ_ROOT};${OPENSSL_ROOT};${GIFLIB_ROOT};${FREETYPE_ROOT};${PYTHON_ROOT};${LIBPNG_ROOT};${PCRE_ROOT};${TBB_ROOT};${OPENBLAS_ROOT};${DAVIX_ROOT};${LZ4_ROOT/usr/local};${LIBXML2_ROOT}" + -DZSTD_ROOT="${ZSTD_ROOT}" \ + -DCMAKE_PREFIX_PATH="${LZ4_ROOT}/include;${LZ4_ROOT}/lib;${GSL_ROOT};${XZ_ROOT};${OPENSSL_ROOT};${GIFLIB_ROOT};${FREETYPE_ROOT};${PYTHON_ROOT};${LIBPNG_ROOT};${PCRE_ROOT};${TBB_ROOT};${OPENBLAS_ROOT};${DAVIX_ROOT};${LZ4_ROOT/usr/local};${LIBXML2_ROOT};${ZSTD_ROOT}" # For CMake cache variables: http://www.cmake.org/cmake/help/v3.2/manual/cmake-language.7.html#lists # For environment variables it's OS specific: http://www.cmake.org/Wiki/CMake_Useful_Variables