diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-22 14:02:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-22 14:02:43 (GMT) |
| commit | a66f9bc0c4e3507b5478f8254585aa262f023171 (patch) | |
| tree | 4a07d129b5de69aecf3c077aa5cf02197fc30b67 /Tests/CMakeLists.txt | |
| parent | 9f3bf3cb9d014c3acce0709af7cce82554bc7a89 (diff) | |
| parent | 0db4c7a021437c1b2e0ec788bdda249417501490 (diff) | |
| download | CMake-a66f9bc0c4e3507b5478f8254585aa262f023171.zip CMake-a66f9bc0c4e3507b5478f8254585aa262f023171.tar.gz CMake-a66f9bc0c4e3507b5478f8254585aa262f023171.tar.bz2 | |
Merge topic 'vs_fix_configuration_error'
0db4c7a0 Tests: Verify registry value is not "/registry" before using
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !994
Diffstat (limited to 'Tests/CMakeLists.txt')
| -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 d16df1c..34418c5 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2082,7 +2082,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release set(reg_nasm "[HKEY_CURRENT_USER\\SOFTWARE\\nasm]") foreach(reg vs10 vs11 vs12 vs14 ws80 ws81 ws10_0 wp80 wp81 wince tegra nasm) get_filename_component(r "${reg_${reg}}" ABSOLUTE) - if(IS_DIRECTORY "${r}") + if(IS_DIRECTORY "${r}" AND NOT "${r}" STREQUAL "/registry") set(${reg} 1) else() set(${reg} 0) |