From cf047466b5d297d80644194cc76f0a30ad2bac91 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 6 Jul 2015 12:11:07 -0700 Subject: Cmake: make Facebook support an actual option This way we can selectively turn off Facebook support. And turning off both Facebook support and support for the user manual allows us to not rely on QWebKit which once again allows debugging Subsurface with valgrind on Arch Linux. Signed-off-by: Dirk Hohndel --- CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 77d202661..b4eed8bed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,7 @@ option(NO_PRINTING "disable the printing support" ON) option(NO_USERMANUAL "don't include a viewer for the user manual" OFF) option(USE_LIBGIT23_API "allow building with libgit2 master" OFF) option(SUBSURFACE_MOBILE "build the QtQuick version for mobile device" OFF) +option(FBSUPPORT "allow posting to Facebook" ON) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} @@ -160,6 +161,7 @@ endif() if(CMAKE_SYSTEM_NAME STREQUAL "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) @@ -223,7 +225,6 @@ add_custom_target( # set up the different target platforms set(PLATFORM_SRC unknown_platform.c) if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(FBSUPPORT 1) set(SUBSURFACE_TARGET subsurface) set(PLATFORM_SRC linux.c) # in some builds we appear to be missing libz for some strange reason... @@ -236,7 +237,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android") set(SUBSURFACE_TARGET subsurface) endif() if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set(FBSUPPORT 1) set(SUBSURFACE_TARGET Subsurface) set(PLATFORM_SRC macos.c) find_library(APP_SERVICES_LIBRARY ApplicationServices) @@ -254,7 +254,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(SUBSURFACE_PKG MACOSX_BUNDLE ${ICON_FILE}) endif() if(CMAKE_SYSTEM_NAME STREQUAL "Windows") - set(FBSUPPORT 1) set(SUBSURFACE_TARGET subsurface) set(PLATFORM_SRC windows.c) set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lwsock32) -- cgit v1.2.3-70-g09d2