Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Games
Kiriki
Commits
9d762cc2
Commit
9d762cc2
authored
Dec 28, 2021
by
Laurent Montel
😁
Browse files
Adapt build system for building against qt6
parent
46b084e4
Pipeline
#115343
passed with stage
in 35 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
9d762cc2
...
...
@@ -9,7 +9,7 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_
project
(
kiriki VERSION
${
RELEASE_SERVICE_VERSION
}
)
set
(
QT_MIN_VERSION
"5.15.0"
)
set
(
KF5_MIN_VERSION
"5.
85
.0"
)
set
(
KF5_MIN_VERSION
"5.
90
.0"
)
find_package
(
ECM
${
KF5_REQUIRED_VERSION
}
REQUIRED CONFIG
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
${
ECM_MODULE_PATH
}
)
...
...
@@ -23,7 +23,9 @@ include(ECMInstallIcons)
include
(
ECMSetupVersion
)
include
(
FeatureSummary
)
find_package
(
Qt5
${
QT_MIN_VERSION
}
REQUIRED NO_MODULE COMPONENTS Widgets PrintSupport
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
${
QT_MIN_VERSION
}
REQUIRED NO_MODULE COMPONENTS Widgets PrintSupport
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
QuickWidgets
${
REQUIRED_QT_VERSION
}
CONFIG
)
find_package
(
KF5
${
KF5_REQUIRED_VERSION
}
REQUIRED COMPONENTS
CoreAddons
Config
...
...
src/CMakeLists.txt
View file @
9d762cc2
...
...
@@ -34,7 +34,7 @@ target_link_libraries(kiriki
KF5::IconThemes
KF5::DBusAddons
KF5::Crash
Qt::PrintSupport
Qt
${
QT_MAJOR_VERSION
}
::PrintSupport
)
install
(
TARGETS kiriki
${
KDE_INSTALL_TARGETS_DEFAULT_ARGS
}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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