[Cmake-commits] CMake branch, next, updated. v2.8.3-1623-g88e3b08

[Alexander Neundorf]

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  88e3b0870f2f53f375a866ed52f668153a1713bf (commit)
       via  2a9f7f96b804ed929c56826c8477895c5924befe (commit)
       via  d26ef5c1180835d8cb32b1783b6e01806905b1e8 (commit)
      from  8b34a234ad91347c411fe0ace319738b28a9fe72 (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=88e3b0870f2f53f375a866ed52f668153a1713bf
commit 88e3b0870f2f53f375a866ed52f668153a1713bf
Merge: 8b34a23 2a9f7f9
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Sun Feb 13 16:59:00 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 13 16:59:00 2011 -0500

    Merge topic 'AddCustomTargetSourcesToCodeBlocksProject' into next
    
    2a9f7f9 Also add the SOURCES from add_custom_target() to CodeBlocks projects (#11736)
    d26ef5c KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a9f7f96b804ed929c56826c8477895c5924befe
commit 2a9f7f96b804ed929c56826c8477895c5924befe
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sun Feb 13 22:53:43 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sun Feb 13 22:53:43 2011 +0100

    Also add the SOURCES from add_custom_target() to CodeBlocks projects (#11736)
    
    Since CMake 2.6.3 add_custom_target() has a SOURCES option, this was not
    yet considered in the C::B generator.
    Also, now GENERATED files are not added to the project.
    
    Alex

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index a5650d4..4f93067 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -416,11 +416,18 @@ void cmExtraCodeBlocksGenerator
         case cmTarget::STATIC_LIBRARY:
         case cmTarget::SHARED_LIBRARY:
         case cmTarget::MODULE_LIBRARY:
+        case cmTarget::UTILITY: // can have sources since 2.6.3
           {
           const std::vector<cmSourceFile*>&sources=ti->second.GetSourceFiles();
           for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
                si!=sources.end(); si++)
             {
+            // don't add source files which have the GENERATED property set:
+            if ((*si)->GetPropertyAsBool("GENERATED"))
+              {
+              continue;
+              }
+
             // check whether it is a C/C++ implementation file
             bool isCFile = false;
             if ((*si)->GetLanguage() && (*(*si)->GetLanguage() == 'C'))

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

Summary of changes:
 Source/cmExtraCodeBlocksGenerator.cxx |    7 +++++++
 Source/kwsys/kwsysDateStamp.cmake     |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake