diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-01-25 08:26:35 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-02-07 09:03:30 (GMT) |
| commit | 1714c27a74c1616e5998a1a51fe42848a1f1c389 (patch) | |
| tree | 8bf6e0dd9228f7acc50697ea75c1c8fd941b9c23 /Source/cmLocalGenerator.cxx | |
| parent | 2ce7231f56807b62917e6da1336f033d5386694a (diff) | |
| download | CMake-1714c27a74c1616e5998a1a51fe42848a1f1c389.zip CMake-1714c27a74c1616e5998a1a51fe42848a1f1c389.tar.gz CMake-1714c27a74c1616e5998a1a51fe42848a1f1c389.tar.bz2 | |
Process generator expressions for 'system' include directories.
Since commit 08cb4fa4 (Process generator expressions in the
INCLUDE_DIRECTORIES property., 2012-09-18), it is possible to use
generator expressions with the include_directories command.
As that command can also have a SYSTEM argument, ensure that the
result of using that argument with generator expressions gives a
sane result.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index ecf6b41..dc39fdc 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1212,7 +1212,8 @@ cmLocalGenerator::ConvertToIncludeReference(std::string const& path) //---------------------------------------------------------------------------- std::string cmLocalGenerator::GetIncludeFlags( const std::vector<std::string> &includes, - const char* lang, bool forResponseFile) + const char* lang, bool forResponseFile, + const char *config) { if(!lang) { @@ -1285,7 +1286,7 @@ std::string cmLocalGenerator::GetIncludeFlags( if(!flagUsed || repeatFlag) { if(sysIncludeFlag && - this->Makefile->IsSystemIncludeDirectory(i->c_str())) + this->Makefile->IsSystemIncludeDirectory(i->c_str(), config)) { includeFlags << sysIncludeFlag; } |