Commit Graph

23 Commits

Author SHA1 Message Date
Alexandru Croitor
b87098e90d CMake: Update provisioned CMake to version 3.30.5
Fixes: QTQAINFRA-6484
Change-Id: Iacccb9f43059c78080e338da6680f5c50284c057
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 400776459b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-10-31 14:42:43 +00:00
Alexandru Croitor
bae2268c47 CMake: Update provisioned CMake to version 3.27.7
We want access to the debugger, and also to be in sync with the CMake
shipped with the Qt SDK.

Task-number: QTBUG-118138
Change-Id: I4b43b9543e8e6ef23c9608a8e1c623ee16edfbd5
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2023-11-15 09:14:29 +01:00
Lucie Gérard
eecfb19548 Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.

Pick-to: 6.5 6.6
Task-number: QTBUG-67283
Task-number: QTBUG-108364
Change-Id: If26e4d35c780db4a7982bb84872b251dad24716e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2023-06-12 12:10:41 +00:00
Tony Sarajärvi
58ddf7133c Correct the domain of ci-files01-hki
It's hasn't been .intra.qt.io for quite some time, it
has worked through an alias we have on the DNS server.

Change-Id: I0bc17668dacfea64c276bb553e75e4be16e97659
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2023-06-12 12:10:26 +00:00
Alexandru Croitor
6943f28b17 CMake: Update provisioned CMake to version 3.24.2
Needed to fix iOS Xcode generator builds when using Xcode 14.
Otherwise compiler identification fails due to a code-signing error.
We hit it in our iOS MinimalStaticTests configuration.

 error: Cannot code sign because the target does not have an
        Info.plist file and one is not being generated
        automatically.
         (in target 'CompilerIdCXX' from project
         'CompilerIdCXX')

See https://gitlab.kitware.com/cmake/cmake/-/issues/23719

Amends eee152ca70

Fixes: QTQAINFRA-5044
Change-Id: Idabd78e6e28816a8fc4dd7e627de82f2c622c54e
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-11-26 18:19:17 +01:00
Simo Fält
bfc49c207d Provisioning: Update cmake to 3.21.3 to enable Android build
To avoid https://gitlab.kitware.com/cmake/cmake/-/issues/22634.

Pick-to: 6.2 6.3
Change-Id: I1227218514174843353b5bd5d831d89ed1ca89b4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-04-04 23:16:47 +03:00
Kai Köhne
becb423e80 Replace LGPL2.1 only header with LGPL3 one
This is in line with e.g. qtbase. Also remove outdated/unreferenced
license files.

Pick-to: 6.3
Change-Id: I5d3370ab453610f9c8165ff9e57db7ad4a785370
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-12-19 19:47:15 +00:00
Alexandru Croitor
9218d50a6e CMake: Update provisioned CMake to version 3.21.1
Task-number: QTBUG-95018
Task-number: QTBUG-95229
Pick-to: 6.2
Change-Id: Ibed6ff323ca1633444ed29423ce1e94c99e68f77
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-08-06 20:30:36 +02:00
Alexandru Croitor
d7c2951de0 CMake: Update provisioned CMake to version 3.20.5
Pick-to: 6.2
Change-Id: Id09eedf75b02b28dd94b0e3f858a05ebe8875679
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-07-09 16:58:13 +02:00
Cristian Adam
5f4bd8911d CMake: Update provisioned CMake to version 3.19.2
Pick-to: 6.0
Change-Id: I9544eb3ba08b60d027e895031b93731c1e8d00af
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-12-22 19:03:33 +01:00
Alexandru Croitor
6b46bc3b7b CMake: Update provisioned CMake to version 3.19.0
Pick-to: 6.0.0 6.0
Change-Id: I9c5be93146882d5593bbe46811a653d6b2a88aee
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-11-20 19:25:56 +01:00
Alexandru Croitor
dc84140127 CMake: Update provisioned CMake to version 3.19.0-rc2
We want to be able to build qdoc and lupdate on MSVC with
Ninja Multi-Config.

Task-number: QTBUG-85411
Task-number: QTBUG-88139
Task-number: QTBUG-87315
Change-Id: I53b705535981b67c817f4d49d435e8f2a0553f74
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-11-12 18:21:53 +01:00
Cristian Adam
74f29a622a CMake: Update provisioned CMake to version 3.18.3
This version should fix the iOS PCH builds and Ninja Multi-Config,
as well as the issues with AUTOMOC and Ninja.

Temporarily explicitly disable the pkg_config feature on Windows
hosts, because otherwise the configuration will break. The
FindPkgConfig module in 3.18 has some additional behavior for checking
if the found pkg-config works, and that's not handled by our
qt_build_internals_disable_pkg_config_if_needed function in qtbase.

Fixes: QTBUG-86862
Change-Id: I80514d3d7896ae09ab252aed10e86725fae0cc9c
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-09-25 08:58:20 +02:00
Alexandru Croitor
177b0b0ea4 CMake: Update provisioned CMake version to 3.17.4
This CMake version among other things, fixes a bug with
Ninja Multi-Config writing into the same response file
on Windows, which can cause wrong libraries to be linked
(mixing Debug and Release libs).

Also disable PCH for iOS configs, because that seems to be broken
again.

We can't upgrade to 3.18.2 because that breaks iOS PCH in a different
way than 3.17.4, and because of an AUTOMOC regression introduced when
using Ninja Multi-Config.

Fixes: QTBUG-85586
Change-Id: I04c08d3a8bfb88433f2d50f4d41d11fc0df3d7ec
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-08-21 17:45:48 +02:00
Alexandru Croitor
68134db435 Update provisioned CMake version to 3.17.2
This should fix the ninja deps issue we had on Windows with the
Ninja Multi-Config generator, where calling ninja a second time to
rebuild the project failed.

More details at https://gitlab.kitware.com/cmake/cmake/-/issues/20723

Change-Id: I0029e57fbc704120d2241499a87cad0ad40c2e50
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-26 21:57:20 +02:00
Alexandru Croitor
e9c2be7b6a Update provisioned CMake version to 3.17.0-rc2
We want to test debug_and_release builds with CMake as soon
as possible.

Change-Id: I7d4c0a4e33adc26129844ff34ea8df6b149e184f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-03-09 23:42:21 +01:00
Liang Qi
95c7b90309 Update CMake to version 3.16.0-rc4
Change-Id: I4fc1f412888e1915ae2110320c18fb39a9600b94
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-29 10:00:50 +00:00
Leander Beernaert
8eab11f696 Update CMake to version 3.15.5
Update required as there's a bug with setting the CXX_STANDARD on
android. Updating to this version fixes the issue.

Change-Id: I50b0bc2941e0919232b46bbf5b28133149878649
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-12 13:27:23 +00:00
Jędrzej Nowacki
7df4f93cb1 Fix provisioning of cmake on macOS
The script contains a bit of data duplication, one of the fields was
not updated.

This amends 463235a0bc.

Change-Id: Idb9e88eba1f1415a0ca29f2c3a003c8a844bb024
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-06-06 07:39:02 +00:00
Simon Hausmann
463235a0bc Bump cmake to 3.15-rc1
Same as for the recent Linux change.

Change-Id: I073411bcfa8cbd692a7770cdaad3a368c6f7108d
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-06-05 12:54:18 +00:00
Simo Fält
a7a31600b4 Provisioning: Update cmake to 3.11.3 on macos
It seems that cmake 3.6 had issues with more recent XCode. Since XCode 8
the sysroot folder might have been unversioned (MacOSX10.12.sdk ->
MacOSX.sdk). In that case older cmake can't detect correct SDK
version. This is causing issues when building Pyside2.

Change-Id: I09f0ed4fe6d15ba3d60aa3a6e9a9b3b9091996c8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-23 20:19:30 +00:00
Joni Jantti
6d1190aaa0 Provisioning: Use SetEnvVar helper function in scripts
Currently when adding an environment variable in provisioning we have
to check if the system is Ubuntu and use .profile instead of .bashrc.
This check should be done in a function so we don't have to duplicate
it for every provisioning script separately.

Change-Id: I2fa128032123e17d20dfb39cd3668e22e4bb0d55
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-26 13:12:41 +00:00
Heikki Halmet
2a28ce864b Split Common folder based on operating system families
This change will split common folder to four different folders:
Linux, Unix, Windows and MacOS. Each of these folders includes scripts
which are common for their operating system familes

Task-number: QTQAINFRA-1451
Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-01-10 07:58:26 +00:00