From d4a807c8a74d466657919685edf8e349d954f4c2 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 20 Nov 2018 13:29:59 +0100 Subject: [PATCH] Fail if package creation is not successful. --- cmake_builder/linphone_package/macos/packaging.cmake.in | 5 ++++- .../linphone_package/windows/packaging.cmake.in | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cmake_builder/linphone_package/macos/packaging.cmake.in b/cmake_builder/linphone_package/macos/packaging.cmake.in index 8d2c6fe79..8ed4e14c1 100644 --- a/cmake_builder/linphone_package/macos/packaging.cmake.in +++ b/cmake_builder/linphone_package/macos/packaging.cmake.in @@ -23,6 +23,9 @@ if (NOT "${CMAKE_INSTALL_PREFIX}" MATCHES .*/_CPack_Packages/.*) execute_process( COMMAND ${CMAKE_CPACK_COMMAND} -G DragNDrop - RESULT_VARIABLE CPACK_COMMAND_SUCCESS + RESULT_VARIABLE CPACK_COMMAND_RESULT ) + if(CPACK_COMMAND_RESULT) + message(FATAL_ERROR "Failed to create dmg package!") + endif() endif () diff --git a/cmake_builder/linphone_package/windows/packaging.cmake.in b/cmake_builder/linphone_package/windows/packaging.cmake.in index ba0d113fa..2bd39ba9f 100644 --- a/cmake_builder/linphone_package/windows/packaging.cmake.in +++ b/cmake_builder/linphone_package/windows/packaging.cmake.in @@ -23,12 +23,19 @@ if (NOT "${CMAKE_INSTALL_PREFIX}" MATCHES .*/_CPack_Packages/.*) execute_process( COMMAND ${CMAKE_CPACK_COMMAND} -G @CPACK_GENERATOR@ - RESULT_VARIABLE CPACK_COMMAND_SUCCESS + RESULT_VARIABLE CPACK_COMMAND_RESULT ) + if(CPACK_COMMAND_RESULT) + message(FATAL_ERROR "Failed to generate package!") + endif() if (@PERFORM_SIGNING@) execute_process( COMMAND @SIGNTOOL_COMMAND@ @CMAKE_CURRENT_BINARY_DIR@/@CPACK_PACKAGE_FILE_NAME@.@PACKAGE_EXT@ + RESULT_VARIABLE SIGNING_RESULT ) + if(SIGNING_RESULT) + message(FATAL_ERROR "Failed to sign the package!") + endif() endif () endif ()