From 1402ac196457fb99bb16962c0d1371b6885b44c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Wed, 27 Sep 2017 23:24:16 +0200 Subject: Add detection of MSVC 14.0 and 14.1+ to CMake configuration (#580) --- cmake/Proj4SystemInfo.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmake/Proj4SystemInfo.cmake b/cmake/Proj4SystemInfo.cmake index 294a50b2..fda57edb 100644 --- a/cmake/Proj4SystemInfo.cmake +++ b/cmake/Proj4SystemInfo.cmake @@ -50,6 +50,12 @@ if(WIN32) if(MSVC_VERSION EQUAL 1800) set(PROJ_COMPILER_NAME "msvc-12.0") #Visual Studio 2013 endif() + if(MSVC_VERSION EQUAL 1900) # CMake 3.1+ + set(PROJ_COMPILER_NAME "msvc-14.0") #Visual Studio 2015 + endif() + if(MSVC_VERSION GREATER 1900 AND MSVC_VERSION LESS 1920) # CMake 3.8+ + set(PROJ_COMPILER_NAME "msvc-14.1") #Visual Studio 2017 + endif() endif(MSVC) if(MINGW) -- cgit v1.2.3