Commit aff1e77f authored by Ruslan Baratov's avatar Ruslan Baratov Committed by Gregor Jasny
Browse files

CMakeIOSInstallCombined: do not merge content of OUTPUT and ERROR variables

parent 3a044943
...@@ -237,17 +237,20 @@ function(ios_install_combined target destination) ...@@ -237,17 +237,20 @@ function(ios_install_combined target destination)
endif() endif()
set(cmd xcrun -f lipo) 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( execute_process(
COMMAND ${cmd} COMMAND ${cmd}
RESULT_VARIABLE result RESULT_VARIABLE result
OUTPUT_VARIABLE output OUTPUT_VARIABLE output
ERROR_VARIABLE output ERROR_VARIABLE error_output
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE
) )
if(NOT result EQUAL 0) if(NOT result EQUAL 0)
message( 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() endif()
set(_lipo_path ${output}) set(_lipo_path ${output})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment