summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-07-12 13:44:38 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-07-12 13:44:38 (GMT)
commit0416c94f6415101e93e9dc3f83d666926ee2da16 (patch)
tree3bf49a6bd00fb0868f90c9c5ee520e0648102f49 /Source
parent4dc515f8e16f0a924fb7f941c1cfe704dea9e785 (diff)
downloadCMake-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')
-rw-r--r--Source/cmComputeLinkInformation.cxx11
-rw-r--r--Source/cmDocumentVariables.cxx10
-rw-r--r--Source/cmFindCommon.cxx24
-rw-r--r--Source/cmLocalGenerator.cxx6
-rw-r--r--Source/cmMakefileExecutableTargetGenerator.cxx16
-rw-r--r--Source/cmMakefileLibraryTargetGenerator.cxx20
-rw-r--r--Source/cmMakefileTargetGenerator.cxx17
-rw-r--r--Source/cmNinjaNormalTargetGenerator.cxx22
-rw-r--r--Source/cmNinjaTargetGenerator.cxx18
9 files changed, 9 insertions, 135 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 0ba0139..ab9eb14 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1884,8 +1884,6 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
}
if(use_build_rpath || use_link_rpath)
{
- std::string rootPath = this->Makefile->GetSafeDefinition("CMAKE_SYSROOT");
- cmSystemTools::ConvertToUnixSlashes(rootPath);
std::vector<std::string> const& rdirs = this->GetRuntimeSearchPath();
for(std::vector<std::string>::const_iterator ri = rdirs.begin();
ri != rdirs.end(); ++ri)
@@ -1909,14 +1907,9 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
!cmSystemTools::IsSubDirectory(ri->c_str(), topSourceDir) &&
!cmSystemTools::IsSubDirectory(ri->c_str(), topBinaryDir))
{
- std::string d = *ri;
- if (d.find(rootPath) == 0)
+ if(emitted.insert(*ri).second)
{
- d = d.substr(rootPath.size());
- }
- if(emitted.insert(d).second)
- {
- runtimeDirs.push_back(d);
+ runtimeDirs.push_back(*ri);
}
}
}
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 0a78ccf..58df66c 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -561,16 +561,6 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
"Variables That Change Behavior");
cm->DefineProperty
- ("CMAKE_SYSROOT", cmProperty::VARIABLE,
- "Path to pass to the compiler in the --sysroot flag.",
- "The CMAKE_SYSROOT content is passed to the compiler in the --sysroot "
- "flag, if supported. The path is also stripped from the RPATH if "
- "necessary on installation. The CMAKE_SYSROOT is also used to prefix "
- "paths searched by the find_* commands.",
- false,
- "Variables That Change Behavior");
-
- cm->DefineProperty
("CMAKE_FIND_LIBRARY_PREFIXES", cmProperty::VARIABLE,
"Prefixes to prepend when looking for libraries.",
"This specifies what prefixes to add to library names when "
diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx
index 5daa47d..b44864e 100644
--- a/Source/cmFindCommon.cxx
+++ b/Source/cmFindCommon.cxx
@@ -62,15 +62,10 @@ void cmFindCommon::GenerateDocumentation()
"The CMake variable CMAKE_FIND_ROOT_PATH specifies one or more "
"directories to be prepended to all other search directories. "
"This effectively \"re-roots\" the entire search under given locations. "
- "By default it is empty. "
- "The variable CMAKE_SYSROOT can also be used to specify exactly one "
- "directory to use as a prefix. Setting CMAKE_SYSROOT also has other "
- "effects. See the documentation for that variable for more. "
- "These are especially useful when "
+ "By default it is empty. It is especially useful when "
"cross-compiling to point to the root directory of the "
"target environment and CMake will search there too. By default at first "
- "the CMAKE_SYSROOT directory is searched, then the directories listed in "
- "CMAKE_FIND_ROOT_PATH and then the non-rooted "
+ "the directories listed in CMAKE_FIND_ROOT_PATH and then the non-rooted "
"directories will be searched. "
"The default behavior can be adjusted by setting "
"CMAKE_FIND_ROOT_PATH_MODE_XXX. This behavior can be manually "
@@ -192,27 +187,16 @@ void cmFindCommon::RerootPaths(std::vector<std::string>& paths)
{
return;
}
- const char* sysroot =
- this->Makefile->GetDefinition("CMAKE_SYSROOT");
const char* rootPath =
this->Makefile->GetDefinition("CMAKE_FIND_ROOT_PATH");
- const bool noSysroot = !sysroot || !*sysroot;
- const bool noRootPath = !rootPath || !*rootPath;
- if(noSysroot && noRootPath)
+ if((rootPath == 0) || (strlen(rootPath) == 0))
{
return;
}
// Construct the list of path roots with no trailing slashes.
std::vector<std::string> roots;
- if (sysroot)
- {
- roots.push_back(sysroot);
- }
- if (rootPath)
- {
- cmSystemTools::ExpandListArgument(rootPath, roots);
- }
+ cmSystemTools::ExpandListArgument(rootPath, roots);
for(std::vector<std::string>::iterator ri = roots.begin();
ri != roots.end(); ++ri)
{
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);
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 271183e..e4219a9 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -365,22 +365,6 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
vars.TargetVersionMajor = targetVersionMajor.c_str();
vars.TargetVersionMinor = targetVersionMinor.c_str();
- if (const char *rootPath =
- this->Makefile->GetDefinition("CMAKE_SYSROOT"))
- {
- if (*rootPath)
- {
- if (const char *sysrootFlag =
- this->Makefile->GetDefinition("CMAKE_SYSROOT_FLAG"))
- {
- flags += " ";
- flags += sysrootFlag;
- flags += this->LocalGenerator->EscapeForShell(rootPath);
- flags += " ";
- }
- }
- }
-
vars.LinkLibraries = linkLibs.c_str();
vars.Flags = flags.c_str();
vars.LinkFlags = linkFlags.c_str();
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 36d1a5a..347f26d 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -589,26 +589,6 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
cmLocalGenerator::SHELL);
vars.ObjectDir = objdir.c_str();
vars.Target = targetOutPathReal.c_str();
-
- if(this->Target->GetType() == cmTarget::SHARED_LIBRARY)
- {
- if (const char *rootPath =
- this->Makefile->GetSafeDefinition("CMAKE_SYSROOT"))
- {
- if (*rootPath)
- {
- if (const char *sysrootFlag =
- this->Makefile->GetDefinition("CMAKE_SYSROOT_FLAG"))
- {
- linkFlags += " ";
- linkFlags += sysrootFlag;
- linkFlags += this->LocalGenerator->EscapeForShell(rootPath);
- linkFlags += " ";
- }
- }
- }
- }
-
vars.LinkLibraries = linkLibs.c_str();
vars.ObjectsQuoted = buildObjs.c_str();
if (this->Target->HasSOName(this->ConfigName))
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 1492dfa..513b8e3 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -644,23 +644,6 @@ cmMakefileTargetGenerator
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::SHELL);
vars.ObjectDir = objectDir.c_str();
-
- if (const char *rootPath =
- this->Makefile->GetSafeDefinition("CMAKE_SYSROOT"))
- {
- if (*rootPath)
- {
- if (const char *sysrootFlag =
- this->Makefile->GetDefinition("CMAKE_SYSROOT_FLAG"))
- {
- flags += " ";
- flags += sysrootFlag;
- flags += this->LocalGenerator->EscapeForShell(rootPath);
- flags += " ";
- }
- }
- }
-
vars.Flags = flags.c_str();
std::string definesString = "$(";
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 921ca92..fa7e396 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -224,27 +224,7 @@ cmNinjaNormalTargetGenerator
vars.TargetVersionMajor = targetVersionMajor.c_str();
vars.TargetVersionMinor = targetVersionMinor.c_str();
-
- std::string flags = "$FLAGS";
-
- if (const char *rootPath =
- this->GetMakefile()->GetSafeDefinition("CMAKE_SYSROOT"))
- {
- if (*rootPath)
- {
- if (const char *sysrootFlag =
- this->GetMakefile()->GetDefinition("CMAKE_SYSROOT_FLAG"))
- {
- flags += " ";
- flags += sysrootFlag;
- flags += this->GetLocalGenerator()->EscapeForShell(rootPath);
- flags += " ";
- }
- }
- }
-
- vars.Flags = flags.c_str();
-
+ vars.Flags = "$FLAGS";
vars.LinkFlags = "$LINK_FLAGS";
std::string langFlags;
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 65173ca..2efc4bd 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -384,23 +384,7 @@ cmNinjaTargetGenerator
cmSystemTools::ReplaceString(depFlagsStr, "<CMAKE_C_COMPILER>",
mf->GetDefinition("CMAKE_C_COMPILER"));
flags += " " + depFlagsStr;
-
- if (const char *rootPath =
- this->Makefile->GetSafeDefinition("CMAKE_SYSROOT"))
- {
- if (*rootPath)
- {
- if (const char *sysrootFlag =
- this->Makefile->GetDefinition("CMAKE_SYSROOT_FLAG"))
- {
- flags += " ";
- flags += sysrootFlag;
- flags += this->LocalGenerator->EscapeForShell(rootPath);
- flags += " ";
- }
- }
- }
- }
+ }
vars.Flags = flags.c_str();