ENH: Merged implementations of ConvertToRelative*Path methods. The main ConvertToRelativePath method is now in cmGlobalGenerator. It converts paths only if they are at least inside the deepest common directory between the top-level source and build trees. Each cmLocalGenerator instance calls this global method with its own output directory as the "local" argument from which paths are relative. Added separate ConvertToOptionallyRelative path that pays attention to the CMAKE_USE_RELATIVE_PATHS option.

1 files changed, 30 insertions, 6 deletions

diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index eaa9a8a..0932c76 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -77,8 +77,35 @@ public:
   /** Get the full name of the target's file, without path.  */
   std::string GetFullTargetName(const char* n, const cmTarget& t);
 
-  std::string ConvertToRelativeOutputPath(const char* p);
-  
+  /**
+   * Convert the given remote path to a relative path with respect to
+   * this generator's output directory.  The remote path must use
+   * forward slashes and not already be escaped or quoted.
+   */
+  std::string ConvertToRelativePath(const char* remote);
+
+  /**
+   * Convert to an output path that is relative to the current output
+   * directory.  The remote path must use forward slashes and not
+   * already be escaped or quoted.
+   */
+  std::string ConvertToRelativeOutputPath(const char* remote);
+
+  /**
+   * Calls ConvertToRelativePath conditionally on the cache option
+   * CMAKE_USE_RELATIVE_PATHS.  The remote path must use forward
+   * slashes and not already be escaped or quoted.
+   */
+  std::string ConvertToOptionallyRelativePath(const char* remote);
+
+  /**
+   * Convert the given path to an output path that is optionally
+   * relative based on the cache option CMAKE_USE_RELATIVE_PATHS.  The
+   * remote path must use forward slashes and not already be escaped
+   * or quoted.
+   */
+  std::string ConvertToOptionallyRelativeOutputPath(const char* remote);
+
   // flag to determine if this project should be included in a parent project
   bool GetExcludeAll()
     {
@@ -156,10 +183,7 @@ protected:
   // members used for relative path function ConvertToMakefilePath
   std::string m_RelativePathToSourceDir;
   std::string m_RelativePathToBinaryDir;
-  std::string m_CurrentOutputDirectory;
-  std::string m_HomeOutputDirectory;
-  std::string m_HomeDirectory;
-  std::string m_HomeOutputDirectoryNoSlash;
+  std::vector<std::string> m_CurrentOutputDirectoryComponents;
   bool m_ExcludeFromAll;
   cmLocalGenerator* m_Parent;
   std::map<cmStdString, cmStdString> m_LanguageToIncludeFlags;