diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-21 15:44:08 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-21 15:44:08 -0400 |
| commit | 70b0b2a2e3d4661d5df2a487cf519a4509a89c6f (patch) | |
| tree | 94c353e0f94fdda35ad738ad9a609e395c1796b6 | |
| parent | c13d75dc386db883c35624a92ca452e04cc1365a (diff) | |
revise test for hg to detect and ignore incorrect results from cygwin hg
| -rwxr-xr-x | indra/cmake/BuildVersion.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake index c494355746..0094e313c7 100755 --- a/indra/cmake/BuildVersion.cmake +++ b/indra/cmake/BuildVersion.cmake @@ -22,12 +22,12 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n OUTPUT_VARIABLE VIEWER_VERSION_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE ) - if (DEFINED VIEWER_VERSION_REVISION) + if ("${VIEWER_VERSION_REVISION}" MATCHES "^[0-9]+$") message("Revision (from hg) ${VIEWER_VERSION_REVISION}") - else (DEFINED VIEWER_VERSION_REVISION) + else ("${VIEWER_VERSION_REVISION}" MATCHES "^[0-9]+$") set(VIEWER_VERSION_REVISION 0 ) message("Revision not set, repository not found, using ${VIEWER_VERSION_REVISION}") - endif (DEFINED VIEWER_VERSION_REVISION) + endif ("${VIEWER_VERSION_REVISION}" MATCHES "^[0-9]+$") else (DEFINED MERCURIAL) set(VIEWER_VERSION_REVISION 0) message("Revision not set, 'hg' not found (${MERCURIAL}), using ${VIEWER_VERSION_REVISION}") |