Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix find debug dependencies of PCL #2197

Merged
merged 2 commits into from
Nov 17, 2017
+14 −5
Merged

Fix find debug dependencies of PCL #2197

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c43dfa
Fix find debug library of QHull
UnaNancyOwen Nov 14, 2017
0e4daf3
Fix find debug library of FLANN
UnaNancyOwen Nov 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/pcl/CONTROL
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: pcl
Version: 1.8.1-4
Version: 1.8.1-5
Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.
Build-Depends: boost, eigen3, flann, qhull, vtk, openni2

4 changes: 2 additions & 2 deletions ports/pcl/config.patch
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ index f4ef6a0ff..3a2c259dc 100644
HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}"
PATHS "$ENV{PROGRAMFILES}/qhull" "$ENV{PROGRAMW6432}/qhull"
- PATH_SUFFIXES project build bin lib)
+ PATH_SUFFIXES project build bin debug/lib)
+ PATH_SUFFIXES project build bin lib debug/lib)

find_package_handle_standard_args(qhull DEFAULT_MSG QHULL_LIBRARY QHULL_INCLUDE_DIRS)

@@ -16,7 +16,7 @@ index f4ef6a0ff..3a2c259dc 100644
PATHS "$ENV{PROGRAMFILES}/flann 1.6.9" "$ENV{PROGRAMW6432}/flann 1.6.9"
"$ENV{PROGRAMFILES}/flann" "$ENV{PROGRAMW6432}/flann"
- PATH_SUFFIXES lib)
+ PATH_SUFFIXES debug/lib)
+ PATH_SUFFIXES lib debug/lib)

find_package_handle_standard_args(Flann DEFAULT_MSG FLANN_LIBRARY FLANN_INCLUDE_DIRS)
if(FLANN_FOUND)
11 changes: 10 additions & 1 deletion ports/pcl/find_flann.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/cmake/Modules/FindFLANN.cmake b/cmake/Modules/FindFLANN.cmake
index b5739dc95..4041a2539 100644
index b5739dc95..d2c3fd07e 100644
--- a/cmake/Modules/FindFLANN.cmake
+++ b/cmake/Modules/FindFLANN.cmake
@@ -10,8 +10,8 @@
@@ -13,3 +13,12 @@ index b5739dc95..4041a2539 100644
else(FLANN_USE_STATIC)
set(FLANN_RELEASE_NAME flann_cpp)
set(FLANN_DEBUG_NAME flann_cpp-gd)
@@ -41,7 +41,7 @@ find_library(FLANN_LIBRARY_DEBUG
NAMES ${FLANN_DEBUG_NAME} ${FLANN_RELEASE_NAME}
HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann"
- PATH_SUFFIXES lib)
+ PATH_SUFFIXES lib debug/lib)

if(NOT FLANN_LIBRARY_DEBUG)
set(FLANN_LIBRARY_DEBUG ${FLANN_LIBRARY})
2 changes: 1 addition & 1 deletion ports/pcl/find_qhull.patch
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ index 698bd151b..44c1d5d8d 100644
HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}"
PATHS "$ENV{PROGRAMFILES}/QHull" "$ENV{PROGRAMW6432}/QHull"
- PATH_SUFFIXES project build bin lib)
+ PATH_SUFFIXES project build bin debug/lib)
+ PATH_SUFFIXES project build bin lib debug/lib)

if(NOT QHULL_LIBRARY_DEBUG)
set(QHULL_LIBRARY_DEBUG ${QHULL_LIBRARY})