diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-07-12 13:44:38 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-07-12 13:44:38 (GMT) |
| commit | 0416c94f6415101e93e9dc3f83d666926ee2da16 (patch) | |
| tree | 3bf49a6bd00fb0868f90c9c5ee520e0648102f49 /Source/cmLocalGenerator.cxx | |
| parent | 4dc515f8e16f0a924fb7f941c1cfe704dea9e785 (diff) | |
| download | CMake-0416c94f6415101e93e9dc3f83d666926ee2da16.zip CMake-0416c94f6415101e93e9dc3f83d666926ee2da16.tar.gz CMake-0416c94f6415101e93e9dc3f83d666926ee2da16.tar.bz2 | |
Revert "Use --sysroot when cross compiling."
This reverts commit de4da665d3205afa239749c41513a315c3831f51.
This feature is not yet ready for release. It needs to be
merged with the CMAKE_OSX_SYSROOT feature.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 00846d5..7ca8110 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1467,8 +1467,6 @@ 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_"; @@ -1481,9 +1479,7 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs, for(std::vector<std::string>::const_iterator i = impDirVec.begin(); i != impDirVec.end(); ++i) { - std::string d = rootPath + *i; - cmSystemTools::ConvertToUnixSlashes(d); - emitted.insert(d); + emitted.insert(*i); if (!stripImplicitInclDirs) { implicitDirs.push_back(*i); |