Changeset: 16bd4bee771d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=16bd4bee771d
Modified Files:
MonetDB.spec
Branch: oscar
Log Message:
Use cmake3 so that we can build on CentOS 7.
diffs (39 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -111,7 +111,7 @@ BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
BuildRequires: hardlink
%endif
-BuildRequires: cmake >= 3.12
+BuildRequires: cmake3 >= 3.12
BuildRequires: gcc
BuildRequires: bison
BuildRequires: /usr/bin/python3
@@ -762,7 +762,7 @@ fi
%setup -q
%build
-%{cmake} \
+%cmake3 \
-DASSERT=OFF \
-DCINTEGRATION=%{?with_cintegration:ON}%{!?with_cintegration:OFF} \
-DFITS=%{?with_fits:ON}%{!?with_fits:OFF} \
@@ -791,7 +791,7 @@ fi
-DWITH_XML2=ON \
-DWITH_ZLIB=ON
-%cmake_build
+%cmake3_build
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
cd buildtools/selinux
@@ -810,7 +810,7 @@ cd -
%endif
%install
-%cmake_install
+%cmake3_install
# move file to correct location
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
