diff options
| author | eao197 <eao197@gmail.com> | 2018-11-12 16:19:10 +0300 |
|---|---|---|
| committer | eao197 <eao197@gmail.com> | 2018-11-12 16:19:10 +0300 |
| commit | 2d0ce681b068da0b05c3a4a99573dd00a9415eba (patch) | |
| tree | 85f9572b8edaa611199d6e281af278e56d0094bf /ports/pcl/cmakelists.patch | |
| parent | 8c13a782a044edc67f655b5dcb0227e737136e74 (diff) | |
| parent | 8dc8d0e0c97550a95b764287adbad90b7df7d11d (diff) | |
| download | vcpkg-2d0ce681b068da0b05c3a4a99573dd00a9415eba.tar.gz vcpkg-2d0ce681b068da0b05c3a4a99573dd00a9415eba.zip | |
Merge https://github.com/Microsoft/vcpkg
Diffstat (limited to 'ports/pcl/cmakelists.patch')
| -rw-r--r-- | ports/pcl/cmakelists.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/ports/pcl/cmakelists.patch b/ports/pcl/cmakelists.patch deleted file mode 100644 index d385fd291..000000000 --- a/ports/pcl/cmakelists.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -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) - 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}) |