diff --git a/cmake/tools/SetupCodesign.cmake b/cmake/tools/SetupCodesign.cmake index 2d47783940..82a4e2e8f5 100644 --- a/cmake/tools/SetupCodesign.cmake +++ b/cmake/tools/SetupCodesign.cmake @@ -18,6 +18,7 @@ if(ENABLE_CODESIGN AND APPLE) if(NOT EXISTS ${APPLE_CODESIGN_KEYCHAIN_PATH}) execute_process( COMMAND ${SECURITY_PROGRAM} create-keychain -p "${APPLE_CODESIGN_KEYCHAIN_PASSWORD}" ${APPLE_CODESIGN_KEYCHAIN_PATH} + COMMAND_ECHO STDOUT OUTPUT_QUIET ERROR_VARIABLE CREATE_KEYCHAIN_ERROR ERROR_STRIP_TRAILING_WHITESPACE @@ -29,6 +30,7 @@ if(ENABLE_CODESIGN AND APPLE) execute_process( COMMAND ${SECURITY_PROGRAM} set-keychain-settings -l ${APPLE_CODESIGN_KEYCHAIN_PATH} + COMMAND_ECHO STDOUT OUTPUT_QUIET ERROR_VARIABLE SET_KEYCHAIN_SETTINGS_ERROR ERROR_STRIP_TRAILING_WHITESPACE @@ -41,6 +43,7 @@ if(ENABLE_CODESIGN AND APPLE) execute_process( COMMAND ${SECURITY_PROGRAM} unlock-keychain -p "${APPLE_CODESIGN_KEYCHAIN_PASSWORD}" ${APPLE_CODESIGN_KEYCHAIN_PATH} + COMMAND_ECHO STDOUT OUTPUT_QUIET ERROR_VARIABLE UNLOCK_KEYCHAIN_ERROR ERROR_STRIP_TRAILING_WHITESPACE @@ -69,6 +72,7 @@ if(ENABLE_CODESIGN AND APPLE) execute_process( COMMAND ${CMAKE_COMMAND} -E echo "${APPLE_CODESIGN_IDENTITY_BASE64}" | ${BASE64_PROGRAM} --decode > ${APPLE_CODESIGN_IDENTITY_PATH} + COMMAND_ECHO STDOUT OUTPUT_QUIET ERROR_VARIABLE DECODE_IDENTITY_ERROR ERROR_STRIP_TRAILING_WHITESPACE @@ -83,6 +87,7 @@ if(ENABLE_CODESIGN AND APPLE) execute_process( COMMAND ${SECURITY_PROGRAM} find-identity -v -p codesigning ${APPLE_CODESIGN_KEYCHAIN_PATH} + COMMAND_ECHO STDOUT OUTPUT_VARIABLE FIND_IDENTITY_OUTPUT OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE FIND_IDENTITY_ERROR @@ -96,6 +101,7 @@ if(ENABLE_CODESIGN AND APPLE) if(NOT FIND_IDENTITY_OUTPUT MATCHES "${APPLE_CODESIGN_IDENTITY}") execute_process( COMMAND ${SECURITY_PROGRAM} import ${APPLE_CODESIGN_IDENTITY_PATH} -k ${APPLE_CODESIGN_KEYCHAIN_PATH} -P "${APPLE_CODESIGN_IDENTITY_PASSWORD}" -T ${CODESIGN_PROGRAM} + COMMAND_ECHO STDOUT OUTPUT_QUIET ERROR_VARIABLE IMPORT_IDENTITY_ERROR ERROR_STRIP_TRAILING_WHITESPACE @@ -107,6 +113,7 @@ if(ENABLE_CODESIGN AND APPLE) execute_process( COMMAND ${SECURITY_PROGRAM} set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "${APPLE_CODESIGN_KEYCHAIN_PASSWORD}" ${APPLE_CODESIGN_KEYCHAIN_PATH} + COMMAND_ECHO STDOUT OUTPUT_QUIET ERROR_VARIABLE SET_KEY_PARTITION_LIST_ERROR ERROR_STRIP_TRAILING_WHITESPACE @@ -118,6 +125,7 @@ if(ENABLE_CODESIGN AND APPLE) execute_process( COMMAND ${SECURITY_PROGRAM} find-identity -v -p codesigning ${APPLE_CODESIGN_KEYCHAIN_PATH} + COMMAND_ECHO STDOUT OUTPUT_VARIABLE FIND_IDENTITY_OUTPUT OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE FIND_IDENTITY_ERROR