Fix PCL port according to QHull port change

Fix PCL port according to QHull port change.
PCL will link dynamic link librariy of QHull when build dynamic link
library configure.
This commit is contained in:
Tsukasa Sugiura 2017-11-26 07:49:30 +09:00
parent 173a1d59a5
commit 390806e931
3 changed files with 19 additions and 2 deletions

View File

@ -1,5 +1,5 @@
Source: pcl
Version: 1.8.1-6
Version: 1.8.1-7
Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.
Build-Depends: boost, eigen3, flann, qhull, vtk

View File

@ -0,0 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d36a581fb..9b0195324 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -327,9 +327,9 @@ endif(WITH_PNG)
# Qhull
option(WITH_QHULL "Include convex-hull operations" TRUE)
if(WITH_QHULL)
- if(NOT PCL_SHARED_LIBS OR WIN32)
+ if(NOT PCL_SHARED_LIBS)
set(QHULL_USE_STATIC ON)
- endif(NOT PCL_SHARED_LIBS OR WIN32)
+ endif(NOT PCL_SHARED_LIBS)
find_package(Qhull)
if(QHULL_FOUND)
include_directories(${QHULL_INCLUDE_DIRS})

View File

@ -10,7 +10,8 @@ vcpkg_from_github(
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/config.patch"
PATCHES "${CMAKE_CURRENT_LIST_DIR}/cmakelists.patch"
"${CMAKE_CURRENT_LIST_DIR}/config.patch"
"${CMAKE_CURRENT_LIST_DIR}/config_install.patch"
"${CMAKE_CURRENT_LIST_DIR}/find_flann.patch"
"${CMAKE_CURRENT_LIST_DIR}/find_qhull.patch"