napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: WITH_KF5Crash -> BUILD_KF5Crash

Browse Source 
ABI-changing flags are WITH_*, features and dependencies are BUILD_*
This commit is contained in:
Adriaan de Groot 2021-11-30 11:49:43 +01:00
parent ce23efae99
commit 1667d75a70
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -25,9 +25,13 @@
# CMake once. These affect the ABI offered by Calamares. # CMake once. These affect the ABI offered by Calamares.
# - PYTHON (enable Python Job modules) # - PYTHON (enable Python Job modules)
# - QML (enable QML UI View modules) # - QML (enable QML UI View modules)
# The WITH_* options affect the ABI of Calamares: you must
# build (C++) modules for Calamares with the same WITH_*
# settings, or they may not load at all.
# BUILD_<foo> : choose additional things to build # BUILD_<foo> : choose additional things to build
# - TESTING (standard CMake option) # - TESTING (standard CMake option)
# - SCHEMA_TESTING (requires Python, see ci/configvalidator.py) # - SCHEMA_TESTING (requires Python, see ci/configvalidator.py)
# - KF5Crash (uses KCrash, rather than Calamares internal, for crash reporting)
# DEBUG_<foo> : special developer flags for debugging # DEBUG_<foo> : special developer flags for debugging
# #
# Example usage: # Example usage:
@ -64,15 +68,15 @@ endif()
option( INSTALL_CONFIG "Install configuration files" OFF ) option( INSTALL_CONFIG "Install configuration files" OFF )
option( INSTALL_POLKIT "Install Polkit configuration" ON ) option( INSTALL_POLKIT "Install Polkit configuration" ON )
option( INSTALL_COMPLETION "Install shell completions" OFF ) option( INSTALL_COMPLETION "Install shell completions" OFF )
# Options for the calamares executable
option( WITH_KF5Crash "Enable crash reporting with KCrash." ON ) # TODO:3.3: WITH->BUILD (this isn't an ABI thing)
# When adding WITH_* that affects the ABI offered by libcalamares, # When adding WITH_* that affects the ABI offered by libcalamares,
# also update libcalamares/CalamaresConfig.h.in # also update libcalamares/CalamaresConfig.h.in
option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON ) option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON )
option( WITH_QML "Enable QML UI options." ON ) option( WITH_QML "Enable QML UI options." ON )
# #
# Additional parts to build # Additional parts to build that do not affect ABI
option( BUILD_SCHEMA_TESTING "Enable schema-validation-tests" ON ) option( BUILD_SCHEMA_TESTING "Enable schema-validation-tests" ON )
# Options for the calamares executable
option( BUILD_KF5Crash "Enable crash reporting with KCrash." ON )
# Possible debugging flags are: # Possible debugging flags are:
@ -338,10 +342,10 @@ set_package_properties(
PURPOSE "Unique instance of Calamares" PURPOSE "Unique instance of Calamares"
) )
if( NOT KF5Crash_FOUND ) if( NOT KF5Crash_FOUND )
if( WITH_KF5Crash ) if( BUILD_KF5Crash )
message(WARNING "WITH_KF5Crash is set, but KF5::Crash is not available.") message(WARNING "BUILD_KF5Crash is set, but KF5::Crash is not available.")
endif() endif()
set( WITH_KF5Crash OFF ) set( BUILD_KF5Crash OFF )
endif() endif()
# TODO:3.3: Use FindPython3 instead # TODO:3.3: Use FindPython3 instead
@ -563,8 +567,10 @@ set( Calamares_LIBRARIES calamares )
add_subdirectory( src ) add_subdirectory( src )
add_feature_info(Python ${WITH_PYTHON} "Python job modules") add_feature_info(Python ${WITH_PYTHON} "Python job modules")
add_feature_info(Qml ${WITH_QML} "QML UI support")
add_feature_info(Config ${INSTALL_CONFIG} "Install Calamares configuration") add_feature_info(Config ${INSTALL_CONFIG} "Install Calamares configuration")
add_feature_info(KCrash ${WITH_KF5Crash} "Crash dumps via KCrash") add_feature_info(Polkit ${INSTALL_POLKIT} "Install Polkit files")
add_feature_info(KCrash ${BUILD_KF5Crash} "Crash dumps via KCrash")
### CMake infrastructure installation ### CMake infrastructure installation
# #

4
src/calamares/CMakeLists.txt
View File

@ -56,9 +56,9 @@ target_link_libraries( calamares_bin
KF5::CoreAddons KF5::CoreAddons
KF5::DBusAddons KF5::DBusAddons
) )
if( WITH_KF5Crash ) if( BUILD_KF5Crash )
target_link_libraries( calamares_bin PRIVATE KF5::Crash ) target_link_libraries( calamares_bin PRIVATE KF5::Crash )
target_compile_definitions( calamares_bin PRIVATE WITH_KF5Crash ) target_compile_definitions( calamares_bin PRIVATE BUILD_KF5Crash )
endif() endif()
install( TARGETS calamares_bin install( TARGETS calamares_bin

5
src/calamares/main.cpp
View File

@ -18,7 +18,7 @@
#include <KCoreAddons/KAboutData> #include <KCoreAddons/KAboutData>
#include <KDBusAddons/KDBusService> #include <KDBusAddons/KDBusService>
#ifdef WITH_KF5Crash #ifdef BUILD_KF5Crash
#include <KCrash/KCrash> #include <KCrash/KCrash>
#endif #endif
@ -117,12 +117,11 @@ main( int argc, char* argv[] )
KAboutData::setApplicationData( aboutData ); KAboutData::setApplicationData( aboutData );
a.setApplicationDisplayName( QString() ); // To avoid putting an extra "Calamares/" into the log-file a.setApplicationDisplayName( QString() ); // To avoid putting an extra "Calamares/" into the log-file
#ifdef WITH_KF5Crash #ifdef BUILD_KF5Crash
KCrash::initialize(); KCrash::initialize();
// KCrash::setCrashHandler(); // KCrash::setCrashHandler();
KCrash::setDrKonqiEnabled( true ); KCrash::setDrKonqiEnabled( true );
KCrash::setFlags( KCrash::SaferDialog | KCrash::AlwaysDirectly ); KCrash::setFlags( KCrash::SaferDialog | KCrash::AlwaysDirectly );
// TODO: umount anything in /tmp/calamares-... as an emergency save function
#endif #endif
bool is_debug = handle_args( a ); bool is_debug = handle_args( a );