Several fixes/improvements:

  - Fixed CollapseFullPath to work on relative paths with base paths
    not in the current working directory.
  - INCLUDE command now supports relative paths (using above fix).
  - Added ABSOLUTE option to GET_FILENAME_COMPONENT command to
    unwind symlinks and relative paths.
  - Fixed libName_EXPORTS macro definition to be valid C identifier.
  - Added DEFINE_SYMBOL target propterty for customizing the export symbol.
  - Implemented LINK_FLAGS target propterty for libraries in VC6 and VC7.

Several of these fixes were contributed by Gareth Jones.

1 files changed, 13 insertions, 2 deletions

diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index 3cd3321..e513733 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -29,6 +29,15 @@ class cmSystemTools
 {
 public:
   /**
+   * Replace symbols in str that are not valid in C identifiers as
+   * defined by the 1999 standard, ie. anything except [A-Za-z0-9_].
+   * They are replaced with `_' and if the first character is a digit
+   * then an underscore is prepended.  Note that this can produce
+   * identifiers that the standard reserves (_[A-Z].* and __.*).
+   */
+  static std::string MakeCindentifier(const char* s);
+  
+  /**
    * Make a new directory if it is not there.  This function
    * can make a full path even if none of the directories existed
    * prior to calling this function.  
@@ -256,8 +265,10 @@ public:
   static void SplitProgramPath(const char* in_name, 
                                std::string& dir, 
                                std::string& file);
-  static std::string CollapseFullPath(const char*);
-
+  static std::string CollapseFullPath(const char* in_relative);
+  static std::string CollapseFullPath(const char* in_relative,
+                                      const char* in_base);
+  
   ///! return path of a full filename (no trailing slashes).
   static std::string GetFilenamePath(const std::string&);