mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-29 07:19:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2306 from UnaNancyOwen/fix_pcl

Browse Source 
Fix pcl/CMakeLists fot Visual Studio 2017
This commit is contained in:
Robert Schumacher 2017-12-05 12:41:43 -08:00 committed by GitHub
commit 93e7a9e19d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/pcl/CONTROL
View File

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

11
ports/pcl/cmakelists.patch
View File

@ -1,7 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d36a581fb..9b0195324 100644
index d36a581fb..b68962e97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -258,7 +258,7 @@ if(OPENMP_FOUND)
set(OPENMP_DLL VCOMP120)
elseif(MSVC_VERSION EQUAL 1900)
set(OPENMP_DLL VCOMP140)
- elseif(MSVC_VERSION EQUAL 1910)
+ elseif(MSVC_VERSION MATCHES "^191[0-9]$")
set(OPENMP_DLL VCOMP140)
endif()
if(OPENMP_DLL)
@@ -327,9 +327,9 @@ endif(WITH_PNG)
# Qhull
option(WITH_QHULL "Include convex-hull operations" TRUE)