From dec90fecbf2306675723117850dcca0de08be028 Mon Sep 17 00:00:00 2001 From: Tsukasa Sugiura Date: Tue, 5 Feb 2019 01:00:19 +0900 Subject: [PATCH] Add Visual Studio 2019 MSVC_VERSION of Visual Studio 2019 (vs16) is 1920-1929. --- CMakeLists.txt | 2 ++ cmake/pcl_cpack.cmake | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 100fa3655aa..d6018f994ac 100644 --- 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 index 5fc829fc386..a759b193597 100644 --- 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()