summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Blechmann <tim@klingt.org>2014-08-07 17:30:27 (GMT)
committerBrad King <brad.king@kitware.com>2014-08-07 18:00:16 (GMT)
commit00ad505b374f80c72e6576bb0cb3829521964239 (patch)
tree7ad3e3a52f3dbb9708e2d32dd840314d7d960ffe
parent76acc128a272b1fae303215a985410faec87c3e0 (diff)
downloadCMake-00ad505b374f80c72e6576bb0cb3829521964239.zip
CMake-00ad505b374f80c72e6576bb0cb3829521964239.tar.gz
CMake-00ad505b374f80c72e6576bb0cb3829521964239.tar.bz2
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@klingt.org>
-rw-r--r--Modules/BundleUtilities.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index b896de2..60d01b5 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(REGEX REPLACE ";" "\\\\;" info_plist "${info_plist}")
string(REGEX REPLACE "\n" "${eol_char};" info_plist "${info_plist}")
+ string(REGEX 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.