diff options
author | Chuck Atkins <chuck.atkins@kitware.com> | 2014-09-03 21:00:48 (GMT) |
---|---|---|
committer | Chuck Atkins <chuck.atkins@kitware.com> | 2014-09-03 21:00:48 (GMT) |
commit | 3e84e78c3fcd2575a4159c3a1619833a7a80ef17 (patch) | |
tree | 968ce764d01dc78dd6b09d941d42465e2a8b80d7 /Modules/FortranCInterface/Detect.cmake | |
parent | fb8acb74e83a591c1231c4a07c221f4392f4c0be (diff) | |
download | CMake-3e84e78c3fcd2575a4159c3a1619833a7a80ef17.zip CMake-3e84e78c3fcd2575a4159c3a1619833a7a80ef17.tar.gz CMake-3e84e78c3fcd2575a4159c3a1619833a7a80ef17.tar.bz2 |
Use a more reliable regex for extracting binary INFO strings
A few different regular expressions were being used in various
places to extract info strings from binaries. This uses a
consistent regex amongst all of them now. This also fixes the
broken ABI detection for Cray compilers.
Diffstat (limited to 'Modules/FortranCInterface/Detect.cmake')
-rw-r--r-- | Modules/FortranCInterface/Detect.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FortranCInterface/Detect.cmake b/Modules/FortranCInterface/Detect.cmake index ceb1db4..bee7dae 100644 --- a/Modules/FortranCInterface/Detect.cmake +++ b/Modules/FortranCInterface/Detect.cmake @@ -67,7 +67,7 @@ endif() set(FortranCInterface_SYMBOLS) if(FortranCInterface_EXE) file(STRINGS "${FortranCInterface_EXE}" _info_strings - LIMIT_COUNT 8 REGEX "INFO:[^[]*\\[") + LIMIT_COUNT 8 REGEX "INFO:[A-Za-z0-9_]+\\[[^]]*\\]") foreach(info ${_info_strings}) if("${info}" MATCHES "INFO:symbol\\[([^]]*)\\]") list(APPEND FortranCInterface_SYMBOLS ${CMAKE_MATCH_1}) |