AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Detect MSVC 2017 Community in GN

Browse Source 
Change-Id: If5dc14cbed7d0c6e5ca47dae3408bbe3cf213eab
Reviewed-on: https://skia-review.googlesource.com/105609
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2018-02-08 10:24:09 -05:00 committed by Skia Commit-Bot
parent e88470eb16
commit c50f8e031b
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gn/BUILDCONFIG.gn
View File

@ -131,16 +131,24 @@ if (is_android) {
msvc = ""
if (target_os == "win") {
# By default we look for 2017, then 2015. If MSVC is installed in a non-default
# location, you can set win_vc to inform us where it is.
vc_2017_default =
# By default we look for 2017 (Pro & Community), then 2015. If MSVC is installed in a
# non-default location, you can set win_vc to inform us where it is.
vc_2017_pro_default =
"C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC"
vc_2017_com_default =
"C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC"
vc_2015_default = "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC"
if (win_vc == "") {
if ("True" ==
exec_script("//gn/checkdir.py", [ "$vc_2017_default" ], "trim string")) {
win_vc = vc_2017_default
if ("True" == exec_script("//gn/checkdir.py",
[ "$vc_2017_pro_default" ],
"trim string")) {
win_vc = vc_2017_pro_default
msvc = 2017
} else if ("True" == exec_script("//gn/checkdir.py",
[ "$vc_2017_com_default" ],
"trim string")) {
win_vc = vc_2017_com_default
msvc = 2017
} else if ("True" == exec_script("//gn/checkdir.py",
[ "$vc_2015_default" ],