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 /Tests | |
| 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 'Tests')
| -rw-r--r-- | Tests/PerConfig/perconfig.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/PerConfig/perconfig.cmake b/Tests/PerConfig/perconfig.cmake index 0731041..5286307 100644 --- a/Tests/PerConfig/perconfig.cmake +++ b/Tests/PerConfig/perconfig.cmake @@ -29,7 +29,7 @@ endif() # Verify that the implementation files are named correctly. foreach(lib pcStatic pcShared) - file(STRINGS "${${lib}_file}" info LIMIT_COUNT 1 REGEX "INFO:[^[]*\\[") + file(STRINGS "${${lib}_file}" info LIMIT_COUNT 1 REGEX "INFO:[A-Za-z0-9_]+\\[[^]]*\\]") if(NOT "${info}" MATCHES "INFO:symbol\\[${lib}\\]") message(SEND_ERROR "No INFO:symbol[${lib}] found in:\n ${${lib}_file}") endif() |