diff options
| author | Gilles Khouzam <gillesk@microsoft.com> | 2017-08-07 17:38:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-09-19 13:39:25 (GMT) |
| commit | 173d29a379b5fc4a41116486ca2af4d006188ee5 (patch) | |
| tree | 912fd698fb50d0593b4f2a4c6d03e60e0dc7f1f7 /Tests | |
| parent | 83ddc4d2891a0bbb06fb1e3daa00245b3c23eddc (diff) | |
| download | CMake-173d29a379b5fc4a41116486ca2af4d006188ee5.zip CMake-173d29a379b5fc4a41116486ca2af4d006188ee5.tar.gz CMake-173d29a379b5fc4a41116486ca2af4d006188ee5.tar.bz2 | |
Tests: Fix VSWinStorePhone to properly identify VS 14 2015
VS 14 2015 was only identified by the Windows 10 SDK. On machines with
only VS 2017 and the Windows 10 SDKs, this would incorrectly identify
that VS 2015 was installed. Check for VS 14 2015 with its proper
registry entry.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index a22521b..7e8fef8 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2106,7 +2106,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release set(reg_vs10 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;InstallDir]") set(reg_vs11 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0;InstallDir]") set(reg_vs12 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0;InstallDir]") - set(reg_vs14 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot10]") + set(reg_vs14 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0;InstallDir]") set(reg_ws80 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.0;InstallationFolder]") set(reg_ws81 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.1;InstallationFolder]") set(reg_ws10_0 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\Setup\\Build Tools for Windows 10;srcPath]") |