Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated root to tip of branch master #4638

Merged
merged 2 commits into from
Jan 15, 2019
Merged

Updated root to tip of branch master #4638

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90488c9
Updated root to tip of branch master
mrodozov Jan 14, 2019
9d94a74
Add CMake option
mrodozov Jan 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions root.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
## INITENV +PATH PYTHON27PATH %{i}/lib
## INITENV +PATH PYTHON3PATH %{i}/lib
## INITENV SET ROOTSYS %{i}
%define tag b475b65b36ae652c1af64f45e2629aec06dc83df
%define branch cms/master/c6edc31
%define tag a621b7a2e9352b55e350c24971f00b69642956d9
%define branch cms/master/db49a85
%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

Expand Down Expand Up @@ -136,7 +136,7 @@ cmake ../%{n}-%{realversion} \
-DLIBLZ4_LIBRARY="${LZ4_ROOT}/lib/liblz4.%{soext}" \
-DZLIB_ROOT="${ZLIB_ROOT}" \
-DZLIB_INCLUDE_DIR="${ZLIB_ROOT}/include" \
-DCMAKE_PREFIX_PATH="${XZ_ROOT};${OPENSSL_ROOT};${GIFLIB_ROOT};${FREETYPE_ROOT};${PYTHON_ROOT};${LIBPNG_ROOT};${PCRE_ROOT};${TBB_ROOT};${OPENBLAS_ROOT};${DAVIX_ROOT};${LZ4_ROOT};${LIBXML2_ROOT}"
-DCMAKE_PREFIX_PATH="${GSL_ROOT};${XZ_ROOT};${OPENSSL_ROOT};${GIFLIB_ROOT};${FREETYPE_ROOT};${PYTHON_ROOT};${LIBPNG_ROOT};${PCRE_ROOT};${TBB_ROOT};${OPENBLAS_ROOT};${DAVIX_ROOT};${LZ4_ROOT};${LIBXML2_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
Expand Down