2
0
Эх сурвалжийг харах

StaticModules.in must be generated after the gems are enabled

amzn-sj 4 жил өмнө
parent
commit
f6a6614e4b
1 өөрчлөгдсөн 7 нэмэгдсэн , 6 устгасан
  1. 7 6
      CMakeLists.txt

+ 7 - 6
CMakeLists.txt

@@ -105,24 +105,25 @@ endforeach()
 # Post-processing
 # Post-processing
 ################################################################################
 ################################################################################
 # The following steps have to be done after all targets are registered:
 # 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
 # 1. Add any dependencies registered via ly_enable_gems
 ly_enable_gems_delayed()
 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
 #    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
 #    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
 #    if the build dependency is a MODULE_LIBRARY. That would cause a false load dependency to be generated
 ly_delayed_generate_settings_registry()
 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
 #    linking logic depending on the type of target
 ly_delayed_target_link_libraries()
 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)
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
     ly_delayed_generate_unit_test_module_registry()
     ly_delayed_generate_unit_test_module_registry()
 endif()
 endif()