diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-02-12 09:35:28 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-02-12 09:39:35 (GMT) |
| commit | 5b88504f650c7bcd3d404853b26292b50fa6f141 (patch) | |
| tree | f628cdf768e2549b7569edacb0eb4cb759f03471 /Source/cmMakefile.h | |
| parent | b030323c133155c57437527d04ca2ba619663f6d (diff) | |
| download | CMake-5b88504f650c7bcd3d404853b26292b50fa6f141.zip CMake-5b88504f650c7bcd3d404853b26292b50fa6f141.tar.gz CMake-5b88504f650c7bcd3d404853b26292b50fa6f141.tar.bz2 | |
Rename the IncludeDirectoriesEntry to be more generic.
Diffstat (limited to 'Source/cmMakefile.h')
| -rw-r--r-- | Source/cmMakefile.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index c0020bf..74a731d 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -22,7 +22,6 @@ #include "cmNewLineStyle.h" #include "cmGeneratorTarget.h" #include "cmake.h" -#include "cmMakefileIncludeDirectoriesEntry.h" #if defined(CMAKE_BUILD_WITH_CMAKE) #include "cmSourceGroup.h" @@ -863,9 +862,7 @@ public: /** Set whether or not to report a CMP0000 violation. */ void SetCheckCMP0000(bool b) { this->CheckCMP0000 = b; } - typedef cmMakefileIncludeDirectoriesEntry IncludeDirectoriesEntry; - - std::vector<IncludeDirectoriesEntry> GetIncludeDirectoriesEntries() const + std::vector<cmValueWithOrigin> GetIncludeDirectoriesEntries() const { return this->IncludeDirectoriesEntries; } @@ -921,7 +918,7 @@ protected: std::vector<std::string> HeaderFileExtensions; std::string DefineFlags; - std::vector<IncludeDirectoriesEntry> IncludeDirectoriesEntries; + std::vector<cmValueWithOrigin> IncludeDirectoriesEntries; // Track the value of the computed DEFINITIONS property. void AddDefineFlag(const char*, std::string&); |