Fix FTBFS with CMake build:

+ Determine TQt and TDE include directories as SYSTEM.
  It solves priority for #include "..." × #include <...>
+ Additional linked libraries.

Signed-off-by: Slávek Banko <[email protected]>

8 files changed, 37 insertions, 13 deletions

diff --git a/kommander/editor/CMakeLists.txt b/kommander/editor/CMakeLists.txt
index 0fa2d46b..26acc0cd 100644
--- a/kommander/editor/CMakeLists.txt
+++ b/kommander/editor/CMakeLists.txt
@@ -4,13 +4,15 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${TDE_INCLUDE_DIR}
-  ${TQT_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/kommander/widget
   ${CMAKE_SOURCE_DIR}/kommander/widgets
   ${CMAKE_SOURCE_DIR}/kommander/plugin
   ${CMAKE_SOURCE_DIR}/kommander/factory
-  
+)
+
+include_directories( SYSTEM
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
 )
 
 link_directories(
diff --git a/kommander/executor/CMakeLists.txt b/kommander/executor/CMakeLists.txt
index 806b0911..063dcbaa 100644
--- a/kommander/executor/CMakeLists.txt
+++ b/kommander/executor/CMakeLists.txt
@@ -2,14 +2,17 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${TDE_INCLUDE_DIR}
-  ${TQT_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/kommander/widget
   ${CMAKE_SOURCE_DIR}/kommander/widgets
   ${CMAKE_SOURCE_DIR}/kommander/factory
   ${CMAKE_SOURCE_DIR}/kommander/plugin
 )
 
+include_directories( SYSTEM
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
 link_directories(
   ${TQT_LIBRARY_DIRS}
   ${TDE_LIB_DIR}
@@ -28,6 +31,7 @@ tde_add_library( instance STATIC_PIC AUTOMOC
      tdeui-shared
      tdeio-shared
      kommanderplugin-shared
+     kommanderwidget-shared
 )
 
 
diff --git a/kommander/factory/CMakeLists.txt b/kommander/factory/CMakeLists.txt
index ec540c7c..d33ff52e 100644
--- a/kommander/factory/CMakeLists.txt
+++ b/kommander/factory/CMakeLists.txt
@@ -2,12 +2,15 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${TDE_INCLUDE_DIR}
-  ${TQT_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/kommander/widget
   ${CMAKE_SOURCE_DIR}/kommander/plugin
 )
 
+include_directories( SYSTEM
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
 link_directories(
   ${TQT_LIBRARY_DIRS}
   ${TDE_LIB_DIR}
diff --git a/kommander/part/CMakeLists.txt b/kommander/part/CMakeLists.txt
index a576ef73..7667da1c 100644
--- a/kommander/part/CMakeLists.txt
+++ b/kommander/part/CMakeLists.txt
@@ -2,12 +2,15 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${TDE_INCLUDE_DIR}
-  ${TQT_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/kommander/executor
   ${CMAKE_SOURCE_DIR}/kommander/factory
 )
 
+include_directories( SYSTEM
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
 link_directories(
   ${TQT_LIBRARY_DIRS}
   ${TDE_LIB_DIR}
diff --git a/kommander/plugin/CMakeLists.txt b/kommander/plugin/CMakeLists.txt
index 0daa3736..44a70077 100644
--- a/kommander/plugin/CMakeLists.txt
+++ b/kommander/plugin/CMakeLists.txt
@@ -2,9 +2,12 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/kommander/widget
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
-  ${CMAKE_SOURCE_DIR}/kommander/widget
 )
 
 link_directories(
diff --git a/kommander/pluginmanager/CMakeLists.txt b/kommander/pluginmanager/CMakeLists.txt
index 077dd20b..d65e78ff 100644
--- a/kommander/pluginmanager/CMakeLists.txt
+++ b/kommander/pluginmanager/CMakeLists.txt
@@ -2,9 +2,12 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/kommander/factory
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
-  ${CMAKE_SOURCE_DIR}/kommander/factory
 )
 
 link_directories(
diff --git a/kommander/widget/CMakeLists.txt b/kommander/widget/CMakeLists.txt
index 38fb56f7..866a0dfd 100644
--- a/kommander/widget/CMakeLists.txt
+++ b/kommander/widget/CMakeLists.txt
@@ -2,12 +2,15 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${TDE_INCLUDE_DIR}
-  ${TQT_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/kommander/plugin
   ${CMAKE_SOURCE_DIR}/kommander/factory
 )
 
+include_directories( SYSTEM
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
 link_directories(
   ${TQT_LIBRARY_DIRS}
   ${TDE_LIB_DIR}
diff --git a/kommander/widgets/CMakeLists.txt b/kommander/widgets/CMakeLists.txt
index d4bacb99..a3e2d641 100644
--- a/kommander/widgets/CMakeLists.txt
+++ b/kommander/widgets/CMakeLists.txt
@@ -5,6 +5,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/kommander/widget
   ${CMAKE_SOURCE_DIR}/kommander/factory
   ${CMAKE_SOURCE_DIR}/kommander/plugin
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )