diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-09-01 09:49:57 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-09-01 09:52:52 -0700 |
| commit | 181d5c5db9678dc275b3764d5fada002d190c66a (patch) | |
| tree | 9683556665716b6cf304ec4b4398d4e526bff263 | |
| parent | b2fd98dc1b34fe0fcacb786b2955079075d41b68 (diff) | |
| download | subsurface-181d5c5db9678dc275b3764d5fada002d190c66a.tar.gz | |
Cmake: turn on printing by default
As we get closer to the 4.5 release we should try to make sure we build
with printing enabled everywhere and just turn it off if we no it's not
supported.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1426040ab..236f00847 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ option(LIBGRANTLEE_FROM_PKGCONFIG "use pkg-config to retrieve grantlee" OFF) option(NO_MARBLE "disable the marble widget" OFF) option(NO_TESTS "disable the tests" OFF) option(NO_DOCS "disable the docs" OFF) -option(NO_PRINTING "disable the printing support" ON) +option(NO_PRINTING "disable the printing support" OFF) option(NO_USERMANUAL "don't include a viewer for the user manual" OFF) option(USE_LIBGIT23_API "allow building with libgit2 master" OFF) option(FORCE_LIBSSH "force linking with libssh to workaround libgit2 bug" ON) @@ -135,6 +135,11 @@ if(NO_MARBLE) set(MARBLE_LIBRARIES "") endif() +if(ANDROID) + set(FBSUPPORT OFF) + set(NO_PRINTING ON) +endif() + # setup Grantlee if(NO_PRINTING) @@ -194,7 +199,6 @@ endif() if(ANDROID) set(ANDROID_PKG AndroidExtras) set(ANDROID_LIB Qt5::AndroidExtras) - set(FBSUPPORT OFF) endif() find_package(Qt5 REQUIRED COMPONENTS Core Concurrent Widgets Network ${WEBKIT_PKG} ${PRINTING_PKG} Svg Test LinguistTools ${QT_QUICK_PKG} ${ANDROID_PKG} Bluetooth) set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network ${WEBKIT_LIB} ${PRINTING_LIB} Qt5::Svg ${QT_QUICK_LIB} ${ANDROID_LIB} Qt5::Bluetooth) |