[pcl] Fix PCLConfig.cmake so PCL can discover itself
rmattes
rmattes at fedoraproject.org
Thu Aug 29 01:14:20 UTC 2013
commit 80f3e7b5ac12e3af8f5e74f54a0c4b42be2548b2
Author: Rich Mattes <richmattes at gmail.com>
Date: Wed Aug 28 21:13:42 2013 -0400
Fix PCLConfig.cmake so PCL can discover itself
pcl-1.7.0-fedora.patch | 11 +++++++++++
pcl.spec | 8 +++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/pcl-1.7.0-fedora.patch b/pcl-1.7.0-fedora.patch
new file mode 100644
index 0000000..67ce182
--- /dev/null
+++ b/pcl-1.7.0-fedora.patch
@@ -0,0 +1,11 @@
+diff -up ./PCLConfig.cmake.in.fedora ./PCLConfig.cmake.in
+--- ./PCLConfig.cmake.in.fedora 2013-08-28 21:11:22.407176091 -0400
++++ ./PCLConfig.cmake.in 2013-08-28 21:11:57.506556606 -0400
+@@ -492,6 +492,7 @@ else(WIN32 AND NOT MINGW)
+ # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
+ get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
+ get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
++ get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
+ endif(WIN32 AND NOT MINGW)
+
+ # check whether PCLConfig.cmake is found into a PCL installation or in a build tree
diff --git a/pcl.spec b/pcl.spec
index 6586432..fedb3a7 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -2,7 +2,7 @@
Name: pcl
Version: 1.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library for point cloud processing
Group: System Environment/Libraries
@@ -13,6 +13,8 @@ Source0: https://github.com/PointCloudLibrary/pcl/archive/pcl-1.7.0.tar.g
Patch0: %{name}-vtk6.patch
# Patch to compile against system metslib
Patch1: %{name}-1.7.0-metslib.patch
+# Patch for PCLConfig.cmake to find pcl
+Patch2: %{name}-1.7.0-fedora.patch
# For plain building
BuildRequires: cmake, gcc-c++, boost-devel
@@ -81,6 +83,7 @@ Library.
%setup -q -n %{name}-%{name}-%{version}
%patch0 -p1 -b .vtk6
%patch1 -p0 -b .metslib
+%patch2 -p0 -b .fedora
# Just to make it obvious we're not using any of these
rm -fr recognition/include/pcl/recognition/3rdparty/metslib
rm -fr surface/src/3rdparty/opennurbs
@@ -194,6 +197,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{apiversion}
%changelog
+* Thu Aug 29 2013 Rich Mattes <richmattes at gmail.com> - 1.7.0-2
+- Fix PCLConfig.cmake so PCL can discover itself
+
* Wed Aug 21 2013 Rich Mattes <richmattes at gmail.com> - 1.7.0-1
- Update to 1.7.0
- Update vtk 6 patch for 1.7.0
More information about the scm-commits
mailing list