summaryrefslogtreecommitdiffstats
path: root/.cmake.conf
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@qt.io>2021-07-01 10:56:42 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-08-26 18:37:05 +0000
commite36fc521a9a48c8171c3213b72d74b387ec3c212 (patch)
treec374a72c12abb17a163108ad28679b2bd837901c /.cmake.conf
parent4f5f3c0e086e65a55b81fad833b74393869dcf68 (diff)
Support builds with Conan
Provide conanfile.py recipe to support building this module with Conan. The conanfile.py recipe inherits the main functionality from base class located in qt-conan-common.git. 'qt-configure-module(.bat)' and cmake is used for the builds. Dependencies (Conan requirements) are defined by the base class implementation which reads those from the 'dependencies.yaml' which is also used by the Coin/CI. Task-number: QTBUG-94909 Change-Id: Ibe186eba4c3177c6f0cc7e397c395df0c8cb6d20 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit a68e93ade8ae39e2b11904d2c3115c9d69e87932) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to '.cmake.conf')
-rw-r--r--.cmake.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/.cmake.conf b/.cmake.conf
index 4e73b3d60..4aa8eb1fd 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1 +1,2 @@
set(QT_REPO_MODULE_VERSION "6.2.0")
+set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")