use standard way to version applications in Plasma

This commit is contained in:
Jonathan Riddell 2014-08-20 15:43:27 +02:00
parent 5f439cea99
commit dc554ed256
4 changed files with 9 additions and 15 deletions

View file

@ -1,4 +1,6 @@
project(KWIN) project(KWIN)
set(PROJECT_VERSION "5.0.95")
set(PROJECT_VERSION_MAJOR 5)
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
set(QT_MIN_VERSION "5.3.0") set(QT_MIN_VERSION "5.3.0")
@ -195,16 +197,8 @@ endif()
set(KWIN_NAME "kwin") set(KWIN_NAME "kwin")
set(KWIN_INTERNAL_NAME_X11 "kwin_x11") set(KWIN_INTERNAL_NAME_X11 "kwin_x11")
set(KWIN_INTERNAL_NAME_WAYLAND "kwin_wayland") set(KWIN_INTERNAL_NAME_WAYLAND "kwin_wayland")
set(KWIN_VERSION_MAJOR 5)
set(KWIN_VERSION_MINOR 0)
set(KWIN_VERSION_PATCH 1)
set(KWIN_VERSION ${KWIN_VERSION_MAJOR}.${KWIN_VERSION_MINOR}.${KWIN_VERSION_PATCH} )
set(KWIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(KWIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(GENERIC_LIB_SOVERSION ${KWIN_VERSION_MAJOR})
set(GENERIC_LIB_VERSION "${KWIN_VERSION_MAJOR}.${KWIN_VERSION_MINOR}.${KWIN_VERSION_PATCH}")
if(KWIN_PLASMA_ACTIVE) if(KWIN_PLASMA_ACTIVE)
set(KWIN_BUILD_DECORATIONS OFF) set(KWIN_BUILD_DECORATIONS OFF)
set(KWIN_BUILD_KCMS OFF) set(KWIN_BUILD_KCMS OFF)
@ -514,8 +508,8 @@ endif()
add_library(kwin SHARED ${kwin_KDEINIT_SRCS}) add_library(kwin SHARED ${kwin_KDEINIT_SRCS})
set_target_properties(kwin PROPERTIES set_target_properties(kwin PROPERTIES
VERSION ${GENERIC_LIB_VERSION} VERSION ${PROJECT_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION} SOVERSION ${PROJECT_VERSION_MAJOR}
) )
target_link_libraries(kwin ${kwinLibs}) target_link_libraries(kwin ${kwinLibs})

View file

@ -7,7 +7,7 @@
#define KWIN_NAME "${KWIN_NAME}" #define KWIN_NAME "${KWIN_NAME}"
#define KWIN_INTERNAL_NAME_X11 "${KWIN_INTERNAL_NAME_X11}" #define KWIN_INTERNAL_NAME_X11 "${KWIN_INTERNAL_NAME_X11}"
#define KWIN_CONFIG "${KWIN_NAME}rc" #define KWIN_CONFIG "${KWIN_NAME}rc"
#define KWIN_VERSION_STRING "${KWIN_VERSION}" #define KWIN_VERSION_STRING "${PROJECT_VERSION}"
#define KWIN_KILLER_BIN "${CMAKE_INSTALL_PREFIX}/${LIBEXEC_INSTALL_DIR}/kwin_killer_helper" #define KWIN_KILLER_BIN "${CMAKE_INSTALL_PREFIX}/${LIBEXEC_INSTALL_DIR}/kwin_killer_helper"
#cmakedefine01 HAVE_WAYLAND #cmakedefine01 HAVE_WAYLAND
#cmakedefine01 HAVE_WAYLAND_EGL #cmakedefine01 HAVE_WAYLAND_EGL

View file

@ -27,11 +27,11 @@ target_link_libraries(kdecorations
include(ECMPackageConfigHelpers) include(ECMPackageConfigHelpers)
include(ECMSetupVersion) include(ECMSetupVersion)
ecm_setup_version(${KWIN_VERSION} ecm_setup_version(${PROJECT_VERSION}
VARIABLE_PREFIX KDECORATIONS VARIABLE_PREFIX KDECORATIONS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdecorations_version.h" VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdecorations_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KDecorationsConfigVersion.cmake" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KDecorationsConfigVersion.cmake"
SOVERSION 5 SOVERSION ${PROJECT_VERSION_MAJOR}
) )
set_target_properties(kdecorations PROPERTIES set_target_properties(kdecorations PROPERTIES

View file

@ -1,11 +1,11 @@
########### next target ############### ########### next target ###############
include(ECMSetupVersion) include(ECMSetupVersion)
ecm_setup_version(${KWIN_VERSION} ecm_setup_version(${PROJECT_VERSION}
VARIABLE_PREFIX KWINEFFECTS VARIABLE_PREFIX KWINEFFECTS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kwineffects_version.h" VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kwineffects_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KWinEffectsConfigVersion.cmake" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KWinEffectsConfigVersion.cmake"
SOVERSION 5 SOVERSION ${PROJECT_VERSION_MAJOR}
) )
### xrenderutils lib ### ### xrenderutils lib ###