Merge branch 'stabilization/2106' of https://github.com/aws-lumberyard/o3de into carlito/stabilization/2106

5 years ago · 8d35a4255e
parent a766e3af5c 5f82e5a111
commit 8d35a4255e
13 changed files with 101 additions and 96 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -88,6 +88,10 @@ if(NOT INSTALLED_ENGINE)
    # Add external subdirectories listed in the engine.json. LY_EXTERNAL_SUBDIRS is a cache variable so the user can add extra
    # external subdirectories
    add_engine_json_external_subdirectories()
+else()
+    ly_find_o3de_packages()
+endif()
+
 get_property(external_subdirs GLOBAL PROPERTY LY_EXTERNAL_SUBDIRS)
 list(APPEND LY_EXTERNAL_SUBDIRS ${external_subdirs})

@ -106,10 +110,6 @@ if(NOT INSTALLED_ENGINE)
    add_subdirectory(${external_directory} ${CMAKE_BINARY_DIR}/External/${directory_name}-${full_directory_hash})
 endforeach()

-else()
-    ly_find_o3de_packages()
-endif()
-
 ################################################################################
 # Post-processing
 ################################################################################
--- a/Code/Framework/AzTest/CMakeLists.txt
+++ b/Code/Framework/AzTest/CMakeLists.txt
@ -9,8 +9,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
   
-if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-    
 ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/AzTest/Platform/${PAL_PLATFORM_NAME})

 ly_add_target(
@ -32,5 +30,3 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
    PLATFORM_INCLUDE_FILES
            ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
 )
-
-endif()
--- a/Code/LauncherUnified/launcher_generator.cmake
+++ b/Code/LauncherUnified/launcher_generator.cmake
@ -16,6 +16,7 @@ set_property(GLOBAL PROPERTY LAUNCHER_UNIFIED_BINARY_DIR ${CMAKE_CURRENT_BINARY_
 # When using an installed engine, this file will be included by the FindLauncherGenerator.cmake script
 get_property(LY_PROJECTS_TARGET_NAME GLOBAL PROPERTY LY_PROJECTS_TARGET_NAME)
 foreach(project_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJECTS)
+    
    # Computes the realpath to the project
    # If the project_path is relative, it is evaluated relative to the ${LY_ROOT_FOLDER}
    # Otherwise the the absolute project_path is returned with symlinks resolved
@ -35,6 +36,28 @@ foreach(project_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJEC
                "to the LY_PROJECTS_TARGET_NAME global property. Other configuration errors might occur")
        endif()
    endif()
+
+    ################################################################################
+    # Assets
+    ################################################################################
+    if(PAL_TRAIT_BUILD_HOST_TOOLS)
+        add_custom_target(${project_name}.Assets
+            COMMENT "Processing ${project_name} assets..."
+            COMMAND "${CMAKE_COMMAND}" 
+                -DLY_LOCK_FILE=$<TARGET_FILE_DIR:AZ::AssetProcessorBatch>/project_assets.lock
+                -P ${LY_ROOT_FOLDER}/cmake/CommandExecution.cmake
+                    EXEC_COMMAND $<TARGET_FILE:AZ::AssetProcessorBatch> 
+                        --zeroAnalysisMode 
+                        --project-path=${project_real_path} 
+                        --platforms=${LY_ASSET_DEPLOY_ASSET_TYPE}
+        )
+        set_target_properties(${project_name}.Assets
+            PROPERTIES 
+                EXCLUDE_FROM_ALL TRUE
+                FOLDER ${project_name}
+        )
+    endif()
+
    ################################################################################
    # Monolithic game
    ################################################################################
--- a/Code/Tools/AzTestRunner/CMakeLists.txt
+++ b/Code/Tools/AzTestRunner/CMakeLists.txt
@ -9,12 +9,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #

-if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-
 ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})

 include(${pal_dir}/platform_traits_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)

+if(PAL_TRAIT_AZTESTRUNNER_SUPPORTED)
+    
    ly_add_target(
        NAME AzTestRunner ${PAL_TRAIT_AZTESTRUNNER_LAUNCHER_TYPE}
        NAMESPACE AZ
@ -33,6 +33,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                AZ::AzFramework
    )
    
+    if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
+    
        ly_add_target(
            NAME AzTestRunner.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
            NAMESPACE AZ
@ -48,3 +50,5 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
        )

    endif()
+
+endif()
--- a/Code/Tools/AzTestRunner/Platform/Android/platform_traits_android.cmake
+++ b/Code/Tools/AzTestRunner/Platform/Android/platform_traits_android.cmake
@ -9,5 +9,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #

+set(PAL_TRAIT_AZTESTRUNNER_SUPPORTED TRUE)
 set(PAL_TRAIT_AZTESTRUNNER_LAUNCHER_TYPE MODULE)
-
--- a/Code/Tools/AzTestRunner/Platform/Linux/platform_traits_linux.cmake
+++ b/Code/Tools/AzTestRunner/Platform/Linux/platform_traits_linux.cmake
@ -9,5 +9,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #

+set(PAL_TRAIT_AZTESTRUNNER_SUPPORTED TRUE)
 set(PAL_TRAIT_AZTESTRUNNER_LAUNCHER_TYPE EXECUTABLE)
-
--- a/Code/Tools/AzTestRunner/Platform/Mac/platform_traits_mac.cmake
+++ b/Code/Tools/AzTestRunner/Platform/Mac/platform_traits_mac.cmake
@ -9,5 +9,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #

+set(PAL_TRAIT_AZTESTRUNNER_SUPPORTED TRUE)
 set(PAL_TRAIT_AZTESTRUNNER_LAUNCHER_TYPE EXECUTABLE)
-
--- a/Code/Tools/AzTestRunner/Platform/Windows/platform_traits_windows.cmake
+++ b/Code/Tools/AzTestRunner/Platform/Windows/platform_traits_windows.cmake
@ -9,5 +9,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #

+set(PAL_TRAIT_AZTESTRUNNER_SUPPORTED TRUE)
 set(PAL_TRAIT_AZTESTRUNNER_LAUNCHER_TYPE EXECUTABLE)
-
--- a/Code/Tools/AzTestRunner/Platform/iOS/platform_traits_ios.cmake
+++ b/Code/Tools/AzTestRunner/Platform/iOS/platform_traits_ios.cmake
@ -9,5 +9,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #

+set(PAL_TRAIT_AZTESTRUNNER_SUPPORTED TRUE)
 set(PAL_TRAIT_AZTESTRUNNER_LAUNCHER_TYPE EXECUTABLE)
-
--- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp
+++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp
@ -693,7 +693,7 @@ namespace ImGui
        ImGui::TextColored(ImGui::Colors::s_PlainLabelColor, "Left Stick");
        ImGui::NextColumn();
        ImGui::Bullet();
-        ImGui::TextColored(ImGui::Colors::s_PlainLabelColor, "Mova Mouse Pointer");
+        ImGui::TextColored(ImGui::Colors::s_PlainLabelColor, "Move Mouse Pointer");
        ImGui::Separator();
        ImGui::NextColumn();

--- a/cmake/Platform/Common/Install_common.cmake
+++ b/cmake/Platform/Common/Install_common.cmake
@ -162,7 +162,18 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME)
        elseif(target_type STREQUAL MODULE_LIBRARY)
            set(target_location "\${LY_ROOT_FOLDER}/${library_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>/${target_library_output_subdirectory}/$<TARGET_FILE_NAME:${TARGET_NAME}>")
        elseif(target_type STREQUAL SHARED_LIBRARY)
-            string(APPEND target_file_contents "set_property(TARGET ${TARGET_NAME} PROPERTY IMPORTED_IMPLIB_$<CONFIG> \"\${LY_ROOT_FOLDER}/${archive_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>/$<TARGET_LINKER_FILE_NAME:${TARGET_NAME}>\")\n")
+            string(APPEND target_file_contents 
+"set_property(TARGET ${TARGET_NAME} 
+    APPEND_STRING PROPERTY IMPORTED_IMPLIB
+        $<$<CONFIG:$<CONFIG>$<ANGLE-R>:\"\${LY_ROOT_FOLDER}/${archive_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>/$<TARGET_LINKER_FILE_NAME:${TARGET_NAME}>\"$<ANGLE-R>
+)
+")
+            string(APPEND target_file_contents 
+"set_property(TARGET ${TARGET_NAME} 
+    PROPERTY IMPORTED_IMPLIB_$<UPPER_CASE:$<CONFIG>> 
+        \"\${LY_ROOT_FOLDER}/${archive_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>/$<TARGET_LINKER_FILE_NAME:${TARGET_NAME}>\"
+)
+")
            set(target_location "\${LY_ROOT_FOLDER}/${library_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>/${target_library_output_subdirectory}/$<TARGET_FILE_NAME:${TARGET_NAME}>")
        else() # STATIC_LIBRARY, OBJECT_LIBRARY, INTERFACE_LIBRARY
            set(target_location "\${LY_ROOT_FOLDER}/${archive_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>/$<TARGET_LINKER_FILE_NAME:${TARGET_NAME}>")
--- a/cmake/Platform/Common/VisualStudio_common.cmake
+++ b/cmake/Platform/Common/VisualStudio_common.cmake
@ -10,5 +10,5 @@
 #

 if(CMAKE_GENERATOR MATCHES "Visual Studio 16")
-    configure_file("${CMAKE_CURRENT_LIST_DIR}/Directory.Build.props" "${CMAKE_CURRENT_BINARY_DIR}/Directory.Build.props" COPYONLY)
+    configure_file("${CMAKE_CURRENT_LIST_DIR}/Directory.Build.props" "${CMAKE_BINARY_DIR}/Directory.Build.props" COPYONLY)
 endif()
--- a/scripts/ctest/CMakeLists.txt
+++ b/scripts/ctest/CMakeLists.txt
@ -16,35 +16,6 @@ if(NOT PAL_TRAIT_BUILD_TESTS_SUPPORTED)
    return()
 endif()

-################################################################################
-# Asset Processing Target
-# i.e. Tests depend on AutomatedTesting.Assets
-################################################################################
-
-if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
-    get_property(LY_PROJECTS_TARGET_NAME GLOBAL PROPERTY LY_PROJECTS_TARGET_NAME)
-    foreach(project_target_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJECTS)
-        file(REAL_PATH ${project_path} project_real_path BASE_DIRECTORY ${LY_ROOT_FOLDER})
-        # With the lock file, asset processing jobs are serialized to avoid race conditions
-        # on files that are created temporarily in source folders during shader processing.
-        add_custom_target(${project_target_name}.Assets
-            COMMENT "Processing ${project_target_name} assets..."
-            COMMAND "${CMAKE_COMMAND}" 
-                -DLY_LOCK_FILE=$<TARGET_FILE_DIR:AZ::AssetProcessorBatch>/project_assets.lock
-                -P ${LY_ROOT_FOLDER}/cmake/CommandExecution.cmake
-                    EXEC_COMMAND $<TARGET_FILE:AZ::AssetProcessorBatch> 
-                        --zeroAnalysisMode 
-                        --project-path=${project_real_path} 
-                        --platforms=${LY_ASSET_DEPLOY_ASSET_TYPE}
-        )
-        set_target_properties(${project_target_name}.Assets
-            PROPERTIES 
-                EXCLUDE_FROM_ALL TRUE
-                FOLDER ${project_target_name}
-        )
-    endforeach()
-endif()
-
 ################################################################################
 # Tests
 ################################################################################