diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-24 12:46:12 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-24 12:46:12 (GMT) |
| commit | b2d70c1a20caf8011a1cc8b9fe5fb59a614dd959 (patch) | |
| tree | ea4bfbb83021fe81c54bd857c7dc8183ea4fb1f6 /Source/cmLocalGenerator.cxx | |
| parent | 059be4ba3b8af00f3615726ba8d3ff485e2fcef4 (diff) | |
| parent | de4da665d3205afa239749c41513a315c3831f51 (diff) | |
| download | CMake-b2d70c1a20caf8011a1cc8b9fe5fb59a614dd959.zip CMake-b2d70c1a20caf8011a1cc8b9fe5fb59a614dd959.tar.gz CMake-b2d70c1a20caf8011a1cc8b9fe5fb59a614dd959.tar.bz2 | |
Merge topic 'set-sysroot'
de4da66 Use --sysroot when cross compiling.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index a72d9cf..f943161 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1425,6 +1425,8 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs, return; } + std::string rootPath = this->Makefile->GetSafeDefinition("CMAKE_SYSROOT"); + std::vector<std::string> implicitDirs; // Load implicit include directories for this language. std::string impDirVar = "CMAKE_"; @@ -1437,7 +1439,9 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs, for(std::vector<std::string>::const_iterator i = impDirVec.begin(); i != impDirVec.end(); ++i) { - emitted.insert(*i); + std::string d = rootPath + *i; + cmSystemTools::ConvertToUnixSlashes(d); + emitted.insert(d); if (!stripImplicitInclDirs) { implicitDirs.push_back(*i); |