From 2977e1d7cd51d2150b9b8b4708e369ccc8666f92 Mon Sep 17 00:00:00 2001 From: Tsukasa Sugiura Date: Wed, 6 Dec 2017 05:38:35 +0900 Subject: Fix pcl/CMakeLists fot Visual Studio 2017 Fix conditional branch for Visual C++ 2017. Visual C++ 2017 has a version number 191x. --- ports/pcl/CONTROL | 2 +- 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) -- cgit v1.2.3