SVN commit 840363 by mueller: fix link reduction fallout M +1 -1 kfilereplace/CMakeLists.txt M +1 -1 klinkstatus/src/CMakeLists.txt M +3 -2 klinkstatus/src/plugins/automation/CMakeLists.txt M +8 -3 kommander/lib/CMakeLists.txt M +1 -1 kxsldbg/kxsldbgpart/CMakeLists.txt --- branches/KDE/4.1/kdewebdev/kfilereplace/CMakeLists.txt #840362:840363 @@ -28,7 +28,7 @@ -target_link_libraries(kfilereplacepart ${KDE4_KDE3SUPPORT_LIBS} ) +target_link_libraries(kfilereplacepart ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS} ) install(TARGETS kfilereplacepart DESTINATION ${PLUGIN_INSTALL_DIR}) --- branches/KDE/4.1/kdewebdev/klinkstatus/src/CMakeLists.txt #840362:840363 @@ -159,7 +159,7 @@ kde4_add_plugin(klinkstatuspart ${klinkstatuspart_PART_SRCS}) -target_link_libraries(klinkstatuspart klinkstatuscommon) +target_link_libraries(klinkstatuspart klinkstatuscommon ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS}) install(TARGETS klinkstatuspart DESTINATION ${PLUGIN_INSTALL_DIR}) --- branches/KDE/4.1/kdewebdev/klinkstatus/src/plugins/automation/CMakeLists.txt #840362:840363 @@ -21,8 +21,9 @@ kde4_add_plugin(automationklinkstatus ${automationklinkstatus_PART_SRCS}) target_link_libraries(automationklinkstatus - ${KDE4_KDECORE_LIBS} - ${KDE4_KPARTS_LIBS} + ${KDE4_KDECORE_LIBS} + ${KDE4_KPARTS_LIBS} + ${KDE4_MAILTRANSPORT_LIBS} klinkstatuscommon) install(TARGETS automationklinkstatus DESTINATION ${PLUGIN_INSTALL_DIR}) --- branches/KDE/4.1/kdewebdev/kommander/lib/CMakeLists.txt #840362:840363 @@ -1,9 +1,14 @@ ### Kommander Widget ### -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} +find_package(ZLIB) + +INCLUDE_DIRECTORIES( +${ZLIB_INCLUDE_DIR} +${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} -${QT_INCLUDE_DIR} ) +${QT_INCLUDE_DIR} +) ########### next target ############### @@ -28,7 +33,7 @@ ) KDE4_ADD_LIBRARY(kommandercore SHARED ${kommandercore_LIB_SRCS}) -TARGET_LINK_LIBRARIES(kommandercore ${KDE4_KIO_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ) +TARGET_LINK_LIBRARIES(kommandercore ${KDE4_KIO_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${ZLIB_LIBRARY}) SET_TARGET_PROPERTIES(kommandercore PROPERTIES VERSION 4.2.0 SOVERSION 4 ) INSTALL(TARGETS kommandercore ${INSTALL_TARGETS_DEFAULT_ARGS} ) --- branches/KDE/4.1/kdewebdev/kxsldbg/kxsldbgpart/CMakeLists.txt #840362:840363 @@ -29,7 +29,7 @@ kde4_add_plugin(kxsldbgpart WITH_PREFIX ${kxsldbgpart_PART_SRCS}) -target_link_libraries(kxsldbgpart ${KDE4_KTEXTEDITOR_LIBS} exslt ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY}) +target_link_libraries(kxsldbgpart ${KDE4_KTEXTEDITOR_LIBS} exslt ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY}) install(TARGETS kxsldbgpart DESTINATION ${PLUGIN_INSTALL_DIR})