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]>

44 files changed, 156 insertions, 23 deletions

diff --git a/kimagemapeditor/CMakeLists.txt b/kimagemapeditor/CMakeLists.txt
index 78bfb22f..442c8ed8 100644
--- a/kimagemapeditor/CMakeLists.txt
+++ b/kimagemapeditor/CMakeLists.txt
@@ -4,6 +4,9 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -29,6 +32,8 @@ tde_add_library( kimagemapeditorcommon STATIC_PIC AUTOMOC
         arealistview.cpp
         imageslistview.cpp
         mapslistview.cpp
+  LINK
+     tdehtml-shared
 )
 
 
@@ -44,7 +49,6 @@ tde_add_kpart( libkimagemapeditor AUTOMOC
      kimagemapeditorcommon-static
   LINK
      tdeparts-shared
-     tdehtml-shared
 
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
@@ -61,7 +65,6 @@ tde_add_executable( kimagemapeditor AUTOMOC
      tdecore-shared
      tdeui-shared
      tdeio-shared
-     tdehtml-shared
      kimagemapeditorcommon-static
 
   DESTINATION ${BIN_INSTALL_DIR}
diff --git a/klinkstatus/src/CMakeLists.txt b/klinkstatus/src/CMakeLists.txt
index eb3e7bdb..b8a5eea3 100644
--- a/klinkstatus/src/CMakeLists.txt
+++ b/klinkstatus/src/CMakeLists.txt
@@ -8,12 +8,15 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${TDE_INCLUDE_DIR}
-  ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/klinkstatus/src/ui
   ${CMAKE_BINARY_DIR}/klinkstatus/src/ui/settings
 )
 
+include_directories( SYSTEM
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
 link_directories(
   ${TQT_LIBRARY_DIRS}
   ${TDE_LIB_DIR}
diff --git a/klinkstatus/src/cfg/CMakeLists.txt b/klinkstatus/src/cfg/CMakeLists.txt
index 41601328..f5f9a1f3 100644
--- a/klinkstatus/src/cfg/CMakeLists.txt
+++ b/klinkstatus/src/cfg/CMakeLists.txt
@@ -2,6 +2,9 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/klinkstatus/src/engine/CMakeLists.txt b/klinkstatus/src/engine/CMakeLists.txt
index 875c60db..21cd32ae 100644
--- a/klinkstatus/src/engine/CMakeLists.txt
+++ b/klinkstatus/src/engine/CMakeLists.txt
@@ -2,9 +2,12 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/src/ui
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
-  ${CMAKE_SOURCE_DIR}/src/ui
 )
 
 link_directories(
diff --git a/klinkstatus/src/parser/CMakeLists.txt b/klinkstatus/src/parser/CMakeLists.txt
index f86149f7..3a31b799 100644
--- a/klinkstatus/src/parser/CMakeLists.txt
+++ b/klinkstatus/src/parser/CMakeLists.txt
@@ -2,6 +2,9 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/klinkstatus/src/ui/CMakeLists.txt b/klinkstatus/src/ui/CMakeLists.txt
index a2d49e43..316b729b 100644
--- a/klinkstatus/src/ui/CMakeLists.txt
+++ b/klinkstatus/src/ui/CMakeLists.txt
@@ -4,13 +4,16 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${TDE_INCLUDE_DIR}
-  ${TQT_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/src
   ${CMAKE_BINARY_DIR}/klinkstatus/src/cfg
   ${CMAKE_BINARY_DIR}/klinkstatus/src
 )
 
+include_directories( SYSTEM
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
 link_directories(
   ${TQT_LIBRARY_DIRS}
   ${TDE_LIB_DIR}
diff --git a/klinkstatus/src/ui/settings/CMakeLists.txt b/klinkstatus/src/ui/settings/CMakeLists.txt
index d1fb1f3d..78e036f1 100644
--- a/klinkstatus/src/ui/settings/CMakeLists.txt
+++ b/klinkstatus/src/ui/settings/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_BINARY_DIR}/klinkstatus/src/cfg
   ${CMAKE_BINARY_DIR}/klinkstatus/src
 )
 
+include_directories( SYSTEM
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
 link_directories(
   ${TQT_LIBRARY_DIRS}
   ${TDE_LIB_DIR}
diff --git a/klinkstatus/src/utils/CMakeLists.txt b/klinkstatus/src/utils/CMakeLists.txt
index d52bd7b5..53a5fc3d 100644
--- a/klinkstatus/src/utils/CMakeLists.txt
+++ b/klinkstatus/src/utils/CMakeLists.txt
@@ -5,6 +5,9 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
   ${LIBXML_INCLUDE_DIRS}
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}
 )
diff --git a/kxsldbg/CMakeLists.txt b/kxsldbg/CMakeLists.txt
index c8d0a2da..d699d4d9 100644
--- a/kxsldbg/CMakeLists.txt
+++ b/kxsldbg/CMakeLists.txt
@@ -8,6 +8,9 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
   ${LIBXML_INCLUDE_DIRS}
diff --git a/kxsldbg/kxsldbgpart/CMakeLists.txt b/kxsldbg/kxsldbgpart/CMakeLists.txt
index b3776dde..cf55a993 100644
--- a/kxsldbg/kxsldbgpart/CMakeLists.txt
+++ b/kxsldbg/kxsldbgpart/CMakeLists.txt
@@ -5,6 +5,9 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
   ${LIBXML_INCLUDE_DIRS}
diff --git a/kxsldbg/kxsldbgpart/libtqtnotfier/CMakeLists.txt b/kxsldbg/kxsldbgpart/libtqtnotfier/CMakeLists.txt
index ef507a7c..e8416c7d 100644
--- a/kxsldbg/kxsldbgpart/libtqtnotfier/CMakeLists.txt
+++ b/kxsldbg/kxsldbgpart/libtqtnotfier/CMakeLists.txt
@@ -2,6 +2,9 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
   ${LIBXML_INCLUDE_DIRS}
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/CMakeLists.txt b/kxsldbg/kxsldbgpart/libxsldbg/CMakeLists.txt
index 056331ce..79160bc0 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/CMakeLists.txt
+++ b/kxsldbg/kxsldbgpart/libxsldbg/CMakeLists.txt
@@ -2,6 +2,9 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
   ${LIBXML_INCLUDE_DIRS}
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index a76ed738..22bd24a9 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -11,6 +11,9 @@
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/lib/compatibility/tdemdi/CMakeLists.txt b/lib/compatibility/tdemdi/CMakeLists.txt
index c3973143..980af1c9 100644
--- a/lib/compatibility/tdemdi/CMakeLists.txt
+++ b/lib/compatibility/tdemdi/CMakeLists.txt
@@ -4,6 +4,9 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/lib/compatibility/tdemdi/qextmdi
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/lib/compatibility/tdemdi/qextmdi/CMakeLists.txt b/lib/compatibility/tdemdi/qextmdi/CMakeLists.txt
index 12bb58e5..78a41177 100644
--- a/lib/compatibility/tdemdi/qextmdi/CMakeLists.txt
+++ b/lib/compatibility/tdemdi/qextmdi/CMakeLists.txt
@@ -5,6 +5,9 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/lib/compatibility/tdemdi/qextmdi/res
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/components/csseditor/CMakeLists.txt b/quanta/components/csseditor/CMakeLists.txt
index 83e9068c..82113e59 100644
--- a/quanta/components/csseditor/CMakeLists.txt
+++ b/quanta/components/csseditor/CMakeLists.txt
@@ -18,6 +18,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/project
   ${CMAKE_SOURCE_DIR}/quanta/parsers
   ${CMAKE_SOURCE_DIR}/quanta/utility
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/components/cvsservice/CMakeLists.txt b/quanta/components/cvsservice/CMakeLists.txt
index 7f2010ae..7f0a83c8 100644
--- a/quanta/components/cvsservice/CMakeLists.txt
+++ b/quanta/components/cvsservice/CMakeLists.txt
@@ -5,6 +5,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/project
   ${CMAKE_SOURCE_DIR}/quanta/parsers
   ${CMAKE_SOURCE_DIR}/quanta/utility
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/components/debugger/CMakeLists.txt b/quanta/components/debugger/CMakeLists.txt
index 6a9e7609..58d8c1f2 100644
--- a/quanta/components/debugger/CMakeLists.txt
+++ b/quanta/components/debugger/CMakeLists.txt
@@ -24,6 +24,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/utility
   ${CMAKE_SOURCE_DIR}/quanta/messages
   ${CMAKE_SOURCE_DIR}/quanta/parts/preview
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/components/debugger/dbgp/CMakeLists.txt b/quanta/components/debugger/dbgp/CMakeLists.txt
index 0652c64d..e56d828b 100644
--- a/quanta/components/debugger/dbgp/CMakeLists.txt
+++ b/quanta/components/debugger/dbgp/CMakeLists.txt
@@ -13,6 +13,9 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/quanta/components/debugger
   ${CMAKE_SOURCE_DIR}/quanta/components/debugger/interfaces
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/components/debugger/gubed/CMakeLists.txt b/quanta/components/debugger/gubed/CMakeLists.txt
index b528b30a..a5cfe95d 100644
--- a/quanta/components/debugger/gubed/CMakeLists.txt
+++ b/quanta/components/debugger/gubed/CMakeLists.txt
@@ -13,6 +13,9 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/quanta/components/debugger
   ${CMAKE_SOURCE_DIR}/quanta/components/debugger/interfaces
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/components/debugger/interfaces/CMakeLists.txt b/quanta/components/debugger/interfaces/CMakeLists.txt
index 9778dbe0..72e14676 100644
--- a/quanta/components/debugger/interfaces/CMakeLists.txt
+++ b/quanta/components/debugger/interfaces/CMakeLists.txt
@@ -12,6 +12,9 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/quanta/components/debugger
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/components/framewizard/CMakeLists.txt b/quanta/components/framewizard/CMakeLists.txt
index 0a1f83a1..c745467b 100644
--- a/quanta/components/framewizard/CMakeLists.txt
+++ b/quanta/components/framewizard/CMakeLists.txt
@@ -14,6 +14,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/lib
   ${CMAKE_SOURCE_DIR}/quanta/project
   ${CMAKE_SOURCE_DIR}/quanta/components/framewizard
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/components/tableeditor/CMakeLists.txt b/quanta/components/tableeditor/CMakeLists.txt
index e6a7d8a9..699d1aa6 100644
--- a/quanta/components/tableeditor/CMakeLists.txt
+++ b/quanta/components/tableeditor/CMakeLists.txt
@@ -15,6 +15,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/parsers
   ${CMAKE_SOURCE_DIR}/quanta/utility
   ${CMAKE_SOURCE_DIR}/quanta/dialogs/tagdialogs
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/dialogs/CMakeLists.txt b/quanta/dialogs/CMakeLists.txt
index 22debbf3..69d43876 100644
--- a/quanta/dialogs/CMakeLists.txt
+++ b/quanta/dialogs/CMakeLists.txt
@@ -19,6 +19,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/dialogs
   ${CMAKE_SOURCE_DIR}/quanta/src
   ${CMAKE_SOURCE_DIR}/quanta/parsers
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/dialogs/settings/CMakeLists.txt b/quanta/dialogs/settings/CMakeLists.txt
index c5d96b02..74396c31 100644
--- a/quanta/dialogs/settings/CMakeLists.txt
+++ b/quanta/dialogs/settings/CMakeLists.txt
@@ -14,6 +14,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/utility
   ${CMAKE_SOURCE_DIR}/quanta/parsers
   ${CMAKE_SOURCE_DIR}/quanta/src
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/dialogs/tagdialogs/CMakeLists.txt b/quanta/dialogs/tagdialogs/CMakeLists.txt
index 7d478f6d..7a53c140 100644
--- a/quanta/dialogs/tagdialogs/CMakeLists.txt
+++ b/quanta/dialogs/tagdialogs/CMakeLists.txt
@@ -18,6 +18,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/src
   ${CMAKE_SOURCE_DIR}/quanta/parts/kafka
   ${CMAKE_SOURCE_DIR}/quanta/components/csseditor
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -33,4 +36,6 @@ tde_add_library( tagdialogs STATIC_PIC AUTOMOC
     tagimgdlg.cpp tagxml.cpp tagwidget.cpp
     colorcombo.cpp tagimgdlgdata.cpp tagmiscdlg.cpp
     tagmail.ui
+  LINK
+    tdeabc-shared
 )
diff --git a/quanta/messages/CMakeLists.txt b/quanta/messages/CMakeLists.txt
index 8e2d1d40..9552040a 100644
--- a/quanta/messages/CMakeLists.txt
+++ b/quanta/messages/CMakeLists.txt
@@ -16,6 +16,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/project
   ${CMAKE_SOURCE_DIR}/quanta/parsers
   ${CMAKE_SOURCE_DIR}/quanta/utility
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/parsers/CMakeLists.txt b/quanta/parsers/CMakeLists.txt
index 53536e0b..a7c6adc4 100644
--- a/quanta/parsers/CMakeLists.txt
+++ b/quanta/parsers/CMakeLists.txt
@@ -19,6 +19,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/utility
   ${CMAKE_SOURCE_DIR}/quanta/treeviews
   ${CMAKE_SOURCE_DIR}/quanta/parts/kafka
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/parsers/dtd/CMakeLists.txt b/quanta/parsers/dtd/CMakeLists.txt
index 405a4f5e..5d767f5e 100644
--- a/quanta/parsers/dtd/CMakeLists.txt
+++ b/quanta/parsers/dtd/CMakeLists.txt
@@ -20,6 +20,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/parsers
   ${CMAKE_SOURCE_DIR}/quanta/utility
   ${CMAKE_SOURCE_DIR}/quanta/dialogs
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
   ${LIBXML_INCLUDE_DIRS}
diff --git a/quanta/parts/kafka/CMakeLists.txt b/quanta/parts/kafka/CMakeLists.txt
index cf1b5775..eebfe2f1 100644
--- a/quanta/parts/kafka/CMakeLists.txt
+++ b/quanta/parts/kafka/CMakeLists.txt
@@ -21,6 +21,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/parsers
   ${CMAKE_SOURCE_DIR}/quanta/utility
   ${CMAKE_SOURCE_DIR}/quanta/treeviews
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/parts/preview/CMakeLists.txt b/quanta/parts/preview/CMakeLists.txt
index 8a0493c5..39fde475 100644
--- a/quanta/parts/preview/CMakeLists.txt
+++ b/quanta/parts/preview/CMakeLists.txt
@@ -12,6 +12,9 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/quanta/utility
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/plugins/CMakeLists.txt b/quanta/plugins/CMakeLists.txt
index 21be0e70..f4e84be9 100644
--- a/quanta/plugins/CMakeLists.txt
+++ b/quanta/plugins/CMakeLists.txt
@@ -16,6 +16,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/parsers
   ${CMAKE_SOURCE_DIR}/quanta/utility
   ${CMAKE_SOURCE_DIR}/quanta/messages
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/project/CMakeLists.txt b/quanta/project/CMakeLists.txt
index 6f3c6f8f..ba5015ad 100644
--- a/quanta/project/CMakeLists.txt
+++ b/quanta/project/CMakeLists.txt
@@ -22,6 +22,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/dialogs/tagdialogs
   ${CMAKE_SOURCE_DIR}/quanta/components/debugger
   ${CMAKE_SOURCE_DIR}/quanta/components/debugger/interfaces
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/src/CMakeLists.txt b/quanta/src/CMakeLists.txt
index dfd385f1..fb9ec188 100644
--- a/quanta/src/CMakeLists.txt
+++ b/quanta/src/CMakeLists.txt
@@ -39,6 +39,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/dialogs
   ${CMAKE_SOURCE_DIR}/quanta/dialogs/settings
   ${CMAKE_SOURCE_DIR}/quanta/dialogs/tagdialogs
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/quanta/treeviews/CMakeLists.txt b/quanta/treeviews/CMakeLists.txt
index e5b8d6a3..17754a1f 100644
--- a/quanta/treeviews/CMakeLists.txt
+++ b/quanta/treeviews/CMakeLists.txt
@@ -27,6 +27,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/components/csseditor
   ${CMAKE_SOURCE_DIR}/quanta/components/cvsservice
   ${CMAKE_SOURCE_DIR}/quanta/plugins
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
   ${X11_INCLUDE_DIR}
diff --git a/quanta/utility/CMakeLists.txt b/quanta/utility/CMakeLists.txt
index c65eb97a..5faa5f29 100644
--- a/quanta/utility/CMakeLists.txt
+++ b/quanta/utility/CMakeLists.txt
@@ -19,11 +19,13 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/quanta/messages
   ${CMAKE_SOURCE_DIR}/quanta/parts/kafka
   ${CMAKE_SOURCE_DIR}/quanta/project
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
 
-
 ##### utility (static) ##########################
 
 tde_add_library( utility STATIC_PIC AUTOMOC