[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra/frameworks] /: Readd FILTER_KARBON_TO_WMF to the build.
From: Inge Wallin <inge () lysator ! liu ! se>
Date: 2015-04-05 4:29:17
Message-ID: E1YecBR-0001zg-KN () scm ! kde ! org
[Download RAW message or body]
Git commit cf3325cc3938c847868c25528e13eb15240b0f49 by Inge Wallin.
Committed on 05/04/2015 at 04:28.
Pushed by ingwa into branch 'frameworks'.
Readd FILTER_KARBON_TO_WMF to the build.
M +1 -1 CalligraProducts.cmake
M +3 -14 filters/karbon/wmf/CMakeLists.txt
M +3 -2 filters/karbon/wmf/WmfExport.cpp
http://commits.kde.org/calligra/cf3325cc3938c847868c25528e13eb15240b0f49
diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index 9b56553..3482ce6 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -188,7 +188,7 @@ calligra_define_product(FILTER_WPG_TO_SVG "WPG to SVG f=
ilter" REQUIRES LIB_CALL
calligra_define_product(FILTER_KARBON_TO_IMAGE "Karbon image export filter=
" UNPORTED REQUIRES APP_KARBON)
calligra_define_product(FILTER_KARBON_TO_SVG "Karbon SVG export filter" UN=
PORTED REQUIRES APP_KARBON)
calligra_define_product(FILTER_SVG_TO_KARBON "Karbon SVG import filter" UN=
PORTED REQUIRES APP_KARBON)
-calligra_define_product(FILTER_KARBON_TO_WMF "Karbon WMF export filter" UN=
PORTED REQUIRES APP_KARBON)
+calligra_define_product(FILTER_KARBON_TO_WMF "Karbon WMF export filter" RE=
QUIRES APP_KARBON)
calligra_define_product(FILTER_WMF_TO_SVG "WMF to SVG filter" REQUIRES LIB=
_KOVECTORIMAGE LIB_CALLIGRA)
calligra_define_product(FILTER_KARBON1X_TO_KARBON "Karbon 1.x import filte=
r" REQUIRES APP_KARBON)
=
diff --git a/filters/karbon/wmf/CMakeLists.txt b/filters/karbon/wmf/CMakeLi=
sts.txt
index 21bdc5d..5c5e0c0 100644
--- a/filters/karbon/wmf/CMakeLists.txt
+++ b/filters/karbon/wmf/CMakeLists.txt
@@ -15,8 +15,6 @@ target_link_libraries(calligra_filter_wmf2svg kovectorima=
ge komain koodf)
install(TARGETS calligra_filter_wmf2svg DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
kcoreaddons_desktop_to_json(calligra_filter_wmf2svg calligra_filter_wmf2sv=
g.desktop)
=
-#install(FILES calligra_filter_wmf2svg.desktop DESTINATION ${SERVICES_INS=
TALL_DIR}/calligra)
-
if(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
install(FILES karbon_wmf_thumbnail.desktop DESTINATION ${SERVICES_INS=
TALL_DIR})
endif()
@@ -29,18 +27,9 @@ if(SHOULD_BUILD_FILTER_KARBON_TO_WMF)
set(karbon2wmf_PART_SRCS WmfExport.cpp)
=
add_library(calligra_filter_karbon2wmf MODULE ${karbon2wmf_PART_SRCS})
+target_link_libraries(calligra_filter_karbon2wmf kovectorimage karboncomm=
on karbonui)
=
-target_link_libraries(
- calligra_filter_karbon2wmf
- kovectorimage
- karboncommon
- karbonui
-)
-
-install(TARGETS calligra_filter_karbon2wmf
- DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
-
-install(FILES calligra_filter_karbon2wmf.desktop
- DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+install(TARGETS calligra_filter_karbon2wmf DESTINATION ${CALLIGRA_PLUGIN_I=
NSTALL_DIR})
+kcoreaddons_desktop_to_json(calligra_filter_karbon2wmf calligra_filter_kar=
bon2wmf.desktop)
=
endif()
diff --git a/filters/karbon/wmf/WmfExport.cpp b/filters/karbon/wmf/WmfExpor=
t.cpp
index 1a0ea92..e4ee0e3 100644
--- a/filters/karbon/wmf/WmfExport.cpp
+++ b/filters/karbon/wmf/WmfExport.cpp
@@ -37,8 +37,9 @@
TODO: bs.wmf stroke in red with MSword and in brown with Words ??
*/
=
-K_PLUGIN_FACTORY(WmfExportFactory, registerPlugin<WmfExport>();)
-K_EXPORT_PLUGIN(WmfExportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(WmfExportFactory, "calligra_filter_karbon2wmf.j=
son",
+ registerPlugin<WmfExport>();)
+
=
=
WmfExport::WmfExport(QObject*parent, const QVariantList&) :
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic