1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add TRY_RUN to host tools

Browse Source 
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 <alexandru.croitor@qt.io>
This commit is contained in:
Amir Masoud Abdol 2023-05-05 17:34:05 +02:00
parent f34c5215f4
commit 41b32cd2c4
16 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qmake/CMakeLists.txt
View File

@ -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

1
src/tools/androiddeployqt/CMakeLists.txt
View File

@ -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

1
src/tools/androidtestrunner/CMakeLists.txt
View File

@ -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

1
src/tools/cmake_automoc_parser/CMakeLists.txt
View File

@ -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}"

1
src/tools/macdeployqt/macdeployqt/CMakeLists.txt
View File

@ -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

1
src/tools/moc/CMakeLists.txt
View File

@ -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}"

1
src/tools/qdbuscpp2xml/CMakeLists.txt
View File

@ -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

1
src/tools/qdbusxml2cpp/CMakeLists.txt
View File

@ -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

1
src/tools/qlalr/CMakeLists.txt
View File

@ -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

1
src/tools/qtpaths/CMakeLists.txt
View File

@ -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

1
src/tools/qvkgen/CMakeLists.txt
View File

@ -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

1
src/tools/rcc/CMakeLists.txt
View File

@ -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

1
src/tools/tracegen/CMakeLists.txt
View File

@ -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

1
src/tools/tracepointgen/CMakeLists.txt
View File

@ -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

1
src/tools/uic/CMakeLists.txt
View File

@ -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

1
src/tools/windeployqt/CMakeLists.txt
View File

@ -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