From eb420989682579d3fea7313ef87e1d2c44d3fcaf Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Sat, 24 Jan 2015 03:17:15 +0000
Subject: [PATCH] generic: normalize libraries versioning

---
 kscreensaver/libkscreensaver/CMakeLists.txt | 3 ++-
 kwalletd/backend/CMakeLists.txt             | 2 +-
 kwin/libkwineffects/CMakeLists.txt          | 4 ++--
 powerdevil/daemon/CMakeLists.txt            | 8 ++------
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/kscreensaver/libkscreensaver/CMakeLists.txt b/kscreensaver/libkscreensaver/CMakeLists.txt
index 39a95d25..b7ca8e42 100644
--- a/kscreensaver/libkscreensaver/CMakeLists.txt
+++ b/kscreensaver/libkscreensaver/CMakeLists.txt
@@ -10,7 +10,8 @@ set(kscreensaver_LIB_SRCS main.cpp kscreensaver.cpp)
 kde4_add_library(kscreensaver SHARED ${kscreensaver_LIB_SRCS})
 
 target_link_libraries(kscreensaver  ${KDE4_KIO_LIBS} ${X11_X11_LIB})
-set_target_properties(kscreensaver PROPERTIES VERSION 5.0.0 SOVERSION 5 DEFINE_SYMBOL MAKE_KSCREENSAVER_LIB)
+set_target_properties(kscreensaver PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+set_target_properties(kscreensaver PROPERTIES DEFINE_SYMBOL MAKE_KSCREENSAVER_LIB)
 
 install(TARGETS kscreensaver EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES screensaver.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
diff --git a/kwalletd/backend/CMakeLists.txt b/kwalletd/backend/CMakeLists.txt
index 02f3445c..747564bb 100644
--- a/kwalletd/backend/CMakeLists.txt
+++ b/kwalletd/backend/CMakeLists.txt
@@ -21,7 +21,7 @@ kde4_add_library(kwalletbackend SHARED ${kwalletbackend_LIB_SRCS})
 
 target_link_libraries(kwalletbackend ${KDE4_KDEUI_LIBS} ${LIBGCRYPT_LIBRARIES})
 if(QGPGME_FOUND)
-target_link_libraries(kwalletbackend ${QGPGME_LIBRARIES} )
+    target_link_libraries(kwalletbackend ${QGPGME_LIBRARIES} )
 endif(QGPGME_FOUND)
 
 set_target_properties(kwalletbackend PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
diff --git a/kwin/libkwineffects/CMakeLists.txt b/kwin/libkwineffects/CMakeLists.txt
index 4a218f5d..6c37e798 100644
--- a/kwin/libkwineffects/CMakeLists.txt
+++ b/kwin/libkwineffects/CMakeLists.txt
@@ -38,7 +38,7 @@ target_link_libraries(kwineffects
     ${kwineffects_XLIB_LIBS}
     ${kwineffects_XCB_LIBS}
 )
-set_target_properties(kwineffects PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+set_target_properties(kwineffects PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
 set_target_properties(kwineffects PROPERTIES OUTPUT_NAME ${KWIN_NAME}effects)
 
 install(TARGETS kwineffects EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -62,7 +62,7 @@ macro( KWIN4_ADD_GLUTILS_BACKEND name glinclude )
     if(OPENGL_EGL_FOUND)
         target_link_libraries(${name} ${OPENGLES_EGL_LIBRARY})
     endif()
-    set_target_properties(${name} PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+    set_target_properties(${name} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
     target_link_libraries(${name} ${ARGN})
     target_link_libraries(${name} LINK_INTERFACE_LIBRARIES ${ARGN})
 
diff --git a/powerdevil/daemon/CMakeLists.txt b/powerdevil/daemon/CMakeLists.txt
index 713a07e0..2544fccf 100644
--- a/powerdevil/daemon/CMakeLists.txt
+++ b/powerdevil/daemon/CMakeLists.txt
@@ -3,11 +3,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
 
 add_subdirectory(actions)
 
-set(POWERDEVIL_CORE_VERSION_MAJOR 0)
-set(POWERDEVIL_CORE_VERSION_MINOR 1)
-set(POWERDEVIL_CORE_VERSION_MICRO 0)
-set(POWERDEVIL_CORE_VERSION_STRING ${POWERDEVIL_CORE_VERSION_MAJOR}.${POWERDEVIL_CORE_VERSION_MINOR}.${POWERDEVIL_CORE_VERSION_MICRO})
-
 # Add bundled actions
 set(powerdevil_bundled_actions_SRCS
     actions/bundled/suspendsession.cpp
@@ -46,7 +41,8 @@ qt4_add_dbus_adaptor(powerdevilcore_SRCS actions/bundled/org.kde.Solid.PowerMana
                      actions/bundled/suspendsession.h PowerDevil::BundledActions::SuspendSession)
 
 kde4_add_library(powerdevilcore SHARED ${powerdevilcore_SRCS} ${powerdevil_bundled_actions_SRCS})
-set_target_properties(powerdevilcore PROPERTIES VERSION ${POWERDEVIL_CORE_VERSION_STRING} SOVERSION ${POWERDEVIL_CORE_VERSION_MAJOR})
+
+set_target_properties(powerdevilcore PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 
 target_link_libraries(powerdevilcore
     ${KDE4_KDECORE_LIBS}