SVN commit 854089 by zander: make kword link properly M +5 -2 part/CMakeLists.txt M +1 -1 plugins/scripting/CMakeLists.txt --- trunk/koffice/kword/part/CMakeLists.txt #854088:854089 @@ -77,14 +77,17 @@ kde4_add_library(kwordprivate SHARED ${kwordprivate_LIB_SRCS}) -target_link_libraries(kwordprivate ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} komain kstore flake pigmentcms koguiutils kotext) +target_link_libraries(kwordprivate ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} koguiutils kotext) if(KDE4_BUILD_TESTS) # only with this definition will the KWORD_TEST_EXPORT macro do something add_definitions(-DCOMPILING_TESTS) endif(KDE4_BUILD_TESTS) -set_target_properties(kwordprivate PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} ) +set_target_properties(kwordprivate + PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} + ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kotext;koguiutils" +) install(TARGETS kwordprivate DESTINATION ${LIB_INSTALL_DIR}) ########### KWordPart Library ############### --- trunk/koffice/kword/plugins/scripting/CMakeLists.txt #854088:854089 @@ -23,7 +23,7 @@ ) kde4_add_plugin(krossmodulekword ${krossmodulekword_PART_SRCS}) -target_link_libraries(krossmodulekword ${QT_QT3SUPPORT_LIBRARY} komain kotext ${KDE4_KROSSUI_LIBS} flake pigmentcms ${KDE4_KPARTS_LIBS} kokross kwordprivate) +target_link_libraries(krossmodulekword ${QT_QT3SUPPORT_LIBRARY} kotext ${KDE4_KROSSUI_LIBS} ${KDE4_KPARTS_LIBS} kokross kwordprivate) install(TARGETS krossmodulekword DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES krossmodulekword.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES scripting.rc DESTINATION ${DATA_INSTALL_DIR}/kword/kpartplugins)