Skip to content

Commit ddc40e1

Browse files
committed
BUG: Fix mapping of module name to group
Fix parsing of itk-module.cmake file to account for change introduced in InsightSoftwareConsortium/ITK@efa749515 (STYLE: Initial run of cmake-format) by implementing change similar to InsightSoftwareConsortium/ITK@6384cd067 (BUG: Fix ITKGroup identification with multiline itk_module)
1 parent 4936bcc commit ddc40e1

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -439,10 +439,9 @@ else()
439439
foreach(group IN LISTS ITK_GROUPS)
440440
file( GLOB_RECURSE _${group}_module_files ${ITK_SOURCE_DIR}/Modules/${group}/itk-module.cmake )
441441
foreach( _module_file ${_${group}_module_files} )
442-
file( STRINGS ${_module_file} _module_line REGEX "itk_module[ \n]*\\([ \n]*[A-Za-z0-9]*" )
443-
string( REGEX MATCH "(\\([ \n]*)([A-Za-z0-9]*)" _module_name ${_module_line} )
444-
set( _module_name ${CMAKE_MATCH_2} )
445-
set( _${_module_name}_module_line ${_module_line} )
442+
file(READ ${_module_file} _module_file_content)
443+
string( REGEX MATCH "itk_module[ \n]*(\\([ \n]*)([A-Za-z0-9]*)" _module_name ${_module_file_content} )
444+
set(_module_name ${CMAKE_MATCH_2})
446445
list( APPEND _${group}_module_list ${_module_name} )
447446
set(ITK_MODULE_${_module_name}_GROUP ${group})
448447
endforeach()

0 commit comments

Comments
 (0)