setup include directories before including sub-directory CMake files

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 1eaf958..5f28fa0 100644 (file)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -177,16 +177,6 @@ set(CORE_PUBLIC_HEADERS
     QCommandLineParser
 )
 
-include(codecs/codecs.cmake)
-include(concurrent/concurrent.cmake)
-include(global/global.cmake)
-include(io/io.cmake)
-include(json/json.cmake)
-include(kernel/kernel.cmake)
-include(plugin/plugin.cmake)
-include(thread/thread.cmake)
-include(tools/tools.cmake)
-
 include_directories(
     ${CMAKE_BINARY_DIR}/include
     ${CMAKE_BINARY_DIR}/privateinclude
@@ -198,6 +188,16 @@ include_directories(
     ${ZSTD_INCLUDES}
 )
 
+include(codecs/codecs.cmake)
+include(concurrent/concurrent.cmake)
+include(global/global.cmake)
+include(io/io.cmake)
+include(json/json.cmake)
+include(kernel/kernel.cmake)
+include(plugin/plugin.cmake)
+include(thread/thread.cmake)
+include(tools/tools.cmake)
+
 if(${KATIE_PLATFORM} STREQUAL "linux")
     set(EXTRA_CORE_LIBS
         ${EXTRA_CORE_LIBS}

diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index a740b1f..909713a 100644 (file)
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -2,14 +2,9 @@
 set(EXTRA_XML_LIBS KtCore)
 
 set(XML_PUBLIC_HEADERS
-    ${XML_PUBLIC_HEADERS}
     # all headers are aliases
 )
 
-include(dom/dom.cmake)
-include(kernel/kernel.cmake)
-include(sax/sax.cmake)
-
 include_directories(
     ${CMAKE_BINARY_DIR}/include
     ${CMAKE_BINARY_DIR}/privateinclude
@@ -19,6 +14,10 @@ include_directories(
     ${CMAKE_BINARY_DIR}/privateinclude/QtXml
 )
 
+include(dom/dom.cmake)
+include(kernel/kernel.cmake)
+include(sax/sax.cmake)
+
 set(XML_HEADERS
     ${XML_HEADERS}
     ${CMAKE_CURRENT_SOURCE_DIR}/qxmlcommon_p.h