Merge pull request #2826 from UnaNancyOwen/add_vs2019

Add support for Visual Studio 2019
PointCloudLibrary · Feb 5, 2019 · 9f0b0b1 · 9f0b0b1
2 parents 3bfec88 + dec90fe
commit 9f0b0b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -253,6 +253,8 @@ if(OPENMP_FOUND)
       set(OPENMP_DLL VCOMP140)
     elseif(MSVC_VERSION MATCHES "^191[0-9]$")
       set(OPENMP_DLL VCOMP140)
+    elseif(MSVC_VERSION MATCHES "^192[0-9]$")
+      set(OPENMP_DLL VCOMP140)
     endif()
     if(OPENMP_DLL)
       set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DELAYLOAD:${OPENMP_DLL}D.dll")

diff --git a/cmake/pcl_cpack.cmake b/cmake/pcl_cpack.cmake
@@ -41,6 +41,8 @@ if(WIN32)
     set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_PACKAGE_NAME}-msvc2015-${win_system_name}")
   elseif(MSVC_VERSION MATCHES "^191[0-9]$")
     set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_PACKAGE_NAME}-msvc2017-${win_system_name}")
+  elseif(MSVC_VERSION MATCHES "^192[0-9]$")
+    set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_PACKAGE_NAME}-msvc2019-${win_system_name}")
   else()
     set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_PACKAGE_NAME}-${win_system_name}")
   endif()