[Cmake-commits] CMake branch, next, updated. v2.8.11-2136-g90bf98a

[Clinton Stimpson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  90bf98a934610c8f3ce351a8ee9595f87d6cf7a4 (commit)
       via  94ee14e8d8c6fe2f3585652150665f0720124176 (commit)
      from  13bfc75547b029c1ac9b89506f6c543084ef627d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90bf98a934610c8f3ce351a8ee9595f87d6cf7a4
commit 90bf98a934610c8f3ce351a8ee9595f87d6cf7a4
Merge: 13bfc75 94ee14e
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue May 21 23:52:49 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 21 23:52:49 2013 -0400

    Merge topic 'framework-refactor' into next
    
    94ee14e Fix KWStyle warnings.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=94ee14e8d8c6fe2f3585652150665f0720124176
commit 94ee14e8d8c6fe2f3585652150665f0720124176
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue May 21 21:43:36 2013 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Tue May 21 21:43:36 2013 -0600

    Fix KWStyle warnings.
    
    Also reverting a hunk from 355fca64.

diff --git a/Source/cmOSXBundleGenerator.h b/Source/cmOSXBundleGenerator.h
index c74596a..6cf81d2 100644
--- a/Source/cmOSXBundleGenerator.h
+++ b/Source/cmOSXBundleGenerator.h
@@ -35,7 +35,8 @@ public:
   void CreateAppBundle(const std::string& targetName, std::string& root);
 
   // create a framework at a given root
-  void CreateFramework(const std::string& targetName, const std::string& outpath);
+  void CreateFramework(const std::string& targetName,
+                       const std::string& root);
 
   // create a cf bundle at a given root and return the
   // directory within the bundle that contains the library
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 8a71afe..e2f80d1 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -3208,10 +3208,7 @@ bool cmake::SymlinkInternal(std::string const& file, std::string const& link)
 #if defined(_WIN32) && !defined(__CYGWIN__)
   return cmSystemTools::CopyFileAlways(file.c_str(), link.c_str());
 #else
-  std::string link_abs = "/" + link;
-  link_abs = cmSystemTools::GetFilenamePath(link_abs);
-  std::string file_abs = "/" + file;
-  std::string linktext = cmSystemTools::RelativePath(link_abs.c_str(), file_abs.c_str());
+  std::string linktext = cmSystemTools::GetFilenameName(file);
   return cmSystemTools::CreateSymlink(linktext.c_str(), link.c_str());
 #endif
 }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmOSXBundleGenerator.h |    3 ++-
 Source/cmake.cxx              |    5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake