From f4edc50e4756b2289254ee308223faed9be6a2c7 Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Fri, 12 Mar 2021 03:34:03 +0100 Subject: Fix FTBFS with CMake build: + Determine TQt and TDE include directories as SYSTEM. It solves priority for #include "..." × #include <...> + Additional linked libraries. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- klinkstatus/src/ui/CMakeLists.txt | 7 +++++-- klinkstatus/src/ui/settings/CMakeLists.txt | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'klinkstatus/src/ui') 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} -- cgit v1.2.3