diff options
| author | Brad King <brad.king@kitware.com> | 2024-01-17 14:53:24 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-01-17 14:53:46 (GMT) |
| commit | fa4a499238502dead01c482a168eb52b6599dc22 (patch) | |
| tree | bf5979cea353f228c43b993194e22555928afaab /Source/cmake.cxx | |
| parent | c7ebec770f19faa7b16df280a1f4804fa98b1011 (diff) | |
| parent | 1bb17692359d675eee12996c43446fa9c9fe5175 (diff) | |
| download | CMake-fa4a499238502dead01c482a168eb52b6599dc22.zip CMake-fa4a499238502dead01c482a168eb52b6599dc22.tar.gz CMake-fa4a499238502dead01c482a168eb52b6599dc22.tar.bz2 | |
Merge topic 'cmake-language-exit-code'
1bb1769235 cmake_language: Add EXIT subcommand
4f160f7906 cmakemain: Return the SCRIPT_MODE exit code if it was set
b62dcbf5d2 cmMakefile: check cmake script mode exit code after command
3d9d504646 cmMakefile: Store the exit code from cmExecutionStatus to cmake instance
9f6c937408 Source/cmake.h: Add ScriptModeExitCode for proper storing exit code
1082b9cb9a cmExecutionStatus: Add ability to set optional custom exit code
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Leonid Pospelov <pospelovlm@yandex.ru>
Acked-by: NoMaY (a user of Renesas Rulz Japanese Forum) <nomay-jp@outlook.com>
Merge-request: !8228
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 32064b4..7ab7600 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -2820,7 +2820,7 @@ int cmake::Run(const std::vector<std::string>& args, bool noconfigure) if (cmSystemTools::GetErrorOccurredFlag()) { return -1; } - return 0; + return this->HasScriptModeExitCode() ? this->GetScriptModeExitCode() : 0; } // If MAKEFLAGS are given in the environment, remove the environment |