[Cmake-commits] CMake branch, next, updated. v3.0.1-4804-ga3a81de

[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  a3a81ded931ccffe858bcc284789f3521ea5c9c2 (commit)
       via  810f5ccefc113987fc6f68c073ab9c84fc278b32 (commit)
      from  0e3015f3add67ecd9596b3805f42a9388fbf2db0 (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=a3a81ded931ccffe858bcc284789f3521ea5c9c2
commit a3a81ded931ccffe858bcc284789f3521ea5c9c2
Merge: 0e3015f 810f5cc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 7 13:59:37 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 7 13:59:37 2014 -0400

    Merge topic 'BundleUtilities-os9-newlines' into next
    
    810f5cce BundleUtilities: Allow Info.plist files which use CR line endings


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=810f5ccefc113987fc6f68c073ab9c84fc278b32
commit 810f5ccefc113987fc6f68c073ab9c84fc278b32
Author:     Tim Blechmann <tim at klingt.org>
AuthorDate: Thu Aug 7 19:30:27 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 7 14:00:01 2014 -0400

    BundleUtilities: Allow Info.plist files which use CR line endings
    
    Convert \r to our internal end-of-line character just as we do \n.
    
    Signed-off-by: Tim Blechmann <tim at klingt.org>

diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index 0c733fa..0046c97 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -237,6 +237,7 @@ function(get_bundle_main_executable bundle result_var)
     file(READ "${bundle}/Contents/Info.plist" info_plist)
     string(REPLACE ";" "\\;" info_plist "${info_plist}")
     string(REPLACE "\n" "${eol_char};" info_plist "${info_plist}")
+    string(REPLACE "\r" "${eol_char};" info_plist "${info_plist}")
 
     # Scan the lines for "<key>CFBundleExecutable</key>" - the line after that
     # is the name of the main executable.

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

Summary of changes:
 Modules/BundleUtilities.cmake |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake