diff options
| author | Ruslan Baratov <ruslan_baratov@yahoo.com> | 2016-06-25 13:37:44 +0200 |
|---|---|---|
| committer | Gregor Jasny <gjasny@googlemail.com> | 2016-06-25 13:37:44 +0200 |
| commit | aff1e77f480f72b1a517ae9b7d54e56b30fab4b3 (patch) | |
| tree | 2953fbafd5ffd71a5ceff884101e18611cc0edd0 /Modules | |
| parent | 3a0449439f03981865b8d43815ac9b6292574a47 (diff) | |
| download | cmake-aff1e77f480f72b1a517ae9b7d54e56b30fab4b3.tar.gz | |
CMakeIOSInstallCombined: do not merge content of OUTPUT and ERROR variables
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeIOSInstallCombined.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/CMakeIOSInstallCombined.cmake b/Modules/CMakeIOSInstallCombined.cmake index 1256f563e4..d700011062 100644 --- a/Modules/CMakeIOSInstallCombined.cmake +++ b/Modules/CMakeIOSInstallCombined.cmake @@ -237,17 +237,20 @@ function(ios_install_combined target destination) endif() set(cmd xcrun -f lipo) + + # Do not merge OUTPUT_VARIABLE and ERROR_VARIABLE since latter may contain + # some diagnostic information even for the successful run. execute_process( COMMAND ${cmd} RESULT_VARIABLE result OUTPUT_VARIABLE output - ERROR_VARIABLE output + ERROR_VARIABLE error_output OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE ) if(NOT result EQUAL 0) message( - FATAL_ERROR "Command failed (${result}): ${cmd}\n\nOutput:\n${output}" + FATAL_ERROR "Command failed (${result}): ${cmd}\n\nOutput:\n${output}\nOutput(error):\n${error_output}" ) endif() set(_lipo_path ${output}) |