Merge pull request #2121 from UnaNancyOwen/fix_msvc

Fix conditional branch of Visual C++ 2017
PointCloudLibrary · Dec 5, 2017 · 8161985 · 8161985
2 parents e5d5631 + c2f301e
commit 8161985
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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)

diff --git a/cmake/pcl_cpack.cmake b/cmake/pcl_cpack.cmake
@@ -45,7 +45,7 @@ if(WIN32)
     set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_PACKAGE_NAME}-msvc2013-${win_system_name}")
   elseif(MSVC_VERSION EQUAL 1900)
     set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_PACKAGE_NAME}-msvc2015-${win_system_name}")
-  elseif(MSVC_VERSION EQUAL 1910)
+  elseif(MSVC_VERSION MATCHES "^191[0-9]$")
     set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_PACKAGE_NAME}-msvc2017-${win_system_name}")
   else()
     set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_PACKAGE_NAME}-${win_system_name}")