Merge pull request InsightSoftwareConsortium#4258 from thewtex/group-…

…multiline Multiline module group definition
Kitware · Oct 8, 2023 · 90320e2 · 90320e2
2 parents bdcb9e3 + 3568eee
commit 90320e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CMake/ITKGroups.cmake b/CMake/ITKGroups.cmake
@@ -78,12 +78,12 @@ foreach(group ${group_list})
   set(_${group}_module_list)
   file(GLOB_RECURSE _${group}_module_files ${ITK_SOURCE_DIR}/Modules/${group}/itk-module.cmake)
   foreach(_module_file ${_${group}_module_files})
-    file(STRINGS ${_module_file} _module_line REGEX "itk_module[ \n]*\\([ \n]*[A-Za-z0-9]*")
+    file(READ ${_module_file} _module_file_content)
     string(
       REGEX MATCH
-            "(\\([ \n]*)([A-Za-z0-9]*)"
+            "itk_module[ \n]*(\\([ \n]*)([A-Za-z0-9]*)"
             _module_name
-            ${_module_line})
+            ${_module_file_content})
     set(_module_name ${CMAKE_MATCH_2})
     set(_${_module_name}_module_line ${_module_line})
     list(APPEND _${group}_module_list ${_module_name})

diff --git a/CMake/ITKModuleEnablement.cmake b/CMake/ITKModuleEnablement.cmake
@@ -1,7 +1,7 @@
 # This script sorts out the module dependencies, provides user options for customizing
 # the list of modules to be built, and enables modules accordingly.
 
-macro(itk_module_load_DAG)
+macro(itk_module_load_dag)
   set(ITK_MODULES_ALL)
   file(
     GLOB_RECURSE meta