Fix build and link errors in monolithic builds

Merge pull request #1288 from aws-lumberyard-dev/SPEC-7273

CMakeLists.txt

@@ -105,24 +105,25 @@ endforeach()
 # Post-processing
 ################################################################################
 # The following steps have to be done after all targets are registered:
-# Defer generation of the StaticModules.inl file which is needed to create the AZ::Module derived class in monolithic
-# builds until after all the targets are known
-ly_delayed_generate_static_modules_inl()
 
 # 1. Add any dependencies registered via ly_enable_gems
 ly_enable_gems_delayed()
 
-# 2. generate a settings registry .setreg file for all ly_add_project_dependencies() and ly_add_target_dependencies() calls
+# 2. Defer generation of the StaticModules.inl file which is needed to create the AZ::Module derived class in monolithic
+#    builds until after all the targets are known and all the gems are enabled
+ly_delayed_generate_static_modules_inl()
+
+# 3. generate a settings registry .setreg file for all ly_add_project_dependencies() and ly_add_target_dependencies() calls
 #    to provide applications with the filenames of gem modules to load
 #    This must be done before ly_delayed_target_link_libraries() as that inserts BUILD_DEPENDENCIES as MANUALLY_ADDED_DEPENDENCIES
 #    if the build dependency is a MODULE_LIBRARY. That would cause a false load dependency to be generated
 ly_delayed_generate_settings_registry()
 
-# 3. link targets where the dependency was yet not declared, we need to have the declaration so we do different
+# 4. link targets where the dependency was yet not declared, we need to have the declaration so we do different
 #    linking logic depending on the type of target
 ly_delayed_target_link_libraries()
 
-# 4. generate a registry file for unit testing for platforms that support unit testing
+# 5. generate a registry file for unit testing for platforms that support unit testing
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
     ly_delayed_generate_unit_test_module_registry()
 endif()

Code/Framework/AzTest/CMakeLists.txt

@@ -8,25 +8,27 @@
 # remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
-   
-ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/AzTest/Platform/${PAL_PLATFORM_NAME})
 
-ly_add_target(
-    NAME AzTest STATIC
-    NAMESPACE AZ
-    FILES_CMAKE
-        AzTest/aztest_files.cmake
-        ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            .
-            ${pal_dir}
-    BUILD_DEPENDENCIES
-        PUBLIC
-            3rdParty::googletest::GMock
-            3rdParty::googletest::GTest
-            3rdParty::GoogleBenchmark
-            AZ::AzCore
-    PLATFORM_INCLUDE_FILES
+if(NOT LY_MONOLITHIC_GAME)
+    ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/AzTest/Platform/${PAL_PLATFORM_NAME})
+
+    ly_add_target(
+        NAME AzTest STATIC
+        NAMESPACE AZ
+        FILES_CMAKE
+            AzTest/aztest_files.cmake
+            ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
+        INCLUDE_DIRECTORIES
+            PUBLIC
+                .
+                ${pal_dir}
+        BUILD_DEPENDENCIES
+            PUBLIC
+                3rdParty::googletest::GMock
+                3rdParty::googletest::GTest
+                3rdParty::GoogleBenchmark
+                AZ::AzCore
+        PLATFORM_INCLUDE_FILES
             ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-)
+    )
+endif()

Code/LauncherUnified/launcher_generator.cmake

@@ -196,6 +196,16 @@ function(ly_delayed_generate_static_modules_inl)
             ly_get_gem_load_dependencies(all_game_gem_dependencies ${project_name}.GameLauncher)
 
             foreach(game_gem_dependency ${all_game_gem_dependencies})
+                # Sometimes, a gem's Client variant may be an interface library
+                # which dependes on multiple gem targets. The interface libraries
+                # should be skipped; the real dependencies of the interface will be processed
+                if(TARGET ${game_gem_dependency})
+                    get_target_property(target_type ${game_gem_dependency} TYPE)
+                    if(${target_type} STREQUAL "INTERFACE_LIBRARY")
+                        continue()
+                    endif()
+                endif()
+
                 # To match the convention on how gems targets vs gem modules are named,
                 # we remove the ".Static" from the suffix
                 # Replace "." with "_"
@@ -224,6 +234,14 @@ function(ly_delayed_generate_static_modules_inl)
                     list(APPEND all_server_gem_dependencies ${server_gem_load_dependencies} ${server_gem_dependency})
                 endforeach()
                 foreach(server_gem_dependency ${all_server_gem_dependencies})
+                    # Skip interface libraries
+                    if(TARGET ${server_gem_dependency})
+                        get_target_property(target_type ${server_gem_dependency} TYPE)
+                        if(${target_type} STREQUAL "INTERFACE_LIBRARY")
+                            continue()
+                        endif()
+                    endif()
+
                     # Replace "." with "_"
                     string(REPLACE "." "_" server_gem_dependency ${server_gem_dependency})
 

Code/Tools/AzTestRunner/CMakeLists.txt

@@ -13,7 +13,7 @@ ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${P
 
 include(${pal_dir}/platform_traits_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
 
-if(PAL_TRAIT_AZTESTRUNNER_SUPPORTED)
+if(PAL_TRAIT_AZTESTRUNNER_SUPPORTED AND NOT LY_MONOLITHIC_GAME)
     
     ly_add_target(
         NAME AzTestRunner ${PAL_TRAIT_AZTESTRUNNER_LAUNCHER_TYPE}