[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice
From: Thomas Zander <zander () kde ! org>
Date: 2008-08-28 20:10:54
Message-ID: 1219954254.954394.25818.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 854090 by zander:
cleanup and make link
M +1 -1 filters/kivio/imageexport/CMakeLists.txt
M +1 -1 koshell/CMakeLists.txt
M +6 -3 kspread/CMakeLists.txt
M +4 -4 kspread/functions/CMakeLists.txt
M +1 -1 kspread/plugins/calendar/CMakeLists.txt
M +1 -1 kspread/plugins/scripting/CMakeLists.txt
M +1 -1 kspread/plugins/solver/CMakeLists.txt
M +1 -1 kspread/shape/CMakeLists.txt
M +1 -1 tools/converter/CMakeLists.txt
M +2 -2 tools/kthesaurus/CMakeLists.txt
M +2 -2 tools/thumbnail/CMakeLists.txt
--- trunk/koffice/filters/kivio/imageexport/CMakeLists.txt #854089:854090
@@ -14,7 +14,7 @@
-target_link_libraries(kivioimageexport ${KDE4_KDECORE_LIBS} kiviocommon )
+target_link_libraries(kivioimageexport kiviocommon )
install(TARGETS kivioimageexport DESTINATION ${PLUGIN_INSTALL_DIR})
--- trunk/koffice/koshell/CMakeLists.txt #854089:854090
@@ -12,7 +12,7 @@
kde4_add_kdeinit_executable( koshell ${koshell_KDEINIT_SRCS})
-target_link_libraries(kdeinit_koshell ${KDE4_KDECORE_LIBS} koguiutils )
+target_link_libraries(kdeinit_koshell ${KDE4_KDECORE_LIBS} koguiutils )
install(TARGETS kdeinit_koshell DESTINATION ${LIB_INSTALL_DIR})
--- trunk/koffice/kspread/CMakeLists.txt #854089:854090
@@ -223,11 +223,14 @@
target_link_libraries(kspreadcommon
${QT_QTSQL_LIBRARY}
${KDE4_KNOTIFYCONFIG_LIBS} ${KDE4_KPARTS_LIBS}
- komain koguiutils
- kutils kstore flake pigmentcms
+ koguiutils
+ kutils flake
${KDE4_KDE3SUPPORT_LIBS} )
-set_target_properties(kspreadcommon PROPERTIES VERSION \
${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} ) \
+set_target_properties(kspreadcommon PROPERTIES + VERSION \
${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} + \
${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "koguiutils;flake" +)
install(TARGETS kspreadcommon DESTINATION ${LIB_INSTALL_DIR})
--- trunk/koffice/kspread/functions/CMakeLists.txt #854089:854090
@@ -52,7 +52,7 @@
########### next target ###############
kde4_add_plugin(kspreadinformationmodule information.cpp)
-target_link_libraries(kspreadinformationmodule kspreadcommon)
+target_link_libraries(kspreadinformationmodule kspreadcommon \
${QT_QT3SUPPORT_LIBRARY}) install(TARGETS kspreadinformationmodule DESTINATION \
${PLUGIN_INSTALL_DIR}) install(FILES kspreadinformationmodule.desktop DESTINATION \
${SERVICES_INSTALL_DIR}) install(FILES information.xml DESTINATION \
${DATA_INSTALL_DIR}/kspread/functions) @@ -76,7 +76,7 @@
########### next target ###############
kde4_add_plugin(kspreadreferencemodule reference.cpp)
-target_link_libraries(kspreadreferencemodule kspreadcommon)
+target_link_libraries(kspreadreferencemodule kspreadcommon ${QT_QT3SUPPORT_LIBRARY})
install(TARGETS kspreadreferencemodule DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES kspreadreferencemodule.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES reference.xml DESTINATION ${DATA_INSTALL_DIR}/kspread/functions)
@@ -92,7 +92,7 @@
########### next target ###############
kde4_add_plugin(kspreadtextmodule text.cpp)
-target_link_libraries(kspreadtextmodule kspreadcommon)
+target_link_libraries(kspreadtextmodule kspreadcommon ${QT_QT3SUPPORT_LIBRARY})
install(TARGETS kspreadtextmodule DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES kspreadtextmodule.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES text.xml DESTINATION ${DATA_INSTALL_DIR}/kspread/functions)
@@ -100,7 +100,7 @@
########### next target ###############
kde4_add_plugin(kspreadtrigonometrymodule trig.cpp)
-target_link_libraries(kspreadtrigonometrymodule kspreadcommon)
+target_link_libraries(kspreadtrigonometrymodule kspreadcommon \
${QT_QT3SUPPORT_LIBRARY}) install(TARGETS kspreadtrigonometrymodule DESTINATION \
${PLUGIN_INSTALL_DIR}) install(FILES kspreadtrigonometrymodule.desktop DESTINATION \
${SERVICES_INSTALL_DIR}) install(FILES trig.xml DESTINATION \
${DATA_INSTALL_DIR}/kspread/functions)
--- trunk/koffice/kspread/plugins/calendar/CMakeLists.txt #854089:854090
@@ -3,6 +3,6 @@
set(kspread_plugin_tool_calendar_SRCS CalendarTool.cpp CalendarToolFactory.cpp \
CalendarToolWidget.cpp) kde4_add_ui_files(kspread_plugin_tool_calendar_SRCS \
CalendarToolWidget.ui) kde4_add_plugin(kspread_plugin_tool_calendar \
${kspread_plugin_tool_calendar_SRCS})
-target_link_libraries(kspread_plugin_tool_calendar kspreadcommon flake \
${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) \
+target_link_libraries(kspread_plugin_tool_calendar kspreadcommon \
${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDEUI_LIBS}) install(TARGETS \
kspread_plugin_tool_calendar DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES \
kspread_plugin_tool_calendar.desktop DESTINATION \
${SERVICES_INSTALL_DIR})
--- trunk/koffice/kspread/plugins/scripting/CMakeLists.txt #854089:854090
@@ -17,7 +17,7 @@
qt4_wrap_cpp(krossmodulekspread_PART_SRCS ScriptingReader.h ScriptingWriter.h)
kde4_add_plugin(krossmodulekspread ${krossmodulekspread_PART_SRCS})
-target_link_libraries(krossmodulekspread kstore komain ${QT_QT3SUPPORT_LIBRARY} \
${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDECORE_LIBS} kspreadcommon \
${KDE4_KROSSUI_LIBS} kokross) +target_link_libraries(krossmodulekspread \
${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} kspreadcommon \
${KDE4_KROSSUI_LIBS} kokross) install(TARGETS krossmodulekspread DESTINATION \
${PLUGIN_INSTALL_DIR})
########### install files ###############
--- trunk/koffice/kspread/plugins/solver/CMakeLists.txt #854089:854090
@@ -28,7 +28,7 @@
target_link_libraries( kspreadsolver
${GSL_LIBRARIES}
${GSL_CBLAS_LIBRARIES}
- kspreadcommon ${QT_QT3SUPPORT_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBS}
+ kspreadcommon ${QT_QT3SUPPORT_LIBRARY}
${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS}
)
--- trunk/koffice/kspread/shape/CMakeLists.txt #854089:854090
@@ -18,7 +18,7 @@
kde4_add_plugin(spreadsheetshape ${tableshape_LIB_SRCS})
-target_link_libraries(spreadsheetshape kstore kspreadcommon ${QT_QT3SUPPORT_LIBRARY} \
${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} flake \
kotext) +target_link_libraries(spreadsheetshape kspreadcommon \
${QT_QT3SUPPORT_LIBRARY} ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} kotext) install(TARGETS \
spreadsheetshape DESTINATION ${PLUGIN_INSTALL_DIR})
########### install files ###############
--- trunk/koffice/tools/converter/CMakeLists.txt #854089:854090
@@ -4,7 +4,7 @@
kde4_add_executable(koconverter ${koconverter_SRCS})
-target_link_libraries(koconverter ${KDE4_KDECORE_LIBS} komain )
+target_link_libraries(koconverter komain )
install(TARGETS koconverter ${INSTALL_TARGETS_DEFAULT_ARGS})
--- trunk/koffice/tools/kthesaurus/CMakeLists.txt #854089:854090
@@ -7,11 +7,11 @@
kde4_add_kdeinit_executable( kthesaurus ${kthesaurus_KDEINIT_SRCS})
-target_link_libraries(kdeinit_kthesaurus kotext ${KDE4_KDEUI_LIBS} \
${KDE4_KDECORE_LIBS} ) +target_link_libraries(kdeinit_kthesaurus kotext \
${KDE4_KDEUI_LIBS})
install(TARGETS kdeinit_kthesaurus DESTINATION ${LIB_INSTALL_DIR})
-target_link_libraries( kthesaurus kdeinit_kthesaurus ${KDE4_KDECORE_LIBS})
+target_link_libraries( kthesaurus kdeinit_kthesaurus)
install(TARGETS kthesaurus ${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
--- trunk/koffice/tools/thumbnail/CMakeLists.txt #854089:854090
@@ -8,7 +8,7 @@
-target_link_libraries(clipartthumbnail ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} \
komain ) +target_link_libraries(clipartthumbnail komain )
install(TARGETS clipartthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
@@ -21,7 +21,7 @@
-target_link_libraries(kofficethumbnail ${KDE4_KPARTS_LIBS} kstore \
${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} komain ) \
+target_link_libraries(kofficethumbnail ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY} \
komain )
install(TARGETS kofficethumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic