diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-09-19 03:55:43 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2014-09-20 22:14:52 (GMT) |
| commit | e949a91a1947c2efd4e449994f3a84ad490aad36 (patch) | |
| tree | 98678ec378d536708e1af5c4f17dd4011232c282 /src | |
| parent | 27431c2e97f56fb518b402b91c8f1e744e0a8f30 (diff) | |
| download | mxe-e949a91a1947c2efd4e449994f3a84ad490aad36.zip mxe-e949a91a1947c2efd4e449994f3a84ad490aad36.tar.gz mxe-e949a91a1947c2efd4e449994f3a84ad490aad36.tar.bz2 | |
pcl: explicitly disable pcap
winpcap package is broken: it doesn't install many headers needed by normal
applications like pcl. If it is installed before `make pcl`, the pcl build
system falsely believes the installation is legit and tries to build against
winpcap, and fails.
Therefore, before fixing winpcap, it is better to at least make pcl build.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pcl-2-option-to-disable-pcap.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/src/pcl-2-option-to-disable-pcap.patch b/src/pcl-2-option-to-disable-pcap.patch new file mode 100644 index 0000000..7f907a1 --- /dev/null +++ b/src/pcl-2-option-to-disable-pcap.patch @@ -0,0 +1,34 @@ +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 + |