CMake: shuffle includes, drop useless (empty) QT_INCLUDE_DIR

src/CMakeLists.txt

@@ -3,17 +3,18 @@ include( CalamaresAddModuleSubdirectory )
 include( CalamaresAddLibrary )
 include( CalamaresAddBrandingSubdirectory )
 
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/libcalamares )
-include_directories( ${CMAKE_CURRENT_LIST_DIR}/libcalamares )
-
-include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( ${CMAKE_CURRENT_LIST_DIR} )
+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 )
 
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/libcalamaresui )
-include_directories( ${CMAKE_CURRENT_LIST_DIR}/libcalamaresui )
 add_subdirectory( libcalamaresui )
 
 # all things qml

src/libcalamares/CMakeLists.txt

@@ -36,7 +36,6 @@ set( utilSources
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${QT_INCLUDE_DIR}
 )