[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kwin/fredrik/vulkan] /: cmake: define KWIN_VERSION_MAJOR/MINOR/PATCH
From:       Fredrik_Höglund <null () kde ! org>
Date:       2018-02-16 17:01:48
Message-ID: E1emjOO-0004Yx-DN () code ! kde ! org
[Download RAW message or body]

Git commit 5356e6f06a41c3cbc8bffe3495d40a276f1f821c by Fredrik H=C3=B6glund.
Committed on 16/02/2018 at 16:58.
Pushed by fredrik into branch 'fredrik/vulkan'.

cmake: define KWIN_VERSION_MAJOR/MINOR/PATCH

This will be used when creating a Vulkan instance.

M  +1    -3    CMakeLists.txt
M  +3    -0    config-kwin.h.cmake

https://commits.kde.org/kwin/5356e6f06a41c3cbc8bffe3495d40a276f1f821c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d899abe79..5347c6fc4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.7 FATAL_ERROR)
 =

-project(KWIN)
-set(PROJECT_VERSION "5.12.80")
-set(PROJECT_VERSION_MAJOR 5)
+project(KWIN VERSION 5.12.80)
 =

 set(QT_MIN_VERSION "5.9.0")
 set(KF5_MIN_VERSION "5.42.0")
diff --git a/config-kwin.h.cmake b/config-kwin.h.cmake
index c9ca40fa1..6d9cdddde 100644
--- a/config-kwin.h.cmake
+++ b/config-kwin.h.cmake
@@ -5,6 +5,9 @@
 #define KWIN_INTERNAL_NAME_X11 "${KWIN_INTERNAL_NAME_X11}"
 #define KWIN_CONFIG "${KWIN_NAME}rc"
 #define KWIN_VERSION_STRING "${PROJECT_VERSION}"
+#define KWIN_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}
+#define KWIN_VERSION_MINOR ${PROJECT_VERSION_MINOR}
+#define KWIN_VERSION_PATCH ${PROJECT_VERSION_PATCH}
 #define XCB_VERSION_STRING "${XCB_VERSION}"
 #define KWIN_KILLER_BIN "${CMAKE_INSTALL_FULL_LIBEXECDIR}/kwin_killer_help=
er"
 #define KWIN_RULES_DIALOG_BIN "${CMAKE_INSTALL_FULL_LIBEXECDIR}/kwin_rules=
_dialog"

[prev in list] [next in list] [prev in thread] [next in thread]