Commit 174eac65 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Make marble, ICU and SQLite optional

Once the textshape starts using calligradb,
it'll have to be disabled if we cannot build
calligradb because of a missing icu, but there
is no reason to stop people from building the
other parts of calligra.

The previous way of disabling was done with a
IF(CREATIVEONLY) block, but that hides the variables
and makes everything fail in creativeonly mode.

Conflicts:
	CMakeLists.txt
	libs/CMakeLists.txt
parent cf6eb087
......@@ -197,7 +197,7 @@ macro_log_feature(ICU_FOUND "ICU" "International Components for Unicode (ICU) Li
"Required by Calligra's default database handler for Kexi and Words.")
##
## Check for OpenEXR
## Check for OpenEXR
##
macro_optional_find_package(OpenEXR)
......
......@@ -23,9 +23,9 @@ if(NOT TINY OR NOT CREATIVEONLY)
add_subdirectory( koproperty ) # TODO move to independent place like kdesupport
endif(NOT TINY OR NOT CREATIVEONLY)
if (SHOULD_BUILD_CALLIGRADB)
if (HAVE_ICU AND HAVE_SQLITE AND SHOULD_BUILD_CALLIGRADB)
add_subdirectory( db ) # used by Kexi and Word's Biblio; TODO: remove when Predicate lib arrives
endif (SHOULD_BUILD_CALLIGRADB)
endif ()
# only build koreport if possible
if (SHOULD_BUILD_KOREPORT)
......@@ -35,4 +35,3 @@ endif (SHOULD_BUILD_KOREPORT)
if (Soprano_FOUND)
add_subdirectory( rdf )
endif (Soprano_FOUND)
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