This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 7a0201ef70ea7b405dfb275fd117bc2419e7e27e (commit) via 11c3a8dc11eae4305409afbb8d7fa66ee31d41de (commit) via aff1e77f480f72b1a517ae9b7d54e56b30fab4b3 (commit) via 3a0449439f03981865b8d43815ac9b6292574a47 (commit) from 2152e11e7a4f9d5bb80e224265e3aba40c92a060 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a0201ef70ea7b405dfb275fd117bc2419e7e27e commit 7a0201ef70ea7b405dfb275fd117bc2419e7e27e Merge: 2152e11 11c3a8d Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Sat Jun 25 07:55:54 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sat Jun 25 07:55:54 2016 -0400 Merge topic 'ios-universal-fixes' into next 11c3a8dc CMakeIOSInstallCombined: add some sanity checks aff1e77f CMakeIOSInstallCombined: do not merge content of OUTPUT and ERROR variables 3a044943 CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11c3a8dc11eae4305409afbb8d7fa66ee31d41de commit 11c3a8dc11eae4305409afbb8d7fa66ee31d41de Author: Ruslan Baratov <ruslan_bara...@yahoo.com> AuthorDate: Sat Jun 25 13:48:31 2016 +0200 Commit: Gregor Jasny <gja...@googlemail.com> CommitDate: Sat Jun 25 13:48:31 2016 +0200 CMakeIOSInstallCombined: add some sanity checks diff --git a/Modules/CMakeIOSInstallCombined.cmake b/Modules/CMakeIOSInstallCombined.cmake index d700011..234322c 100644 --- a/Modules/CMakeIOSInstallCombined.cmake +++ b/Modules/CMakeIOSInstallCombined.cmake @@ -254,6 +254,13 @@ function(ios_install_combined target destination) ) endif() set(_lipo_path ${output}) + list(LENGTH _lipo_path len) + if(NOT len EQUAL 1) + message(FATAL_ERROR "Unexpected xcrun output: ${_lipo_path}") + endif() + if(NOT EXISTS "${_lipo_path}") + message(FATAL_ERROR "File not found: ${_lipo_path}") + endif() set(CURRENT_CONFIG "${CMAKE_INSTALL_CONFIG_NAME}") set(CURRENT_TARGET "${target}") https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aff1e77f480f72b1a517ae9b7d54e56b30fab4b3 commit aff1e77f480f72b1a517ae9b7d54e56b30fab4b3 Author: Ruslan Baratov <ruslan_bara...@yahoo.com> AuthorDate: Sat Jun 25 13:37:44 2016 +0200 Commit: Gregor Jasny <gja...@googlemail.com> CommitDate: Sat Jun 25 13:37:44 2016 +0200 CMakeIOSInstallCombined: do not merge content of OUTPUT and ERROR variables diff --git a/Modules/CMakeIOSInstallCombined.cmake b/Modules/CMakeIOSInstallCombined.cmake index 1256f56..d700011 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}) ----------------------------------------------------------------------- Summary of changes: Modules/CMakeIOSInstallCombined.cmake | 14 ++++++++++++-- Source/CMakeVersion.cmake | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits