Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Require at least VS2015 #290

Merged
merged 1 commit into from
Jul 7, 2021
Merged

Require at least VS2015 #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 1 addition & 4 deletions cmake/VcMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion cmake/msvc_version.c
View file
Open in desktop

This file was deleted.