[calamares] avoid extra defines for KCrash
- Don't need an extra indirection from WITH_KF5Crash to WITH_KCRASH, just use the cmakedefine directly. - Since the setting is only used in main.cpp, move the define down there and remove cmakedefine entirely.
This commit is contained in:
parent
81c4114de9
commit
1cf3ac810a
@ -39,21 +39,21 @@ set_target_properties(calamares_bin
|
||||
)
|
||||
calamares_automoc( calamares_bin )
|
||||
|
||||
if( WITH_KF5Crash )
|
||||
set( LINK_LIBRARIES
|
||||
KF5::CoreAddons
|
||||
KF5::Crash
|
||||
)
|
||||
endif()
|
||||
|
||||
target_link_libraries( calamares_bin
|
||||
PRIVATE
|
||||
${CALAMARES_LIBRARIES}
|
||||
calamaresui
|
||||
Qt5::Core
|
||||
Qt5::Widgets
|
||||
${LINK_LIBRARIES}
|
||||
)
|
||||
if( WITH_KF5Crash )
|
||||
target_link_libraries( calamares_bin
|
||||
PRIVATE
|
||||
KF5::CoreAddons
|
||||
KF5::Crash
|
||||
)
|
||||
target_compile_definitions( calamares_bin PRIVATE WITH_KF5Crash )
|
||||
endif()
|
||||
|
||||
install( TARGETS calamares_bin
|
||||
BUNDLE DESTINATION .
|
||||
|
@ -26,7 +26,7 @@
|
||||
#include "utils/Logger.h"
|
||||
#include "CalamaresConfig.h"
|
||||
|
||||
#ifdef WITH_KCRASH
|
||||
#ifdef WITH_KF5Crash
|
||||
#include <KF5/KCrash/KCrash>
|
||||
#include <KF5/KCoreAddons/KAboutData>
|
||||
#endif
|
||||
@ -84,7 +84,7 @@ main( int argc, char* argv[] )
|
||||
{
|
||||
CalamaresApplication a( argc, argv );
|
||||
|
||||
#ifdef WITH_KCRASH
|
||||
#ifdef WITH_KF5Crash
|
||||
KAboutData aboutData( "calamares",
|
||||
"Calamares",
|
||||
a.applicationVersion(),
|
||||
|
@ -10,12 +10,6 @@
|
||||
|
||||
//cmakedefines for CMake variables (e.g. for optdepends) go here
|
||||
#cmakedefine WITH_PYTHON
|
||||
|
||||
#cmakedefine WITH_KF5Crash
|
||||
#ifdef WITH_KF5Crash
|
||||
#define WITH_KCRASH
|
||||
#endif
|
||||
|
||||
#cmakedefine WITH_PYTHONQT
|
||||
|
||||
#endif // CALAMARESCONFIG_H
|
||||
|
Loading…
Reference in New Issue
Block a user