Commit c83583b4 authored by Frederik Gladhorn's avatar Frederik Gladhorn

Remove complex Calligra product system

Summary:
This made sense for the office suite, currently it's just added
complexity without benefit.

After this change, all parts of Krita will be built, is there a neccessity
to disable for example the vectorimage support?

Reviewers: #krita

Differential Revision: https://phabricator.kde.org/D3182
parent 0f55fb70
......@@ -168,34 +168,9 @@ add_feature_info("Foundation Build" FOUNDATION_BUILD "A Foundation build is a bi
# 5. estimate which of the products/features can be build by internal deps
# get the special macros
include(CalligraProductSetMacros)
include(MacroJPEG)
include(GenerateTestExportHeader)
# get the definitions of products, features and product sets
include(KritaProducts.cmake)
set(PRODUCTSET_DEFAULT "ALL")
# temporary migration support
if (CREATIVEONLY)
set(WARN_ABOUT_CREATIVEONLY TRUE)
set(PRODUCTSET_DEFAULT "CREATIVE")
endif ()
if(NOT PRODUCTSET)
set(PRODUCTSET ${PRODUCTSET_DEFAULT} CACHE STRING "Set of products/features to build" FORCE)
endif()
if (RELEASE_BUILD)
set(CALLIGRA_SHOULD_BUILD_STAGING FALSE)
else ()
set(CALLIGRA_SHOULD_BUILD_STAGING TRUE)
endif ()
# finally choose products/features to build
calligra_set_productset(${PRODUCTSET})
########################
#########################
## Look for KDE and Qt ##
......@@ -574,15 +549,6 @@ if(HAVE_VC)
endif()
set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
##
## Test for Xinput
##
if(NOT WIN32 AND NOT APPLE)
set(REQUIRED_Xinput_FOUND ${X11_Xinput_FOUND})
else()
set(REQUIRED_Xinput_FOUND TRUE)
endif()
add_definitions(${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS})
if(WIN32)
......@@ -662,63 +628,12 @@ include_directories(
${CMAKE_BINARY_DIR}/libs/version
)
###################################################
####################################################
## Detect which products/features can be compiled ##
####################################################
###################################################
calligra_drop_product_on_bad_condition( APP_KRITA
EIGEN3_FOUND "Eigen devel not found"
EXIV2_FOUND "libexiv2 devel not found"
HAVE_REQUIRED_LCMS_VERSION "lcms devel not found"
Boost_SYSTEM_FOUND "boost-system devel not found"
REQUIRED_Xinput_FOUND "Xinput devel not found "
)
#############################################
#### Backward compatibility BUILD_x=off ####
#############################################
# workaround: disable directly all products which might be activated by internal
# dependencies, but belong to scope of old flag
calligra_drop_products_on_old_flag(krita APP_KRITA)
#############################################
#### Temporarily broken products ####
#############################################
# If a product does not build due to some temporary brokeness disable it here,
# by calling calligra_disable_product with the product id and the reason,
# e.g.:
# calligra_disable_product(APP_KEXI "isn't buildable at the moment")
#############################################
#### Calculate buildable products ####
#############################################
calligra_drop_unbuildable_products()
###################
####################
## Subdirectories ##
####################
###################
if(SHOULD_BUILD_APP_KRITA)
add_subdirectory(krita)
endif()
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
# non-app directories are moved here because they can depend on SHOULD_BUILD_{appname} variables set above
add_subdirectory(libs)
add_subdirectory(plugins)
add_subdirectory( benchmarks )
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
calligra_product_deps_report("product_deps")
calligra_log_should_build()
add_subdirectory(benchmarks)
add_subdirectory(krita)
configure_file(KoConfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/KoConfig.h )
configure_file(config_convolution.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_convolution.h)
......
This diff is collapsed.
This diff is collapsed.
......@@ -14,7 +14,4 @@ add_subdirectory( psd )
add_subdirectory( color )
add_subdirectory( image )
add_subdirectory( ui )
if (SHOULD_BUILD_LIB_KOVECTORIMAGE)
add_subdirectory( vectorimage )
endif ()
add_subdirectory( vectorimage )
if (SHOULD_BUILD_PLUGIN_ARTISTICTEXTSHAPE)
add_subdirectory( artistictextshape )
endif ()
if (SHOULD_BUILD_PLUGIN_PATHSHAPES)
add_subdirectory( pathshapes )
endif ()
if (SHOULD_BUILD_PLUGIN_TEXTSHAPE)
add_subdirectory( textshape )
endif()
if (SHOULD_BUILD_PLUGIN_VECTORSHAPE)
add_subdirectory( vectorshape )
endif ()
add_subdirectory( artistictextshape )
add_subdirectory( pathshapes )
add_subdirectory( textshape )
add_subdirectory( vectorshape )
......@@ -26,7 +26,4 @@ install(TARGETS kritaoraexport DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
install( PROGRAMS krita_ora.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
if(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
install( FILES krita_ora_thumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR})
endif()
install( FILES krita_ora_thumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR})
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