Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
KDecoration
Commits
3c95d5ad
Commit
3c95d5ad
authored
Jan 15, 2022
by
Volker Krause
Browse files
Add KF6 build support and CI
parent
34a954f5
Pipeline
#124190
passed with stage
in 41 seconds
Changes
5
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
3c95d5ad
...
...
@@ -4,3 +4,4 @@
include
:
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
CMakeLists.txt
View file @
3c95d5ad
...
...
@@ -4,7 +4,7 @@ project(decoration-api)
set
(
PROJECT_VERSION
"5.24.80"
)
set
(
QT_MIN_VERSION
"5.15.0"
)
set
(
KF5_MIN_VERSION
"5.
86
"
)
set
(
KF5_MIN_VERSION
"5.
90
"
)
set
(
KDE_COMPILERSETTINGS_LEVEL
"5.82"
)
find_package
(
ECM
${
KF5_MIN_VERSION
}
REQUIRED NO_MODULE
)
...
...
@@ -29,7 +29,7 @@ ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX KDECORATION2
SOVERSION 5
)
#dependencies
find_package
(
Qt
5
${
QT_MIN_VERSION
}
CONFIG REQUIRED COMPONENTS
find_package
(
Qt
${
QT_MAJOR_VERSION
}
${
QT_MIN_VERSION
}
CONFIG REQUIRED COMPONENTS
Core
Gui
Test
...
...
@@ -78,7 +78,7 @@ install(EXPORT KDecoration2Targets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/kdecoration2_version.h
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
5
}
COMPONENT Devel
)
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
}
COMPONENT Devel
)
feature_summary
(
WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES
)
...
...
KDecoration2Config.cmake.in
View file @
3c95d5ad
@PACKAGE_INIT@
include(CMakeFindDependencyMacro)
find_dependency(Qt
5
Gui @QT_MIN_VERSION@)
find_dependency(Qt
@QT_MAJOR_VERSION@
Gui @QT_MIN_VERSION@)
include("${CMAKE_CURRENT_LIST_DIR}/KDecoration2Targets.cmake")
...
...
src/CMakeLists.txt
View file @
3c95d5ad
...
...
@@ -69,7 +69,7 @@ install(FILES ${KDecoration2_CamelCase_HEADERS}
DESTINATION
${
KDECORATION2_INCLUDEDIR
}
/KDecoration2
COMPONENT Devel
)
install
(
TARGETS kdecorations2 EXPORT KDecoration2Targets
${
KF
5
_INSTALL_TARGETS_DEFAULT_ARGS
}
)
install
(
TARGETS kdecorations2 EXPORT KDecoration2Targets
${
KF_INSTALL_TARGETS_DEFAULT_ARGS
}
)
install
(
FILES
...
...
src/private/CMakeLists.txt
View file @
3c95d5ad
...
...
@@ -45,7 +45,7 @@ install(FILES ${KDecoration2Private_CamelCase_HEADERS}
DESTINATION
${
KDECORATION2_INCLUDEDIR
}
/KDecoration2/Private
COMPONENT Devel
)
install
(
TARGETS kdecorations2private EXPORT KDecoration2Targets
${
KF
5
_INSTALL_TARGETS_DEFAULT_ARGS
}
)
install
(
TARGETS kdecorations2private EXPORT KDecoration2Targets
${
KF_INSTALL_TARGETS_DEFAULT_ARGS
}
)
install
(
FILES
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment