From d12459f79ec5270cce7d425839674a71e83617ba Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 30 Jul 2013 09:41:46 -0400 Subject: VS 6: Tell BuildDepends test to tolerate ninjadep failure The VS 6 IDE does not want to recompile a particular source after a particular header it includes is modified, even by hand. For now just silence the failure and document it with a comment. --- Tests/BuildDepends/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Tests/BuildDepends/CMakeLists.txt b/Tests/BuildDepends/CMakeLists.txt index 6281c40..3af0fda 100644 --- a/Tests/BuildDepends/CMakeLists.txt +++ b/Tests/BuildDepends/CMakeLists.txt @@ -235,6 +235,9 @@ message("Run result: ${runResult} Output: \"${out}\"") if("${out}" STREQUAL "HEADER_STRING: ninja changed ") message("Worked!") +elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 6") + # Tolerate failure because VS 6 does not seem to recompile ninjadep.cpp + # when the "dir/header.h" it includes changes. else() message(SEND_ERROR "Project did not rebuild properly. Output[${out}]\n" " expected [HEADER_STRING: ninja changed]") -- cgit v0.12