Replace KF5_VERSION with KF_VERSION
Frameworks will be Frameworks 6 at some point and there is no good reason to have the major version in the variable name. Given this is purely internal we can to this now, making it a bit more future-proof GIT_SILENT NO_CHANGELOG
This commit is contained in:
parent
a9b9a25c9f
commit
08f0204d16
|
@ -1,8 +1,8 @@
|
|||
cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
set(KF5_VERSION "5.79.0") # handled by release scripts
|
||||
set(KF5_DEP_VERSION "5.79.0") # handled by release scripts
|
||||
project(Plasma VERSION ${KF5_VERSION})
|
||||
set(KF_VERSION "5.79.0") # handled by release scripts
|
||||
set(KF_DEP_VERSION "5.79.0") # handled by release scripts
|
||||
project(Plasma VERSION ${KF_VERSION})
|
||||
|
||||
# ECM setup
|
||||
include(FeatureSummary)
|
||||
|
@ -42,7 +42,7 @@ set (REQUIRED_QT_VERSION 5.14.0)
|
|||
|
||||
find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Quick Gui Sql Qml Svg QuickControls2)
|
||||
|
||||
find_package(KF5 ${KF5_DEP_VERSION} REQUIRED
|
||||
find_package(KF5 ${KF_DEP_VERSION} REQUIRED
|
||||
COMPONENTS
|
||||
Activities
|
||||
Archive
|
||||
|
|
|
@ -16,9 +16,9 @@ set(PLASMA_CONTAINMENTACTIONS_PLUGINDIR ${KDE_INSTALL_PLUGINDIR}/plasma/containm
|
|||
|
||||
include(CMakeFindDependencyMacro)
|
||||
find_dependency(Qt5Gui "@REQUIRED_QT_VERSION@")
|
||||
find_dependency(KF5Package "@KF5_DEP_VERSION@")
|
||||
find_dependency(KF5Service "@KF5_DEP_VERSION@")
|
||||
find_dependency(KF5WindowSystem "@KF5_DEP_VERSION@")
|
||||
find_dependency(KF5Package "@KF_DEP_VERSION@")
|
||||
find_dependency(KF5Service "@KF_DEP_VERSION@")
|
||||
find_dependency(KF5WindowSystem "@KF_DEP_VERSION@")
|
||||
|
||||
@PACKAGE_SETUP_AUTOMOC_VARIABLES@
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
find_package(KF5Parts ${KF5_DEP_VERSION} REQUIRED)
|
||||
find_package(KF5Parts ${KF_DEP_VERSION} REQUIRED)
|
||||
set_package_properties(KF5Parts PROPERTIES PURPOSE "Required for examples")
|
||||
|
||||
find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
|
||||
find_package(KF5WidgetsAddons ${KF_DEP_VERSION} REQUIRED)
|
||||
set_package_properties(KF5WidgetsAddons PROPERTIES PURPOSE "Required for examples")
|
||||
|
||||
add_subdirectory(applets)
|
||||
|
|
|
@ -104,7 +104,7 @@ Comment[zh_TW]=吸一口新鮮空氣
|
|||
X-KDE-PluginInfo-Author=The Oxygen Project
|
||||
X-KDE-PluginInfo-Email=kde-artists@kde.org
|
||||
X-KDE-PluginInfo-Name=air
|
||||
X-KDE-PluginInfo-Version=@KF5_VERSION@
|
||||
X-KDE-PluginInfo-Version=@KF_VERSION@
|
||||
X-KDE-PluginInfo-Website=https://plasma.kde.org
|
||||
X-KDE-PluginInfo-Category=
|
||||
X-KDE-PluginInfo-License=GPL
|
||||
|
|
|
@ -87,7 +87,7 @@ Comment[zh_TW]=由 KDE VDG 團隊製作的 Breeze Dark
|
|||
X-KDE-PluginInfo-Author=KDE Visual Design Group
|
||||
X-KDE-PluginInfo-Email=kde-artists@kde.org
|
||||
X-KDE-PluginInfo-Name=breeze-dark
|
||||
X-KDE-PluginInfo-Version=@KF5_VERSION@
|
||||
X-KDE-PluginInfo-Version=@KF_VERSION@
|
||||
X-KDE-PluginInfo-Website=https://plasma.kde.org
|
||||
X-KDE-PluginInfo-Category=
|
||||
X-KDE-PluginInfo-License=LGPL
|
||||
|
|
|
@ -85,7 +85,7 @@ Comment[zh_TW]=由 KDE VDG 團隊製作的 Breeze Light
|
|||
X-KDE-PluginInfo-Author=KDE Visual Design Group
|
||||
X-KDE-PluginInfo-Email=kde-artists@kde.org
|
||||
X-KDE-PluginInfo-Name=default
|
||||
X-KDE-PluginInfo-Version=@KF5_VERSION@
|
||||
X-KDE-PluginInfo-Version=@KF_VERSION@
|
||||
X-KDE-PluginInfo-Website=https://plasma.kde.org
|
||||
X-KDE-PluginInfo-Category=
|
||||
X-KDE-PluginInfo-License=LGPL
|
||||
|
|
|
@ -86,7 +86,7 @@ Comment[zh_TW]=由 KDE VDG 團隊製作的 Breeze
|
|||
X-KDE-PluginInfo-Author=KDE Visual Design Group
|
||||
X-KDE-PluginInfo-Email=kde-artists@kde.org
|
||||
X-KDE-PluginInfo-Name=default
|
||||
X-KDE-PluginInfo-Version=@KF5_VERSION@
|
||||
X-KDE-PluginInfo-Version=@KF_VERSION@
|
||||
X-KDE-PluginInfo-Website=https://plasma.kde.org
|
||||
X-KDE-PluginInfo-Category=
|
||||
X-KDE-PluginInfo-License=LGPL
|
||||
|
|
|
@ -102,7 +102,7 @@ Comment[zh_TW]=以 Oxygen 樣式完成的外觀主題
|
|||
X-KDE-PluginInfo-Author=The Oxygen Project
|
||||
X-KDE-PluginInfo-Email=kde-artists@kde.org
|
||||
X-KDE-PluginInfo-Name=oxygen
|
||||
X-KDE-PluginInfo-Version=@KF5_VERSION@
|
||||
X-KDE-PluginInfo-Version=@KF_VERSION@
|
||||
X-KDE-PluginInfo-Website=https://plasma.kde.org
|
||||
X-KDE-PluginInfo-Category=
|
||||
X-KDE-PluginInfo-License=GPL
|
||||
|
|
|
@ -81,7 +81,7 @@ ecm_generate_export_header(KF5Plasma
|
|||
EXPORT_FILE_NAME plasma/plasma_export.h
|
||||
BASE_NAME Plasma
|
||||
GROUP_BASE_NAME KF
|
||||
VERSION ${KF5_VERSION}
|
||||
VERSION ${KF_VERSION}
|
||||
DEPRECATED_BASE_VERSION 0
|
||||
DEPRECATION_VERSIONS 5.6 5.19 5.28 5.30 5.36 5.46 5.67 5.77 5.78
|
||||
)
|
||||
|
@ -204,7 +204,7 @@ if(BUILD_QCH)
|
|||
KF5Plasma_QCH
|
||||
NAME Plasma
|
||||
BASE_NAME KF5Plasma
|
||||
VERSION ${KF5_VERSION}
|
||||
VERSION ${KF_VERSION}
|
||||
ORG_DOMAIN org.kde
|
||||
SOURCES # using only public headers, to cover only public API
|
||||
${Plasma_HEADERS}
|
||||
|
|
|
@ -88,7 +88,7 @@ install(TARGETS KF5PlasmaQuick EXPORT KF5PlasmaQuickTargets ${KF5_INSTALL_TARGET
|
|||
ecm_generate_export_header(KF5PlasmaQuick
|
||||
BASE_NAME PlasmaQuick
|
||||
GROUP_BASE_NAME KF
|
||||
VERSION ${KF5_VERSION}
|
||||
VERSION ${KF_VERSION}
|
||||
DEPRECATED_BASE_VERSION 0
|
||||
DEPRECATION_VERSIONS 5.12 5.25 5.36
|
||||
)
|
||||
|
@ -126,7 +126,7 @@ configure_package_config_file(
|
|||
PATH_VARS KDE_INSTALL_INCLUDEDIR_KF5 CMAKE_INSTALL_PREFIX
|
||||
)
|
||||
|
||||
ecm_setup_version(${KF5_VERSION}
|
||||
ecm_setup_version(${KF_VERSION}
|
||||
VARIABLE_PREFIX PLASMAQUICK
|
||||
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5PlasmaQuickConfigVersion.cmake" )
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# Any changes in this ".cmake" file will be overwritten by CMake, the source is the ".cmake.in" file.
|
||||
|
||||
include(CMakeFindDependencyMacro)
|
||||
find_dependency(KF5Plasma "@KF5_DEP_VERSION@")
|
||||
find_dependency(KF5Plasma "@KF_DEP_VERSION@")
|
||||
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/KF5PlasmaQuickTargets.cmake")
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user