rmattes pushed to pcl (el6). "Fix VTK Libraries in PCLConfig.cmake (rhbz#1198957)"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Mar 24 23:51:43 UTC 2015


>From 7c610379f225abd450fb41334de103748b91d033 Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes at gmail.com>
Date: Tue, 24 Mar 2015 19:51:33 -0400
Subject: Fix VTK Libraries in PCLConfig.cmake (rhbz#1198957)


diff --git a/pcl-1.7.1-fedora.patch b/pcl-1.7.1-fedora.patch
index 275f843..4d22b0c 100644
--- a/pcl-1.7.1-fedora.patch
+++ b/pcl-1.7.1-fedora.patch
@@ -1,12 +1,12 @@
 diff -up ./PCLConfig.cmake.in.fedora ./PCLConfig.cmake.in
 --- ./PCLConfig.cmake.in.fedora	2013-10-07 09:09:35.000000000 -0400
-+++ ./PCLConfig.cmake.in	2014-03-21 16:40:01.057216627 -0400
++++ ./PCLConfig.cmake.in	2015-03-24 18:38:15.948008880 -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)
++    set(VTK_LIBRARIES "@VTK_LIBRARIES@")
    endif(VTK_FOUND AND NOT ANDROID)
  endmacro(find_VTK)
  
diff --git a/pcl.spec b/pcl.spec
index f7027d5..5e2e07e 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -2,7 +2,7 @@
 
 Name:           pcl
 Version:        1.7.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Library for point cloud processing
 
 Group:          System Environment/Libraries
@@ -226,6 +226,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar 24 2015 Rich Mattes <richmattes at gmail.com> - 1.7.1-8
+- Fix VTK Libraries in PCLConfig.cmake (rhbz#1198957)
+
 * Tue Sep 23 2014 Tim Niemueller <tim at niemueller.de> - 1.7.1-7
 - Fix BR for EL 6 (python-sphinx10)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/pcl.git/commit/?h=el6&id=7c610379f225abd450fb41334de103748b91d033

--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390


More information about the scm-commits mailing list