<div class="gmail_quote">On Tue, Dec 14, 2010 at 10:20 PM, Andreas Pakulat <span dir="ltr"><<a href="mailto:apaku@gmx.de">apaku@gmx.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
commit 306d9f23e3d70fb8d745c384aac96a76963dffbd<br>
branch master<br>
Author: Andreas Pakulat <<a href="mailto:apaku@gmx.de">apaku@gmx.de</a>><br>
Date: Tue Dec 14 22:17:44 2010 +0100<br>
<br>
Fix linkage and link-interfaces<br>
<br>
This reduces the link-interfaces of the kdevplatform libs to whats really<br>
necessary (i.e. to libs they really use in their public API) and removes<br>
unecessary ones from the interface that are indirectly pulled in already.<br>
<br>
Also cleaned up the linking a bit along the way, removed some unecessary<br>
dependencies.<br>
<br>
If someone notices linker errors please send contact me with the output<br>
of make VERBOSE=1 in the failing directory.<br>
<br>
CCMAIL: <a href="mailto:kdevelop-devel@kdevelop.org">kdevelop-devel@kdevelop.org</a><br>
<br>
diff --git a/debugger/CMakeLists.txt b/debugger/CMakeLists.txt<br>
index 639fc99..0e6fa50 100644<br>
--- a/debugger/CMakeLists.txt<br>
+++ b/debugger/CMakeLists.txt<br>
@@ -30,6 +30,9 @@ target_link_libraries(kdevplatformdebugger<br>
${KDE4_KDEUI_LIBS}<br>
${KDE4_KTEXTEDITOR_LIBS}<br>
)<br>
+target_link_libraries(kdevplatformdebugger LINK_INTERFACE_LIBRARIES<br>
+ kdevplatforminterfaces<br>
+ kdevplatformutil)<br>
set_target_properties(kdevplatformdebugger PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION})<br>
install(TARGETS kdevplatformdebugger EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )<br>
<br>
diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt<br>
index 7b0c44c..8e36eae 100644<br>
--- a/documentation/CMakeLists.txt<br>
+++ b/documentation/CMakeLists.txt<br>
@@ -15,8 +15,7 @@ target_link_libraries(kdevplatformdocumentation<br>
kdevplatforminterfaces)<br>
<br>
target_link_libraries(kdevplatformdocumentation LINK_INTERFACE_LIBRARIES<br>
- ${QT_QTGUI_LIBRARY}<br>
- ${KDE4_KDECORE_LIBS})<br>
+ kdevplatforminterfaces)<br>
<br>
set_target_properties(kdevplatformdocumentation PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION})<br>
<br>
diff --git a/language/CMakeLists.txt b/language/CMakeLists.txt<br>
index b66418d..67985db 100644<br>
--- a/language/CMakeLists.txt<br>
+++ b/language/CMakeLists.txt<br>
@@ -139,8 +139,7 @@ target_link_libraries(kdevplatformlanguage<br>
kdevplatformutil)<br>
# Need to add kdevplatforminterfaces and kdevplatformutil when those are exported targets<br>
target_link_libraries(kdevplatformlanguage LINK_INTERFACE_LIBRARIES<br>
- ${KDE4_KTEXTEDITOR_LIBS}<br>
- ${KDE4_THREADWEAVER_LIBRARIES})<br>
+ kdevplatforminterfaces)<br>
set_target_properties(kdevplatformlanguage PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION})<br>
install(TARGETS kdevplatformlanguage EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )<br>
<br>
diff --git a/outputview/CMakeLists.txt b/outputview/CMakeLists.txt<br>
index 8bc2650..ba30392 100644<br>
--- a/outputview/CMakeLists.txt<br>
+++ b/outputview/CMakeLists.txt<br>
@@ -9,10 +9,9 @@ kde4_add_library( kdevplatformoutputview SHARED ${outputviewinterfaces_LIB_SRCS}<br>
target_link_libraries(kdevplatformoutputview<br>
${QT_QTCORE_LIBRARY}<br>
${KDE4_KDEUI_LIBS}<br>
- kdevplatforminterfaces )<br>
+ kdevplatforminterfaces)<br>
# Need to add kdevplatforminterfaces when its exported as target<br>
target_link_libraries(kdevplatformoutputview LINK_INTERFACE_LIBRARIES<br>
- ${QT_QTCORE_LIBRARY}<br>
${KDE4_KDEUI_LIBS})<br>
set_target_properties(kdevplatformoutputview PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION})<br>
install(TARGETS kdevplatformoutputview EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )<br>
diff --git a/plugins/execute/CMakeLists.txt b/plugins/execute/CMakeLists.txt<br>
index 0454f7e..6c65936 100644<br>
--- a/plugins/execute/CMakeLists.txt<br>
+++ b/plugins/execute/CMakeLists.txt<br>
@@ -19,6 +19,7 @@ kde4_add_ui_files( kdevexecute_PART_SRCS ${kdevexecute_PART_UIS} )<br>
kde4_add_plugin(kdevexecute ${kdevexecute_PART_SRCS} )<br>
target_link_libraries(kdevexecute<br>
${KDE4_KDEUI_LIBS}<br>
+ ${KDE4_KCMUTILS_LIBS}<br>
kdevplatforminterfaces<br>
kdevplatformutil<br>
kdevplatformproject<br>
diff --git a/project/CMakeLists.txt b/project/CMakeLists.txt<br>
index 1cf4d7c..6e195ad 100644<br>
--- a/project/CMakeLists.txt<br>
+++ b/project/CMakeLists.txt<br>
@@ -26,9 +26,7 @@ target_link_libraries(kdevplatformproject<br>
kdevplatformlanguage<br>
${KDE4_KIO_LIBS})<br>
target_link_libraries(kdevplatformproject LINK_INTERFACE_LIBRARIES<br>
- ${QT_QTGUI_LIBRARY}<br>
- ${KDE4_KDECORE_LIBS}<br>
- ${KDE4_KUTIL_LIBRARY})<br>
+ kdevplatforminterfaces)<br>
set_target_properties(kdevplatformproject PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION})<br>
install(TARGETS kdevplatformproject EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )<br>
<br>
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt<br>
index fdd430c..95641dd 100644<br>
--- a/shell/CMakeLists.txt<br>
+++ b/shell/CMakeLists.txt<br>
@@ -113,15 +113,9 @@ target_link_libraries(kdevplatformshell<br>
kdevplatformdocumentation)<br>
# need to add kdevplatform* once those are exported targets<br>
target_link_libraries(kdevplatformshell LINK_INTERFACE_LIBRARIES<br>
- ${KDE4_KDEUI_LIBS}<br>
- ${KDE4_KDECORE_LIBS}<br>
- kdevplatformproject<br>
+ kdevplatformoutputview<br>
sublime<br>
- kdevplatformlanguage<br>
- kdevplatformvcs<br>
- kdevplatformdocumentation<br>
- kdevplatformdebugger<br>
- kdevplatforminterfaces)<br>
+ kdevplatformdebugger)<br>
set_target_properties(kdevplatformshell PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION})<br>
<br>
install(FILES<br>
diff --git a/sublime/CMakeLists.txt b/sublime/CMakeLists.txt<br>
index a4c3523..f9aaaeb 100644<br>
--- a/sublime/CMakeLists.txt<br>
+++ b/sublime/CMakeLists.txt<br>
@@ -27,7 +27,6 @@ target_link_libraries(sublime<br>
${KDE4_KDEUI_LIBS}<br>
${KDE4_KPARTS_LIBS})<br>
target_link_libraries(sublime LINK_INTERFACE_LIBRARIES<br>
- ${KDE4_KDEUI_LIBS}<br>
${KDE4_KPARTS_LIBS})<br>
set_target_properties(sublime PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION})<br>
install(TARGETS sublime EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )<br>
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt<br>
index f90cc07..39bf040 100644<br>
--- a/tests/CMakeLists.txt<br>
+++ b/tests/CMakeLists.txt<br>
@@ -13,7 +13,8 @@ kde4_add_library(kdevplatformtests SHARED ${kdevplatformtests_LIB_SRCS})<br>
target_link_libraries(kdevplatformtests<br>
${QT_QTCORE_LIBRARY} kdevplatformshell kdevplatformlanguage)<br>
target_link_libraries(kdevplatformtests LINK_INTERFACE_LIBRARIES<br>
- ${QT_QTCORE_LIBRARY} kdevplatformshell)<br>
+ kdevplatformshell<br>
+ kdevplatformlanguage)<br>
set_target_properties(kdevplatformtests PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION})<br>
install(TARGETS kdevplatformtests EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )<br>
<br>
diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt<br>
index de8616d..1e8c2a7 100644<br>
--- a/util/CMakeLists.txt<br>
+++ b/util/CMakeLists.txt<br>
@@ -27,12 +27,10 @@ target_link_libraries(kdevplatformutil<br>
${KDE4_KDEUI_LIBS}<br>
${KDE4_KCMUTILS_LIBRARY}<br>
kdevplatforminterfaces<br>
- kdevplatformoutputview<br>
)<br>
# Might want to add kdevplatform* when they're exported targets<br>
target_link_libraries(kdevplatformutil LINK_INTERFACE_LIBRARIES<br>
- ${KDE4_KDEUI_LIBS}<br>
- ${KDE4_KCMUTILS_LIBRARY})<br>
+ ${KDE4_KDEUI_LIBS})<br>
set_target_properties(kdevplatformutil PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION})<br>
install(TARGETS kdevplatformutil EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )<br>
<br>
diff --git a/vcs/CMakeLists.txt b/vcs/CMakeLists.txt<br>
index 7419986..f3cd726 100644<br>
--- a/vcs/CMakeLists.txt<br>
+++ b/vcs/CMakeLists.txt<br>
@@ -58,8 +58,8 @@ target_link_libraries(kdevplatformvcs<br>
)<br>
# add kdevplatform* when they're exported targets<br>
target_link_libraries(kdevplatformvcs LINK_INTERFACE_LIBRARIES<br>
- ${KDE4_KIO_LIBS}<br>
- ${KDE4_KPARTS_LIBS})<br>
+ kdevplatformoutputview<br>
+ kdevplatforminterfaces)<br>
set_target_properties(kdevplatformvcs PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION})<br>
install(TARGETS kdevplatformvcs EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )<br>
<font color="#888888"><br>
<br>
--<br>
KDevelop-devel mailing list<br>
<a href="mailto:KDevelop-devel@kdevelop.org">KDevelop-devel@kdevelop.org</a><br>
<a href="https://barney.cs.uni-potsdam.de/mailman/listinfo/kdevelop-devel" target="_blank">https://barney.cs.uni-potsdam.de/mailman/listinfo/kdevelop-devel</a><br>
</font></blockquote></div><br><div><meta http-equiv="content-type" content="text/html; charset=utf-8">Just for the record, it worked just fine here.</div><div><br></div><div>Aleix</div>