| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Change-Id: I5ef26d617e3885a4d685bf1e78291541af4c92db
|
|
|
|
| |
Change-Id: I139059ba9b01ba7dd3ae7facc0b75d290f2bf5a5
|
|
|
|
| |
Change-Id: I0d67e471bd68a0c356c968282535a0b3758dc95e
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
Change-Id: If84835613855afc00c79eab4a382dc256d87cd08
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 04a3129c52b64d4c53b7a13cc525a38153e3eca1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
Task-number: QTQAINFRA-4325
Change-Id: I33095ecd14ce711516d5a13d70ffabf444c67392
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit 4d60c670ab2155332bfca799e1f5205273c0bc8e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
Task-number: QTBUG-90901
Change-Id: Ifd9ef0d982a1f1e4a3f454e3d5e4c7075f873c22
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit b2d0ef3f7ab36b93a51eb0bea14afe1e9fc5c0d1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: I7cafcda260fc1bda271135a2cd20472efc5e1b1f
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
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>
|