[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/apps
From: Dirk Mueller <mueller () kde ! org>
Date: 2008-06-26 1:29:37
Message-ID: 1214443777.652288.27493.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 824530 by mueller:
fix linking
M +2 -2 dolphin/src/CMakeLists.txt
M +1 -1 keditbookmarks/CMakeLists.txt
M +1 -1 konqueror/client/CMakeLists.txt
M +1 -1 konqueror/sidebar/trees/bookmark_module/CMakeLists.txt
M +4 -3 konqueror/sidebar/trees/history_module/CMakeLists.txt
M +5 -1 konqueror/src/CMakeLists.txt
M +1 -1 kwrite/CMakeLists.txt
M +5 -1 lib/konq/CMakeLists.txt
M +1 -1 plasma/applets/folderview/CMakeLists.txt
--- trunk/KDE/kdebase/apps/dolphin/src/CMakeLists.txt #824529:824530
@@ -55,7 +55,7 @@
kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS})
-target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq \
${QIMAGEBLITZ_LIBRARIES}) +target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} \
konq ${QIMAGEBLITZ_LIBRARIES} ${X11_LIBRARIES}) if(X11_Xrender_FOUND)
target_link_libraries(dolphinprivate ${X11_Xrender_LIB} )
endif(X11_Xrender_FOUND)
@@ -77,7 +77,7 @@
kde4_add_plugin(dolphinpart ${dolphinpart_SRCS})
-target_link_libraries(dolphinpart dolphinprivate konq)
+target_link_libraries(dolphinpart dolphinprivate konq ${KDE4_KPARTS_LIBS} \
${KDE4_KDEUI_LIBS})
install(TARGETS dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR} )
--- trunk/KDE/kdebase/apps/keditbookmarks/CMakeLists.txt #824529:824530
@@ -40,7 +40,7 @@
kde4_add_kdeinit_executable( keditbookmarks ${keditbookmarks_KDEINIT_SRCS})
-target_link_libraries(kdeinit_keditbookmarks ${KDE4_KDE3SUPPORT_LIBS} konq )
+target_link_libraries(kdeinit_keditbookmarks ${KDE4_KDE3SUPPORT_LIBS} konq \
${KDE4_KPARTS_LIBS})
install(TARGETS kdeinit_keditbookmarks ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS keditbookmarks ${INSTALL_TARGETS_DEFAULT_ARGS})
--- trunk/KDE/kdebase/apps/konqueror/client/CMakeLists.txt #824529:824530
@@ -16,7 +16,7 @@
target_link_libraries(kfmclient ${KDE4_KIO_LIBS} )
else (WIN32)
kde4_add_kdeinit_executable( kfmclient NOGUI ${kfmclient_SRCS})
- target_link_libraries(kdeinit_kfmclient ${KDE4_KIO_LIBS} )
+ target_link_libraries(kdeinit_kfmclient ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
install(TARGETS kdeinit_kfmclient ${INSTALL_TARGETS_DEFAULT_ARGS} )
endif (WIN32)
--- trunk/KDE/kdebase/apps/konqueror/sidebar/trees/bookmark_module/CMakeLists.txt \
#824529:824530 @@ -16,7 +16,7 @@
# please remove next lib and add the sources here for 4.1 if cmake > 2.6 is \
available target_link_libraries(konq_sidebartree_bookmarks sidebar_tree)
endif(WIN32)
-target_link_libraries(konq_sidebartree_bookmarks ${KDE4_KDEUI_LIBS} \
konqsidebarplugin konq) +target_link_libraries(konq_sidebartree_bookmarks \
${KDE4_KDEUI_LIBS} konqsidebarplugin konq ${KDE4_KDE3SUPPORT_LIBS})
install(TARGETS konq_sidebartree_bookmarks DESTINATION ${PLUGIN_INSTALL_DIR} )
--- trunk/KDE/kdebase/apps/konqueror/sidebar/trees/history_module/CMakeLists.txt \
#824529:824530 @@ -19,9 +19,10 @@
# please remove next lib and add the sources here for 4.1 if cmake > 2.6 is \
available target_link_libraries(konq_sidebartree_history sidebar_tree )
endif(WIN32)
-target_link_libraries(konq_sidebartree_history konqsidebarplugin konquerorprivate \
konq ) +target_link_libraries(konq_sidebartree_history konqsidebarplugin \
konquerorprivate konq + ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} \
${KDE4_KDE3SUPPORT_LIBS})
-install(TARGETS konq_sidebartree_history DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS konq_sidebartree_history DESTINATION ${PLUGIN_INSTALL_DIR})
########### next target ###############
@@ -33,7 +34,7 @@
kde4_add_plugin(kcm_history ${kcm_history_SRCS})
-target_link_libraries(kcm_history konquerorprivate konq )
+target_link_libraries(kcm_history konquerorprivate konq ${KDE4_KPARTS_LIBS} \
${KDE4_KDEUI_LIBS} )
install(TARGETS kcm_history DESTINATION ${PLUGIN_INSTALL_DIR} )
--- trunk/KDE/kdebase/apps/konqueror/src/CMakeLists.txt #824529:824530
@@ -26,7 +26,7 @@
qt4_add_dbus_adaptor(konquerorprivate_SRCS org.kde.Konqueror.HistoryManager.xml \
konqhistorymanager.h KonqHistoryManager konqhistorymanageradaptor \
KonqHistoryManagerAdaptor)
kde4_add_library(konquerorprivate SHARED ${konquerorprivate_SRCS})
-target_link_libraries(konquerorprivate ${KDE4_KPARTS_LIBS})
+target_link_libraries(konquerorprivate ${KDE4_KPARTS_LIBS} ${ZLIB_LIBRARY})
set_target_properties(konquerorprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} \
SOVERSION ${GENERIC_LIB_SOVERSION} ) install(TARGETS konquerorprivate \
${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -83,7 +83,11 @@
kde4_add_app_icon(konqueror_KDEINIT_SRCS \
"${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/konqueror.png") \
kde4_add_kdeinit_executable(konqueror ${konqueror_KDEINIT_SRCS} konqmain.cpp) \
target_link_libraries(kdeinit_konqueror konquerorprivate konq ${KDE4_KPARTS_LIBS} \
${KDE4_KUTILS_LIBS}) +if (UNIX)
+ target_link_libraries(kdeinit_konqueror ${X11_LIBRARIES})
+endif (UNIX)
+
if (NOT WIN32)
install(TARGETS kdeinit_konqueror ${INSTALL_TARGETS_DEFAULT_ARGS} )
endif (NOT WIN32)
--- trunk/KDE/kdebase/apps/kwrite/CMakeLists.txt #824529:824530
@@ -1,7 +1,7 @@
set(kwrite_KDEINIT_SRCS kwritemain.cpp)
kde4_add_kdeinit_executable(kwrite ${kwrite_KDEINIT_SRCS})
-target_link_libraries(kdeinit_kwrite ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(kdeinit_kwrite ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIO_LIBS} \
${KDE4_KPARTS_LIBS})
install(TARGETS kwrite ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS kdeinit_kwrite ${INSTALL_TARGETS_DEFAULT_ARGS})
--- trunk/KDE/kdebase/apps/lib/konq/CMakeLists.txt #824529:824530
@@ -25,7 +25,11 @@
target_link_libraries(konq ${KDE4_KPARTS_LIBS})
-set_target_properties(konq PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} \
SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} ) +set_target_properties(konq PROPERTIES
+ VERSION ${KDE_NON_GENERIC_LIB_VERSION}
+ SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
+ LINK_INTERFACE_LIBRARIES "${KDE4_KPARTS_LIBS}"
+)
install(TARGETS konq ${INSTALL_TARGETS_DEFAULT_ARGS})
########### konq_sound ###############
--- trunk/KDE/kdebase/apps/plasma/applets/folderview/CMakeLists.txt #824529:824530
@@ -6,7 +6,7 @@
kde4_add_ui_files(folderview_SRCS folderviewConfig.ui)
kde4_add_plugin(plasma_applet_folderview ${folderview_SRCS})
-target_link_libraries(plasma_applet_folderview ${PLASMA_LIBS} konq ${KDE4_KIO_LIBS})
+target_link_libraries(plasma_applet_folderview ${PLASMA_LIBS} konq ${KDE4_KIO_LIBS} \
${X11_LIBRARIES})
install(TARGETS plasma_applet_folderview DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-applet-folderview.desktop DESTINATION ${SERVICES_INSTALL_DIR})
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic