Ver código fonte

Merge pull request #6229 from aws-lumberyard-dev/Prism/InstallerVersionBuildNumber

Force string check on build version numbers so that versions such as 21.11.1 are detected correctly.
AMZN-Phil 3 anos atrás
pai
commit
0b028a827c
1 arquivos alterados com 2 adições e 2 exclusões
  1. 2 2
      cmake/Version.cmake

+ 2 - 2
cmake/Version.cmake

@@ -12,12 +12,12 @@ 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}")
+if(NOT "$ENV{O3DE_VERSION}" STREQUAL "")
     # Overriding through environment
     set(LY_VERSION_STRING "$ENV{O3DE_VERSION}")
 endif()
 
-if("$ENV{O3DE_BUILD_VERSION}")
+if(NOT "$ENV{O3DE_BUILD_VERSION}" STREQUAL "")
     # Overriding through environment
     set(LY_VERSION_BUILD_NUMBER "$ENV{O3DE_BUILD_VERSION}")
 endif()