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 <slavek.banko@axis.cz>

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}

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}

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}
 )

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(

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}
 )

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}

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}

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}

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(

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
 )
 
 

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}

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}

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(

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(

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}

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}
 )

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}

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}

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}

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}

lib/CMakeLists.txt

@@ -11,6 +11,9 @@
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+include_directories( SYSTEM
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )

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}
 )

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}
 )

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}
 )

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}
 )

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}
 )

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}
 )

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}
 )

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}
 )

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}
 )

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}
 )

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}
 )

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}
 )

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
 )

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}
 )

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}
 )

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}

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}
 )

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}
 )

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}
 )

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}
 )

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}
 )

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}

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