From 41b32cd2c4706fa280fc779d5dec132ee9edf0f6 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Fri, 5 May 2023 17:34:05 +0200 Subject: [PATCH] Add TRY_RUN to host tools On Windows, we will try to run our host tools after a successful build. If the build fails because of a missing DLL, we will be able to throw an error with some direction on what might be the cause, and how to resolve it. Pick-to: 6.5 6.6 Fixes: QTBUG-113273 Change-Id: Iba548829bc41fbee95cef288faaf7edca118ee33 Reviewed-by: Alexandru Croitor --- qmake/CMakeLists.txt | 1 + src/tools/androiddeployqt/CMakeLists.txt | 1 + src/tools/androidtestrunner/CMakeLists.txt | 1 + src/tools/cmake_automoc_parser/CMakeLists.txt | 1 + src/tools/macdeployqt/macdeployqt/CMakeLists.txt | 1 + src/tools/moc/CMakeLists.txt | 1 + src/tools/qdbuscpp2xml/CMakeLists.txt | 1 + src/tools/qdbusxml2cpp/CMakeLists.txt | 1 + src/tools/qlalr/CMakeLists.txt | 1 + src/tools/qtpaths/CMakeLists.txt | 1 + src/tools/qvkgen/CMakeLists.txt | 1 + src/tools/rcc/CMakeLists.txt | 1 + src/tools/tracegen/CMakeLists.txt | 1 + src/tools/tracepointgen/CMakeLists.txt | 1 + src/tools/uic/CMakeLists.txt | 1 + src/tools/windeployqt/CMakeLists.txt | 1 + 16 files changed, 16 insertions(+) diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 2c2c777b2cb..abd9c84cc91 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -52,6 +52,7 @@ endif() qt_get_tool_target_name(target_name qmake) qt_internal_add_tool(${target_name} + TRY_RUN TOOLS_TARGET Core USER_FACING NO_UNITY_BUILD diff --git a/src/tools/androiddeployqt/CMakeLists.txt b/src/tools/androiddeployqt/CMakeLists.txt index 2a0f1ae9aff..65e072b6fb3 100644 --- a/src/tools/androiddeployqt/CMakeLists.txt +++ b/src/tools/androiddeployqt/CMakeLists.txt @@ -7,6 +7,7 @@ qt_get_tool_target_name(target_name androiddeployqt) qt_internal_add_tool(${target_name} + TRY_RUN TARGET_DESCRIPTION "Qt Android Deployment Tool" TOOLS_TARGET Core USER_FACING diff --git a/src/tools/androidtestrunner/CMakeLists.txt b/src/tools/androidtestrunner/CMakeLists.txt index 77157e29a3e..45b23a95f38 100644 --- a/src/tools/androidtestrunner/CMakeLists.txt +++ b/src/tools/androidtestrunner/CMakeLists.txt @@ -7,6 +7,7 @@ qt_get_tool_target_name(target_name androidtestrunner) qt_internal_add_tool(${target_name} + TRY_RUN TARGET_DESCRIPTION "Qt Android Test Runner Tool" TOOLS_TARGET Core SOURCES diff --git a/src/tools/cmake_automoc_parser/CMakeLists.txt b/src/tools/cmake_automoc_parser/CMakeLists.txt index a58c9c9ff17..e0ce0e65d1e 100644 --- a/src/tools/cmake_automoc_parser/CMakeLists.txt +++ b/src/tools/cmake_automoc_parser/CMakeLists.txt @@ -7,6 +7,7 @@ qt_get_tool_target_name(target_name cmake_automoc_parser) qt_internal_add_tool(${target_name} + TRY_RUN CORE_LIBRARY Bootstrap TARGET_DESCRIPTION "Qt CMake AUTOMOC Parser" INSTALL_DIR "${INSTALL_LIBEXECDIR}" diff --git a/src/tools/macdeployqt/macdeployqt/CMakeLists.txt b/src/tools/macdeployqt/macdeployqt/CMakeLists.txt index 5c50fe7de0a..d1597d5c09d 100644 --- a/src/tools/macdeployqt/macdeployqt/CMakeLists.txt +++ b/src/tools/macdeployqt/macdeployqt/CMakeLists.txt @@ -7,6 +7,7 @@ qt_get_tool_target_name(target_name macdeployqt) qt_internal_add_tool(${target_name} + TRY_RUN TOOLS_TARGET Core USER_FACING INSTALL_VERSIONED_LINK diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt index 82565b665f7..eec01c12e08 100644 --- a/src/tools/moc/CMakeLists.txt +++ b/src/tools/moc/CMakeLists.txt @@ -7,6 +7,7 @@ qt_get_tool_target_name(target_name moc) qt_internal_add_tool(${target_name} + TRY_RUN CORE_LIBRARY Bootstrap TARGET_DESCRIPTION "Qt Meta Object Compiler" INSTALL_DIR "${INSTALL_LIBEXECDIR}" diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt index 59677288c77..20a2d497d7a 100644 --- a/src/tools/qdbuscpp2xml/CMakeLists.txt +++ b/src/tools/qdbuscpp2xml/CMakeLists.txt @@ -7,6 +7,7 @@ qt_get_tool_target_name(target_name qdbuscpp2xml) qt_internal_add_tool(${target_name} + TRY_RUN TARGET_DESCRIPTION "Qt D-Bus C++ to XML Compiler" TOOLS_TARGET DBus SOURCES diff --git a/src/tools/qdbusxml2cpp/CMakeLists.txt b/src/tools/qdbusxml2cpp/CMakeLists.txt index 05acd0329c3..0da22ebfc62 100644 --- a/src/tools/qdbusxml2cpp/CMakeLists.txt +++ b/src/tools/qdbusxml2cpp/CMakeLists.txt @@ -7,6 +7,7 @@ qt_get_tool_target_name(target_name qdbusxml2cpp) qt_internal_add_tool(${target_name} + TRY_RUN TARGET_DESCRIPTION "Qt D-Bus XML to C++ Compiler" TOOLS_TARGET DBus SOURCES diff --git a/src/tools/qlalr/CMakeLists.txt b/src/tools/qlalr/CMakeLists.txt index f6e2077ef4b..04154d3cbfe 100644 --- a/src/tools/qlalr/CMakeLists.txt +++ b/src/tools/qlalr/CMakeLists.txt @@ -7,6 +7,7 @@ qt_get_tool_target_name(target_name qlalr) qt_internal_add_tool(${target_name} + TRY_RUN TARGET_DESCRIPTION "Qt Look Ahead LR Parser Generator" INSTALL_DIR "${INSTALL_LIBEXECDIR}" TOOLS_TARGET Core diff --git a/src/tools/qtpaths/CMakeLists.txt b/src/tools/qtpaths/CMakeLists.txt index 1bd1cc907b9..6d3ccd097ef 100644 --- a/src/tools/qtpaths/CMakeLists.txt +++ b/src/tools/qtpaths/CMakeLists.txt @@ -7,6 +7,7 @@ qt_get_tool_target_name(target_name qtpaths) qt_internal_add_tool(${target_name} + TRY_RUN TARGET_DESCRIPTION "Qt tool that provides the standard paths of the Qt framework" TOOLS_TARGET Core INSTALL_VERSIONED_LINK diff --git a/src/tools/qvkgen/CMakeLists.txt b/src/tools/qvkgen/CMakeLists.txt index 0f68968fd33..a29094c9530 100644 --- a/src/tools/qvkgen/CMakeLists.txt +++ b/src/tools/qvkgen/CMakeLists.txt @@ -7,6 +7,7 @@ qt_get_tool_target_name(target_name qvkgen) qt_internal_add_tool(${target_name} + TRY_RUN TARGET_DESCRIPTION "Qt Vulkan Header Generator" INSTALL_DIR "${INSTALL_LIBEXECDIR}" TOOLS_TARGET Gui diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt index c810537721c..55d4de2e285 100644 --- a/src/tools/rcc/CMakeLists.txt +++ b/src/tools/rcc/CMakeLists.txt @@ -7,6 +7,7 @@ qt_get_tool_target_name(target_name rcc) qt_internal_add_tool(${target_name} + TRY_RUN TARGET_DESCRIPTION "Qt Resource Compiler" INSTALL_DIR "${INSTALL_LIBEXECDIR}" TOOLS_TARGET Core diff --git a/src/tools/tracegen/CMakeLists.txt b/src/tools/tracegen/CMakeLists.txt index f5f6b2e1842..8139c4c446d 100644 --- a/src/tools/tracegen/CMakeLists.txt +++ b/src/tools/tracegen/CMakeLists.txt @@ -7,6 +7,7 @@ qt_get_tool_target_name(target_name tracegen) qt_internal_add_tool(${target_name} + TRY_RUN CORE_LIBRARY Bootstrap INSTALL_DIR "${INSTALL_LIBEXECDIR}" TOOLS_TARGET Core diff --git a/src/tools/tracepointgen/CMakeLists.txt b/src/tools/tracepointgen/CMakeLists.txt index 2f473d376af..bbc4bd4cad4 100644 --- a/src/tools/tracepointgen/CMakeLists.txt +++ b/src/tools/tracepointgen/CMakeLists.txt @@ -7,6 +7,7 @@ qt_get_tool_target_name(target_name tracepointgen) qt_internal_add_tool(${target_name} + TRY_RUN CORE_LIBRARY Bootstrap INSTALL_DIR "${INSTALL_LIBEXECDIR}" TOOLS_TARGET Core diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt index 9f9ea93beaf..48c1a535464 100644 --- a/src/tools/uic/CMakeLists.txt +++ b/src/tools/uic/CMakeLists.txt @@ -7,6 +7,7 @@ qt_get_tool_target_name(target_name uic) qt_internal_add_tool(${target_name} + TRY_RUN TARGET_DESCRIPTION "Qt User Interface Compiler" INSTALL_DIR "${INSTALL_LIBEXECDIR}" TOOLS_TARGET Widgets diff --git a/src/tools/windeployqt/CMakeLists.txt b/src/tools/windeployqt/CMakeLists.txt index 715c008831d..fdf69c98d1c 100644 --- a/src/tools/windeployqt/CMakeLists.txt +++ b/src/tools/windeployqt/CMakeLists.txt @@ -7,6 +7,7 @@ qt_get_tool_target_name(target_name windeployqt) qt_internal_add_tool(${target_name} + TRY_RUN TOOLS_TARGET Core USER_FACING INSTALL_VERSIONED_LINK