[pcl] Fix hard-coded vtk library dependencies in PCLConfig.cmake

rmattes rmattes at fedoraproject.org
Sun Sep 8 17:17:54 UTC 2013


commit 797cfcf210b48844c7cb4b486e372cd00e85c1ff
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sun Sep 8 13:17:42 2013 -0400

    Fix hard-coded vtk library dependencies in PCLConfig.cmake

 pcl-1.7.0-fedora.patch |   13 +++++++++++--
 pcl.spec               |    5 ++++-
 2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/pcl-1.7.0-fedora.patch b/pcl-1.7.0-fedora.patch
index 67ce182..b233d5a 100644
--- a/pcl-1.7.0-fedora.patch
+++ b/pcl-1.7.0-fedora.patch
@@ -1,6 +1,15 @@
 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
+--- ./PCLConfig.cmake.in.fedora	2013-07-23 13:21:02.000000000 -0400
++++ ./PCLConfig.cmake.in	2013-09-08 13:16:48.445021650 -0400
+@@ -267,7 +267,7 @@ macro(find_VTK)
+   endif(PCL_ALL_IN_ONE_INSTALLER)
+   find_package(VTK ${QUIET_})
+   if (VTK_FOUND AND NOT ANDROID)
+-    set(VTK_LIBRARIES vtkCommon vtkRendering vtkHybrid vtkCharts)
++    set(VTK_LIBRARIES vtkCommonCore vtkRenderingCore)
+   endif(VTK_FOUND AND NOT ANDROID)
+ endmacro(find_VTK)
+ 
 @@ -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)
diff --git a/pcl.spec b/pcl.spec
index fedb3a7..5c8499d 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -2,7 +2,7 @@
 
 Name:           pcl
 Version:        1.7.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library for point cloud processing
 
 Group:          System Environment/Libraries
@@ -197,6 +197,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{apiversion}
 
 
 %changelog
+* Sun Sep 08 2013 Rich Mattes <richmattes at gmail.com> - 1.7.0-3
+- Fix hard-coded vtk library dependencies in PCLConfig.cmake
+
 * Thu Aug 29 2013 Rich Mattes <richmattes at gmail.com> - 1.7.0-2
 - Fix PCLConfig.cmake so PCL can discover itself
 


More information about the scm-commits mailing list