require at least VS2015 (#290)

VcDevel · Jul 7, 2021 · 8ae998c · 8ae998c
1 parent 8566787
commit 8ae998c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -62,8 +62,8 @@ if(NOT Vc_COMPILER_IS_MSVC) # MSVC doesn't provide a switch to turn C++11 on/off
          endif()
       endif()
    endif()
-elseif(Vc_MSVC_VERSION LESS 180021114)
-   message(FATAL_ERROR "Vc 1.x requires C++11 support. This requires at least Visual Studio 2013 with the Nov 2013 CTP.")
+elseif(MSVC_VERSION LESS 1900)
+   message(FATAL_ERROR "Vc 1.x requires at least Visual Studio 2015.")
 endif()
 
 if(Vc_COMPILER_IS_GCC)

diff --git a/cmake/VcMacros.cmake b/cmake/VcMacros.cmake
@@ -71,10 +71,7 @@ macro(vc_determine_compiler)
          endif()
       elseif(MSVC)
          set(Vc_COMPILER_IS_MSVC true)
-         execute_process(COMMAND ${CMAKE_CXX_COMPILER} /nologo -EP "${_currentDir}/msvc_version.c" OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE Vc_MSVC_VERSION)
-         string(STRIP "${Vc_MSVC_VERSION}" Vc_MSVC_VERSION)
-         string(REPLACE "MSVC " "" Vc_MSVC_VERSION "${Vc_MSVC_VERSION}")
-         message(STATUS "Detected Compiler: MSVC ${Vc_MSVC_VERSION}")
+         message(STATUS "Detected Compiler: MSVC ${MSVC_VERSION}")
       elseif(CMAKE_COMPILER_IS_GNUCXX)
          set(Vc_COMPILER_IS_GCC true)
          exec_program(${CMAKE_CXX_COMPILER} ARGS -dumpversion OUTPUT_VARIABLE Vc_GCC_VERSION)

diff --git a/cmake/msvc_version.c b/cmake/msvc_version.c