diff options
| author | Jochen Sprickerhof <git@jochen.sprickerhof.de> | 2018-12-19 11:35:50 +0100 |
|---|---|---|
| committer | Jochen Sprickerhof <git@jochen.sprickerhof.de> | 2018-12-19 11:40:40 +0100 |
| commit | ad51f98926277892e0b7b5a71a3fdbe0ed4640f7 (patch) | |
| tree | a128cb36e0f006d035e23ef3530276340d34ee7c | |
| parent | e6cfd5e34da52b7e69cfa6d540512eb5bb76f94a (diff) | |
Revert "Fix vtk include path"
This reverts commit c91caa81e984c0544501c43496af62411c706e2a.
| -rw-r--r-- | debian/patches/0005-Fix-vtk-include-path.patch | 21 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | setup.py | 2 |
3 files changed, 1 insertions, 23 deletions
diff --git a/debian/patches/0005-Fix-vtk-include-path.patch b/debian/patches/0005-Fix-vtk-include-path.patch deleted file mode 100644 index 315ae0f..0000000 --- a/debian/patches/0005-Fix-vtk-include-path.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Jochen Sprickerhof <git@jochen.sprickerhof.de> -Date: Tue, 11 Dec 2018 21:07:02 +0100 -Subject: Fix vtk include path - ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 84addab..9c5781b 100644 ---- a/setup.py -+++ b/setup.py -@@ -546,7 +546,7 @@ else: - # ext_args['include_dirs'].append('/usr/include/vtk') - # ext_args['include_dirs'].append('/usr/local/include/vtk') - # pcl 1.7(Ubuntu) -- ext_args['include_dirs'].append('/usr/include/vtk-7.1') -+ ext_args['include_dirs'].append('/usr/include/vtk-6.3') - ext_args['library_dirs'].append('/usr/lib') - # ext_args['libraries'].append('libvtk*.so') - # pcl 1.8.1(MacOSX) diff --git a/debian/patches/series b/debian/patches/series index cf8fe10..559d579 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,3 @@ 0002-Enable-visualization-module.patch 0003-Remove-ConditionalRemoval-API-and-add-deprecation-no.patch 0004-Add-support-for-PCL-1.9.patch -0005-Fix-vtk-include-path.patch @@ -546,7 +546,7 @@ else: # ext_args['include_dirs'].append('/usr/include/vtk') # ext_args['include_dirs'].append('/usr/local/include/vtk') # pcl 1.7(Ubuntu) - ext_args['include_dirs'].append('/usr/include/vtk-6.3') + ext_args['include_dirs'].append('/usr/include/vtk-7.1') ext_args['library_dirs'].append('/usr/lib') # ext_args['libraries'].append('libvtk*.so') # pcl 1.8.1(MacOSX) |