TDE
/
tdewebdev
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdewebdev
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix FTBFS with CMake build:

Browse Source 
+ 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>
pull/12/head
Slávek Banko 4 years ago
parent 70defe5e6d
commit f4edc50e47
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
44 changed files with 156 additions and 23 deletions
Show Stats Download Patch File Download Diff File

7
kimagemapeditor/CMakeLists.txt
Unescape View File

@ -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}

7
klinkstatus/src/CMakeLists.txt
Unescape View File

@ -8,12 +8,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/ui
${CMAKE_BINARY_DIR}/klinkstatus/src/ui/settings
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}

3
klinkstatus/src/cfg/CMakeLists.txt
Unescape View File

@ -2,6 +2,9 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

5
klinkstatus/src/engine/CMakeLists.txt
Unescape View File

@ -2,9 +2,12 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src/ui
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/src/ui
)
link_directories(

3
klinkstatus/src/parser/CMakeLists.txt
Unescape View File

@ -2,6 +2,9 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

7
klinkstatus/src/ui/CMakeLists.txt
Unescape View File

@ -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}

7
klinkstatus/src/ui/settings/CMakeLists.txt
Unescape View File

@ -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}

3
klinkstatus/src/utils/CMakeLists.txt
Unescape View File

@ -5,6 +5,9 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${LIBXML_INCLUDE_DIRS}

8
kommander/editor/CMakeLists.txt
Unescape View File

@ -4,13 +4,15 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/kommander/widget
${CMAKE_SOURCE_DIR}/kommander/widgets
${CMAKE_SOURCE_DIR}/kommander/plugin
${CMAKE_SOURCE_DIR}/kommander/factory
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
link_directories(

8
kommander/executor/CMakeLists.txt
Unescape View File

@ -2,14 +2,17 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/kommander/widget
${CMAKE_SOURCE_DIR}/kommander/widgets
${CMAKE_SOURCE_DIR}/kommander/factory
${CMAKE_SOURCE_DIR}/kommander/plugin
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}
@ -28,6 +31,7 @@ tde_add_library( instance STATIC_PIC AUTOMOC
tdeui-shared
tdeio-shared
kommanderplugin-shared
kommanderwidget-shared
)

7
kommander/factory/CMakeLists.txt
Unescape View File

@ -2,12 +2,15 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/kommander/widget
${CMAKE_SOURCE_DIR}/kommander/plugin
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}

7
kommander/part/CMakeLists.txt
Unescape View File

@ -2,12 +2,15 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/kommander/executor
${CMAKE_SOURCE_DIR}/kommander/factory
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}

5
kommander/plugin/CMakeLists.txt
Unescape View File

@ -2,9 +2,12 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kommander/widget
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/kommander/widget
)
link_directories(

5
kommander/pluginmanager/CMakeLists.txt
Unescape View File

@ -2,9 +2,12 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kommander/factory
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/kommander/factory
)
link_directories(

7
kommander/widget/CMakeLists.txt
Unescape View File

@ -2,12 +2,15 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/kommander/plugin
${CMAKE_SOURCE_DIR}/kommander/factory
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIB_DIR}

3
kommander/widgets/CMakeLists.txt
Unescape View File

@ -5,6 +5,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/kommander/widget
${CMAKE_SOURCE_DIR}/kommander/factory
${CMAKE_SOURCE_DIR}/kommander/plugin
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

3
kxsldbg/CMakeLists.txt
Unescape View File

@ -8,6 +8,9 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${LIBXML_INCLUDE_DIRS}

3
kxsldbg/kxsldbgpart/CMakeLists.txt
Unescape View File

@ -5,6 +5,9 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${LIBXML_INCLUDE_DIRS}

3
kxsldbg/kxsldbgpart/libtqtnotfier/CMakeLists.txt
Unescape View File

@ -2,6 +2,9 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${LIBXML_INCLUDE_DIRS}

3
kxsldbg/kxsldbgpart/libxsldbg/CMakeLists.txt
Unescape View File

@ -2,6 +2,9 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${LIBXML_INCLUDE_DIRS}

3
lib/CMakeLists.txt
Unescape View File

@ -11,6 +11,9 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

3
lib/compatibility/tdemdi/CMakeLists.txt
Unescape View File

@ -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}
)

3
lib/compatibility/tdemdi/qextmdi/CMakeLists.txt
Unescape View File

@ -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}
)

3
quanta/components/csseditor/CMakeLists.txt
Unescape View File

@ -18,6 +18,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/quanta/project
${CMAKE_SOURCE_DIR}/quanta/parsers
${CMAKE_SOURCE_DIR}/quanta/utility
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

3
quanta/components/cvsservice/CMakeLists.txt
Unescape View File

@ -5,6 +5,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/quanta/project
${CMAKE_SOURCE_DIR}/quanta/parsers
${CMAKE_SOURCE_DIR}/quanta/utility
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

3
quanta/components/debugger/CMakeLists.txt
Unescape View File

@ -24,6 +24,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/quanta/utility
${CMAKE_SOURCE_DIR}/quanta/messages
${CMAKE_SOURCE_DIR}/quanta/parts/preview
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

3
quanta/components/debugger/dbgp/CMakeLists.txt
Unescape View File

@ -13,6 +13,9 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/quanta/components/debugger
${CMAKE_SOURCE_DIR}/quanta/components/debugger/interfaces
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

3
quanta/components/debugger/gubed/CMakeLists.txt
Unescape View File

@ -13,6 +13,9 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/quanta/components/debugger
${CMAKE_SOURCE_DIR}/quanta/components/debugger/interfaces
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

3
quanta/components/debugger/interfaces/CMakeLists.txt
Unescape View File

@ -12,6 +12,9 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/quanta/components/debugger
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

3
quanta/components/framewizard/CMakeLists.txt
Unescape View File

@ -14,6 +14,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/lib
${CMAKE_SOURCE_DIR}/quanta/project
${CMAKE_SOURCE_DIR}/quanta/components/framewizard
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

3
quanta/components/tableeditor/CMakeLists.txt
Unescape View File

@ -15,6 +15,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/quanta/parsers
${CMAKE_SOURCE_DIR}/quanta/utility
${CMAKE_SOURCE_DIR}/quanta/dialogs/tagdialogs
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

3
quanta/dialogs/CMakeLists.txt
Unescape View File

@ -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}
)

3
quanta/dialogs/settings/CMakeLists.txt
Unescape View File

@ -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}
)

5
quanta/dialogs/tagdialogs/CMakeLists.txt
Unescape View File

@ -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
)

3
quanta/messages/CMakeLists.txt
Unescape View File

@ -16,6 +16,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/quanta/project
${CMAKE_SOURCE_DIR}/quanta/parsers
${CMAKE_SOURCE_DIR}/quanta/utility
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

3
quanta/parsers/CMakeLists.txt
Unescape View File

@ -19,6 +19,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/quanta/utility
${CMAKE_SOURCE_DIR}/quanta/treeviews
${CMAKE_SOURCE_DIR}/quanta/parts/kafka
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

3
quanta/parsers/dtd/CMakeLists.txt
Unescape View File

@ -20,6 +20,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/quanta/parsers
${CMAKE_SOURCE_DIR}/quanta/utility
${CMAKE_SOURCE_DIR}/quanta/dialogs
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${LIBXML_INCLUDE_DIRS}

3
quanta/parts/kafka/CMakeLists.txt
Unescape View File

@ -21,6 +21,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/quanta/parsers
${CMAKE_SOURCE_DIR}/quanta/utility
${CMAKE_SOURCE_DIR}/quanta/treeviews
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

3
quanta/parts/preview/CMakeLists.txt
Unescape View File

@ -12,6 +12,9 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/quanta/utility
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

3
quanta/plugins/CMakeLists.txt
Unescape View File

@ -16,6 +16,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/quanta/parsers
${CMAKE_SOURCE_DIR}/quanta/utility
${CMAKE_SOURCE_DIR}/quanta/messages
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

3
quanta/project/CMakeLists.txt
Unescape View File

@ -22,6 +22,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/quanta/dialogs/tagdialogs
${CMAKE_SOURCE_DIR}/quanta/components/debugger
${CMAKE_SOURCE_DIR}/quanta/components/debugger/interfaces
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

3
quanta/src/CMakeLists.txt
Unescape View File

@ -39,6 +39,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/quanta/dialogs
${CMAKE_SOURCE_DIR}/quanta/dialogs/settings
${CMAKE_SOURCE_DIR}/quanta/dialogs/tagdialogs
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

3
quanta/treeviews/CMakeLists.txt
Unescape View File

@ -27,6 +27,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/quanta/components/csseditor
${CMAKE_SOURCE_DIR}/quanta/components/cvsservice
${CMAKE_SOURCE_DIR}/quanta/plugins
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${X11_INCLUDE_DIR}

4
quanta/utility/CMakeLists.txt
Unescape View File

@ -19,11 +19,13 @@ include_directories(
${CMAKE_SOURCE_DIR}/quanta/messages
${CMAKE_SOURCE_DIR}/quanta/parts/kafka
${CMAKE_SOURCE_DIR}/quanta/project
)
include_directories( SYSTEM
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
##### utility (static) ##########################
tde_add_library( utility STATIC_PIC AUTOMOC

Write Preview
Loading…
Cancel
Save