diff options
author | Oz Linden <oz@lindenlab.com> | 2017-02-22 17:34:46 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2017-02-22 17:34:46 -0500 |
commit | f0b256b1cb6c96aed81ee456e505247fd2169c5f (patch) | |
tree | 5a04f9ef98a16913a9af6da2f173c0b7710594bb | |
parent | f77af9df438e0f955a4cf5c550f5eb3d3c919519 (diff) |
correct merge error in BuildVersion.cmake
-rw-r--r-- | indra/cmake/BuildVersion.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake index 9ee055b59a..157fdd07e4 100644 --- a/indra/cmake/BuildVersion.cmake +++ b/indra/cmake/BuildVersion.cmake @@ -14,7 +14,7 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n set(VIEWER_VERSION_REVISION $ENV{revision}) message(STATUS "Revision (from environment): ${VIEWER_VERSION_REVISION}") - elif (DEFINED ENV{AUTOBUILD_BUILD_ID}) + elseif (DEFINED ENV{AUTOBUILD_BUILD_ID}) set(VIEWER_VERSION_REVISION $ENV{AUTOBUILD_BUILD_ID}) message(STATUS "Revision (from autobuild environment): ${VIEWER_VERSION_REVISION}") |