[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-643-g8585172

[Brad King]

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  85851721aab04bb870f8918b50807f138bae7c8e (commit)
       via  78ec4b16400111cab7cc0de3e7544b1b071b2abe (commit)
      from  2746af6cc62a2b4b3f9761b9b838319411822b78 (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=85851721aab04bb870f8918b50807f138bae7c8e
commit 85851721aab04bb870f8918b50807f138bae7c8e
Merge: 2746af6 78ec4b1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 13:13:02 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 13:13:02 2015 -0500

    Merge topic 'osx-CFBundleExecutable' into next
    
    78ec4b16 OS X: Shorten CFBundleExecutable to file name only


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78ec4b16400111cab7cc0de3e7544b1b071b2abe
commit 78ec4b16400111cab7cc0de3e7544b1b071b2abe
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Feb 22 19:00:10 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 13:07:33 2015 -0500

    OS X: Shorten CFBundleExecutable to file name only
    
    Shorten the CFBundleExecutable in the PList file of Bundles to
    the file name only as it is done for Frameworks, too.
    
    Signed-off-by: Gregor Jasny <gjasny at googlemail.com>

diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 55e20ab..a8eef82 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -181,8 +181,9 @@ void cmOSXBundleGenerator::CreateCFBundle(const std::string& targetName,
   std::string plist = root + "/" +
     this->GT->Target->GetCFBundleDirectory(this->ConfigName, true);
   plist += "/Info.plist";
+  std::string name = cmSystemTools::GetFilenameName(targetName);
   this->LocalGenerator->GenerateAppleInfoPList(this->GT->Target,
-                                               targetName,
+                                               name,
                                                plist.c_str());
   this->Makefile->AddCMakeOutputFile(plist);
 }

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

Summary of changes:
 Source/cmOSXBundleGenerator.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake