style: reformat consistently using gersemi

https://github.com/BlankSpruce/gersemi
abdes · Oct 2, 2023 · 243569f · 243569f
1 parent de72309
commit 243569f
Show file tree

Hide file tree

Showing 10 changed files with 1,642 additions and 1,451 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake
@@ -7,25 +7,29 @@
 set(CPM_DOWNLOAD_VERSION 0.35.5)
 
 if(CPM_SOURCE_CACHE)
- # Expand relative path. This is important if the provided path contains a
- # tilde (~)
- get_filename_component(CPM_SOURCE_CACHE ${CPM_SOURCE_CACHE} ABSOLUTE)
- set(CPM_DOWNLOAD_LOCATION
- "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+ # Expand relative path. This is important if the provided path contains a
+ # tilde (~)
+ get_filename_component(CPM_SOURCE_CACHE ${CPM_SOURCE_CACHE} ABSOLUTE)
+ set(CPM_DOWNLOAD_LOCATION
+ "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake"
+ )
 elseif(DEFINED ENV{CPM_SOURCE_CACHE})
- set(CPM_DOWNLOAD_LOCATION
- "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+ set(CPM_DOWNLOAD_LOCATION
+ "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake"
+ )
 else()
- set(CPM_DOWNLOAD_LOCATION
- "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+ set(CPM_DOWNLOAD_LOCATION
+ "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake"
+ )
 endif()
 
 if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION}))
- message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}")
- file(
- DOWNLOAD
- https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
- ${CPM_DOWNLOAD_LOCATION})
+ message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}")
+ file(
+ DOWNLOAD
+ https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
+ ${CPM_DOWNLOAD_LOCATION}
+ )
 endif()
 
 include(${CPM_DOWNLOAD_LOCATION})
diff --git a/cmake/ConfigFiles.cmake b/cmake/ConfigFiles.cmake
@@ -10,29 +10,33 @@ include(CMakePackageConfigHelpers)
 # Generate module config files for cmake and pkgconfig
 # ------------------------------------------------------------------------------
 function(_module_cmake_config_files)
- message(STATUS "[cryptopp] Generating cmake package config files")
- write_basic_package_version_file(
- ${CMAKE_CURRENT_BINARY_DIR}/cryptoppConfigVersion.cmake
- COMPATIBILITY SameMajorVersion)
+ message(STATUS "[cryptopp] Generating cmake package config files")
+ write_basic_package_version_file(
+ ${CMAKE_CURRENT_BINARY_DIR}/cryptoppConfigVersion.cmake
+ COMPATIBILITY SameMajorVersion
+ )
 endfunction()
 
 function(_module_pkgconfig_files)
- message(STATUS "[cryptopp] Generating pkgconfig files")
- set(MODULE_PKGCONFIG_FILE cryptopp.pc)
+  message(STATUS "[cryptopp] Generating pkgconfig files")
+  set(MODULE_PKGCONFIG_FILE cryptopp.pc)
 
- if(CMAKE_BUILD_TYPE EQUAL "Debug")
- get_target_property(target_debug_postfix cryptopp DEBUG_POSTFIX)
- if(${target_debug_postfix} MATCHES "-NOTFOUND$")
- set(target_debug_postfix "")
+ if(CMAKE_BUILD_TYPE EQUAL "Debug")
+ get_target_property(target_debug_postfix cryptopp DEBUG_POSTFIX)
+ if(${target_debug_postfix} MATCHES "-NOTFOUND$")
+ set(target_debug_postfix "")
+ endif()
  endif()
- endif()
- set(MODULE_LINK_LIBS "-lcryptopp${target_debug_postfix}")
+ set(MODULE_LINK_LIBS "-lcryptopp${target_debug_postfix}")
 
- configure_file(config.pc.in
- ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_PKGCONFIG_FILE} @ONLY)
+ configure_file(
+ config.pc.in
+ ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_PKGCONFIG_FILE}
+ @ONLY
+ )
 endfunction()
 
 function(create_module_config_files)
- _module_cmake_config_files()
- _module_pkgconfig_files()
+  _module_cmake_config_files()
+  _module_pkgconfig_files()
 endfunction()
diff --git a/cmake/FasterBuild.cmake b/cmake/FasterBuild.cmake
@@ -10,23 +10,14 @@
 
 find_program(CCACHE_TOOL_PATH ccache)
 
-if(NOT WIN32
- AND USE_CCACHE
- AND CCACHE_TOOL_PATH)
- message(STATUS "Using ccache (${CCACHE_TOOL_PATH}) (via wrapper).")
- # see https://github.com/TheLartians/Ccache.cmake enables CCACHE support
- # through the USE_CCACHE flag possible values are: YES, NO or equivalent
- include("${CMAKE_CURRENT_LIST_DIR}/CPM.cmake")
- cpmaddpackage("gh:TheLartians/Ccache.cmake@1.2.3")
-elseif(
- WIN32
- AND USE_CCACHE
- AND CCACHE_TOOL_PATH)
- set(CMAKE_C_COMPILER_LAUNCHER
- ${CCACHE_TOOL_PATH}
- CACHE STRING "" FORCE)
- set(CMAKE_CXX_COMPILER_LAUNCHER
- ${CCACHE_TOOL_PATH}
- CACHE STRING "" FORCE)
- message(STATUS "Using ccache (${CCACHE_TOOL_PATH}).")
+if(NOT WIN32 AND USE_CCACHE AND CCACHE_TOOL_PATH)
+ message(STATUS "Using ccache (${CCACHE_TOOL_PATH}) (via wrapper).")
+ # see https://github.com/TheLartians/Ccache.cmake enables CCACHE support
+ # through the USE_CCACHE flag possible values are: YES, NO or equivalent
+ include("${CMAKE_CURRENT_LIST_DIR}/CPM.cmake")
+ cpmaddpackage("gh:TheLartians/Ccache.cmake@1.2.3")
+elseif(WIN32 AND USE_CCACHE AND CCACHE_TOOL_PATH)
+ set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_TOOL_PATH} CACHE STRING "" FORCE)
+ set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_TOOL_PATH} CACHE STRING "" FORCE)
+ message(STATUS "Using ccache (${CCACHE_TOOL_PATH}).")
 endif()
diff --git a/cmake/GetCryptoppSources.cmake b/cmake/GetCryptoppSources.cmake
@@ -5,36 +5,39 @@
 # ===-----------------------------------------------------------------------===#
 
 include(FetchContent)
-set (version_underscore "${cryptopp-cmake_VERSION_MAJOR}_${cryptopp-cmake_VERSION_MINOR}_${cryptopp-cmake_VERSION_PATCH}")
+set(version_underscore
+ "${cryptopp-cmake_VERSION_MAJOR}_${cryptopp-cmake_VERSION_MINOR}_${cryptopp-cmake_VERSION_PATCH}"
+)
 if(GIT_FOUND)
- if(${CRYPTOPP_USE_MASTER_BRANCH})
- set(source_location "master")
- else()
- set(source_location
- "CRYPTOPP_${version_underscore}"
+ if(${CRYPTOPP_USE_MASTER_BRANCH})
+ set(source_location "master")
+ else()
+ set(source_location "CRYPTOPP_${version_underscore}")
+ endif()
+ fetchcontent_declare(
+ cryptopp
+ GIT_REPOSITORY ${cryptopp-cmake_HOMEPAGE_URL}
+ GIT_TAG ${source_location}
+ QUIET
+ SOURCE_DIR
+ ${CRYPTOPP_INCLUDE_PREFIX}
  )
- endif()
- FetchContent_Declare(
- cryptopp
- GIT_REPOSITORY ${cryptopp-cmake_HOMEPAGE_URL}
- GIT_TAG ${source_location}
- QUIET
- SOURCE_DIR ${CRYPTOPP_INCLUDE_PREFIX})
 else()
- message(STATUS "Downloading crypto++ from URL...")
- cmake_policy(SET CMP0135 NEW)
- set(source_location "${cryptopp-cmake_HOMEPAGE_URL}/")
- if(NOT ${CRYPTOPP_USE_MASTER_BRANCH})
- string(APPEND source_location
- "releases/download/CRYPTOPP_${version_underscore}/cryptopp${cryptopp-cmake_VERSION_MAJOR}${cryptopp-cmake_VERSION_MINOR}${cryptopp-cmake_VERSION_PATCH}")
- else()
- string(APPEND source_location "archive/refs/heads/master")
- endif()
- FetchContent_Declare(
- cryptopp
- URL "${source_location}.zip"
- QUIET
- SOURCE_DIR ${CRYPTOPP_INCLUDE_PREFIX}
- )
+ message(STATUS "Downloading crypto++ from URL...")
+ cmake_policy(SET CMP0135 NEW)
+ set(source_location "${cryptopp-cmake_HOMEPAGE_URL}/")
+ if(NOT ${CRYPTOPP_USE_MASTER_BRANCH})
+ string(
+ APPEND
+ source_location
+ "releases/download/CRYPTOPP_${version_underscore}/cryptopp${cryptopp-cmake_VERSION_MAJOR}${cryptopp-cmake_VERSION_MINOR}${cryptopp-cmake_VERSION_PATCH}"
+ )
+ else()
+ string(APPEND source_location "archive/refs/heads/master")
+ endif()
+ fetchcontent_declare(
+ cryptopp
+ URL "${source_location}.zip" QUIET SOURCE_DIR ${CRYPTOPP_INCLUDE_PREFIX}
+ )
 endif()
-FetchContent_Populate(cryptopp)
+fetchcontent_populate(cryptopp)
diff --git a/cmake/GetGitRevisionDescription.cmake b/cmake/GetGitRevisionDescription.cmake
@@ -30,7 +30,7 @@
 # at http://www.boost.org/LICENSE_1_0.txt)
 
 if(__get_git_revision_description)
- return()
+  return()
 endif()
 set(__get_git_revision_description YES)
 
@@ -39,90 +39,88 @@ set(__get_git_revision_description YES)
 get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
 
 function(get_git_head_revision _refspecvar _hashvar)
- set(GIT_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
- set(GIT_DIR "${GIT_PARENT_DIR}/.git")
- while(NOT EXISTS "${GIT_DIR}") # .git dir not found, search parent directories
- set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
- get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
- if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
- # We have reached the root directory, we are not in git
- set(${_refspecvar}
- "GITDIR-NOTFOUND"
- PARENT_SCOPE)
- set(${_hashvar}
- "GITDIR-NOTFOUND"
- PARENT_SCOPE)
- return()
- endif()
+ set(GIT_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
  set(GIT_DIR "${GIT_PARENT_DIR}/.git")
- endwhile()
- # check if this is a submodule
- if(NOT IS_DIRECTORY ${GIT_DIR})
- file(READ ${GIT_DIR} submodule)
- string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule})
- get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
- get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE}
- ABSOLUTE)
- endif()
- set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
- if(NOT EXISTS "${GIT_DATA}")
- file(MAKE_DIRECTORY "${GIT_DATA}")
- endif()
+ while(NOT EXISTS "${GIT_DIR}") # .git dir not found, search parent directories
+ set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
+ get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
+ if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
+ # We have reached the root directory, we are not in git
+ set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+ set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+ return()
+ endif()
+ set(GIT_DIR "${GIT_PARENT_DIR}/.git")
+ endwhile()
+ # check if this is a submodule
+ if(NOT IS_DIRECTORY ${GIT_DIR})
+ file(READ ${GIT_DIR} submodule)
+ string(
+ REGEX REPLACE
+ "gitdir: (.*)\n$"
+ "\\1"
+ GIT_DIR_RELATIVE
+ ${submodule}
+ )
+ get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
+ get_filename_component(
+ GIT_DIR
+ ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE}
+ ABSOLUTE
+ )
+ endif()
+ set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
+ if(NOT EXISTS "${GIT_DATA}")
+ file(MAKE_DIRECTORY "${GIT_DATA}")
+ endif()
 
- if(NOT EXISTS "${GIT_DIR}/HEAD")
- return()
- endif()
- set(HEAD_FILE "${GIT_DATA}/HEAD")
- configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
+  if(NOT EXISTS "${GIT_DIR}/HEAD")
+  return()
+  endif()
+  set(HEAD_FILE "${GIT_DATA}/HEAD")
+  configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
 
- configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
- "${GIT_DATA}/grabRef.cmake" @ONLY)
- include("${GIT_DATA}/grabRef.cmake")
+ configure_file(
+ "${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
+ "${GIT_DATA}/grabRef.cmake"
+ @ONLY
+ )
+ include("${GIT_DATA}/grabRef.cmake")
 
- set(${_refspecvar}
- "${HEAD_REF}"
- PARENT_SCOPE)
- set(${_hashvar}
- "${HEAD_HASH}"
- PARENT_SCOPE)
+ set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
+ set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
 endfunction()
 
 function(git_describe _var)
- if(NOT GIT_FOUND)
- find_package(Git QUIET)
- endif()
- get_git_head_revision(refspec hash)
- if(NOT GIT_FOUND)
- set(${_var}
- "GIT-NOTFOUND"
- PARENT_SCOPE)
- return()
- endif()
- if(NOT hash)
- set(${_var}
- "HEAD-HASH-NOTFOUND"
- PARENT_SCOPE)
- return()
- endif()
+ if(NOT GIT_FOUND)
+ find_package(Git QUIET)
+ endif()
+ get_git_head_revision(refspec hash)
+ if(NOT GIT_FOUND)
+ set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
+ return()
+ endif()
+ if(NOT hash)
+ set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
+ return()
+ endif()
 
- execute_process(
- COMMAND "${GIT_EXECUTABLE}" describe ${hash} ${ARGN}
- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
- RESULT_VARIABLE res
- OUTPUT_VARIABLE out
- ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(NOT res EQUAL 0)
- set(out "${out}-${res}-NOTFOUND")
- endif()
+ execute_process(
+ COMMAND "${GIT_EXECUTABLE}" describe ${hash} ${ARGN}
+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+ RESULT_VARIABLE res
+ OUTPUT_VARIABLE out
+ ERROR_QUIET
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ if(NOT res EQUAL 0)
+ set(out "${out}-${res}-NOTFOUND")
+ endif()
 
- set(${_var}
- "${out}"
- PARENT_SCOPE)
+ set(${_var} "${out}" PARENT_SCOPE)
 endfunction()
 
 function(git_get_exact_tag _var)
- git_describe(out --exact-match ${ARGN})
- set(${_var}
- "${out}"
- PARENT_SCOPE)
+ git_describe(out --exact-match ${ARGN})
+ set(${_var} "${out}" PARENT_SCOPE)
 endfunction()
diff --git a/cmake/ResetInitialCompilerOptions.cmake b/cmake/ResetInitialCompilerOptions.cmake
@@ -19,16 +19,16 @@
 # We use this module to strip compiler options that are not really needed but
 # will cause compatibility issues with `ccache`.
 if(MSVC AND USE_CCACHE)
- # As of ccache 4.6, /Zi option automatically added by cmake is unsupported.
- # Given that we are doing ccache only in development environments (USE_CCACHE
- # controls if ccache is enabled), we can just strip that option.
- macro(strip_unwanted_options_from cmake_flags)
- if(${cmake_flags} MATCHES "/Zi")
- string(REPLACE "/Zi" "/Z7" ${cmake_flags} ${${cmake_flags}})
- endif()
- endmacro()
- strip_unwanted_options_from(CMAKE_CXX_FLAGS_DEBUG_INIT)
- strip_unwanted_options_from(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT)
- strip_unwanted_options_from(CMAKE_C_FLAGS_DEBUG_INIT)
- strip_unwanted_options_from(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT)
+  # As of ccache 4.6, /Zi option automatically added by cmake is unsupported.
+  # Given that we are doing ccache only in development environments (USE_CCACHE
+  # controls if ccache is enabled), we can just strip that option.
+  macro(strip_unwanted_options_from cmake_flags)
+  if(${cmake_flags} MATCHES "/Zi")
+  string(REPLACE "/Zi" "/Z7" ${cmake_flags} ${${cmake_flags}})
+  endif()
+  endmacro()
+  strip_unwanted_options_from(CMAKE_CXX_FLAGS_DEBUG_INIT)
+  strip_unwanted_options_from(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT)
+  strip_unwanted_options_from(CMAKE_C_FLAGS_DEBUG_INIT)
+  strip_unwanted_options_from(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT)
 endif()