diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-12-05 12:41:43 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 12:41:43 -0800 |
| commit | 93e7a9e19dda5d3b8255dcc1422beab83a17724b (patch) | |
| tree | ecbf5b56087bf3acdb66242f9308345626aa1d3b | |
| parent | 216f7137b9736d68e698f32154966ea68c7b98db (diff) | |
| parent | 2977e1d7cd51d2150b9b8b4708e369ccc8666f92 (diff) | |
| download | vcpkg-93e7a9e19dda5d3b8255dcc1422beab83a17724b.tar.gz vcpkg-93e7a9e19dda5d3b8255dcc1422beab83a17724b.zip | |
Merge pull request #2306 from UnaNancyOwen/fix_pcl
Fix pcl/CMakeLists fot Visual Studio 2017
| -rw-r--r-- | ports/pcl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pcl/cmakelists.patch | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL index 86839aedd..fa2d37fca 100644 --- a/ports/pcl/CONTROL +++ b/ports/pcl/CONTROL @@ -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 diff --git a/ports/pcl/cmakelists.patch b/ports/pcl/cmakelists.patch index 2d8bd1bd3..d385fd291 100644 --- a/ports/pcl/cmakelists.patch +++ b/ports/pcl/cmakelists.patch @@ -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) |