mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 23:57:34 +02:00
Code Issues Releases Wiki Activity

Build crash reporter if submodule is checked out

Browse Source
This commit is contained in:
Dominik Schmidt
2014-04-18 13:20:56 +02:00
parent 161a754d6d
commit 5117980a0e
6 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@@ -50,7 +50,6 @@ option(BUILD_TESTS "Build Tomahawk with unit tests" ON)
option(BUILD_HATCHET "Build the Hatchet plugin" OFF) option(BUILD_HATCHET "Build the Hatchet plugin" OFF)
option(BUILD_WITH_QT4 "Build Tomahawk with Qt4 no matter if Qt5 was found" ON) option(BUILD_WITH_QT4 "Build Tomahawk with Qt4 no matter if Qt5 was found" ON)
option(WITH_BREAKPAD "Build with breakpad integration" ON)
option(WITH_CRASHREPORTER "Build with CrashReporter" ON) option(WITH_CRASHREPORTER "Build with CrashReporter" ON)
option(WITH_BINARY_ATTICA "Enable support for downloading binary resolvers automatically" ON) 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(LEGACY_KDE_INTEGRATION "Install tomahawk.protocol file, deprecated since 4.6.0" OFF)
@@ -61,21 +60,11 @@ CMAKE_DEPENDENT_OPTION(WITH_UPOWER "Build with support for UPower events" ON
CMAKE_DEPENDENT_OPTION(WITH_GNOMESHORTCUTHANDLER "Build with shortcut handler for GNOME" ON CMAKE_DEPENDENT_OPTION(WITH_GNOMESHORTCUTHANDLER "Build with shortcut handler for GNOME" ON
"UNIX;NOT APPLE" OFF) "UNIX;NOT APPLE" OFF)
IF( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" ) IF( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libcrashreporter-qt")
message(STATUS "Build of breakpad library disabled on this platform.") message(STATUS "Build of crashreporter disabled.")
SET(WITH_BREAKPAD OFF)
SET(WITH_CRASHREPORTER OFF) SET(WITH_CRASHREPORTER OFF)
ENDIF() ENDIF()
# add definitions based on build options
IF( WITH_BREAKPAD )
message(STATUS "Build with support for breakpad.")
IF( CMAKE_COMPILER_IS_GNUCXX )
ADD_DEFINITIONS( -DSTDC_HEADERS -std=gnu++98 )
# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTDC_HEADERS -std=gnu++98" )
ENDIF()
ENDIF()
# generate version string # generate version string
# base string used in release and unstable builds # base string used in release and unstable builds

5
src/CMakeLists.txt
View File

@@ -21,7 +21,10 @@ add_subdirectory( viewpages )
# application # application
add_subdirectory( tomahawk ) add_subdirectory( tomahawk )
add_subdirectory( crashreporter )
if(WITH_CRASHREPORTER)
add_subdirectory( crashreporter )
endif()
# tests # tests
add_subdirectory( tests ) add_subdirectory( tests )

2
src/tomahawk/CMakeLists.txt
View File

@@ -173,7 +173,7 @@ ENDIF( LIBLASTFM_FOUND )
IF( QCA2_FOUND ) IF( QCA2_FOUND )
LIST(APPEND LINK_LIBRARIES ${LINK_LIBRARIES} ${QCA2_LIBRARIES} ) LIST(APPEND LINK_LIBRARIES ${LINK_LIBRARIES} ${QCA2_LIBRARIES} )
ENDIF( QCA2_FOUND ) ENDIF( QCA2_FOUND )
IF( WITH_BREAKPAD ) IF( WITH_CRASHREPORTER )
LIST(APPEND LINK_LIBRARIES ${LINK_LIBRARIES} crashreporter-handler ) LIST(APPEND LINK_LIBRARIES ${LINK_LIBRARIES} crashreporter-handler )
ENDIF() ENDIF()

1
src/tomahawk/Config.h.in
View File

@@ -12,7 +12,6 @@
#cmakedefine LEOPARD #cmakedefine LEOPARD
#cmakedefine HAVE_SPARKLE #cmakedefine HAVE_SPARKLE
#cmakedefine WITH_BREAKPAD
#cmakedefine WITH_CRASHREPORTER #cmakedefine WITH_CRASHREPORTER
#cmakedefine WITH_BINARY_ATTICA #cmakedefine WITH_BINARY_ATTICA
#cmakedefine WITH_QTSPARKLE #cmakedefine WITH_QTSPARKLE

4
src/tomahawk/main.cpp
View File

@@ -36,7 +36,7 @@
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS
#include "TomahawkSettingsGui.h" #include "TomahawkSettingsGui.h"
#ifdef WITH_BREAKPAD #ifdef WITH_CRASHREPORTER
#include "libcrashreporter-handler/Handler.h" #include "libcrashreporter-handler/Handler.h"
#endif #endif
@@ -165,7 +165,7 @@ main( int argc, char *argv[] )
#endif #endif
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS
#ifdef WITH_BREAKPAD #ifdef WITH_CRASHREPORTER
new CrashReporter::Handler( QDir::tempPath(), TomahawkSettings::instance()->crashReporterEnabled() && !TomahawkUtils::headless(), "tomahawk_crash_reporter" ); new CrashReporter::Handler( QDir::tempPath(), TomahawkSettings::instance()->crashReporterEnabled() && !TomahawkUtils::headless(), "tomahawk_crash_reporter" );
#endif #endif
#endif #endif

2
thirdparty/CMakeLists.txt vendored
View File

@@ -1,5 +1,5 @@
ADD_SUBDIRECTORY( qxt ) ADD_SUBDIRECTORY( qxt )
IF( WITH_BREAKPAD ) IF( WITH_CRASHREPORTER )
ADD_SUBDIRECTORY( libcrashreporter-qt ) ADD_SUBDIRECTORY( libcrashreporter-qt )
ENDIF() ENDIF()
IF( APPLE ) IF( APPLE )