diff options
author | Tim Jenssen <tim.jenssen@qt.io> | 2023-11-27 13:24:08 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2023-11-27 13:45:16 +0000 |
commit | 60d23bff03edd7d8e5522523e2fff1843caec800 (patch) | |
tree | efb81b5382f94944f84f1256d8f23be771a23500 | |
parent | ec59bab4914abb0a817dc85de9cd6129b87f7a3e (diff) |
CMake: make sure that deploy.py errors get caught
Change-Id: I05f818145ed29f4521bddc36051ae504c13278d7
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r-- | cmake/Utils.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake index b1be1ccf10..3dbe0f1e81 100644 --- a/cmake/Utils.cmake +++ b/cmake/Utils.cmake @@ -22,6 +22,9 @@ function(setup_dependencies_component) set(_elfutils_arg "--elfutils \"${_elfutils_path}\"") endif() install(CODE " + if (CMAKE_VERSION GREATER_EQUAL 3.19) + set(QTC_COMMAND_ERROR_IS_FATAL COMMAND_ERROR_IS_FATAL ANY) + endif() # DESTDIR is set for e.g. the cpack DEB generator, but is empty in other situations if(DEFINED ENV{DESTDIR}) set(DESTDIR_WITH_SEP \"\$ENV{DESTDIR}/\") @@ -48,7 +51,7 @@ function(setup_dependencies_component) \"\${_ide_app_target}\" \"${_qmake_binary}\" COMMAND_ECHO STDOUT - \${QTC_COMMAND_ERROR_IS_FATAL} + ${QTC_COMMAND_ERROR_IS_FATAL} ) " COMPONENT Dependencies |