diff options
| author | Brad King <brad.king@kitware.com> | 2014-08-11 14:00:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-08-11 14:00:14 (GMT) |
| commit | 81a4ca57f858ad8ea7e042f60300aa5322541578 (patch) | |
| tree | 63f1e6056fca0f695eef9a7cbb4d553ad9ff2476 | |
| parent | 4988b174923dd20620d1c7ee9feec6d04386cbc4 (diff) | |
| parent | 00ad505b374f80c72e6576bb0cb3829521964239 (diff) | |
| download | CMake-81a4ca57f858ad8ea7e042f60300aa5322541578.zip CMake-81a4ca57f858ad8ea7e042f60300aa5322541578.tar.gz CMake-81a4ca57f858ad8ea7e042f60300aa5322541578.tar.bz2 | |
Merge branch 'backport-BundleUtilities-os9-newlines' into release
| -rw-r--r-- | Modules/BundleUtilities.cmake | 1 |
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. |