diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-18 15:12:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-07-18 15:12:33 (GMT) |
| commit | b10d919de763000801cbffd4f58cbd0c4a1ad7a0 (patch) | |
| tree | 2d75817e2a343fecec6071e08bce294919f60c40 /Modules | |
| parent | 787017451c437713b05a2ffc6fe609ea7da5f95b (diff) | |
| parent | 8eb1cb3ff1938f4c216d08860f7cf8e07ec71537 (diff) | |
| download | CMake-b10d919de763000801cbffd4f58cbd0c4a1ad7a0.zip CMake-b10d919de763000801cbffd4f58cbd0c4a1ad7a0.tar.gz CMake-b10d919de763000801cbffd4f58cbd0c4a1ad7a0.tar.bz2 | |
Merge topic 'GHS_int_detection'
8eb1cb3f GHS: Correct the regex for the intXXXX directory detection.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1062
Diffstat (limited to 'Modules')
| -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) |