From c2f301ea131b20288c6cfc11b9c7f4a0ed849d80 Mon Sep 17 00:00:00 2001 From: Tsukasa Sugiura Date: Wed, 6 Dec 2017 05:17:55 +0900 Subject: [PATCH] Fix conditional branch of Visual C++ 2017 Fix conditional branch of Visual C++ 2017. Visual C++ 2017 has a version number 191x. --- CMakeLists.txt | 2 +- cmake/pcl_cpack.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fbb4e0424ee..03b30fc4cbf 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) diff --git a/cmake/pcl_cpack.cmake b/cmake/pcl_cpack.cmake index ec785c5f369..3c52f3d5533 100644 --- 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}")