[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1450-g5481c26

[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  5481c267c3ff15008b2f71a46a39c454d64ef28a (commit)
       via  90e22f8f713cb90f2020942cc168badedd6176e1 (commit)
       via  a29ea834de49cfcbf9b28e4403fd45f0c559bb06 (commit)
      from  10875553da2862eec0bc56d6c302eb7d14e69e51 (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=5481c267c3ff15008b2f71a46a39c454d64ef28a
commit 5481c267c3ff15008b2f71a46a39c454d64ef28a
Merge: 1087555 90e22f8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 26 11:04:45 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 26 11:04:45 2014 -0400

    Merge topic 'osx-CFBundle-info-plist' into next
    
    90e22f8f OS X: Fix Info.plist placement in a CFBundle
    a29ea834 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90e22f8f713cb90f2020942cc168badedd6176e1
commit 90e22f8f713cb90f2020942cc168badedd6176e1
Author:     Tim Blechmann <tim at klingt.org>
AuthorDate: Tue Mar 25 16:16:51 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 26 10:52:23 2014 -0400

    OS X: Fix Info.plist placement in a CFBundle
    
    Fix cmOSXBundleGenerator::CreateCFBundle to place Info.plist under the
    same root directory as the rest of the bundle.  Without this, Info.plist
    was placed into CMAKE_BINARY_DIR, not CMAKE_CURRENT_BINARY_DIR because
    the target path was not generated correctly.

diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 6f16913..786e6e2 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -178,7 +178,7 @@ void cmOSXBundleGenerator::CreateCFBundle(const std::string& targetName,
 
   // Configure the Info.plist file.  Note that it needs the executable name
   // to be set.
-  std::string plist =
+  std::string plist = root + "/" +
     this->GT->Target->GetCFBundleDirectory(this->ConfigName, true);
   plist += "/Info.plist";
   this->LocalGenerator->GenerateAppleInfoPList(this->GT->Target,

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

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


hooks/post-receive
-- 
CMake