diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-05-29 11:44:22 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-05-29 11:44:22 -0700 |
| commit | ebc604fa8d12fb08fda1ac55aae817ad0135bb6b (patch) | |
| tree | 2487b5bd256188a0c49a1d46265d75f3190dd53c /indra/cmake | |
| parent | 85dde8d591aabe03b01720a22f91e54fc3d04552 (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
Merge with 3.5.4 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}") |