[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-177-ga146979
Brad King
brad.king at kitware.com
Wed Feb 15 09:26:23 EST 2017
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 a146979be3b0890d376f6c722f3b0744189367c9 (commit)
via 20ae76b1da82d87792fb54335dbf95e871261f52 (commit)
from 13314a3e27942a44e747a9ba52e0c819a1b602d2 (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=a146979be3b0890d376f6c722f3b0744189367c9
commit a146979be3b0890d376f6c722f3b0744189367c9
Merge: 13314a3 20ae76b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 15 09:26:23 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 15 09:26:23 2017 -0500
Merge topic 'command-cleanup-fix' into next
20ae76b1 cmDisallowedCommand: Forward final pass too
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20ae76b1da82d87792fb54335dbf95e871261f52
commit 20ae76b1da82d87792fb54335dbf95e871261f52
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 15 09:18:26 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 15 09:22:22 2017 -0500
cmDisallowedCommand: Forward final pass too
Refactoring in commit 7fb14775 (cmDisallowedCommand: extract policy
checking from cmCommand, 2016-12-26) introduced a wrapper for
disallowed commands that forwards to their original commands.
This broke the `export_library_dependencies` command that uses
a final pass. Forward the final pass too to fix it.
diff --git a/Source/cmDisallowedCommand.h b/Source/cmDisallowedCommand.h
index 9cf5e6f..00b0183 100644
--- a/Source/cmDisallowedCommand.h
+++ b/Source/cmDisallowedCommand.h
@@ -34,6 +34,13 @@ public:
bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus& status) CM_OVERRIDE;
+ void FinalPass() CM_OVERRIDE { this->Command->FinalPass(); }
+
+ bool HasFinalPass() const CM_OVERRIDE
+ {
+ return this->Command->HasFinalPass();
+ }
+
bool IsScriptable() const CM_OVERRIDE
{
return this->Command->IsScriptable();
-----------------------------------------------------------------------
Summary of changes:
Source/cmDisallowedCommand.h | 7 +++++++
1 file changed, 7 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list