BUG: Changing to a new test for whether to do relative path conversion. Now only paths inside the source or binary trees are converted.

1 files changed, 7 insertions, 4 deletions

diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index c72ab67..8b35116 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -171,10 +171,13 @@ private:
   std::map<cmStdString, cmStdString> m_ExtensionToLanguage;
   std::map<cmStdString, cmStdString> m_LanguageToLinkerPreference; 
 
-  // The prefix required of a path to be converted to a relative path.
-  // No sequence of ../.. will ever go past this path.  This is the
-  // longest common path between the top level source and build trees.
-  std::string m_RelativePathTop;
+  // The paths to the tops of the source and binary trees used for
+  // relative path computation.  A path must be either in the source
+  // tree or the build tree to be converted to a relative path.  The
+  // ConfigureRelativePaths method may set these to be empty when
+  // using relative paths is unsafe.
+  std::string m_RelativePathTopSource;
+  std::string m_RelativePathTopBinary;
 };
 
 #endif