diff --git a/.cmake-format b/.cmake-format
index a4447d3..fbddd84 100644
--- a/.cmake-format
+++ b/.cmake-format
@@ -38,7 +38,7 @@ with section("parse"):
 with section("format"):
 
   # How wide to allow formatted cmake files
-  line_width = 90
+  line_width = 110
 
   # How many spaces to tab for indent
   tab_size = 2
@@ -204,7 +204,7 @@ with section("lint"):
   min_statement_spacing = 1
 
   # Require no more than this many newlines between statements
-  max_statement_spacing = 1
+  max_statement_spacing = 2
   max_returns = 6
   max_branches = 12
   max_arguments = 5
diff --git a/CMLibCPackSources.cmake b/CMLibCPackSources.cmake
index 37d904e..fa6ae00 100644
--- a/CMLibCPackSources.cmake
+++ b/CMLibCPackSources.cmake
@@ -6,8 +6,7 @@ set(CPACK_TARGET_ARCH ${CMAKE_SYSTEM_PROCESSOR})
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
   set(CPACK_TARGET_ARCH "amd64")
 endif()
-set(CPACK_PACKAGE_FILE_NAME
-    "${CMLIB_PROJECT_NAME_LOWER}_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}")
+set(CPACK_PACKAGE_FILE_NAME "${CMLIB_PROJECT_NAME_LOWER}_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}")
 
 include(CPack)
 add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
diff --git a/CMLibCodeAnalysisClangAnalyze.cmake b/CMLibCodeAnalysisClangAnalyze.cmake
index d73d89a..811129f 100644
--- a/CMLibCodeAnalysisClangAnalyze.cmake
+++ b/CMLibCodeAnalysisClangAnalyze.cmake
@@ -1,5 +1,5 @@
-find_program(CLANG_CHECK_EXE NAMES clang-check-10 clang-check-9 clang-check-8
-                                   clang-check-7 clang-check-6.0 clang-check)
+find_program(CLANG_CHECK_EXE NAMES clang-check-10 clang-check-9 clang-check-8 clang-check-7 clang-check-6.0
+                                   clang-check)
 if(CLANG_CHECK_EXE)
   option(CLANG_ANALYZE_FIX "Perform fixes for Clang-Check" OFF)
 endif()
@@ -19,8 +19,8 @@ function(add_clang_analyze_check)
     add_custom_target(
       clang-analyze-check-${_target}
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-      COMMAND ${CLANG_CHECK_EXE} -analyze -extra-arg="-Wno-unknown-warning-option" -p
-              ${CMAKE_BINARY_DIR} ${_sources})
+      COMMAND ${CLANG_CHECK_EXE} -analyze -extra-arg="-Wno-unknown-warning-option" -p ${CMAKE_BINARY_DIR}
+              ${_sources})
     add_dependencies(clang-analyze-check-${_target} ${_target})
     add_dependencies(clang-analyze-check clang-analyze-check-${_target})
   else()
diff --git a/CMLibCodeAnalysisClangTidy.cmake b/CMLibCodeAnalysisClangTidy.cmake
index b63c825..753e95a 100644
--- a/CMLibCodeAnalysisClangTidy.cmake
+++ b/CMLibCodeAnalysisClangTidy.cmake
@@ -1,5 +1,5 @@
-find_program(CLANG_TIDY_EXE NAMES clang-tidy-10 clang-tidy-9 clang-tidy-8 clang-tidy-7
-                                  clang-tidy-6.0 clang-tidy)
+find_program(CLANG_TIDY_EXE NAMES clang-tidy-10 clang-tidy-9 clang-tidy-8 clang-tidy-7 clang-tidy-6.0
+                                  clang-tidy)
 if(CLANG_TIDY_EXE)
   option(CLANG_TIDY_FIX "Perform fixes for Clang-Tidy" OFF)
   if(CLANG_TIDY_FIX)
@@ -19,8 +19,7 @@ function(add_clang_tidy_check)
     add_custom_target(
       clang-tidy-check-${_target}
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-      COMMAND ${CLANG_TIDY_EXE} -extra-arg="-Wno-unknown-warning-option" -p
-              ${CMAKE_BINARY_DIR} ${_sources})
+      COMMAND ${CLANG_TIDY_EXE} -extra-arg="-Wno-unknown-warning-option" -p ${CMAKE_BINARY_DIR} ${_sources})
     add_dependencies(clang-tidy-check-${_target} ${_target})
     add_dependencies(clang-tidy-check clang-tidy-check-${_target})
   else()
diff --git a/CMLibCodeAnalysisClazy.cmake b/CMLibCodeAnalysisClazy.cmake
index 98388e0..e4cb78b 100644
--- a/CMLibCodeAnalysisClazy.cmake
+++ b/CMLibCodeAnalysisClazy.cmake
@@ -15,8 +15,8 @@ function(add_clazy_check)
     add_custom_target(
       clazy-check-${_target}
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-      COMMAND ${CLAZY_EXE} -checks=level2,${clazy_checks}
-              -extra-arg="-Wno-unknown-warning-option" -p ${CMAKE_BINARY_DIR} ${_sources})
+      COMMAND ${CLAZY_EXE} -checks=level2,${clazy_checks} -extra-arg="-Wno-unknown-warning-option" -p
+              ${CMAKE_BINARY_DIR} ${_sources})
     add_dependencies(clazy-check-${_target} ${_target})
     add_dependencies(clazy-check clazy-check-${_target})
   else()
diff --git a/CMLibCodeAnalysisPvsStudio.cmake b/CMLibCodeAnalysisPvsStudio.cmake
index 6994264..1ac7c77 100644
--- a/CMLibCodeAnalysisPvsStudio.cmake
+++ b/CMLibCodeAnalysisPvsStudio.cmake
@@ -14,8 +14,7 @@ function(add_pvs_check)
         COMPILE_COMMANDS HIDE_HELP OUTPUT
         FORMAT errorfile
         CONFIG "${CMAKE_BINARY_DIR}/PVS-Studio-${_target}.cfg"
-        ARGS --analysis-mode 29 --exclude-path
-             ${CMAKE_CURRENT_BINARY_DIR}/${_target}_autogen
+        ARGS --analysis-mode 29 --exclude-path ${CMAKE_CURRENT_BINARY_DIR}/${_target}_autogen
         MODE GA:1,2,3;64:1;OP:1,2;CS:1,2)
       add_dependencies(pvs-check pvs-check-${_target})
     else()
@@ -24,8 +23,6 @@ function(add_pvs_check)
     endif()
   else()
     message(STATUS "CMLIB warning:")
-    message(
-      STATUS
-        "  Option CMAKE_EXPORT_COMPILE_COMMANDS is not set. PVS checks will be disabled.")
+    message(STATUS "  Option CMAKE_EXPORT_COMPILE_COMMANDS is not set. PVS checks will be disabled.")
   endif()
 endfunction()
diff --git a/CMLibCodeCoverage.cmake b/CMLibCodeCoverage.cmake
index 07e780d..ad6ad7f 100644
--- a/CMLibCodeCoverage.cmake
+++ b/CMLibCodeCoverage.cmake
@@ -16,16 +16,15 @@ function(add_code_coverage)
         add_custom_target(
           coverage-${_target}
           WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-          COMMAND ${LCOV_EXE} --test-name ${_target} --output "${_target}.lcov" --capture
-                  --directory ${CMAKE_BINARY_DIR})
+          COMMAND ${LCOV_EXE} --test-name ${_target} --output "${_target}.lcov" --capture --directory
+                  ${CMAKE_BINARY_DIR})
         add_dependencies(coverage-${_target} ${_target})
 
         if(GENHTML_EXE)
           add_custom_target(
             coverage-report-${_target}
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-            COMMAND ${GENHTML_EXE} --output-directory "report-${_target}"
-                    "${_target}.lcov")
+            COMMAND ${GENHTML_EXE} --output-directory "report-${_target}" "${_target}.lcov")
           add_dependencies(coverage-report-${_target} coverage-${_target})
         endif()
       endif()
diff --git a/CMLibCommonLibraryTarget.cmake b/CMLibCommonLibraryTarget.cmake
index 7eabb6a..011e10f 100644
--- a/CMLibCommonLibraryTarget.cmake
+++ b/CMLibCommonLibraryTarget.cmake
@@ -16,33 +16,26 @@ function(add_common_library)
 
   add_library(${LIBNAME} OBJECT ${SOURCES})
   target_include_directories(
-    ${LIBNAME}
-    PUBLIC
-      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-      $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>
-      $<INSTALL_INTERFACE:include/${LIBNAME}>)
+    ${LIBNAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+                      $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include> $<INSTALL_INTERFACE:include/${LIBNAME}>)
   set_target_properties(${LIBNAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
   if(BUILD_SHARED_LIBS)
     add_library(${LIBNAME}_shared SHARED $<TARGET_OBJECTS:${LIBNAME}>)
     set_target_properties(
       ${LIBNAME}_shared
-      PROPERTIES
-        VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR} OUTPUT_NAME
-                                                                      ${OUTNAME}
-        LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
+      PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR} OUTPUT_NAME ${OUTNAME}
+                 LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
     install(TARGETS ${LIBNAME}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
   endif()
 
   if(NOT SKIP_STATIC_LIBS)
     add_library(${LIBNAME}_static STATIC $<TARGET_OBJECTS:${LIBNAME}>)
-    set_target_properties(
-      ${LIBNAME}_static PROPERTIES OUTPUT_NAME ${OUTNAME} ARCHIVE_OUTPUT_DIRECTORY
-                                                          ${CMAKE_INSTALL_LIBDIR})
+    set_target_properties(${LIBNAME}_static PROPERTIES OUTPUT_NAME ${OUTNAME} ARCHIVE_OUTPUT_DIRECTORY
+                                                                              ${CMAKE_INSTALL_LIBDIR})
     install(TARGETS ${LIBNAME}_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
   endif()
 
   configure_file(${CMLIB_MODULE_DIR}/pc/lib.pc.in ${CMAKE_BINARY_DIR}/${LIBNAME}.pc)
-  install(FILES ${CMAKE_BINARY_DIR}/${LIBNAME}.pc
-          DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+  install(FILES ${CMAKE_BINARY_DIR}/${LIBNAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 endfunction()
diff --git a/CMLibCommonTargetProperties.cmake b/CMLibCommonTargetProperties.cmake
index 40d5008..e258ac5 100644
--- a/CMLibCommonTargetProperties.cmake
+++ b/CMLibCommonTargetProperties.cmake
@@ -17,10 +17,8 @@ function(common_target_properties Name)
   endif()
   target_include_directories(
     ${Name}
-    PUBLIC
-      $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-      $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
-      $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
+    PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+           $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
   if(APPLE)
     target_compile_definitions(
       ${Name}
@@ -57,13 +55,11 @@ function(common_target_properties Name)
     if(CMAKE_CXX_COMPILER_IS_GCC AND CXX_HAS_LTO_FLAG)
       find_program(
         CMAKE_GCC_AR
-        NAMES "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar${_CMAKE_TOOLCHAIN_SUFFIX}"
-              "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar"
+        NAMES "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar${_CMAKE_TOOLCHAIN_SUFFIX}" "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar"
         HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
       find_program(
         CMAKE_GCC_NM
-        NAMES "${_CMAKE_TOOLCHAIN_PREFIX}gcc-nm${_CMAKE_TOOLCHAIN_SUFFIX}"
-              "${_CMAKE_TOOLCHAIN_PREFIX}gcc-nm"
+        NAMES "${_CMAKE_TOOLCHAIN_PREFIX}gcc-nm${_CMAKE_TOOLCHAIN_SUFFIX}" "${_CMAKE_TOOLCHAIN_PREFIX}gcc-nm"
         HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
       find_program(
         CMAKE_GCC_RANLIB
@@ -81,10 +77,7 @@ function(common_target_properties Name)
         set(CMAKE_NM "${CMAKE_GCC_NM}")
         set(CMAKE_RANLIB "${CMAKE_GCC_RANLIB}")
       else()
-        message(
-          WARNING
-            "GCC indicates LTO support, but binutils wrappers could not be found. Disabling LTO."
-        )
+        message(WARNING "GCC indicates LTO support, but binutils wrappers could not be found. Disabling LTO.")
       endif()
     else()
       check_enable_compiler_flag(-flto)
@@ -114,8 +107,8 @@ function(common_target_properties Name)
       ANALYSIS)
   endif()
   target_compile_definitions(
-      ${Name}
-      ${__visibility}
-      "TARGET_LSB_ID_${LSB_DISTRIBUTOR_ID}"
-      "TARGET_LSB_CODENAME_${LSB_CODENAME}")
+    ${Name}
+    ${__visibility}
+    "TARGET_LSB_ID_${LSB_DISTRIBUTOR_ID}"
+    "TARGET_LSB_CODENAME_${LSB_CODENAME}")
 endfunction()
diff --git a/CMLibCompiler.cmake b/CMLibCompiler.cmake
index b981803..0c13007 100644
--- a/CMLibCompiler.cmake
+++ b/CMLibCompiler.cmake
@@ -12,8 +12,7 @@ endif()
 # C++ compiler name
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
   set(CMAKE_CXX_COMPILER_IS_INTEL ON)
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL
-                                                 "AppleClang")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
   set(CMAKE_CXX_COMPILER_IS_CLANG ON)
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   set(CMAKE_CXX_COMPILER_IS_GCC ON)
diff --git a/CMLibDistCC.cmake b/CMLibDistCC.cmake
index cb41569..d3b7d0f 100644
--- a/CMLibDistCC.cmake
+++ b/CMLibDistCC.cmake
@@ -2,8 +2,7 @@ find_program(DISTCC_EXECUTABLE distcc)
 mark_as_advanced(DISTCC_EXECUTABLE)
 if(DISTCC_EXECUTABLE)
   foreach(LANG C CXX)
-    if(NOT DEFINED CMAKE_${LANG}_COMPILER_LAUNCHER AND NOT CMAKE_${LANG}_COMPILER MATCHES
-                                                       ".*/distcc$")
+    if(NOT DEFINED CMAKE_${LANG}_COMPILER_LAUNCHER AND NOT CMAKE_${LANG}_COMPILER MATCHES ".*/distcc$")
       message(STATUS "Enabling distcc for ${LANG}")
       set(CMAKE_${LANG}_COMPILER_LAUNCHER
           ${DISTCC_EXECUTABLE}
diff --git a/CMLibDocBreathe.cmake b/CMLibDocBreathe.cmake
index 86ca2a0..8718c6a 100644
--- a/CMLibDocBreathe.cmake
+++ b/CMLibDocBreathe.cmake
@@ -37,8 +37,7 @@ function(add_breathe_target)
   set(oneValueArgs TARGET_NAME COMMENT)
   set(multiValueArgs)
 
-  cmake_parse_arguments(_BREATHE "${options}" "${oneValueArgs}" "${multiValueArgs}"
-                        ${ARGN})
+  cmake_parse_arguments(_BREATHE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
   if(BREATHE_FOUND)
     set(WORK_DIR ${CMAKE_BINARY_DIR}/_breathe)
     set(BREATHE_DOCS_BUILD_DIR ${WORK_DIR})
@@ -55,8 +54,8 @@ function(add_breathe_target)
     add_custom_target(
       ${_BREATHE_TARGET_NAME}
       VERBATIM
-      COMMAND ${SPHINX_EXECUTABLE} -q -b html -c ${WORK_DIR} -d ${WORK_DIR}/cache
-              ${WORK_DIR} ${CMAKE_BINARY_DIR}/doc/breathe
+      COMMAND ${SPHINX_EXECUTABLE} -q -b html -c ${WORK_DIR} -d ${WORK_DIR}/cache ${WORK_DIR}
+              ${CMAKE_BINARY_DIR}/doc/breathe
       COMMENT "Building ${_BREATHE_TARGET_NAME} documentation with Breathe")
 
     set(INDEX_MD_FILE ${CMAKE_SOURCE_DIR}/doc/breathe/index.md.in)
diff --git a/CMLibDocDoxygen.cmake b/CMLibDocDoxygen.cmake
index 35b6ee9..6d4a082 100644
--- a/CMLibDocDoxygen.cmake
+++ b/CMLibDocDoxygen.cmake
@@ -19,8 +19,7 @@ function(add_doxygen_target)
   set(oneValueArgs TARGET_NAME SQLITE LATEX HTML)
   set(multiValueArgs)
 
-  cmake_parse_arguments(_DOXYGEN "${options}" "${oneValueArgs}" "${multiValueArgs}"
-                        ${ARGN})
+  cmake_parse_arguments(_DOXYGEN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
   if(DOXYGEN_FOUND)
     set(GENERATE_XML NO)
     set(GENERATE_HTML NO)
diff --git a/CMLibFlagRemove.cmake b/CMLibFlagRemove.cmake
index 244b0bb..18653b5 100644
--- a/CMLibFlagRemove.cmake
+++ b/CMLibFlagRemove.cmake
@@ -51,8 +51,7 @@ macro(remove_flag_from_file _target _file _flag)
       endif()
       # Apply the compile flags to the current source file.
       string(REPLACE ";" " " _source_file_cxx_flags_string "${_source_file_cxx_flags}")
-      set_source_files_properties(
-        ${_source_file} PROPERTIES COMPILE_FLAGS "${_source_file_cxx_flags_string}")
+      set_source_files_properties(${_source_file} PROPERTIES COMPILE_FLAGS "${_source_file_cxx_flags_string}")
     endforeach()
   endif()
   list(FIND _target_sources ${_file} _file_found_at)
@@ -70,7 +69,7 @@ macro(remove_flag_from_file _target _file _flag)
     list(REMOVE_ITEM _cached_${_target}_${_file}_cxx_flags ${_flag})
     string(REPLACE ";" " " _cached_${_target}_${_file}_cxx_flags_string
                    "${_cached_${_target}_${_file}_cxx_flags}")
-    set_source_files_properties(
-      ${_file} PROPERTIES COMPILE_FLAGS "${_cached_${_target}_${_file}_cxx_flags_string}")
+    set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS
+                                                    "${_cached_${_target}_${_file}_cxx_flags_string}")
   endif()
 endmacro()
diff --git a/CMLibFormatSources.cmake b/CMLibFormatSources.cmake
index daf7ad6..a4004be 100644
--- a/CMLibFormatSources.cmake
+++ b/CMLibFormatSources.cmake
@@ -13,8 +13,8 @@ function(add_format_sources)
     if(EXISTS ${CMAKE_SOURCE_DIR}/cmake/etc/uncrustify/default.cfg)
       list(APPEND UNCRUSTIFY_OPTS -c ${CMAKE_SOURCE_DIR}/cmake/etc/uncrustify/default.cfg)
     endif()
-    add_custom_target(format-sources-uncrustify-${_target}
-                      COMMAND ${UNCRUSTIFY_EXE} ${UNCRUSTIFY_OPTS} ${_sources})
+    add_custom_target(format-sources-uncrustify-${_target} COMMAND ${UNCRUSTIFY_EXE} ${UNCRUSTIFY_OPTS}
+                                                                   ${_sources})
     add_dependencies(format-sources format-sources-uncrustify-${_target})
   else()
     message(STATUS "CMLIB warning:")
@@ -24,8 +24,7 @@ function(add_format_sources)
   find_program(DOS2UNIX_EXE NAMES dos2unix)
   if(DOS2UNIX_EXE)
     list(APPEND DOS2UNIX_OPTS -k -r)
-    add_custom_target(format-sources-dos2unix-${_target}
-                      COMMAND ${DOS2UNIX_EXE} ${DOS2UNIX_OPTS} ${_sources})
+    add_custom_target(format-sources-dos2unix-${_target} COMMAND ${DOS2UNIX_EXE} ${DOS2UNIX_OPTS} ${_sources})
     add_dependencies(format-sources format-sources-dos2unix-${_target})
   else()
     message(STATUS "CMLIB warning:")
diff --git a/CMLibLSBInfo.cmake b/CMLibLSBInfo.cmake
index 4257296..601563b 100644
--- a/CMLibLSBInfo.cmake
+++ b/CMLibLSBInfo.cmake
@@ -20,13 +20,13 @@ if(EXISTS /etc/mcst_version)
 else()
   find_program(_lsb_release_executable lsb_release)
   if(_lsb_release_executable)
-    execute_process(COMMAND ${_lsb_release_executable} -si
-                    OUTPUT_VARIABLE LSB_DISTRIBUTOR_ID OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND ${_lsb_release_executable} -si OUTPUT_VARIABLE LSB_DISTRIBUTOR_ID
+                                                                           OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-    execute_process(COMMAND ${_lsb_release_executable} -sc
-                    OUTPUT_VARIABLE LSB_CODENAME OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND ${_lsb_release_executable} -sc OUTPUT_VARIABLE LSB_CODENAME
+                                                                           OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-    execute_process(COMMAND ${_lsb_release_executable} -sr
-                    OUTPUT_VARIABLE LSB_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND ${_lsb_release_executable} -sr OUTPUT_VARIABLE LSB_RELEASE
+                                                                           OUTPUT_STRIP_TRAILING_WHITESPACE)
   endif()
 endif()
diff --git a/CMLibLargeFiles.cmake b/CMLibLargeFiles.cmake
index 69f398c..655e086 100644
--- a/CMLibLargeFiles.cmake
+++ b/CMLibLargeFiles.cmake
@@ -61,17 +61,15 @@ macro(cmlib_test_large_files VARIABLE)
     message(STATUS "Checking for 64-bit off_t")
 
     # First check without any special flags
-    try_compile(FILE64_OK "${CMAKE_BINARY_DIR}"
-                "${CMLIB_MODULE_DIR}/tests/TestFileOffsetBits.c")
+    try_compile(FILE64_OK "${CMAKE_BINARY_DIR}" "${CMLIB_MODULE_DIR}/tests/TestFileOffsetBits.c")
     if(FILE64_OK)
       message(STATUS "Checking for 64-bit off_t - present")
     endif()
 
     if(NOT FILE64_OK)
       # Test with _FILE_OFFSET_BITS=64
-      try_compile(
-        FILE64_OK "${CMAKE_BINARY_DIR}" "${CMLIB_MODULE_DIR}/tests/TestFileOffsetBits.c"
-        COMPILE_DEFINITIONS "-D_FILE_OFFSET_BITS=64")
+      try_compile(FILE64_OK "${CMAKE_BINARY_DIR}" "${CMLIB_MODULE_DIR}/tests/TestFileOffsetBits.c"
+                  COMPILE_DEFINITIONS "-D_FILE_OFFSET_BITS=64")
       if(FILE64_OK)
         message(STATUS "Checking for 64-bit off_t - present with _FILE_OFFSET_BITS=64")
         set(_FILE_OFFSET_BITS
@@ -82,9 +80,8 @@ macro(cmlib_test_large_files VARIABLE)
 
     if(NOT FILE64_OK)
       # Test with _LARGE_FILES
-      try_compile(
-        FILE64_OK "${CMAKE_BINARY_DIR}" "${CMLIB_MODULE_DIR}/tests/TestFileOffsetBits.c"
-        COMPILE_DEFINITIONS "-D_LARGE_FILES")
+      try_compile(FILE64_OK "${CMAKE_BINARY_DIR}" "${CMLIB_MODULE_DIR}/tests/TestFileOffsetBits.c"
+                  COMPILE_DEFINITIONS "-D_LARGE_FILES")
       if(FILE64_OK)
         message(STATUS "Checking for 64-bit off_t - present with _LARGE_FILES")
         set(_LARGE_FILES
@@ -95,9 +92,8 @@ macro(cmlib_test_large_files VARIABLE)
 
     if(NOT FILE64_OK)
       # Test with _LARGEFILE_SOURCE
-      try_compile(
-        FILE64_OK "${CMAKE_BINARY_DIR}" "${CMLIB_MODULE_DIR}/tests/TestFileOffsetBits.c"
-        COMPILE_DEFINITIONS "-D_LARGEFILE_SOURCE")
+      try_compile(FILE64_OK "${CMAKE_BINARY_DIR}" "${CMLIB_MODULE_DIR}/tests/TestFileOffsetBits.c"
+                  COMPILE_DEFINITIONS "-D_LARGEFILE_SOURCE")
       if(FILE64_OK)
         message(STATUS "Checking for 64-bit off_t - present with _LARGEFILE_SOURCE")
         set(_LARGEFILE_SOURCE
@@ -143,8 +139,7 @@ macro(cmlib_test_large_files VARIABLE)
 
     if(NOT FILE64_OK)
       # now check for Windows stuff
-      try_compile(FILE64_OK "${CMAKE_BINARY_DIR}"
-                  "${CMLIB_MODULE_DIR}/tests/TestWindowsFSeek.c")
+      try_compile(FILE64_OK "${CMAKE_BINARY_DIR}" "${CMLIB_MODULE_DIR}/tests/TestWindowsFSeek.c")
       if(FILE64_OK)
         message(STATUS "Checking for 64-bit off_t - present with _fseeki64")
         set(HAVE__FSEEKI64
diff --git a/CMLibProjectVersion.cmake b/CMLibProjectVersion.cmake
index f6d6352..272d39c 100644
--- a/CMLibProjectVersion.cmake
+++ b/CMLibProjectVersion.cmake
@@ -3,10 +3,7 @@ function(set_project_version)
     message(FATAL_ERROR "Please set project version in X.Y.Z format")
   endif()
 
-  math(
-    EXPR
-    _version_int
-    "(${PROJECT_VERSION_MAJOR} << 16) + (${PROJECT_VERSION_MINOR} << 8) + ${PROJECT_VERSION_PATCH}"
-  )
+  math(EXPR _version_int
+       "(${PROJECT_VERSION_MAJOR} << 16) + (${PROJECT_VERSION_MINOR} << 8) + ${PROJECT_VERSION_PATCH}")
   set_property(GLOBAL PROPERTY PROJECT_VERSION_INT ${_version_int})
 endfunction()
diff --git a/CMLibQtTranslation.cmake b/CMLibQtTranslation.cmake
index 1cfd9f3..94a66f0 100644
--- a/CMLibQtTranslation.cmake
+++ b/CMLibQtTranslation.cmake
@@ -22,13 +22,11 @@ function(qt5_translation)
     set(_qm "${_target}_${_lang}.qm")
     list(APPEND _ts_list ${_ts_dir}/${_ts})
     list(APPEND _l10n_targets "${_target}_l10n_${_lang}")
-    string(APPEND L10N_QRC_BODY
-           "<file alias=\"${_qm}\">${CMAKE_BINARY_DIR}/${_qm}</file>\n")
+    string(APPEND L10N_QRC_BODY "<file alias=\"${_qm}\">${CMAKE_BINARY_DIR}/${_qm}</file>\n")
 
     add_custom_target(
       ${_target}_l10n_${_lang}
-      COMMAND ${Qt5_LUPDATE_EXECUTABLE} ${_sources} -ts ${_ts_dir}/${_ts} -target-language
-              ${_lang}
+      COMMAND ${Qt5_LUPDATE_EXECUTABLE} ${_sources} -ts ${_ts_dir}/${_ts} -target-language ${_lang}
       DEPENDS ${_sources})
 
     if(NOT EXISTS "${_ts_dir}/${_ts}")
@@ -39,13 +37,11 @@ function(qt5_translation)
 
     add_custom_command(
       OUTPUT ${CMAKE_BINARY_DIR}/${_qm}
-      COMMAND ${Qt5_LRELEASE_EXECUTABLE} ARGS ${_ts_dir}/${_ts} -qm
-              ${CMAKE_BINARY_DIR}/${_qm}
+      COMMAND ${Qt5_LRELEASE_EXECUTABLE} ARGS ${_ts_dir}/${_ts} -qm ${CMAKE_BINARY_DIR}/${_qm}
       DEPENDS ${_ts} ${_sources})
   endforeach()
 
-  configure_file(${CMLIB_MODULE_DIR}/qrc/l10n.qrc.in
-                 ${CMAKE_BINARY_DIR}/${_target}_l10n.qrc)
+  configure_file(${CMLIB_MODULE_DIR}/qrc/l10n.qrc.in ${CMAKE_BINARY_DIR}/${_target}_l10n.qrc)
   qt5_add_resources(_qrc ${CMAKE_BINARY_DIR}/${_target}_l10n.qrc)
   add_custom_target(${_target}_qrc DEPENDS ${_qrc})
   add_custom_target(${_target}_l10n DEPENDS ${_l10n_targets})
diff --git a/CMLibRequiredVariables.cmake b/CMLibRequiredVariables.cmake
index 9f7b172..f938974 100644
--- a/CMLibRequiredVariables.cmake
+++ b/CMLibRequiredVariables.cmake
@@ -19,8 +19,7 @@ if(NOT CPACK_PACKAGE_CONTACT)
 endif()
 
 if(NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY)
-  message(
-    FATAL_ERROR "Required variable CPACK_PACKAGE_DESCRIPTION_SUMMARY is not defined")
+  message(FATAL_ERROR "Required variable CPACK_PACKAGE_DESCRIPTION_SUMMARY is not defined")
 endif()
 
 if(NOT CPACK_DEBIAN_PACKAGE_SECTION)
diff --git a/CMLibUninstall.cmake b/CMLibUninstall.cmake
index ad9e8a0..4dee8b5 100644
--- a/CMLibUninstall.cmake
+++ b/CMLibUninstall.cmake
@@ -1,7 +1,6 @@
 if(NOT TARGET uninstall)
-  configure_file("${CMLIB_MODULE_DIR}/CMLibUninstall.cmake.in"
-                 "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
+  configure_file("${CMLIB_MODULE_DIR}/CMLibUninstall.cmake.in" "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
+                 IMMEDIATE @ONLY)
 
-  add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P
-                                      ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake)
+  add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake)
 endif()