summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-09-24 12:51:33 (GMT)
committerBrad King <brad.king@kitware.com>2008-09-24 12:51:33 (GMT)
commit5f57efb417bc02a0aab7be2667a3712ca8af3c64 (patch)
tree8eb810faafc0ac558dab6c1c03367bf5444f0bde /Source/cmMakefile.cxx
parentdbd88e00c7c281991b28616fe8ac4cfe5f737ea3 (diff)
downloadCMake-5f57efb417bc02a0aab7be2667a3712ca8af3c64.zip
CMake-5f57efb417bc02a0aab7be2667a3712ca8af3c64.tar.gz
CMake-5f57efb417bc02a0aab7be2667a3712ca8af3c64.tar.bz2
BUG: Skip a command if its arguments fail to parse
If the arguments to a command fail to parse correctly due to a syntax error, the command should not be invoked. This avoids problems created by processing of commands with bad arguments. Even though the build system will not be generated, the command may affect files on disk that persist across CMake runs.
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 8456d58..8f102df 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2364,7 +2364,7 @@ bool cmMakefile::IsFunctionBlocked(const cmListFileFunction& lff,
return false;
}
-void cmMakefile::ExpandArguments(
+bool cmMakefile::ExpandArguments(
std::vector<cmListFileArgument> const& inArgs,
std::vector<std::string>& outArgs)
{
@@ -2390,6 +2390,7 @@ void cmMakefile::ExpandArguments(
cmSystemTools::ExpandListArgument(value, outArgs);
}
}
+ return !cmSystemTools::GetFatalErrorOccured();
}
void cmMakefile::RemoveFunctionBlocker(const cmListFileFunction& lff)