diff options
| author | Tsukasa Sugiura <t.sugiura0204@gmail.com> | 2017-11-26 07:49:30 +0900 |
|---|---|---|
| committer | Tsukasa Sugiura <t.sugiura0204@gmail.com> | 2017-11-26 07:49:30 +0900 |
| commit | 390806e93186563372d6f2797e8dcabdb4d7de07 (patch) | |
| tree | eff6ecfbc8e77b43513b161c07498b03ec71403c | |
| parent | 173a1d59a590f823cd0e25b48906348ff68435e2 (diff) | |
| download | vcpkg-390806e93186563372d6f2797e8dcabdb4d7de07.tar.gz vcpkg-390806e93186563372d6f2797e8dcabdb4d7de07.zip | |
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.
| -rw-r--r-- | ports/pcl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pcl/cmakelists.patch | 16 | ||||
| -rw-r--r-- | ports/pcl/portfile.cmake | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL index 5d19f0021..86839aedd 100644 --- a/ports/pcl/CONTROL +++ b/ports/pcl/CONTROL @@ -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 diff --git a/ports/pcl/cmakelists.patch b/ports/pcl/cmakelists.patch new file mode 100644 index 000000000..2d8bd1bd3 --- /dev/null +++ b/ports/pcl/cmakelists.patch @@ -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}) diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index a3efd3367..eeb7b0e6c 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -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" |