summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorEnrico Bedau <rikky@web.de>2016-06-16 06:39:07 (GMT)
committerBrad King <brad.king@kitware.com>2016-06-16 13:55:29 (GMT)
commitafd6cc6b923af63faebe9ccbad3a8ccd950e1782 (patch)
tree9c728fb5b4b51ebd7bf930bae05e539167713442 /Source
parent83ae79442c8bc16cca72977e0671845efe191696 (diff)
downloadCMake-afd6cc6b923af63faebe9ccbad3a8ccd950e1782.zip
CMake-afd6cc6b923af63faebe9ccbad3a8ccd950e1782.tar.gz
CMake-afd6cc6b923af63faebe9ccbad3a8ccd950e1782.tar.bz2
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.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmExtraCodeBlocksGenerator.cxx6
1 files changed, 4 insertions, 2 deletions
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;
}