diff options
author | Brad King <brad.king@kitware.com> | 2006-10-05 12:55:59 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2006-10-05 12:55:59 (GMT) |
commit | c11cf31c9b70b21ba171bb2682ea5304e8d00de8 (patch) | |
tree | 3d6aaf2ef210a0a725346db4b708240d06edc06f /Source/cmMakefile.cxx | |
parent | e36eb719135b8c5ce6ff317614df5e0d961718f2 (diff) | |
download | CMake-c11cf31c9b70b21ba171bb2682ea5304e8d00de8.zip CMake-c11cf31c9b70b21ba171bb2682ea5304e8d00de8.tar.gz CMake-c11cf31c9b70b21ba171bb2682ea5304e8d00de8.tar.bz2 |
ENH: Adding SYSTEM option to INCLUDE_DIRECTORIES command. This addresses bug #3462.
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r-- | Source/cmMakefile.cxx | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 226f5d5..88f55dd 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -106,6 +106,7 @@ cmMakefile::cmMakefile(const cmMakefile& mf) this->Tests = mf.Tests; this->IncludeDirectories = mf.IncludeDirectories; this->LinkDirectories = mf.LinkDirectories; + this->SystemIncludeDirectories = mf.SystemIncludeDirectories; this->ListFiles = mf.ListFiles; this->OutputFiles = mf.OutputFiles; this->LinkLibraries = mf.LinkLibraries; @@ -1025,6 +1026,7 @@ void cmMakefile::InitializeFromParent() // copy include paths this->IncludeDirectories = parent->IncludeDirectories; + this->SystemIncludeDirectories = parent->SystemIncludeDirectories; // define flags this->DefineFlags = parent->DefineFlags; @@ -1150,6 +1152,19 @@ void cmMakefile::AddIncludeDirectory(const char* inc, bool before) } } +//---------------------------------------------------------------------------- +void cmMakefile::AddSystemIncludeDirectory(const char* dir) +{ + this->SystemIncludeDirectories.insert(dir); +} + +//---------------------------------------------------------------------------- +bool cmMakefile::IsSystemIncludeDirectory(const char* dir) +{ + return (this->SystemIncludeDirectories.find(dir) != + this->SystemIncludeDirectories.end()); +} + void cmMakefile::AddDefinition(const char* name, const char* value) { if (!value ) |