Commit 7e20f81c authored by Christophe Giboudeaux's avatar Christophe Giboudeaux Committed by David Faure
Browse files

Fix the kig build after kwindowsystem changes

Commit 61cfaf3b738 in kwindowsystem adds a public dependency on X11 and XCB.
kig indirectly needs these dependencies (kig -> kparts -> KIO -> kwindowsystem), so we must
be sure it will find the CMake Find*.cmake modules before looking for KF5Parts.

(cherry picked from commit 4e77085b)
parent 895286ac
......@@ -13,7 +13,9 @@ find_package(Qt5Svg REQUIRED)
find_package(Qt5PrintSupport REQUIRED)
find_package(Qt5XmlPatterns 5.5.1)
find_package(ECM 1.7 REQUIRED NO_MODULE)
find_package(ECM REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${kig_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})
find_package(KF5Parts REQUIRED)
find_package(KF5DocTools REQUIRED)
find_package(KF5I18n REQUIRED)
......@@ -25,8 +27,6 @@ find_package(KF5XmlGui 5.1 REQUIRED)
find_package(KF5Crash 5.15 REQUIRED)
find_package(KF5CoreAddons REQUIRED)
set(CMAKE_MODULE_PATH ${kig_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})
set (KDE5_ICON_DIR ${CMAKE_INSTALL_PREFIX}/share/icons)
include(ECMAddAppIcon)
......
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