[Cmake-commits] CMake branch, next, updated. v2.8.9-1069-g37e760e

[Peter Kuemmel]

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  37e760e7ec7b86f6a16299521bde09e5ce22b985 (commit)
       via  60a3c08e968f02877952992782b5745ce2d88119 (commit)
       via  2876cb39d7c8d671aaf05f2ab418991e328beba7 (commit)
      from  2b2adae33c6b9d1df06bd2db985296696af69f14 (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=37e760e7ec7b86f6a16299521bde09e5ce22b985
commit 37e760e7ec7b86f6a16299521bde09e5ce22b985
Merge: 2b2adae 60a3c08
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Thu Oct 11 15:04:26 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 11 15:04:26 2012 -0400

    Merge topic 'codeblocks-cdefs' into next
    
    60a3c08 Fix regression: write compile definitions if any
    2876cb3 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60a3c08e968f02877952992782b5745ce2d88119
commit 60a3c08e968f02877952992782b5745ce2d88119
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Thu Oct 11 20:54:40 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Thu Oct 11 20:58:39 2012 +0200

    Fix regression: write compile definitions if any
    
    In 0ff4e3f0b88885eafab0693fdf03b44c7a5f9d0c cdefs
    was changed from a pointer to a vector.

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 8b2daba..00e1abc 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -623,7 +623,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
     // the compilerdefines for this target
     std::string cdefs = gtgt->GetCompileDefinitions();
 
-    if(cdefs.empty())
+    if(!cdefs.empty())
       {
       // Expand the list.
       std::vector<std::string> defs;

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

Summary of changes:
 Source/CMakeVersion.cmake             |    2 +-
 Source/cmExtraCodeBlocksGenerator.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake