diff options
| author | Brad King <brad.king@kitware.com> | 2022-09-07 13:51:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-09-07 13:51:51 (GMT) |
| commit | a64aa9bd300b2df2441d8e07ec3e2afe3069b04e (patch) | |
| tree | f5bd7f1904b224e701d6360194a524388d238727 /Source/cmIfCommand.cxx | |
| parent | 15f3d6e87ae83559ad43255f19a8606d86ac4e95 (diff) | |
| parent | 838a5fae23cba0c9acf922164ff89fb6883d0f96 (diff) | |
| download | CMake-a64aa9bd300b2df2441d8e07ec3e2afe3069b04e.zip CMake-a64aa9bd300b2df2441d8e07ec3e2afe3069b04e.tar.gz CMake-a64aa9bd300b2df2441d8e07ec3e2afe3069b04e.tar.bz2 | |
Merge topic 'return-propagate-variables'
838a5fae23 return(): Propagate variables to result scope
8f0e1f2111 cmMakefile: add RaiseScope for list of variables
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !7634
Diffstat (limited to 'Source/cmIfCommand.cxx')
| -rw-r--r-- | Source/cmIfCommand.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx index 0da72b1..c2a09c1 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -150,7 +150,7 @@ bool cmIfFunctionBlocker::Replay(std::vector<cmListFileFunction> functions, cmExecutionStatus status(mf); mf.ExecuteCommand(func, status); if (status.GetReturnInvoked()) { - inStatus.SetReturnInvoked(); + inStatus.SetReturnInvoked(status.GetReturnVariables()); return true; } if (status.GetBreakInvoked()) { |