[rpms/pcl] f44: Use new cmake macros

[rpms/pcl] f44: Use new cmake macros

[Orion Poplawski]

            A new commit has been pushed.

            Repo   : rpms/pcl
            Branch : f44
            Commit : a4eba281956327ba4410cdbc8b0fc8695f458627
            Author : Orion Poplawski <orion@nwra.com>
            Date   : 2020-08-07T20:57:01-06:00
            Stats  : +12/-12 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/pcl/c/a4eba281956327ba4410cdbc8b0fc8695f458627?branch=f44

            Log:
            Use new cmake macros
Disable LTO for now - build fails

---
diff --git a/pcl.spec b/pcl.spec
index 22c6487..474caa6 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -1,8 +1,11 @@
+%undefine __cmake_in_source_build
+# LTO fails with /usr/bin/ld: error: lto-wrapper failed
+%undefine _lto_cflags
 %global apiversion 1.11
 
 Name:           pcl
 Version:        1.11.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library for point cloud processing
 License:        BSD
 URL:            http://pointclouds.org/
@@ -93,8 +96,6 @@ rm -fr surface/src/3rdparty/opennurbs
 rm -rf surface/include/pcl/surface/3rdparty/opennurbs
 
 %build
-mkdir build
-pushd build
 # try to reduce memory usage of compile process (can cause OOM errors
 # esp. on ARM builders)
 %global optflags %(echo %{optflags} | sed -e 's/-g /-g1 /' -e 's/-pipe //')
@@ -115,16 +116,12 @@ pushd build
 %endif
   -DPCL_PKGCONFIG_SUFFIX:STRING="" \
   -DBUILD_documentation=ON \
-  -DCMAKE_SKIP_RPATH=ON \
-  ..
+  -DCMAKE_SKIP_RPATH=ON
 
-# Don't use mflags, we're hitting out of memory errors on the koji builders
-%make_build
-popd
+%cmake_build
 
 %install
-pushd build
-%make_install
+%cmake_install
 
 # Remove libtool archives
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@ -144,7 +141,6 @@ cp -fr ../doc/advanced/content/files/* doc/advanced/advanced
 cp -fr ../doc/tutorials/content/sources doc/tutorials/tutorials
 
 rm -f doc/doxygen/api/_form*
-popd
 
 for f in $RPM_BUILD_ROOT%{_bindir}/{openni_image,pcd_grabber_viewer,pcd_viewer,openni_viewer,oni_viewer}; do
 	if [ -f $f ]; then
@@ -158,7 +154,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}-*/*.cmake $RPM_BUILD_ROOT%{_libdir}/cmake/
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}-*/Modules $RPM_BUILD_ROOT%{_libdir}/cmake/pcl/
 
 %check
-ARGS='-V' make -C build test || true
+%ctest || true
 
 %ldconfig_scriptlets
 
@@ -186,6 +182,10 @@ ARGS='-V' make -C build test || true
 %doc build/doc/advanced/advanced
 
 %changelog
+* Fri Aug 07 2020 Orion Poplawski <orion@nwra.com> - 1.11.0-4
+- Use new cmake macros
+- Disable LTO for now - build fails
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.0-3
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild