diff options
| author | Dominik Schmidt <dev@dominik-schmidt.de> | 2021-08-19 16:10:07 +0300 |
|---|---|---|
| committer | Dominik Schmidt <dev@dominik-schmidt.de> | 2021-08-19 16:10:07 +0300 |
| commit | 5b2753de99c530c63c1611d0eddae8ae5bfaddb0 (patch) | |
| tree | 870e8ec18d06659dc3a4d08b570eb61038cc7726 | |
| parent | c004f32a52a27b84b61ee1f454ac7337eee7d4ef (diff) | |
Do not require ENABLE_GPL_CODE on Linux
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/libcrashreporter-gui/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/libcrashreporter-gui/CrashReporter.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 43fa720..0beae2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,10 @@ if(POLICY CMP0063) endif() option(ENABLE_GPL_CODE "Enable GPL-licensed depencencies of libcrashreporter-qt (dr.konqui integration)" OFF) +if(ENABLE_GPL_CODE) + add_definitions( -DENABLE_GPL_CODE ) +endif() + option(ENABLE_CRASH_REPORTER "Enable libcrashreporter-qt GUI component" ON) find_package(Qt5 COMPONENTS Core Network Widgets) diff --git a/src/libcrashreporter-gui/CMakeLists.txt b/src/libcrashreporter-gui/CMakeLists.txt index 4420e33..feb32c0 100644 --- a/src/libcrashreporter-gui/CMakeLists.txt +++ b/src/libcrashreporter-gui/CMakeLists.txt @@ -3,11 +3,7 @@ set(crashreporter_UI CrashReporter.ui) set(crashreporter_RC ../../resources.qrc) set(crashreporter_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES}) -if(UNIX AND NOT APPLE) - if(NOT ENABLE_GPL_CODE) - message(FATAL_ERROR "Using the Linux build requires ENABLE_GPL_CODE to be true.") - endif() - +if(ENABLE_GPL_CODE) list(APPEND crashreporter_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/../../3rdparty/drkonqi-parser ) diff --git a/src/libcrashreporter-gui/CrashReporter.cpp b/src/libcrashreporter-gui/CrashReporter.cpp index b419265..ced151a 100644 --- a/src/libcrashreporter-gui/CrashReporter.cpp +++ b/src/libcrashreporter-gui/CrashReporter.cpp @@ -21,7 +21,7 @@ #include "CrashReporter.h" -#ifdef Q_OS_LINUX +#ifdef ENABLE_GPL_CODE #include "linux-backtrace-generator/backtracegenerator.h" #include "linux-backtrace-generator/crashedapplication.h" #include "CrashReporterGzip.h" @@ -87,7 +87,7 @@ CrashReporter::CrashReporter( const QUrl& url, const QStringList& args ) adjustSize(); setFixedSize( size() ); -#ifdef Q_OS_LINUX +#ifdef ENABLE_GPL_CODE if ( args.count() == 8 ) { qDebug() << "These are all our args:" << args.join( ", " ); |