feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: make sure that deploy.py errors get caught

Browse Source 
Change-Id: I05f818145ed29f4521bddc36051ae504c13278d7
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tim Jenssen
2023-11-27 13:24:08 +01:00
parent ec59bab491
commit 60d23bff03
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/Utils.cmake
View File

@@ -22,6 +22,9 @@ function(setup_dependencies_component)
set(_elfutils_arg "--elfutils \"${_elfutils_path}\"") set(_elfutils_arg "--elfutils \"${_elfutils_path}\"")
endif() endif()
install(CODE " 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 # DESTDIR is set for e.g. the cpack DEB generator, but is empty in other situations
if(DEFINED ENV{DESTDIR}) if(DEFINED ENV{DESTDIR})
set(DESTDIR_WITH_SEP \"\$ENV{DESTDIR}/\") set(DESTDIR_WITH_SEP \"\$ENV{DESTDIR}/\")
@@ -48,7 +51,7 @@ function(setup_dependencies_component)
\"\${_ide_app_target}\" \"\${_ide_app_target}\"
\"${_qmake_binary}\" \"${_qmake_binary}\"
COMMAND_ECHO STDOUT COMMAND_ECHO STDOUT
\${QTC_COMMAND_ERROR_IS_FATAL} ${QTC_COMMAND_ERROR_IS_FATAL}
) )
" "
COMPONENT Dependencies COMPONENT Dependencies