diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pcl-1-disable-tools.patch | 16 | ||||
| -rw-r--r-- | src/pcl-2-option-to-disable-pcap.patch | 34 | ||||
| -rw-r--r-- | src/pcl.mk | 4 |
3 files changed, 2 insertions, 52 deletions
diff --git a/src/pcl-1-disable-tools.patch b/src/pcl-1-disable-tools.patch deleted file mode 100644 index ea3005b..0000000 --- a/src/pcl-1-disable-tools.patch +++ /dev/null @@ -1,16 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -diff -ur pcl-pcl-1.7.1.orig/visualization/CMakeLists.txt pcl-pcl-1.7.1/visualization/CMakeLists.txt ---- pcl-pcl-1.7.1.orig/visualization/CMakeLists.txt 2014-05-09 20:37:41.000000000 +1000 -+++ pcl-pcl-1.7.1/visualization/CMakeLists.txt 2014-05-09 20:48:58.000000000 +1000 -@@ -171,6 +171,8 @@ - add_subdirectory(test) - endif(BUILD_TESTS) - -- add_subdirectory(tools) -+ if(BUILD_tools) -+ add_subdirectory(tools) -+ endif(BUILD_tools) - - endif(build) diff --git a/src/pcl-2-option-to-disable-pcap.patch b/src/pcl-2-option-to-disable-pcap.patch deleted file mode 100644 index 7f907a1..0000000 --- a/src/pcl-2-option-to-disable-pcap.patch +++ /dev/null @@ -1,34 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From 8db0a5e0d8e859fc503a95bca8ae471c84a661f0 Mon Sep 17 00:00:00 2001 -From: v4hn <me@v4hn.de> -Date: Fri, 19 Sep 2014 14:46:45 -0700 -Subject: [PATCH] add cmake options to enable/disable optional pcap - -Taken from https://github.com/PointCloudLibrary/pcl/commit/15442dce767881c60612cf70f9a7726d3fccc486 - -Signed-off-by: Timothy Gu <timothygu99@gmail.com> ---- - CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f2196da..2d9a919 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -321,7 +321,10 @@ if(DOXYGEN_FOUND) - find_package(HTMLHelp) - endif(DOXYGEN_FOUND) - #Find PCAP --find_package(Pcap) -+option(WITH_PCAP "pcap file capabilities in Velodyne HDL driver" TRUE) -+if(WITH_PCAP) -+ find_package(Pcap) -+endif(WITH_PCAP) - - ### ---[ Create the config.h file - set(pcl_config_h_in "${CMAKE_CURRENT_SOURCE_DIR}/pcl_config.h.in") --- -1.8.3.2 - @@ -3,8 +3,8 @@ PKG := pcl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.7.1 -$(PKG)_CHECKSUM := 784bce606141260423ea04f37b093f59d4c94c6a +$(PKG)_VERSION := 1.7.2 +$(PKG)_CHECKSUM := 7a59e9348a81f42725db1f8b1194c9c3313372ae $(PKG)_SUBDIR := $(PKG)-$(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/PointCloudLibrary/pcl/archive/$($(PKG)_FILE) |