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 d47c6c0bd03502146f6cedbbcd6806c050bbd5d7 (commit)
via db2fb6973014939db1b844b7a20b80ff25a90e79 (commit)
via 563b24c8dd998311e9cd76c8c212e5452b8c8615 (commit)
from a3d8a241d07a0c2de01e76bbea77429389cfc900 (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=d47c6c0bd03502146f6cedbbcd6806c050bbd5d7
commit d47c6c0bd03502146f6cedbbcd6806c050bbd5d7
Merge: a3d8a24 db2fb69
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Sun Jan 20 06:59:55 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Jan 20 06:59:55 2013 -0500
Merge topic 'clean-include-dirs-debugging' into next
db2fb69 Specify the target whose includes are being listed.
563b24c Only output includes once after the start of 'generate-time' when
debugging.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db2fb6973014939db1b844b7a20b80ff25a90e79
commit db2fb6973014939db1b844b7a20b80ff25a90e79
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Sun Jan 20 12:57:25 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Sun Jan 20 12:59:13 2013 +0100
Specify the target whose includes are being listed.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index fb99b4a..6c9ed1b 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2785,8 +2785,8 @@ std::vector<std::string>
cmTarget::GetIncludeDirectories(const char *config)
if (!usedIncludes.empty())
{
this->Makefile->GetCMakeInstance()->IssueMessage(cmake::LOG,
- "Used includes:\n" + usedIncludes,
- (*it)->ge->GetBacktrace());
+ "Used includes for target " + this->Name + ":\n"
+ + usedIncludes, (*it)->ge->GetBacktrace());
}
}
return includes;
diff --git a/Tests/RunCMake/include_directories/DebugIncludes-stderr.txt
b/Tests/RunCMake/include_directories/DebugIncludes-stderr.txt
index ab99784..379174a 100644
--- a/Tests/RunCMake/include_directories/DebugIncludes-stderr.txt
+++ b/Tests/RunCMake/include_directories/DebugIncludes-stderr.txt
@@ -1,5 +1,5 @@
CMake Warning at DebugIncludes.cmake:8 \(include_directories\):
- Used includes:
+ Used includes for target lll:
\* .*/Tests/RunCMake/include_directories/one
\* .*/Tests/RunCMake/include_directories/two
@@ -8,7 +8,7 @@ Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
+
CMake Warning at DebugIncludes.cmake:13 \(set_property\):
- Used includes:
+ Used includes for target lll:
\* .*/Tests/RunCMake/include_directories/three
@@ -16,7 +16,7 @@ Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
+
CMake Warning at DebugIncludes.cmake:18 \(include_directories\):
- Used includes:
+ Used includes for target lll:
\* .*/Tests/RunCMake/include_directories/four
@@ -24,7 +24,7 @@ Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
+
CMake Warning at DebugIncludes.cmake:25 \(set_property\):
- Used includes:
+ Used includes for target lll:
\* .*/Tests/RunCMake/include_directories/five
\* .*/Tests/RunCMake/include_directories/six
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=563b24c8dd998311e9cd76c8c212e5452b8c8615
commit 563b24c8dd998311e9cd76c8c212e5452b8c8615
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Sun Jan 20 12:50:53 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Sun Jan 20 12:58:56 2013 +0100
Only output includes once after the start of 'generate-time' when debugging.
During configure-time, GetIncludeDirectories may be called too, for example
if using the export() command. As the content can be different, it should
be output each time then.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d2baf53..f28bd6c 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -980,6 +980,7 @@ void cmGlobalGenerator::Generate()
// Generate project files
for (i = 0; i < this->LocalGenerators.size(); ++i)
{
+ this->LocalGenerators[i]->GetMakefile()->SetGeneratingBuildSystem();
this->SetCurrentLocalGenerator(this->LocalGenerators[i]);
this->LocalGenerators[i]->Generate();
this->LocalGenerators[i]->GenerateInstallRules();
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 602cf07..f5aa932 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -99,6 +99,7 @@ cmMakefile::cmMakefile(): Internal(new Internals)
this->AddDefaultDefinitions();
this->Initialize();
this->PreOrder = false;
+ this->GeneratingBuildSystem = false;
}
cmMakefile::cmMakefile(const cmMakefile& mf): Internal(new Internals)
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index bb161b1..a2783f2 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -870,6 +870,9 @@ public:
return this->IncludeDirectoriesEntries;
}
+ bool IsGeneratingBuildSystem(){ return this->GeneratingBuildSystem; }
+ void SetGeneratingBuildSystem(){ this->GeneratingBuildSystem = true; }
+
protected:
// add link libraries and directories to the target
void AddGlobalLinkInformation(const char* name, cmTarget& target);
@@ -1019,6 +1022,9 @@ private:
// Enforce rules about CMakeLists.txt files.
void EnforceDirectoryLevelRules();
+
+ bool GeneratingBuildSystem;
+
};
//----------------------------------------------------------------------------
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 815da40..fb99b4a 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -151,6 +151,7 @@ cmTarget::cmTarget()
this->IsApple = false;
this->IsImportedTarget = false;
this->BuildInterfaceIncludesAppended = false;
+ this->DebugIncludesDone = false;
}
//----------------------------------------------------------------------------
@@ -2739,11 +2740,17 @@ std::vector<std::string>
cmTarget::GetIncludeDirectories(const char *config)
cmSystemTools::ExpandListArgument(debugProp, debugProperties);
}
- bool debugIncludes = std::find(debugProperties.begin(),
+ bool debugIncludes = !this->DebugIncludesDone
+ && std::find(debugProperties.begin(),
debugProperties.end(),
"INCLUDE_DIRECTORIES")
!= debugProperties.end();
+ if (this->Makefile->IsGeneratingBuildSystem())
+ {
+ this->DebugIncludesDone = true;
+ }
+
for (std::vector<cmTargetInternals::IncludeDirectoriesEntry*>::const_iterator
it = this->Internal->IncludeDirectoriesEntries.begin(),
end = this->Internal->IncludeDirectoriesEntries.end();
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 69a00c1..47ec528 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -610,6 +610,7 @@ private:
bool DLLPlatform;
bool IsApple;
bool IsImportedTarget;
+ bool DebugIncludesDone;
mutable std::map<cmStdString, std::set<std::string> >
LinkDependentProperties;
mutable std::set<std::string> LinkImplicitNullProperties;
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalGenerator.cxx | 1 +
Source/cmMakefile.cxx | 1 +
Source/cmMakefile.h | 6 ++++++
Source/cmTarget.cxx | 13 ++++++++++---
Source/cmTarget.h | 1 +
.../include_directories/DebugIncludes-stderr.txt | 8 ++++----
6 files changed, 23 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
