Add patch to drop build path in cmake file

diff --git a/debian/changelog b/debian/changelog
index 38778da43fa7de46685b2a7516bbdd448748621d..6bed84c243124a98b3f633aad4c96df58d5e60fc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ pcl (1.12.1+dfsg-1) unstable; urgency=medium
   * Rebase patches
   * Update copyright
   * Drop empty documentation
+  * Add patch to drop build path in cmake file
 
  -- Jochen Sprickerhof <jspricke@debian.org>  Fri, 24 Dec 2021 23:58:00 +0100
 

diff --git a/debian/patches/0007-Drop-PCL_SOURCES_TREE-from-installation-cmake.patch b/debian/patches/0007-Drop-PCL_SOURCES_TREE-from-installation-cmake.patch
new file mode 100644 (file)
index 0000000..d19fdd2
--- /dev/null
+++ b/debian/patches/0007-Drop-PCL_SOURCES_TREE-from-installation-cmake.patch
@@ -0,0 +1,29 @@
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Sat, 25 Dec 2021 09:30:57 +0100
+Subject: Drop $PCL_SOURCES_TREE from installation cmake
+
+It is not used elsewhere and makes the build unreproducible.
+---
+ PCLConfig.cmake.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
+index b8e5148..5ba9165 100644
+--- a/PCLConfig.cmake.in
++++ b/PCLConfig.cmake.in
+@@ -409,7 +409,6 @@ elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h")
+   # pcl_message("PCL found into a build tree.")
+   set(PCL_CONF_INCLUDE_DIR "${PCL_DIR}/include") # for pcl_config.h
+   set(PCL_LIBRARY_DIRS "${PCL_DIR}/@LIB_INSTALL_DIR@")
+-  set(PCL_SOURCES_TREE "@CMAKE_SOURCE_DIR@")
+ else()
+   pcl_report_not_found("PCL can not be found on this machine")
+ endif()
+@@ -504,7 +503,6 @@ foreach(component ${PCL_TO_FIND_COMPONENTS})
+           pcl/cuda/${cuda_component} pcl/cuda/${component}
+           pcl/gpu/${gpu_component} pcl/gpu/${component}
+     HINTS ${PCL_INCLUDE_DIRS}
+-          "${PCL_SOURCES_TREE}"
+     PATH_SUFFIXES
+           ${component}/include
+           apps/${component}/include

diff --git a/debian/patches/series b/debian/patches/series
index 5023766fadedb10a239ff30ea5b2f395d98a11e5..c58ca4a5ddd71c34e499ca80b6575c5a18695210 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-Disable-failing-tests.patch
 0005-Adopt-unit-test-for-i386.patch
 0007-Adopt-unit-tests-for-arm64-and-ppc64el.patch
+0007-Drop-PCL_SOURCES_TREE-from-installation-cmake.patch