From 001d936aaedd089ad57e1e6af1b84b94dd2a83c7 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Thu, 29 Jan 2015 06:10:35 +0100 Subject: [PATCH] Disable CrashReporter by default on Linux --- CMakeLists.txt | 7 +++- .../hatchet/cmake/Modules/FindQCA2.cmake | 37 ------------------- 2 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 src/accounts/hatchet/cmake/Modules/FindQCA2.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 2875be113..4cce460bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,12 @@ option(BUILD_TOOLS "Build Tomahawk helper tools" ${BUILD_NO_RELEASE}) option(BUILD_HATCHET "Build the Hatchet plugin" ON) option(BUILD_WITH_QT4 "Build Tomahawk with Qt4 no matter if Qt5 was found" ON) -option(WITH_CRASHREPORTER "Build with CrashReporter" ON) +if(UNIX AND NOT APPLE) + set(CRASHREPORTER_ENABLED_BY_DEFAULT OFF) +else() + set(CRASHREPORTER_ENABLED_BY_DEFAULT ON) +endif() +option(WITH_CRASHREPORTER "Build with CrashReporter" ${CRASHREPORTER_ENABLED_BY_DEFAULT}) option(WITH_BINARY_ATTICA "Enable support for downloading binary resolvers automatically" ON) option(LEGACY_KDE_INTEGRATION "Install tomahawk.protocol file, deprecated since 4.6.0" OFF) option(WITH_KDE4 "Build with support for KDE specific stuff" ON) diff --git a/src/accounts/hatchet/cmake/Modules/FindQCA2.cmake b/src/accounts/hatchet/cmake/Modules/FindQCA2.cmake deleted file mode 100644 index 888937196..000000000 --- a/src/accounts/hatchet/cmake/Modules/FindQCA2.cmake +++ /dev/null @@ -1,37 +0,0 @@ -# - Try to find QCA2 (Qt Cryptography Architecture 2) -# Once done this will define -# -# QCA2_FOUND - system has QCA2 -# QCA2_INCLUDE_DIR - the QCA2 include directory -# QCA2_LIBRARIES - the libraries needed to use QCA2 -# QCA2_DEFINITIONS - Compiler switches required for using QCA2 -# -# use pkg-config to get the directories and then use these values -# in the FIND_PATH() and FIND_LIBRARY() calls - -# Copyright (c) 2006, Michael Larouche, -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -if (NOT WIN32) - find_package(PkgConfig) - pkg_check_modules(PC_QCA2 qca2) - set(QCA2_DEFINITIONS ${PC_QCA2_CFLAGS_OTHER}) -endif (NOT WIN32) - -find_library(QCA2_LIBRARIES - NAMES qca - HINTS ${PC_QCA2_LIBDIR} ${PC_QCA2_LIBRARY_DIRS} -) - -find_path(QCA2_INCLUDE_DIR qca.h - HINTS ${PC_QCA2_INCLUDEDIR} ${PC_QCA2_INCLUDE_DIRS} - PATH_SUFFIXES QtCrypto - PATHS /usr/local/lib/qca.framework/Headers/ -) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(QCA2 DEFAULT_MSG QCA2_LIBRARIES QCA2_INCLUDE_DIR) - -mark_as_advanced(QCA2_INCLUDE_DIR QCA2_LIBRARIES)