summaryrefslogtreecommitdiffstats
path: root/conanfile.py
Commit message (Collapse)AuthorAgeFilesLines
* Conan: Inherit recipe class from QtLeafModule for common functionalityIikka Eklund2021-08-261-103/+41
| | | | | | | | | | | | | | | | | | | The recipe uses Conan's supported way to inherit from a given base class via 'python_requires_extend'. The qt-conan-common package implements a base class for Qt leaf module recipes. The build steps in leaf modules are mostly identical so it makes sense to put those in the base class. Dependencies are read by the base class from the 'dependencies.yaml' which is the same file the CI system uses. Task-number: QTBUG-94758 Change-Id: I61baf3f96a027ee374af6b16ba370fb85a2e698c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 91974f11f12091d94d5c5f85a3368aa1844ee580) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Conan: Use "scm" revision mode when exporting from .git repositoryIikka Eklund2021-04-131-1/+3
| | | | | | | | | | | | | | | We have two use cases where the conan export is being executed: - Conan export from src tar ball - .git directory is not present - Coin/CI: conan export from git repository The "scm" feature will not work if the ".git" repository does not exist. If this is the case then use the default "hash" mode for the recipe revision. Pick-to: 6.1 Change-Id: If84835613855afc00c79eab4a382dc256d87cd08 Reviewed-by: Toni Saario <toni.saario@qt.io>
* Add "scm" attribute to conanfile.pyIikka Eklund2021-03-151-0/+1
| | | | | | | | | | | | | We want to match the commit ID along with the RREV (recipe revision). This way we can pin exact Conan packages to known sha1/tag which makes releasing easier. https://docs.conan.io/en/latest/reference/conanfile/attributes.html#revision-mode Pick-to: 6.1 Task-number: QTQAINFRA-4325 Change-Id: I33095ecd14ce711516d5a13d70ffabf444c67392 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Bump versionJani Heikkinen2021-02-181-1/+1
| | | | Change-Id: I0f53fed0b1f65bbeafa62c96d19bf19d1dc6d88a
* Conan: Use the 'shared' option value of the Qt buildIikka Eklund2021-02-081-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Default to the value of the prebuilt Qt build. The 'default' needs to be added as valid option in the list which will be used by default if no value is given by the user or via the conan profile. The user is still able to override this via the profile or from command line if needed: "conan install ... -o shared=False" CMakeCache.txt: - "conan install ..." - BUILD_SHARED_LIBS:BOOL=ON - "conan install ... -o shared=True" - BUILD_SHARED_LIBS:BOOL=ON - "conan install ... -o shared=False" - BUILD_SHARED_LIBS:BOOL=OFF Pick-to: 6.1 Task-number: QTBUG-90901 Change-Id: Ifd9ef0d982a1f1e4a3f454e3d5e4c7075f873c22 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* conanfile.py: Use QTDIR instead of QT_PATHIikka Eklund2021-02-011-4/+4
| | | | | | | | | | | | | There's an established environment variable for this though, QTDIR. This environment variable is also set by Qt Creator by default. So the Conan recipes should accept this environment variable instead. This requires a change in the matching conan profile files where the path to Qt installation is injected to env. Task-number: QTBUG-90583 Change-Id: I0beaff832325008dd1778a03d2885b6190def754 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Bump Qt version to 6.1.0 in conanfile.pyJani Heikkinen2021-01-131-2/+2
| | | | | | Change-Id: I7cafcda260fc1bda271135a2cd20472efc5e1b1f Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Conan: Fix iOS buildsIikka Eklund2020-12-021-0/+13
| | | | | | | | | | | | | | | | | | | | Conan passes some autodetected iOS related CMake options like CMAKE_SYSTEM_NAME, CMAKE_OSX_ARCHITECTURES, CMAKE_OSX_SYSROOT, which apparently don't work out of the box. - Explicitly pass 'iOS' for CMAKE_SYSTEM_NAME - Remove the explicit sysroot 'CMAKE_OSX_SYSROOT', let CMake detect the sysroots, to ensure that multi-arch builds work. - Remove the conan provided architecture 'CMAKE_OSX_ARCHITECTURES', instead rely on the architectures set by the Qt toolchain file, which with official Qt packages most likely means multi-arch iOS. Task-number: QTBUG-89020 Change-Id: I3c559f00f9391edf68bf88348baae561dc5f0991 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 2ed189225580f49695560b59f4fe341da4444253) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add conanfile.py to support building with ConanIikka Eklund2020-11-101-0/+122
Support building qt3d with conan against Qt6 base binary package. The build recipe expects to locate QT_PATH from env. The 'qt-cmake(.bat)' is used for the build. 'CMAKE_TOOLCHAIN_FILE' is used to pick the toolchain file for cross compilations. For Android builds 'ANDROID_SDK_ROOT' and 'ANDROID_NDK_ROOT' need to be passed from env. The qt3d build expects the following from env: - QT_FEATURE_qt3d_assimp - QT_FEATURE_qt3d_opengl_renderer - QT_FEATURE_qt3d_rhi_renderer Change-Id: I9d1bea5e40f0196f02d8cdd8ef0d0b03b8b5c45b Reviewed-by: Mike Krus <mike.krus@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 01:43:55 +0000