diff options
| author | Geenz <geenz@geenzo.com> | 2013-06-17 04:39:47 -0400 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-06-17 04:39:47 -0400 |
| commit | 0af636e63270047a61ced51b7f3b22f45003120a (patch) | |
| tree | eefb829c8d2afb0489eccc456db8e134718bf145 /indra/cmake | |
| parent | 7decac40e6453b2d8822d2677b9b59300bc260cf (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
Merged with viewer-release
Diffstat (limited to 'indra/cmake')
| -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}") |