diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-06-13 16:37:49 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-06-15 11:46:00 +0000 |
| commit | 69d74afd43adac796efb3ebb1f7e73da64010cb5 (patch) | |
| tree | c8368eb5243c06029ec44105bfc5bf55ed3f6a7d /src/tools/cmake_automoc_parser | |
| parent | f3c2cf47fc35262dee0c4732ada6f334009cabf3 (diff) | |
Add TRY_RUN_FLAGS argument to customize the TRY_RUN command
Some of our tools don't have the `-h`, or `-v` flag, or it could be
that the `-v` flag also prints the entire `--help` as well, e.g.,
`androiddeployqt`. When running in Jenkins, this may lead to a message
box being shown and consequently stopping the build. By customizing the
flag per tool, and limiting the TRY_RUN to tools that support `-v` or
`--version`, we can avoid this.
Also removed TRY_RUN from `macdeployqt` which doesn't need it anyway.
Amend 41b32cd2c4706fa280fc779d5dec132ee9edf0f6
Pick-to: 6.5.2 6.5 6.6
Fixes: QTBUG-114530
Change-Id: I78e3344d2553c0050c285ae86f2310bd373c6c57
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/tools/cmake_automoc_parser')
| -rw-r--r-- | src/tools/cmake_automoc_parser/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/tools/cmake_automoc_parser/CMakeLists.txt b/src/tools/cmake_automoc_parser/CMakeLists.txt index e0ce0e65d1..a58c9c9ff1 100644 --- a/src/tools/cmake_automoc_parser/CMakeLists.txt +++ b/src/tools/cmake_automoc_parser/CMakeLists.txt @@ -7,7 +7,6 @@ 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}" |