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>

7 files changed, 28 insertions, 7 deletions

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}