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
Games
Kolf
Commits
d5b782ea
Commit
d5b782ea
authored
Dec 30, 2021
by
Laurent Montel
Browse files
Adapt build system for building against qt6
parent
8dcc44bf
Changes
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
d5b782ea
...
...
@@ -9,7 +9,7 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_
project
(
kolf 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
}
)
...
...
@@ -23,7 +23,8 @@ include(ECMInstallIcons)
include
(
ECMSetupVersion
)
include
(
FeatureSummary
)
find_package
(
Qt5
${
QT_MIN_VERSION
}
REQUIRED NO_MODULE COMPONENTS Gui Widgets
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
${
QT_MIN_VERSION
}
REQUIRED NO_MODULE COMPONENTS Gui Widgets
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
QuickWidgets
${
REQUIRED_QT_VERSION
}
CONFIG
)
find_package
(
KF5
${
KF5_MIN_VERSION
}
REQUIRED COMPONENTS
Completion
Config
...
...
@@ -204,8 +205,8 @@ target_link_libraries(kolfprivate
KF5::KIOCore
KF5::TextWidgets
KF5::XmlGui
Qt::Gui
Qt::Widgets
Qt
${
QT_MAJOR_VERSION
}
::Gui
Qt
${
QT_MAJOR_VERSION
}
::Widgets
)
########### next target ###############
...
...
@@ -222,7 +223,7 @@ install(TARGETS kolf ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
install
(
PROGRAMS org.kde.kolf.desktop DESTINATION
${
KDE_INSTALL_APPDIR
}
)
install
(
FILES kolfui.rc DESTINATION
${
KDE_INSTALL_KXMLGUI
5
DIR
}
/kolf
)
install
(
FILES kolfui.rc DESTINATION
${
KDE_INSTALL_KXMLGUIDIR
}
/kolf
)
install
(
FILES intro tutorial.kolf tutorial.kolfgame DESTINATION
${
KDE_INSTALL_DATADIR
}
/kolf
)
#install(FILES ball.h game.h statedb.h config.h canvasitem.h object.h rtti.h vector.h floater.h slope.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kolf COMPONENT Devel)
install
(
FILES org.kde.kolf.appdata.xml DESTINATION
${
KDE_INSTALL_METAINFODIR
}
)
...
...
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