summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2020-07-29 12:40:25 +0200
committerOliver Wolff <oliver.wolff@qt.io>2020-07-29 14:01:32 +0200
commit28aea79f9f978a7d0f62d802ed36c84c813eed36 (patch)
tree3e5d64449163b45f350d4080f1fd6a7748d4797f
parentfd3d1f36f70d871d9140762c8b51332fbb64e729 (diff)
downloadqtconnectivity-28aea79f9f978a7d0f62d802ed36c84c813eed36.tar.gz
Update top level cmakelists with pro2cmake and add resulting cmake.conf
Change-Id: Id09067de392240e9c4d3b2ab50edfb853c36574f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--.cmake.conf1
-rw-r--r--.prev_CMakeLists.txt3
-rw-r--r--CMakeLists.txt1
3 files changed, 4 insertions, 1 deletions
diff --git a/.cmake.conf b/.cmake.conf
new file mode 100644
index 00000000..93054804
--- /dev/null
+++ b/.cmake.conf
@@ -0,0 +1 @@
+set(QT_REPO_MODULE_VERSION "6.0.0")
diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt
index 1326798b..5285aa7f 100644
--- a/.prev_CMakeLists.txt
+++ b/.prev_CMakeLists.txt
@@ -2,8 +2,9 @@
cmake_minimum_required(VERSION 3.15.0)
+include(.cmake.conf)
project(connectivity_FIXME
- VERSION 6.0.0
+ VERSION "${QT_REPO_MODULE_VERSION}"
DESCRIPTION "Qt connectivity_FIXME Libraries"
HOMEPAGE_URL "https://qt.io/"
LANGUAGES CXX C
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34451f02..4ef41583 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@
cmake_minimum_required(VERSION 3.15.0)
+include(.cmake.conf)
project(QtConnectivity # special case
VERSION 6.0.0
DESCRIPTION "Qt Connectivity Libraries" # special case