diff options
| author | Brad King <brad.king@kitware.com> | 2013-07-31 12:48:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-07-31 12:48:52 (GMT) |
| commit | 4e3675ae916e824997c01989366408ff2107a96f (patch) | |
| tree | 020d6782b322c82820302254af2fc91bf0aca5a6 | |
| parent | f2db78c120ada2a084d69abe0296709f56c5ed10 (diff) | |
| parent | d12459f79ec5270cce7d425839674a71e83617ba (diff) | |
| download | CMake-4e3675ae916e824997c01989366408ff2107a96f.zip CMake-4e3675ae916e824997c01989366408ff2107a96f.tar.gz CMake-4e3675ae916e824997c01989366408ff2107a96f.tar.bz2 | |
Merge topic 'ninja_bad_cmcldeps_paths'
d12459f VS 6: Tell BuildDepends test to tolerate ninjadep failure
| -rw-r--r-- | Tests/BuildDepends/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
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]") |