From 8de565f269074c4ecb29eab5216b55dd0d944644 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Aug 2022 12:22:09 +0200 Subject: [PATCH] CMake: apply gersemi formatting --- src/modules/locale/CMakeLists.txt | 8 +++++++- src/modules/luksbootkeyfile/CMakeLists.txt | 7 +------ src/modules/partition/CMakeLists.txt | 18 +++++++++--------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/modules/locale/CMakeLists.txt b/src/modules/locale/CMakeLists.txt index b631f77f7..94cae2144 100644 --- a/src/modules/locale/CMakeLists.txt +++ b/src/modules/locale/CMakeLists.txt @@ -40,7 +40,13 @@ calamares_add_plugin(locale calamares_add_test( localetest - SOURCES Tests.cpp Config.cpp LocaleConfiguration.cpp LocaleNames.cpp SetTimezoneJob.cpp timezonewidget/TimeZoneImage.cpp + SOURCES + Tests.cpp + Config.cpp + LocaleConfiguration.cpp + LocaleNames.cpp + SetTimezoneJob.cpp + timezonewidget/TimeZoneImage.cpp DEFINITIONS SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images" DEBUG_TIMEZONES=1 LIBRARIES Qt5::Gui ) diff --git a/src/modules/luksbootkeyfile/CMakeLists.txt b/src/modules/luksbootkeyfile/CMakeLists.txt index dff682521..a2b52ad94 100644 --- a/src/modules/luksbootkeyfile/CMakeLists.txt +++ b/src/modules/luksbootkeyfile/CMakeLists.txt @@ -12,9 +12,4 @@ calamares_add_plugin(luksbootkeyfile NO_CONFIG ) -calamares_add_test( - luksbootkeyfiletest - SOURCES - Tests.cpp - LuksBootKeyFileJob.cpp -) +calamares_add_test(luksbootkeyfiletest SOURCES Tests.cpp LuksBootKeyFileJob.cpp) diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt index 3b6269854..743d906bd 100644 --- a/src/modules/partition/CMakeLists.txt +++ b/src/modules/partition/CMakeLists.txt @@ -18,27 +18,27 @@ # modules since the partitions on disk won't match GS, but it can be # useful for debugging simulated installations that don't need to # mount the target filesystems. -option( DEBUG_PARTITION_UNSAFE "Allow unsafe partitioning choices." OFF ) -option( DEBUG_PARTITION_BAIL_OUT "Unsafe partitioning will error out on exec." ON ) -option( DEBUG_PARTITION_SKIP "Don't actually do any partitioning." OFF) +option(DEBUG_PARTITION_UNSAFE "Allow unsafe partitioning choices." OFF) +option(DEBUG_PARTITION_BAIL_OUT "Unsafe partitioning will error out on exec." ON) +option(DEBUG_PARTITION_SKIP "Don't actually do any partitioning." OFF) # This is very chatty, useful mostly if you don't know what KPMCore offers. option(DEBUG_FILESYSTEMS "Log all available Filesystems from KPMCore." OFF) include_directories(${CMAKE_SOURCE_DIR}) # For 3rdparty -set( _partition_defs ) -if( DEBUG_PARTITION_UNSAFE ) - if( DEBUG_PARTITION_BAIL_OUT ) - list( APPEND _partition_defs DEBUG_PARTITION_BAIL_OUT ) +set(_partition_defs) +if(DEBUG_PARTITION_UNSAFE) + if(DEBUG_PARTITION_BAIL_OUT) + list(APPEND _partition_defs DEBUG_PARTITION_BAIL_OUT) endif() list(APPEND _partition_defs DEBUG_PARTITION_UNSAFE) endif() if(DEBUG_FILESYSTEMS) list(APPEND _partition_defs DEBUG_FILESYSTEMS) endif() -if( DEBUG_PARTITION_SKIP ) - list( APPEND _partition_defs DEBUG_PARTITION_SKIP ) +if(DEBUG_PARTITION_SKIP) + list(APPEND _partition_defs DEBUG_PARTITION_SKIP) endif() find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)