diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-06-07 19:34:34 +0300 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-06-07 19:34:34 +0300 |
| commit | 15b6a395d00d55c50e98c86498669bd06782cb15 (patch) | |
| tree | 0a64d37e2b21c5e084d7855be7128c28f458ac89 /indra/cmake/BuildVersion.cmake | |
| parent | 57b21335ba232d4023ec2cda81153d02bc190f6b (diff) | |
| parent | 0bcb1db3ea8056e96b6cb087758e6ee57bc122a3 (diff) | |
merge
Diffstat (limited to 'indra/cmake/BuildVersion.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}") |