Merge pull request #2508 from pkoller/patch-1

fixed MSVC toolset versions >140
pull/2488/head
Kim Kulling 2019-06-13 15:40:49 +02:00 committed by GitHub
commit b381467fc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 19 deletions

View File

@ -1069,11 +1069,14 @@ if( MSVC )
set(MSVC_PREFIX "vc110")
elseif( MSVC12 )
set(MSVC_PREFIX "vc120")
elseif( MSVC14 )
elseif( MSVC_VERSION LESS 1910)
set(MSVC_PREFIX "vc140")
elseif( MSVC15 )
elseif( MSVC_VERSION LESS 1920)
set(MSVC_PREFIX "vc141")
elseif( MSVC_VERSION LESS 1930)
set(MSVC_PREFIX "vc142")
else()
MESSAGE(WARNING "unknown msvc version ${MSVC_VERSION}")
set(MSVC_PREFIX "vc150")
endif()
endif()