From 2061cea0f38e1eaae26fca1a04fdf6d9473a47d0 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 23 Mar 2022 16:49:52 +0100 Subject: CMake: Pass -v to ninja when using ctest --build-and-test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So we can see the command line invocations of the built cmake auto tests. To achieve that, we create a ninja shell script wrapper, because ctest --build-and-test does not currently allow specifying custom build tool options. Details at https://gitlab.kitware.com/cmake/cmake/-/issues/22443 Pick-to: 6.2 6.3 Change-Id: I7fb3b7f7f802943a7013c859b2cf39842a34e2e4 Reviewed-by: Qt CI Bot Reviewed-by: Jörg Bornemann --- libexec/qt-internal-ninja.bat.in | 3 +++ libexec/qt-internal-ninja.in | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 libexec/qt-internal-ninja.bat.in create mode 100755 libexec/qt-internal-ninja.in (limited to 'libexec') diff --git a/libexec/qt-internal-ninja.bat.in b/libexec/qt-internal-ninja.bat.in new file mode 100644 index 0000000000..98742e1aec --- /dev/null +++ b/libexec/qt-internal-ninja.bat.in @@ -0,0 +1,3 @@ +:: Make sure we don't echo, because CMake uses the output to parse out ninja's version +@echo off +@original_ninja@ @ninja_arguments@ %* diff --git a/libexec/qt-internal-ninja.in b/libexec/qt-internal-ninja.in new file mode 100755 index 0000000000..742a06d597 --- /dev/null +++ b/libexec/qt-internal-ninja.in @@ -0,0 +1,2 @@ +#!/bin/sh +@original_ninja@ @ninja_arguments@ "$@" -- cgit v1.2.3