diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2021-05-09 20:27:28 +0200 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-05-18 08:37:29 +0000 |
commit | b1ccd9ab328cc7f7e34ab653ec93f389b9945e19 (patch) | |
tree | 8ce97344b4ae475d2965802c50a93957d6950502 /.github/workflows/main.yml | |
parent | 3ec5e234fe40985d58839409c3dce53d4cd78f17 (diff) |
cmake: Add bundled QtScript build
Also, make QtScript dependency optional like we do in the Qbs build.
Tested on macOS, Linux and Windows.
CMake 3.15 is now required for the CMP0092 policy which removes default
warning flags from CMAKE_CXX_FLAGS.
Change-Id: I199fb802d5ad72d1ac8d5a89c05372c43581c95d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to '.github/workflows/main.yml')
-rw-r--r-- | .github/workflows/main.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1245daeca..b15885b8a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -68,6 +68,7 @@ jobs: - { name: 'Build on Linux (CMake)', script: './scripts/build-qbs-with-cmake.sh', + options: '-DQBS_USE_BUNDLED_QT_SCRIPT=1', cacheid: 'cmake', } - { @@ -81,6 +82,8 @@ jobs: QTEST_FUNCTION_TIMEOUT: 9000000 steps: - uses: actions/checkout@v1 + with: + submodules: true - name: Create .ccache dir run: mkdir -p ~/.ccache - name: prepare timestamp |