[Cmake-commits] CMake branch, next, updated. v3.6.2-1962-ge5a23b9
Brad King
brad.king at kitware.com
Mon Sep 12 14:34:38 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via e5a23b9d152d9114bfdb65caeb7c33c35ab21b59 (commit)
via 4dd997da541be93b0cfacdd8483eaec8dd2a76d5 (commit)
from 5ba3f1a9068a6504c8a3ae5987a090c6fe787b40 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5a23b9d152d9114bfdb65caeb7c33c35ab21b59
commit e5a23b9d152d9114bfdb65caeb7c33c35ab21b59
Merge: 5ba3f1a 4dd997d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 12 14:34:37 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 12 14:34:37 2016 -0400
Merge topic 'file-download-unexpected-arg' into next
4dd997da file(DOWNLOAD|UPLOAD): Warn on unexpected arguments
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4dd997da541be93b0cfacdd8483eaec8dd2a76d5
commit 4dd997da541be93b0cfacdd8483eaec8dd2a76d5
Author: Ruslan Baratov <ruslan_baratov at yahoo.com>
AuthorDate: Fri Sep 9 23:19:39 2016 +0300
Commit: Ruslan Baratov <ruslan_baratov at yahoo.com>
CommitDate: Fri Sep 9 23:19:39 2016 +0300
file(DOWNLOAD|UPLOAD): Warn on unexpected arguments
Emit warning message on unparsed argument instead of silently ignoring it.
Can't stop with the error message because it may break old code.
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 835b118..ae7a511 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -2564,6 +2564,11 @@ bool cmFileCommand::HandleDownloadCommand(std::vector<std::string> const& args)
return false;
}
hashMatchMSG = algo + " hash";
+ } else {
+ // Do not return error for compatibility reason.
+ std::string err = "Unexpected argument: ";
+ err += *i;
+ this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, err.c_str());
}
++i;
}
@@ -2812,6 +2817,11 @@ bool cmFileCommand::HandleUploadCommand(std::vector<std::string> const& args)
statusVar = *i;
} else if (*i == "SHOW_PROGRESS") {
showProgress = true;
+ } else {
+ // Do not return error for compatibility reason.
+ std::string err = "Unexpected argument: ";
+ err += *i;
+ this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, err.c_str());
}
++i;
diff --git a/Tests/RunCMake/file/DOWNLOAD-unused-argument-result.txt b/Tests/RunCMake/file/DOWNLOAD-unused-argument-result.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/file/DOWNLOAD-unused-argument-stderr.txt b/Tests/RunCMake/file/DOWNLOAD-unused-argument-stderr.txt
new file mode 100644
index 0000000..82a78c9
--- /dev/null
+++ b/Tests/RunCMake/file/DOWNLOAD-unused-argument-stderr.txt
@@ -0,0 +1,5 @@
+^CMake Warning \(dev\) at DOWNLOAD-unused-argument.cmake:[0-9]+ \(file\):
+ Unexpected argument: JUNK
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
+This warning is for project developers. Use -Wno-dev to suppress it.$
diff --git a/Tests/RunCMake/file/DOWNLOAD-unused-argument.cmake b/Tests/RunCMake/file/DOWNLOAD-unused-argument.cmake
new file mode 100644
index 0000000..2e3fbe1
--- /dev/null
+++ b/Tests/RunCMake/file/DOWNLOAD-unused-argument.cmake
@@ -0,0 +1,5 @@
+file(DOWNLOAD
+ "file://${CMAKE_CURRENT_SOURCE_DIR}/DOWNLOAD-unused-argument.txt"
+ "${CMAKE_CURRENT_BINARY_DIR}/unused-argument.txt"
+ JUNK
+ )
diff --git a/Tests/RunCMake/file/DOWNLOAD-unused-argument.txt b/Tests/RunCMake/file/DOWNLOAD-unused-argument.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/file/RunCMakeTest.cmake b/Tests/RunCMake/file/RunCMakeTest.cmake
index 5f85bba..4c05f24 100644
--- a/Tests/RunCMake/file/RunCMakeTest.cmake
+++ b/Tests/RunCMake/file/RunCMakeTest.cmake
@@ -1,6 +1,8 @@
include(RunCMake)
run_cmake(DOWNLOAD-hash-mismatch)
+run_cmake(DOWNLOAD-unused-argument)
+run_cmake(UPLOAD-unused-argument)
run_cmake(INSTALL-DIRECTORY)
run_cmake(INSTALL-MESSAGE-bad)
run_cmake(FileOpenFailRead)
diff --git a/Tests/RunCMake/file/UPLOAD-unused-argument-result.txt b/Tests/RunCMake/file/UPLOAD-unused-argument-result.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/file/UPLOAD-unused-argument-stderr.txt b/Tests/RunCMake/file/UPLOAD-unused-argument-stderr.txt
new file mode 100644
index 0000000..3c1b744
--- /dev/null
+++ b/Tests/RunCMake/file/UPLOAD-unused-argument-stderr.txt
@@ -0,0 +1,5 @@
+^CMake Warning \(dev\) at UPLOAD-unused-argument.cmake:[0-9]+ \(file\):
+ Unexpected argument: JUNK
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
+This warning is for project developers. Use -Wno-dev to suppress it.$
diff --git a/Tests/RunCMake/file/UPLOAD-unused-argument.cmake b/Tests/RunCMake/file/UPLOAD-unused-argument.cmake
new file mode 100644
index 0000000..94ac9ac
--- /dev/null
+++ b/Tests/RunCMake/file/UPLOAD-unused-argument.cmake
@@ -0,0 +1,5 @@
+file(UPLOAD
+ "${CMAKE_CURRENT_SOURCE_DIR}/UPLOAD-unused-argument.txt"
+ "file://${CMAKE_CURRENT_BINARY_DIR}/unused-argument.txt"
+ JUNK
+ )
diff --git a/Tests/RunCMake/file/UPLOAD-unused-argument.txt b/Tests/RunCMake/file/UPLOAD-unused-argument.txt
new file mode 100644
index 0000000..e69de29
-----------------------------------------------------------------------
Summary of changes:
Source/cmFileCommand.cxx | 10 ++++++++++
.../RunCMake/file/DOWNLOAD-unused-argument-result.txt | 0
Tests/RunCMake/file/DOWNLOAD-unused-argument-stderr.txt | 5 +++++
Tests/RunCMake/file/DOWNLOAD-unused-argument.cmake | 5 +++++
.../RunCMake/file/DOWNLOAD-unused-argument.txt | 0
Tests/RunCMake/file/RunCMakeTest.cmake | 2 ++
.../RunCMake/file/UPLOAD-unused-argument-result.txt | 0
Tests/RunCMake/file/UPLOAD-unused-argument-stderr.txt | 5 +++++
Tests/RunCMake/file/UPLOAD-unused-argument.cmake | 5 +++++
.../RunCMake/file/UPLOAD-unused-argument.txt | 0
10 files changed, 32 insertions(+)
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/file/DOWNLOAD-unused-argument-result.txt (100%)
create mode 100644 Tests/RunCMake/file/DOWNLOAD-unused-argument-stderr.txt
create mode 100644 Tests/RunCMake/file/DOWNLOAD-unused-argument.cmake
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/file/DOWNLOAD-unused-argument.txt (100%)
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/file/UPLOAD-unused-argument-result.txt (100%)
create mode 100644 Tests/RunCMake/file/UPLOAD-unused-argument-stderr.txt
create mode 100644 Tests/RunCMake/file/UPLOAD-unused-argument.cmake
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/file/UPLOAD-unused-argument.txt (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list