Loading

Paste #pelj2ugxp

  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index 4f1bdde6..8ab7f8bb 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -1,6 +1,12 @@
  6. -project(okular)
  7. +cmake_minimum_required(VERSION 3.0)
  8.  
  9. -cmake_minimum_required(VERSION 2.8.12)
  10. +# KDE Application Version, managed by release script
  11. +set (KDE_APPLICATIONS_VERSION_MAJOR "17")
  12. +set (KDE_APPLICATIONS_VERSION_MINOR "07")
  13. +set (KDE_APPLICATIONS_VERSION_MICRO "80")
  14. +set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
  15. +
  16. +project(okular VERSION 1.2.${KDE_APPLICATIONS_VERSION_MICRO})
  17.  
  18.  set(QT_REQUIRED_VERSION "5.6.0")
  19.  set(KF5_REQUIRED_VERSION "5.16.0")
  20. @@ -8,12 +14,6 @@ set(KF5_REQUIRED_VERSION "5.16.0")
  21.  find_package(ECM 5.19.0 CONFIG REQUIRED)
  22.  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
  23.  
  24. -# KDE Application Version, managed by release script
  25. -set (KDE_APPLICATIONS_VERSION_MAJOR "17")
  26. -set (KDE_APPLICATIONS_VERSION_MINOR "07")
  27. -set (KDE_APPLICATIONS_VERSION_MICRO "80")
  28. -set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
  29. -
  30.  include(ECMInstallIcons)
  31.  include(ECMSetupVersion)
  32.  include(ECMOptionalAddSubdirectory)
  33. @@ -27,7 +27,7 @@ include(ECMAddTests)
  34.  include(ECMAddAppIcon)
  35.  include(ECMPackageConfigHelpers)
  36.  
  37. -ecm_setup_version(1.2.${KDE_APPLICATIONS_VERSION_MICRO}
  38. +ecm_setup_version(${PROJECT_VERSION}
  39.                    VARIABLE_PREFIX OKULAR
  40.                    VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/core/version.h"
  41.                    PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Okular5ConfigVersion.cmake")

Comments