summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-03-12 03:34:03 +0100
committerSlávek Banko <slavek.banko@axis.cz>2021-03-12 15:28:13 +0100
commitf8e520626b8b09927cfa024d1860778466892d4f (patch)
tree11b2ff0760ecd227d2396475e27f985654b5b233 /lib
parent369d8455ac39aa9f5328b855bd5f456e3f384a63 (diff)
downloadtdewebdev-f8e520626b8b09927cfa024d1860778466892d4f.tar.gz
tdewebdev-f8e520626b8b09927cfa024d1860778466892d4f.zip
Fix FTBFS with CMake build:r14.0.10
+ 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> (cherry picked from commit f4edc50e4756b2289254ee308223faed9be6a2c7)
Diffstat (limited to 'lib')
-rw-r--r--lib/CMakeLists.txt3
-rw-r--r--lib/compatibility/tdemdi/CMakeLists.txt3
-rw-r--r--lib/compatibility/tdemdi/qextmdi/CMakeLists.txt3
3 files changed, 9 insertions, 0 deletions
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}
)