From 4b1a9a965a05230b2085bae1227e9817f3e9dfdc Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 28 Jul 2020 15:46:18 +0200 Subject: [PATCH] Use %cmake_build/%cmake_install/%ctest --- PDAL.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PDAL.spec b/PDAL.spec index 2395882..ea4d039 100644 --- a/PDAL.spec +++ b/PDAL.spec @@ -152,7 +152,7 @@ rm -rf vendor/{eigen,gtest,pdalboost} -D POSTGRESQL_INCLUDE_DIR=%{_includedir}/pgsql \ -D POSTGRESQL_LIBRARIES=%{_libdir}/libpq.so . -%make_build +%cmake_build # Build documentation %if 0%{?fedora} @@ -164,7 +164,7 @@ sphinx-build -b html . build/html %endif %install -%make_install +%cmake_install # commented out due to size ## unpack vertical datums @@ -181,11 +181,11 @@ sphinx-build -b html . build/html ## test the compiled code (see doc/project/testing.rst) # we skip tests for selected architectures which need upstream fixes %ifarch armv7hl aarch64 ppc64le s390x -ctest || true +%ctest || true %else -## we skip the PG test (BUILD_PGPOINTCLOUD_TESTS:BOOL=OFF): +## we skip the PG test (BUILD_PGPOINTCLOUD_TESTS:BOOL=OFF): # PGUSER=pdal PGPASSWORD=password PGHOST=localhost PGPORT=5432 ctest -V -ctest -V +%ctest %endif %files