mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-09 15:20:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmakemain: Return the SCRIPT_MODE exit code if it was set

Browse Source 
We determine it via checking cmake.Run() return code and
ScriptModeExitCode. If ScriptModeExitCode is zero, then we would return
1 if retcode was non-zero. Otherwise it will be returned if retcode was
  also non-zero.
This commit is contained in:
leha-bot
2024-01-02 21:13:53 +03:00
parent b62dcbf5d2
commit 4f160f7906
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmake.cxx
View File

@@ -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

11
Source/cmakemain.cxx
View File

@@ -389,13 +389,16 @@ int do_cmake(int ac, char const* const* av)
}
}
// Always return a non-negative value. Windows tools do not always
// interpret negative return values as errors.
// Always return a non-negative value (except exit code from SCRIPT_MODE).
// Windows tools do not always interpret negative return values as errors.
if (res != 0) {
auto scriptModeExitCode =
cm.HasScriptModeExitCode() ? cm.GetScriptModeExitCode() : 0;
res = scriptModeExitCode ? scriptModeExitCode : 1;
#ifdef CMake_ENABLE_DEBUGGER
cm.StopDebuggerIfNeeded(1);
cm.StopDebuggerIfNeeded(res);
#endif
return 1;
return res;
}
#ifdef CMake_ENABLE_DEBUGGER
cm.StopDebuggerIfNeeded(0);