Merge topic 'modules-no-soname'

21d99aa3 Tests: Use a less strict regular expression to look for "SONAME"
This commit is contained in:
Brad King 2015-09-02 09:58:28 -04:00 committed by CMake Topic Stage
commit e1c58e0bfa
3 changed files with 3 additions and 3 deletions

View File

@ -1,5 +1,5 @@
execute_process(COMMAND ${readelf} -d ${lib} OUTPUT_FILE ${lib}.readelf.txt) execute_process(COMMAND ${readelf} -d ${lib} OUTPUT_FILE ${lib}.readelf.txt)
file(STRINGS ${lib}.readelf.txt soname REGEX "\\(SONAME\\)") file(STRINGS ${lib}.readelf.txt soname REGEX "SONAME")
if(soname) if(soname)
message(FATAL_ERROR "${lib} has soname but should not:\n ${soname}") message(FATAL_ERROR "${lib} has soname but should not:\n ${soname}")
else() else()

View File

@ -1,5 +1,5 @@
execute_process(COMMAND ${readelf} -d ${lib} OUTPUT_FILE ${lib}.readelf.txt) execute_process(COMMAND ${readelf} -d ${lib} OUTPUT_FILE ${lib}.readelf.txt)
file(STRINGS ${lib}.readelf.txt soname REGEX "\\(SONAME\\)") file(STRINGS ${lib}.readelf.txt soname REGEX "SONAME")
if(soname) if(soname)
message(STATUS "${lib} has soname as expected:\n ${soname}") message(STATUS "${lib} has soname as expected:\n ${soname}")
else() else()

View File

@ -1,5 +1,5 @@
execute_process(COMMAND ${readelf} -d ${mod} OUTPUT_FILE ${mod}.readelf.txt) execute_process(COMMAND ${readelf} -d ${mod} OUTPUT_FILE ${mod}.readelf.txt)
file(STRINGS ${mod}.readelf.txt soname REGEX "\\(SONAME\\)") file(STRINGS ${mod}.readelf.txt soname REGEX "SONAME")
if(soname) if(soname)
message(FATAL_ERROR "${mod} has soname but should not:\n ${soname}") message(FATAL_ERROR "${mod} has soname but should not:\n ${soname}")
else() else()