summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hdrhistogram.spec22
1 files changed, 19 insertions, 3 deletions
diff --git a/hdrhistogram.spec b/hdrhistogram.spec
index 4d5f0c8..e23bf8d 100644
--- a/hdrhistogram.spec
+++ b/hdrhistogram.spec
@@ -17,7 +17,7 @@
Name: HdrHistogram_c
Summary: A High Dynamic Range (HDR) Histogram
Version: 0.11.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: CC0 or BSD
URL: https://github.com/%{gh_owner}/%{gh_project}
@@ -84,8 +84,13 @@ source /opt/rh/devtoolset-6/enable
%cmake \
%endif
-DHDR_HISTOGRAM_INSTALL_STATIC=OFF \
- .
+ -S .
+
+%if 0%{?cmake_build:1}
+%cmake_build
+%else
make %{_smp_mflags}
+%endif
%install
@@ -93,13 +98,21 @@ make %{_smp_mflags}
source /opt/rh/devtoolset-6/enable
%endif
-make install DESTDIR="%{buildroot}"
+%if 0%{?cmake_install:1}
+%cmake_install
+%else
+make install DESTDIR="%{buildroot}"
+%endif
rm %{buildroot}/%{_bindir}/*test
%check
+%if 0%{?ctest:1}
+%ctest
+%else
make test
+%endif
if grep -r static %{buildroot}%{_libdir}/cmake; then
: cmake configuration file contain reference to static library
@@ -135,6 +148,9 @@ fi
%changelog
+* Wed Aug 19 2020 Remi Collet <remi@remirepo.net> - 0.11.0-2
+- fix cmake usage for F33 build
+
* Wed Jun 17 2020 Remi Collet <remi@remirepo.net> - 0.11.0-1
- update to 0.11.0
- rename to HdrHistogram_c to match Fedora