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

Merge branch 'main' into cpack_installer

Browse Source
This commit is contained in:
scottr
2021-04-20 14:19:26 -07:00
parent 4638a831bc 3df1ffe3b7
commit 8784314b7b
328 changed files with 6058 additions and 7806 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/3rdParty.cmake
-4
View File
@@ -116,10 +116,6 @@ function(ly_add_external_target)
# Setting BASE_PATH variable in the parent scope to allow for the Find<3rdParty>.cmake scripts to use them
set(BASE_PATH ${BASE_PATH} PARENT_SCOPE)
if(NOT EXISTS ${BASE_PATH})
message(FATAL_ERROR "Cannot find 3rdParty library ${ly_add_external_target_NAME} on path ${BASE_PATH}")
endif()
add_library(3rdParty::${NAME_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
if(ly_add_external_target_INCLUDE_DIRECTORIES)
cmake/3rdParty/FindOpenGLInterface.cmake
Vendored
+19
View File
@@ -0,0 +1,19 @@
#
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
# its licensors.
#
# For complete copyright and license terms please see the LICENSE at the root of this
# distribution (the "License"). All use of this software is governed by the License,
# or, if provided, by the license below or the license accompanying this file. Do not
# 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.
#
find_package(OpenGL)
ly_add_external_target(
NAME OpenGLInterface
VERSION ""
BUILD_DEPENDENCIES
OpenGL::GL
)
cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev3-multiplatform TARG
ly_associate_package(PACKAGE_NAME ilmbase-2.3.0-rev4-multiplatform TARGETS ilmbase PACKAGE_HASH 97547fdf1fbc4d81b8ccf382261f8c25514ed3b3c4f8fd493f0a4fa873bba348)
ly_associate_package(PACKAGE_NAME hdf5-1.0.11-rev2-multiplatform TARGETS hdf5 PACKAGE_HASH 11d5e04df8a93f8c52a5684a4cacbf0d9003056360983ce34f8d7b601082c6bd)
ly_associate_package(PACKAGE_NAME alembic-1.7.11-rev3-multiplatform TARGETS alembic PACKAGE_HASH ba7a7d4943dd752f5a662374f6c48b93493df1d8e2c5f6a8d101f3b50700dd25)
ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev6-multiplatform TARGETS assimplib PACKAGE_HASH 47f1a6d05d101def036c030484c4a6e19d745aacd57037174715c7afe2b19b4c)
ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev7-multiplatform TARGETS assimplib PACKAGE_HASH def855c89d8210db3040f1cb6ec837141ab9b8e74c158eae7c03d50160fcf30b)
ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform TARGETS squish-ccr PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform TARGETS ASTCEncoder PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform TARGETS md5 PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
cmake/3rdParty/Platform/Linux/Clang_linux.cmake
Vendored
-43
View File
@@ -1,43 +0,0 @@
#
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
# its licensors.
#
# For complete copyright and license terms please see the LICENSE at the root of this
# distribution (the "License"). All use of this software is governed by the License,
# or, if provided, by the license below or the license accompanying this file. Do not
# 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.
#
set(CLANG_PLATFORM_LIB_PATH ${BASE_PATH}/linux_x64/release/lib)
set(CLANG_INCLUDE_DIRECTORIES
llvm/include
linux_x64/release/include
)
set(CLANG_LIBS
${CLANG_PLATFORM_LIB_PATH}/libclangFrontend.a
${CLANG_PLATFORM_LIB_PATH}/libclangSerialization.a
${CLANG_PLATFORM_LIB_PATH}/libclangDriver.a
${CLANG_PLATFORM_LIB_PATH}/libclangTooling.a
${CLANG_PLATFORM_LIB_PATH}/libclangParse.a
${CLANG_PLATFORM_LIB_PATH}/libclangSema.a
${CLANG_PLATFORM_LIB_PATH}/libclangAnalysis.a
${CLANG_PLATFORM_LIB_PATH}/libclangRewriteFrontend.a
${CLANG_PLATFORM_LIB_PATH}/libclangRewrite.a
${CLANG_PLATFORM_LIB_PATH}/libclangEdit.a
${CLANG_PLATFORM_LIB_PATH}/libclangAST.a
${CLANG_PLATFORM_LIB_PATH}/libclangLex.a
${CLANG_PLATFORM_LIB_PATH}/libclangBasic.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMCore.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMBinaryFormat.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMDebugInfoDWARF.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMMC.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMOption.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMBitReader.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMMCParser.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMProfileData.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMTarget.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMSupport.a
)
cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake
Vendored
-1
View File
@@ -13,7 +13,6 @@ set(FILES
AWSGameLiftServerSDK_linux.cmake
BuiltInPackages_linux.cmake
civetweb_linux.cmake
Clang_linux.cmake
dyad_linux.cmake
FbxSdk_linux.cmake
OpenSSL_linux.cmake
cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev3-multiplatform
ly_associate_package(PACKAGE_NAME ilmbase-2.3.0-rev4-multiplatform TARGETS ilmbase PACKAGE_HASH 97547fdf1fbc4d81b8ccf382261f8c25514ed3b3c4f8fd493f0a4fa873bba348)
ly_associate_package(PACKAGE_NAME hdf5-1.0.11-rev2-multiplatform TARGETS hdf5 PACKAGE_HASH 11d5e04df8a93f8c52a5684a4cacbf0d9003056360983ce34f8d7b601082c6bd)
ly_associate_package(PACKAGE_NAME alembic-1.7.11-rev3-multiplatform TARGETS alembic PACKAGE_HASH ba7a7d4943dd752f5a662374f6c48b93493df1d8e2c5f6a8d101f3b50700dd25)
ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev6-multiplatform TARGETS assimplib PACKAGE_HASH 47f1a6d05d101def036c030484c4a6e19d745aacd57037174715c7afe2b19b4c)
ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev7-multiplatform TARGETS assimplib PACKAGE_HASH def855c89d8210db3040f1cb6ec837141ab9b8e74c158eae7c03d50160fcf30b)
ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform TARGETS squish-ccr PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform TARGETS ASTCEncoder PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform TARGETS md5 PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
cmake/3rdParty/Platform/Mac/Clang_mac.cmake
Vendored
-49
View File
@@ -1,49 +0,0 @@
#
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
# its licensors.
#
# For complete copyright and license terms please see the LICENSE at the root of this
# distribution (the "License"). All use of this software is governed by the License,
# or, if provided, by the license below or the license accompanying this file. Do not
# 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.
#
set(CLANG_PLATFORM_LIB_PATH ${BASE_PATH}/xcode/$<IF:$<CONFIG:Debug>,debug,release>/lib)
set(CLANG_INCLUDE_DIRECTORIES
llvm/include
xcode/$<IF:$<CONFIG:Debug>,debug,release>/include
)
set(CLANG_LIBS
${CLANG_PLATFORM_LIB_PATH}/libclangFrontend.a
${CLANG_PLATFORM_LIB_PATH}/libclangSerialization.a
${CLANG_PLATFORM_LIB_PATH}/libclangDriver.a
${CLANG_PLATFORM_LIB_PATH}/libclangTooling.a
${CLANG_PLATFORM_LIB_PATH}/libclangParse.a
${CLANG_PLATFORM_LIB_PATH}/libclangSema.a
${CLANG_PLATFORM_LIB_PATH}/libclangAnalysis.a
${CLANG_PLATFORM_LIB_PATH}/libclangRewriteFrontend.a
${CLANG_PLATFORM_LIB_PATH}/libclangRewrite.a
${CLANG_PLATFORM_LIB_PATH}/libclangEdit.a
${CLANG_PLATFORM_LIB_PATH}/libclangAST.a
${CLANG_PLATFORM_LIB_PATH}/libclangASTMatchers.a
${CLANG_PLATFORM_LIB_PATH}/libclangLex.a
${CLANG_PLATFORM_LIB_PATH}/libclangBasic.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMCore.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMBinaryFormat.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMDebugInfoDWARF.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMMC.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMOption.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMBitReader.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMMCParser.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMProfileData.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMTarget.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMSupport.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMDemangle.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMSupport.a
${CLANG_PLATFORM_LIB_PATH}/libLLVMCore.a
)
cmake/3rdParty/Platform/Mac/OpenGLInterface_mac.cmake
Vendored
+13
View File
@@ -0,0 +1,13 @@
#
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
# its licensors.
#
# For complete copyright and license terms please see the LICENSE at the root of this
# distribution (the "License"). All use of this software is governed by the License,
# or, if provided, by the license below or the license accompanying this file. Do not
# 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.
#
# MacOS 10.14 deprecates OpenGL. This silences the warnings for now.
set(OPENGLINTERFACE_COMPILE_DEFINITIONS GL_SILENCE_DEPRECATION)
cmake/3rdParty/Platform/Mac/cmake_mac_files.cmake
Vendored
+1 -1
View File
@@ -12,9 +12,9 @@
set(FILES
BuiltInPackages_mac.cmake
civetweb_mac.cmake
Clang_mac.cmake
DirectXShaderCompiler_mac.cmake
FbxSdk_mac.cmake
OpenGLInterface_mac.cmake
OpenSSL_mac.cmake
Wwise_mac.cmake
)
cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev3-multiplatform
ly_associate_package(PACKAGE_NAME ilmbase-2.3.0-rev4-multiplatform TARGETS ilmbase PACKAGE_HASH 97547fdf1fbc4d81b8ccf382261f8c25514ed3b3c4f8fd493f0a4fa873bba348)
ly_associate_package(PACKAGE_NAME hdf5-1.0.11-rev2-multiplatform TARGETS hdf5 PACKAGE_HASH 11d5e04df8a93f8c52a5684a4cacbf0d9003056360983ce34f8d7b601082c6bd)
ly_associate_package(PACKAGE_NAME alembic-1.7.11-rev3-multiplatform TARGETS alembic PACKAGE_HASH ba7a7d4943dd752f5a662374f6c48b93493df1d8e2c5f6a8d101f3b50700dd25)
ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev6-multiplatform TARGETS assimplib PACKAGE_HASH 47f1a6d05d101def036c030484c4a6e19d745aacd57037174715c7afe2b19b4c)
ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev7-multiplatform TARGETS assimplib PACKAGE_HASH def855c89d8210db3040f1cb6ec837141ab9b8e74c158eae7c03d50160fcf30b)
ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform TARGETS squish-ccr PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform TARGETS ASTCEncoder PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform TARGETS md5 PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
cmake/3rdParty/Platform/Windows/Clang_windows.cmake
Vendored
-44
View File
@@ -1,44 +0,0 @@
#
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
# its licensors.
#
# For complete copyright and license terms please see the LICENSE at the root of this
# distribution (the "License"). All use of this software is governed by the License,
# or, if provided, by the license below or the license accompanying this file. Do not
# 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.
#
set(CLANG_PLATFORM_LIB_PATH ${BASE_PATH}/vs2015/$<IF:$<CONFIG:Debug>,debug,release>/lib)
set(CLANG_INCLUDE_DIRECTORIES
llvm/include
vs2015/$<IF:$<CONFIG:Debug>,debug,release>/include
)
set(CLANG_LIBS
${CLANG_PLATFORM_LIB_PATH}/clangFrontend.lib
${CLANG_PLATFORM_LIB_PATH}/clangSerialization.lib
${CLANG_PLATFORM_LIB_PATH}/clangDriver.lib
${CLANG_PLATFORM_LIB_PATH}/clangTooling.lib
${CLANG_PLATFORM_LIB_PATH}/clangParse.lib
${CLANG_PLATFORM_LIB_PATH}/clangSema.lib
${CLANG_PLATFORM_LIB_PATH}/clangAnalysis.lib
${CLANG_PLATFORM_LIB_PATH}/clangRewriteFrontend.lib
${CLANG_PLATFORM_LIB_PATH}/clangRewrite.lib
${CLANG_PLATFORM_LIB_PATH}/clangEdit.lib
${CLANG_PLATFORM_LIB_PATH}/clangAST.lib
${CLANG_PLATFORM_LIB_PATH}/clangLex.lib
${CLANG_PLATFORM_LIB_PATH}/clangBasic.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMBinaryFormat.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMDebugInfoDWARF.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMMC.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMOption.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMBitReader.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMMCParser.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMProfileData.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMTarget.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMCore.lib
${CLANG_PLATFORM_LIB_PATH}/LLVMSupport.lib
Version.lib
)
cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake
Vendored
-1
View File
@@ -12,7 +12,6 @@
set(FILES
AWSGameLiftServerSDK_windows.cmake
BuiltInPackages_windows.cmake
Clang_windows.cmake
Crashpad_windows.cmake
DirectXShaderCompiler_windows.cmake
dyad_windows.cmake
cmake/3rdParty/cmake_files.cmake
Vendored
+1
View File
@@ -18,6 +18,7 @@ set(FILES
Finddyad.cmake
FindFbxSdk.cmake
Findlibav.cmake
FindOpenGLInterface.cmake
FindOpenSSL.cmake
FindRadTelemetry.cmake
FindVkValidation.cmake
cmake/FindTarget.cmake.in
+45
View File
@@ -0,0 +1,45 @@
#
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
# its licensors.
#
# For complete copyright and license terms please see the LICENSE at the root of this
# distribution (the "License"). All use of this software is governed by the License,
# or, if provided, by the license below or the license accompanying this file. Do not
# 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.
#
# Generated by O3DE
include(FindPackageHandleStandardArgs)
ly_add_target(
NAME @NAME_PLACEHOLDER@ UNKNOWN IMPORTED
@NAMESPACE_PLACEHOLDER@
@INCLUDE_DIRECTORIES_PLACEHOLDER@
@BUILD_DEPENDENCIES_PLACEHOLDER@
@RUNTIME_DEPENDENCIES_PLACEHOLDER@
@COMPILE_DEFINITIONS_PLACEHOLDER@
)
# The below if was generated from if (NOT HEADER_ONLY_PLACEHOLDER)
# HEADER_ONLY_PLACEHOLDER evaluates to TRUE or FALSE
if (NOT @HEADER_ONLY_PLACEHOLDER@)
# Load information for each installed configuration.
foreach(config @ALL_CONFIGS@)
set(@NAME_PLACEHOLDER@_${config}_FOUND FALSE)
include("${LY_ROOT_FOLDER}/cmake_autogen/@NAME_PLACEHOLDER@/@NAME_PLACEHOLDER@_${config}.cmake")
endforeach()
find_package_handle_standard_args(@NAME_PLACEHOLDER@
"Could not find package @NAME_PLACEHOLDER@"
@TARGET_CONFIG_FOUND_VARS_PLACEHOLDER@)
else()
set(@NAME_PLACEHOLDER@_FOUND TRUE)
endif()
cmake/Findo3de.cmake
+10 -15
View File
@@ -27,24 +27,19 @@ if(json_error)
message(FATAL_ERROR "Unable to read key 'engine_name' from '${current_path}/../engine.json', error: ${json_error}")
endif()
if(NOT this_engine_name STREQUAL LY_ENGINE_NAME_TO_USE)
set(o3de_FOUND FALSE)
set(o3de_NOT_FOUND_MESSAGE)
find_package_handle_standard_args(o3de
"Could not find an engine with matching ${LY_ENGINE_NAME_TO_USE}"
o3de_FOUND
)
return()
set(found_matching_engine FALSE)
if(this_engine_name STREQUAL LY_ENGINE_NAME_TO_USE)
set(found_matching_engine TRUE)
endif()
find_package_handle_standard_args(o3de
"Could not find an engine with matching ${LY_ENGINE_NAME_TO_USE}"
found_matching_engine
)
macro(o3de_initialize)
set(INSTALLED_ENGINE FALSE)
set(LY_PROJECTS ${CMAKE_CURRENT_LIST_DIR})
o3de_current_file_path(current_path)
add_subdirectory(${current_path}/.. o3de)
endmacro()
message(STATUS "Found ${this_engine_name} in ${current_path}")
set(o3de_FOUND FALSE)
find_package_handle_standard_args(o3de
o3de_FOUND
)
endmacro()
cmake/Findo3de.cmake.in
+36
View File
@@ -0,0 +1,36 @@
#
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
# its licensors.
#
# For complete copyright and license terms please see the LICENSE at the root of this
# distribution (the "License"). All use of this software is governed by the License,
# or, if provided, by the license below or the license accompanying this file. Do not
# 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.
#
# Generated by O3DE
include(FindPackageHandleStandardArgs)
# This will be called from within the installed engine's CMakeLists.txt
macro(ly_find_o3de_packages)
@FIND_PACKAGES_PLACEHOLDER@
find_package(LauncherGenerator)
endmacro()
function(o3de_current_file_path path)
set(${path} ${CMAKE_CURRENT_FUNCTION_LIST_DIR} PARENT_SCOPE)
endfunction()
# We are using the engine's CMakeLists.txt to handle initialization/importing targets
# Since this is external to the project's source, we need to specify an output directory
# even though we don't build
macro(o3de_initialize)
set(INSTALLED_ENGINE TRUE)
set(LY_PROJECTS ${CMAKE_SOURCE_DIR})
o3de_current_file_path(current_path)
add_subdirectory(${current_path}/.. o3de)
endmacro()
cmake/Platform/Common/Install_common.cmake
+2 -9
View File
@@ -14,13 +14,6 @@ ly_set(LY_DEFAULT_INSTALL_COMPONENT "Core")
#! ly_install_target: registers the target to be installed by cmake install.
#
# \arg:NAME name of the target
# \arg:NAMESPACE namespace declaration for this target. It will be used for IDE and dependencies
# \arg:INCLUDE_DIRECTORIES paths to the include directories
# \arg:BUILD_DEPENDENCIES list of interfaces this target depends on (could be a compilation dependency
# if the dependency is only exposing an include path, or could be a linking
# dependency is exposing a lib)
# \arg:RUNTIME_DEPENDENCIES list of dependencies this target depends on at runtime
# \arg:COMPILE_DEFINITIONS list of compilation definitions this target will use to compile
function(ly_install_target ly_install_target_NAME)
set(options)
@@ -161,7 +154,7 @@ function(ly_generate_target_find_file)
set(HEADER_ONLY_PLACEHOLDER TRUE)
endif()
configure_file(${LY_ROOT_FOLDER}/cmake/FindTargetTemplate.cmake ${CMAKE_CURRENT_BINARY_DIR}/Find${ly_generate_target_find_file_NAME}.cmake @ONLY)
configure_file(${LY_ROOT_FOLDER}/cmake/FindTarget.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/Find${ly_generate_target_find_file_NAME}.cmake @ONLY)
endfunction()
@@ -232,7 +225,7 @@ function(ly_setup_o3de_install)
string(REPLACE ";" "\n" FIND_PACKAGES_PLACEHOLDER "${find_package_list}")
configure_file(${LY_ROOT_FOLDER}/cmake/Findo3deTemplate.cmake ${CMAKE_CURRENT_BINARY_DIR}/Findo3de.cmake @ONLY)
configure_file(${LY_ROOT_FOLDER}/cmake/Findo3de.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/Findo3de.cmake @ONLY)
ly_install_launcher_target_generator()
cmake/Tools/common.py
+6 -3
View File
@@ -628,8 +628,8 @@ def get_test_module_registry(build_dir_path):
test_module_items = unit_test_json['Amazon']
for _, test_module_item in test_module_items.items():
module_file = test_module_item['Modules']
dep_modules.append(module_file)
module_files = test_module_item['Modules']
dep_modules.extend(module_files)
except FileNotFoundError:
raise LmbrCmdError(f"Unit test registry not found ('{str(unit_test_module_path)}')")
@@ -659,7 +659,10 @@ def get_validated_test_modules(test_modules, build_dir_path):
for test_target_check in test_modules:
if test_target_check not in all_test_modules:
raise LmbrCmdError(f"Invalid test module {test_target_check}")
validated_test_modules.append(test_target_check)
if isinstance(test_target_check, list):
validated_test_modules.extend(test_target_check)
else:
validated_test_modules.append(test_target_check)
else:
validated_test_modules = all_test_modules