summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.h
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-01-24 16:54:46 (GMT)
committerDavid Cole <david.cole@kitware.com>2012-02-22 11:31:49 (GMT)
commit8adaee2b0b2651cfd93bb4a915d11bdd4cba1b51 (patch)
tree6d4be7d67b3ee2ba398f928cc45284dcd6914b7e /Source/cmMakefile.h
parent7620932d8259572dc737d97cec83779efadab5a3 (diff)
downloadCMake-8adaee2b0b2651cfd93bb4a915d11bdd4cba1b51.zip
CMake-8adaee2b0b2651cfd93bb4a915d11bdd4cba1b51.tar.gz
CMake-8adaee2b0b2651cfd93bb4a915d11bdd4cba1b51.tar.bz2
CMake: Eliminate cmMakefile::IncludeDirectories
Instead, re-implement it in terms of the directory property INCLUDE_DIRECTORIES.
Diffstat (limited to 'Source/cmMakefile.h')
-rw-r--r--Source/cmMakefile.h17
1 files changed, 2 insertions, 15 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 1c46a73..5e5310f 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -524,18 +524,7 @@ public:
/**
* Get a list of include directories in the build.
*/
- std::vector<std::string>& GetIncludeDirectories()
- {
- return this->IncludeDirectories;
- }
- const std::vector<std::string>& GetIncludeDirectories() const
- {
- return this->IncludeDirectories;
- }
- void SetIncludeDirectories(const std::vector<std::string>& vec)
- {
- this->IncludeDirectories = vec;
- }
+ std::vector<std::string> GetIncludeDirectories();
/**
* Mark include directories as system directories.
@@ -880,9 +869,7 @@ protected:
// Tests
std::map<cmStdString, cmTest*> Tests;
- // The include and link-library paths. These may have order
- // dependency, so they must be vectors (not set).
- std::vector<std::string> IncludeDirectories;
+ // The link-library paths. Order matters, use std::vector (not std::set).
std::vector<std::string> LinkDirectories;
// The set of include directories that are marked as system include