diff options
| author | Hutchings Samuel (ETAS/ERS-PRM) <Samuel.Hutchings@etas.com> | 2022-10-07 11:04:13 (GMT) |
|---|---|---|
| committer | Hutchings Samuel (ETAS/ERS-PRM) <Samuel.Hutchings@etas.com> | 2022-10-07 11:04:13 (GMT) |
| commit | 5b03fecb8f11c05cdc27b47c4b48c21c3453130c (patch) | |
| tree | e6878e9522b9253d7774d81428295527c81e7029 /Modules/Compiler | |
| parent | eaeb9b60404c51f9f84cd93d751e27c38cb4c041 (diff) | |
| download | CMake-5b03fecb8f11c05cdc27b47c4b48c21c3453130c.zip CMake-5b03fecb8f11c05cdc27b47c4b48c21c3453130c.tar.gz CMake-5b03fecb8f11c05cdc27b47c4b48c21c3453130c.tar.bz2 | |
Tasking: Simplify processor list matching regex
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/Tasking.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Compiler/Tasking.cmake b/Modules/Compiler/Tasking.cmake index 30d4c69..d0c2f79 100644 --- a/Modules/Compiler/Tasking.cmake +++ b/Modules/Compiler/Tasking.cmake @@ -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() |