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

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

Gems/Multiplayer/Code/CMakeLists.txt

@@ -133,7 +133,6 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
                 Gem::Atom_RHI.Reflect
                 Gem::Multiplayer.Static
                 Gem::Multiplayer.Tools.Static
-                Gem::Multiplayer.Builders
     )
     
     ly_create_alias(NAME Multiplayer.Builders  NAMESPACE Gem TARGETS Gem::Multiplayer.Editor)

cmake/Platform/Common/Install_common.cmake

@@ -224,8 +224,14 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME absolute_tar
         if("${target_type}" STREQUAL "STATIC_LIBRARY")
             set(build_deps_target "${build_deps_target};${build_deps_PRIVATE}")
         endif()
-        # But we will also pass the private dependencies as runtime dependencies (note the comment above)
-        set(RUNTIME_DEPENDENCIES_PLACEHOLDER ${build_deps_PRIVATE})
+
+        # But we will also pass the private dependencies as runtime dependencies (as long as they are targets, note the comment above)
+        foreach(build_dep_private IN LISTS build_deps_PRIVATE)
+            if(TARGET ${build_dep_private})
+                list(APPEND RUNTIME_DEPENDENCIES_PLACEHOLDER "${build_dep_private}")
+            endif()
+        endforeach()
+        
         foreach(build_dependency IN LISTS build_deps_target)
             # Skip wrapping produced when targets are not created in the same directory
             if(build_dependency)
@@ -809,4 +815,4 @@ set(LY_CORE_COMPONENT_ALREADY_INCLUDED FALSE)"
         ly_post_install_steps()
     endif()
 
-endfunction()
+endfunction()

cmake/Platform/Mac/Install_mac.cmake

@@ -147,4 +147,3 @@ function(ly_post_install_steps)
     ")
 
 endfunction()
-

cmake/Version.cmake

@@ -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()

scripts/build/Platform/Windows/env_windows.cmd

@@ -7,6 +7,10 @@ REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
 REM
 
+REM To get recursive folder creation
+SETLOCAL EnableExtensions
+SETLOCAL EnableDelayedExpansion
+
 where /Q cmake
 IF NOT %ERRORLEVEL%==0 (
     ECHO [ci_build] CMake not found
@@ -28,6 +32,9 @@ IF NOT "%TMP%"=="" (
         SET TEMP=%cd%/temp
     )
 )
+IF NOT EXIST "!TMP!" (
+    MKDIR "!TMP!"
+)
 
 EXIT /b 0
 

scripts/build/Platform/Windows/installer_windows.cmd

@@ -20,8 +20,8 @@ PUSHD %OUTPUT_DIRECTORY%
 REM Override the temporary directory used by wix to the workspace (if we have a WORKSPACE_TMP)
 IF NOT "%WORKSPACE_TMP%"=="" (
     SET "WIX_TEMP=!WORKSPACE_TMP!/wix"
-    IF NOT EXIST "%WIX_TEMP%" (
-        MKDIR "%WIX_TEMP%"
+    IF NOT EXIST "!WIX_TEMP!" (
+        MKDIR "!WIX_TEMP!"
     )
 )