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 /kimagemapeditor/CMakeLists.txt | |
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 'kimagemapeditor/CMakeLists.txt')
-rw-r--r-- | kimagemapeditor/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kimagemapeditor/CMakeLists.txt b/kimagemapeditor/CMakeLists.txt index 78bfb22f..442c8ed8 100644 --- a/kimagemapeditor/CMakeLists.txt +++ b/kimagemapeditor/CMakeLists.txt @@ -4,6 +4,9 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -29,6 +32,8 @@ tde_add_library( kimagemapeditorcommon STATIC_PIC AUTOMOC arealistview.cpp imageslistview.cpp mapslistview.cpp + LINK + tdehtml-shared ) @@ -44,7 +49,6 @@ tde_add_kpart( libkimagemapeditor AUTOMOC kimagemapeditorcommon-static LINK tdeparts-shared - tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -61,7 +65,6 @@ tde_add_executable( kimagemapeditor AUTOMOC tdecore-shared tdeui-shared tdeio-shared - tdehtml-shared kimagemapeditorcommon-static DESTINATION ${BIN_INSTALL_DIR} |