diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-17 11:19:54 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-05-17 11:19:54 -0400 |
| commit | 1558f30cead409181b6950433b6adfa7d64871e2 (patch) | |
| tree | 3375ced491a56bba6d9c950e2bd6c94c304ffa08 | |
| parent | 93cadfc2b5ebf6c859df24781bb759b03f1f2b5c (diff) | |
| parent | c02d4d2aeee1ee8e6f24f360e2f75eff8e709833 (diff) | |
| download | cmake-1558f30cead409181b6950433b6adfa7d64871e2.tar.gz | |
Merge branch 'vs14-GNUtoMS' into release
| -rw-r--r-- | Modules/Platform/Windows-GNU.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake index 22daa6294f..50477a4b1e 100644 --- a/Modules/Platform/Windows-GNU.cmake +++ b/Modules/Platform/Windows-GNU.cmake @@ -148,6 +148,7 @@ macro(__windows_compiler_gnu_abi lang) find_program(CMAKE_GNUtoMS_VCVARS NAMES vcvars32.bat DOC "Visual Studio vcvars32.bat" PATHS + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\Setup\\VC;ProductDir]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0\\Setup\\VC;ProductDir]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VC;ProductDir]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/bin" @@ -161,6 +162,7 @@ macro(__windows_compiler_gnu_abi lang) find_program(CMAKE_GNUtoMS_VCVARS NAMES vcvars64.bat vcvarsamd64.bat DOC "Visual Studio vcvarsamd64.bat" PATHS + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\Setup\\VC;ProductDir]/bin/amd64" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0\\Setup\\VC;ProductDir]/bin/amd64" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VC;ProductDir]/bin/amd64" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/bin/amd64" |