mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 02:59:01 +08:00
27 lines
792 B
Diff
27 lines
792 B
Diff
|
From ca8bb14234091ab7b1ada2b9e5abb04f40d459cb Mon Sep 17 00:00:00 2001
|
||
|
|
From: Manuel Massing <Manuel Massing m.massing@warped-space.de>
|
||
|
|
Date: Tue, 22 Nov 2016 12:00:39 +0100
|
||
|
|
Subject: [PATCH 1/3] CMake: add detection of recent visual studio versions
|
||
|
|
|
||
|
|
---
|
||
|
|
cmake/Proj4SystemInfo.cmake | 3 +++
|
||
|
|
1 file changed, 3 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/cmake/Proj4SystemInfo.cmake b/cmake/Proj4SystemInfo.cmake
|
||
|
|
index 294a50b..c7fb6bf 100644
|
||
|
|
--- a/cmake/Proj4SystemInfo.cmake
|
||
|
|
+++ b/cmake/Proj4SystemInfo.cmake
|
||
|
|
@@ -50,6 +50,9 @@ if(WIN32)
|
||
|
|
if(MSVC_VERSION EQUAL 1800)
|
||
|
|
set(PROJ_COMPILER_NAME "msvc-12.0") #Visual Studio 2013
|
||
|
|
endif()
|
||
|
|
+ if(MSVC_VERSION EQUAL 1900)
|
||
|
|
+ set(PROJ_COMPILER_NAME "msvc-14.0") #Visual Studio 2015
|
||
|
|
+ endif()
|
||
|
|
endif(MSVC)
|
||
|
|
|
||
|
|
if(MINGW)
|
||
|
|
--
|
||
|
|
2.9.2.windows.1
|
||
|
|
|