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 /quanta/dialogs | |
| parent | 369d8455ac39aa9f5328b855bd5f456e3f384a63 (diff) | |
| download | tdewebdev-r14.0.10.tar.gz tdewebdev-r14.0.10.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 'quanta/dialogs')
| -rw-r--r-- | quanta/dialogs/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | quanta/dialogs/settings/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | quanta/dialogs/tagdialogs/CMakeLists.txt | 5 |
3 files changed, 11 insertions, 0 deletions
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 ) |