diff --git a/CMakeLists.txt b/CMakeLists.txt index ca23deb1..2f5f81f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,12 +8,6 @@ include(CTestConfig.cmake) include(CheckIncludeFiles) include(CheckFunctionExists) -# Used e.g. in KDE4WorkspaceConfig.cmake, Alex -set(KDE4WORKSPACE_VERSION_MAJOR 4) -set(KDE4WORKSPACE_VERSION_MINOR 11) -set(KDE4WORKSPACE_VERSION_PATCH 14) -set(KDE4WORKSPACE_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} ) @@ -342,9 +336,6 @@ set(KDE4WORKSPACE_TARGET_PREFIX KDE4Workspace__) configure_file(KDE4WorkspaceConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake" @ONLY) -# this file will be installed too and will be used by cmake when searching for the Config.cmake file to check the version of kdepimlibs, Alex -macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake - ${KDE4WORKSPACE_VERSION_MAJOR} ${KDE4WORKSPACE_VERSION_MINOR} ${KDE4WORKSPACE_VERSION_PATCH}) set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace/cmake) # places where find_package() looks for FooConfig.cmake files: @@ -356,7 +347,6 @@ if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake - ${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake DESTINATION ${_KDE4WorkspaceConfig_INSTALL_DIR}) install(EXPORT kdeworkspaceLibraryTargets diff --git a/KDE4WorkspaceConfig.cmake.in b/KDE4WorkspaceConfig.cmake.in index 5f2e24e2..29e81f6d 100644 --- a/KDE4WorkspaceConfig.cmake.in +++ b/KDE4WorkspaceConfig.cmake.in @@ -1,9 +1,9 @@ # 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 @KDE4WORKSPACE_VERSION_MAJOR@) -set(KDE4WORKSPACE_VERSION_MINOR @KDE4WORKSPACE_VERSION_MINOR@) -set(KDE4WORKSPACE_VERSION_PATCH @KDE4WORKSPACE_VERSION_PATCH@) +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}") # set the directories diff --git a/config-workspace.h.cmake b/config-workspace.h.cmake index 90959bf3..b3ba37d5 100644 --- a/config-workspace.h.cmake +++ b/config-workspace.h.cmake @@ -155,5 +155,3 @@ /* type to use in place of socklen_t if not defined */ #define kde_socklen_t socklen_t - -#define WORKSPACE_VERSION_STRING "${KDE4WORKSPACE_VERSION}" diff --git a/kinfocenter/main.cpp b/kinfocenter/main.cpp index 19defcf7..8520d3f3 100644 --- a/kinfocenter/main.cpp +++ b/kinfocenter/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) KLocale::setMainCatalog("kinfocenter"); KAboutData aboutKInfoCenter( "kinfocenter", 0, ki18n("KDE Info Center"), - WORKSPACE_VERSION_STRING, ki18n("The KDE Info Center"), KAboutData::License_GPL, + KDE_VERSION_STRING, ki18n("The KDE Info Center"), KAboutData::License_GPL, ki18n("(c) 2009-2010, The KDE SC KInfocenter Development Team")); QByteArray argv_0 = argv[0]; diff --git a/krunner/main.cpp b/krunner/main.cpp index a87cfb90..8f92abc3 100644 --- a/krunner/main.cpp +++ b/krunner/main.cpp @@ -46,7 +46,7 @@ KDE_EXPORT int kdemain(int argc, char* argv[]) #endif KAboutData aboutData( "krunner", 0, ki18n( "Run Command Interface" ), - WORKSPACE_VERSION_STRING, ki18n(description), KAboutData::License_GPL, + KDE_VERSION_STRING, ki18n(description), KAboutData::License_GPL, ki18n("(c) 2006, Aaron Seigo") ); aboutData.addAuthor( ki18n("Aaron J. Seigo"), ki18n( "Author and maintainer" ), diff --git a/kstyles/oxygen/config/main.cpp b/kstyles/oxygen/config/main.cpp index 63b11ab9..3fb24c69 100644 --- a/kstyles/oxygen/config/main.cpp +++ b/kstyles/oxygen/config/main.cpp @@ -37,7 +37,7 @@ int main(int argc, char *argv[]) "oxygen-settings", "kstyle_config", ki18n( "Oxygen Settings" ), - WORKSPACE_VERSION_STRING, + KDE_VERSION_STRING, ki18n( "Oxygen expert configuration tool" ), KAboutData::License_GPL_V2, ki18n( "(c) 2010, Hugo Pereira Da Costa" )); diff --git a/kstyles/oxygen/demo/main.cpp b/kstyles/oxygen/demo/main.cpp index 18fce7db..916d7b37 100644 --- a/kstyles/oxygen/demo/main.cpp +++ b/kstyles/oxygen/demo/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) "oxygen-demo", "kstyle_config", ki18n( "Oxygen Demo" ), - WORKSPACE_VERSION_STRING, + KDE_VERSION_STRING, ki18n( "Oxygen style demonstration" ), KAboutData::License_GPL_V2, ki18n( "(c) 2010, Hugo Pereira Da Costa" )); diff --git a/ksysguard/gui/ksysguard.cpp b/ksysguard/gui/ksysguard.cpp index 67981e0e..560538d3 100644 --- a/ksysguard/gui/ksysguard.cpp +++ b/ksysguard/gui/ksysguard.cpp @@ -512,7 +512,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char** argv ) #endif KAboutData aboutData( "ksysguard", 0, ki18n( "System Monitor" ), - WORKSPACE_VERSION_STRING, ki18n(Description), KAboutData::License_GPL, + KDE_VERSION_STRING, ki18n(Description), KAboutData::License_GPL, ki18n( "(c) 1996-2008 The KDE System Monitor Developers" ) ); aboutData.addAuthor( ki18n("John Tapsell"), ki18n("Current Maintainer"), "john.tapsell@kde.org" ); aboutData.addAuthor( ki18n("Chris Schlaeger"), ki18n("Previous Maintainer"), "cs@kde.org" ); diff --git a/kwin/clients/oxygen/demo/main.cpp b/kwin/clients/oxygen/demo/main.cpp index a5727bf9..f25044bd 100644 --- a/kwin/clients/oxygen/demo/main.cpp +++ b/kwin/clients/oxygen/demo/main.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -40,7 +41,7 @@ int main(int argc, char *argv[]) "oxygen-shadow-demo", "kstyle_config", ki18n( "Oxygen Shadow Demo" ), - WORKSPACE_VERSION_STRING, + KDE_VERSION_STRING, ki18n( "Oxygen decoration shadows demonstration" ), KAboutData::License_GPL_V2, ki18n( "(c) 2011, Hugo Pereira Da Costa" )); diff --git a/kwin/config-kwin.h.cmake b/kwin/config-kwin.h.cmake index 2e0a3279..894c9519 100644 --- a/kwin/config-kwin.h.cmake +++ b/kwin/config-kwin.h.cmake @@ -6,4 +6,4 @@ #cmakedefine KWIN_BUILD_OXYGEN 1 #define KWIN_NAME "${KWIN_NAME}" #define KWIN_CONFIG "${KWIN_NAME}rc" -#define KWIN_VERSION_STRING "${KDE4WORKSPACE_VERSION}" +#define KWIN_VERSION_STRING "${KDE_VERSION_STRING}" diff --git a/kwrited/kwrited.cpp b/kwrited/kwrited.cpp index 4e625ced..0367efdb 100644 --- a/kwrited/kwrited.cpp +++ b/kwrited/kwrited.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #if defined(BUILD_AS_EXECUTABLE) @@ -43,7 +44,7 @@ static inline KAboutData aboutData() { - return KAboutData("kwrited", 0, ki18n("kwrited"), WORKSPACE_VERSION_STRING); + return KAboutData("kwrited", 0, ki18n("kwrited"), KDE_VERSION_STRING); } #if defined(BUILD_AS_EXECUTABLE) diff --git a/plasma/desktop/shell/main.cpp b/plasma/desktop/shell/main.cpp index 299f950d..0110d708 100644 --- a/plasma/desktop/shell/main.cpp +++ b/plasma/desktop/shell/main.cpp @@ -49,7 +49,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "START" << "(line:" << __LINE__ << ")"; - + plasmaLocale = KLocale("libplasma").language(); // dual head support int associatedScreen = 0; @@ -104,7 +104,7 @@ KDE_EXPORT int kdemain(int argc, char **argv) } KAboutData aboutData(appName, 0, ki18n("Plasma Desktop Shell"), - WORKSPACE_VERSION_STRING, ki18n(description), KAboutData::License_GPL, + KDE_VERSION_STRING, ki18n(description), KAboutData::License_GPL, ki18n("Copyright 2006-2009, The KDE Team")); aboutData.addAuthor(ki18n("Aaron J. Seigo"), ki18n("Author and maintainer"), diff --git a/startkde.cmake b/startkde.cmake index d0c13ec4..46bdc3c2 100644 --- a/startkde.cmake +++ b/startkde.cmake @@ -1,6 +1,6 @@ #!/bin/sh # -# DEFAULT KDE STARTUP SCRIPT ( @KDE4WORKSPACE_VERSION@ ) +# DEFAULT KDE STARTUP SCRIPT ( @KDE_VERSION_STRING@ ) # if test "x$1" = x--failsafe; then