From bc97abbc2d25019c9ee1e6cb6bc604f67dddb599 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 19 Aug 2020 10:43:47 +0200 Subject: fix cmake usage for F33 build --- cassandra-cpp-driver.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'cassandra-cpp-driver.spec') diff --git a/cassandra-cpp-driver.spec b/cassandra-cpp-driver.spec index 40b34f3..c292754 100644 --- a/cassandra-cpp-driver.spec +++ b/cassandra-cpp-driver.spec @@ -18,7 +18,7 @@ Name: cassandra-cpp-driver Summary: DataStax C/C++ Driver for Apache Cassandra Version: 2.15.3%{?prever:~%{prever}} -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Group: System Environment/Libraries @@ -70,13 +70,21 @@ export CXXFLAGS="$RPM_OPT_FLAGS -Wno-implicit-fallthrough" -DCASS_USE_OPENSSL:BOOL=ON \ -DCASS_INSTALL_HEADER_IN_SUBDIR:BOOL=ON \ -DCASS_INSTALL_HEADER_SUBDIR_NAME:STRING="cassandra" \ - . + -S . +%if 0%{?cmake_build:1} +%cmake_build +%else make %{_smp_mflags} +%endif %install -make install DESTDIR="%{buildroot}" +%if 0%{?cmake_install:1} +%cmake_install +%else +make install DESTDIR="%{buildroot}" +%endif %if 0%{?fedora} < 28 && 0%{?rhel} < 8 @@ -100,6 +108,9 @@ make install DESTDIR="%{buildroot}" %changelog +* Wed Aug 19 2020 Remi Collet - 2.15.3-2 +- fix cmake usage for F33 build + * Tue Jul 21 2020 Remi Collet - 2.15.3-1 - update to 2.15.3 - open https://github.com/datastax/cpp-driver/pull/479 -- cgit