diff options
| author | Iikka Eklund <iikka.eklund@qt.io> | 2021-05-27 11:24:35 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-21 13:50:41 +0000 |
| commit | dc9d23451ea680495b87205f35356c77d0f3ce7d (patch) | |
| tree | 330b27540b1fd3f0fc5f7e467f7a400a57dfbdce /.cmake.conf | |
| parent | a1a051f792afb11fe9610b5a4f369e8e494075a3 (diff) | |
Conan: Read status flag from .cmake.conf
The status information (alpha1, beta2, rc3, ...) needs to be part of
the Conan package reference.
As Conan supports semantic versioning the best place to put the status
is to append it to the version string:
qtbase/6.2.0-alpha1@qt/everywhere
qtbase/6.2.0-beta2@qt/everywhere
qtbase/6.2.0-rc3@qt/everywhere
qtbase/6.2.0@qt/everywhere
Other Conan packages declaring a dependency can use e.g. syntax:
# notice the asterix character after version
self.requires(f"qtbase/[<=<version>, include_prerelease=True}]@..)
This way the status information is not in the Conan channel part and
downstream consumers of the Conan package does not need to update
the dependency (Conan reference string) every time the version changes.
Put the status information next to Qt version string in .cmake.cache.
Task-number: QTBUG-94385
Change-Id: Ib277f99ea1e87253b93f59e463bd6c7dd8b3203e
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 08448a5f48748fec88c52659361af3546196bd7f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to '.cmake.conf')
| -rw-r--r-- | .cmake.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.cmake.conf b/.cmake.conf index 099f7e7563..a63f70d6b9 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,4 +1,5 @@ set(QT_REPO_MODULE_VERSION "6.2.0") +set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") # Minimum requirement for building Qt set(QT_MIN_SUPPORTED_CMAKE_VERSION "3.16") |