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>

21 files changed, 65 insertions, 1 deletions

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