[pcl/f15] Add missing part of patch that fixes PCLConfig.cmake
rmattes
rmattes at fedoraproject.org
Thu Feb 23 02:28:35 UTC 2012
commit 351ea72a2b092f63160509cfa250d0202758fb12
Author: Rich Mattes <richmattes at gmail.com>
Date: Wed Feb 22 21:26:25 2012 -0500
Add missing part of patch that fixes PCLConfig.cmake
PCL-1.3.1-Source-fedora.patch | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/PCL-1.3.1-Source-fedora.patch b/PCL-1.3.1-Source-fedora.patch
index 1f48044..37640fb 100644
--- a/PCL-1.3.1-Source-fedora.patch
+++ b/PCL-1.3.1-Source-fedora.patch
@@ -89,3 +89,21 @@ diff -urN PCL-1.3.1-Source/visualization/CMakeLists.txt PCL-1.3.1-Source-fedora/
PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
"${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "")
+diff -urN PCL-1.3.1-Source/PCLConfig.cmake.in PCL-1.3.1-Source.fedora/PCLConfig.cmake.in
+--- PCL-1.3.1-Source/PCLConfig.cmake.in 2011-12-03 00:35:48.000000000 +0100
++++ PCL-1.3.1-Source.fedora/PCLConfig.cmake.in 2012-01-16 19:47:07.404643739 +0100
+@@ -304,9 +304,13 @@
+ # PCLConfig.cmake is installed to PCL_ROOT/cmake
+ get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
+ else(WIN32)
+-# PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
++ # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y or PCL_ROOT/lib${LIB_SUFFIX}/cmake/pcl
+ get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
+ get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
++ if (${PCL_DIR} MATCHES ".*lib.*")
++ # PCLConfig.cmake is installed to PCL_ROOT/lib${LIB_SUFFIX}/cmake/pcl
++ get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
++ endif()
+ endif(WIN32)
+
+ # check whether PCLConfig.cmake is found into a PCL installation or in a build tree
More information about the scm-commits
mailing list