From ce602febf0095dcd435a211eeb91e364e203fdc0 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 25 Aug 2017 09:55:50 -0400 Subject: Tests: Fix RunCMake.BuildDepends on VS 2017 with v90 toolset The MSVC toolsets v100 and below forget to re-link when a manifest changes. Exclude this part of the test case for them. --- Tests/RunCMake/BuildDepends/RunCMakeTest.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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() -- cgit v0.12