diff --git a/pcl-1.12.0-fedora.patch b/pcl-1.12.0-fedora.patch index 7433e26837186eed35c81e225c014c1bbacc7d51..cc30da6109bd490a1bc59d5607f41b9cb223f6d1 100644 --- a/pcl-1.12.0-fedora.patch +++ b/pcl-1.12.0-fedora.patch @@ -1,6 +1,6 @@ -diff -up ./PCLConfig.cmake.in.fedora ./PCLConfig.cmake.in ---- ./PCLConfig.cmake.in.fedora 2020-05-29 17:48:55.884924391 -0400 -+++ ./PCLConfig.cmake.in 2020-05-29 17:50:25.211139677 -0400 +diff -up a/PCLConfig.cmake.in.fedora b/PCLConfig.cmake.in +--- a/PCLConfig.cmake.in 2020-05-29 17:48:55.884924391 -0400 ++++ b/PCLConfig.cmake.in 2020-05-29 17:50:25.211139677 -0400 @@ -398,7 +398,7 @@ if(WIN32 AND NOT MINGW) endif() else() diff --git a/pcl.spec b/pcl.spec index 95879a4a5af38886b45f4f2e8c98641e41716bee..895eafb762a28e4742b0b5e9b6aed22328dc42ff 100644 --- a/pcl.spec +++ b/pcl.spec @@ -1,9 +1,11 @@ +%undefine __cmake_in_source_build + %global apiversion 1.12 %global soversion 1.12 Name: pcl Version: 1.12.1 -Release: 3 +Release: 4 Summary: Library for point cloud processing License: BSD URL: http://pointclouds.org/ @@ -87,15 +89,7 @@ Library. %prep -%setup -qn %{name}-%{name}-%{version} -%patch0 -p1 -b .metslib -%patch1 -p0 -b .fedora -%patch2 -p1 -b .boost -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 +%autosetup -p1 -n %{name}-%{name}-%{version} # Just to make it obvious we're not using any of these @@ -107,7 +101,6 @@ rm -rf surface/include/pcl/surface/3rdparty/opennurbs # 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 //' -e's/-ffat-lto-objects/-fno-fat-lto-objects/') -mkdir build && cd build %cmake \ -DCMAKE_BUILD_TYPE=None \ -DWITH_DOCS=ON \ @@ -126,13 +119,11 @@ mkdir build && cd build -DPCL_PKGCONFIG_SUFFIX:STRING="" \ -DBUILD_documentation=ON \ -DCMAKE_SKIP_RPATH=ON \ - .. -%make_build +%cmake_build %install -cd build -%make_install +%cmake_install # Just a dummy test rm -f $RPM_BUILD_ROOT%{_bindir}/timed_trigger_test @@ -142,10 +133,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 -cd build -make test || true - -%ldconfig_scriptlets +%ctest || true %files @@ -170,6 +158,9 @@ make test || true %doc %{_datadir}/doc %changelog +* Tue Nov 19 2024 Funda Wang - 1.12.1-4 +- adopt to new cmake macro + * Thu Aug 22 2024 zhangxingrong - 1.12.1-3 - Fix Bug between addText3D and QVTKWidget - Perform static cast + transform instead of simple copy to avoid compiler warning