diff options
author | Stephen Kelly <steveire@gmail.com> | 2013-01-20 11:50:53 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2013-01-21 08:12:22 (GMT) |
commit | d70204a86aa3e454e73049efda3e1ccea8c60720 (patch) | |
tree | 45bc8dd5a0184c82be312492e20eed5c99a7d146 /Source/cmTarget.cxx | |
parent | 0d46e9a0297d78dabc9988604a15c0096c702855 (diff) | |
download | CMake-d70204a86aa3e454e73049efda3e1ccea8c60720.zip CMake-d70204a86aa3e454e73049efda3e1ccea8c60720.tar.gz CMake-d70204a86aa3e454e73049efda3e1ccea8c60720.tar.bz2 |
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.
Diffstat (limited to 'Source/cmTarget.cxx')
-rw-r--r-- | Source/cmTarget.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
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(); |