[build] Apply a formatter for CMake files (#5973)

2026-07-03 03:01:44 +00:00 · 2023-11-30 19:52:21 -05:00
parent 9b8011aa67
commit 4fcf0b25a1
37 changed files with 1496 additions and 896 deletions
--- a/cmake/modules/AddTest.cmake
+++ b/cmake/modules/AddTest.cmake
@@ -4,10 +4,10 @@ macro(wpilib_add_test name srcdir)
    file(GLOB_RECURSE test_src ${srcdir}/*.cpp)
    add_executable(${name}_test ${test_src})
    wpilib_target_warnings(${name}_test)
-    if (BUILD_SHARED_LIBS)
+    if(BUILD_SHARED_LIBS)
        target_compile_definitions(${name}_test PRIVATE -DGTEST_LINKED_AS_SHARED_LIBRARY)
    endif()
-    if (MSVC)
+    if(MSVC)
        target_compile_options(${name}_test PRIVATE /wd4101 /wd4251)
    endif()
    add_test(NAME ${name} COMMAND ${name}_test)
--- a/cmake/modules/CompileWarnings.cmake
+++ b/cmake/modules/CompileWarnings.cmake
@@ -1,28 +1,48 @@
 macro(wpilib_target_warnings target)
    if(NOT MSVC)
-        target_compile_options(${target} PRIVATE -Wall -pedantic -Wextra -Werror -Wno-unused-parameter ${WPILIB_TARGET_WARNINGS})
+        target_compile_options(
+            ${target}
+            PRIVATE -Wall -pedantic -Wextra -Werror -Wno-unused-parameter ${WPILIB_TARGET_WARNINGS}
+        )
    else()
-        target_compile_options(${target} PRIVATE /wd4146 /wd4244 /wd4251 /wd4267 /WX /D_CRT_SECURE_NO_WARNINGS ${WPILIB_TARGET_WARNINGS})
+        target_compile_options(
+            ${target}
+            PRIVATE
+                /wd4146
+                /wd4244
+                /wd4251
+                /wd4267
+                /WX
+                /D_CRT_SECURE_NO_WARNINGS
+                ${WPILIB_TARGET_WARNINGS}
+        )
    endif()

    # Suppress C++-specific OpenCV warning; C compiler rejects it with an error
    # https://github.com/opencv/opencv/issues/20269
    if(UNIX AND NOT APPLE)
-        target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-enum-enum-conversion>)
+        target_compile_options(
+            ${target}
+            PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-enum-enum-conversion>
+        )
    elseif(UNIX AND APPLE)
-        target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-anon-enum-enum-conversion>)
+        target_compile_options(
+            ${target}
+            PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-anon-enum-enum-conversion>
+        )
    endif()

    # Suppress warning "enumeration types with a fixed underlying type are a
    # Clang extension"
    if(APPLE)
-      target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:C>:-Wno-fixed-enum-extension>)
+        target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:C>:-Wno-fixed-enum-extension>)
    endif()

    # Compress debug info with GCC
-    if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug" OR
-         ${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo") AND
-        ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-      target_compile_options(${target} PRIVATE -gz=zlib)
+    if(
+        (${CMAKE_BUILD_TYPE} STREQUAL "Debug" OR ${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
+        AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU"
+    )
+        target_compile_options(${target} PRIVATE -gz=zlib)
    endif()
 endmacro()
--- a/cmake/modules/DownloadAndCheck.cmake
+++ b/cmake/modules/DownloadAndCheck.cmake
@@ -1,11 +1,11 @@
 macro(download_and_check source destination)
-  file(DOWNLOAD ${source} ${destination} STATUS download_status)
-  list(GET download_status 0 status_code)
-  list(GET download_status 1 status_message)
+    file(DOWNLOAD ${source} ${destination} STATUS download_status)
+    list(GET download_status 0 status_code)
+    list(GET download_status 1 status_message)

-  if(${status_code} EQUAL 0)
-    message(VERBOSE "Download of \"${source}\" successful.")
-  else()
-    message(FATAL_ERROR "Download of \"${source}\" failed: ${status_message}")
-  endif()
+    if(${status_code} EQUAL 0)
+        message(VERBOSE "Download of \"${source}\" successful.")
+    else()
+        message(FATAL_ERROR "Download of \"${source}\" failed: ${status_message}")
+    endif()
 endmacro()
--- a/cmake/modules/FindLIBSSH.cmake
+++ b/cmake/modules/FindLIBSSH.cmake
@@ -38,30 +38,28 @@ if(LIBSSH_LIBRARIES AND LIBSSH_INCLUDE_DIRS)
    # in cache already
    set(LIBSSH_FOUND TRUE)
 else()
-    find_path(LIBSSH_INCLUDE_DIR
-        NAMES
-        libssh/libssh.h
+    find_path(
+        LIBSSH_INCLUDE_DIR
+        NAMES libssh/libssh.h
        PATHS
-        /usr/include
-        /usr/local/include
-        /opt/local/include
-        /sw/include
-        ${CMAKE_INCLUDE_PATH}
-        ${CMAKE_INSTALL_PREFIX}/include
+            /usr/include
+            /usr/local/include
+            /opt/local/include
+            /sw/include
+            ${CMAKE_INCLUDE_PATH}
+            ${CMAKE_INSTALL_PREFIX}/include
    )

-    find_library(LIBSSH_LIBRARY
-        NAMES
-        ssh.so
-        libssh.so
-        libssh.dylib
+    find_library(
+        LIBSSH_LIBRARY
+        NAMES ssh.so libssh.so libssh.dylib
        PATHS
-        /usr/lib
-        /usr/local/lib
-        /opt/local/lib
-        /sw/lib
-        ${CMAKE_LIBRARY_PATH}
-        ${CMAKE_INSTALL_PREFIX}/lib
+            /usr/lib
+            /usr/local/lib
+            /opt/local/lib
+            /sw/lib
+            ${CMAKE_LIBRARY_PATH}
+            ${CMAKE_INSTALL_PREFIX}/lib
    )

    if(LIBSSH_INCLUDE_DIR AND LIBSSH_LIBRARY)
@@ -71,34 +69,60 @@ else()
        else()
            set(LIBSSH_HEADER_PATH ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h)
        endif()
-        file(STRINGS ${LIBSSH_HEADER_PATH} LIBSSH_VERSION_MAJOR
-            REGEX "#define[ ]+LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
+        file(
+            STRINGS
+            ${LIBSSH_HEADER_PATH}
+            LIBSSH_VERSION_MAJOR
+            REGEX "#define[ ]+LIBSSH_VERSION_MAJOR[ ]+[0-9]+"
+        )
        if(NOT LIBSSH_VERSION_MAJOR)
-            message(STATUS "LIBSSH_VERSION_MAJOR not found, assuming libssh is too old and cannot be used!")
+            message(
+                STATUS
+                "LIBSSH_VERSION_MAJOR not found, assuming libssh is too old and cannot be used!"
+            )
            set(LIBSSH_INCLUDE_DIR "LIBSSH_INCLUDE_DIR-NOTFOUND")
            set(LIBSSH_LIBRARY "LIBSSH_LIBRARY-NOTFOUND")
        else()
            string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MAJOR ${LIBSSH_VERSION_MAJOR})
-            file(STRINGS ${LIBSSH_HEADER_PATH} LIBSSH_VERSION_MINOR
-                REGEX "#define[ ]+LIBSSH_VERSION_MINOR[ ]+[0-9]+")
+            file(
+                STRINGS
+                ${LIBSSH_HEADER_PATH}
+                LIBSSH_VERSION_MINOR
+                REGEX "#define[ ]+LIBSSH_VERSION_MINOR[ ]+[0-9]+"
+            )
            string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MINOR ${LIBSSH_VERSION_MINOR})
-            file(STRINGS ${LIBSSH_HEADER_PATH} LIBSSH_VERSION_PATCH
-                REGEX "#define[ ]+LIBSSH_VERSION_MICRO[ ]+[0-9]+")
+            file(
+                STRINGS
+                ${LIBSSH_HEADER_PATH}
+                LIBSSH_VERSION_PATCH
+                REGEX "#define[ ]+LIBSSH_VERSION_MICRO[ ]+[0-9]+"
+            )
            string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_PATCH ${LIBSSH_VERSION_PATCH})

-            set(LIBSSH_VERSION ${LIBSSH_VERSION_MAJOR}.${LIBSSH_VERSION_MINOR}.${LIBSSH_VERSION_PATCH})
+            set(LIBSSH_VERSION
+                ${LIBSSH_VERSION_MAJOR}.${LIBSSH_VERSION_MINOR}.${LIBSSH_VERSION_PATCH}
+            )

            if(LIBSSH_VERSION VERSION_LESS 0.8.0)
                # libssh_threads also needs to be linked for these versions
-                string(REPLACE "libssh.so" "libssh_threads.so"
+                string(
+                    REPLACE
+                    "libssh.so"
+                    "libssh_threads.so"
                    LIBSSH_THREADS_LIBRARY
                    ${LIBSSH_LIBRARY}
                )
-                string(REPLACE "libssh.dylib" "libssh_threads.dylib"
+                string(
+                    REPLACE
+                    "libssh.dylib"
+                    "libssh_threads.dylib"
                    LIBSSH_THREADS_LIBRARY
                    ${LIBSSH_THREADS_LIBRARY}
                )
-                string(REPLACE "ssh.so" "ssh_threads.so"
+                string(
+                    REPLACE
+                    "ssh.so"
+                    "ssh_threads.so"
                    LIBSSH_THREADS_LIBRARY
                    ${LIBSSH_THREADS_LIBRARY}
                )
@@ -110,7 +134,10 @@ else()
    set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY} ${LIBSSH_THREADS_LIBRARY})
    mark_as_advanced(LIBSSH_INCLUDE_DIRS LIBSSH_LIBRARIES)

-    find_package_handle_standard_args(LIBSSH FOUND_VAR LIBSSH_FOUND
+    find_package_handle_standard_args(
+        LIBSSH
+        FOUND_VAR LIBSSH_FOUND
        REQUIRED_VARS LIBSSH_INCLUDE_DIRS LIBSSH_LIBRARIES
-        VERSION_VAR LIBSSH_VERSION)
+        VERSION_VAR LIBSSH_VERSION
+    )
 endif()
--- a/cmake/modules/GenResources.cmake
+++ b/cmake/modules/GenResources.cmake
@@ -1,26 +1,30 @@
 set(scripts_dir "${CMAKE_CURRENT_LIST_DIR}/../scripts")
-macro(generate_resources inputDir outputDir prefix namespace outputFiles)
-  file(GLOB inputFiles ${inputDir}/*)
-  set(${outputFiles})
-  foreach(input ${inputFiles})
-    get_filename_component(inputBase ${input} NAME)
-    if("${inputBase}" MATCHES "^\\.")
-      continue()
-    endif()
-    set(output "${outputDir}/${inputBase}.cpp")
-    list(APPEND ${outputFiles} "${output}")
+macro(
+    generate_resources
+    inputDir
+    outputDir
+    prefix
+    namespace
+    outputFiles
+)
+    file(GLOB inputFiles ${inputDir}/*)
+    set(${outputFiles})
+    foreach(input ${inputFiles})
+        get_filename_component(inputBase ${input} NAME)
+        if("${inputBase}" MATCHES "^\\.")
+            continue()
+        endif()
+        set(output "${outputDir}/${inputBase}.cpp")
+        list(APPEND ${outputFiles} "${output}")

-    add_custom_command(
-      OUTPUT ${output}
-      COMMAND ${CMAKE_COMMAND}
-        "-Dinput=${input}"
-        "-Doutput=${output}"
-        "-Dprefix=${prefix}"
-        "-Dnamespace=${namespace}"
-        -P "${scripts_dir}/GenResource.cmake"
-      MAIN_DEPENDENCY ${input}
-      DEPENDS ${scripts_dir}/GenResource.cmake
-      VERBATIM
-    )
-  endforeach()
+        add_custom_command(
+            OUTPUT ${output}
+            COMMAND
+                ${CMAKE_COMMAND} "-Dinput=${input}" "-Doutput=${output}" "-Dprefix=${prefix}"
+                "-Dnamespace=${namespace}" -P "${scripts_dir}/GenResource.cmake"
+            MAIN_DEPENDENCY ${input}
+            DEPENDS ${scripts_dir}/GenResource.cmake
+            VERBATIM
+        )
+    endforeach()
 endmacro()
--- a/cmake/modules/LinkMacOSGUI.cmake
+++ b/cmake/modules/LinkMacOSGUI.cmake
@@ -1,5 +1,8 @@
 macro(wpilib_link_macos_gui target)
-    if (APPLE)
-        set_target_properties(${target} PROPERTIES LINK_FLAGS "-framework Metal -framework QuartzCore")
+    if(APPLE)
+        set_target_properties(
+            ${target}
+            PROPERTIES LINK_FLAGS "-framework Metal -framework QuartzCore"
+        )
    endif()
 endmacro()
--- a/cmake/modules/SubDirList.cmake
+++ b/cmake/modules/SubDirList.cmake
@@ -1,17 +1,17 @@
 macro(subdir_list result curdir)
-  file(GLOB children RELATIVE ${curdir} ${curdir}/*)
-  set(dirlist "")
-  foreach(child ${children})
-    if(IS_DIRECTORY ${curdir}/${child})
-      list(APPEND dirlist ${child})
-    endif()
-  endforeach()
-  set(${result} ${dirlist})
+    file(GLOB children RELATIVE ${curdir} ${curdir}/*)
+    set(dirlist "")
+    foreach(child ${children})
+        if(IS_DIRECTORY ${curdir}/${child})
+            list(APPEND dirlist ${child})
+        endif()
+    endforeach()
+    set(${result} ${dirlist})
 endmacro()

 macro(add_all_subdirectories curdir)
-  subdir_list(_SUBPROJECTS ${curdir})
-  foreach(dir ${_SUBPROJECTS})
-    add_subdirectory(${dir})
-  endforeach()
+    subdir_list(_SUBPROJECTS ${curdir})
+    foreach(dir ${_SUBPROJECTS})
+        add_subdirectory(${dir})
+    endforeach()
 endmacro()