Cherry-picking some changes from stabilization into development (#5810)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-19 15:59:21 -08:00
parent 6eec6c8f8e
commit 7100d48e16
6 changed files with 23 additions and 7 deletions
@@ -11,3 +11,8 @@ set(LY_VERSION_COPYRIGHT_YEAR ${current_year} CACHE STRING "Open 3D Engine's cop
 set(LY_VERSION_STRING "0.0.0.0" CACHE STRING "Open 3D Engine's version")
 set(LY_VERSION_BUILD_NUMBER 0 CACHE STRING "Open 3D Engine's build number")
 set(LY_VERSION_ENGINE_NAME "o3de" CACHE STRING "Open 3D Engine's engine name")
+
+if("$ENV{O3DE_VERSION}")
+    # Overriding through environment
+    set(LY_VERSION_STRING "$ENV{O3DE_VERSION}")
+endif()