summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-06-01 17:56:46 (GMT)
committerBrad King <brad.king@kitware.com>2015-06-03 15:43:31 (GMT)
commit1335992c8f4e8b96f1a21d5dcc7d65a9fbd84c11 (patch)
tree1270246f8d0c3779feb4fc002a2fe3b68bd537d5 /Source/cmLocalGenerator.cxx
parentd3bb5da9294ddbfcc5fddf7ba3dafd2c3e0b32b2 (diff)
downloadCMake-1335992c8f4e8b96f1a21d5dcc7d65a9fbd84c11.zip
CMake-1335992c8f4e8b96f1a21d5dcc7d65a9fbd84c11.tar.gz
CMake-1335992c8f4e8b96f1a21d5dcc7d65a9fbd84c11.tar.bz2
Remove CMAKE_USE_RELATIVE_PATHS variable.
The test for this variable was removed in commit v2.8.8~330^2~7 (complex: Remove ancient unused ComplexRelativePaths test, 2011-12-23). Commit v3.1.0-rc1~425^2~2 (backtrace: Convert to local paths in IssueMessage, 2014-03-12) appears to have accidentally made some backtraces print relative paths with the variable because conversions which used to be done at configure time, before the variable had an effect are now potentially done at generate time. The documentation of the variable says not to use it, and the docs are wrong in that the variable actually applies in per-directory scope. The read of the variable makes it harder to split conversion methods from cmLocalGenerator where they don't belong. Remove it now.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r--Source/cmLocalGenerator.cxx9
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index eb6b871..84461b1 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -59,7 +59,6 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
this->Makefile = new cmMakefile(this);
this->LinkScriptShell = false;
- this->UseRelativePaths = false;
this->Configured = false;
this->EmitUniversalBinaryFlags = true;
this->BackwardsCompatibility = 0;
@@ -137,10 +136,6 @@ void cmLocalGenerator::Configure()
this->Makefile->AddCMakeDependFilesFromUser();
- // Check whether relative paths should be used for optionally
- // relative paths.
- this->UseRelativePaths = this->Makefile->IsOn("CMAKE_USE_RELATIVE_PATHS");
-
this->ComputeObjectMaxPath();
this->Configured = true;
@@ -2705,7 +2700,7 @@ std::string cmLocalGenerator::Convert(const std::string& source,
// Convert the path to a relative path.
std::string result = source;
- if (!optional || this->UseRelativePaths)
+ if (!optional)
{
switch (relative)
{
@@ -2786,7 +2781,7 @@ std::string cmLocalGenerator::Convert(RelativeRoot remote,
// The relative root must have a path (i.e. not FULL or NONE)
assert(remotePath != 0);
- if(!local.empty() && (!optional || this->UseRelativePaths))
+ if(!local.empty() && !optional)
{
std::vector<std::string> components;
cmSystemTools::SplitPath(local, components);