aboutsummaryrefslogtreecommitdiffstats
path: root/coin
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/wip/cmake' into devSimon Hausmann2019-12-1321-31/+216
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merges merely the provisioning changes needed to perform cmake builds in the CI. The platform configuration changes will be applied incremental as we merge support in the individual modules. Conflicts: coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh Added ninja to coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh just to force re-provisioning. Removed module_config.yaml because that breaks license check in qmake builds. Change-Id: Ic074c0c881404f4361e61f66130c0cb07f5e8b84
| * Update vcpkg snapshotAlexandru Croitor2019-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | The snapshot uses the previous snapshot as a based. It was rebased on latest master as of 2019-12-05, and also contains cherry-picked patches to target iOS. Change-Id: I9fc0c39856fdb255533f6c71d27f5749894b6bea Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update CMake to version 3.16.0-rc4Liang Qi2019-11-293-12/+14
| | | | | | | | | | | | Change-Id: I4fc1f412888e1915ae2110320c18fb39a9600b94 Reviewed-by: Qt CMake Build Bot Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Merge remote-tracking branch 'origin/dev' into wip/cmakeLiang Qi2019-11-2834-45/+401
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update the Windows config to use MSVC2019 instead of 2017 to circumvent the issue that vcpkg is building libraries with the latest compiler it finds (MSVC 2019), but Qt is building with 2017. Conflicts: coin/platform_configs/default.yaml coin/platform_configs/qt5.yaml coin/platform_configs/qtsaferenderer.yaml Change-Id: I88deb114e171046b50fc617ab6bc18b707d61486
| * | Bump vcpkg to a new snapshotSimon Hausmann2019-11-133-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some patches were upstreamed and this beings the version in line with what we need for Android. This patch also centralizes the version into a shared file, for future use. Change-Id: I90973f9bfcbc1bfeb2d11e2ee7a7fa4e4f6a58a2 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update CMake to version 3.15.5Leander Beernaert2019-11-123-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Merge remote-tracking branch 'origin/dev' into wip/cmakeSimon Hausmann2019-11-11150-823/+1955
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.yaml coin/platform_configs/qt5.yaml coin/platform_configs/qtbase.yaml coin/platform_configs/qtdeclarative.yaml coin/platform_configs/qtsaferenderer.yaml coin/platform_configs/qtsdk.yaml coin/provisioning/common/linux/cmake_linux.sh coin/provisioning/common/windows/cmake.ps1 Change-Id: I37bb513e3be19e4de4003679f8528677e57c09ee
| * | | Work around cmake issue breaking C++ feature detection on AndroidSimon Hausmann2019-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per https://gitlab.kitware.com/cmake/cmake/issues/19515, the version of CMake we're currently using in the CI has an issue detecting clang as GNU compatible C++ frontend and thus fails to convert the values in the CMAKE_C/CXX_STANDARD variables to compiler flags correctly. Work around this for now as suggested in the upstream ticket. We can remove this when upgrading to a newer cmake version. Change-Id: I0ea37503c086ff86e05c50b812474522a7737b20 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | platform_configs: add Android arm64 build on RHEL 7.6 hostLiang Qi2019-10-113-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * install vcpkg and for android * a remaining issue in vcpkg: https://github.com/microsoft/vcpkg/issues/8506 Task-number: QTBUG-78945 Change-Id: I484612e2157bf1c1142934cc4f27729e8be37b89 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
| * | | provisioning: update python to 3.7 on macosLiang Qi2019-10-111-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-3271 Change-Id: Ic1645a8b5bc94b0ce6ff58352891af0beabd7649 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | | platform_configs: add a RHEL 7.6 buildLiang Qi2019-10-105-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A preparing for having android build later. * install gcc 7.x * install git 2.x * install a few other dependencies Change-Id: I18f05bdfb78c92b7f05f67609613b5271b400f91 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
| * | | Provisioning: install libsdl2 on ubuntuLiang Qi2019-10-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3c547c1e44ebc734fd9908db2828440bc13f55f5 Reviewed-by: Qt CMake Build Bot Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Build examples on at least one configurationAlexandru Croitor2019-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ubuntu Linux in this case. Change-Id: Ic17b3f4880105e639340ffc07c52de27245612d7 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | platform_configs: remove CMAKE_VERBOSE_MAKEFILE optionLiang Qi2019-09-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which is not in use when ninja got selected. Change-Id: I1841471dee0f58e4a54cd05f33f4ba7c3a1a8251 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLiang Qi2019-09-23161-2085/+4618
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/default.txt Change-Id: I78eb6b6522c678fb40f1202c0040c1c87ff890a6
| * | | | Move the developer build from static suse to ubuntuLiang Qi2019-09-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we don't run tests on static build. Change-Id: I10c7851ecebcfa3691690c6bc26a352fd5799965 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Add empty build instructions to allow for qt5 integrationsSimon Hausmann2019-09-051-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build shall be empty for now, but this allow testing module wide updates. Change-Id: I47bcdae274edb2ec000bb57480d74614d3b55833 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Remove "-DBUILD_TESTING=OFF" from default configsJędrzej Nowacki2019-07-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not needed. QtBase build instructions add it explicitly, as the tests are build with a separate cmake call (to compile tests against differently installed Qt). Change-Id: I22fe26d4bdb9dd237df76246607d823f4b4fa315 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Do not specify compiler binary name directlyJędrzej Nowacki2019-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a code that handles that implicitly so it is not needed anymore. Change-Id: I4aea2f55f9efd24ec7cf22cb8b413789ec3e7fea Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Remove DisableTests in featuresLiang Qi2019-06-241-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least we can get tests built now. Change-Id: I7830f495002083023651ca5da3c6c39e745f920f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Move ICC compiler name setup to instructions levelJędrzej Nowacki2019-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That way we can simplify product level configuration. Change-Id: Ib855c1873d3b4566b437845ab18182a0db8e45b9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Enable freetype on the Windows buildSimon Hausmann2019-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the newer vcpkg this works now. Change-Id: I8408041b338ffbe74aaec9afbb1cf8cbf3bb1d92 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Update vcpkg installationSimon Hausmann2019-06-212-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the latest snapshot, fetch the package set from the repo itself and set the VCPKG_ROOT environment variable as that's the vcpkg documented interface. The qt specific triplet defaults to static linkage, which allows removing the %PATH% handling and resembles the same setup as in Qt 5 where we linked the 3rd-party code statically into qt. Change-Id: I789d61b5c7258674c2dd80403efaeb891c8f75c7 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Increase CI test coverage by changing GCC to ICCJędrzej Nowacki2019-06-172-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is already other place in which we compile with GCC on Linux. As we use ninja now, it has to be installed on open suse too. Cmake port depends on system libraries therefore pcre2 needs to be installed. Change-Id: I92e16cc31fa60b4c591e71b58cd7235540065ac6 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Add a new Linux config that builds a static developer buildAlexandru Croitor2019-06-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8e40ed674cf0a72223a0180296db8eaa6eb6da06 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Enable windows and macOS builds for yaml and cmakeLiang Qi2019-06-121-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I91aea0fe59e77cf95f7441c646e95d038f0e0032 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Update cmake sha1 for WindowsJędrzej Nowacki2019-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It amends a6d159c9e714a6b743ae13b96e2ebcd241c50a01. Seems that I computed sha1 for a wrong file. Change-Id: Ie524b2c825189a91cd6b809ff7991af20bd301b1 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Bump cmake to 3.15-rc1 on WindowsJędrzej Nowacki2019-06-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as for the recent Linux and macOS change. Change-Id: Ic7ae30333f8cd58925f697c19ca046ceac49cd32 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Fix provisioning of cmake on macOSJędrzej Nowacki2019-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script contains a bit of data duplication, one of the fields was not updated. This amends 463235a0bcdf42ece5be2d0b27dfb81cb46d5dfb. Change-Id: Idb9e88eba1f1415a0ca29f2c3a003c8a844bb024 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Fix paths when installing cmake on macOSJędrzej Nowacki2019-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ammends d44a7a5f145ebdd49e09da358850d102f089c0df. Change-Id: I8e8644a1f8677e6e62fb6356cc6c3533ec40e454 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Fix path to cmake installation scriptSimon Hausmann2019-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amends commit d44a7a5f145ebdd49e09da358850d102f089c0df Change-Id: I52926a8e8c488beaeb70c9bf0222c7caa0ccfe9c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Bump cmake to 3.15-rc1Simon Hausmann2019-06-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as for the recent Linux change. Change-Id: I073411bcfa8cbd692a7770cdaad3a368c6f7108d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Install cmake from binaries instead of from sourceSimon Hausmann2019-06-052-73/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The from-source installation originates from a point in time where there was no cmake release with binaries that were sufficient. That is not the case with 3.15-rc1. Change-Id: I385016969f21c194b25334e3af8af7283fc5873f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Upgrade CMake to 3.15.0-rc1Jean-Michaël Celerier2019-06-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I374631637a6521621dfa702aa2390998ef124d24 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Provisioning: Add ninja to the list of installed packagesLiang Qi2019-05-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I018e7812fc95c1db841720294a700a391246251d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Move some configure arguments to qtbase instructionsJędrzej Nowacki2019-05-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These arguments are specific to the build and changes to them are _not_ affecting configuration. Change-Id: I701b7d83511c5f80b88c5aab09eae3ecb6df74a1 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Use yaml configuration file for cmake supportLiang Qi2019-05-208-45/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is needed by new coin to support cmake build as only there configuration arguments are separated from features. Change-Id: I960ec693f80803fd86de472efc953a38358ae14e Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Provisioning: install vcpkg and some packages on Windows 10Liang Qi2019-05-032-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib8ba5b30ebcfb5e66ce5de65c9287807943d7166 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Provisioning: install latest cmake - 3.14.1 on WindowsLiang Qi2019-05-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I461589be02c26e048d5975d59600376022d728fd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Provisioning: Add Windows 10+MSVC2017 to test cmake buildLiang Qi2019-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7acd16f12ed0e5d0fb7a9961c9099b9e4f1a2401 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Provisioning: Add freetype to the list of installed packages on macOSLiang Qi2019-05-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic2df763fc027e3a588723a37a70354d3becc29a6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Provisioning: Add pcre2 to the list of installed packagesLiang Qi2019-05-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This external dependency is now required by QtCore on macOS. Change-Id: I4eef98e8e54f00861c1e9469dfbac61979d652e8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Provisioning: build cmake from source on macOS 10.13Liang Qi2019-05-032-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifada0cf62d1e75e8cab3e3bbe6250718747d0703 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Add macOS 10.13 to test cmake buildLiang Qi2019-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I676db571d3a14f2abd823d41905b95a070c66f59 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLiang Qi2019-05-03103-406/+605
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/default.txt coin/platform_configs/qt5.txt coin/platform_configs/qtbase.txt Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
| * | | | | Provisioning: Add pcre2 to the list of installed packagesLiang Qi2019-03-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This external dependency is now required by QtCore on Linux. Change-Id: I47ba758e86e110c33f9e2bc7607ff9352892470a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Provisioning: build cmake from sourceLiang Qi2019-03-153-5/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b4006250a7e019d7c38eaf3c29ae75a3a65300c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Add double-conversion to the list of installed packagesSimon Hausmann2019-03-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This external dependency is now required by QtCore on Linux. Change-Id: I910a3e17ec4d6c10ad4e1a9dfc31d1340fe110de Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | | Cmake: install latest 3.14.0-rc3 packages on LinuxLiang Qi2019-03-131-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5d88ac6c9180c24538de7c386d026f2d6547ccf4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | | Shrink build configurations and modulesSimon Hausmann2019-03-133-55/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change disables all modules except qtbase from the build and also reduces the build to one configuration. This is not intended to be merged back to qt5/dev but rather a starting point to build up cmake builds in the CI platform by platform and module by module. Change-Id: I899da885dacb32188a0d02b2301df3d4450c0589 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 08:29:50 +0000