mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'Tasking-regex-fix'

Browse Source 
5b03fecb8f Tasking: Simplify processor list matching regex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7752
This commit is contained in:
Brad King
2022-10-07 15:22:38 +00:00
committed by Kitware Robot
parent a07be2ffd1 5b03fecb8f
commit 269652a814
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/Compiler/Tasking.cmake
View File

@@ -21,9 +21,9 @@ function(__tasking_set_processor_list lang out_var)
execute_process(COMMAND "${CMAKE_${lang}_COMPILER}" --cpu-list
OUTPUT_VARIABLE processor_list
ERROR_VARIABLE processor_list)
string(REGEX MATCHALL "[ ]+([A-Za-z0-9_]+)[ ]+[^ ]([^ ]+ ?)*[ ]+[A-Za-z0-9\\.]+[ ]+[A-Za-z0-9\.]+\n" processor_list "${processor_list}")
string(REGEX MATCHALL " +([A-Za-z0-9_]+)[^\n]+\n" processor_list "${processor_list}")
list(POP_FRONT processor_list)
string(REGEX REPLACE "[ ]+([A-Za-z0-9_]+)[ ]+[^ ]([^ ]+ ?)*[ ]+[A-Za-z0-9\\.]+[ ]+[A-Za-z0-9\.]+\n" "\\1" processor_list "${processor_list}")
string(REGEX REPLACE " +([A-Za-z0-9_]+)[^\n]+\n" "\\1" processor_list "${processor_list}")
set(${out_var} "${processor_list}" PARENT_SCOPE)
endfunction()