diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2021-03-12 03:34:03 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2021-03-12 15:28:13 +0100 |
commit | f8e520626b8b09927cfa024d1860778466892d4f (patch) | |
tree | 11b2ff0760ecd227d2396475e27f985654b5b233 /klinkstatus/src/ui | |
parent | 369d8455ac39aa9f5328b855bd5f456e3f384a63 (diff) | |
download | tdewebdev-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 'klinkstatus/src/ui')
-rw-r--r-- | klinkstatus/src/ui/CMakeLists.txt | 7 | ||||
-rw-r--r-- | klinkstatus/src/ui/settings/CMakeLists.txt | 7 |
2 files changed, 10 insertions, 4 deletions
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} |