diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-24 13:37:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-05-24 15:40:35 (GMT) |
| commit | a896043bacdd0cb2597fa10074302ed8a9a5e138 (patch) | |
| tree | bf722b16e813d7604fe712734a58236a72566dcb /Source | |
| parent | 7807b3a9db35acd683fd82c6d902272991a9789a (diff) | |
| download | CMake-a896043bacdd0cb2597fa10074302ed8a9a5e138.zip CMake-a896043bacdd0cb2597fa10074302ed8a9a5e138.tar.gz CMake-a896043bacdd0cb2597fa10074302ed8a9a5e138.tar.bz2 | |
GHS: Compute include directories consistently with other generators
All generators use cmLocalGenerator::GetIncludeDirectories to construct
the final list of include directories for a target.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGhsMultiTargetGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx index 5e13d4c..8565fdb 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -322,8 +322,10 @@ void cmGhsMultiTargetGenerator::WriteCompilerDefinitions( void cmGhsMultiTargetGenerator::WriteIncludes(const std::string& config, const std::string& language) { - std::vector<std::string> includes = - this->GeneratorTarget->GetIncludeDirectories(config, language); + std::vector<std::string> includes; + this->LocalGenerator->GetIncludeDirectories(includes, this->GeneratorTarget, + language, config); + for (std::vector<std::string>::const_iterator includes_i = includes.begin(); includes_i != includes.end(); ++includes_i) { *this->GetFolderBuildStreams() << " -I\"" << *includes_i << "\"" |