birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes SDK mix between monolithic and non-monolithic

Browse Source
monroegm-disable-blank-issue-2
Esteban Papp 4 years ago committed by GitHub
parent 5a0b6314e4 a433b9e8dd
commit 520aeb60a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 116 additions and 68 deletions
Show Stats Download Patch File Download Diff File

5
cmake/LYWrappers.cmake
Unescape Escape View File

@ -403,7 +403,7 @@ function(ly_target_link_libraries TARGET)
message(FATAL_ERROR "You must provide a target") message(FATAL_ERROR "You must provide a target")
endif() endif()
set_property(GLOBAL APPEND PROPERTY LY_DELAYED_LINK_${TARGET} ${ARGN}) set_property(TARGET ${TARGET} APPEND PROPERTY LY_DELAYED_LINK ${ARGN})
set_property(GLOBAL APPEND PROPERTY LY_DELAYED_LINK_TARGETS ${TARGET}) # to walk them at the end set_property(GLOBAL APPEND PROPERTY LY_DELAYED_LINK_TARGETS ${TARGET}) # to walk them at the end
endfunction() endfunction()
@ -430,7 +430,7 @@ function(ly_delayed_target_link_libraries)
get_property(delayed_targets GLOBAL PROPERTY LY_DELAYED_LINK_TARGETS) get_property(delayed_targets GLOBAL PROPERTY LY_DELAYED_LINK_TARGETS)
foreach(target ${delayed_targets}) foreach(target ${delayed_targets})
get_property(delayed_link GLOBAL PROPERTY LY_DELAYED_LINK_${target}) get_property(delayed_link TARGET ${target} PROPERTY LY_DELAYED_LINK)
if(delayed_link) if(delayed_link)
cmake_parse_arguments(ly_delayed_target_link_libraries "" "" "${visibilities}" ${delayed_link}) cmake_parse_arguments(ly_delayed_target_link_libraries "" "" "${visibilities}" ${delayed_link})
@ -458,7 +458,6 @@ function(ly_delayed_target_link_libraries)
endforeach() endforeach()
endforeach() endforeach()
set_property(GLOBAL PROPERTY LY_DELAYED_LINK_${target})
endif() endif()

169
cmake/Platform/Common/Install_common.cmake
Unescape Escape View File

@ -157,16 +157,15 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME absolute_tar
endif() endif()
# Includes need additional processing to add the install root # Includes need additional processing to add the install root
if(include_directories) foreach(include IN LISTS include_directories)
foreach(include ${include_directories}) string(GENEX_STRIP ${include} include_genex_expr)
string(GENEX_STRIP ${include} include_genex_expr) if(include_genex_expr STREQUAL include) # only for cases where there are no generation expressions
if(include_genex_expr STREQUAL include) # only for cases where there are no generation expressions # Make the include path relative to the source dir where the target will be declared
# Make the include path relative to the source dir where the target will be declared cmake_path(RELATIVE_PATH include BASE_DIRECTORY ${absolute_target_source_dir} OUTPUT_VARIABLE target_include)
cmake_path(RELATIVE_PATH include BASE_DIRECTORY ${absolute_target_source_dir} OUTPUT_VARIABLE target_include) list(APPEND INCLUDE_DIRECTORIES_PLACEHOLDER "${PLACEHOLDER_INDENT}${target_include}")
string(APPEND INCLUDE_DIRECTORIES_PLACEHOLDER "${PLACEHOLDER_INDENT}${target_include}\n") endif()
endif() endforeach()
endforeach() list(JOIN INCLUDE_DIRECTORIES_PLACEHOLDER "\n" INCLUDE_DIRECTORIES_PLACEHOLDER)
endif()
string(REPEAT " " 8 PLACEHOLDER_INDENT) string(REPEAT " " 8 PLACEHOLDER_INDENT)
get_target_property(RUNTIME_DEPENDENCIES_PLACEHOLDER ${TARGET_NAME} MANUALLY_ADDED_DEPENDENCIES) get_target_property(RUNTIME_DEPENDENCIES_PLACEHOLDER ${TARGET_NAME} MANUALLY_ADDED_DEPENDENCIES)
@ -178,27 +177,27 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME absolute_tar
endif() endif()
string(REPEAT " " 12 PLACEHOLDER_INDENT) string(REPEAT " " 12 PLACEHOLDER_INDENT)
get_target_property(inteface_build_dependencies_props ${TARGET_NAME} INTERFACE_LINK_LIBRARIES) get_property(interface_build_dependencies_props TARGET ${TARGET_NAME} PROPERTY LY_DELAYED_LINK)
unset(INTERFACE_BUILD_DEPENDENCIES_PLACEHOLDER) unset(INTERFACE_BUILD_DEPENDENCIES_PLACEHOLDER)
if(inteface_build_dependencies_props) if(interface_build_dependencies_props)
foreach(build_dependency ${inteface_build_dependencies_props}) cmake_parse_arguments(build_deps "" "" "PRIVATE;PUBLIC;INTERFACE" ${interface_build_dependencies_props})
# Skip wrapping produced when targets are not created in the same directory # Interface and public dependencies should always be exposed
if(NOT ${build_dependency} MATCHES "^::@") set(build_deps_target ${build_deps_INTERFACE})
list(APPEND INTERFACE_BUILD_DEPENDENCIES_PLACEHOLDER "${PLACEHOLDER_INDENT}${build_dependency}") if(build_deps_PUBLIC)
endif() set(build_deps_target "${build_deps_target};${build_deps_PUBLIC}")
endforeach() endif()
endif() # Private dependencies should only be exposed if it is a static library, since in those cases, link
# We also need to pass the private link libraries since we will use that to generate the runtime dependencies # dependencies are transfered to the downstream dependencies
get_target_property(private_build_dependencies_props ${TARGET_NAME} LINK_LIBRARIES) if("${target_type}" STREQUAL "STATIC_LIBRARY")
if(private_build_dependencies_props) set(build_deps_target "${build_deps_target};${build_deps_PRIVATE}")
foreach(build_dependency ${private_build_dependencies_props}) endif()
foreach(build_dependency IN LISTS build_deps_target)
# Skip wrapping produced when targets are not created in the same directory # Skip wrapping produced when targets are not created in the same directory
if(NOT ${build_dependency} MATCHES "^::@") if(build_dependency)
list(APPEND INTERFACE_BUILD_DEPENDENCIES_PLACEHOLDER "${PLACEHOLDER_INDENT}${build_dependency}") list(APPEND INTERFACE_BUILD_DEPENDENCIES_PLACEHOLDER "${PLACEHOLDER_INDENT}${build_dependency}")
endif() endif()
endforeach() endforeach()
endif() endif()
list(REMOVE_DUPLICATES INTERFACE_BUILD_DEPENDENCIES_PLACEHOLDER)
list(JOIN INTERFACE_BUILD_DEPENDENCIES_PLACEHOLDER "\n" INTERFACE_BUILD_DEPENDENCIES_PLACEHOLDER) list(JOIN INTERFACE_BUILD_DEPENDENCIES_PLACEHOLDER "\n" INTERFACE_BUILD_DEPENDENCIES_PLACEHOLDER)
string(REPEAT " " 8 PLACEHOLDER_INDENT) string(REPEAT " " 8 PLACEHOLDER_INDENT)
@ -322,7 +321,7 @@ include(Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}.cm
file(CONFIGURE OUTPUT "${target_install_source_dir}/Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}.cmake" CONTENT [[ file(CONFIGURE OUTPUT "${target_install_source_dir}/Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}.cmake" CONTENT [[
@cmake_copyright_comment@ @cmake_copyright_comment@
if(LY_MONOLITHIC_GAME) if(LY_MONOLITHIC_GAME)
include(Platform/${PAL_PLATFORM_NAME}/Monolithic/permutation.cmake) include(Platform/${PAL_PLATFORM_NAME}/Monolithic/permutation.cmake OPTIONAL)
else() else()
include(Platform/${PAL_PLATFORM_NAME}/Default/permutation.cmake) include(Platform/${PAL_PLATFORM_NAME}/Default/permutation.cmake)
endif() endif()
@ -354,29 +353,6 @@ endif()
endfunction() endfunction()
#! ly_setup_o3de_install: orchestrates the installation of the different parts. This is the entry point from the root CMakeLists.txt
function(ly_setup_o3de_install)
ly_setup_subdirectories()
ly_setup_cmake_install()
ly_setup_runtime_dependencies()
ly_setup_assets()
# Misc
install(FILES
${LY_ROOT_FOLDER}/pytest.ini
${LY_ROOT_FOLDER}/LICENSE.txt
${LY_ROOT_FOLDER}/README.md
DESTINATION .
COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
)
if(COMMAND ly_post_install_steps)
ly_post_install_steps()
endif()
endfunction()
#! ly_setup_cmake_install: install the "cmake" folder #! ly_setup_cmake_install: install the "cmake" folder
function(ly_setup_cmake_install) function(ly_setup_cmake_install)
@ -385,8 +361,10 @@ function(ly_setup_cmake_install)
COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
PATTERN "__pycache__" EXCLUDE PATTERN "__pycache__" EXCLUDE
PATTERN "Findo3de.cmake" EXCLUDE PATTERN "Findo3de.cmake" EXCLUDE
PATTERN "cmake/ConfigurationTypes.cmake" EXCLUDE
REGEX "3rdParty/Platform\/.*\/BuiltInPackages_.*\.cmake" EXCLUDE REGEX "3rdParty/Platform\/.*\/BuiltInPackages_.*\.cmake" EXCLUDE
) )
# Connect configuration types # Connect configuration types
install(FILES "${LY_ROOT_FOLDER}/cmake/install/ConfigurationTypes.cmake" install(FILES "${LY_ROOT_FOLDER}/cmake/install/ConfigurationTypes.cmake"
DESTINATION cmake DESTINATION cmake
@ -446,6 +424,7 @@ function(ly_setup_cmake_install)
list(APPEND additional_platform_files "${plat_files}") list(APPEND additional_platform_files "${plat_files}")
endforeach() endforeach()
endforeach() endforeach()
install(FILES ${additional_find_files} install(FILES ${additional_find_files}
DESTINATION cmake/3rdParty DESTINATION cmake/3rdParty
COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
@ -455,40 +434,68 @@ function(ly_setup_cmake_install)
COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
) )
# Findo3de.cmake file: we generate a different Findo3de.camke file than the one we have in cmake. This one is going to expose all # Findo3de.cmake file: we generate a different Findo3de.cmake file than the one we have in the source dir.
# targets that are pre-built configure_file(${LY_ROOT_FOLDER}/cmake/install/Findo3de.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cmake/Findo3de.cmake @ONLY)
unset(FIND_PACKAGES_PLACEHOLDER) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/Findo3de.cmake"
DESTINATION cmake
COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
)
# Add to the FIND_PACKAGES_PLACEHOLDER all directories in which ly_add_target were called in unset(find_subdirectories)
# Add to find_subdirectories all directories in which ly_add_target were called in
get_property(all_subdirectories GLOBAL PROPERTY LY_ALL_TARGET_DIRECTORIES) get_property(all_subdirectories GLOBAL PROPERTY LY_ALL_TARGET_DIRECTORIES)
foreach(target_subdirectory IN LISTS all_subdirectories) foreach(target_subdirectory IN LISTS all_subdirectories)
cmake_path(RELATIVE_PATH target_subdirectory BASE_DIRECTORY ${LY_ROOT_FOLDER} OUTPUT_VARIABLE relative_target_subdirectory) cmake_path(RELATIVE_PATH target_subdirectory BASE_DIRECTORY ${LY_ROOT_FOLDER} OUTPUT_VARIABLE relative_target_subdirectory)
string(APPEND FIND_PACKAGES_PLACEHOLDER " add_subdirectory(${relative_target_subdirectory})\n") string(APPEND find_subdirectories "add_subdirectory(${relative_target_subdirectory})\n")
endforeach() endforeach()
set(permutation_find_subdirectories ${CMAKE_CURRENT_BINARY_DIR}/cmake/Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION}/o3de_subdirectories_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
file(GENERATE OUTPUT ${permutation_find_subdirectories}
CONTENT
"# Generated by O3DE install\n
${find_subdirectories}
"
)
install(FILES "${permutation_find_subdirectories}"
DESTINATION cmake/Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION}
COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
)
configure_file(${LY_ROOT_FOLDER}/cmake/install/Findo3de.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cmake/Findo3de.cmake @ONLY) set(pal_builtin_file ${CMAKE_CURRENT_BINARY_DIR}/cmake/3rdParty/Platform/${PAL_PLATFORM_NAME}/BuiltInPackages_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/Findo3de.cmake" file(GENERATE OUTPUT ${pal_builtin_file}
DESTINATION cmake CONTENT
"# Generated by O3DE install\n
if(LY_MONOLITHIC_GAME)
include(cmake/3rdParty/Platform/${PAL_PLATFORM_NAME}/Monolithic/BuiltInPackages_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
else()
include(cmake/3rdParty/Platform/${PAL_PLATFORM_NAME}/Default/BuiltInPackages_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
endif()
"
)
install(FILES "${pal_builtin_file}"
DESTINATION cmake/3rdParty/Platform/${PAL_PLATFORM_NAME}
COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
) )
# BuiltInPackage_<platform>.cmake: since associations could happen in any cmake file across the engine. We collect # ${LY_BUILD_PERMUTATION}/BuiltInPackage_<platform>.cmake: since associations could happen in any cmake file across the engine. We collect
# all the associations in ly_associate_package and then generate them into BuiltInPackages_<platform>.cmake. This # all the associations in ly_associate_package and then generate them into BuiltInPackages_<platform>.cmake. This will consolidate all
# will consolidate all associations in one file # associations in one file
# Associations are sensitive to platform and build permutation, so we make different files for each.
get_property(all_package_names GLOBAL PROPERTY LY_PACKAGE_NAMES) get_property(all_package_names GLOBAL PROPERTY LY_PACKAGE_NAMES)
list(REMOVE_DUPLICATES all_package_names)
set(builtinpackages "# Generated by O3DE install\n\n") set(builtinpackages "# Generated by O3DE install\n\n")
foreach(package_name IN LISTS all_package_names) foreach(package_name IN LISTS all_package_names)
get_property(package_hash GLOBAL PROPERTY LY_PACKAGE_HASH_${package_name}) get_property(package_hash GLOBAL PROPERTY LY_PACKAGE_HASH_${package_name})
get_property(targets GLOBAL PROPERTY LY_PACKAGE_TARGETS_${package_name}) get_property(targets GLOBAL PROPERTY LY_PACKAGE_TARGETS_${package_name})
list(REMOVE_DUPLICATES targets)
string(APPEND builtinpackages "ly_associate_package(PACKAGE_NAME ${package_name} TARGETS ${targets} PACKAGE_HASH ${package_hash})\n") string(APPEND builtinpackages "ly_associate_package(PACKAGE_NAME ${package_name} TARGETS ${targets} PACKAGE_HASH ${package_hash})\n")
endforeach() endforeach()
set(pal_builtin_file ${CMAKE_CURRENT_BINARY_DIR}/cmake/3rdParty/Platform/${PAL_PLATFORM_NAME}/BuiltInPackages_${PAL_PLATFORM_NAME_LOWERCASE}.cmake) set(permutation_builtin_file ${CMAKE_CURRENT_BINARY_DIR}/cmake/3rdParty/Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION}/BuiltInPackages_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
file(GENERATE OUTPUT ${pal_builtin_file} file(GENERATE OUTPUT ${permutation_builtin_file}
CONTENT ${builtinpackages} CONTENT ${builtinpackages}
) )
install(FILES "${pal_builtin_file}" install(FILES "${permutation_builtin_file}"
DESTINATION cmake/3rdParty/Platform/${PAL_PLATFORM_NAME} DESTINATION cmake/3rdParty/Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION}
COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
) )
@ -632,6 +639,7 @@ function(ly_setup_assets)
if (NOT gem_install_dest_dir) if (NOT gem_install_dest_dir)
cmake_path(SET gem_install_dest_dir .) cmake_path(SET gem_install_dest_dir .)
endif() endif()
if(IS_DIRECTORY ${gem_absolute_path}) if(IS_DIRECTORY ${gem_absolute_path})
install(DIRECTORY "${gem_absolute_path}" install(DIRECTORY "${gem_absolute_path}"
DESTINATION ${gem_install_dest_dir} DESTINATION ${gem_install_dest_dir}
@ -703,3 +711,36 @@ function(ly_setup_subdirectory_enable_gems absolute_target_source_dir output_scr
endforeach() endforeach()
set(${output_script} ${enable_gems_calls} PARENT_SCOPE) set(${output_script} ${enable_gems_calls} PARENT_SCOPE)
endfunction() endfunction()
#! ly_setup_o3de_install: orchestrates the installation of the different parts. This is the entry point from the root CMakeLists.txt
function(ly_setup_o3de_install)
ly_setup_subdirectories()
ly_setup_cmake_install()
ly_setup_runtime_dependencies()
ly_setup_assets()
# Misc
install(FILES
${LY_ROOT_FOLDER}/pytest.ini
${LY_ROOT_FOLDER}/LICENSE.txt
${LY_ROOT_FOLDER}/README.md
DESTINATION .
COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
)
# Inject other build directories
foreach(external_dir ${LY_INSTALL_EXTERNAL_BUILD_DIRS})
install(CODE
"set(LY_CORE_COMPONENT_ALREADY_INCLUDED TRUE)
include(${external_dir}/cmake_install.cmake)
set(LY_CORE_COMPONENT_ALREADY_INCLUDED FALSE)"
ALL_COMPONENTS
)
endforeach()
if(COMMAND ly_post_install_steps)
ly_post_install_steps()
endif()
endfunction()

10
cmake/install/Findo3de.cmake.in
Unescape Escape View File

@ -12,7 +12,15 @@ include(FindPackageHandleStandardArgs)
# This will be called from within the installed engine's CMakeLists.txt # This will be called from within the installed engine's CMakeLists.txt
macro(ly_find_o3de_packages) macro(ly_find_o3de_packages)
@FIND_PACKAGES_PLACEHOLDER@ if(LY_MONOLITHIC_GAME)
set(monolithic_file "${LY_ROOT_FOLDER}/cmake/Platform/${PAL_PLATFORM_NAME}/Monolithic/o3de_subdirectories_${PAL_PLATFORM_NAME_LOWERCASE}.cmake")
if(NOT EXISTS ${monolithic_file})
message(FATAL_ERROR "O3DE SDK was not generated to support monolithic builds")
endif()
include("${monolithic_file}")
else()
include("${LY_ROOT_FOLDER}/cmake/Platform/${PAL_PLATFORM_NAME}/Default/o3de_subdirectories_${PAL_PLATFORM_NAME_LOWERCASE}.cmake")
endif()
find_package(LauncherGenerator) find_package(LauncherGenerator)
endmacro() endmacro()

Write Preview
Loading…
Cancel
Save