[build] Make custom CMake macros use lowercase (#5594)

Most of them already do use lowercase, and uppercase is like screaming at the user.
2026-06-19 00:41:43 +00:00 · 2023-08-30 21:17:09 -07:00
parent 45e7720ec1
commit 383289bc4b
12 changed files with 45 additions and 45 deletions
--- a/apriltag/CMakeLists.txt
+++ b/apriltag/CMakeLists.txt
@@ -70,7 +70,7 @@ if (WITH_JAVA)

 endif()

-GENERATE_RESOURCES(src/main/native/resources/edu/wpi/first/apriltag generated/main/cpp APRILTAG frc apriltag_resources_src)
+generate_resources(src/main/native/resources/edu/wpi/first/apriltag generated/main/cpp APRILTAG frc apriltag_resources_src)

 file(GLOB apriltag_native_src src/main/native/cpp/*.cpp)

--- a/cmake/modules/GenResources.cmake
+++ b/cmake/modules/GenResources.cmake
@@ -1,26 +1,26 @@
-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}")
+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}")

-    ADD_CUSTOM_COMMAND(
+    add_custom_command(
      OUTPUT ${output}
      COMMAND ${CMAKE_COMMAND}
        "-Dinput=${input}"
        "-Doutput=${output}"
        "-Dprefix=${prefix}"
        "-Dnamespace=${namespace}"
-        -P "${SCRIPTS_DIR}/GenResource.cmake"
+        -P "${scripts_dir}/GenResource.cmake"
      MAIN_DEPENDENCY ${input}
-      DEPENDS ${SCRIPTS_DIR}/GenResource.cmake
+      DEPENDS ${scripts_dir}/GenResource.cmake
      VERBATIM
    )
-  ENDFOREACH()
-ENDMACRO()
+  endforeach()
+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})
-ENDMACRO()
+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})
+endmacro()

-MACRO(ADD_ALL_SUBDIRECTORIES curdir)
-  SUBDIR_LIST (_SUBPROJECTS ${curdir})
-  FOREACH (dir ${_SUBPROJECTS})
-    ADD_SUBDIRECTORY (${dir})
-  ENDFOREACH ()
-ENDMACRO()
+macro(add_all_subdirectories curdir)
+  subdir_list(_SUBPROJECTS ${curdir})
+  foreach(dir ${_SUBPROJECTS})
+    add_subdirectory(${dir})
+  endforeach()
+endmacro()
--- a/cscore/CMakeLists.txt
+++ b/cscore/CMakeLists.txt
@@ -53,7 +53,7 @@ configure_file(cscore-config.cmake.in ${WPILIB_BINARY_DIR}/cscore-config.cmake )
 install(FILES ${WPILIB_BINARY_DIR}/cscore-config.cmake DESTINATION ${cscore_config_dir})
 install(EXPORT cscore DESTINATION ${cscore_config_dir})

-SUBDIR_LIST(cscore_examples "${CMAKE_CURRENT_SOURCE_DIR}/examples")
+subdir_list(cscore_examples "${CMAKE_CURRENT_SOURCE_DIR}/examples")
 foreach(example ${cscore_examples})
    file(GLOB cscore_example_src examples/${example}/*.cpp)
    unset(add_libs)
--- a/datalogtool/CMakeLists.txt
+++ b/datalogtool/CMakeLists.txt
@@ -5,7 +5,7 @@ include(GenResources)
 include(LinkMacOSGUI)

 configure_file(src/main/generate/WPILibVersion.cpp.in WPILibVersion.cpp)
-GENERATE_RESOURCES(src/main/native/resources generated/main/cpp DLT dlt datalogtool_resources_src)
+generate_resources(src/main/native/resources generated/main/cpp DLT dlt datalogtool_resources_src)

 file(GLOB datalogtool_src src/main/native/cpp/*.cpp ${CMAKE_CURRENT_BINARY_DIR}/WPILibVersion.cpp)

--- a/fieldImages/CMakeLists.txt
+++ b/fieldImages/CMakeLists.txt
@@ -22,7 +22,7 @@ if (WITH_JAVA)
 endif()


-GENERATE_RESOURCES(src/main/native/resources/edu/wpi/first/fields generated/main/cpp FIELDS fields field_images_resources_src)
+generate_resources(src/main/native/resources/edu/wpi/first/fields generated/main/cpp FIELDS fields field_images_resources_src)


 add_library(fieldImages src/main/native/cpp/fields.cpp ${field_images_resources_src})
--- a/glass/CMakeLists.txt
+++ b/glass/CMakeLists.txt
@@ -51,7 +51,7 @@ install(DIRECTORY src/libnt/native/include/ DESTINATION "${include_dest}/glass")
 #

 configure_file(src/app/generate/WPILibVersion.cpp.in WPILibVersion.cpp)
-GENERATE_RESOURCES(src/app/native/resources generated/app/cpp GLASS glass glass_resources_src)
+generate_resources(src/app/native/resources generated/app/cpp GLASS glass glass_resources_src)

 file(GLOB glass_src src/app/native/cpp/*.cpp ${CMAKE_CURRENT_BINARY_DIR}/WPILibVersion.cpp)

--- a/outlineviewer/CMakeLists.txt
+++ b/outlineviewer/CMakeLists.txt
@@ -5,7 +5,7 @@ include(GenResources)
 include(LinkMacOSGUI)

 configure_file(src/main/generate/WPILibVersion.cpp.in WPILibVersion.cpp)
-GENERATE_RESOURCES(src/main/native/resources generated/main/cpp OV ov outlineviewer_resources_src)
+generate_resources(src/main/native/resources generated/main/cpp OV ov outlineviewer_resources_src)

 file(GLOB outlineviewer_src src/main/native/cpp/*.cpp ${CMAKE_CURRENT_BINARY_DIR}/WPILibVersion.cpp)

--- a/roborioteamnumbersetter/CMakeLists.txt
+++ b/roborioteamnumbersetter/CMakeLists.txt
@@ -5,7 +5,7 @@ include(GenResources)
 include(LinkMacOSGUI)

 configure_file(src/main/generate/WPILibVersion.cpp.in WPILibVersion.cpp)
-GENERATE_RESOURCES(src/main/native/resources generated/main/cpp RTNS rtns rtns_resources_src)
+generate_resources(src/main/native/resources generated/main/cpp RTNS rtns rtns_resources_src)

 file(GLOB rtns_src src/main/native/cpp/*.cpp ${CMAKE_CURRENT_BINARY_DIR}/WPILibVersion.cpp)

--- a/wpilibcExamples/CMakeLists.txt
+++ b/wpilibcExamples/CMakeLists.txt
@@ -3,8 +3,8 @@ project(wpilibcExamples)
 include(AddTest)
 include(SubDirList)

-SUBDIR_LIST(TEMPLATES ${CMAKE_SOURCE_DIR}/wpilibcExamples/src/main/cpp/templates)
-SUBDIR_LIST(EXAMPLES  ${CMAKE_SOURCE_DIR}/wpilibcExamples/src/main/cpp/examples)
+subdir_list(TEMPLATES ${CMAKE_SOURCE_DIR}/wpilibcExamples/src/main/cpp/templates)
+subdir_list(EXAMPLES  ${CMAKE_SOURCE_DIR}/wpilibcExamples/src/main/cpp/examples)

 foreach(example ${EXAMPLES})
  file(GLOB_RECURSE sources src/main/cpp/examples/${example}/cpp/*.cpp
--- a/wpinet/CMakeLists.txt
+++ b/wpinet/CMakeLists.txt
@@ -52,7 +52,7 @@ if (NOT MSVC AND NOT APPLE)
    endif()
 endif()

-GENERATE_RESOURCES(src/main/native/resources generated/main/cpp WPI wpi wpinet_resources_src)
+generate_resources(src/main/native/resources generated/main/cpp WPI wpi wpinet_resources_src)

 file(GLOB_RECURSE wpinet_native_src src/main/native/cpp/*.cpp src/main/native/thirdparty/tcpsockets/cpp/*.cpp)
 list(REMOVE_ITEM wpinet_native_src ${wpinet_jni_src})
@@ -177,7 +177,7 @@ configure_file(wpinet-config.cmake.in ${WPILIB_BINARY_DIR}/wpinet-config.cmake )
 install(FILES ${WPILIB_BINARY_DIR}/wpinet-config.cmake DESTINATION ${wpinet_config_dir})
 install(EXPORT wpinet DESTINATION ${wpinet_config_dir})

-SUBDIR_LIST(wpinet_examples "${CMAKE_CURRENT_SOURCE_DIR}/examples")
+subdir_list(wpinet_examples "${CMAKE_CURRENT_SOURCE_DIR}/examples")
 foreach(example ${wpinet_examples})
    file(GLOB wpinet_example_src examples/${example}/*.cpp)
    if(wpinet_example_src)
--- a/wpiutil/CMakeLists.txt
+++ b/wpiutil/CMakeLists.txt
@@ -76,7 +76,7 @@ if (NOT MSVC AND NOT APPLE AND NOT ANDROID)
    endif()
 endif()

-GENERATE_RESOURCES(src/main/native/resources generated/main/cpp WPI wpi wpiutil_resources_src)
+generate_resources(src/main/native/resources generated/main/cpp WPI wpi wpiutil_resources_src)

 file(GLOB_RECURSE wpiutil_native_src src/main/native/cpp/*.cpp
                                     src/main/native/thirdparty/json/cpp/*.cpp
@@ -178,7 +178,7 @@ configure_file(wpiutil-config.cmake.in ${WPILIB_BINARY_DIR}/wpiutil-config.cmake
 install(FILES ${WPILIB_BINARY_DIR}/wpiutil-config.cmake DESTINATION ${wpiutil_config_dir})
 install(EXPORT wpiutil DESTINATION ${wpiutil_config_dir})

-SUBDIR_LIST(wpiutil_examples "${CMAKE_CURRENT_SOURCE_DIR}/examples")
+subdir_list(wpiutil_examples "${CMAKE_CURRENT_SOURCE_DIR}/examples")
 foreach(example ${wpiutil_examples})
    file(GLOB wpiutil_example_src examples/${example}/*.cpp)
    if(wpiutil_example_src)