From 8373620cca964cca0f73b72929acaffd36282fc3 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 20 Jun 2017 07:10:29 -0400
Subject: [PATCH] Partitionmanager: partly fix PM-tests build

---
 src/modules/partition/CMakeLists.txt       | 6 +++---
 src/modules/partition/tests/CMakeLists.txt | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt
index 95c3934d1..ceebbcf1f 100644
--- a/src/modules/partition/CMakeLists.txt
+++ b/src/modules/partition/CMakeLists.txt
@@ -21,10 +21,10 @@ if( NOT blkid_LIB )
 endif()
 
 
-add_subdirectory( tests )
-
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
 include_directories( ${KPMCORE_INCLUDE_DIR} )
+include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
+
+add_subdirectory( tests )
 
 calamares_add_plugin( partition
     TYPE viewmodule
diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt
index c91222222..12d970fa4 100644
--- a/src/modules/partition/tests/CMakeLists.txt
+++ b/src/modules/partition/tests/CMakeLists.txt
@@ -1,4 +1,6 @@
-find_package( Qt5 COMPONENTS Test REQUIRED )
+find_package( Qt5 COMPONENTS Gui Test REQUIRED )
+find_package( KF5 COMPONENTS Service REQUIRED )
+
 include( ECMAddTests )
 
 set( PartitionModule_SOURCE_DIR .. )
@@ -18,8 +20,10 @@ set( partitionjobtests_SRCS
 )
 
 include_directories(
+    ${Qt5Gui_INCLUDE_DIRS}
     ${PartitionModule_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 ecm_add_test( ${partitionjobtests_SRCS}
@@ -29,6 +33,7 @@ ecm_add_test( ${partitionjobtests_SRCS}
         ${CALAMARES_LIBRARIES}
         Qt5::Core
         Qt5::Test
+        KF5::Service
 )
 
 set_target_properties( partitionjobtests PROPERTIES AUTOMOC TRUE )