From f60ac5e101d17eda4b47d884ccddefda17e27aba Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 7 May 2019 07:47:24 -0400
Subject: [PATCH] [modules] The modules can include libcalamares and
 libcalamaresui

 - Remove (heavy-handed) top-level include_directories, in favor
   of more focused ones; this helps to make sure that the dependencies
   ordering is correct.
---
 src/CMakeLists.txt         | 9 ---------
 src/modules/CMakeLists.txt | 6 ++++++
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c29a866d8..b73fecda0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,15 +3,6 @@ include( CalamaresAddModuleSubdirectory )
 include( CalamaresAddLibrary )
 include( CalamaresAddBrandingSubdirectory )
 
-include_directories(
-    ${CMAKE_CURRENT_LIST_DIR}
-    ${CMAKE_CURRENT_LIST_DIR}/libcalamares
-    ${CMAKE_CURRENT_LIST_DIR}/libcalamaresui
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}/libcalamares
-    ${CMAKE_CURRENT_BINARY_DIR}/libcalamaresui
-)
-
 # library
 add_subdirectory( libcalamares )
 
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 0a8d1db70..9e9621106 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -4,6 +4,12 @@
 # in this list.
 set( LIST_SKIPPED_MODULES "" )
 
+include_directories(
+    ${CMAKE_SOURCE_DIR}/src/libcalamares
+    ${CMAKE_BINARY_DIR}/src/libcalamares
+    ${CMAKE_SOURCE_DIR}/src/libcalamaresui
+)
+
 if( BUILD_TESTING )
     add_executable( test_conf test_conf.cpp )
     target_link_libraries( test_conf ${YAMLCPP_LIBRARY} Qt5::Core )