mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-08 15:16:34 +02:00
Make compile on ARM (related to breakpad)
Make breakpad optional, add options Same for CrashReporter - both don't work on ARM.
This commit is contained in:
@@ -26,8 +26,21 @@ add_definitions( "-fvisibility=hidden" )
|
|||||||
# build options
|
# build options
|
||||||
option(BUILD_GUI "Build Tomahawk with GUI" ON)
|
option(BUILD_GUI "Build Tomahawk with GUI" ON)
|
||||||
option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF)
|
option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF)
|
||||||
|
option(WITH_BREAKPAD "Build with breakpad integration" ON)
|
||||||
|
option(WITH_CRASHREPORTER "Build with CrashReporter" 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)
|
||||||
|
|
||||||
|
IF( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" )
|
||||||
|
message(STATUS "Build of breakpad library disabled on this platform.")
|
||||||
|
SET(WITH_BREAKPAD OFF)
|
||||||
|
SET(WITH_CRASHREPORTER OFF)
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
|
# add definitions based on build options
|
||||||
|
IF(WITH_BREAKPAD)
|
||||||
|
message(STATUS "Build with support for breakpad.")
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
# generate version string
|
# generate version string
|
||||||
|
|
||||||
# base string used in release and unstable builds
|
# base string used in release and unstable builds
|
||||||
@@ -200,9 +213,3 @@ ADD_SUBDIRECTORY( src/libtomahawk )
|
|||||||
SET( TOMAHAWK_LIBRARIES tomahawklib )
|
SET( TOMAHAWK_LIBRARIES tomahawklib )
|
||||||
ADD_SUBDIRECTORY( src )
|
ADD_SUBDIRECTORY( src )
|
||||||
ADD_SUBDIRECTORY( admin )
|
ADD_SUBDIRECTORY( admin )
|
||||||
|
|
||||||
IF( BUILD_GUI )
|
|
||||||
IF( NOT DISABLE_CRASHREPORTER )
|
|
||||||
ADD_SUBDIRECTORY( src/breakpad/CrashReporter )
|
|
||||||
ENDIF()
|
|
||||||
ENDIF()
|
|
||||||
|
@@ -68,8 +68,6 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
|
|||||||
sourcetree/items/groupitem.cpp
|
sourcetree/items/groupitem.cpp
|
||||||
sourcetree/items/historyitem.cpp
|
sourcetree/items/historyitem.cpp
|
||||||
|
|
||||||
breakpad/BreakPad.cpp
|
|
||||||
|
|
||||||
utils/guihelpers.cpp
|
utils/guihelpers.cpp
|
||||||
|
|
||||||
accounts/lastfm/LastFmAccount.cpp
|
accounts/lastfm/LastFmAccount.cpp
|
||||||
@@ -91,6 +89,10 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
|
|||||||
AccountFactoryWrapperDelegate.cpp
|
AccountFactoryWrapperDelegate.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
IF( WITH_BREAKPAD )
|
||||||
|
LIST(APPEND tomahawkSourcesGui breakpad/BreakPad.cpp)
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
SET( tomahawkUI ${tomahawkUI}
|
SET( tomahawkUI ${tomahawkUI}
|
||||||
tomahawkwindow.ui
|
tomahawkwindow.ui
|
||||||
diagnosticsdialog.ui
|
diagnosticsdialog.ui
|
||||||
@@ -171,6 +173,10 @@ SET( final_src ${final_src} ${tomahawkMoc} ${tomahawkSources} ${trans_outfile})
|
|||||||
IF( BUILD_GUI )
|
IF( BUILD_GUI )
|
||||||
LIST(APPEND tomahawkSources ${tomahawkSourcesGui})
|
LIST(APPEND tomahawkSources ${tomahawkSourcesGui})
|
||||||
qt4_wrap_ui( tomahawkUI_H ${tomahawkUI} )
|
qt4_wrap_ui( tomahawkUI_H ${tomahawkUI} )
|
||||||
|
|
||||||
|
IF( WITH_CRASHREPORTER )
|
||||||
|
ADD_SUBDIRECTORY( breakpad/CrashReporter )
|
||||||
|
ENDIF()
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
kde4_add_app_icon( tomahawkSources "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-*.png" )
|
kde4_add_app_icon( tomahawkSources "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-*.png" )
|
||||||
@@ -203,9 +209,11 @@ ENDIF(GLOOX_FOUND)
|
|||||||
IF(QCA2_FOUND)
|
IF(QCA2_FOUND)
|
||||||
SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${QCA2_LIBRARIES} )
|
SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${QCA2_LIBRARIES} )
|
||||||
ENDIF(QCA2_FOUND)
|
ENDIF(QCA2_FOUND)
|
||||||
|
IF(WITH_BREAKPAD)
|
||||||
|
SET(LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_breakpad)
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES( tomahawk
|
TARGET_LINK_LIBRARIES( tomahawk
|
||||||
tomahawk_breakpad
|
|
||||||
${LINK_LIBRARIES}
|
${LINK_LIBRARIES}
|
||||||
${TOMAHAWK_LIBRARIES}
|
${TOMAHAWK_LIBRARIES}
|
||||||
${PHONON_LIBS}
|
${PHONON_LIBS}
|
||||||
|
@@ -17,6 +17,9 @@
|
|||||||
#cmakedefine LEOPARD
|
#cmakedefine LEOPARD
|
||||||
#cmakedefine HAVE_SPARKLE
|
#cmakedefine HAVE_SPARKLE
|
||||||
|
|
||||||
|
#cmakedefine WITH_BREAKPAD
|
||||||
|
#cmakedefine WITH_CRASHREPORTER
|
||||||
|
|
||||||
#cmakedefine LIBLASTFM_FOUND
|
#cmakedefine LIBLASTFM_FOUND
|
||||||
#cmakedefine GLOOX_FOUND
|
#cmakedefine GLOOX_FOUND
|
||||||
#cmakedefine QCA2_FOUND
|
#cmakedefine QCA2_FOUND
|
||||||
|
@@ -22,6 +22,7 @@
|
|||||||
#include "thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h"
|
#include "thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h"
|
||||||
#include "ubuntuunityhack.h"
|
#include "ubuntuunityhack.h"
|
||||||
#include "tomahawksettings.h"
|
#include "tomahawksettings.h"
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
#include <QTranslator>
|
#include <QTranslator>
|
||||||
|
|
||||||
@@ -123,8 +124,11 @@ main( int argc, char *argv[] )
|
|||||||
new TomahawkSettingsGui( &a );
|
new TomahawkSettingsGui( &a );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#ifndef ENABLE_HEADLESS
|
#ifndef ENABLE_HEADLESS
|
||||||
|
#ifdef WITH_BREAKPAD
|
||||||
new BreakPad( QDir::tempPath(), TomahawkSettings::instance()->crashReporterEnabled() );
|
new BreakPad( QDir::tempPath(), TomahawkSettings::instance()->crashReporterEnabled() );
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
KDSingleApplicationGuard guard( &a, KDSingleApplicationGuard::AutoKillOtherInstances );
|
KDSingleApplicationGuard guard( &a, KDSingleApplicationGuard::AutoKillOtherInstances );
|
||||||
|
4
thirdparty/CMakeLists.txt
vendored
4
thirdparty/CMakeLists.txt
vendored
@@ -1,6 +1,8 @@
|
|||||||
ADD_SUBDIRECTORY( qxt )
|
ADD_SUBDIRECTORY( qxt )
|
||||||
ADD_SUBDIRECTORY( liblastfm2 )
|
ADD_SUBDIRECTORY( liblastfm2 )
|
||||||
ADD_SUBDIRECTORY( breakpad )
|
IF( WITH_BREAKPAD )
|
||||||
|
ADD_SUBDIRECTORY( breakpad )
|
||||||
|
ENDIF()
|
||||||
IF( APPLE )
|
IF( APPLE )
|
||||||
ADD_SUBDIRECTORY( SPMediaKeyTap )
|
ADD_SUBDIRECTORY( SPMediaKeyTap )
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
Reference in New Issue
Block a user