diff options
| author | Mateusz Ĺoskot <mateusz@loskot.net> | 2017-09-27 23:24:16 +0200 |
|---|---|---|
| committer | Howard Butler <howard@hobu.co> | 2017-09-27 16:24:16 -0500 |
| commit | 1402ac196457fb99bb16962c0d1371b6885b44c3 (patch) | |
| tree | 1e8d0cb50551e4305c2f52a08b09f83bd9411fe8 | |
| parent | 4a48c99cf5f84cbdbfca6bdd7efd93c370ab5ae9 (diff) | |
| download | PROJ-1402ac196457fb99bb16962c0d1371b6885b44c3.tar.gz PROJ-1402ac196457fb99bb16962c0d1371b6885b44c3.zip | |
Add detection of MSVC 14.0 and 14.1+ to CMake configuration (#580)
| -rw-r--r-- | cmake/Proj4SystemInfo.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
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) |