Drop code for MSVC 2013 and below

PointCloudLibrary · Feb 1, 2019 · 35f9822 · 35f9822
1 parent ee3fe6f
commit 35f9822
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -249,15 +249,7 @@ if(OPENMP_FOUND)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
   message(STATUS "Found OpenMP")
   if(MSVC)
-    if(MSVC_VERSION EQUAL 1500)
-      set(OPENMP_DLL VCOMP90)
-    elseif(MSVC_VERSION EQUAL 1600)
-      set(OPENMP_DLL VCOMP100)
-    elseif(MSVC_VERSION EQUAL 1700)
-      set(OPENMP_DLL VCOMP110)
-    elseif(MSVC_VERSION EQUAL 1800)
-      set(OPENMP_DLL VCOMP120)
-    elseif(MSVC_VERSION EQUAL 1900)
+    if(MSVC_VERSION EQUAL 1900)
       set(OPENMP_DLL VCOMP140)
     elseif(MSVC_VERSION MATCHES "^191[0-9]$")
       set(OPENMP_DLL VCOMP140)

diff --git a/cmake/pcl_cpack.cmake b/cmake/pcl_cpack.cmake
@@ -37,13 +37,7 @@ if(WIN32)
   if(BUILD_all_in_one_installer)
     set(CPACK_NSIS_PACKAGE_NAME "${PROJECT_NAME}-${PCL_VERSION_PRETTY}-AllInOne")
   endif()
-  if(MSVC_VERSION EQUAL 1600)
-    set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_PACKAGE_NAME}-msvc2010-${win_system_name}")
-  elseif(MSVC_VERSION EQUAL 1700)
-    set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_PACKAGE_NAME}-msvc2012-${win_system_name}")
-  elseif(MSVC_VERSION EQUAL 1800)
-    set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_PACKAGE_NAME}-msvc2013-${win_system_name}")
-  elseif(MSVC_VERSION EQUAL 1900)
+  if(MSVC_VERSION EQUAL 1900)
     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}")

diff --git a/gpu/features/test/test_fpfh.cpp b/gpu/features/test/test_fpfh.cpp
@@ -38,7 +38,7 @@
     #define GTEST_USE_OWN_TR1_TUPLE 0
 #endif
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1500)
+#if defined(_MSC_VER)
     #define GTEST_USE_OWN_TR1_TUPLE 0
 #endif
 

diff --git a/gpu/features/test/test_normals.cpp b/gpu/features/test/test_normals.cpp
@@ -38,7 +38,7 @@
     #define GTEST_USE_OWN_TR1_TUPLE 0
 #endif
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1500)
+#if defined(_MSC_VER)
     #define GTEST_USE_OWN_TR1_TUPLE 0
 #endif
 

diff --git a/gpu/features/test/test_pfh.cpp b/gpu/features/test/test_pfh.cpp
@@ -38,7 +38,7 @@
     #define GTEST_USE_OWN_TR1_TUPLE 0
 #endif
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1500)
+#if defined(_MSC_VER)
     #define GTEST_USE_OWN_TR1_TUPLE 0
 #endif
 

diff --git a/gpu/features/test/test_ppf.cpp b/gpu/features/test/test_ppf.cpp
@@ -38,7 +38,7 @@
     #define GTEST_USE_OWN_TR1_TUPLE 0
 #endif
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1500)
+#if defined(_MSC_VER)
     #define GTEST_USE_OWN_TR1_TUPLE 0
 #endif
 

diff --git a/gpu/features/test/test_principal_curvatures.cpp b/gpu/features/test/test_principal_curvatures.cpp
@@ -38,7 +38,7 @@
     #define GTEST_USE_OWN_TR1_TUPLE 0
 #endif
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1500)
+#if defined(_MSC_VER)
     #define GTEST_USE_OWN_TR1_TUPLE 0
 #endif
 

diff --git a/gpu/features/test/test_spinimages.cpp b/gpu/features/test/test_spinimages.cpp
@@ -38,7 +38,7 @@
     #define GTEST_USE_OWN_TR1_TUPLE 0
 #endif
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1500)
+#if defined(_MSC_VER)
     #define GTEST_USE_OWN_TR1_TUPLE 0
 #endif
 

diff --git a/gpu/features/test/test_vfh.cpp b/gpu/features/test/test_vfh.cpp
@@ -39,7 +39,7 @@
     #define GTEST_USE_OWN_TR1_TUPLE 0
 #endif
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1500)
+#if defined(_MSC_VER)
     #define GTEST_USE_OWN_TR1_TUPLE 0
 #endif
 

diff --git a/pcl_config.h.in b/pcl_config.h.in
@@ -3,7 +3,7 @@
 // Ensure the compiler is meeting the minimum C++ standard
 // MSVC is being skipped due to
 // https://developercommunity.visualstudio.com/content/problem/120156/-cplusplus-macro-still-defined-as-pre-c11-value.html
-#if !defined(_MSC_VER) && __cplusplus < 201402L
+#if (!defined(_MSC_VER) && __cplusplus < 201402L) || (defined(_MSC_VER) && _MSC_VER < 1900)
   #error PCL requires C++14 or above
 #endif