diff --git a/CMakeLists.txt b/CMakeLists.txt index 957b10247ea20e0aa27740039b40b949d20a9e4a..4f38f33159359d6a807e2d6c5cd2f828cf07b126 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -101,17 +101,17 @@ calligra_define_product(LIB_KDGANTT "libkdgantt") calligra_define_product(LIB_KDCHART "libkdchart") calligra_define_product(LIB_WRITERPERFECT "libwriterperfect") # Calligra-independent utility libs -calligra_define_product(LIB_VECTORIMAGE "libkovectorimage") +calligra_define_product(LIB_KOVECTORIMAGE "libkovectorimage") calligra_define_product(LIB_KOPROPERTY "libkoproperty") calligra_define_product(LIB_KOREPORT "libkoreport" NEEDS LIB_KOPROPERTY) calligra_define_product(LIB_CALLIGRADB "libcalligradb") # calligra libs calligra_define_product(CALLIGRA_LIBS "Calligra core libs") calligra_define_product(LIB_KOPAGEAPP "Lib for paged documents" NEEDS CALLIGRA_LIBS) -calligra_define_product(LIB_ODF2 "libkoodf2" NEEDS CALLIGRA_LIBS) -calligra_define_product(LIB_ODFREADER "libkoodfreader" NEEDS CALLIGRA_LIBS) +calligra_define_product(LIB_KOODF2 "libkoodf2" NEEDS CALLIGRA_LIBS) +calligra_define_product(LIB_KOODFREADER "libkoodfreader" NEEDS CALLIGRA_LIBS) calligra_define_product(LIB_MSO "libmso" NEEDS CALLIGRA_LIBS) -calligra_define_product(LIB_MSOOXML "libkomsooxml" NEEDS LIB_ODF2 CALLIGRA_LIBS) +calligra_define_product(LIB_KOMSOOXML "libkomsooxml" NEEDS LIB_KOODF2 CALLIGRA_LIBS) calligra_define_product(SCRIPTING "Scripting feature") # TODO calligra_define_product(RDF "RDF feature") # plugins @@ -154,16 +154,16 @@ calligra_define_product(PLUGIN_PICTURESHAPE "" NEEDS CALLIGRA_LIBS) calligra_define_product(PLUGIN_PLUGINSHAPE "" NEEDS CALLIGRA_LIBS) calligra_define_product(PLUGIN_FORMULASHAPE "" NEEDS CALLIGRA_LIBS) calligra_define_product(PLUGIN_VIDEOSHAPE "Plugin for handling videos in Calligra" NEEDS CALLIGRA_LIBS) -calligra_define_product(PLUGIN_VECTORSHAPE "" NEEDS CALLIGRA_LIBS LIB_VECTORIMAGE) +calligra_define_product(PLUGIN_VECTORSHAPE "" NEEDS CALLIGRA_LIBS LIB_KOVECTORIMAGE) calligra_define_product(PLUGIN_REPORTING "" NEEDS LIB_KOREPORT LIB_KDCHART) # staging plugins calligra_define_product(PLUGIN_GOOGLEDOCS "" STAGING NEEDS CALLIGRA_LIBS) calligra_define_product(PLUGIN_THREEDSHAPE "" STAGING NEEDS CALLIGRA_LIBS) calligra_define_product(PLUGIN_SHEETS_PIVOTTABLES "" STAGING NEEDS SHEETS_PART) # Sheets filters -calligra_define_product(FILTER_XLSX_TO_ODS "XLSX to ODS filter" NEEDS LIB_MSOOXML SHEETS_PART) -calligra_define_product(FILTER_XLS_TO_SHEETS "Sheets XLS import filter" NEEDS LIB_MSO LIB_MSOOXML SHEETS_PART) -calligra_define_product(FILTER_SHEETS_TO_XLS "Sheets XLS export filter" NEEDS LIB_MSO LIB_MSOOXML SHEETS_PART) +calligra_define_product(FILTER_XLSX_TO_ODS "XLSX to ODS filter" NEEDS LIB_KOMSOOXML SHEETS_PART) +calligra_define_product(FILTER_XLS_TO_SHEETS "Sheets XLS import filter" NEEDS LIB_MSO LIB_KOMSOOXML SHEETS_PART) +calligra_define_product(FILTER_SHEETS_TO_XLS "Sheets XLS export filter" NEEDS LIB_MSO LIB_KOMSOOXML SHEETS_PART) calligra_define_product(FILTER_CSV_TO_SHEETS "Sheets CSV import filter" NEEDS SHEETS_PART) calligra_define_product(FILTER_SHEETS_TO_CSV "Sheets CSV export filter" NEEDS SHEETS_PART) calligra_define_product(FILTER_APPLIXSPREAD_TO_KSPREAD "Applix Spreadsheet to KSpread filter" NEEDS SHEETS_PART) @@ -187,22 +187,22 @@ calligra_define_product(FILTER_FLOW "All Flow filter" WANTS FILTER_FLOW_IMPORT # Stage filters calligra_define_product(FILTER_KPR_TO_OPD "KPresenter to ODP filter" NEEDS CALLIGRA_LIBS) calligra_define_product(FILTER_PPT_TO_ODP "PPT to OPD filter" NEEDS LIB_MSO CALLIGRA_LIBS) -calligra_define_product(FILTER_PPTX_TO_ODP "PPTX to ODP filter" NEEDS LIB_MSOOXML LIB_ODF2 CALLIGRA_LIBS) +calligra_define_product(FILTER_PPTX_TO_ODP "PPTX to ODP filter" NEEDS LIB_KOMSOOXML LIB_KOODF2 CALLIGRA_LIBS) calligra_define_product(FILTER_STAGE_IMPORT "All Stage import filter" WANTS FILTER_KPR_TO_OPD FILTER_PPT_TO_ODP FILTER_PPTX_TO_ODP) calligra_define_product(FILTER_STAGE_EXPORT "All Stage export filter" WANTS ) calligra_define_product(FILTER_STAGE "All Stage filter" WANTS FILTER_STAGE_IMPORT FILTER_STAGE_EXPORT) # Words filters -calligra_define_product(FILTER_DOC_TO_ODT "DOC to ODT filter" NEEDS LIB_MSO LIB_MSOOXML CALLIGRA_LIBS) -calligra_define_product(FILTER_DOCX_TO_ODT "DOCX to ODT filter" NEEDS LIB_MSOOXML LIB_ODF2 CALLIGRA_LIBS) +calligra_define_product(FILTER_DOC_TO_ODT "DOC to ODT filter" NEEDS LIB_MSO LIB_KOMSOOXML CALLIGRA_LIBS) +calligra_define_product(FILTER_DOCX_TO_ODT "DOCX to ODT filter" NEEDS LIB_KOMSOOXML LIB_KOODF2 CALLIGRA_LIBS) calligra_define_product(FILTER_WORDPERFECT_TO_ODT "Word Perfect to ODT filter" NEEDS LIB_WRITERPERFECT CALLIGRA_LIBS) calligra_define_product(FILTER_WORKS_TO_ODT "MS Works to ODT filter" NEEDS LIB_WRITERPERFECT CALLIGRA_LIBS) calligra_define_product(FILTER_APPLIXWORD_TO_ODT "Applixword to ODT filter" NEEDS CALLIGRA_LIBS) calligra_define_product(FILTER_ASCII_TO_WORDS "Words ASCII import filter" NEEDS WORDS_PART) -calligra_define_product(FILTER_ODT_TO_ASCII "ODT to ASCII filter" NEEDS LIB_ODFREADER CALLIGRA_LIBS) +calligra_define_product(FILTER_ODT_TO_ASCII "ODT to ASCII filter" NEEDS LIB_KOODFREADER CALLIGRA_LIBS) calligra_define_product(FILTER_RTF_TO_ODT "RTF to ODT filter" NEEDS CALLIGRA_LIBS) calligra_define_product(FILTER_ODT_TO_MOBI "Mobi export filter" NEEDS CALLIGRA_LIBS) -calligra_define_product(FILTER_ODT_TO_EPUB2 "ODT Epub2 export filter" NEEDS LIB_VECTORIMAGE CALLIGRA_LIBS) -calligra_define_product(FILTER_ODT_TO_HTML "ODT HTML export filter" NEEDS LIB_VECTORIMAGE CALLIGRA_LIBS) +calligra_define_product(FILTER_ODT_TO_EPUB2 "ODT Epub2 export filter" NEEDS LIB_KOVECTORIMAGE CALLIGRA_LIBS) +calligra_define_product(FILTER_ODT_TO_HTML "ODT HTML export filter" NEEDS LIB_KOVECTORIMAGE CALLIGRA_LIBS) calligra_define_product(FILTER_WORDS_IMPORT "All Words import filter" WANTS FILTER_DOC_TO_ODT FILTER_DOCX_TO_ODT FILTER_WORDPERFECT_TO_ODT FILTER_WORKS_TO_ODT FILTER_ASCII_TO_WORDS FILTER_RTF_TO_ODT) calligra_define_product(FILTER_WORDS_EXPORT "All Words export filter" WANTS FILTER_ODT_TO_ASCII FILTER_ODT_TO_MOBI FILTER_ODT_TO_EPUB2 FILTER_ODT_TO_HTML) calligra_define_product(FILTER_WORDS "All Words filter" WANTS FILTER_WORDS_IMPORT FILTER_WORDS_EXPORT) @@ -218,7 +218,7 @@ calligra_define_product(FILTER_KARBON_TO_IMAGE "Karbon image export filter" NEE calligra_define_product(FILTER_KARBON_TO_SVG "Karbon SVG export filter" NEEDS KARBON_APP) calligra_define_product(FILTER_SVG_TO_KARBON "Karbon SVG import filter" NEEDS KARBON_APP) calligra_define_product(FILTER_KARBON_TO_WMF "Karbon WMF export filter" NEEDS KARBON_APP) -calligra_define_product(FILTER_WMF_TO_SVG "WMF to SVG filter" NEEDS LIB_VECTORIMAGE CALLIGRA_LIBS) +calligra_define_product(FILTER_WMF_TO_SVG "WMF to SVG filter" NEEDS LIB_KOVECTORIMAGE CALLIGRA_LIBS) calligra_define_product(FILTER_KARBON1X_TO_KARBON "Karbon 1.x import filter" NEEDS KARBON_APP) calligra_define_product(FILTER_KARBON_IMPORT "All Karbon import filter" WANTS FILTER_EPS_TO_SVG_AI FILTER_PDF_TO_SVG FILTER_WPG_TO_SVG FILTER_SVG_TO_KARBON FILTER_WMF_TO_SVG FILTER_KARBON1X_TO_KARBON) calligra_define_product(FILTER_KARBON_EXPORT "All Karbon export filter" WANTS FILTER_KARBON_TO_IMAGE FILTER_KARBON_TO_SVG FILTER_KARBON_TO_WMF) @@ -818,7 +818,7 @@ set(KOODF2_INCLUDES # if(NOT SHARED_MIME_INFO_FOUND) - calligra_disable_product(LIB_MSOOXML "SharedMimeInfo not found (needed to install mimetypes)") + calligra_disable_product(LIB_KOMSOOXML "SharedMimeInfo not found (needed to install mimetypes)") endif(NOT SHARED_MIME_INFO_FOUND) if(NOT Soprano_FOUND) diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt index eb0ca9e46cdebd4f91d5ed08c887abd252d5e35b..d482a4beee9b8f6e8632b0d53beae60d341e42c3 100644 --- a/libs/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -16,9 +16,9 @@ if (SHOULD_BUILD_SCRIPTING) add_subdirectory( kokross ) endif (SHOULD_BUILD_SCRIPTING) -if (SHOULD_BUILD_LIB_VECTORIMAGE) +if (SHOULD_BUILD_LIB_KOVECTORIMAGE) add_subdirectory( vectorimage ) -endif (SHOULD_BUILD_LIB_VECTORIMAGE) +endif (SHOULD_BUILD_LIB_KOVECTORIMAGE) if (SHOULD_BUILD_LIB_KOPAGEAPP) add_subdirectory( kopageapp )