[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice
From:       Laurent Montel <montel () kde ! org>
Date:       2006-07-29 16:25:18
Message-ID: 1154190318.631450.5339.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 567630 by mlaurent:

Use cmake variable


 M  +1 -1      filters/kword/html/import/CMakeLists.txt  
 M  +1 -1      kword/mailmerge/kabc/CMakeLists.txt  
 M  +1 -1      libs/kofficecore/CMakeLists.txt  


--- trunk/koffice/filters/kword/html/import/CMakeLists.txt #567629:567630
@@ -13,7 +13,7 @@
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} htmlimport )
 
-target_link_libraries(htmlimport  ${KDE4_KDECORE_LIBS} kotext khtml )
+target_link_libraries(htmlimport  ${KDE4_KDECORE_LIBS} kotext ${KDE4_KHTML_LIBS} )
 
 install(TARGETS htmlimport  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- trunk/koffice/kword/mailmerge/kabc/CMakeLists.txt #567629:567630
@@ -15,7 +15,7 @@
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwmailmerge_kabc )
 
-target_link_libraries(kwmailmerge_kabc ${KDE4_KDEUI_LIBS} kwmailmerge_interface kabc \
) +target_link_libraries(kwmailmerge_kabc ${KDE4_KDEUI_LIBS} kwmailmerge_interface \
${KDE4_KABC_LIBS} )  
 install(TARGETS kwmailmerge_kabc  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- trunk/koffice/libs/kofficecore/CMakeLists.txt #567629:567630
@@ -78,7 +78,7 @@
 
 kde4_add_library(kofficecore SHARED ${kofficecore_LIB_SRCS})
 
-target_link_libraries(kofficecore  ${KDE4_KPARTS_LIBS} kstore kabc \
${KDE4_KDEPRINT_LIBS} kowmf) +target_link_libraries(kofficecore  ${KDE4_KPARTS_LIBS} \
kstore ${KDE4_KABC_LIBS} ${KDE4_KDEPRINT_LIBS} kowmf)  
 set_target_properties(kofficecore PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} \
SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} )  install(TARGETS kofficecore DESTINATION \
${LIB_INSTALL_DIR} )


[prev in list] [next in list] [prev in thread] [next in thread]