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
Graphics
KImageMap Editor
Commits
a06c4e48
Commit
a06c4e48
authored
Oct 08, 2022
by
Kai Uwe Broulik
🍇
Browse files
Use QT_MAJOR_VERSION and version-less targets
Needed to shuffle the includes above the find calls for using that variable
parent
c4c15fdb
Pipeline
#244052
passed with stage
in 40 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
a06c4e48
...
...
@@ -17,7 +17,15 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
add_definitions
(
-DQURL_NO_CAST_FROM_STRING
)
find_package
(
Qt5
${
QT_MIN_VERSION
}
REQUIRED NO_MODULE COMPONENTS
include
(
FeatureSummary
)
include
(
ECMInstallIcons
)
include
(
KDEInstallDirs
)
include
(
KDECompilerSettings NO_POLICY_SCOPE
)
include
(
KDECMakeSettings
)
include
(
ECMQtDeclareLoggingCategory
)
include
(
ECMSetupVersion
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
${
QT_MIN_VERSION
}
REQUIRED NO_MODULE COMPONENTS
Gui
Widgets
WebEngineWidgets
...
...
@@ -36,14 +44,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
XmlGui
)
include
(
FeatureSummary
)
include
(
ECMInstallIcons
)
include
(
KDEInstallDirs
)
include
(
KDECompilerSettings NO_POLICY_SCOPE
)
include
(
KDECMakeSettings
)
include
(
ECMQtDeclareLoggingCategory
)
include
(
ECMSetupVersion
)
ecm_setup_version
(
${
RELEASE_SERVICE_VERSION
}
VARIABLE_PREFIX KIMAGEMAPEDITOR VERSION_HEADER kimagemapeditor_version.h
)
include_directories
(
${
CMAKE_SOURCE_DIR
}
${
CMAKE_BINARY_DIR
}
)
...
...
@@ -79,7 +79,7 @@ target_link_libraries(kimagemapeditor_bin
KF5::I18n
KF5::ConfigCore
KF5::Parts
Qt
5
::WebEngineWidgets
Qt::WebEngineWidgets
)
install
(
TARGETS kimagemapeditor_bin
${
KDE_INSTALL_TARGETS_DEFAULT_ARGS
}
)
...
...
@@ -114,7 +114,7 @@ target_link_libraries(kimagemapeditorpart
KF5::I18n
KF5::ConfigCore
KF5::Parts
Qt
5
::WebEngineWidgets
Qt::WebEngineWidgets
)
install
(
TARGETS kimagemapeditorpart DESTINATION
${
KDE_INSTALL_PLUGINDIR
}
/kf5/parts
)
...
...
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