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

cmake: Allow arbitrary args passed to CMake script

Browse Source
This commit is contained in:
Alex Turbov
2020-05-04 23:08:40 +08:00
committed by Craig Scott
parent e177e7dbec
commit e4f1b301fe
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmake.cxx
View File

@@ -289,7 +289,8 @@ void cmake::CleanupCommandsAndMacros()
// Parse the args
bool cmake::SetCacheArgs(const std::vector<std::string>& args)
{
bool findPackageMode = false;
auto findPackageMode = false;
auto seenScriptOption = false;
for (unsigned int i = 1; i < args.size(); ++i) {
std::string const& arg = args[i];
if (cmHasLiteralPrefix(arg, "-D")) {
@@ -444,6 +445,11 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
this->SetHomeOutputDirectory(
cmSystemTools::GetCurrentWorkingDirectory());
this->ReadListFile(args, path);
seenScriptOption = true;
} else if (arg == "--" && seenScriptOption) {
// Stop processing CMake args and avoid possible errors
// when arbitrary args are given to CMake script.
break;
} else if (cmHasLiteralPrefix(arg, "--find-package")) {
findPackageMode = true;
}