[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-484-g72d97b7

Stephen Kelly steveire at gmail.com
Tue Mar 4 12:31:54 EST 2014


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  72d97b7ef358caec678fb44bd632d3428129936e (commit)
       via  1e6ef747d8e3babc819c8a00f5a0b26c6c1f70eb (commit)
      from  74c433c03a1dfd2f4033afefc29430a7d7ef24e2 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72d97b7ef358caec678fb44bd632d3428129936e
commit 72d97b7ef358caec678fb44bd632d3428129936e
Merge: 74c433c 1e6ef74
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Mar 4 12:31:53 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 4 12:31:53 2014 -0500

    Merge topic 'fix-Qt4-moc-command-depends' into next
    
    1e6ef747 Fix typo.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e6ef747d8e3babc819c8a00f5a0b26c6c1f70eb
commit 1e6ef747d8e3babc819c8a00f5a0b26c6c1f70eb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Mar 4 18:29:32 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Mar 4 18:31:28 2014 +0100

    Fix typo.

diff --git a/Source/cmCustomCommand.cxx b/Source/cmCustomCommand.cxx
index a048dd9..7c2ab38 100644
--- a/Source/cmCustomCommand.cxx
+++ b/Source/cmCustomCommand.cxx
@@ -153,7 +153,7 @@ const std::vector<std::string>& cmCustomCommand::GetDepends() const
     std::vector<std::string> configs;
     this->Makefile->GetConfigurations(configs);
 
-    if (confis.empty())
+    if (configs.empty())
       {
       this->GetConfigDepends(0, emitted);
       }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCustomCommand.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list