style: replace cmake-format with gersemi

nicer formatting - support file_sets

Author: mrpilot2

.gersemirc

@@ -0,0 +1,3 @@
+{
+  "indent": 2
+}

.pre-commit-config.yaml

@@ -2,13 +2,12 @@ default_install_hook_types:
   - pre-commit
   - commit-msg
 repos:
-  - repo: https://github.com/cheshirekow/cmake-format-precommit
-    rev: v0.6.13
+    # nicer formatting than cmake-format; supports file_sets
+  - repo: https://github.com/BlankSpruce/gersemi
+    rev: 0.26.1
     hooks:
-    - id: cmake-format
-      additional_dependencies: [pyyaml]
-      stages: [pre-commit]
-
+    - id: gersemi
+  
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v20.1.8
     hooks:

CMakeLists.txt

@@ -6,11 +6,7 @@ include(cmake/VersionFromGit.cmake)
 
 version_from_git()
 
-project(
-  aide
-  LANGUAGES CXX
-  VERSION ${VERSION}
-)
+project(aide LANGUAGES CXX VERSION ${VERSION})
 
 set(CMAKE_CXX_EXTENSIONS OFF)
 
@@ -31,14 +27,12 @@ enable_testing()
 add_subdirectory(tests)
 
 if(PROJECT_IS_TOP_LEVEL)
-
   option(aide_ENABLE_DEMO "Builds a small demo application" ON)
   add_feature_info(EnableDemo aide_ENABLE_DEMO "Builds the demo application.")
 
   if(aide_ENABLE_DEMO)
     add_subdirectory(demo)
   endif()
-
 endif()
 
 feature_summary(WHAT ALL)

ProjectOptions.cmake

@@ -4,16 +4,24 @@ include(CheckCXXCompilerFlag)
 include(FeatureSummary)
 
 macro(aide_supports_sanitizers)
-  if((CMAKE_CXX_COMPILER_ID MATCHES ".*Clang.*" OR CMAKE_CXX_COMPILER_ID MATCHES
-                                                   ".*GNU.*") AND NOT WIN32
+  if(
+    (
+      CMAKE_CXX_COMPILER_ID MATCHES ".*Clang.*"
+      OR CMAKE_CXX_COMPILER_ID MATCHES ".*GNU.*"
+    )
+    AND NOT WIN32
   )
     set(SUPPORTS_UBSAN ON)
   else()
     set(SUPPORTS_UBSAN OFF)
   endif()
 
-  if((CMAKE_CXX_COMPILER_ID MATCHES ".*Clang.*" OR CMAKE_CXX_COMPILER_ID MATCHES
-                                                   ".*GNU.*") AND WIN32
+  if(
+    (
+      CMAKE_CXX_COMPILER_ID MATCHES ".*Clang.*"
+      OR CMAKE_CXX_COMPILER_ID MATCHES ".*GNU.*"
+    )
+    AND WIN32
   )
     set(SUPPORTS_ASAN OFF)
   else()
@@ -32,8 +40,10 @@ macro(aide_setup_options)
 
   cmake_dependent_option(
     aide_ENABLE_GLOBAL_HARDENING
-    "Attempt to push hardening options to built dependencies" ON
-    aide_ENABLE_HARDENING OFF
+    "Attempt to push hardening options to built dependencies"
+    ON
+    aide_ENABLE_HARDENING
+    OFF
   )
 
   aide_supports_sanitizers()
@@ -57,12 +67,16 @@ macro(aide_setup_options)
     option(aide_ENABLE_IPO "Enable IPO/LTO" OFF)
     option(aide_WARNINGS_AS_ERRORS "Treat Warnings As Errors" ON)
     option(aide_ENABLE_USER_LINKER "Enable user-selected linker" OFF)
-    option(aide_ENABLE_SANITIZER_ADDRESS "Enable address sanitizer"
-           ${SUPPORTS_ASAN}
+    option(
+      aide_ENABLE_SANITIZER_ADDRESS
+      "Enable address sanitizer"
+      ${SUPPORTS_ASAN}
     )
     option(aide_ENABLE_SANITIZER_LEAK "Enable leak sanitizer" OFF)
-    option(aide_ENABLE_SANITIZER_UNDEFINED "Enable undefined sanitizer"
-           ${SUPPORTS_UBSAN}
+    option(
+      aide_ENABLE_SANITIZER_UNDEFINED
+      "Enable undefined sanitizer"
+      ${SUPPORTS_UBSAN}
     )
     option(aide_ENABLE_SANITIZER_THREAD "Enable thread sanitizer" OFF)
     option(aide_ENABLE_SANITIZER_MEMORY "Enable memory sanitizer" OFF)
@@ -75,57 +89,77 @@ macro(aide_setup_options)
   endif()
 
   add_feature_info(
-    AIDE_ENABLE_COVERAGE aide_ENABLE_COVERAGE "Enable coverage reporting"
+    AIDE_ENABLE_COVERAGE
+    aide_ENABLE_COVERAGE
+    "Enable coverage reporting"
   )
   add_feature_info(
-    AIDE_ENABLE_HARDENING aide_ENABLE_HARDENING "Enable hardening"
+    AIDE_ENABLE_HARDENING
+    aide_ENABLE_HARDENING
+    "Enable hardening"
   )
   add_feature_info(
-    AIDE_ENABLE_GLOBAL_HARDENING aide_ENABLE_GLOBAL_HARDENING
+    AIDE_ENABLE_GLOBAL_HARDENING
+    aide_ENABLE_GLOBAL_HARDENING
     "Attempt to push hardening options to built dependencies"
   )
 
   add_feature_info(AIDE_ENABLE_IPO aide_ENABLE_IPO "Enable IPO/LTO")
   add_feature_info(
-    AIDE_WARNINGS_AS_ERRORS aide_WARNINGS_AS_ERRORS "Treat Warnings As Errors"
+    AIDE_WARNINGS_AS_ERRORS
+    aide_WARNINGS_AS_ERRORS
+    "Treat Warnings As Errors"
   )
   add_feature_info(
-    AIDE_ENABLE_USER_LINKER aide_ENABLE_USER_LINKER
+    AIDE_ENABLE_USER_LINKER
+    aide_ENABLE_USER_LINKER
     "Enable user-selected linker"
   )
   add_feature_info(
-    AIDE_ENABLE_SANITIZER_ADDRESS aide_ENABLE_SANITIZER_ADDRESS
+    AIDE_ENABLE_SANITIZER_ADDRESS
+    aide_ENABLE_SANITIZER_ADDRESS
     "Enable address sanitizer"
   )
   add_feature_info(
-    AIDE_ENABLE_SANITIZER_LEAK aide_ENABLE_SANITIZER_LEAK
+    AIDE_ENABLE_SANITIZER_LEAK
+    aide_ENABLE_SANITIZER_LEAK
     "Enable leak sanitizer"
   )
   add_feature_info(
-    AIDE_ENABLE_SANITIZER_UNDEFINED aide_ENABLE_SANITIZER_UNDEFINED
+    AIDE_ENABLE_SANITIZER_UNDEFINED
+    aide_ENABLE_SANITIZER_UNDEFINED
     "Enable undefined sanitizer"
   )
   add_feature_info(
-    AIDE_ENABLE_SANITIZER_THREAD aide_ENABLE_SANITIZER_THREAD
+    AIDE_ENABLE_SANITIZER_THREAD
+    aide_ENABLE_SANITIZER_THREAD
     "Enable thread sanitizer"
   )
   add_feature_info(
-    AIDE_ENABLE_SANITIZER_MEMORY aide_ENABLE_SANITIZER_MEMORY
+    AIDE_ENABLE_SANITIZER_MEMORY
+    aide_ENABLE_SANITIZER_MEMORY
     "Enable memory sanitizer"
   )
   add_feature_info(
-    AIDE_ENABLE_UNITY_BUILD aide_ENABLE_UNITY_BUILD "Enable unity builds"
+    AIDE_ENABLE_UNITY_BUILD
+    aide_ENABLE_UNITY_BUILD
+    "Enable unity builds"
   )
   add_feature_info(
-    AIDE_ENABLE_CLANG_TIDY aide_ENABLE_CLANG_TIDY "Enable clang-tidy"
+    AIDE_ENABLE_CLANG_TIDY
+    aide_ENABLE_CLANG_TIDY
+    "Enable clang-tidy"
   )
   add_feature_info(
-    AIDE_ENABLE_CPPCHECK aide_ENABLE_CPPCHECK "Enable cpp-check analysis"
+    AIDE_ENABLE_CPPCHECK
+    aide_ENABLE_CPPCHECK
+    "Enable cpp-check analysis"
   )
   add_feature_info(AIDE_ENABLE_PCH aide_ENABLE_PCH "Enable precompiled headers")
   add_feature_info(AIDE_ENABLE_CACHE aide_ENABLE_CACHE "Enable ccache")
   add_feature_info(
-    AIDE_ENABLE_ABI_COMPLIANCE_CHECK aide_ENABLE_ABI_COMPLIANCE_CHECK
+    AIDE_ENABLE_ABI_COMPLIANCE_CHECK
+    aide_ENABLE_ABI_COMPLIANCE_CHECK
     "Enable ABI compliance check"
   )
 
@@ -148,7 +182,6 @@ macro(aide_setup_options)
       aide_ENABLE_ABI_COMPLIANCE_CHECK
     )
   endif()
-
 endmacro()
 
 macro(aide_global_options)
@@ -161,11 +194,12 @@ macro(aide_global_options)
 
   if(aide_ENABLE_HARDENING AND aide_ENABLE_GLOBAL_HARDENING)
     include(cmake/Hardening.cmake)
-    if(NOT SUPPORTS_UBSAN
-       OR aide_ENABLE_SANITIZER_UNDEFINED
-       OR aide_ENABLE_SANITIZER_ADDRESS
-       OR aide_ENABLE_SANITIZER_THREAD
-       OR aide_ENABLE_SANITIZER_LEAK
+    if(
+      NOT SUPPORTS_UBSAN
+      OR aide_ENABLE_SANITIZER_UNDEFINED
+      OR aide_ENABLE_SANITIZER_ADDRESS
+      OR aide_ENABLE_SANITIZER_THREAD
+      OR aide_ENABLE_SANITIZER_LEAK
     )
       set(ENABLE_UBSAN_MINIMAL_RUNTIME FALSE)
     else()
@@ -189,7 +223,7 @@ macro(aide_local_options)
 
   include(cmake/CompilerWarnings.cmake)
   aide_set_project_warnings(
-    aide_warnings ${aide_WARNINGS_AS_ERRORS} "" "" "" ""
+      aide_warnings ${aide_WARNINGS_AS_ERRORS} "" "" "" ""
   )
 
   if(aide_ENABLE_USER_LINKER)
@@ -199,18 +233,20 @@ macro(aide_local_options)
 
   include(cmake/Sanitizers.cmake)
   aide_enable_sanitizers(
-    aide_options ${aide_ENABLE_SANITIZER_ADDRESS} ${aide_ENABLE_SANITIZER_LEAK}
-    ${aide_ENABLE_SANITIZER_UNDEFINED} ${aide_ENABLE_SANITIZER_THREAD}
-    ${aide_ENABLE_SANITIZER_MEMORY}
+      aide_options ${aide_ENABLE_SANITIZER_ADDRESS} ${aide_ENABLE_SANITIZER_LEAK}
+      ${aide_ENABLE_SANITIZER_UNDEFINED} ${aide_ENABLE_SANITIZER_THREAD}
+      ${aide_ENABLE_SANITIZER_MEMORY}
   )
 
   set_target_properties(
-    aide_options PROPERTIES UNITY_BUILD ${aide_ENABLE_UNITY_BUILD}
+    aide_options
+    PROPERTIES UNITY_BUILD ${aide_ENABLE_UNITY_BUILD}
   )
 
   if(aide_ENABLE_PCH)
     target_precompile_headers(
-      aide_options INTERFACE <vector> <string> <utility>
+      aide_options
+      INTERFACE <vector> <string> <utility>
     )
   endif()
 
@@ -226,7 +262,7 @@ macro(aide_local_options)
 
   if(aide_ENABLE_CPPCHECK)
     aide_enable_cppcheck(
-      ${aide_WARNINGS_AS_ERRORS} "" # override cppcheck options
+          ${aide_WARNINGS_AS_ERRORS} "" # override cppcheck options
     )
   endif()
 
@@ -250,17 +286,17 @@ macro(aide_local_options)
 
   if(aide_ENABLE_HARDENING AND NOT aide_ENABLE_GLOBAL_HARDENING)
     include(cmake/Hardening.cmake)
-    if(NOT SUPPORTS_UBSAN
-       OR aide_ENABLE_SANITIZER_UNDEFINED
-       OR aide_ENABLE_SANITIZER_ADDRESS
-       OR aide_ENABLE_SANITIZER_THREAD
-       OR aide_ENABLE_SANITIZER_LEAK
+    if(
+      NOT SUPPORTS_UBSAN
+      OR aide_ENABLE_SANITIZER_UNDEFINED
+      OR aide_ENABLE_SANITIZER_ADDRESS
+      OR aide_ENABLE_SANITIZER_THREAD
+      OR aide_ENABLE_SANITIZER_LEAK
     )
       set(ENABLE_UBSAN_MINIMAL_RUNTIME FALSE)
     else()
       set(ENABLE_UBSAN_MINIMAL_RUNTIME TRUE)
     endif()
     aide_enable_hardening(aide_options OFF ${ENABLE_UBSAN_MINIMAL_RUNTIME})
   endif()
-
 endmacro()

aide/CMakeLists.txt

@@ -4,18 +4,13 @@ include(${CMAKE_CURRENT_LIST_DIR}/../cmake/VersionFromGit.cmake)
 
 version_from_git()
 
-project(
-  aide.library
-  LANGUAGES CXX
-  VERSION ${VERSION}
-)
+project(aide.library LANGUAGES CXX VERSION ${VERSION})
 
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 include(${CMAKE_CURRENT_LIST_DIR}/../cmake/CheckRequiredCXXStandard.cmake)
 
 if(PROJECT_IS_TOP_LEVEL)
-
   include(${CMAKE_CURRENT_LIST_DIR}/../cmake/PreventInSourceBuilds.cmake)
   include(${CMAKE_CURRENT_LIST_DIR}/../ProjectOptions.cmake)
 

aide/dependencies/CMakeLists.txt

@@ -115,6 +115,8 @@ string(SUBSTRING ${markdown_content} 0 ${markdown_substring} markdown_content)
 if(AIDE_CHECK_LICENSES_AVAILABILITY)
   configure_file(licenses.hml.in licenses.html @ONLY)
   configure_file(
-    licenses.md.in ${CMAKE_CURRENT_LIST_DIR}/../../3rd-party-licenses.md @ONLY
+    licenses.md.in
+    ${CMAKE_CURRENT_LIST_DIR}/../../3rd-party-licenses.md
+    @ONLY
   )
 endif()

aide/dependencies/Qt.cmake

@@ -1,30 +1,22 @@
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
 
-find_package(
-  Qt6
-  COMPONENTS Core Widgets
-  QUIET
-)
+find_package(Qt6 COMPONENTS Core Widgets QUIET)
 
 if(TARGET Qt6::Core)
-  find_package(
-    Qt6
-    COMPONENTS Core Widgets
-    REQUIRED
-  )
+  find_package(Qt6 COMPONENTS Core Widgets REQUIRED)
 
   find_package(Qt6LinguistTools)
 else()
   if(NOT TARGET Qt5::Core)
-    find_package(
-      Qt5
-      COMPONENTS Core Widgets
-      REQUIRED
-    )
+    find_package(Qt5 COMPONENTS Core Widgets REQUIRED)
 
     if(TARGET Qt5::Core)
       set_target_properties(
-        Qt5::Core Qt5::Widgets Qt5::moc Qt5::uic Qt5::rcc
+        Qt5::Core
+        Qt5::Widgets
+        Qt5::moc
+        Qt5::uic
+        Qt5::rcc
         PROPERTIES IMPORTED_GLOBAL TRUE
       )
       if(NOT TARGET Qt::Core)