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
KFourInLine
Commits
b866c346
Commit
b866c346
authored
Dec 31, 2021
by
Laurent Montel
😁
Browse files
Adapt build system to allow to build against qt6. Need to fix build as it use kdegame private code
parent
95625eb7
Pipeline
#116326
passed with stage
in 41 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
b866c346
...
...
@@ -9,7 +9,7 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_
project
(
kfourinline VERSION
${
RELEASE_SERVICE_VERSION
}
)
set
(
QT_MIN_VERSION
"5.15.0"
)
set
(
KF5_MIN_VERSION
"5.
8
9.0"
)
set
(
KF5_MIN_VERSION
"5.9
0
.0"
)
find_package
(
ECM
${
KF5_MIN_VERSION
}
REQUIRED CONFIG
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
${
ECM_MODULE_PATH
}
)
...
...
@@ -24,7 +24,8 @@ include(ECMQtDeclareLoggingCategory)
include
(
ECMSetupVersion
)
include
(
FeatureSummary
)
find_package
(
Qt5
${
QT_MIN_VERSION
}
REQUIRED NO_MODULE COMPONENTS Widgets Svg
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
${
QT_MIN_VERSION
}
REQUIRED NO_MODULE COMPONENTS Widgets Svg
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
QuickWidgets
${
REQUIRED_QT_VERSION
}
CONFIG
)
find_package
(
KF5
${
KF5_MIN_VERSION
}
REQUIRED COMPONENTS
Config
ConfigWidgets
...
...
src/CMakeLists.txt
View file @
b866c346
...
...
@@ -85,7 +85,7 @@ target_link_libraries(kfourinline
KF5::DNSSD
KF5::XmlGui
KF5::WidgetsAddons
Qt::Svg
Qt
${
QT_MAJOR_VERSION
}
::Svg
)
install
(
TARGETS kfourinline
${
KDE_INSTALL_TARGETS_DEFAULT_ARGS
}
)
...
...
@@ -107,7 +107,7 @@ target_sources(kfourinlineproc PRIVATE
target_link_libraries
(
kfourinlineproc
KF5KDEGames
KF5KDEGamesPrivate
Qt::Svg
Qt
${
QT_MAJOR_VERSION
}
::Svg
)
install
(
TARGETS kfourinlineproc
${
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