Commit ad7ca678 authored by Michael Reeves's avatar Michael Reeves
Browse files

*include moc file fixes build for menu plugin.

*use kcoreaddons_add_plugin instead of add_library
*remove unneeded dependancy
*use NO_POLICY_SCOPE to avoid spurious warnings from CMake
*don't include KDEFrameworkCompilerSettings with its convention enforcing defines we are not KDE.
parent 247bc705
......@@ -10,9 +10,8 @@ find_package(ECM ${ECM_MIN_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake)
include(KDEInstallDirs)
include(KDECompilerSettings)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings NO_POLICY_SCOPE)
include(FeatureSummary)
include(ECMInstallIcons)
......
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS KIO
WidgetsAddons # KMessageBox
CoreAddons
)
add_library(kdiff3fileitemaction MODULE kdiff3fileitemaction.cpp)
target_link_libraries(kdiff3fileitemaction ${KDiff3_LIBRARIES} KF5::CoreAddons KF5::WidgetsAddons KF5::KIOWidgets ${LibKDiff3_LIBRARIES})
kcoreaddons_add_plugin(kdiff3fileitemaction SOURCES kdiff3fileitemaction.cpp INSTALL_NAMESPACE "kf5/kfileitemaction")
target_link_libraries(kdiff3fileitemaction ${KDiff3_LIBRARIES} KF5::WidgetsAddons KF5::KIOWidgets)
install(TARGETS kdiff3fileitemaction DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES kdiff3fileitemaction.desktop DESTINATION ${SERVICES_INSTALL_DIR})
......@@ -74,6 +74,7 @@ static KDiff3PluginHistory s_history;
K_PLUGIN_FACTORY(KDiff3FileItemActionFactory, registerPlugin<KDiff3FileItemAction>();)
#include "kdiff3fileitemaction.moc"
KDiff3FileItemAction::KDiff3FileItemAction (QObject* pParent, const QVariantList & /*args*/)
: KAbstractFileItemActionPlugin(pParent)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment