From 2bc394656d3446369223200c5d48363a0c1d922a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 13 Jan 2018 21:26:31 +0100 Subject: [PATCH] [welcome] Make libparted optional - This turns off the space-available check in the welcome module; without libparted, always fail that check. - Allows running the welcome module on OS without libparted. --- src/modules/welcome/CMakeLists.txt | 20 ++++++++++++------- .../welcome/checker/RequirementsChecker.cpp | 5 +++++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/modules/welcome/CMakeLists.txt b/src/modules/welcome/CMakeLists.txt index 42ce62beb..a520aa080 100644 --- a/src/modules/welcome/CMakeLists.txt +++ b/src/modules/welcome/CMakeLists.txt @@ -1,20 +1,24 @@ include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) -find_package( LIBPARTED REQUIRED ) find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network ) +find_package( LIBPARTED ) +if ( LIBPARTED_FOUND ) + set( PARTMAN_SRC checker/partman_devices.c ) + set( CHECKER_LINK_LIBRARIES ${LIBPARTED_LIBRARY} ) +else() + set( PARTMAN_SRC ) + set( CHECKER_LINK_LIBRARIES ) + add_definitions( -DWITHOUT_LIBPARTED ) +endif() + include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) set( CHECKER_SOURCES checker/CheckItemWidget.cpp checker/CheckerWidget.cpp checker/RequirementsChecker.cpp - checker/partman_devices.c -) -set( CHECKER_LINK_LIBRARIES - ${LIBPARTED_LIBRARY} - Qt5::DBus - Qt5::Network + ${PARTMAN_SRC} ) calamares_add_plugin( welcome @@ -29,5 +33,7 @@ calamares_add_plugin( welcome LINK_PRIVATE_LIBRARIES calamaresui ${CHECKER_LINK_LIBRARIES} + Qt5::DBus + Qt5::Network SHARED_LIB ) diff --git a/src/modules/welcome/checker/RequirementsChecker.cpp b/src/modules/welcome/checker/RequirementsChecker.cpp index f059cc914..4dbd977d1 100644 --- a/src/modules/welcome/checker/RequirementsChecker.cpp +++ b/src/modules/welcome/checker/RequirementsChecker.cpp @@ -313,7 +313,12 @@ RequirementsChecker::verdict() const bool RequirementsChecker::checkEnoughStorage( qint64 requiredSpace ) { +#ifdef WITHOUT_LIBPARTED + cDebug() << "WARNING: RequirementsChecker is configured without libparted."; + return false; +#else return check_big_enough( requiredSpace ); +#endif }