Skip to content

Commit 632b166

Browse files
authored
Merge pull request #10161 from fwyzard/IB/CMSSW_16_0_X/master_root_external_json
Build ROOT with the external version of Nlohmann Json
2 parents d8d6228 + 2c5c499 commit 632b166

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

cepgen.spec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Source: https://github.com/cepgen/cepgen/archive/refs/tags/%{realversion}.tar.gz
44

55
BuildRequires: cmake ninja
66
Requires: gsl OpenBLAS hepmc hepmc3 lhapdf pythia6 root bz2lib zlib xz python3
7+
# ROOT uses the json package, and seems to require that it be availble also when other packages use ROOT
8+
Requires: json
79

810
%prep
911
%setup -n %{n}-%{realversion}
@@ -27,7 +29,7 @@ cmake ../%{n}-%{realversion} \
2729
-DCMAKE_INSTALL_PREFIX:PATH="%i" \
2830
-DCMAKE_BUILD_TYPE=Release \
2931
-DBoost_NO_SYSTEM_PATHS=ON \
30-
-DCMAKE_PREFIX_PATH="${BZ2LIB_ROOT};${ZLIB_ROOT};${XZ_ROOT}"
32+
-DCMAKE_PREFIX_PATH="%{cmake_prefix_path}"
3133

3234
ninja -v %{makeprocesses}
3335

dd4hep.spec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Source: git+https://github.com/%{github_user}/DD4hep.git?obj=%{branch}/%{tag}&ex
77
## INCLUDE geant4-deps
88

99
Requires: root boost geant4
10+
# ROOT uses the json package, and seems to require that it be availble also when other packages use ROOT
11+
Requires: json
1012

1113
%define cmake_fixed_args \\\
1214
-DCMAKE_INSTALL_PREFIX='%{i}' \\\

root.spec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Source: git+https://github.com/%{github_user}/root.git?obj=%{branch}/%{tag}&expo
1111

1212
BuildRequires: cmake ninja
1313

14-
Requires: gsl libjpeg-turbo libpng libtiff giflib pcre2 python3 fftw3 xz xrootd libxml2 zlib davix tbb OpenBLAS py3-numpy lz4 freetype zstd
14+
Requires: gsl libjpeg-turbo libpng libtiff giflib pcre2 python3 fftw3 xz xrootd libxml2 zlib davix tbb OpenBLAS py3-numpy lz4 freetype zstd json
1515
%{!?without_cuda:Requires: cuda}
1616

1717
%ifos linux
@@ -92,7 +92,7 @@ cmake ../%{n}-%{realversion} \
9292
-Dbuiltin_gl2ps=ON \
9393
-Dbuiltin_afterimage=ON \
9494
-Dbuiltin_xxhash=ON \
95-
-Dbuiltin_nlohmannjson=ON \
95+
-Dbuiltin_nlohmannjson=OFF \
9696
-Darrow=OFF \
9797
-DGSL_ROOT_DIR="${GSL_ROOT}" \
9898
-DGSL_CBLAS_LIBRARY="${OPENBLAS_ROOT}/lib/libopenblas.%{soext}" \
@@ -149,7 +149,7 @@ cmake ../%{n}-%{realversion} \
149149
-DZLIB_ROOT="${ZLIB_ROOT}" \
150150
-DZLIB_INCLUDE_DIR="${ZLIB_ROOT}/include" \
151151
-DZSTD_ROOT="${ZSTD_ROOT}" \
152-
-DCMAKE_PREFIX_PATH="${LZ4_ROOT};${GSL_ROOT};${XZ_ROOT};${GIFLIB_ROOT};${FREETYPE_ROOT};${PYTHON3_ROOT};${LIBPNG_ROOT};${PCRE2_ROOT};${TBB_ROOT};${OPENBLAS_ROOT};${DAVIX_ROOT};${LIBXML2_ROOT};${ZSTD_ROOT}"
152+
-DCMAKE_PREFIX_PATH="%{cmake_prefix_path}"
153153

154154
# For CMake cache variables: http://www.cmake.org/cmake/help/v3.2/manual/cmake-language.7.html#lists
155155
# For environment variables it's OS specific: http://www.cmake.org/Wiki/CMake_Useful_Variables

0 commit comments

Comments
 (0)