Commit d6d221d4 authored by David Cole's avatar David Cole Committed by Kitware Robot
Browse files

Merge topic 'fix-AllFindModules-version-check'

a5ee6285 Tests: Relax restrictions on version variable contents
parents 5f5ce26c a5ee6285
...@@ -48,11 +48,21 @@ endif (NOT QT4_FOUND) ...@@ -48,11 +48,21 @@ endif (NOT QT4_FOUND)
macro(check_version_string MODULE_NAME VERSION_VAR) macro(check_version_string MODULE_NAME VERSION_VAR)
if (${MODULE_NAME}_FOUND) if (${MODULE_NAME}_FOUND)
if (DEFINED ${VERSION_VAR}) if (DEFINED ${VERSION_VAR})
if (NOT ${VERSION_VAR} MATCHES "^[0-9][0-9\\.]*[-A-Za-z_\\+]*[0-9\\.]*$") message(STATUS "${VERSION_VAR}='${${VERSION_VAR}}'")
message(SEND_ERROR "${VERSION_VAR} has unexpected content ${${VERSION_VAR}}") if (NOT ${VERSION_VAR} MATCHES "^[0-9]")
message(SEND_ERROR "unexpected: ${VERSION_VAR} does not begin with a decimal digit")
endif()
if ("${${VERSION_VAR}}" STREQUAL "")
message(SEND_ERROR "unexpected: ${VERSION_VAR} is empty")
endif()
if (${VERSION_VAR} VERSION_EQUAL 0)
message(SEND_ERROR "unexpected: ${VERSION_VAR} is VERSION_EQUAL 0")
endif()
if (NOT ${VERSION_VAR} VERSION_GREATER 0)
message(SEND_ERROR "unexpected: ${VERSION_VAR} is NOT VERSION_GREATER 0")
endif() endif()
else() else()
message(SEND_ERROR "${MODULE_NAME}_FOUND is set but no version number is defined") message(SEND_ERROR "${MODULE_NAME}_FOUND is set but version number variable ${VERSION_VAR} is NOT DEFINED")
endif() endif()
endif () endif ()
endmacro(check_version_string) endmacro(check_version_string)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment