set GENERIC_LIB_VERSION and GENERIC_LIB_SOVERSION

Desktop / KDE / KDE Workspace - Sebastian Kügler [kde.org] - 4 October 2013 16:35 EDT

in top-level CMakeLists, so it gets found by the libs and those aren't installed with SOVERSION as prefix anymore (var expansion problem).

###

diff --git a/CMakeLists.txt b/CMakeLists.txt
index daa991e..32b8f38 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,12 @@ set(KDE4WORKSPACE_VERSION_MINOR 90)
set(KDE4WORKSPACE_VERSION_PATCH 1)
set(KDE4WORKSPACE_VERSION ${KDE4WORKSPACE_VERSION_MAJOR}.${KDE4WORKSPACE_VERSION_MINOR}.${KDE4WORKSPACE_VERSION_PATCH} )

+
+set(GENERIC_LIB_SOVERSION ${KDE4WORKSPACE_VERSION_MAJOR})
+
+set(GENERIC_LIB_VERSION "${KDE4WORKSPACE_VERSION_MAJOR}.${KDE4WORKSPACE_VERSION_MINOR}.${KDE4WORKSPACE_VERSION_PATCH}")
+
+
# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )

diff --git a/libs/taskmanager/CMakeLists.txt b/libs/taskmanager/CMakeLists.txt
index 88cee36..91008ef 100644
--- a/libs/taskmanager/CMakeLists.txt
+++ b/libs/taskmanager/CMakeLists.txt
@@ -67,7 +67,7 @@ endif()
# target_link_libraries(taskmanager kephal)
# endif (NOT KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)

-set_target_properties(taskmanager PROPERTIES VERSION 5.0.0 SOVERSION 5 )
+set_target_properties(taskmanager PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS taskmanager EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )

install(FILES

7834808 set GENERIC_LIB_VERSION and GENERIC_LIB_SOVERSION
CMakeLists.txt | 6 ++++++
libs/taskmanager/CMakeLists.txt | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)

Upstream: quickgit.kde.org


  • Share