Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit d9727172 authored by Jigar Raisinghani's avatar Jigar Raisinghani

Fixed Git Merge conflict with Master

parent 27f15e57
......@@ -62,7 +62,7 @@ endif(NOT DEFINED RELEASE_BUILD)
message(STATUS "Release build: ${RELEASE_BUILD}")
if (RELEASE_BUILD)
set(CALLIGRA_SHOULD_BUILD_STAGING TRUE)
set(CALLIGRA_SHOULD_BUILD_STAGING FALSE)
else (RELEASE_BUILD)
set(CALLIGRA_SHOULD_BUILD_STAGING TRUE)
endif (RELEASE_BUILD)
......@@ -123,7 +123,7 @@ calligra_define_product(WORDS_PART "Words engine" NEEDS CALLIGRA_LIBS PLUGIN_TEX
calligra_define_product(WORDS_APP "Words executable (for Desktop)" NEEDS WORDS_PART)
calligra_define_product(STAGE_PART "Stage engine" NEEDS CALLIGRA_LIBS LIB_KOPAGEAPP)
calligra_define_product(STAGE_APP "Stage executable (for Desktop)" NEEDS STAGE_PART)
calligra_define_product(SHEETS_PART "Sheets engine" NEEDS CALLIGRA_LIBS NEEDS )
calligra_define_product(SHEETS_PART "Sheets engine" NEEDS CALLIGRA_LIBS)
calligra_define_product(SHEETS_APP "Sheets executable (for Desktop)" NEEDS SHEETS_PART)
calligra_define_product(AUTHOR_APP "Full Author (for Desktop)" NEEDS WORDS_PART)
calligra_define_product(KARBON_APP "Full Karbon (for Desktop)" NEEDS CALLIGRA_LIBS)
......@@ -158,10 +158,11 @@ 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_KOVECTORIMAGE)
calligra_define_product(PLUGIN_REPORTING "" NEEDS LIB_KOREPORT LIB_KDCHART)
calligra_define_product(PLUGIN_SEMANTICITEMS "Semantic items plugins" NEEDS RDF CALLIGRA_LIBS)
# 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 "" NEEDS SHEETS_PART)
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_KOMSOOXML SHEETS_PART)
calligra_define_product(FILTER_XLS_TO_SHEETS "Sheets XLS import filter" NEEDS LIB_MSO LIB_KOMSOOXML SHEETS_PART)
......@@ -226,10 +227,10 @@ calligra_define_product(FILTER_KARBON_IMPORT "All Karbon import filter" WANTS F
calligra_define_product(FILTER_KARBON_EXPORT "All Karbon export filter" WANTS FILTER_KARBON_TO_IMAGE FILTER_KARBON_TO_SVG FILTER_KARBON_TO_WMF)
calligra_define_product(FILTER_KARBON "All Karbon filter" WANTS FILTER_KARBON_IMPORT FILTER_KARBON_EXPORT)
# meta apps
calligra_define_product(WORDS "Full Words (for Desktop)" NEEDS WORDS_APP WANTS FILTER_WORDS)
calligra_define_product(WORDS "Full Words (for Desktop)" NEEDS WORDS_APP WANTS FILTER_WORDS PLUGIN_SEMANTICITEMS)
calligra_define_product(STAGE "Full Stage (for Desktop)" NEEDS STAGE_APP WANTS FILTER_STAGE)
calligra_define_product(SHEETS "Full Sheets (for Desktop)" NEEDS SHEETS_APP PLUGIN_SHEETS_PIVOTTABLES WANTS FILTER_SHEETS)
calligra_define_product(AUTHOR "Full Author (for Desktop)" NEEDS AUTHOR_APP WANTS FILTER_WORDS)
calligra_define_product(SHEETS "Full Sheets (for Desktop)" NEEDS SHEETS_APP WANTS FILTER_SHEETS PLUGIN_SHEETS_PIVOTTABLES)
calligra_define_product(AUTHOR "Full Author (for Desktop)" NEEDS AUTHOR_APP WANTS FILTER_WORDS PLUGIN_SEMANTICITEMS)
calligra_define_product(KARBON "Full Karbon (for Desktop)" NEEDS KARBON_APP WANTS FILTER_KARBON)
calligra_define_product(KRITA "Full Krita (for Desktop)" NEEDS KRITA_APP)
calligra_define_product(KEXI "Full Kexi (for Desktop)" NEEDS KEXI_APP WANTS PLUGIN_KEXI_SPREADSHEETMIGRATION PLUGIN_REPORTING)
......@@ -407,10 +408,9 @@ macro_log_feature(HAVE_OPENGL "OpenGL" "OpenGL support" "" FALSE "" "Required by
##
## Test for kdepimlibs
##
macro_optional_find_package(KdepimLibs)
macro_optional_find_package(KdepimLibs 4.6.0)
macro_log_feature(KDEPIMLIBS_FOUND "KDE PIMLibs" "KDE Personal Information Management Libraries" "http://www.kde.org/" FALSE "" "Required by Plan and the KDE address book integration (available as a module in KDE)")
##
## Test for eigen2
##
......@@ -501,21 +501,49 @@ if(HAVE_VC)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${Vc_CMAKE_MODULES_DIR}")
include (VcMacros)
macro(ko_compile_for_all_implementations_no_scalar _objs _src)
if(PACKAGERS_BUILD)
vc_compile_for_all_implementations(${_objs} ${_src} FLAGS -fPIC ONLY SSE2 SSSE3 SSE4_1 AVX)
else(PACKAGERS_BUILD)
set(${_objs} ${_src})
endif(PACKAGERS_BUILD)
endmacro()
macro(ko_compile_for_all_implementations _objs _src)
if(PACKAGERS_BUILD)
vc_compile_for_all_implementations(${_objs} ${_src} FLAGS -fPIC ONLY Scalar SSE2 SSSE3 SSE4_1 AVX)
else(PACKAGERS_BUILD)
set(${_objs} ${_src})
endif(PACKAGERS_BUILD)
endmacro()
#Handle Vc master
if(Vc_VERSION_MAJOR GREATER 0 OR Vc_VERSION_MINOR GREATER 7)
message(STATUS "Vc version is greater than 0.7, enabling AVX2 support")
if(Vc_COMPILER_IS_GCC)
AddCompilerFlag("-std=c++11" _ok)
if(NOT _ok)
AddCompilerFlag("-std=c++0x" _ok)
endif()
endif(Vc_COMPILER_IS_GCC)
macro(ko_compile_for_all_implementations_no_scalar _objs _src)
if(PACKAGERS_BUILD)
vc_compile_for_all_implementations(${_objs} ${_src} FLAGS -fPIC ONLY SSE2 SSSE3 SSE4_1 AVX AVX2)
else(PACKAGERS_BUILD)
set(${_objs} ${_src})
endif(PACKAGERS_BUILD)
endmacro()
macro(ko_compile_for_all_implementations _objs _src)
if(PACKAGERS_BUILD)
vc_compile_for_all_implementations(${_objs} ${_src} FLAGS -fPIC ONLY Scalar SSE2 SSSE3 SSE4_1 AVX AVX2)
else(PACKAGERS_BUILD)
set(${_objs} ${_src})
endif(PACKAGERS_BUILD)
endmacro()
else()
macro(ko_compile_for_all_implementations_no_scalar _objs _src)
if(PACKAGERS_BUILD)
vc_compile_for_all_implementations(${_objs} ${_src} FLAGS -fPIC ONLY SSE2 SSSE3 SSE4_1 AVX)
else(PACKAGERS_BUILD)
set(${_objs} ${_src})
endif(PACKAGERS_BUILD)
endmacro()
macro(ko_compile_for_all_implementations _objs _src)
if(PACKAGERS_BUILD)
vc_compile_for_all_implementations(${_objs} ${_src} FLAGS -fPIC ONLY Scalar SSE2 SSSE3 SSE4_1 AVX)
else(PACKAGERS_BUILD)
set(${_objs} ${_src})
endif(PACKAGERS_BUILD)
endmacro()
endif()
if (NOT PACKAGERS_BUILD)
# Optimize the whole Calligra for current architecture
......@@ -524,6 +552,15 @@ if(HAVE_VC)
endif(HAVE_VC)
set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
##
## Test for Xinput
##
if(NOT WIN32)
set(REQUIRED_Xinput_FOUND ${X11_Xinput_FOUND})
else(NOT WIN32)
set(REQUIRED_Xinput_FOUND TRUE)
endif(NOT WIN32)
##
## Test for Nepomuk
##
......@@ -695,12 +732,13 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CM
# koplugin is at the bottom of the stack
set(KOPLUGIN_INCLUDES ${CMAKE_SOURCE_DIR}/libs/koplugin)
set(KUNDO2_INCLUDES ${CMAKE_SOURCE_DIR}/libs/kundo2)
# koodf is at the bottom of the stack
set(KOODF_INCLUDES ${CMAKE_SOURCE_DIR}/libs/odf
${CMAKE_BINARY_DIR}/libs/odf
${KDE4_INCLUDES})
set(KUNDO2_INCLUDES ${CMAKE_SOURCE_DIR}/libs/kundo2)
# pigment depends on koplugin and lcms
set(PIGMENT_INCLUDES ${KOPLUGIN_INCLUDES}
......@@ -760,6 +798,7 @@ set(KOMAIN_INCLUDES ${KDE4_INCLUDES}
set(KORDF_INCLUDES ${KOMAIN_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/rdf
)
set(KORDF_LIBS kordf)
if(SHOULD_BUILD_SCRIPTING)
set(KOKROSS_INCLUDES ${CMAKE_SOURCE_DIR}/libs/kokross ${CMAKE_BINARY_DIR}/libs/kokross)
......@@ -848,9 +887,9 @@ if(NOT EIGEN2_FOUND)
calligra_disable_product(SHEETS_PART "Eigen devel not found")
endif(NOT EIGEN2_FOUND)
if(NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND)
calligra_disable_product(KRITA_APP "SharedMimeInfo|libeigen2|libexiv2|lcms devel not found ")
endif(NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND)
if(NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND OR NOT REQUIRED_Xinput_FOUND)
calligra_disable_product(KRITA_APP "SharedMimeInfo|libeigen2|libexiv2|lcms|Xinput devel not found ")
endif(NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND OR NOT REQUIRED_Xinput_FOUND)
if (NOT ${QTVERSION} VERSION_GREATER 4.7.0)
calligra_disable_product(ACTIVE "Qt version <= 4.7.0")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment