diff --git a/Source/cmBlockCommand.cxx b/Source/cmBlockCommand.cxx index 42f1ad377b..5bf7bed08b 100644 --- a/Source/cmBlockCommand.cxx +++ b/Source/cmBlockCommand.cxx @@ -127,6 +127,10 @@ bool cmBlockFunctionBlocker::Replay(std::vector functions, inStatus.SetContinueInvoked(); return true; } + if (status.HasExitCode()) { + inStatus.SetExitCode(status.GetExitCode()); + return true; + } if (cmSystemTools::GetFatalErrorOccurred()) { return true; } diff --git a/Source/cmForEachCommand.cxx b/Source/cmForEachCommand.cxx index 21a140d02c..33dae79f9a 100644 --- a/Source/cmForEachCommand.cxx +++ b/Source/cmForEachCommand.cxx @@ -272,6 +272,11 @@ auto cmForEachFunctionBlocker::invoke( if (status.GetContinueInvoked()) { break; } + if (status.HasExitCode()) { + inStatus.SetExitCode(status.GetExitCode()); + result.Break = true; + break; + } if (cmSystemTools::GetFatalErrorOccurred()) { result.Restore = false; result.Break = true; diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx index 8d2d9725ea..33721fcf4a 100644 --- a/Source/cmFunctionCommand.cxx +++ b/Source/cmFunctionCommand.cxx @@ -124,6 +124,10 @@ bool cmFunctionHelperCommand::operator()( makefile.RaiseScope(status.GetReturnVariables()); break; } + if (status.HasExitCode()) { + inStatus.SetExitCode(status.GetExitCode()); + break; + } } // pop scope on the makefile diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx index c2a09c1085..0b80aaaf28 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -161,6 +161,10 @@ bool cmIfFunctionBlocker::Replay(std::vector functions, inStatus.SetContinueInvoked(); return true; } + if (status.HasExitCode()) { + inStatus.SetExitCode(status.GetExitCode()); + return true; + } } } return true; diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx index 3d7cd8b068..b57c3ddce0 100644 --- a/Source/cmMacroCommand.cxx +++ b/Source/cmMacroCommand.cxx @@ -135,6 +135,10 @@ bool cmMacroHelperCommand::operator()( inStatus.SetBreakInvoked(); return true; } + if (status.HasExitCode()) { + inStatus.SetExitCode(status.GetExitCode()); + return true; + } } return true; } diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx index e80d1fcf02..6b454d7de5 100644 --- a/Source/cmWhileCommand.cxx +++ b/Source/cmWhileCommand.cxx @@ -105,6 +105,10 @@ bool cmWhileFunctionBlocker::Replay(std::vector functions, if (status.GetContinueInvoked()) { break; } + if (status.HasExitCode()) { + inStatus.SetExitCode(status.GetExitCode()); + return true; + } if (cmSystemTools::GetFatalErrorOccurred()) { return true; } diff --git a/Tests/RunCMake/cmake_language/RunCMakeTest.cmake b/Tests/RunCMake/cmake_language/RunCMakeTest.cmake index ac4aec8000..5fb2de6e8b 100644 --- a/Tests/RunCMake/cmake_language/RunCMakeTest.cmake +++ b/Tests/RunCMake/cmake_language/RunCMakeTest.cmake @@ -91,6 +91,13 @@ run_cmake_script(exit_5_script) run_cmake_script(exit_0_script_with_command) run_cmake_script(exit_7_script_in_include) run_cmake_script(exit_8_script_in_recursive_cmake_language) +run_cmake_script(exit_9_script_block) +run_cmake_script(exit_9_script_control) +run_cmake_script(exit_9_script_if) +run_cmake_script(exit_9_script_foreach) +run_cmake_script(exit_9_script_function) +run_cmake_script(exit_9_script_macro) +run_cmake_script(exit_9_script_while) # Default log level run_cmake_command( diff --git a/Tests/RunCMake/cmake_language/exit_9_script_block-result.txt b/Tests/RunCMake/cmake_language/exit_9_script_block-result.txt new file mode 100644 index 0000000000..b38a53dd17 --- /dev/null +++ b/Tests/RunCMake/cmake_language/exit_9_script_block-result.txt @@ -0,0 +1 @@ +^9$ diff --git a/Tests/RunCMake/cmake_language/exit_9_script_block.cmake b/Tests/RunCMake/cmake_language/exit_9_script_block.cmake new file mode 100644 index 0000000000..b8d8615073 --- /dev/null +++ b/Tests/RunCMake/cmake_language/exit_9_script_block.cmake @@ -0,0 +1,5 @@ +block() + cmake_language(EXIT 9) + message(FATAL_ERROR "This should not be reached!") +endblock() +message(FATAL_ERROR "This should not be reached!") diff --git a/Tests/RunCMake/cmake_language/exit_9_script_control-result.txt b/Tests/RunCMake/cmake_language/exit_9_script_control-result.txt new file mode 100644 index 0000000000..b38a53dd17 --- /dev/null +++ b/Tests/RunCMake/cmake_language/exit_9_script_control-result.txt @@ -0,0 +1 @@ +^9$ diff --git a/Tests/RunCMake/cmake_language/exit_9_script_control.cmake b/Tests/RunCMake/cmake_language/exit_9_script_control.cmake new file mode 100644 index 0000000000..168f81f234 --- /dev/null +++ b/Tests/RunCMake/cmake_language/exit_9_script_control.cmake @@ -0,0 +1,24 @@ +function(exit_macro) + cmake_language(EXIT 9) + message(FATAL_ERROR "This should not be reached!") +endfunction() + +function(exit_function) + exit_macro() + message(FATAL_ERROR "This should not be reached!") +endfunction() + +block() + if(1) + foreach(i IN ITEMS a b) + while(1) + exit_function() + message(FATAL_ERROR "This should not be reached!") + endwhile() + message(FATAL_ERROR "This should not be reached!") + endforeach() + message(FATAL_ERROR "This should not be reached!") + endif() + message(FATAL_ERROR "This should not be reached!") +endblock() +message(FATAL_ERROR "This should not be reached!") diff --git a/Tests/RunCMake/cmake_language/exit_9_script_foreach-result.txt b/Tests/RunCMake/cmake_language/exit_9_script_foreach-result.txt new file mode 100644 index 0000000000..b38a53dd17 --- /dev/null +++ b/Tests/RunCMake/cmake_language/exit_9_script_foreach-result.txt @@ -0,0 +1 @@ +^9$ diff --git a/Tests/RunCMake/cmake_language/exit_9_script_foreach.cmake b/Tests/RunCMake/cmake_language/exit_9_script_foreach.cmake new file mode 100644 index 0000000000..b2055373fb --- /dev/null +++ b/Tests/RunCMake/cmake_language/exit_9_script_foreach.cmake @@ -0,0 +1,5 @@ +foreach(i IN ITEMS a b) + cmake_language(EXIT 9) + message(FATAL_ERROR "This should not be reached!") +endforeach() +message(FATAL_ERROR "This should not be reached!") diff --git a/Tests/RunCMake/cmake_language/exit_9_script_function-result.txt b/Tests/RunCMake/cmake_language/exit_9_script_function-result.txt new file mode 100644 index 0000000000..b38a53dd17 --- /dev/null +++ b/Tests/RunCMake/cmake_language/exit_9_script_function-result.txt @@ -0,0 +1 @@ +^9$ diff --git a/Tests/RunCMake/cmake_language/exit_9_script_function.cmake b/Tests/RunCMake/cmake_language/exit_9_script_function.cmake new file mode 100644 index 0000000000..67a2615f0e --- /dev/null +++ b/Tests/RunCMake/cmake_language/exit_9_script_function.cmake @@ -0,0 +1,6 @@ +function(exit) + cmake_language(EXIT 9) + message(FATAL_ERROR "This should not be reached!") +endfunction() +exit() +message(FATAL_ERROR "This should not be reached!") diff --git a/Tests/RunCMake/cmake_language/exit_9_script_if-result.txt b/Tests/RunCMake/cmake_language/exit_9_script_if-result.txt new file mode 100644 index 0000000000..b38a53dd17 --- /dev/null +++ b/Tests/RunCMake/cmake_language/exit_9_script_if-result.txt @@ -0,0 +1 @@ +^9$ diff --git a/Tests/RunCMake/cmake_language/exit_9_script_if.cmake b/Tests/RunCMake/cmake_language/exit_9_script_if.cmake new file mode 100644 index 0000000000..935b8d5509 --- /dev/null +++ b/Tests/RunCMake/cmake_language/exit_9_script_if.cmake @@ -0,0 +1,5 @@ +if(1) + cmake_language(EXIT 9) + message(FATAL_ERROR "This should not be reached!") +endif() +message(FATAL_ERROR "This should not be reached!") diff --git a/Tests/RunCMake/cmake_language/exit_9_script_macro-result.txt b/Tests/RunCMake/cmake_language/exit_9_script_macro-result.txt new file mode 100644 index 0000000000..b38a53dd17 --- /dev/null +++ b/Tests/RunCMake/cmake_language/exit_9_script_macro-result.txt @@ -0,0 +1 @@ +^9$ diff --git a/Tests/RunCMake/cmake_language/exit_9_script_macro.cmake b/Tests/RunCMake/cmake_language/exit_9_script_macro.cmake new file mode 100644 index 0000000000..133348c178 --- /dev/null +++ b/Tests/RunCMake/cmake_language/exit_9_script_macro.cmake @@ -0,0 +1,6 @@ +macro(exit) + cmake_language(EXIT 9) + message(FATAL_ERROR "This should not be reached!") +endmacro() +exit() +message(FATAL_ERROR "This should not be reached!") diff --git a/Tests/RunCMake/cmake_language/exit_9_script_while-result.txt b/Tests/RunCMake/cmake_language/exit_9_script_while-result.txt new file mode 100644 index 0000000000..b38a53dd17 --- /dev/null +++ b/Tests/RunCMake/cmake_language/exit_9_script_while-result.txt @@ -0,0 +1 @@ +^9$ diff --git a/Tests/RunCMake/cmake_language/exit_9_script_while.cmake b/Tests/RunCMake/cmake_language/exit_9_script_while.cmake new file mode 100644 index 0000000000..261438c8c7 --- /dev/null +++ b/Tests/RunCMake/cmake_language/exit_9_script_while.cmake @@ -0,0 +1,5 @@ +while(1) + cmake_language(EXIT 9) + message(FATAL_ERROR "This should not be reached!") +endwhile() +message(FATAL_ERROR "This should not be reached!")