Commit 0bd67f9a authored by Michael Reeves's avatar Michael Reeves

*remove uneeded header fix one compile error for pure kf5 build.

parent d6e3a110
......@@ -17,13 +17,13 @@ include(FeatureSummary)
include(ECMInstallIcons)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n KDELibs4Support)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n CoreAddons KDELibs4Support)
find_package(KF5DocTools ${KF5_MIN_VERSION} REQUIRED )
# I don't need warnings about wired things in comments.
SET(CLANG_WARNING_FLAGS -Wno-comment)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
SET(KDiff3_LIBRARIES KF5::I18n KF5::KDELibs4Support)
SET(KDiff3_LIBRARIES KF5::I18n KF5::CoreAddons KF5::KDELibs4Support)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CLANG_WARNING_FLAGS}")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CLANG_WARNING_FLAGS}")
......
########### kdiff3 KPart ###############
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Parts CoreAddons WidgetsAddons)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Parts WidgetsAddons)
set(kdiff3part_PART_SRCS
kdiff3_part.cpp
......@@ -25,12 +25,12 @@ add_library(kdiff3part MODULE ${kdiff3part_PART_SRCS})
set_target_properties(kdiff3part PROPERTIES DEFINE_SYMBOL KDIFF3_PART)
target_link_libraries(kdiff3part ${KDiff3_LIBRARIES} KF5::Parts KF5::CoreAddons ${QT_QT3SUPPORT_LIBRARY})
target_link_libraries(kdiff3part ${KDiff3_LIBRARIES} KF5::Parts ${QT_QT3SUPPORT_LIBRARY})
install(TARGETS kdiff3part DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/parts )
########### kdiff3 executable ###############
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Parts CoreAddons WidgetsAddons Config)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Parts WidgetsAddons Config)
set(kdiff3_SRCS
main.cpp
......
......@@ -41,7 +41,6 @@
#include <QMenu>
#include <QAction>
#include <kmessagebox.h>
#include <kfiledialog.h>
#include <kiconloader.h>
#include <klocalizedstring.h>
#include <ktoggleaction.h>
......
......@@ -33,7 +33,6 @@
#include <QAction>
#include <kstandardaction.h>
#include <klibloader.h>
#include <kmessagebox.h>
#include <QStatusBar>
#include <klocalizedstring.h>
......
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