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
Bovo
Commits
5bd1f726
Commit
5bd1f726
authored
Dec 28, 2021
by
Laurent Montel
Browse files
Adapt build system for building against qt6
(cherry picked from commit 90743e069f7c6279e7fe8bd93e7a23ef2134deb7)
parent
a867969b
Pipeline
#119116
failed with stage
in 42 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
5bd1f726
...
...
@@ -9,12 +9,17 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_
project
(
bovo VERSION
${
RELEASE_SERVICE_VERSION
}
)
set
(
QT_MIN_VERSION
"5.15.0"
)
set
(
KF5_MIN_VERSION
"5.89.0"
)
set
(
KF5_MIN_VERSION
"5.90.0"
)
find_package
(
ECM
${
KF5_MIN_VERSION
}
REQUIRED CONFIG
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
${
ECM_MODULE_PATH
}
)
include
(
KDEInstallDirs
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
${
QT_MIN_VERSION
}
REQUIRED NO_MODULE COMPONENTS Widgets Svg Concurrent
)
if
(
QT_MAJOR_VERSION STREQUAL
"6"
)
find_package
(
Qt6SvgWidgets
)
endif
()
find_package
(
Qt
${
QT_MAJOR_VERSION
}
QuickWidgets
${
REQUIRED_QT_VERSION
}
CONFIG
)
find_package
(
Qt5
${
QT_MIN_VERSION
}
REQUIRED NO_MODULE COMPONENTS Widgets Svg Concurrent
)
find_package
(
KF5
${
KF5_MIN_VERSION
}
REQUIRED COMPONENTS
CoreAddons
Crash
...
...
@@ -24,7 +29,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
)
find_package
(
KF5KDEGames 4.9.0 REQUIRED
)
include
(
KDEInstallDirs
)
include
(
KDECMakeSettings
)
include
(
KDECompilerSettings NO_POLICY_SCOPE
)
include
(
FeatureSummary
)
...
...
@@ -115,7 +119,6 @@ include_directories(
${
CMAKE_SOURCE_DIR
}
/game
${
CMAKE_SOURCE_DIR
}
/gui
${
CMAKE_SOURCE_DIR
}
/ai
${
Qt5Concurrent_INCLUDE_DIRS
}
)
kconfig_add_kcfg_files
(
bovo_SRCS gui/settings.kcfgc
)
...
...
@@ -126,12 +129,17 @@ add_executable(bovo ${bovo_SRCS})
target_link_libraries
(
bovo
KF5::XmlGui
KF5::I18n
Qt::Svg
KF5KDEGames
KF5::DBusAddons
KF5::Crash
Qt
${
QT_MAJOR_VERSION
}
::Svg
Qt
${
QT_MAJOR_VERSION
}
::Concurrent
)
if
(
QT_MAJOR_VERSION STREQUAL
"6"
)
target_link_libraries
(
bovo Qt6::SvgWidgets
)
endif
()
add_subdirectory
(
themes
)
add_subdirectory
(
icons
)
add_subdirectory
(
doc
)
...
...
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