[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-340-g18ebcf2

[Brad King]

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  18ebcf28426e7d5b80b5005d1505588566009697 (commit)
       via  afd6cc6b923af63faebe9ccbad3a8ccd950e1782 (commit)
      from  b8ae6f14b838e364960540bc51c88f751e88395e (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=18ebcf28426e7d5b80b5005d1505588566009697
commit 18ebcf28426e7d5b80b5005d1505588566009697
Merge: b8ae6f1 afd6cc6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 16 09:56:18 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 16 09:56:18 2016 -0400

    Merge topic 'CodeBlocks-generated-sources' into next
    
    afd6cc6b CodeBlocks: Show generated files in non-utility targets


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afd6cc6b923af63faebe9ccbad3a8ccd950e1782
commit afd6cc6b923af63faebe9ccbad3a8ccd950e1782
Author:     Enrico Bedau <rikky at web.de>
AuthorDate: Thu Jun 16 08:39:07 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 16 09:55:29 2016 -0400

    CodeBlocks: Show generated files in non-utility targets
    
    Since 2.6.3 the UTILITY target may have source files. A defect was filed
    that these files are now visible in the source tree. A fix later removed
    all generated files from the source tree, regardless of the target type.
    You can't even include them by using the SOURCES option. This fix adds
    generated files again, except for the UTILITY target which cluttered the
    source tree.
    
    Fixes #14272.

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 8c656b9..28d1d48 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -376,8 +376,10 @@ void cmExtraCodeBlocksGenerator::CreateNewProjectFile(
                              makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           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")) {
+            // don't add source files from UTILITY target which have the
+            // GENERATED property set:
+            if (gt->GetType() == cmState::UTILITY &&
+                (*si)->GetPropertyAsBool("GENERATED")) {
               continue;
             }
 

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

Summary of changes:
 Source/cmExtraCodeBlocksGenerator.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake