summaryrefslogtreecommitdiffstats
path: root/Source/cmConfigureFileCommand.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-11-03 14:08:35 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-11-03 14:08:35 (GMT)
commit6aa2d4773701d5b491c44e2c0eda202b46b36521 (patch)
treeb6522a78a9e58e57bb3d3cf592d178b5aa691f24 /Source/cmConfigureFileCommand.cxx
parent44853be608a18c94a1ce4000446ec7f29b8f0ee3 (diff)
parent1531df2b866df9aa52dc54219a4552e94f47b622 (diff)
downloadCMake-6aa2d4773701d5b491c44e2c0eda202b46b36521.zip
CMake-6aa2d4773701d5b491c44e2c0eda202b46b36521.tar.gz
CMake-6aa2d4773701d5b491c44e2c0eda202b46b36521.tar.bz2
Merge topic 'fix-configure_file-COPYONLY'
1531df2b configure_file: Warn about unknown arguments 4abbb140 Qt4: Fix configure_file call to use COPYONLY, not COPY_ONLY bd7ba8e2 KWSys: Fix configure_file call to use COPYONLY, not COPY_ONLY e9282782 Help: Fix configure_file call to use COPYONLY, not COPY_ONLY
Diffstat (limited to 'Source/cmConfigureFileCommand.cxx')
-rw-r--r--Source/cmConfigureFileCommand.cxx13
1 files changed, 13 insertions, 0 deletions
diff --git a/Source/cmConfigureFileCommand.cxx b/Source/cmConfigureFileCommand.cxx
index af4805e..cc6cf5f 100644
--- a/Source/cmConfigureFileCommand.cxx
+++ b/Source/cmConfigureFileCommand.cxx
@@ -74,6 +74,7 @@ bool cmConfigureFileCommand
this->CopyOnly = false;
this->EscapeQuotes = false;
+ std::string unknown_args;
this->AtOnly = false;
for(unsigned int i=2;i < args.size();++i)
{
@@ -99,6 +100,18 @@ bool cmConfigureFileCommand
{
/* Ignore legacy option. */
}
+ else
+ {
+ unknown_args += " ";
+ unknown_args += args[i];
+ unknown_args += "\n";
+ }
+ }
+ if (!unknown_args.empty())
+ {
+ std::string msg = "configure_file called with unknown argument(s):\n";
+ msg += unknown_args;
+ this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, msg);
}
if ( !this->ConfigureFile() )