diff options
| author | Roman Wüger <roman.wueger@gmx.at> | 2017-07-17 09:30:04 (GMT) |
|---|---|---|
| committer | Roman Wüger <roman.wueger@gmx.at> | 2017-07-17 09:30:04 (GMT) |
| commit | 8eb1cb3ff1938f4c216d08860f7cf8e07ec71537 (patch) | |
| tree | 90147bb5d92edca8e01dce05b489bfbc0063ad7f /Modules/Platform | |
| parent | 2d5e494637f9dad13fd0206ac3420e7d26f8b778 (diff) | |
| download | CMake-8eb1cb3ff1938f4c216d08860f7cf8e07ec71537.zip CMake-8eb1cb3ff1938f4c216d08860f7cf8e07ec71537.tar.gz CMake-8eb1cb3ff1938f4c216d08860f7cf8e07ec71537.tar.bz2 | |
GHS: Correct the regex for the intXXXX directory detection.
The int directory does not only need to contain digits.
E.g. C:\GHS\int409a is a valid Green Hills installation
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/GHS-MULTI-Initialize.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/GHS-MULTI-Initialize.cmake b/Modules/Platform/GHS-MULTI-Initialize.cmake index fcda6f6..bf61d7b 100644 --- a/Modules/Platform/GHS-MULTI-Initialize.cmake +++ b/Modules/Platform/GHS-MULTI-Initialize.cmake @@ -10,7 +10,7 @@ if (NOT GHS_INT_DIRECTORY) if (EXISTS ${GHS_EXPECTED_ROOT}) FILE(GLOB GHS_CANDIDATE_INT_DIRS RELATIVE ${GHS_EXPECTED_ROOT} ${GHS_EXPECTED_ROOT}/*) - string(REGEX MATCHALL "int[0-9][0-9][0-9][0-9]" GHS_CANDIDATE_INT_DIRS + string(REGEX MATCHALL "int[0-9][0-9][0-9][0-9a-z]" GHS_CANDIDATE_INT_DIRS ${GHS_CANDIDATE_INT_DIRS}) if (GHS_CANDIDATE_INT_DIRS) list(SORT GHS_CANDIDATE_INT_DIRS) |