diff --git a/CMakeLists.txt b/CMakeLists.txt index 883906178..9810c9bb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,12 @@ set(KF5_REQUIRED_VERSION "5.16.0") find_package(ECM 5.19.0 CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) +# KDE Application Version, managed by release script +set (KDE_APPLICATIONS_VERSION_MAJOR "16") +set (KDE_APPLICATIONS_VERSION_MINOR "11") +set (KDE_APPLICATIONS_VERSION_MICRO "60") +set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") + include(ECMInstallIcons) include(ECMSetupVersion) include(ECMOptionalAddSubdirectory) @@ -21,9 +27,10 @@ include(ECMAddTests) include(ECMAddAppIcon) include(ECMPackageConfigHelpers) -ecm_setup_version(1.0.0 VARIABLE_PREFIX OKULAR - VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/core/version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Okular5ConfigVersion.cmake") +ecm_setup_version(0.99.${KDE_APPLICATIONS_VERSION_MICRO} + VARIABLE_PREFIX OKULAR + VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/core/version.h" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Okular5ConfigVersion.cmake") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Core DBus Test Widgets PrintSupport Svg Qml Quick) find_package(Qt5 ${QT_REQUIRED_VERSION} OPTIONAL_COMPONENTS TextToSpeech) diff --git a/core/version.h b/core/version.h deleted file mode 100644 index 477e1a65f..000000000 --- a/core/version.h +++ /dev/null @@ -1,24 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2008 by Pino Toscano * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - ***************************************************************************/ - -#ifndef _OKULAR_VERSION_H_ -#define _OKULAR_VERSION_H_ - -#define OKULAR_VERSION_STRING "0.26.70" -#define OKULAR_VERSION_MAJOR 0 -#define OKULAR_VERSION_MINOR 26 -#define OKULAR_VERSION_RELEASE 70 -#define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) - -#define OKULAR_VERSION \ - OKULAR_MAKE_VERSION(OKULAR_VERSION_MAJOR,OKULAR_VERSION_MINOR,OKULAR_VERSION_RELEASE) - -#define OKULAR_IS_VERSION(a,b,c) ( OKULAR_VERSION >= OKULAR_MAKE_VERSION(a,b,c) ) - -#endif