From b066c41837c12fbc474f2dd90e94603bda25c359 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Mon, 2 Nov 2015 17:57:05 +0200
Subject: [PATCH] generic: split version from export cmake config file

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 CMakeLists.txt                | 33 ++++++++++++++++++++++++---------
 KDE4WorkspaceConfig.cmake.in  |  8 +-------
 KDE4WorkspaceVersion.cmake.in |  7 +++++++
 3 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 KDE4WorkspaceVersion.cmake.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7eeb2786..d955574a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -304,14 +304,29 @@ make_install_path_absolute(KDE4WORKSPACE_SERVICETYPES_DIR ${SERVICETYPES_INSTALL
 
 set(KDE4WORKSPACE_TARGET_PREFIX KDE4Workspace__)
 
-configure_file(KDE4WorkspaceConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake" @ONLY)
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake
-        DESTINATION ${LIB_INSTALL_DIR}/cmake/KDE4Workspace)
-
-install(EXPORT kdeworkspaceLibraryTargets 
-        NAMESPACE ${KDE4WORKSPACE_TARGET_PREFIX}
-        DESTINATION ${LIB_INSTALL_DIR}/cmake/KDE4Workspace
-        FILE KDE4WorkspaceLibraryTargets.cmake )
+configure_file(
+    KDE4WorkspaceConfig.cmake.in
+    "${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake"
+    @ONLY
+)
+configure_file(
+    KDE4WorkspaceVersion.cmake.in
+    "${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceVersion.cmake"
+    @ONLY
+)
+
+install(
+    FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceVersion.cmake
+    DESTINATION ${LIB_INSTALL_DIR}/cmake/KDE4Workspace
+)
+
+install(
+    EXPORT kdeworkspaceLibraryTargets 
+    NAMESPACE ${KDE4WORKSPACE_TARGET_PREFIX}
+    DESTINATION ${LIB_INSTALL_DIR}/cmake/KDE4Workspace
+    FILE KDE4WorkspaceLibraryTargets.cmake
+)
 
 
diff --git a/KDE4WorkspaceConfig.cmake.in b/KDE4WorkspaceConfig.cmake.in
index 622245f4..c69db9fb 100644
--- a/KDE4WorkspaceConfig.cmake.in
+++ b/KDE4WorkspaceConfig.cmake.in
@@ -1,10 +1,4 @@
-# KDE4WorkspaceConfig.cmake is generated by CMake from kdebase/workspace/KDE4WorkspaceConfig.cmake.in
-
-# Do we have a version number for kdebase/workspace ? Alex
-set(KDE4WORKSPACE_VERSION_MAJOR @KDE_VERSION_MAJOR@)
-set(KDE4WORKSPACE_VERSION_MINOR @KDE_VERSION_MINOR@)
-set(KDE4WORKSPACE_VERSION_PATCH @KDE_VERSION_RELEASE@)
-set(KDE4WORKSPACE_VERSION       "${KDE4WORKSPACE_VERSION_MAJOR}.${KDE4WORKSPACE_VERSION_MINOR}.${KDE4WORKSPACE_VERSION_PATCH}")
+# KDE4WorkspaceConfig.cmake is generated by CMake from kde-workspace/KDE4WorkspaceConfig.cmake.in
 
 # set the directories
 if(NOT KDE4WORKSPACE_INSTALL_DIR)
diff --git a/KDE4WorkspaceVersion.cmake.in b/KDE4WorkspaceVersion.cmake.in
new file mode 100644
index 00000000..836556f8
--- /dev/null
+++ b/KDE4WorkspaceVersion.cmake.in
@@ -0,0 +1,7 @@
+# KDE4WorkspaceVersion.cmake is generated by CMake from kde-workspace/KDE4WorkspaceVersion.cmake.in
+
+# Do we have a version number for kdebase/workspace ? Alex
+set(KDE4WORKSPACE_VERSION_MAJOR @KDE_VERSION_MAJOR@)
+set(KDE4WORKSPACE_VERSION_MINOR @KDE_VERSION_MINOR@)
+set(KDE4WORKSPACE_VERSION_PATCH @KDE_VERSION_RELEASE@)
+set(KDE4WORKSPACE_VERSION       "${KDE4WORKSPACE_VERSION_MAJOR}.${KDE4WORKSPACE_VERSION_MINOR}.${KDE4WORKSPACE_VERSION_PATCH}")
-- 
2.11.0