style: run pre-commit

Henry Schreiner · Henry Schreiner
1 parent 05586a9b
Showing 23 changed files with 498 additions and 591 deletions
.ci/azure-build.yml
.ci/azure-test.yml
.ci/build_doxygen.sh
.clang-tidy
.github/workflows/tests.yml
CLI11.CPack.Description.txt
CMakeLists.txt
CPPLINT.cfg
book/CMakeLists.txt
book/README.md
book/SUMMARY.md
book/chapters/basics.md
book/chapters/formatting.md
book/chapters/internals.md
book/chapters/options.md
book/chapters/validators.md
book/code/CMakeLists.txt
cmake/CLI11GeneratePkgConfig.cmake
cmake/CodeCoverage.cmake
docs/CMakeLists.txt
@@ -8,4 +8,3 @@ steps:
 - script: cmake --build .
   displayName: 'Build'
   workingDirectory: build
-
@@ -8,5 +8,3 @@ steps:
   inputs:
     testResultsFormat: 'cTest'
     testResultsFiles: '**/Test.xml'
-
-
@@ -23,4 +23,3 @@ export PATH=&quot;${DEPS_DIR}/doxygen/build/bin:${PATH}&quot;
 cd "${TRAVIS_BUILD_DIR}"
 set +evx
-
@@ -22,4 +22,3 @@ HeaderFilterRegex: &#39;.*hpp&#39;
 CheckOptions:
 - key:             google-readability-braces-around-statements.ShortStatementLines
   value:           '3'
-
@@ -178,5 +178,3 @@ jobs:
     - name: Check CMake 3.20
       uses: ./.github/actions/quick_cmake
       if: success() || failure()
-
-
 CLI11 provides all the features you expect in a powerful command line parser, with a beautiful, minimal syntax and no dependencies beyond C++11. It is header only, and comes in a single file form for easy inclusion in projects. It is easy to use for small projects, but powerful enough for complex command line projects, and can be customized for frameworks.
-
@@ -7,26 +7,29 @@ cmake_minimum_required(VERSION 3.4)
 # We don't use the 3.4...3.17 syntax because of a bug in an older MSVC's
 # built-in and modified CMake 3.11
 if(${CMAKE_VERSION} VERSION_LESS 3.17)
-    cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
+  cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
 else()
-    cmake_policy(VERSION 3.17)
+  cmake_policy(VERSION 3.17)
 endif()
 set(VERSION_REGEX "#define CLI11_VERSION[ \t]+\"(.+)\"")
 # Read in the line containing the version
-file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/include/CLI/Version.hpp"
-    VERSION_STRING REGEX ${VERSION_REGEX})
+file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/include/CLI/Version.hpp" VERSION_STRING
+     REGEX ${VERSION_REGEX})
 # Pick out just the version
 string(REGEX REPLACE ${VERSION_REGEX} "\\1" VERSION_STRING "${VERSION_STRING}")
 # Add the project
-project(CLI11 LANGUAGES CXX VERSION ${VERSION_STRING})
+project(
+  CLI11
+  LANGUAGES CXX
+  VERSION ${VERSION_STRING})
 # Print the version number of CMake if this is the main project
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-    message(STATUS "CMake ${CMAKE_VERSION}")
+  message(STATUS "CMake ${CMAKE_VERSION}")
 endif()
 include(CMakeDependentOption)
@@ -34,7 +37,7 @@ include(GNUInstallDirs)
 include(CTest)
 if(NOT CMAKE_VERSION VERSION_LESS 3.11)
-    include(FetchContent)
+  include(FetchContent)
 endif()
 find_package(Doxygen)
@@ -49,83 +52,76 @@ list(APPEND build-docs &quot;Doxygen_FOUND&quot;)
 # Necessary to support paths with spaces, see #457
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/docs")
-    set(docs_EXIST TRUE)
+  set(docs_EXIST TRUE)
 else()
-    set(docs_EXIST FALSE)
+  set(docs_EXIST FALSE)
 endif()
 list(APPEND build-docs "docs_EXIST")
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/examples")
-    set(examples_EXIST TRUE)
+  set(examples_EXIST TRUE)
 else()
-    set(examples_EXIST FALSE)
+  set(examples_EXIST FALSE)
 endif()
 option(CLI11_WARNINGS_AS_ERRORS "Turn all warnings into errors (for CI)")
 option(CLI11_SINGLE_FILE "Generate a single header file")
-cmake_dependent_option(CLI11_SANITIZERS
-    "Download the sanitizers CMake config" OFF
-    "NOT CMAKE_VERSION VERSION_LESS 3.11" OFF)
+cmake_dependent_option(CLI11_SANITIZERS "Download the sanitizers CMake config" OFF
+                       "NOT CMAKE_VERSION VERSION_LESS 3.11" OFF)
-cmake_dependent_option(CLI11_BUILD_DOCS
-    "Build CLI11 documentation" ON
-    "${build-docs}" OFF)
+cmake_dependent_option(CLI11_BUILD_DOCS "Build CLI11 documentation" ON "${build-docs}" OFF)
-cmake_dependent_option(CLI11_BUILD_TESTS
-    "Build CLI11 tests" ON
-    "BUILD_TESTING;CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME" OFF)
+cmake_dependent_option(CLI11_BUILD_TESTS "Build CLI11 tests" ON
+                       "BUILD_TESTING;CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME" OFF)
-cmake_dependent_option(CLI11_BUILD_EXAMPLES
-    "Build CLI11 examples" ON
-    "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME;${examples_EXIST}" OFF)
+cmake_dependent_option(CLI11_BUILD_EXAMPLES "Build CLI11 examples" ON
+                       "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME;${examples_EXIST}" OFF)
-cmake_dependent_option(CLI11_BUILD_EXAMPLES_JSON
-    "Build CLI11 json example" OFF
-    "CLI11_BUILD_EXAMPLES;NOT CMAKE_VERSION VERSION_LESS 3.11" OFF)
+cmake_dependent_option(CLI11_BUILD_EXAMPLES_JSON "Build CLI11 json example" OFF
+                       "CLI11_BUILD_EXAMPLES;NOT CMAKE_VERSION VERSION_LESS 3.11" OFF)
-cmake_dependent_option(CLI11_SINGLE_FILE_TESTS
-    "Duplicate all the tests for a single file build" OFF
-    "BUILD_TESTING;CLI11_SINGLE_FILE" OFF)
+cmake_dependent_option(CLI11_SINGLE_FILE_TESTS "Duplicate all the tests for a single file build"
+                       OFF "BUILD_TESTING;CLI11_SINGLE_FILE" OFF)
-cmake_dependent_option(CLI11_INSTALL
-    "Install the CLI11 folder to include during install process" ON
-    "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME" OFF)
+cmake_dependent_option(CLI11_INSTALL "Install the CLI11 folder to include during install process"
+                       ON "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME" OFF)
-cmake_dependent_option(CLI11_FORCE_LIBCXX
-    "Force clang to use libc++ instead of libstdc++ (Linux only)" OFF
-    "${force-libcxx}" OFF)
+cmake_dependent_option(
+  CLI11_FORCE_LIBCXX "Force clang to use libc++ instead of libstdc++ (Linux only)" OFF
+  "${force-libcxx}" OFF)
-cmake_dependent_option(CLI11_CUDA_TESTS
-    "Build the tests with NVCC to check for warnings there - requires CMake 3.9+" OFF
-    "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME" OFF)
+cmake_dependent_option(
+  CLI11_CUDA_TESTS "Build the tests with NVCC to check for warnings there - requires CMake 3.9+"
+  OFF "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME" OFF)
-cmake_dependent_option(CLI11_CLANG_TIDY
-    "Look for and use Clang-Tidy" OFF
-    "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME;NOT CMAKE_VERSION VERSION_LESS 3.6" OFF)
-set(CLI11_CLANG_TIDY_OPTIONS "" CACHE STRING "Clang tidy options, such as -fix, semicolon separated")
+cmake_dependent_option(
+  CLI11_CLANG_TIDY "Look for and use Clang-Tidy" OFF
+  "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME;NOT CMAKE_VERSION VERSION_LESS 3.6" OFF)
+set(CLI11_CLANG_TIDY_OPTIONS
+    ""
+    CACHE STRING "Clang tidy options, such as -fix, semicolon separated")
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND NOT DEFINED CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_STANDARD 11)
+  set(CMAKE_CXX_STANDARD 11)
 endif()
 if(NOT DEFINED CMAKE_CXX_EXTENSIONS)
-    set(CMAKE_CXX_EXTENSIONS OFF)
+  set(CMAKE_CXX_EXTENSIONS OFF)
 endif()
 if(NOT DEFINED CMAKE_CXX_STANDARD_REQUIRED)
-    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
 endif()
-
 # Allow IDE's to group targets into folders
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-    set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+  set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 endif()
 if(CMAKE_VERSION VERSION_LESS 3.10)
-    message(STATUS "CMake 3.10+ adds Doxygen support. Update CMake to build documentation")
+  message(STATUS "CMake 3.10+ adds Doxygen support. Update CMake to build documentation")
 elseif(NOT Doxygen_FOUND)
-    message(STATUS "Doxygen not found, building docs has been disabled")
+  message(STATUS "Doxygen not found, building docs has been disabled")
 endif()
 # Special target that adds warnings. Is not exported.
@@ -135,32 +131,28 @@ set(unix-warnings -Wall -Wextra -pedantic -Wshadow -Wsign-conversion -Wswitch-en
 # Buggy in GCC 4.8
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
-    list(APPEND unix-warnings -Weffc++)
+  list(APPEND unix-warnings -Weffc++)
 endif()
-target_compile_options(CLI11_warnings
-   INTERFACE
-     $<$<BOOL:${CLI11_FORCE_LIBCXX}>:-stdlib=libc++>
-     $<$<CXX_COMPILER_ID:MSVC>:/W4 $<$<BOOL:${CLI11_WARNINGS_AS_ERRORS}>:/WX>>
-     $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:${unix-warnings} $<$<BOOL:${CLI11_WARNINGS_AS_ERRORS}>:-Werror>>)
-
-
- if(NOT CMAKE_VERSION VERSION_LESS 3.13)
-     target_link_options(CLI11_warnings
-         INTERFACE
-         $<$<BOOL:${CLI11_FORCE_LIBCXX}>:-stdlib=libc++>)
- endif()
+target_compile_options(
+  CLI11_warnings
+  INTERFACE $<$<BOOL:${CLI11_FORCE_LIBCXX}>:-stdlib=libc++>
+            $<$<CXX_COMPILER_ID:MSVC>:/W4
+            $<$<BOOL:${CLI11_WARNINGS_AS_ERRORS}>:/WX>>
+            $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:${unix-warnings}
+            $<$<BOOL:${CLI11_WARNINGS_AS_ERRORS}>:-Werror>>)
+if(NOT CMAKE_VERSION VERSION_LESS 3.13)
+  target_link_options(CLI11_warnings INTERFACE $<$<BOOL:${CLI11_FORCE_LIBCXX}>:-stdlib=libc++>)
+endif()
 # Allow IDE's to group targets into folders
 add_library(CLI11 INTERFACE)
 add_library(CLI11::CLI11 ALIAS CLI11) # for add_subdirectory calls
 # Duplicated because CMake adds the current source dir if you don't.
-target_include_directories(CLI11 INTERFACE
-     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-     $<INSTALL_INTERFACE:include>)
-
+target_include_directories(CLI11 INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+                                           $<INSTALL_INTERFACE:include>)
 # To see in IDE, headers must be listed for target
 set(header-patterns "${PROJECT_SOURCE_DIR}/include/CLI/*")
@@ -171,104 +163,96 @@ endif()
 file(GLOB CLI11_headers ${header-patterns})
 # Allow tests to be run on CUDA
- if(CLI11_CUDA_TESTS)
-     enable_language(CUDA)
-
-     # Print out warning and error numbers
-     set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcudafe --display_error_number")
- endif()
+if(CLI11_CUDA_TESTS)
+  enable_language(CUDA)
+  # Print out warning and error numbers
+  set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcudafe --display_error_number")
+endif()
 # Prepare Clang-Tidy
 if(CLI11_CLANG_TIDY)
-    find_program(
-        CLANG_TIDY_EXE
-        NAMES "clang-tidy"
-        DOC "Path to clang-tidy executable"
-        REQUIRED
-        )
-
-    set(DO_CLANG_TIDY "${CLANG_TIDY_EXE}" ${CLI11_CLANG_TIDY_OPTIONS})
-endif()
+  find_program(
+    CLANG_TIDY_EXE
+    NAMES "clang-tidy"
+    DOC "Path to clang-tidy executable" REQUIRED)
+  set(DO_CLANG_TIDY "${CLANG_TIDY_EXE}" ${CLI11_CLANG_TIDY_OPTIONS})
+endif()
 # This folder should be installed
 if(CLI11_INSTALL)
-    install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/"
-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+  install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-    # Make an export target
-    install(TARGETS CLI11 EXPORT CLI11Targets)
+  # Make an export target
+  install(TARGETS CLI11 EXPORT CLI11Targets)
-    # Use find_package on the installed package
-    # Since we have no custom code, we can directly write this
-    # to Config.cmake (otherwise we'd have a custom config and would
-    # import Targets.cmake
+  # Use find_package on the installed package
+  # Since we have no custom code, we can directly write this
+  # to Config.cmake (otherwise we'd have a custom config and would
+  # import Targets.cmake
-    # Add the version in a CMake readable way
-    configure_file("cmake/CLI11ConfigVersion.cmake.in"
-       "CLI11ConfigVersion.cmake" @ONLY)
+  # Add the version in a CMake readable way
+  configure_file("cmake/CLI11ConfigVersion.cmake.in" "CLI11ConfigVersion.cmake" @ONLY)
-    # Make version available in the install
-    install(FILES "${PROJECT_BINARY_DIR}/CLI11ConfigVersion.cmake"
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/CLI11")
+  # Make version available in the install
+  install(FILES "${PROJECT_BINARY_DIR}/CLI11ConfigVersion.cmake"
+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/CLI11")
-    # Install the export target as a file
-    install(EXPORT CLI11Targets
-        FILE CLI11Config.cmake
-        NAMESPACE CLI11::
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/CLI11")
+  # Install the export target as a file
+  install(
+    EXPORT CLI11Targets
+    FILE CLI11Config.cmake
+    NAMESPACE CLI11::
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/CLI11")
-    # Use find_package on the installed package
-    export(TARGETS CLI11
-        NAMESPACE CLI11::
-        FILE CLI11Targets.cmake)
+  # Use find_package on the installed package
+  export(
+    TARGETS CLI11
+    NAMESPACE CLI11::
+    FILE CLI11Targets.cmake)
-    include(cmake/CLI11GeneratePkgConfig.cmake)
+  include(cmake/CLI11GeneratePkgConfig.cmake)
-    # Register in the user cmake package registry
-    export(PACKAGE CLI11)
+  # Register in the user cmake package registry
+  export(PACKAGE CLI11)
 endif()
 if(CLI11_SINGLE_FILE)
-    # Single file test
-    if(CMAKE_VERSION VERSION_LESS 3.12)
-        find_package(PythonInterp REQUIRED)
-        add_executable(Python::Interpreter IMPORTED)
-        set_target_properties(Python::Interpreter
-            PROPERTIES
-            IMPORTED_LOCATION "${PYTHON_EXECUTABLE}"
-            VERSION "${PYTHON_VERSION_STRING}")
-    else()
-        find_package(Python COMPONENTS Interpreter REQUIRED)
-    endif()
-
-    file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include")
-    add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/include/CLI11.hpp"
-        COMMAND Python::Interpreter
-        "${CMAKE_CURRENT_SOURCE_DIR}/scripts/MakeSingleHeader.py"
-        ${CLI11_headers}
-        --main "${CMAKE_CURRENT_SOURCE_DIR}/CLI11.hpp.in"
-        --output "${CMAKE_CURRENT_BINARY_DIR}/include/CLI11.hpp"
-        --version "${CLI11_VERSION}"
-        DEPENDS
-        "${CMAKE_CURRENT_SOURCE_DIR}/include/CLI/CLI.hpp"
-        ${CLI11_headers})
-    add_custom_target(CLI11-generate-single-file ALL
-        DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/include/CLI11.hpp")
-    set_property(TARGET CLI11-generate-single-file PROPERTY FOLDER "Scripts")
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/CLI11.hpp"
-        DESTINATION include)
-    add_library(CLI11_SINGLE INTERFACE)
-    target_link_libraries(CLI11_SINGLE INTERFACE CLI11)
-    add_dependencies(CLI11_SINGLE CLI11-generate-single-file)
-    target_compile_definitions(CLI11_SINGLE INTERFACE -DCLI11_SINGLE_FILE)
-    target_include_directories(CLI11_SINGLE INTERFACE
-        $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include/>
-        $<INSTALL_INTERFACE:include>)
+  # Single file test
+  if(CMAKE_VERSION VERSION_LESS 3.12)
+    find_package(PythonInterp REQUIRED)
+    add_executable(Python::Interpreter IMPORTED)
+    set_target_properties(Python::Interpreter PROPERTIES IMPORTED_LOCATION "${PYTHON_EXECUTABLE}"
+                                                         VERSION "${PYTHON_VERSION_STRING}")
+  else()
+    find_package(
+      Python
+      COMPONENTS Interpreter
+      REQUIRED)
+  endif()
+
+  file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include")
+  add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/include/CLI11.hpp"
+    COMMAND
+      Python::Interpreter "${CMAKE_CURRENT_SOURCE_DIR}/scripts/MakeSingleHeader.py"
+      ${CLI11_headers} --main "${CMAKE_CURRENT_SOURCE_DIR}/CLI11.hpp.in" --output
+      "${CMAKE_CURRENT_BINARY_DIR}/include/CLI11.hpp" --version "${CLI11_VERSION}"
+    DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/include/CLI/CLI.hpp" ${CLI11_headers})
+  add_custom_target(CLI11-generate-single-file ALL
+                    DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/include/CLI11.hpp")
+  set_property(TARGET CLI11-generate-single-file PROPERTY FOLDER "Scripts")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/CLI11.hpp" DESTINATION include)
+  add_library(CLI11_SINGLE INTERFACE)
+  target_link_libraries(CLI11_SINGLE INTERFACE CLI11)
+  add_dependencies(CLI11_SINGLE CLI11-generate-single-file)
+  target_compile_definitions(CLI11_SINGLE INTERFACE -DCLI11_SINGLE_FILE)
+  target_include_directories(
+    CLI11_SINGLE INTERFACE $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include/>
+                           $<INSTALL_INTERFACE:include>)
 endif()
-
 if(CLI11_BUILD_TESTS)
   add_subdirectory(tests)
 endif()
@@ -283,7 +267,7 @@ endif()
 # From a build system, this might not be included.
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/book")
-    add_subdirectory(book)
+  add_subdirectory(book)
 endif()
 # Packaging support
@@ -316,12 +300,10 @@ set(CPACK_SOURCE_IGNORE_FILES
     .swp
     /.all-contributorsrc
     /.appveyor.yml
-    /.pre-commit.*yaml
-)
+    /.pre-commit.*yaml)
 set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "all")
 set(CPACK_DEBIAN_COMPRESSION_TYPE "xz")
 set(CPACK_DEBIAN_PACKAGE_NAME "libcli11-dev")
 include(CPack)
-
@@ -11,4 +11,3 @@ filter=-runtime/references  # Requires fundamental change of API, don&#39;t see need
 filter=-whitespace/blank_line  # Unnecessarily strict with blank lines that otherwise help with readability
 filter=-whitespace/indent  # Requires strange 3-space indent of private/protected/public markers
 filter=-whitespace/parens,-whitespace/braces  # Conflict with clang-format
-
+set(book_sources README.md SUMMARY.md)
-set(
-    book_sources
-    README.md
-    SUMMARY.md
-)
-
-file(GLOB book_chapters RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} chapters/*.md)
+file(
+  GLOB book_chapters
+  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+  chapters/*.md)
 add_custom_target(cli_book SOURCES ${book_sources} ${book_chapters})
-
@@ -64,6 +64,3 @@ CLI11 was developed at the [University of Cincinnati] in support of the [GooFit]
 [University of Cincinnati]: http://www.uc.edu
 [Plumbum]: http://plumbum.readthedocs.io/en/latest/
 [Click]: https://click.palletsprojects.com/
-
-
-
@@ -13,4 +13,3 @@
 * [Toolkits](/chapters/toolkits.md)
 * [Advanced topics](/chapters/advanced-topics.md)
 * [Internals](/chapters/internals.md)
-
@@ -24,4 +24,3 @@ Usage: ./a.out [OPTIONS]
 Options:
   -h,--help                   Print this help message and exit
 ```
-
@@ -72,7 +72,3 @@ Notes:
 * `*1`: This signature depends on whether the call is from a positional or optional.
 * `o` is opt pointer, `p` is true if positional.
-
-
-
-
@@ -41,5 +41,3 @@ The `_process` procedure runs the following steps; each step is recursive and co
 ## Exceptions
 The library immediately returns a C++ exception when it detects a problem, such as an incorrect construction or a malformed command line.
-
-
@@ -266,4 +266,3 @@ There are some additional options that can be specified to modify an option for 
 ## Unusual circumstances
 There are a few cases where some things break down in the type system managing options and definitions.  Using the `add_option` method defines a lambda function to extract a default value if required.  In most cases this either straightforward or a failure is detected automatically and handled.  But in a few cases a streaming template is available that several layers down may not actually be defined.  The conditions in CLI11 cannot detect this circumstance automatically and will result in compile error.  One specific known case is `boost::optional` if the boost optional_io header is included.  This header defines a template for all boost optional values even if they do no actually have a streaming operator.  For example `boost::optional<std::vector>` does not have a streaming operator but one is detected since it is part of a template.  For these cases a secondary method `app->add_option_no_stream(...)` is provided that bypasses this operation completely and should compile in these cases.
-
@@ -60,5 +60,3 @@ And, the protected members that you can set when you make your own are:
 | `int` (`-1`) | `application_index_` | The element this validator applies to (-1 for all) |
 | `bool` (`true`) | `active_` | This can be disabled |
 | `bool` (`false`) | `non_modifying_` | Specify that this is a Validator instead of a Transformer |
-
-
@@ -12,27 +12,21 @@ enable_testing()
 # Quick function to add the base executable
 function(add_cli_exe NAME)
-    add_executable(${NAME} ${NAME}.cpp)
-    target_link_libraries(${NAME} CLI11::CLI11)
+  add_executable(${NAME} ${NAME}.cpp)
+  target_link_libraries(${NAME} CLI11::CLI11)
 endfunction()
-
 add_cli_exe(simplest)
 add_test(NAME simplest COMMAND simplest)
-
 add_cli_exe(intro)
 add_test(NAME intro COMMAND intro)
 add_test(NAME intro_p COMMAND intro -p 5)
-
 add_cli_exe(flags)
 add_test(NAME flags COMMAND flags)
 add_test(NAME flags_bip COMMAND flags -b -i -p)
-
 add_cli_exe(geet)
-add_test(NAME geet_add    COMMAND geet add)
+add_test(NAME geet_add COMMAND geet add)
 add_test(NAME geet_commit COMMAND geet commit -m "Test")
-
-
 configure_file("cmake/CLI11.pc.in" "CLI11.pc" @ONLY)
-install(FILES "${PROJECT_BINARY_DIR}/CLI11.pc"
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-
-
+install(FILES "${PROJECT_BINARY_DIR}/CLI11.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
@@ -69,57 +69,51 @@
 include(CMakeParseArguments)
 # Check prereqs
-find_program( GCOV_PATH gcov )
-find_program( LCOV_PATH  NAMES lcov lcov.bat lcov.exe lcov.perl)
-find_program( GENHTML_PATH NAMES genhtml genhtml.perl genhtml.bat )
-find_program( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/scripts/test)
-find_program( SIMPLE_PYTHON_EXECUTABLE python )
+find_program(GCOV_PATH gcov)
+find_program(LCOV_PATH NAMES lcov lcov.bat lcov.exe lcov.perl)
+find_program(GENHTML_PATH NAMES genhtml genhtml.perl genhtml.bat)
+find_program(GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/scripts/test)
+find_program(SIMPLE_PYTHON_EXECUTABLE python)
 if(NOT GCOV_PATH)
-    message(FATAL_ERROR "gcov not found! Aborting...")
+  message(FATAL_ERROR "gcov not found! Aborting...")
 endif() # NOT GCOV_PATH
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang")
-    if("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 3)
-        message(FATAL_ERROR "Clang version must be 3.0.0 or greater! Aborting...")
-    endif()
+  if("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 3)
+    message(FATAL_ERROR "Clang version must be 3.0.0 or greater! Aborting...")
+  endif()
 elseif(NOT CMAKE_COMPILER_IS_GNUCXX)
-    message(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
+  message(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
 endif()
-set(COVERAGE_COMPILER_FLAGS "-g -O0 --coverage -fprofile-arcs -ftest-coverage -fno-inline -fno-inline-small-functions -fno-default-inline"
+set(COVERAGE_COMPILER_FLAGS
+    "-g -O0 --coverage -fprofile-arcs -ftest-coverage -fno-inline -fno-inline-small-functions -fno-default-inline"
     CACHE INTERNAL "")
 set(CMAKE_CXX_FLAGS_COVERAGE
     ${COVERAGE_COMPILER_FLAGS}
-    CACHE STRING "Flags used by the C++ compiler during coverage builds."
-    FORCE )
+    CACHE STRING "Flags used by the C++ compiler during coverage builds." FORCE)
 set(CMAKE_C_FLAGS_COVERAGE
     ${COVERAGE_COMPILER_FLAGS}
-    CACHE STRING "Flags used by the C compiler during coverage builds."
-    FORCE )
+    CACHE STRING "Flags used by the C compiler during coverage builds." FORCE)
 set(CMAKE_EXE_LINKER_FLAGS_COVERAGE
     ""
-    CACHE STRING "Flags used for linking binaries during coverage builds."
-    FORCE )
+    CACHE STRING "Flags used for linking binaries during coverage builds." FORCE)
 set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE
     ""
-    CACHE STRING "Flags used by the shared libraries linker during coverage builds."
-    FORCE )
-mark_as_advanced(
-    CMAKE_CXX_FLAGS_COVERAGE
-    CMAKE_C_FLAGS_COVERAGE
-    CMAKE_EXE_LINKER_FLAGS_COVERAGE
-    CMAKE_SHARED_LINKER_FLAGS_COVERAGE )
+    CACHE STRING "Flags used by the shared libraries linker during coverage builds." FORCE)
+mark_as_advanced(CMAKE_CXX_FLAGS_COVERAGE CMAKE_C_FLAGS_COVERAGE CMAKE_EXE_LINKER_FLAGS_COVERAGE
+                 CMAKE_SHARED_LINKER_FLAGS_COVERAGE)
 if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-    message(WARNING "Code coverage results with an optimised (non-Debug) build may be misleading")
+  message(WARNING "Code coverage results with an optimised (non-Debug) build may be misleading")
 endif() # NOT CMAKE_BUILD_TYPE STREQUAL "Debug"
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
-    link_libraries(gcov)
+  link_libraries(gcov)
 else()
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage")
 endif()
 # Defines a target for running and collection code coverage information
@@ -134,54 +128,57 @@ endif()
 # )
 function(SETUP_TARGET_FOR_COVERAGE)
-    set(options NONE)
-    set(oneValueArgs NAME)
-    set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
-    cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    if(NOT LCOV_PATH)
-        message(FATAL_ERROR "lcov not found! Aborting...")
-    endif() # NOT LCOV_PATH
-
-    if(NOT GENHTML_PATH)
-        message(FATAL_ERROR "genhtml not found! Aborting...")
-    endif() # NOT GENHTML_PATH
-
-    # Setup target
-    add_custom_target(${Coverage_NAME}
-
-        # Cleanup lcov
-        COMMAND ${LCOV_PATH} --directory . --zerocounters
-        # Create baseline to make sure untouched files show up in the report
-        COMMAND ${LCOV_PATH} -c -i -d . -o ${Coverage_NAME}.base
-
-        # Run tests
-        COMMAND ${Coverage_EXECUTABLE}
-
-        # Capturing lcov counters and generating report
-        COMMAND ${LCOV_PATH} --directory . --capture --output-file ${Coverage_NAME}.info
-        # add baseline counters
-        COMMAND ${LCOV_PATH} -a ${Coverage_NAME}.base -a ${Coverage_NAME}.info --output-file ${Coverage_NAME}.total
-        COMMAND ${LCOV_PATH} --remove ${Coverage_NAME}.total ${COVERAGE_EXCLUDES} --output-file ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned
-        COMMAND ${GENHTML_PATH} -o ${Coverage_NAME} ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned
-        COMMAND ${CMAKE_COMMAND} -E remove ${Coverage_NAME}.base ${Coverage_NAME}.total ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned
-
-        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-        DEPENDS ${Coverage_DEPENDENCIES}
-        COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report."
-    )
-
-    # Show where to find the lcov info report
-    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
-        COMMAND ;
-        COMMENT "Lcov code coverage info report saved in ${Coverage_NAME}.info."
-    )
-
-    # Show info where to find the report
-    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
-        COMMAND ;
-        COMMENT "Open ./${Coverage_NAME}/index.html in your browser to view the coverage report."
-    )
+  set(options NONE)
+  set(oneValueArgs NAME)
+  set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
+  cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  if(NOT LCOV_PATH)
+    message(FATAL_ERROR "lcov not found! Aborting...")
+  endif() # NOT LCOV_PATH
+
+  if(NOT GENHTML_PATH)
+    message(FATAL_ERROR "genhtml not found! Aborting...")
+  endif() # NOT GENHTML_PATH
+
+  # Setup target
+  add_custom_target(
+    ${Coverage_NAME}
+    # Cleanup lcov
+    COMMAND ${LCOV_PATH} --directory . --zerocounters
+    # Create baseline to make sure untouched files show up in the report
+    COMMAND ${LCOV_PATH} -c -i -d . -o ${Coverage_NAME}.base
+    # Run tests
+    COMMAND ${Coverage_EXECUTABLE}
+    # Capturing lcov counters and generating report
+    COMMAND ${LCOV_PATH} --directory . --capture --output-file ${Coverage_NAME}.info
+    # add baseline counters
+    COMMAND ${LCOV_PATH} -a ${Coverage_NAME}.base -a ${Coverage_NAME}.info --output-file
+            ${Coverage_NAME}.total
+    COMMAND ${LCOV_PATH} --remove ${Coverage_NAME}.total ${COVERAGE_EXCLUDES} --output-file
+            ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned
+    COMMAND ${GENHTML_PATH} -o ${Coverage_NAME} ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned
+    COMMAND ${CMAKE_COMMAND} -E remove ${Coverage_NAME}.base ${Coverage_NAME}.total
+            ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+    DEPENDS ${Coverage_DEPENDENCIES}
+    COMMENT
+      "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report."
+  )
+
+  # Show where to find the lcov info report
+  add_custom_command(
+    TARGET ${Coverage_NAME}
+    POST_BUILD
+    COMMAND ;
+    COMMENT "Lcov code coverage info report saved in ${Coverage_NAME}.info.")
+
+  # Show info where to find the report
+  add_custom_command(
+    TARGET ${Coverage_NAME}
+    POST_BUILD
+    COMMAND ;
+    COMMENT "Open ./${Coverage_NAME}/index.html in your browser to view the coverage report.")
 endfunction() # SETUP_TARGET_FOR_COVERAGE
@@ -197,48 +194,50 @@ endfunction() # SETUP_TARGET_FOR_COVERAGE
 # )
 function(SETUP_TARGET_FOR_COVERAGE_COBERTURA)
-    set(options NONE)
-    set(oneValueArgs NAME)
-    set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
-    cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    if(NOT SIMPLE_PYTHON_EXECUTABLE)
-        message(FATAL_ERROR "python not found! Aborting...")
-    endif() # NOT SIMPLE_PYTHON_EXECUTABLE
-
-    if(NOT GCOVR_PATH)
-        message(FATAL_ERROR "gcovr not found! Aborting...")
-    endif() # NOT GCOVR_PATH
-
-    # Combine excludes to several -e arguments
-    set(COBERTURA_EXCLUDES "")
-    foreach(EXCLUDE ${COVERAGE_EXCLUDES})
-        set(COBERTURA_EXCLUDES "-e ${EXCLUDE} ${COBERTURA_EXCLUDES}")
-    endforeach()
-
-    add_custom_target(${Coverage_NAME}
-
-        # Run tests
-        ${Coverage_EXECUTABLE}
-
-        # Running gcovr
-        COMMAND ${GCOVR_PATH} -x -r ${CMAKE_SOURCE_DIR} ${COBERTURA_EXCLUDES}
-            -o ${Coverage_NAME}.xml
-        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-        DEPENDS ${Coverage_DEPENDENCIES}
-        COMMENT "Running gcovr to produce Cobertura code coverage report."
-    )
-
-    # Show info where to find the report
-    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
-        COMMAND ;
-        COMMENT "Cobertura code coverage report saved in ${Coverage_NAME}.xml."
-    )
+  set(options NONE)
+  set(oneValueArgs NAME)
+  set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
+  cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  if(NOT SIMPLE_PYTHON_EXECUTABLE)
+    message(FATAL_ERROR "python not found! Aborting...")
+  endif() # NOT SIMPLE_PYTHON_EXECUTABLE
+
+  if(NOT GCOVR_PATH)
+    message(FATAL_ERROR "gcovr not found! Aborting...")
+  endif() # NOT GCOVR_PATH
+
+  # Combine excludes to several -e arguments
+  set(COBERTURA_EXCLUDES "")
+  foreach(EXCLUDE ${COVERAGE_EXCLUDES})
+    set(COBERTURA_EXCLUDES "-e ${EXCLUDE} ${COBERTURA_EXCLUDES}")
+  endforeach()
+
+  add_custom_target(
+    ${Coverage_NAME}
+    # Run tests
+    ${Coverage_EXECUTABLE}
+    # Running gcovr
+    COMMAND ${GCOVR_PATH} -x -r ${CMAKE_SOURCE_DIR} ${COBERTURA_EXCLUDES} -o ${Coverage_NAME}.xml
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+    DEPENDS ${Coverage_DEPENDENCIES}
+    COMMENT "Running gcovr to produce Cobertura code coverage report.")
+
+  # Show info where to find the report
+  add_custom_command(
+    TARGET ${Coverage_NAME}
+    POST_BUILD
+    COMMAND ;
+    COMMENT "Cobertura code coverage report saved in ${Coverage_NAME}.xml.")
 endfunction() # SETUP_TARGET_FOR_COVERAGE_COBERTURA
 function(APPEND_COVERAGE_COMPILER_FLAGS)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
-    message(STATUS "Appending code coverage compiler flags: ${COVERAGE_COMPILER_FLAGS}")
+  set(CMAKE_C_FLAGS
+      "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}"
+      PARENT_SCOPE)
+  set(CMAKE_CXX_FLAGS
+      "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}"
+      PARENT_SCOPE)
+  message(STATUS "Appending code coverage compiler flags: ${COVERAGE_COMPILER_FLAGS}")
 endfunction() # APPEND_COVERAGE_COMPILER_FLAGS
@@ -2,17 +2,10 @@ set(DOXYGEN_EXTRACT_ALL YES)
 set(DOXYGEN_BUILTIN_STL_SUPPORT YES)
 set(PROJECT_BRIEF "C++11 Command Line Interface Parser")
-file(GLOB DOC_LIST
-    RELATIVE "${PROJECT_SOURCE_DIR}/include"
-    "${PROJECT_SOURCE_DIR}/include/CLI/*.hpp"
-    )
-
-doxygen_add_docs(docs
-    ${DOC_LIST}
-    "${CMAKE_CURRENT_SOURCE_DIR}/mainpage.md"
-    WORKING_DIRECTORY
-    "${PROJECT_SOURCE_DIR}/include"
-)
-
-
+file(
+  GLOB DOC_LIST
+  RELATIVE "${PROJECT_SOURCE_DIR}/include"
+  "${PROJECT_SOURCE_DIR}/include/CLI/*.hpp")
+doxygen_add_docs(docs ${DOC_LIST} "${CMAKE_CURRENT_SOURCE_DIR}/mainpage.md"
+                 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/include")
@@ -21,6 +21,3 @@ Groups of related topics:
 |----------------------|------------------------------------------------|
 | @ref error_group     | Errors that can be thrown                      |
 | @ref validator_group | Common validators used in CLI::Option::check() |
-
-
-
-
 function(add_cli_exe T)
-    add_executable(${T} ${ARGN} ${CLI11_headers})
-    target_link_libraries(${T} PUBLIC CLI11)
-    set_property(TARGET ${T} PROPERTY FOLDER "Examples")
-    if(CLI11_FORCE_LIBCXX)
-        set_property(TARGET ${T} APPEND_STRING PROPERTY LINK_FLAGS -stdlib=libc++)
-    endif()
-    if(CLI11_CLANG_TIDY)
-        set_property(TARGET ${T} PROPERTY CXX_CLANG_TIDY "${DO_CLANG_TIDY}")
-    endif()
+  add_executable(${T} ${ARGN} ${CLI11_headers})
+  target_link_libraries(${T} PUBLIC CLI11)
+  set_property(TARGET ${T} PROPERTY FOLDER "Examples")
+  if(CLI11_FORCE_LIBCXX)
+    set_property(
+      TARGET ${T}
+      APPEND_STRING
+      PROPERTY LINK_FLAGS -stdlib=libc++)
+  endif()
+  if(CLI11_CLANG_TIDY)
+    set_property(TARGET ${T} PROPERTY CXX_CLANG_TIDY "${DO_CLANG_TIDY}")
+  endif()
 endfunction()
 if(CLI11_BUILD_EXAMPLES_JSON)
-    message(STATUS "Using nlohmann/json")
-    FetchContent_Declare(json
-        URL https://github.com/nlohmann/json/releases/download/v3.7.3/include.zip
-        URL_HASH "SHA256=87b5884741427220d3a33df1363ae0e8b898099fbc59f1c451113f6732891014"
-    )
-
-    FetchContent_GetProperties(json)
-    if (NOT json_POPULATED)
-        FetchContent_Populate(json)
-    endif()
-
-    add_cli_exe(json json.cpp)
-    target_include_directories(json PUBLIC SYSTEM "${json_SOURCE_DIR}/single_include")
-
-    add_test(NAME json_config_out COMMAND json --item 2)
-    set_property(TEST json_config_out PROPERTY PASS_REGULAR_EXPRESSION
-        [[{]]
-        [["item": "2"]]
-        [["simple": false]]
-        [[}]]
-        )
-
-    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/input.json" [=[{"item":3,"simple":false}]=])
-    add_test(NAME json_config_in COMMAND json --config "${CMAKE_CURRENT_BINARY_DIR}/input.json")
-    set_property(TEST json_config_in PROPERTY PASS_REGULAR_EXPRESSION
-        [[{]]
-        [["item": "3"]]
-        [["simple": false]]
-        [[}]]
-)
+  message(STATUS "Using nlohmann/json")
+  FetchContent_Declare(
+    json
+    URL https://github.com/nlohmann/json/releases/download/v3.7.3/include.zip
+    URL_HASH "SHA256=87b5884741427220d3a33df1363ae0e8b898099fbc59f1c451113f6732891014")
+
+  FetchContent_GetProperties(json)
+  if(NOT json_POPULATED)
+    FetchContent_Populate(json)
+  endif()
+
+  add_cli_exe(json json.cpp)
+  target_include_directories(json PUBLIC SYSTEM "${json_SOURCE_DIR}/single_include")
+
+  add_test(NAME json_config_out COMMAND json --item 2)
+  set_property(TEST json_config_out PROPERTY PASS_REGULAR_EXPRESSION [[{]] [["item": "2"]]
+                                             [["simple": false]] [[}]])
+
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/input.json" [=[{"item":3,"simple":false}]=])
+  add_test(NAME json_config_in COMMAND json --config "${CMAKE_CURRENT_BINARY_DIR}/input.json")
+  set_property(TEST json_config_in PROPERTY PASS_REGULAR_EXPRESSION [[{]] [["item": "3"]]
+                                            [["simple": false]] [[}]])
 endif()
-
 add_cli_exe(simple simple.cpp)
 add_test(NAME simple_basic COMMAND simple)
 add_test(NAME simple_all COMMAND simple -f filename.txt -c 12 --flag --flag -d 1.2)
-set_property(TEST simple_all PROPERTY PASS_REGULAR_EXPRESSION
-    "Working on file: filename.txt, direct count: 1, opt count: 1"
-    "Working on count: 12, direct count: 1, opt count: 1"
-    "Received flag: 2 (2) times"
-    "Some value: 1.2")
+set_property(
+  TEST simple_all
+  PROPERTY PASS_REGULAR_EXPRESSION "Working on file: filename.txt, direct count: 1, opt count: 1"
+           "Working on count: 12, direct count: 1, opt count: 1" "Received flag: 2 (2) times"
+           "Some value: 1.2")
 add_test(NAME simple_version COMMAND simple --version)
-set_property(TEST simple_version PROPERTY PASS_REGULAR_EXPRESSION
-    "${CLI11_VERSION}")
+set_property(TEST simple_version PROPERTY PASS_REGULAR_EXPRESSION "${CLI11_VERSION}")
 add_cli_exe(subcommands subcommands.cpp)
 add_test(NAME subcommands_none COMMAND subcommands)
-set_property(TEST subcommands_none PROPERTY
-    PASS_REGULAR_EXPRESSION "A subcommand is required")
-add_test(NAME subcommands_all COMMAND subcommands --random start --file name stop --count)
-set_property(TEST subcommands_all PROPERTY PASS_REGULAR_EXPRESSION
-    "Working on --file from start: name"
-    "Working on --count from stop: 1, direct count: 1"
-    "Count of --random flag: 1"
-    "Subcommand: start"
-    "Subcommand: stop")
+set_property(TEST subcommands_none PROPERTY PASS_REGULAR_EXPRESSION "A subcommand is required")
+add_test(
+  NAME subcommands_all
+  COMMAND subcommands --random start --file
+  name stop --count)
+set_property(
+  TEST subcommands_all
+  PROPERTY PASS_REGULAR_EXPRESSION "Working on --file from start: name"
+           "Working on --count from stop: 1, direct count: 1" "Count of --random flag: 1"
+           "Subcommand: start" "Subcommand: stop")
 add_cli_exe(subcom_partitioned subcom_partitioned.cpp)
 add_test(NAME subcom_partitioned_none COMMAND subcom_partitioned)
-set_property(TEST subcom_partitioned_none PROPERTY PASS_REGULAR_EXPRESSION
-    "This is a timer:"
-    "--file is required"
-    "Run with --help for more information.")
+set_property(
+  TEST subcom_partitioned_none
+  PROPERTY PASS_REGULAR_EXPRESSION "This is a timer:" "--file is required"
+           "Run with --help for more information.")
 add_test(NAME subcom_partitioned_all COMMAND subcom_partitioned --file this --count --count -d 1.2)
-set_property(TEST subcom_partitioned_all PROPERTY PASS_REGULAR_EXPRESSION
-    "This is a timer:"
-    "Working on file: this, direct count: 1, opt count: 1"
-    "Working on count: 2, direct count: 2, opt count: 2"
-    "Some value: 1.2")
-    # test shows that the help prints out for unnamed subcommands
+set_property(
+  TEST subcom_partitioned_all
+  PROPERTY PASS_REGULAR_EXPRESSION "This is a timer:"
+           "Working on file: this, direct count: 1, opt count: 1"
+           "Working on count: 2, direct count: 2, opt count: 2" "Some value: 1.2")
+# test shows that the help prints out for unnamed subcommands
 add_test(NAME subcom_partitioned_help COMMAND subcom_partitioned --help)
 set_property(TEST subcom_partitioned_help PROPERTY PASS_REGULAR_EXPRESSION
-    "-f,--file TEXT REQUIRED"
-    "-d,--double FLOAT")
+                                                   "-f,--file TEXT REQUIRED" "-d,--double FLOAT")
 add_cli_exe(option_groups option_groups.cpp)
-add_test(NAME option_groups_missing COMMAND option_groups )
-set_property(TEST option_groups_missing PROPERTY PASS_REGULAR_EXPRESSION
-    "Exactly 1 option from"
-    "is required")
+add_test(NAME option_groups_missing COMMAND option_groups)
+set_property(TEST option_groups_missing PROPERTY PASS_REGULAR_EXPRESSION "Exactly 1 option from"
+                                                 "is required")
 add_test(NAME option_groups_extra COMMAND option_groups --csv --binary)
-set_property(TEST option_groups_extra PROPERTY PASS_REGULAR_EXPRESSION
-    "and 2 were given")
-add_test(NAME option_groups_extra2 COMMAND option_groups --csv --address "192.168.1.1" -o "test.out")
-set_property(TEST option_groups_extra2 PROPERTY PASS_REGULAR_EXPRESSION
-    "at most 1")
+set_property(TEST option_groups_extra PROPERTY PASS_REGULAR_EXPRESSION "and 2 were given")
+add_test(NAME option_groups_extra2 COMMAND option_groups --csv --address "192.168.1.1" -o
+                                           "test.out")
+set_property(TEST option_groups_extra2 PROPERTY PASS_REGULAR_EXPRESSION "at most 1")
 add_cli_exe(positional_arity positional_arity.cpp)
-add_test(NAME positional_arity1 COMMAND positional_arity one )
-set_property(TEST positional_arity1 PROPERTY PASS_REGULAR_EXPRESSION
-    "File 1 = one")
-add_test(NAME positional_arity2 COMMAND positional_arity one two )
-set_property(TEST positional_arity2 PROPERTY PASS_REGULAR_EXPRESSION
-    "File 1 = one"
-    "File 2 = two")
+add_test(NAME positional_arity1 COMMAND positional_arity one)
+set_property(TEST positional_arity1 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one")
+add_test(NAME positional_arity2 COMMAND positional_arity one two)
+set_property(TEST positional_arity2 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one" "File 2 = two")
 add_test(NAME positional_arity3 COMMAND positional_arity 1 2 one)
-set_property(TEST positional_arity3 PROPERTY PASS_REGULAR_EXPRESSION
-    "File 1 = one")
+set_property(TEST positional_arity3 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one")
 add_test(NAME positional_arity_fail COMMAND positional_arity 1 one two)
-set_property(TEST positional_arity_fail PROPERTY PASS_REGULAR_EXPRESSION
-    "Could not convert")
-
-    add_cli_exe(positional_validation positional_validation.cpp)
-add_test(NAME positional_validation1 COMMAND positional_validation one )
-set_property(TEST positional_validation1 PROPERTY PASS_REGULAR_EXPRESSION
-    "File 1 = one")
-add_test(NAME positional_validation2 COMMAND positional_validation one 1 2 two )
-set_property(TEST positional_validation2 PROPERTY PASS_REGULAR_EXPRESSION
-    "File 1 = one"
-    "File 2 = two")
+set_property(TEST positional_arity_fail PROPERTY PASS_REGULAR_EXPRESSION "Could not convert")
+
+add_cli_exe(positional_validation positional_validation.cpp)
+add_test(NAME positional_validation1 COMMAND positional_validation one)
+set_property(TEST positional_validation1 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one")
+add_test(NAME positional_validation2 COMMAND positional_validation one 1 2 two)
+set_property(TEST positional_validation2 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one"
+                                                  "File 2 = two")
 add_test(NAME positional_validation3 COMMAND positional_validation 1 2 one)
-set_property(TEST positional_validation3 PROPERTY PASS_REGULAR_EXPRESSION
-    "File 1 = one")
+set_property(TEST positional_validation3 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one")
 add_test(NAME positional_validation4 COMMAND positional_validation 1 one two 2)
-set_property(TEST positional_validation4 PROPERTY PASS_REGULAR_EXPRESSION
-     "File 1 = one"
-    "File 2 = two")
+set_property(TEST positional_validation4 PROPERTY PASS_REGULAR_EXPRESSION "File 1 = one"
+                                                  "File 2 = two")
 add_cli_exe(shapes shapes.cpp)
-add_test(NAME shapes_all COMMAND shapes circle 4.4 circle 10.7 rectangle 4 4 circle 2.3 triangle 4.5 ++ rectangle 2.1 ++ circle 234.675)
-set_property(TEST shapes_all PROPERTY PASS_REGULAR_EXPRESSION
-    "circle2"
-    "circle4"
-    "rectangle2 with edges [2.1,2.1]"
-    "triangel1 with sides [4.5]")
+add_test(NAME shapes_all COMMAND shapes circle 4.4 circle 10.7 rectangle 4 4 circle 2.3 triangle
+                                 4.5 ++ rectangle 2.1 ++ circle 234.675)
+set_property(
+  TEST shapes_all PROPERTY PASS_REGULAR_EXPRESSION "circle2" "circle4"
+                           "rectangle2 with edges [2.1,2.1]" "triangel1 with sides [4.5]")
 add_cli_exe(ranges ranges.cpp)
 add_test(NAME ranges_range COMMAND ranges --range 1 2 3)
-set_property(TEST ranges_range PROPERTY PASS_REGULAR_EXPRESSION
-    "[2:1:3]")
+set_property(TEST ranges_range PROPERTY PASS_REGULAR_EXPRESSION "[2:1:3]")
 add_test(NAME ranges_minmax COMMAND ranges --min 2 --max 3)
-set_property(TEST ranges_minmax PROPERTY PASS_REGULAR_EXPRESSION
-    "[2:1:3]")
+set_property(TEST ranges_minmax PROPERTY PASS_REGULAR_EXPRESSION "[2:1:3]")
 add_test(NAME ranges_error COMMAND ranges --min 2 --max 3 --step 1 --range 1 2 3)
-set_property(TEST ranges_error PROPERTY PASS_REGULAR_EXPRESSION
-    "Exactly 1 option from")
+set_property(TEST ranges_error PROPERTY PASS_REGULAR_EXPRESSION "Exactly 1 option from")
 add_cli_exe(validators validators.cpp)
 add_test(NAME validators_help COMMAND validators --help)
-set_property(TEST validators_help PROPERTY PASS_REGULAR_EXPRESSION
-    "  -f,--file TEXT:FILE[\\r\\n\\t ]+File name"
-    "  -v,--value INT:INT in [3 - 6][\\r\\n\\t ]+Value in range")
+set_property(
+  TEST validators_help
+  PROPERTY PASS_REGULAR_EXPRESSION "  -f,--file TEXT:FILE[\\r\\n\\t ]+File name"
+           "  -v,--value INT:INT in [3 - 6][\\r\\n\\t ]+Value in range")
 add_test(NAME validators_file COMMAND validators --file nonex.xxx)
-set_property(TEST validators_file PROPERTY PASS_REGULAR_EXPRESSION
-    "--file: File does not exist: nonex.xxx"
-    "Run with --help for more information.")
+set_property(
+  TEST validators_file PROPERTY PASS_REGULAR_EXPRESSION "--file: File does not exist: nonex.xxx"
+                                "Run with --help for more information.")
 add_test(NAME validators_plain COMMAND validators --value 9)
-set_property(TEST validators_plain PROPERTY PASS_REGULAR_EXPRESSION
-    "--value: Value 9 not in range 3 to 6"
-    "Run with --help for more information.")
+set_property(
+  TEST validators_plain PROPERTY PASS_REGULAR_EXPRESSION "--value: Value 9 not in range 3 to 6"
+                                 "Run with --help for more information.")
 add_cli_exe(groups groups.cpp)
 add_test(NAME groups_none COMMAND groups)
-set_property(TEST groups_none PROPERTY PASS_REGULAR_EXPRESSION
-    "This is a timer:"
-    "--file is required"
-    "Run with --help for more information.")
+set_property(
+  TEST groups_none PROPERTY PASS_REGULAR_EXPRESSION "This is a timer:" "--file is required"
+                            "Run with --help for more information.")
 add_test(NAME groups_all COMMAND groups --file this --count --count -d 1.2)
-set_property(TEST groups_all PROPERTY PASS_REGULAR_EXPRESSION
-    "This is a timer:"
-    "Working on file: this, direct count: 1, opt count: 1"
-    "Working on count: 2, direct count: 2, opt count: 2"
-    "Some value: 1.2")
+set_property(
+  TEST groups_all
+  PROPERTY PASS_REGULAR_EXPRESSION "This is a timer:"
+           "Working on file: this, direct count: 1, opt count: 1"
+           "Working on count: 2, direct count: 2, opt count: 2" "Some value: 1.2")
 add_cli_exe(inter_argument_order inter_argument_order.cpp)
-add_test(NAME inter_argument_order COMMAND inter_argument_order --foo 1 2 3 --x --bar 4 5 6 --z --foo 7 8)
-set_property(TEST inter_argument_order PROPERTY PASS_REGULAR_EXPRESSION
+add_test(NAME inter_argument_order COMMAND inter_argument_order --foo 1 2 3 --x --bar 4 5 6 --z
+                                           --foo 7 8)
+set_property(
+  TEST inter_argument_order
+  PROPERTY
+    PASS_REGULAR_EXPRESSION
     [=[foo : 1
 foo : 2
 foo : 3
@@ -192,44 +173,37 @@ foo : 8]=])
 add_cli_exe(prefix_command prefix_command.cpp)
 add_test(NAME prefix_command COMMAND prefix_command -v 3 2 1 -- other one two 3)
-set_property(TEST prefix_command PROPERTY PASS_REGULAR_EXPRESSION
-    "Prefix: 3 : 2 : 1"
-    "Remaining commands: other one two 3")
+set_property(TEST prefix_command PROPERTY PASS_REGULAR_EXPRESSION "Prefix: 3 : 2 : 1"
+                                          "Remaining commands: other one two 3")
 add_cli_exe(callback_passthrough callback_passthrough.cpp)
 add_test(NAME callback_passthrough1 COMMAND callback_passthrough --argname t2 --t2 test)
-set_property(TEST callback_passthrough1 PROPERTY PASS_REGULAR_EXPRESSION
-    "the value is now test")
+set_property(TEST callback_passthrough1 PROPERTY PASS_REGULAR_EXPRESSION "the value is now test")
 add_test(NAME callback_passthrough2 COMMAND callback_passthrough --arg EEEK --argname arg)
-set_property(TEST callback_passthrough2 PROPERTY PASS_REGULAR_EXPRESSION
-    "the value is now EEEK")
+set_property(TEST callback_passthrough2 PROPERTY PASS_REGULAR_EXPRESSION "the value is now EEEK")
 add_cli_exe(enum enum.cpp)
 add_test(NAME enum_pass COMMAND enum -l 1)
 add_test(NAME enum_fail COMMAND enum -l 4)
-set_property(TEST enum_fail PROPERTY PASS_REGULAR_EXPRESSION
-    "--level: Check 4 value in {" "FAILED")
+set_property(TEST enum_fail PROPERTY PASS_REGULAR_EXPRESSION "--level: Check 4 value in {"
+                                     "FAILED")
 add_cli_exe(enum_ostream enum_ostream.cpp)
 add_test(NAME enum_ostream_pass COMMAND enum_ostream --level medium)
-set_property(TEST enum_ostream_pass PROPERTY PASS_REGULAR_EXPRESSION
-    "Enum received: Medium")
+set_property(TEST enum_ostream_pass PROPERTY PASS_REGULAR_EXPRESSION "Enum received: Medium")
 add_cli_exe(digit_args digit_args.cpp)
 add_test(NAME digit_args COMMAND digit_args -h)
-set_property(TEST digit_args PROPERTY PASS_REGULAR_EXPRESSION
-    "-3{3}")
+set_property(TEST digit_args PROPERTY PASS_REGULAR_EXPRESSION "-3{3}")
 add_cli_exe(modhelp modhelp.cpp)
 add_test(NAME modhelp COMMAND modhelp -a test -h)
-set_property(TEST modhelp PROPERTY PASS_REGULAR_EXPRESSION
-    "Option -a string in help: test")
+set_property(TEST modhelp PROPERTY PASS_REGULAR_EXPRESSION "Option -a string in help: test")
 add_subdirectory(subcom_in_files)
 add_test(NAME subcom_in_files COMMAND subcommand_main subcommand_a -f this.txt --with-foo)
-set_property(TEST subcom_in_files PROPERTY PASS_REGULAR_EXPRESSION
-    "Working on file: this\.txt"
-    "Using foo!")
+set_property(TEST subcom_in_files PROPERTY PASS_REGULAR_EXPRESSION "Working on file: this\.txt"
+                                           "Using foo!")
 add_cli_exe(formatter formatter.cpp)
@@ -245,14 +219,10 @@ add_test(NAME retired_retired_test2 COMMAND retired --retired_option 567)
 add_test(NAME retired_retired_test3 COMMAND retired --retired_option2 567 689 789)
 add_test(NAME retired_deprecated COMMAND retired --deprecate 19 20)
-set_property(TEST retired_retired_test PROPERTY PASS_REGULAR_EXPRESSION
-    "WARNING.*retired")
+set_property(TEST retired_retired_test PROPERTY PASS_REGULAR_EXPRESSION "WARNING.*retired")
-set_property(TEST retired_retired_test2 PROPERTY PASS_REGULAR_EXPRESSION
-    "WARNING.*retired")
+set_property(TEST retired_retired_test2 PROPERTY PASS_REGULAR_EXPRESSION "WARNING.*retired")
-set_property(TEST retired_retired_test3 PROPERTY PASS_REGULAR_EXPRESSION
-    "WARNING.*retired")
+set_property(TEST retired_retired_test3 PROPERTY PASS_REGULAR_EXPRESSION "WARNING.*retired")
-set_property(TEST retired_deprecated PROPERTY PASS_REGULAR_EXPRESSION
-    "deprecated.*not_deprecated")
+set_property(TEST retired_deprecated PROPERTY PASS_REGULAR_EXPRESSION "deprecated.*not_deprecated")
 list(APPEND CMAKE_MODULE_PATH "${CLI11_SOURCE_DIR}/cmake")
 if(CLI11_SANITIZERS)
-    message(STATUS "Using arsenm/sanitizers-cmake")
-    FetchContent_Declare(sanitizers
-        GIT_REPOSITORY https://github.com/arsenm/sanitizers-cmake.git
-        GIT_SHALLOW 1
-        GIT_TAG 99e159e)
+  message(STATUS "Using arsenm/sanitizers-cmake")
+  FetchContent_Declare(
+    sanitizers
+    GIT_REPOSITORY https://github.com/arsenm/sanitizers-cmake.git
+    GIT_SHALLOW 1
+    GIT_TAG 99e159e)
-    FetchContent_GetProperties(sanitizers)
+  FetchContent_GetProperties(sanitizers)
-    if (NOT sanitizers_POPULATED)
-        FetchContent_Populate(sanitizers)
-    endif()
+  if(NOT sanitizers_POPULATED)
+    FetchContent_Populate(sanitizers)
+  endif()
-    list(APPEND CMAKE_MODULE_PATH "${sanitizers_SOURCE_DIR}/cmake")
+  list(APPEND CMAKE_MODULE_PATH "${sanitizers_SOURCE_DIR}/cmake")
-    find_package(Sanitizers)
-    if(SANITIZE_ADDRESS)
-        message(STATUS "You might want to use \"${ASan_WRAPPER}\" to run your program")
-    endif()
+  find_package(Sanitizers)
+  if(SANITIZE_ADDRESS)
+    message(STATUS "You might want to use \"${ASan_WRAPPER}\" to run your program")
+  endif()
 else()
-    macro(add_sanitizers)
-    endmacro()
-endif()
+  macro(add_sanitizers)
+  endmacro()
+endif()
 # Add boost to test boost::optional (currently explicitly requested)"
 option(CLI11_BOOST "Turn on boost test (currently may fail with Boost 1.70)" OFF)
 if(CLI11_BOOST)
-    find_package(Boost 1.61 REQUIRED)
+  find_package(Boost 1.61 REQUIRED)
 endif()
 set(boost-optional-def $<$<BOOL:${Boost_FOUND}>:CLI11_BOOST_OPTIONAL>)
@@ -50,15 +51,14 @@ set(CLI11_TESTS
     StringParseTest
     ComplexTypeTest
     TrueFalseTest
-    OptionGroupTest
-    )
+    OptionGroupTest)
 if(WIN32)
-    list(APPEND CLI11_TESTS WindowsTest)
+  list(APPEND CLI11_TESTS WindowsTest)
 endif()
-if (Boost_FOUND)
-   list(APPEND CLI11_TESTS BoostOptionTypeTest)
+if(Boost_FOUND)
+  list(APPEND CLI11_TESTS BoostOptionTypeTest)
 endif()
 set(CLI11_MULTIONLY_TESTS TimerTest)
@@ -71,67 +71,63 @@ target_include_directories(catch_main PUBLIC &quot;${CMAKE_CURRENT_SOURCE_DIR}&quot;)
 # requires newer CMake.
 set(url https://github.com/philsquared/Catch/releases/download/v2.13.4/catch.hpp)
-file(DOWNLOAD ${url} "${CMAKE_CURRENT_BINARY_DIR}/catch.hpp" STATUS status EXPECTED_HASH SHA256=6e0fa3dd160891a01c1f3b34e8bcd6e0140abe08eca022e390027f27dec2050b)
+file(
+  DOWNLOAD ${url} "${CMAKE_CURRENT_BINARY_DIR}/catch.hpp"
+  STATUS status
+  EXPECTED_HASH SHA256=6e0fa3dd160891a01c1f3b34e8bcd6e0140abe08eca022e390027f27dec2050b)
 list(GET status 0 error)
 if(error)
-    message(FATAL_ERROR "Could not download ${url}")
+  message(FATAL_ERROR "Could not download ${url}")
 endif()
 target_include_directories(catch_main PUBLIC "${CMAKE_CURRENT_BINARY_DIR}")
 # Target must already exist
 macro(add_catch_test TESTNAME)
-    target_link_libraries(${TESTNAME} PUBLIC catch_main)
-
-    add_test(${TESTNAME} ${TESTNAME})
-    set_target_properties(${TESTNAME} PROPERTIES FOLDER "Tests")
-    if (CLI11_FORCE_LIBCXX)
-       set_property(TARGET ${T} APPEND_STRING
-         PROPERTY LINK_FLAGS -stdlib=libc++)
-     endif()
+  target_link_libraries(${TESTNAME} PUBLIC catch_main)
+
+  add_test(${TESTNAME} ${TESTNAME})
+  set_target_properties(${TESTNAME} PROPERTIES FOLDER "Tests")
+  if(CLI11_FORCE_LIBCXX)
+    set_property(
+      TARGET ${T}
+      APPEND_STRING
+      PROPERTY LINK_FLAGS -stdlib=libc++)
+  endif()
 endmacro()
 foreach(T IN LISTS CLI11_TESTS)
-    if(CLI11_CUDA_TESTS)
-        set_property(
-            SOURCE ${T}.cpp
-            PROPERTY LANGUAGE CUDA
-            )
-    endif()
-    add_executable(${T} ${T}.cpp ${CLI11_headers})
-    add_sanitizers(${T})
-    if(NOT CLI11_CUDA_TESTS)
-        target_link_libraries(${T} PRIVATE CLI11_warnings)
-    endif()
-    target_link_libraries(${T} PRIVATE CLI11)
-    add_catch_test(${T})
-
-    if(CLI11_SINGLE_FILE AND CLI11_SINGLE_FILE_TESTS)
-        add_executable(${T}_Single ${T}.cpp)
-        target_link_libraries(${T}_Single PRIVATE CLI11_SINGLE)
-        add_catch_test(${T}_Single)
-        set_property(TARGET ${T}_Single PROPERTY FOLDER "Tests Single File")
-    endif()
+  if(CLI11_CUDA_TESTS)
+    set_property(SOURCE ${T}.cpp PROPERTY LANGUAGE CUDA)
+  endif()
+  add_executable(${T} ${T}.cpp ${CLI11_headers})
+  add_sanitizers(${T})
+  if(NOT CLI11_CUDA_TESTS)
+    target_link_libraries(${T} PRIVATE CLI11_warnings)
+  endif()
+  target_link_libraries(${T} PRIVATE CLI11)
+  add_catch_test(${T})
+
+  if(CLI11_SINGLE_FILE AND CLI11_SINGLE_FILE_TESTS)
+    add_executable(${T}_Single ${T}.cpp)
+    target_link_libraries(${T}_Single PRIVATE CLI11_SINGLE)
+    add_catch_test(${T}_Single)
+    set_property(TARGET ${T}_Single PROPERTY FOLDER "Tests Single File")
+  endif()
 endforeach()
 foreach(T IN LISTS CLI11_MULTIONLY_TESTS)
-    add_executable(${T} ${T}.cpp ${CLI11_headers})
-    add_sanitizers(${T})
-    target_link_libraries(${T} PUBLIC CLI11)
-    add_catch_test(${T})
+  add_executable(${T} ${T}.cpp ${CLI11_headers})
+  add_sanitizers(${T})
+  target_link_libraries(${T} PUBLIC CLI11)
+  add_catch_test(${T})
 endforeach()
 # Add -Wno-deprecated-declarations to DeprecatedTest
-set(no-deprecated-declarations
-    $<$<CXX_COMPILER_ID:MSVC>:/wd4996>
-    $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-deprecated-declarations>
-    )
-target_compile_options(DeprecatedTest
-    PRIVATE
-    ${no-deprecated-declarations})
-if (TARGET DeprecatedTest_Single)
-    target_compile_options(DeprecatedTest_Single
-        PRIVATE
-        ${no-deprecated-declarations})
+set(no-deprecated-declarations $<$<CXX_COMPILER_ID:MSVC>:/wd4996>
+                               $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-deprecated-declarations>)
+target_compile_options(DeprecatedTest PRIVATE ${no-deprecated-declarations})
+if(TARGET DeprecatedTest_Single)
+  target_compile_options(DeprecatedTest_Single PRIVATE ${no-deprecated-declarations})
 endif()
 # Link test (build error if inlines missing)
@@ -142,33 +138,38 @@ add_executable(link_test_2 link_test_2.cpp)
 target_link_libraries(link_test_2 PUBLIC CLI11 link_test_1)
 add_catch_test(link_test_2)
 if(CLI11_FORCE_LIBCXX)
-    set_property(TARGET link_test_1 APPEND_STRING
-        PROPERTY LINK_FLAGS -stdlib=libc++)
-    set_property(TARGET link_test_2 APPEND_STRING
-        PROPERTY LINK_FLAGS -stdlib=libc++)
+  set_property(
+    TARGET link_test_1
+    APPEND_STRING
+    PROPERTY LINK_FLAGS -stdlib=libc++)
+  set_property(
+    TARGET link_test_2
+    APPEND_STRING
+    PROPERTY LINK_FLAGS -stdlib=libc++)
 endif()
 # Add informational printout
 add_executable(informational informational.cpp)
 target_link_libraries(informational PUBLIC CLI11)
 if(CLI11_FORCE_LIBCXX)
-    set_property(TARGET informational APPEND_STRING
-        PROPERTY LINK_FLAGS -stdlib=libc++)
+  set_property(
+    TARGET informational
+    APPEND_STRING
+    PROPERTY LINK_FLAGS -stdlib=libc++)
 endif()
 # Force this to be in a standard location so CTest can find it
-set_target_properties(informational PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
-    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}"
-    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}"
-    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}"
-    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_BINARY_DIR}"
-    )
+set_target_properties(
+  informational
+  PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
+             RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}"
+             RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}"
+             RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}"
+             RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_BINARY_DIR}")
 # Adding this printout to CTest
 file(WRITE "${PROJECT_BINARY_DIR}/CTestCustom.cmake"
-    "set(CTEST_CUSTOM_PRE_TEST \"${CMAKE_BINARY_DIR}/informational\")"
-)
+     "set(CTEST_CUSTOM_PRE_TEST \"${CMAKE_BINARY_DIR}/informational\")")
 target_compile_definitions(informational PRIVATE ${boost-optional-def})
 target_compile_definitions(OptionalTest PRIVATE ${boost-optional-def})
@@ -176,33 +177,33 @@ target_compile_definitions(OptionalTest PRIVATE ${boost-optional-def})
 message(STATUS "Boost libs=${Boost_INCLUDE_DIRS}")
 if(TARGET Boost::boost)
-    message(STATUS "including boost target")
-    target_link_libraries(informational PRIVATE Boost::boost)
-    target_link_libraries(OptionalTest PRIVATE Boost::boost)
-    target_link_libraries(BoostOptionTypeTest PRIVATE Boost::boost)
-    if(CLI11_SINGLE_FILE AND CLI11_SINGLE_FILE_TESTS)
-       target_link_libraries(OptionalTest_Single PRIVATE Boost::boost)
-       target_link_libraries(BoostOptionTypeTest_Single PRIVATE Boost::boost)
-    endif()
+  message(STATUS "including boost target")
+  target_link_libraries(informational PRIVATE Boost::boost)
+  target_link_libraries(OptionalTest PRIVATE Boost::boost)
+  target_link_libraries(BoostOptionTypeTest PRIVATE Boost::boost)
+  if(CLI11_SINGLE_FILE AND CLI11_SINGLE_FILE_TESTS)
+    target_link_libraries(OptionalTest_Single PRIVATE Boost::boost)
+    target_link_libraries(BoostOptionTypeTest_Single PRIVATE Boost::boost)
+  endif()
 elseif(BOOST_FOUND)
-message(STATUS "no boost target")
-    target_include_directories(informational PRIVATE ${Boost_INCLUDE_DIRS})
-    target_include_directories(OptionalTest PRIVATE ${Boost_INCLUDE_DIRS})
-    target_include_directories(BoostOptionTypeTest PRIVATE ${Boost_INCLUDE_DIRS})
-    if(CLI11_SINGLE_FILE AND CLI11_SINGLE_FILE_TESTS)
-        target_include_directories(OptionalTest_Single PRIVATE ${Boost_INCLUDE_DIRS})
-        target_include_directories(BoostOptionTypeTest_Single PRIVATE ${Boost_INCLUDE_DIRS})
-     endif()
+  message(STATUS "no boost target")
+  target_include_directories(informational PRIVATE ${Boost_INCLUDE_DIRS})
+  target_include_directories(OptionalTest PRIVATE ${Boost_INCLUDE_DIRS})
+  target_include_directories(BoostOptionTypeTest PRIVATE ${Boost_INCLUDE_DIRS})
+  if(CLI11_SINGLE_FILE AND CLI11_SINGLE_FILE_TESTS)
+    target_include_directories(OptionalTest_Single PRIVATE ${Boost_INCLUDE_DIRS})
+    target_include_directories(BoostOptionTypeTest_Single PRIVATE ${Boost_INCLUDE_DIRS})
+  endif()
 endif()
 if(CMAKE_BUILD_TYPE STREQUAL Coverage)
-    include(CodeCoverage)
-    setup_target_for_coverage(
-        NAME CLI11_coverage
-        EXECUTABLE ctest
-        DEPENDENCIES
-          ${CLI11_TESTS}
-          ${CLI11_MULTIONLY_TESTS}
-        )
+  include(CodeCoverage)
+  setup_target_for_coverage(
+    NAME
+    CLI11_coverage
+    EXECUTABLE
+    ctest
+    DEPENDENCIES
+    ${CLI11_TESTS}
+    ${CLI11_MULTIONLY_TESTS})
 endif()
-