diff options
Diffstat (limited to 'Tests/RunCMake/BuildDepends/RunCMakeTest.cmake')
| -rw-r--r-- | Tests/RunCMake/BuildDepends/RunCMakeTest.cmake | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake index 98132cc..8782ba9 100644 --- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake +++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake @@ -14,6 +14,9 @@ function(run_BuildDepends CASE) set(RunCMake-check-file check.cmake) set(check_step 1) run_cmake_command(${CASE}-build1 ${CMAKE_COMMAND} --build . --config Debug) + if(run_BuildDepends_skip_step_2) + return() + endif() execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1.125) # handle 1s resolution include(${RunCMake_SOURCE_DIR}/${CASE}.step2.cmake OPTIONAL) set(check_step 2) @@ -21,3 +24,11 @@ function(run_BuildDepends CASE) endfunction() run_BuildDepends(C-Exe) +if(NOT RunCMake_GENERATOR MATCHES "Visual Studio [67]|Xcode") + if(RunCMake_GENERATOR MATCHES "Visual Studio 10") + # VS 10 forgets to re-link when a manifest changes + set(run_BuildDepends_skip_step_2 1) + endif() + run_BuildDepends(C-Exe-Manifest) + unset(run_BuildDepends_skip_step_2) +endif() |