diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-28 13:45:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-28 13:46:13 (GMT) |
| commit | f267505c537fbb0c04650db4bc80cb06539d4b1e (patch) | |
| tree | 8e80696192d59e590fdc683e802204de1e54ad53 | |
| parent | f8e9a848fb341147b643922864eb5d513a0239a4 (diff) | |
| parent | ce602febf0095dcd435a211eeb91e364e203fdc0 (diff) | |
| download | CMake-f267505c537fbb0c04650db4bc80cb06539d4b1e.zip CMake-f267505c537fbb0c04650db4bc80cb06539d4b1e.tar.gz CMake-f267505c537fbb0c04650db4bc80cb06539d4b1e.tar.bz2 | |
Merge topic 'test-fix-vs15-toolset-v90'
ce602feb Tests: Fix RunCMake.BuildDepends on VS 2017 with v90 toolset
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1186
| -rw-r--r-- | Tests/RunCMake/BuildDepends/RunCMakeTest.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake index 9941c70..1bf8fbc 100644 --- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake +++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake @@ -32,7 +32,8 @@ endfunction() run_BuildDepends(C-Exe) if(NOT RunCMake_GENERATOR STREQUAL "Xcode") - if(RunCMake_GENERATOR MATCHES "Visual Studio 10") + if(RunCMake_GENERATOR MATCHES "Visual Studio 10" OR + RunCMake_GENERATOR_TOOLSET MATCHES "^(v80|v90|v100)$") # VS 10 forgets to re-link when a manifest changes set(run_BuildDepends_skip_step_2 1) endif() |