kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'ninja_bad_cmcldeps_paths' 

d12459f VS 6: Tell BuildDepends test to tolerate ninjadep failure
This commit is contained in:
Brad King 2013-07-31 08:48:52 -04:00 committed by CMake Topic Stage
parent f2db78c120 d12459f79e
commit 4e3675ae91
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Tests/BuildDepends/CMakeLists.txt
View File

@ -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]")