diff options
| author | Brad King <brad.king@kitware.com> | 2014-08-11 13:54:14 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-08-11 13:54:14 (GMT) |
| commit | f85dee25fbf1c5f4db9ecea5fb47910f38fd1ade (patch) | |
| tree | 4788be9bd6ab9921b12ac215891f6adb2c02c3d2 /Modules | |
| parent | 348999a125f3cf6936a2d5ab4f276b813443f1be (diff) | |
| parent | 810f5ccefc113987fc6f68c073ab9c84fc278b32 (diff) | |
| download | CMake-f85dee25fbf1c5f4db9ecea5fb47910f38fd1ade.zip CMake-f85dee25fbf1c5f4db9ecea5fb47910f38fd1ade.tar.gz CMake-f85dee25fbf1c5f4db9ecea5fb47910f38fd1ade.tar.bz2 | |
Merge topic 'BundleUtilities-os9-newlines'
810f5cce BundleUtilities: Allow Info.plist files which use CR line endings
Diffstat (limited to 'Modules')
| -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 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. |