diff options
| author | David Cole <david.cole@kitware.com> | 2012-03-21 13:27:50 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-03-21 13:27:50 -0400 |
| commit | d6d221d4bd64604a525a9d8880b6b8f910704784 (patch) | |
| tree | 02008a574ee6b898a66af03b1da381478870fee7 /Tests | |
| parent | 5f5ce26cb73bffc9fd348d5f82dfa7931a36a528 (diff) | |
| parent | a5ee62851973713e15147d046d7d0d4abcfdd078 (diff) | |
| download | cmake-d6d221d4bd64604a525a9d8880b6b8f910704784.tar.gz | |
Merge topic 'fix-AllFindModules-version-check'
a5ee628 Tests: Relax restrictions on version variable contents
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt index 22b1b7b209..6604208747 100644 --- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt +++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt @@ -48,11 +48,21 @@ endif (NOT QT4_FOUND) macro(check_version_string MODULE_NAME VERSION_VAR) if (${MODULE_NAME}_FOUND) if (DEFINED ${VERSION_VAR}) - if (NOT ${VERSION_VAR} MATCHES "^[0-9][0-9\\.]*[-A-Za-z_\\+]*[0-9\\.]*$") - message(SEND_ERROR "${VERSION_VAR} has unexpected content ${${VERSION_VAR}}") + message(STATUS "${VERSION_VAR}='${${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() 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 () endmacro(check_version_string) |