[Cmake-commits] CMake branch, next, updated. v3.1.2-1145-g57c6574

Brad King brad.king at kitware.com
Tue Feb 10 09:27:34 EST 2015


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  57c6574b35a3d533e47cc8c2be131c46d2b30a99 (commit)
       via  eeb2831b5f35af1ec8a65be343e754ff1c29550d (commit)
      from  6818ee67a5b1f81e3e5b7db36a49774d3dde8c99 (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=57c6574b35a3d533e47cc8c2be131c46d2b30a99
commit 57c6574b35a3d533e47cc8c2be131c46d2b30a99
Merge: 6818ee6 eeb2831
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:27:33 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 09:27:33 2015 -0500

    Merge topic 'makefile-missing-comment' into next
    
    eeb2831b Makefile: Fix regression in target-bound custom command COMMENT output


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eeb2831b5f35af1ec8a65be343e754ff1c29550d
commit eeb2831b5f35af1ec8a65be343e754ff1c29550d
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Feb 10 12:26:56 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 09:22:05 2015 -0500

    Makefile: Fix regression in target-bound custom command COMMENT output
    
    Fix a logic typo introduced by commit v3.1.0-rc1~781^2 (Generalize
    cmCustomCommandGenerator to more fields, 2014-03-10).

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 23513fa..280d4ab 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1076,7 +1076,7 @@ cmLocalUnixMakefileGenerator3
   if(echo_comment)
     {
     const char* comment = ccg.GetComment();
-    if(comment && !*comment)
+    if(comment && *comment)
       {
       this->AppendEcho(commands, comment,
                        cmLocalUnixMakefileGenerator3::EchoGenerate);

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

Summary of changes:


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list