aboutsummaryrefslogtreecommitdiffstats
path: root/coin/conan
Commit message (Collapse)AuthorAgeFilesLines
* Update conan profilesToni Saario2022-02-2854-208/+300
| | | | | | | | | | | | | | | | | | | | | | Split the end user profile variants in two, e.g.: linux-x86_64-gcc -> linux-x86_64-gcc # 1 baseprofiles/linux-x86_64-gcc # 2 1) This is still the end user variant but this includes the counterpart from 3rdparty subfolder 2) This contains those settings and options that are needed for 3rd party depedencies like icu Task-number: QTBUG-99213 Pick-to: 6.2 6.3 Change-Id: Ia6d7d9c5759848ff339cf8f50a40b10dfd9877d6 Reviewed-by: Simo Fält <simo.falt@qt.io>
* Conan: Provide separate build profiles for end users and CIIikka Eklund2021-11-2532-44/+110
| | | | | | | | | | | | | | | | | | The CI uses e.g. "sccache" which is rarely used outside CI systems. Also openssl install directories in the build profiles are specific to CI build agents. Also headersclean option should be CI specific. Split the current profiles in two: the CI specific profile defines only the CI related details and includes the matching profile for the end users. The profile which includes other profile(s) will override the Settings or Options if redefined. Pick-to: 6.2 Task-number: QTQAINFRA-4619 Change-Id: If69e8c0c283655475671fcb0ca739087cd9d2567 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Conan: Update build profilesIikka Eklund2021-11-0813-15/+13
| | | | | | | | | | | Remove mutually exclusive options. Set the 'build_type' correctly so that it reflects the used build Options. Pick-to: 6.2 Change-Id: I40b139898d722583c0fc245f3f8c60657a42d26a Reviewed-by: Toni Saario <toni.saario@qt.io>
* Coin:Android: set ANDROID_SDK_ROOT explicitlyAssam Boudjelthia2021-10-228-8/+8
| | | | | | | | | | | | ... and remove ANDROID_{SDK,NDK}_HOME as they are deprecated and might not work even. Pick-to: 6.2 Task-number: QTBUG-97002 Change-Id: Ie6fe93eb91fad0153aee795b73a43e84e37c8127 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Conan: Scope qtbase related options to qtbase recipe onlyIikka Eklund2021-10-0716-144/+144
| | | | | | | | | | | Some option names supported by qtbase Conan build recipe conflict with other Conan package recipes, e.g. ICU which also supports 'shared' option but with different supported option values. Scope all qtbase related options in profiles to qtbase only. Change-Id: I4c8bc2b7f5ee7cb69f3b83ef209ddda809719d73 Reviewed-by: Toni Saario <toni.saario@qt.io>
* Add Conan profilesIikka Eklund2021-09-0616-0/+361
Create conan profile per packaging configuration. Profiles will carry configuration information to the builds conan does. Profiles allow users to replicate identical configurations to the packaging configurations and reuse existing binaries. Change-Id: I50a2a4edbedbf56774bd4ceaae268928f8ed00e0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>