Auto-format and minimal cleanup to CMake (#592)

I haven't tackled any controversial steps in this PR - simply tidying the formatting.

I have used the `gersemi` tool, which simply "does its thing". I have additionally renamed a few variables to match standard casing conventions (but I am aware that some lowercased variables are used, for example in package-config files, and have left those alone).

Makefile.am

@@ -965,7 +965,6 @@ endif # WITH_GCOV
 EXTRA_DIST += \
   cmake/COPYING-CMAKE-SCRIPTS \
   cmake/FindEditline.cmake \
-  cmake/FindPackageHandleStandardArgs.cmake \
   cmake/FindReadline.cmake \
   cmake/pcre2-config-version.cmake.in \
   cmake/pcre2-config.cmake.in \

README

@@ -933,7 +933,6 @@ The distribution should contain the files listed below.
 (D) Auxiliary files for cmake support
 
   cmake/COPYING-CMAKE-SCRIPTS
-  cmake/FindPackageHandleStandardArgs.cmake
   cmake/FindEditline.cmake
   cmake/FindReadline.cmake
   CMakeLists.txt

cmake/FindEditline.cmake

@@ -2,15 +2,12 @@
 
 if(EDITLINE_INCLUDE_DIR AND EDITLINE_LIBRARY)
   set(EDITLINE_FOUND TRUE)
-else(EDITLINE_INCLUDE_DIR AND EDITLINE_LIBRARY)
-  FIND_PATH(EDITLINE_INCLUDE_DIR readline.h PATH_SUFFIXES
-    editline
-    edit/readline
-  )
-
-  FIND_LIBRARY(EDITLINE_LIBRARY NAMES edit)
+else()
+  find_path(EDITLINE_INCLUDE_DIR readline.h PATH_SUFFIXES editline edit/readline)
+
+  find_library(EDITLINE_LIBRARY NAMES edit)
   include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Editline DEFAULT_MSG EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)
+  find_package_handle_standard_args(Editline DEFAULT_MSG EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)
 
-  MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)
-endif(EDITLINE_INCLUDE_DIR AND EDITLINE_LIBRARY)
+  mark_as_advanced(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)
+endif()

cmake/FindReadline.cmake

@@ -5,25 +5,23 @@
 # GNU Readline library finder
 if(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
   set(READLINE_FOUND TRUE)
-else(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
-  FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h
-    /usr/include/readline
-  )
-
-# 2008-04-22 The next clause used to read like this:
-#
-#  FIND_LIBRARY(READLINE_LIBRARY NAMES readline)
-#        FIND_LIBRARY(NCURSES_LIBRARY NAMES ncurses )
-#        include(FindPackageHandleStandardArgs)
-#        FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG NCURSES_LIBRARY READLINE_INCLUDE_DIR READLINE_LIBRARY )
-#
-# I was advised to modify it such that it will find an ncurses library if
-# required, but not if one was explicitly given, that is, it allows the
-# default to be overridden. PH 
+else()
+  find_path(READLINE_INCLUDE_DIR readline/readline.h /usr/include/readline)
+
+  # 2008-04-22 The next clause used to read like this:
+  #
+  #  FIND_LIBRARY(READLINE_LIBRARY NAMES readline)
+  #        FIND_LIBRARY(NCURSES_LIBRARY NAMES ncurses )
+  #        include(FindPackageHandleStandardArgs)
+  #        FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG NCURSES_LIBRARY READLINE_INCLUDE_DIR READLINE_LIBRARY )
+  #
+  # I was advised to modify it such that it will find an ncurses library if
+  # required, but not if one was explicitly given, that is, it allows the
+  # default to be overridden. PH
 
-  FIND_LIBRARY(READLINE_LIBRARY NAMES readline)
-        include(FindPackageHandleStandardArgs)
-        FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG READLINE_INCLUDE_DIR READLINE_LIBRARY )
+  find_library(READLINE_LIBRARY NAMES readline)
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(Readline DEFAULT_MSG READLINE_INCLUDE_DIR READLINE_LIBRARY)
 
-  MARK_AS_ADVANCED(READLINE_INCLUDE_DIR READLINE_LIBRARY)
-endif(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
+  mark_as_advanced(READLINE_INCLUDE_DIR READLINE_LIBRARY)
+endif()

cmake/pcre2-config-version.cmake.in

@@ -4,8 +4,7 @@ set(PACKAGE_VERSION_PATCH 0)
 set(PACKAGE_VERSION @PCRE2_MAJOR@.@PCRE2_MINOR@.0)
 
 # Check whether the requested PACKAGE_FIND_VERSION is compatible
-if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION OR
-   PACKAGE_VERSION_MAJOR GREATER PACKAGE_FIND_VERSION_MAJOR)
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION OR PACKAGE_VERSION_MAJOR GREATER PACKAGE_FIND_VERSION_MAJOR)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
   set(PACKAGE_VERSION_COMPATIBLE TRUE)

cmake/pcre2-config.cmake.in

@@ -30,33 +30,49 @@ set(PCRE2_16BIT_NAME pcre2-16)
 set(PCRE2_32BIT_NAME pcre2-32)
 set(PCRE2_POSIX_NAME pcre2-posix)
 find_path(PCRE2_INCLUDE_DIR NAMES pcre2.h DOC "PCRE2 include directory")
-if (PCRE2_USE_STATIC_LIBS)
-  if (MSVC)
+if(PCRE2_USE_STATIC_LIBS)
+  if(MSVC)
     set(PCRE2_8BIT_NAME pcre2-8-static)
     set(PCRE2_16BIT_NAME pcre2-16-static)
     set(PCRE2_32BIT_NAME pcre2-32-static)
     set(PCRE2_POSIX_NAME pcre2-posix-static)
-  endif ()
+  endif()
 
   set(PCRE2_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX})
   set(PCRE2_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
-else ()
+else()
   set(PCRE2_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX})
-  if (MINGW AND PCRE2_NON_STANDARD_LIB_PREFIX)
+  if(MINGW AND PCRE2_NON_STANDARD_LIB_PREFIX)
     set(PCRE2_PREFIX "")
-  endif ()
+  endif()
 
   set(PCRE2_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
-  if (MINGW AND PCRE2_NON_STANDARD_LIB_SUFFIX)
+  if(MINGW AND PCRE2_NON_STANDARD_LIB_SUFFIX)
     set(PCRE2_SUFFIX "-0.dll")
   elseif(MSVC)
     set(PCRE2_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
-  endif ()
-endif ()
-find_library(PCRE2_8BIT_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}d${PCRE2_SUFFIX} DOC "8 bit PCRE2 library")
-find_library(PCRE2_16BIT_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_16BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_16BIT_NAME}d${PCRE2_SUFFIX} DOC "16 bit PCRE2 library")
-find_library(PCRE2_32BIT_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_32BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_32BIT_NAME}d${PCRE2_SUFFIX} DOC "32 bit PCRE2 library")
-find_library(PCRE2_POSIX_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_POSIX_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_POSIX_NAME}d${PCRE2_SUFFIX} DOC "8 bit POSIX PCRE2 library")
+  endif()
+endif()
+find_library(
+  PCRE2_8BIT_LIBRARY
+  NAMES ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}d${PCRE2_SUFFIX}
+  DOC "8 bit PCRE2 library"
+)
+find_library(
+  PCRE2_16BIT_LIBRARY
+  NAMES ${PCRE2_PREFIX}${PCRE2_16BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_16BIT_NAME}d${PCRE2_SUFFIX}
+  DOC "16 bit PCRE2 library"
+)
+find_library(
+  PCRE2_32BIT_LIBRARY
+  NAMES ${PCRE2_PREFIX}${PCRE2_32BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_32BIT_NAME}d${PCRE2_SUFFIX}
+  DOC "32 bit PCRE2 library"
+)
+find_library(
+  PCRE2_POSIX_LIBRARY
+  NAMES ${PCRE2_PREFIX}${PCRE2_POSIX_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_POSIX_NAME}d${PCRE2_SUFFIX}
+  DOC "8 bit POSIX PCRE2 library"
+)
 unset(PCRE2_NON_STANDARD_LIB_PREFIX)
 unset(PCRE2_NON_STANDARD_LIB_SUFFIX)
 unset(PCRE2_8BIT_NAME)
@@ -65,51 +81,55 @@ unset(PCRE2_32BIT_NAME)
 unset(PCRE2_POSIX_NAME)
 
 # Set version
-if (PCRE2_INCLUDE_DIR)
+if(PCRE2_INCLUDE_DIR)
   set(PCRE2_VERSION "@PCRE2_MAJOR@.@PCRE2_MINOR@.0")
-endif ()
+endif()
 
 # Which components have been found.
-if (PCRE2_8BIT_LIBRARY)
+if(PCRE2_8BIT_LIBRARY)
   set(PCRE2_8BIT_FOUND TRUE)
-endif ()
-if (PCRE2_16BIT_LIBRARY)
+endif()
+if(PCRE2_16BIT_LIBRARY)
   set(PCRE2_16BIT_FOUND TRUE)
-endif ()
-if (PCRE2_32BIT_LIBRARY)
+endif()
+if(PCRE2_32BIT_LIBRARY)
   set(PCRE2_32BIT_FOUND TRUE)
-endif ()
-if (PCRE2_POSIX_LIBRARY)
+endif()
+if(PCRE2_POSIX_LIBRARY)
   set(PCRE2_POSIX_FOUND TRUE)
-endif ()
+endif()
 
 # Check if at least one component has been specified.
 list(LENGTH PCRE2_FIND_COMPONENTS PCRE2_NCOMPONENTS)
-if (PCRE2_NCOMPONENTS LESS 1)
+if(PCRE2_NCOMPONENTS LESS 1)
   message(FATAL_ERROR "No components have been specified. This is not allowed. Please, specify at least one component.")
-endif ()
+endif()
 unset(PCRE2_NCOMPONENTS)
 
 # When POSIX component has been specified make sure that also 8BIT component is specified.
 set(PCRE2_8BIT_COMPONENT FALSE)
 set(PCRE2_POSIX_COMPONENT FALSE)
 foreach(component ${PCRE2_FIND_COMPONENTS})
-  if (component STREQUAL "8BIT")
+  if(component STREQUAL "8BIT")
     set(PCRE2_8BIT_COMPONENT TRUE)
-  elseif (component STREQUAL "POSIX")
+  elseif(component STREQUAL "POSIX")
     set(PCRE2_POSIX_COMPONENT TRUE)
-  endif ()
+  endif()
 endforeach()
 
-if (PCRE2_POSIX_COMPONENT AND NOT PCRE2_8BIT_COMPONENT)
-  message(FATAL_ERROR "The component POSIX is specified while the 8BIT one is not. This is not allowed. Please, also specify the 8BIT component.")
+if(PCRE2_POSIX_COMPONENT AND NOT PCRE2_8BIT_COMPONENT)
+  message(
+    FATAL_ERROR
+    "The component POSIX is specified while the 8BIT one is not. This is not allowed. Please, also specify the 8BIT component."
+  )
 endif()
 unset(PCRE2_8BIT_COMPONENT)
 unset(PCRE2_POSIX_COMPONENT)
 
 include(FindPackageHandleStandardArgs)
 set(${CMAKE_FIND_PACKAGE_NAME}_CONFIG "${CMAKE_CURRENT_LIST_FILE}")
-find_package_handle_standard_args(PCRE2
+find_package_handle_standard_args(
+  PCRE2
   FOUND_VAR PCRE2_FOUND
   REQUIRED_VARS PCRE2_INCLUDE_DIR
   HANDLE_COMPONENTS
@@ -118,31 +138,31 @@ find_package_handle_standard_args(PCRE2
 )
 
 set(PCRE2_LIBRARIES)
-if (PCRE2_FOUND)
+if(PCRE2_FOUND)
   foreach(component ${PCRE2_FIND_COMPONENTS})
-    if (PCRE2_USE_STATIC_LIBS)
+    if(PCRE2_USE_STATIC_LIBS)
       add_library(PCRE2::${component} STATIC IMPORTED)
       target_compile_definitions(PCRE2::${component} INTERFACE PCRE2_STATIC)
-    else ()
+    else()
       add_library(PCRE2::${component} SHARED IMPORTED)
-    endif ()
-    set_target_properties(PCRE2::${component} PROPERTIES
-      IMPORTED_LOCATION "${PCRE2_${component}_LIBRARY}"
-      IMPORTED_IMPLIB "${PCRE2_${component}_LIBRARY}"
-      INTERFACE_INCLUDE_DIRECTORIES "${PCRE2_INCLUDE_DIR}"
+    endif()
+    set_target_properties(
+      PCRE2::${component}
+      PROPERTIES
+        IMPORTED_LOCATION "${PCRE2_${component}_LIBRARY}"
+        IMPORTED_IMPLIB "${PCRE2_${component}_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${PCRE2_INCLUDE_DIR}"
     )
-    if (component STREQUAL "POSIX")
-      set_target_properties(PCRE2::${component} PROPERTIES
-        INTERFACE_LINK_LIBRARIES "PCRE2::8BIT"
-        LINK_LIBRARIES "PCRE2::8BIT"
+    if(component STREQUAL "POSIX")
+      set_target_properties(
+        PCRE2::${component}
+        PROPERTIES INTERFACE_LINK_LIBRARIES "PCRE2::8BIT" LINK_LIBRARIES "PCRE2::8BIT"
       )
-    endif ()
+    endif()
 
     set(PCRE2_LIBRARIES ${PCRE2_LIBRARIES} ${PCRE2_${component}_LIBRARY})
     mark_as_advanced(PCRE2_${component}_LIBRARY)
   endforeach()
-endif ()
+endif()
 
-mark_as_advanced(
-  PCRE2_INCLUDE_DIR
-)
+mark_as_advanced(PCRE2_INCLUDE_DIR)

doc/html/README.txt

@@ -933,7 +933,6 @@ The distribution should contain the files listed below.
 (D) Auxiliary files for cmake support
 
   cmake/COPYING-CMAKE-SCRIPTS
-  cmake/FindPackageHandleStandardArgs.cmake
   cmake/FindEditline.cmake
   cmake/FindReadline.cmake
   CMakeLists.txt