Integrating latest from github/staging
Integrating up through commit 5e1bdae
This commit is contained in:
alexpete
-118
@@ -1,118 +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(AWSNATIVESDK_PACKAGE_NAME AWSNativeSDK)
|
||||
set(AWSNATIVESDK_3RDPARTY_DIRECTORY AWS/AWSNativeSDK)
|
||||
set(AWSNATIVESDK_PACKAGE_VERSION 1.7.167-az.2)
|
||||
set(AWSNATIVESDK_COMPILEDEFINITIONS AWS_CUSTOM_MEMORY_MANAGEMENT PLATFORM_SUPPORTS_AWS_NATIVE_SDK)
|
||||
|
||||
set(AWSNATIVESDK_MODULES
|
||||
Common
|
||||
Core
|
||||
EventStream
|
||||
Checksums
|
||||
AcessManagement
|
||||
CognitoIdentity
|
||||
CognitoIdp
|
||||
DeviceFarm
|
||||
DynamoDB
|
||||
GameLift
|
||||
IdentityManagement
|
||||
Kinesis
|
||||
Lambda
|
||||
MobileAnalytics
|
||||
Queues
|
||||
S3
|
||||
SNS
|
||||
SQS
|
||||
STS
|
||||
Transfer
|
||||
)
|
||||
foreach(awsmodule ${AWSNATIVESDK_MODULES})
|
||||
ly_add_external_target(
|
||||
NAME ${awsmodule}
|
||||
PACKAGE ${AWSNATIVESDK_PACKAGE_NAME}
|
||||
VERSION ${AWSNATIVESDK_PACKAGE_VERSION}
|
||||
3RDPARTY_DIRECTORY ${AWSNATIVESDK_3RDPARTY_DIRECTORY}
|
||||
INCLUDE_DIRECTORIES include
|
||||
COMPILE_DEFINITIONS ${AWSNATIVESDK_COMPILEDEFINITIONS}
|
||||
)
|
||||
endforeach()
|
||||
|
||||
# Then we have some groupings by functionality. We define a function here to make this easier to define
|
||||
include(CMakeParseArguments)
|
||||
function(ly_aws_addgroup)
|
||||
cmake_parse_arguments(ly_aws_add "" "NAME" "BUILD_DEPENDENCIES" ${ARGN})
|
||||
ly_add_external_target(
|
||||
NAME ${ly_aws_add_NAME}
|
||||
PACKAGE ${AWSNATIVESDK_PACKAGE_NAME}
|
||||
VERSION ${AWSNATIVESDK_PACKAGE_VERSION}
|
||||
3RDPARTY_DIRECTORY ${AWSNATIVESDK_3RDPARTY_DIRECTORY}
|
||||
INCLUDE_DIRECTORIES include
|
||||
COMPILE_DEFINITIONS ${AWSNATIVESDK_COMPILEDEFINITIONS}
|
||||
BUILD_DEPENDENCIES ${ly_aws_add_BUILD_DEPENDENCIES}
|
||||
)
|
||||
endfunction()
|
||||
|
||||
# And here we define the groupings
|
||||
ly_aws_addgroup(NAME Dependencies
|
||||
BUILD_DEPENDENCIES
|
||||
3rdParty::AWSNativeSDK::Checksums
|
||||
3rdParty::AWSNativeSDK::Common
|
||||
3rdParty::AWSNativeSDK::EventStream
|
||||
)
|
||||
|
||||
ly_aws_addgroup(NAME IdentityMetrics
|
||||
BUILD_DEPENDENCIES
|
||||
3rdParty::AWSNativeSDK::Dependencies
|
||||
3rdParty::AWSNativeSDK::CognitoIdentity
|
||||
3rdParty::AWSNativeSDK::CognitoIdp
|
||||
3rdParty::AWSNativeSDK::Core
|
||||
3rdParty::AWSNativeSDK::IdentityManagement
|
||||
3rdParty::AWSNativeSDK::STS
|
||||
3rdParty::AWSNativeSDK::MobileAnalytics
|
||||
)
|
||||
|
||||
ly_aws_addgroup(NAME IdentityLambda
|
||||
BUILD_DEPENDENCIES
|
||||
3rdParty::AWSNativeSDK::Dependencies
|
||||
3rdParty::AWSNativeSDK::CognitoIdentity
|
||||
3rdParty::AWSNativeSDK::CognitoIdp
|
||||
3rdParty::AWSNativeSDK::Core
|
||||
3rdParty::AWSNativeSDK::IdentityManagement
|
||||
3rdParty::AWSNativeSDK::Lambda
|
||||
3rdParty::AWSNativeSDK::STS
|
||||
)
|
||||
|
||||
ly_aws_addgroup(NAME GameLiftClient
|
||||
BUILD_DEPENDENCIES
|
||||
3rdParty::AWSNativeSDK::Core
|
||||
3rdParty::AWSNativeSDK::GameLift
|
||||
3rdParty::AWSNativeSDK::Dependencies
|
||||
)
|
||||
|
||||
ly_aws_addgroup(NAME AWSClientAuth
|
||||
BUILD_DEPENDENCIES
|
||||
3rdParty::AWSNativeSDK::Dependencies
|
||||
3rdParty::AWSNativeSDK::CognitoIdentity
|
||||
3rdParty::AWSNativeSDK::CognitoIdp
|
||||
3rdParty::AWSNativeSDK::STS
|
||||
3rdParty::AWSNativeSDK::IdentityManagement
|
||||
)
|
||||
|
||||
ly_aws_addgroup(NAME AWSCore
|
||||
BUILD_DEPENDENCIES
|
||||
3rdParty::AWSNativeSDK::Dependencies
|
||||
3rdParty::AWSNativeSDK::Core
|
||||
3rdParty::AWSNativeSDK::DynamoDB
|
||||
3rdParty::AWSNativeSDK::Lambda
|
||||
3rdParty::AWSNativeSDK::S3
|
||||
)
|
||||
Vendored
-173
@@ -1,173 +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.
|
||||
#
|
||||
|
||||
if(TARGET 3rdParty::Qt::Core) # Check we are not called multiple times
|
||||
return()
|
||||
endif()
|
||||
|
||||
set(QT_PACKAGE_NAME Qt)
|
||||
set(QT_PACKAGE_VERSION 5.15.1.2-az)
|
||||
|
||||
set(BASE_PATH "${LY_3RDPARTY_PATH}/${QT_PACKAGE_NAME}/${QT_PACKAGE_VERSION}")
|
||||
if(NOT EXISTS ${BASE_PATH})
|
||||
message(FATAL_ERROR "Cannot find 3rdParty library ${QT_PACKAGE_NAME} on path ${BASE_PATH}")
|
||||
endif()
|
||||
|
||||
set(QT5_COMPONENTS
|
||||
Core
|
||||
Concurrent
|
||||
Gui
|
||||
LinguistTools
|
||||
Network
|
||||
OpenGL
|
||||
Svg
|
||||
Test
|
||||
WebEngineWidgets
|
||||
Widgets
|
||||
Xml
|
||||
)
|
||||
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME}/Qt_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
|
||||
|
||||
list(APPEND CMAKE_PREFIX_PATH ${QT_LIB_PATH}/cmake/Qt5)
|
||||
|
||||
# Clear the cache for found DIRs
|
||||
unset(Qt5_DIR CACHE)
|
||||
foreach(component ${QT5_COMPONENTS})
|
||||
unset(Qt5${component}_DIR CACHE)
|
||||
endforeach()
|
||||
unset(Qt5Positioning_DIR CACHE)
|
||||
unset(Qt5PrintSupport_DIR CACHE)
|
||||
unset(Qt5WebChannel_DIR CACHE)
|
||||
unset(Qt5WebEngineCore_DIR CACHE)
|
||||
|
||||
# Populate the Qt5 configurations
|
||||
find_package(Qt5
|
||||
COMPONENTS ${QT5_COMPONENTS}
|
||||
REQUIRED
|
||||
NO_CMAKE_PACKAGE_REGISTRY
|
||||
)
|
||||
mark_as_advanced(Qt5_DIR) # Hiding from GUI
|
||||
mark_as_advanced(Qt5LinguistTools_DIR) # Hiding from GUI, this variable comes from the LinguistTools module
|
||||
|
||||
# Now create libraries that wrap the dependency so we can refer to them in our format
|
||||
foreach(component ${QT5_COMPONENTS})
|
||||
if(TARGET Qt5::${component})
|
||||
|
||||
get_target_property(system_includes Qt5::${component} INTERFACE_INCLUDE_DIRECTORIES)
|
||||
set_target_properties(Qt5::${component} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "") # Clear it in case someone refers to it
|
||||
|
||||
ly_target_include_system_directories(TARGET Qt5::${component}
|
||||
INTERFACE "${system_includes}"
|
||||
)
|
||||
|
||||
add_library(3rdParty::Qt::${component} INTERFACE IMPORTED)
|
||||
set_target_properties(3rdParty::Qt::${component} PROPERTIES
|
||||
INTERFACE_LINK_LIBRARIES Qt5::${component}
|
||||
INTERFACE_COMPILE_DEFINITIONS QT_NO_EXCEPTIONS
|
||||
)
|
||||
mark_as_advanced(Qt5${component}_DIR) # Hiding from GUI
|
||||
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
# Some extra DIR variables we want to hide from GUI
|
||||
mark_as_advanced(Qt5Positioning_DIR)
|
||||
mark_as_advanced(Qt5PrintSupport_DIR)
|
||||
mark_as_advanced(Qt5WebChannel_DIR)
|
||||
mark_as_advanced(Qt5WebEngineCore_DIR)
|
||||
|
||||
# Special case for Qt::Gui, we are using the private headers...
|
||||
ly_target_include_system_directories(TARGET 3rdParty::Qt::Gui
|
||||
INTERFACE "${Qt5Gui_PRIVATE_INCLUDE_DIRS}"
|
||||
)
|
||||
|
||||
# Another special case: Qt:Widgets, we are also using private headers
|
||||
ly_target_include_system_directories(TARGET 3rdParty::Qt::Widgets
|
||||
INTERFACE "${Qt5Widgets_PRIVATE_INCLUDE_DIRS}"
|
||||
)
|
||||
|
||||
# UIC executable
|
||||
unset(QT_UIC_EXECUTABLE CACHE)
|
||||
find_program(QT_UIC_EXECUTABLE uic HINTS "${QT_PATH}/bin")
|
||||
mark_as_advanced(QT_UIC_EXECUTABLE) # Hiding from GUI
|
||||
|
||||
#! ly_qt_uic_target: handles qt's ui files by injecting uic generation
|
||||
#
|
||||
# AUTOUIC has issues to detect changes in UIC files and trigger regeneration:
|
||||
# https://gitlab.kitware.com/cmake/cmake/-/issues/18741
|
||||
# So instead, we are going to manually wrap the files. We dont use qt5_wrap_ui because
|
||||
# it outputs to ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h and we want to follow the
|
||||
# same folder structure that AUTOUIC uses
|
||||
#
|
||||
function(ly_qt_uic_target TARGET)
|
||||
|
||||
get_target_property(all_ui_sources ${TARGET} SOURCES)
|
||||
list(FILTER all_ui_sources INCLUDE REGEX "^.*\\.ui$")
|
||||
if(NOT all_ui_sources)
|
||||
message(FATAL_ERROR "Target ${TARGET} contains AUTOUIC but doesnt have any .ui file")
|
||||
endif()
|
||||
|
||||
if(AUTOGEN_BUILD_DIR)
|
||||
set(gen_dir ${AUTOGEN_BUILD_DIR})
|
||||
else()
|
||||
set(gen_dir ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_autogen/include)
|
||||
endif()
|
||||
|
||||
foreach(ui_source ${all_ui_sources})
|
||||
|
||||
get_filename_component(filename ${ui_source} NAME_WE)
|
||||
get_filename_component(dir ${ui_source} DIRECTORY)
|
||||
if(IS_ABSOLUTE ${dir})
|
||||
file(RELATIVE_PATH dir ${CMAKE_CURRENT_SOURCE_DIR} ${dir})
|
||||
endif()
|
||||
|
||||
set(outfolder ${gen_dir}/${dir})
|
||||
set(outfile ${outfolder}/ui_${filename}.h)
|
||||
get_filename_component(infile ${ui_source} ABSOLUTE)
|
||||
|
||||
file(MAKE_DIRECTORY ${outfolder})
|
||||
add_custom_command(OUTPUT ${outfile}
|
||||
COMMAND ${QT_UIC_EXECUTABLE} -o ${outfile} ${infile}
|
||||
MAIN_DEPENDENCY ${infile} VERBATIM
|
||||
COMMENT "UIC ${infile}"
|
||||
)
|
||||
|
||||
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC TRUE)
|
||||
set_source_files_properties(${outfile} PROPERTIES
|
||||
SKIP_AUTOMOC TRUE
|
||||
SKIP_AUTOUIC TRUE
|
||||
GENERATED TRUE
|
||||
)
|
||||
list(APPEND all_ui_wrapped_sources ${outfile})
|
||||
|
||||
endforeach()
|
||||
|
||||
# Add files to the target
|
||||
target_sources(${TARGET} PRIVATE ${all_ui_wrapped_sources})
|
||||
source_group("Generated Files" FILES ${all_ui_wrapped_sources})
|
||||
|
||||
# Add include directories relative to the generated folder
|
||||
# query for the property first to avoid the "NOTFOUND" in a list
|
||||
get_property(has_includes TARGET ${TARGET} PROPERTY INCLUDE_DIRECTORIES SET)
|
||||
if(has_includes)
|
||||
get_property(all_include_directories TARGET ${TARGET} PROPERTY INCLUDE_DIRECTORIES)
|
||||
foreach(dir ${all_include_directories})
|
||||
if(IS_ABSOLUTE ${dir})
|
||||
file(RELATIVE_PATH dir ${CMAKE_CURRENT_SOURCE_DIR} ${dir})
|
||||
endif()
|
||||
list(APPEND new_includes ${gen_dir}/${dir})
|
||||
endforeach()
|
||||
endif()
|
||||
list(APPEND new_includes ${gen_dir})
|
||||
target_include_directories(${TARGET} PRIVATE ${new_includes})
|
||||
|
||||
endfunction()
|
||||
@@ -1,69 +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.
|
||||
#
|
||||
|
||||
if(LY_MONOLITHIC_GAME)
|
||||
set(AWSNATIVE_SDK_LIB_PATH ${BASE_PATH}/lib/android/arm64-v8a/$<IF:$<CONFIG:Debug>,Debug,Release>)
|
||||
set(AWSNATIVE_SDK_LIB_EXTENSION a)
|
||||
set(AWSNATIVESDK_BUILD_DEPENDENCIES
|
||||
${AWSNATIVE_SDK_LIB_PATH}/dependencies/libcurl.a
|
||||
${AWSNATIVE_SDK_LIB_PATH}/dependencies/libssl.a
|
||||
${AWSNATIVE_SDK_LIB_PATH}/dependencies/libcrypto.a
|
||||
${AWSNATIVE_SDK_LIB_PATH}/dependencies/libz.a
|
||||
)
|
||||
else()
|
||||
set(AWSNATIVE_SDK_LIB_PATH ${BASE_PATH}/bin/android/arm64-v8a/$<IF:$<CONFIG:Debug>,Debug,Release>)
|
||||
set(AWSNATIVE_SDK_LIB_EXTENSION so)
|
||||
endif()
|
||||
|
||||
set(AWSNATIVESDK_CORE_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-core.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
if(NOT LY_MONOLITHIC_GAME)
|
||||
list(APPEND AWSNATIVESDK_CORE_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libcurl$<IF:$<CONFIG:Debug>,-d,>.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
endif()
|
||||
|
||||
set(AWSNATIVESDK_COMMON_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_EVENTSTREAM_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-event-stream.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_CHECKSUMS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-checksums.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
|
||||
set(AWSNATIVESDK_ACESSMANAGEMENT_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-access-management.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_COGNITOIDENTITY_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-cognito-identity.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_COGNITOIDP_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-cognito-idp.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_DYNAMODB_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-dynamodb.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_GAMELIFT_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-gamelift.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_IDENTITYMANAGEMENT_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-identity-management.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_KINESIS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-kinesis.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_LAMBDA_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-lambda.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_MOBILEANALYTICS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-mobileanalytics.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_QUEUES_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-queues.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_S3_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-s3.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_SNS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-sns.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_SQS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-sqs.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_STS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-sts.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_TRANSFER_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-transfer.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
|
||||
if(NOT LY_MONOLITHIC_GAME)
|
||||
|
||||
list(JOIN AWSNATIVESDK_CORE_LIBS ";" AWSNATIVESDK_CORE_RUNTIME_DEPENDENCIES)
|
||||
|
||||
set(AWSNATIVESDK_COMMON_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_COMMON_LIBS})
|
||||
set(AWSNATIVESDK_EVENTSTREAM_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_EVENTSTREAM_LIBS})
|
||||
set(AWSNATIVESDK_CHECKSUMS_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_CHECKSUMS_LIBS})
|
||||
set(AWSNATIVESDK_ACCESSMANAGEMENT_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_ACESSMANAGEMENT_LIBS})
|
||||
set(AWSNATIVESDK_COGNITOIDENTITY_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_COGNITOIDENTITY_LIBS})
|
||||
set(AWSNATIVESDK_COGNITOIDP_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_COGNITOIDP_LIBS})
|
||||
set(AWSNATIVESDK_DYNAMODB_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_DYNAMODB_LIBS})
|
||||
set(AWSNATIVESDK_GAMELIFT_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_GAMELIFT_LIBS})
|
||||
set(AWSNATIVESDK_IDENTITYMANAGEMENT_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_IDENTITYMANAGEMENT_LIBS})
|
||||
set(AWSNATIVESDK_KINESIS_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_KINESIS_LIBS})
|
||||
set(AWSNATIVESDK_LAMBDA_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_LAMBDA_LIBS})
|
||||
set(AWSNATIVESDK_MOBILEANALYTICS_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_MOBILEANALYTICS_LIBS})
|
||||
set(AWSNATIVESDK_QUEUES_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_QUEUES_LIBS})
|
||||
|
||||
endif()
|
||||
@@ -20,6 +20,7 @@ ly_associate_package(PACKAGE_NAME lz4-r128-multiplatform TARGETS lz4
|
||||
ly_associate_package(PACKAGE_NAME zstd-1.35-multiplatform TARGETS zstd PACKAGE_HASH 45d466c435f1095898578eedde85acf1fd27190e7ea99aeaa9acfd2f09e12665)
|
||||
ly_associate_package(PACKAGE_NAME glad-2.0.0-beta-rev2-multiplatform TARGETS glad PACKAGE_HASH ff97ee9664e97d0854b52a3734c2289329d9f2b4cd69478df6d0ca1f1c9392ee)
|
||||
# platform-specific:
|
||||
ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev1-android TARGETS AWSNativeSDK PACKAGE_HASH 3612d8397700cb3a585405440aec2a393843baa506ef8821d0a9b29162fb1854)
|
||||
ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev1-android TARGETS PhysX PACKAGE_HASH 9c494576c2d4ff04dee5a9e092fcd9d5af4b2845f15ffdfcaabb0dbc5b88a7a9)
|
||||
ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-android TARGETS mikkelsen PACKAGE_HASH 075e8e4940884971063b5a9963014e2e517246fa269c07c7dc55b8cf2cd99705)
|
||||
ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-android TARGETS googletest PACKAGE_HASH 95671be75287a61c9533452835c3647e9c1b30f81b34b43bcb0ec1997cc23894)
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
#
|
||||
|
||||
set(FILES
|
||||
AWSNativeSDK_android.cmake
|
||||
BuiltInPackages_android.cmake
|
||||
civetweb_android.cmake
|
||||
expat_android.cmake
|
||||
|
||||
@@ -1,73 +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.
|
||||
#
|
||||
|
||||
if(LY_MONOLITHIC_GAME)
|
||||
set(AWSNATIVE_SDK_LIB_PATH ${BASE_PATH}/lib/linux/$<IF:$<CONFIG:Debug>,Debug,Release>)
|
||||
set(AWSNATIVE_SDK_LIB_EXTENSION a)
|
||||
else()
|
||||
set(AWSNATIVE_SDK_LIB_PATH ${BASE_PATH}/bin/linux/$<IF:$<CONFIG:Debug>,Debug,Release>)
|
||||
set(AWSNATIVE_SDK_LIB_EXTENSION so)
|
||||
set(AWSNATIVESDK_COMMON_UNSTABLE_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.so.0unstable)
|
||||
set(AWSNATIVESDK_EVENTSTREAM_UNSTABLE_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-event-stream.so.0unstable)
|
||||
endif()
|
||||
|
||||
set(AWSNATIVESDK_LIBS
|
||||
curl # The one bundled with the aws sdk in 3rdParty doesn't use the right openssl
|
||||
)
|
||||
|
||||
set(AWSNATIVESDK_CORE_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-core.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_COMMON_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.${AWSNATIVE_SDK_LIB_EXTENSION} ${AWSNATIVESDK_COMMON_UNSTABLE_LIBS})
|
||||
set(AWSNATIVESDK_EVENTSTREAM_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-event-stream.${AWSNATIVE_SDK_LIB_EXTENSION} ${AWSNATIVESDK_EVENTSTREAM_UNSTABLE_LIBS})
|
||||
set(AWSNATIVESDK_CHECKSUMS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-checksums.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
|
||||
set(AWSNATIVESDK_ACESSMANAGEMENT_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-access-management.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_COGNITOIDENTITY_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-cognito-identity.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_COGNITOIDP_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-cognito-idp.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_DEVICEFARM_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-devicefarm.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_DYNAMODB_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-dynamodb.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_GAMELIFT_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-gamelift.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_IDENTITYMANAGEMENT_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-identity-management.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_KINESIS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-kinesis.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_LAMBDA_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-lambda.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_MOBILEANALYTICS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-mobileanalytics.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_QUEUES_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-queues.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_S3_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-s3.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_SNS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-sns.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_SQS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-sqs.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_STS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-sts.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
set(AWSNATIVESDK_TRANSFER_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-transfer.${AWSNATIVE_SDK_LIB_EXTENSION})
|
||||
|
||||
if(NOT LY_MONOLITHIC_GAME)
|
||||
|
||||
list(JOIN AWSNATIVESDK_CORE_LIBS ";" AWSNATIVESDK_CORE_RUNTIME_DEPENDENCIES)
|
||||
|
||||
set(AWSNATIVESDK_COMMON_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_COMMON_LIBS})
|
||||
set(AWSNATIVESDK_EVENTSTREAM_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_EVENTSTREAM_LIBS})
|
||||
set(AWSNATIVESDK_CHECKSUMS_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_CHECKSUMS_LIBS})
|
||||
set(AWSNATIVESDK_ACCESSMANAGEMENT_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_ACESSMANAGEMENT_LIBS})
|
||||
set(AWSNATIVESDK_COGNITOIDENTITY_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_COGNITOIDENTITY_LIBS})
|
||||
set(AWSNATIVESDK_COGNITOIDP_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_COGNITOIDP_LIBS})
|
||||
set(AWSNATIVESDK_DEVICEFARM_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_DEVICEFARM_LIBS})
|
||||
set(AWSNATIVESDK_DYNAMODB_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_DYNAMODB_LIBS})
|
||||
set(AWSNATIVESDK_GAMELIFT_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_GAMELIFT_LIBS})
|
||||
set(AWSNATIVESDK_IDENTITYMANAGEMENT_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_IDENTITYMANAGEMENT_LIBS})
|
||||
set(AWSNATIVESDK_KINESIS_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_KINESIS_LIBS})
|
||||
set(AWSNATIVESDK_LAMBDA_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_LAMBDA_LIBS})
|
||||
set(AWSNATIVESDK_MOBILEANALYTICS_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_MOBILEANALYTICS_LIBS})
|
||||
set(AWSNATIVESDK_QUEUES_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_QUEUES_LIBS})
|
||||
|
||||
set(AWSNATIVESDK_S3_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_S3_LIBS})
|
||||
set(AWSNATIVESDK_SNS_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_SNS_LIBS})
|
||||
set(AWSNATIVESDK_SQS_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_SQS_LIBS})
|
||||
set(AWSNATIVESDK_STS_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_STS_LIBS})
|
||||
set(AWSNATIVESDK_TRANSFER_RUNTIME_DEPENDENCIES ${AWSNATIVESDK_TRANSFER_LIBS})
|
||||
|
||||
endif()
|
||||
@@ -28,11 +28,13 @@ ly_associate_package(PACKAGE_NAME zstd-1.35-multiplatform TARG
|
||||
ly_associate_package(PACKAGE_NAME SQLite-3.32.2-rev3-multiplatform TARGETS SQLite PACKAGE_HASH dd4d3de6cbb4ce3d15fc504ba0ae0587e515dc89a25228037035fc0aef4831f4)
|
||||
ly_associate_package(PACKAGE_NAME glad-2.0.0-beta-rev2-multiplatform TARGETS glad PACKAGE_HASH ff97ee9664e97d0854b52a3734c2289329d9f2b4cd69478df6d0ca1f1c9392ee)
|
||||
ly_associate_package(PACKAGE_NAME xxhash-0.7.4-rev1-multiplatform TARGETS xxhash PACKAGE_HASH e81f3e6c4065975833996dd1fcffe46c3cf0f9e3a4207ec5f4a1b564ba75861e)
|
||||
ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev3-multiplatform TARGETS PVRTexTool PACKAGE_HASH d9c7e21e03b03cb560da4793a91a0d384ea621757cf87a1a82c83bfca6b23f97)
|
||||
ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev4-multiplatform TARGETS PVRTexTool PACKAGE_HASH d0d6da61c7557de0d2c71fc35ba56c3be49555b703f0e853d4c58225537acf1e)
|
||||
|
||||
# platform-specific:
|
||||
ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev1-linux TARGETS AWSNativeSDK PACKAGE_HASH 3876457b5e3233b951ccd9bcf53df4b946041a7de2955eba647020d7ae46163d)
|
||||
ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev1-linux TARGETS PhysX PACKAGE_HASH e3ca36106a8dbf1524709f8bb82d520920ebd3ff3a92672d382efff406c75ee3)
|
||||
ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-linux TARGETS mikkelsen PACKAGE_HASH 5973b1e71a64633588eecdb5b5c06ca0081f7be97230f6ef64365cbda315b9c8)
|
||||
ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-linux TARGETS googletest PACKAGE_HASH 7b7ad330f369450c316a4c4592d17fbb4c14c731c95bd8f37757203e8c2bbc1b)
|
||||
ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev1-linux TARGETS GoogleBenchmark PACKAGE_HASH e794530c60bd1ecb5f224a346091f23c8fdeb4cfd7ba70b5195d6d2e276447e3)
|
||||
ly_associate_package(PACKAGE_NAME unwind-1.2.1-linux TARGETS unwind PACKAGE_HASH 3453265fb056e25432f611a61546a25f60388e315515ad39007b5925dd054a77)
|
||||
ly_associate_package(PACKAGE_NAME qt-5.15.2-linux TARGETS Qt PACKAGE_HASH 3857fbb2fc5581cdb71d80a7f9298c83ef06073d4e1ccd86a32b4f88782b6f14)
|
||||
|
||||
-80
@@ -1,80 +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(QT_PATH ${BASE_PATH}/gcc_64) # "gcc" means "linux" in this case
|
||||
set(QT_LIB_PATH ${QT_PATH}/lib)
|
||||
|
||||
include(CMakeParseArguments)
|
||||
|
||||
unset(WINDEPLOYQT_EXECUTABLE CACHE)
|
||||
find_program(WINDEPLOYQT_EXECUTABLE windeployqt
|
||||
HINTS
|
||||
"${QT_PATH}/bin"
|
||||
)
|
||||
mark_as_advanced(WINDEPLOYQT_EXECUTABLE) # Hiding from GUI
|
||||
|
||||
function(ly_qt_deploy)
|
||||
|
||||
set(options)
|
||||
set(oneValueArgs TARGET)
|
||||
set(multiValueArgs)
|
||||
|
||||
cmake_parse_arguments(ly_qt_deploy "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
|
||||
|
||||
# Validate input arguments
|
||||
if(NOT ly_qt_deploy_TARGET)
|
||||
message(FATAL_ERROR "You must provide a target to detect qt dependencies")
|
||||
endif()
|
||||
|
||||
# When winqtdeploy is used on a unix platform it copies over the hardcoded platform abstraction plugin
|
||||
# of qxcb plugin. The qxcb plugin requires an X server to be running on linux and order to load properly
|
||||
# To avoid the issue of requiring an X server to be running in a headless setup, the qminimal
|
||||
# platform plugin is also copied over to the target file output directory.
|
||||
set(plugin_path "${QT_PATH}/plugins")
|
||||
set(platform_plugins ${plugin_path}/platforms/libqminimal.so)
|
||||
set(xcbglintegrations_plugins ${plugin_path}/xcbglintegrations/libqxcb-glx-integration.so)
|
||||
|
||||
add_custom_command(TARGET ${ly_qt_deploy_TARGET} POST_BUILD
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
-DLY_TIMESTAMP_REFERENCE=$<TARGET_FILE:${ly_qt_deploy_TARGET}>
|
||||
-DLY_LOCK_FILE=$<TARGET_FILE_DIR:${ly_qt_deploy_TARGET}>/qtdeploy.lock
|
||||
-P ${LY_ROOT_FOLDER}/cmake/CommandExecution.cmake
|
||||
EXEC_COMMAND "${CMAKE_COMMAND}" -E
|
||||
env PATH=${CMAKE_BINARY_DIR}:${QT_PATH}/bin:$ENV{PATH}
|
||||
"${CMAKE_COMMAND}" -P "${LY_ROOT_FOLDER}/cmake/Platform/Linux/windeployqt_wrapper.cmake"
|
||||
"$<TARGET_FILE_DIR:${ly_qt_deploy_TARGET}>"
|
||||
"${WINDEPLOYQT_EXECUTABLE}"
|
||||
--verbose 2
|
||||
--no-compiler-runtime
|
||||
--dir "$<TARGET_FILE_DIR:${ly_qt_deploy_TARGET}>"
|
||||
"$<TARGET_FILE:${ly_qt_deploy_TARGET}>"
|
||||
EXEC_COMMAND ${CMAKE_COMMAND} -E make_directory
|
||||
"$<TARGET_FILE_DIR:${ly_qt_deploy_TARGET}>/platforms"
|
||||
EXEC_COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
${platform_plugins}
|
||||
"$<TARGET_FILE_DIR:${ly_qt_deploy_TARGET}>/platforms"
|
||||
EXEC_COMMAND ${CMAKE_COMMAND} -E make_directory
|
||||
"$<TARGET_FILE_DIR:${ly_qt_deploy_TARGET}>/xcbglintegrations"
|
||||
EXEC_COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
${xcbglintegrations_plugins}
|
||||
"$<TARGET_FILE_DIR:${ly_qt_deploy_TARGET}>/xcbglintegrations"
|
||||
DEPENDS $<TARGET_FILE:${ly_qt_deploy_TARGET}>
|
||||
COMMENT "Deploying qt..."
|
||||
VERBATIM
|
||||
)
|
||||
|
||||
endfunction()
|
||||
|
||||
# windeployqt uses qmake -query to introspect a given Qt installation. However,
|
||||
# qmake is not relocatable, so the paths reported are those from the build
|
||||
# machine, and not from wherever the user has their 3rdParty libraries. So we
|
||||
# create a fake qmake executable to report the right paths to windeployqt.
|
||||
configure_file(${CMAKE_CURRENT_LIST_DIR}/Qt_qmake_${PAL_PLATFORM_NAME_LOWERCASE}.cmake.in ${CMAKE_BINARY_DIR}/qmake)
|
||||
@@ -1,38 +0,0 @@
|
||||
#!${CMAKE_COMMAND} -P
|
||||
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
|
||||
execute_process(COMMAND ${CMAKE_COMMAND} -E echo "QT_SYSROOT:
|
||||
QT_INSTALL_PREFIX:${QT_PATH}
|
||||
QT_INSTALL_ARCHDATA:${QT_PATH}
|
||||
QT_INSTALL_DATA:${QT_PATH}
|
||||
QT_INSTALL_DOCS:${QT_PATH}/doc
|
||||
QT_INSTALL_HEADERS:${QT_PATH}/include
|
||||
QT_INSTALL_LIBS:${QT_PATH}/lib
|
||||
QT_INSTALL_LIBEXECS:${QT_PATH}/libexec
|
||||
QT_INSTALL_BINS:${QT_PATH}/bin
|
||||
QT_INSTALL_TESTS:${QT_PATH}/tests
|
||||
QT_INSTALL_PLUGINS:${QT_PATH}/plugins
|
||||
QT_INSTALL_IMPORTS:${QT_PATH}/imports
|
||||
QT_INSTALL_TRANSLATIONS:${QT_PATH}/translations
|
||||
QT_INSTALL_CONFIGURATION:${QT_PATH}/etc/xdg
|
||||
QT_INSTALL_EXAMPLES:${QT_PATH}/examples
|
||||
QT_INSTALL_DEMOS:${QT_PATH}/examples
|
||||
QT_HOST_PREFIX:${QT_PATH}
|
||||
QT_HOST_DATA:${QT_PATH}
|
||||
QT_HOST_BINS:${QT_PATH}/bin
|
||||
QT_HOST_LIBS:${QT_PATH}/lib
|
||||
QMAKE_SPEC:linux-g++
|
||||
QMAKE_XSPEC:linux-g++
|
||||
QMAKE_VERSION:3.1
|
||||
QT_VERSION:${QT_PACKAGE_VERSION}")
|
||||
@@ -11,7 +11,6 @@
|
||||
|
||||
set(FILES
|
||||
AWSGameLiftServerSDK_linux.cmake
|
||||
AWSNativeSDK_linux.cmake
|
||||
BuiltInPackages_linux.cmake
|
||||
civetweb_linux.cmake
|
||||
Clang_linux.cmake
|
||||
@@ -21,7 +20,6 @@ set(FILES
|
||||
FbxSdk_linux.cmake
|
||||
FreeType2_linux.cmake
|
||||
OpenSSL_linux.cmake
|
||||
Qt_linux.cmake
|
||||
tiff_linux.cmake
|
||||
Wwise_linux.cmake
|
||||
)
|
||||
|
||||
@@ -1,95 +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.
|
||||
#
|
||||
|
||||
if (LY_MONOLITHIC_GAME)
|
||||
#Static libs
|
||||
set(AWSNATIVE_SDK_LIB_PATH ${BASE_PATH}/lib/mac/$<IF:$<CONFIG:Debug>,Debug,Release>)
|
||||
|
||||
set(AWSNATIVESDK_CORE_LIBS
|
||||
${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-core.a
|
||||
curl # The one bundled with the aws sdk in 3rdParty doesn't use the right openssl
|
||||
)
|
||||
set(AWSNATIVESDK_COMMON_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.a)
|
||||
set(AWSNATIVESDK_EVENTSTREAM_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-event-stream.a)
|
||||
set(AWSNATIVESDK_CHECKSUMS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-checksums.a)
|
||||
set(AWSNATIVESDK_COGNITOIDENTITY_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-cognito-identity.a)
|
||||
set(AWSNATIVESDK_COGNITOIDP_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-cognito-idp.a)
|
||||
set(AWSNATIVESDK_DEVICEFARM_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-devicefarm.a)
|
||||
set(AWSNATIVESDK_DYNAMODB_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-dynamodb.a)
|
||||
set(AWSNATIVESDK_GAMELIFT_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-gamelift.a)
|
||||
set(AWSNATIVESDK_IDENTITYMANAGEMENT_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-identity-management.a)
|
||||
set(AWSNATIVESDK_KINESIS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-kinesis.a)
|
||||
set(AWSNATIVESDK_LAMBDA_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-lambda.a)
|
||||
set(AWSNATIVESDK_MOBILEANALYTICS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-mobileanalytics.a)
|
||||
set(AWSNATIVESDK_QUEUES_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-queues.a)
|
||||
set(AWSNATIVESDK_S3_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-s3.a)
|
||||
set(AWSNATIVESDK_SNS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-sns.a)
|
||||
set(AWSNATIVESDK_SQS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-sqs.a)
|
||||
set(AWSNATIVESDK_STS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-sts.a)
|
||||
else()
|
||||
# Shared Libs
|
||||
set(AWSNATIVE_SDK_SHARED_LIB_PATH ${BASE_PATH}/bin/mac/$<IF:$<CONFIG:Debug>,Debug,Release>)
|
||||
|
||||
set(AWSNATIVESDK_CORE_LIBS
|
||||
${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-core.dylib
|
||||
curl # The one bundled with the aws sdk in 3rdParty doesn't use the right openssl
|
||||
)
|
||||
set(AWSNATIVESDK_COMMON_LIBS ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-c-common.dylib)
|
||||
set(AWSNATIVESDK_EVENTSTREAM_LIBS ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-c-event-stream.dylib)
|
||||
set(AWSNATIVESDK_CHECKSUMS_LIBS ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-checksums.dylib)
|
||||
set(AWSNATIVESDK_COGNITOIDENTITY_LIBS ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-cognito-identity.dylib)
|
||||
set(AWSNATIVESDK_COGNITOIDP_LIBS ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-cognito-idp.dylib)
|
||||
set(AWSNATIVESDK_DEVICEFARM_LIBS ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-devicefarm.dylib)
|
||||
set(AWSNATIVESDK_DYNAMODB_LIBS ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-dynamodb.dylib)
|
||||
set(AWSNATIVESDK_GAMELIFT_LIBS ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-gamelift.dylib)
|
||||
set(AWSNATIVESDK_IDENTITYMANAGEMENT_LIBS ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-identity-management.dylib)
|
||||
set(AWSNATIVESDK_KINESIS_LIBS ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-kinesis.dylib)
|
||||
set(AWSNATIVESDK_LAMBDA_LIBS ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-lambda.dylib)
|
||||
set(AWSNATIVESDK_MOBILEANALYTICS_LIBS ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-mobileanalytics.dylib)
|
||||
set(AWSNATIVESDK_QUEUES_LIBS ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-queues.dylib)
|
||||
set(AWSNATIVESDK_S3_LIBS ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-s3.dylib)
|
||||
set(AWSNATIVESDK_SNS_LIBS ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-sns.dylib)
|
||||
set(AWSNATIVESDK_SQS_LIBS ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-sqs.dylib)
|
||||
set(AWSNATIVESDK_STS_LIBS ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-sts.dylib)
|
||||
|
||||
set(AWSNATIVESDK_CORE_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-core.dylib)
|
||||
|
||||
set(AWSNATIVESDK_COMMON_RUNTIME_DEPENDENCIES
|
||||
${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-c-common.dylib
|
||||
${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-c-common.0unstable.dylib
|
||||
${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-c-common.1.0.0.dylib
|
||||
)
|
||||
|
||||
set(AWSNATIVESDK_EVENTSTREAM_RUNTIME_DEPENDENCIES
|
||||
${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-c-event-stream.dylib
|
||||
${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-c-event-stream.0unstable.dylib
|
||||
${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-c-event-stream.1.0.0.dylib
|
||||
)
|
||||
|
||||
set(AWSNATIVESDK_CHECKSUMS_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-checksums.dylib)
|
||||
set(AWSNATIVESDK_ACCESSMANAGEMENT_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-access-management.dylib)
|
||||
set(AWSNATIVESDK_COGNITOIDENTITY_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-cognito-identity.dylib)
|
||||
set(AWSNATIVESDK_COGNITOIDP_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-cognito-idp.dylib)
|
||||
set(AWSNATIVESDK_DEVICEFARM_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-devicefarm.dylib)
|
||||
set(AWSNATIVESDK_DYNAMODB_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-dynamodb.dylib)
|
||||
set(AWSNATIVESDK_GAMELIFT_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-gamelift.dylib)
|
||||
set(AWSNATIVESDK_IDENTITYMANAGEMENT_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-identity-management.dylib)
|
||||
set(AWSNATIVESDK_KINESIS_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-kinesis.dylib)
|
||||
set(AWSNATIVESDK_LAMBDA_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-lambda.dylib)
|
||||
set(AWSNATIVESDK_MOBILEANALYTICS_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-mobileanalytics.dylib)
|
||||
set(AWSNATIVESDK_QUEUES_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-queues.dylib)
|
||||
set(AWSNATIVESDK_S3_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-s3.dylib)
|
||||
set(AWSNATIVESDK_SNS_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-sns.dylib)
|
||||
set(AWSNATIVESDK_SQS_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-sqs.dylib)
|
||||
set(AWSNATIVESDK_STS_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-sts.dylib)
|
||||
set(AWSNATIVESDK_TRANSFER_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_SHARED_LIB_PATH}/libaws-cpp-sdk-transfer.dylib)
|
||||
endif()
|
||||
|
||||
+3
-1
@@ -33,10 +33,12 @@ ly_associate_package(PACKAGE_NAME DirectXShaderCompilerDxcAz-5.0.0_az-rev1-multi
|
||||
ly_associate_package(PACKAGE_NAME azslc-1.7.19-rev1-multiplatform TARGETS azslc PACKAGE_HASH e7649ba4a9190a82512f9aaad1b4318fbdf09384c533d2e3cc15c8440e65bd4a)
|
||||
ly_associate_package(PACKAGE_NAME glad-2.0.0-beta-rev2-multiplatform TARGETS glad PACKAGE_HASH ff97ee9664e97d0854b52a3734c2289329d9f2b4cd69478df6d0ca1f1c9392ee)
|
||||
ly_associate_package(PACKAGE_NAME xxhash-0.7.4-rev1-multiplatform TARGETS xxhash PACKAGE_HASH e81f3e6c4065975833996dd1fcffe46c3cf0f9e3a4207ec5f4a1b564ba75861e)
|
||||
ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev3-multiplatform TARGETS PVRTexTool PACKAGE_HASH d9c7e21e03b03cb560da4793a91a0d384ea621757cf87a1a82c83bfca6b23f97)
|
||||
ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev4-multiplatform TARGETS PVRTexTool PACKAGE_HASH d0d6da61c7557de0d2c71fc35ba56c3be49555b703f0e853d4c58225537acf1e)
|
||||
|
||||
# platform-specific:
|
||||
ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev1-mac TARGETS AWSNativeSDK PACKAGE_HASH 9d0562de258edfd8f14c4cc85ac665cf64b6bf13928d53725e7f90e4ad4672a3)
|
||||
ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev1-mac TARGETS PhysX PACKAGE_HASH 149f5e9b44bd27291b1c4772f5e89a1e0efa88eef73c7e0b188935ed4d0c4a70)
|
||||
ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-mac TARGETS mikkelsen PACKAGE_HASH 83af99ca8bee123684ad254263add556f0cf49486c0b3e32e6d303535714e505)
|
||||
ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-mac TARGETS googletest PACKAGE_HASH cbf020d5ef976c5db8b6e894c6c63151ade85ed98e7c502729dd20172acae5a8)
|
||||
ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev1-mac TARGETS GoogleBenchmark PACKAGE_HASH d81817701931508c8aa4efc61852d3d9c5672e43d2f68df645ab56251da43119)
|
||||
ly_associate_package(PACKAGE_NAME qt-5.15.2-mac TARGETS Qt PACKAGE_HASH ac248833d65838e4bcef50f30c9ff02ba9464ff64b9ada52de2ad6045d38baec)
|
||||
|
||||
-78
@@ -1,78 +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(QT_PATH ${BASE_PATH}/clang_64)
|
||||
set(QT_LIB_PATH ${QT_PATH}/lib)
|
||||
|
||||
list(APPEND QT5_COMPONENTS MacExtras)
|
||||
|
||||
|
||||
include(CMakeParseArguments)
|
||||
|
||||
# Clear the cache for found executable
|
||||
unset(MACDEPLOYQT_EXECUTABLE CACHE)
|
||||
find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${QT_PATH}/bin")
|
||||
mark_as_advanced(MACDEPLOYQT_EXECUTABLE) # Hiding from GUI
|
||||
|
||||
function(ly_qt_deploy)
|
||||
|
||||
set(options)
|
||||
set(oneValueArgs TARGET)
|
||||
set(multiValueArgs)
|
||||
|
||||
cmake_parse_arguments(ly_qt_deploy "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
|
||||
|
||||
# Validate input arguments
|
||||
if(NOT ly_qt_deploy_TARGET)
|
||||
message(FATAL_ERROR "You must provide a target to detect qt dependencies")
|
||||
endif()
|
||||
|
||||
get_target_property(is_bundle ${ly_qt_deploy_TARGET} MACOSX_BUNDLE)
|
||||
if (is_bundle)
|
||||
add_custom_command(TARGET ${ly_qt_deploy_TARGET} POST_BUILD
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
-DLY_TIMESTAMP_REFERENCE=$<TARGET_FILE:${ly_qt_deploy_TARGET}>
|
||||
-DLY_LOCK_FILE=$<TARGET_FILE_DIR:${ly_qt_deploy_TARGET}>/qtdeploy.lock
|
||||
-P ${LY_ROOT_FOLDER}/cmake/CommandExecution.cmake
|
||||
EXEC_COMMAND "${CMAKE_COMMAND}" -E time
|
||||
${MACDEPLOYQT_EXECUTABLE}
|
||||
$<TARGET_BUNDLE_DIR:${ly_qt_deploy_TARGET}>
|
||||
-always-overwrite
|
||||
-no-strip
|
||||
-verbose=0
|
||||
-fs=APFS
|
||||
DEPENDS $<TARGET_FILE:${ly_qt_deploy_TARGET}>
|
||||
COMMENT "Deploying qt to the ${ly_qt_deploy_TARGET} bundle ..."
|
||||
VERBATIM
|
||||
)
|
||||
else()
|
||||
set(qt_conf_config "[Paths]\nPlugins=@plugin_path@")
|
||||
set(plugin_path "${QT_PATH}/plugins")
|
||||
string(CONFIGURE "${qt_conf_config}" qt_conf_output @ONLY)
|
||||
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" "${qt_conf_output}")
|
||||
|
||||
# output the qt_conf file using "echo" and file redirection
|
||||
add_custom_command(TARGET ${ly_qt_deploy_TARGET} POST_BUILD
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
-DLY_TIMESTAMP_REFERENCE=$<TARGET_FILE:${ly_qt_deploy_TARGET}>
|
||||
-DLY_LOCK_FILE=$<TARGET_FILE_DIR:${ly_qt_deploy_TARGET}>/qtdeploy.lock
|
||||
-P ${LY_ROOT_FOLDER}/cmake/CommandExecution.cmake
|
||||
EXEC_COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
${CMAKE_CURRENT_BINARY_DIR}/qt.conf
|
||||
$<TARGET_FILE_DIR:${ly_qt_deploy_TARGET}>/qt.conf
|
||||
COMMENT "copying over qt.conf..."
|
||||
VERBATIM
|
||||
)
|
||||
endif()
|
||||
|
||||
endfunction()
|
||||
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
#
|
||||
|
||||
set(FILES
|
||||
AWSNativeSDK_mac.cmake
|
||||
BuiltInPackages_mac.cmake
|
||||
civetweb_mac.cmake
|
||||
Clang_mac.cmake
|
||||
@@ -20,6 +19,5 @@ set(FILES
|
||||
FbxSdk_mac.cmake
|
||||
FreeType2_mac.cmake
|
||||
OpenSSL_mac.cmake
|
||||
Qt_mac.cmake
|
||||
Wwise_mac.cmake
|
||||
)
|
||||
@@ -1,74 +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.
|
||||
#
|
||||
|
||||
|
||||
if (LY_MONOLITHIC_GAME)
|
||||
set(AWSNATIVE_SDK_LIB_PATH ${BASE_PATH}/lib/windows/$<IF:$<CONFIG:Debug>,Debug,Release>)
|
||||
else()
|
||||
set(AWSNATIVE_SDK_LIB_PATH ${BASE_PATH}/bin/windows/$<IF:$<CONFIG:Debug>,Debug,Release>)
|
||||
endif()
|
||||
|
||||
set(AWSNATIVESDK_CORE_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-core.lib
|
||||
Bcrypt.lib
|
||||
Userenv.lib
|
||||
Version.lib
|
||||
Wininet.lib
|
||||
Winhttp.lib
|
||||
Ws2_32.lib
|
||||
)
|
||||
set(AWSNATIVESDK_COMMON_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-c-common.lib)
|
||||
set(AWSNATIVESDK_EVENTSTREAM_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-c-event-stream.lib)
|
||||
set(AWSNATIVESDK_CHECKSUMS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-checksums.lib)
|
||||
set(AWSNATIVESDK_ACCESSMANAGEMENT_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-access-management.lib)
|
||||
set(AWSNATIVESDK_COGNITOIDENTITY_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-cognito-identity.lib)
|
||||
set(AWSNATIVESDK_COGNITOIDP_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-cognito-idp.lib)
|
||||
set(AWSNATIVESDK_DEVICEFARM_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-devicefarm.lib)
|
||||
set(AWSNATIVESDK_DYNAMODB_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-dynamodb.lib)
|
||||
set(AWSNATIVESDK_GAMELIFT_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-gamelift.lib)
|
||||
set(AWSNATIVESDK_IDENTITYMANAGEMENT_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-identity-management.lib)
|
||||
set(AWSNATIVESDK_KINESIS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-kinesis.lib)
|
||||
set(AWSNATIVESDK_LAMBDA_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-lambda.lib)
|
||||
set(AWSNATIVESDK_MOBILEANALYTICS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-mobileanalytics.lib)
|
||||
set(AWSNATIVESDK_QUEUES_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-queues.lib)
|
||||
set(AWSNATIVESDK_S3_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-s3.lib)
|
||||
set(AWSNATIVESDK_SNS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-sns.lib)
|
||||
set(AWSNATIVESDK_SQS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-sqs.lib)
|
||||
set(AWSNATIVESDK_STS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-sts.lib)
|
||||
set(AWSNATIVESDK_TRANSFER_LIBS ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-transfer.lib)
|
||||
|
||||
if (NOT LY_MONOLITHIC_GAME)
|
||||
|
||||
# Add 'USE_IMPORT_EXPORT' for external linkage
|
||||
set(AWSNATIVESDK_COMPILE_DEFINITIONS USE_IMPORT_EXPORT)
|
||||
|
||||
#Shared libs
|
||||
set(AWSNATIVESDK_CORE_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-core.dll)
|
||||
set(AWSNATIVESDK_COMMON_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-c-common.dll)
|
||||
set(AWSNATIVESDK_EVENTSTREAM_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-c-event-stream.dll)
|
||||
set(AWSNATIVESDK_CHECKSUMS_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-checksums.dll)
|
||||
set(AWSNATIVESDK_ACCESSMANAGEMENT_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-access-management.dll)
|
||||
set(AWSNATIVESDK_COGNITOIDENTITY_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-cognito-identity.dll)
|
||||
set(AWSNATIVESDK_COGNITOIDP_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-cognito-idp.dll)
|
||||
set(AWSNATIVESDK_DEVICEFARM_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-devicefarm.dll)
|
||||
set(AWSNATIVESDK_DYNAMODB_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-dynamodb.dll)
|
||||
set(AWSNATIVESDK_GAMELIFT_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-gamelift.dll)
|
||||
set(AWSNATIVESDK_IDENTITYMANAGEMENT_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-identity-management.dll)
|
||||
set(AWSNATIVESDK_KINESIS_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-kinesis.dll)
|
||||
set(AWSNATIVESDK_LAMBDA_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-lambda.dll)
|
||||
set(AWSNATIVESDK_MOBILEANALYTICS_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-mobileanalytics.dll)
|
||||
set(AWSNATIVESDK_QUEUES_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-queues.dll)
|
||||
set(AWSNATIVESDK_S3_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-s3.dll)
|
||||
set(AWSNATIVESDK_SNS_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-sns.dll)
|
||||
set(AWSNATIVESDK_SQS_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-sqs.dll)
|
||||
set(AWSNATIVESDK_STS_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-sts.dll)
|
||||
set(AWSNATIVESDK_TRANSFER_RUNTIME_DEPENDENCIES ${AWSNATIVE_SDK_LIB_PATH}/aws-cpp-sdk-transfer.dll)
|
||||
|
||||
endif()
|
||||
@@ -34,8 +34,9 @@ ly_associate_package(PACKAGE_NAME azslc-1.7.19-rev1-multiplatform
|
||||
ly_associate_package(PACKAGE_NAME glad-2.0.0-beta-rev2-multiplatform TARGETS glad PACKAGE_HASH ff97ee9664e97d0854b52a3734c2289329d9f2b4cd69478df6d0ca1f1c9392ee)
|
||||
ly_associate_package(PACKAGE_NAME xxhash-0.7.4-rev1-multiplatform TARGETS xxhash PACKAGE_HASH e81f3e6c4065975833996dd1fcffe46c3cf0f9e3a4207ec5f4a1b564ba75861e)
|
||||
ly_associate_package(PACKAGE_NAME Blast-1.1.7-rev1-multiplatform TARGETS Blast PACKAGE_HASH 36b8f393bcd25d0f85cfc7a831ebbdac881e6054c4f0735649966aa6aa86e6f0)
|
||||
ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev3-multiplatform TARGETS PVRTexTool PACKAGE_HASH d9c7e21e03b03cb560da4793a91a0d384ea621757cf87a1a82c83bfca6b23f97)
|
||||
ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev4-multiplatform TARGETS PVRTexTool PACKAGE_HASH d0d6da61c7557de0d2c71fc35ba56c3be49555b703f0e853d4c58225537acf1e)
|
||||
# platform-specific:
|
||||
ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev1-windows TARGETS AWSNativeSDK PACKAGE_HASH 58e199f253a28964b96056ed4a6db06216fcde14a96d6d94b0d6ad3437516bdc)
|
||||
ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev1-windows TARGETS PhysX PACKAGE_HASH 198bed89d1aae7caaf5dadba24cee56235fe41725d004b64040d4e50d0f3aa1a)
|
||||
ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-windows TARGETS mikkelsen PACKAGE_HASH 872c4d245a1c86139aa929f2b465b63ea4ea55b04ced50309135dd4597457a4e)
|
||||
ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-windows TARGETS googletest PACKAGE_HASH 7e8f03ae8a01563124e3daa06386f25a2b311c10bb95bff05cae6c41eff83837)
|
||||
@@ -43,3 +44,4 @@ ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev1-windows TARGETS Goo
|
||||
ly_associate_package(PACKAGE_NAME d3dx12-headers-rev1-windows TARGETS d3dx12 PACKAGE_HASH 088c637159fba4a3e4c0cf08fb4921906fd4cca498939bd239db7c54b5b2f804)
|
||||
ly_associate_package(PACKAGE_NAME pyside2-qt-5.15.1-rev2-windows TARGETS pyside2 PACKAGE_HASH c90f3efcc7c10e79b22a33467855ad861f9dbd2e909df27a5cba9db9fa3edd0f)
|
||||
ly_associate_package(PACKAGE_NAME openimageio-2.1.16.0-rev1-windows TARGETS openimageio PACKAGE_HASH b9f6d6df180ad240b9f17a68c1862c7d8f38234de0e692e83116254b0ee467e5)
|
||||
ly_associate_package(PACKAGE_NAME qt-5.15.2-windows TARGETS Qt PACKAGE_HASH edaf954c647c99727bfd313dab2959803d2df0873914bb96368c3d8286eed6d9)
|
||||
|
||||
@@ -1,55 +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(QT_PATH ${BASE_PATH}/msvc2019_64)
|
||||
set(QT_LIB_PATH ${QT_PATH}/lib)
|
||||
|
||||
include(CMakeParseArguments)
|
||||
|
||||
# Clear the cache for found executable
|
||||
unset(WINDEPLOYQT_EXECUTABLE CACHE)
|
||||
find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${QT_PATH}/bin")
|
||||
mark_as_advanced(WINDEPLOYQT_EXECUTABLE) # Hiding from GUI
|
||||
|
||||
function(ly_qt_deploy)
|
||||
|
||||
set(options)
|
||||
set(oneValueArgs TARGET)
|
||||
set(multiValueArgs)
|
||||
|
||||
cmake_parse_arguments(ly_qt_deploy "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
|
||||
|
||||
# Validate input arguments
|
||||
if(NOT ly_qt_deploy_TARGET)
|
||||
message(FATAL_ERROR "You must provide a target to detect qt dependencies")
|
||||
endif()
|
||||
|
||||
# CMake has an issue with POST_BUILD commands in msbuild when it is executed from outside VS:
|
||||
# https://gitlab.kitware.com/cmake/cmake/issues/18530
|
||||
|
||||
add_custom_command(TARGET ${ly_qt_deploy_TARGET} POST_BUILD
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
-DLY_TIMESTAMP_REFERENCE=$<TARGET_FILE:${ly_qt_deploy_TARGET}>
|
||||
-DLY_LOCK_FILE=$<TARGET_FILE_DIR:${ly_qt_deploy_TARGET}>/qtdeploy.lock
|
||||
-P ${LY_ROOT_FOLDER}/cmake/CommandExecution.cmake
|
||||
EXEC_COMMAND "${CMAKE_COMMAND}" -E
|
||||
env PATH="${QT_PATH}/bin"
|
||||
${WINDEPLOYQT_EXECUTABLE}
|
||||
$<$<CONFIG:Debug>:--pdb>
|
||||
--verbose 0
|
||||
--no-compiler-runtime
|
||||
$<TARGET_FILE:${ly_qt_deploy_TARGET}>
|
||||
DEPENDS $<TARGET_FILE:${ly_qt_deploy_TARGET}> $<TARGET_FILE:AZ::QtTGAImageFormatPlugin>
|
||||
COMMENT "Deploying qt..."
|
||||
VERBATIM
|
||||
)
|
||||
|
||||
endfunction()
|
||||
@@ -10,7 +10,6 @@
|
||||
#
|
||||
|
||||
set(FILES
|
||||
AWSNativeSDK_windows.cmake
|
||||
AWSGameLiftServerSDK_windows.cmake
|
||||
BuiltInPackages_windows.cmake
|
||||
Clang_windows.cmake
|
||||
@@ -23,7 +22,6 @@ set(FILES
|
||||
FreeType2_windows.cmake
|
||||
libav_windows.cmake
|
||||
OpenSSL_windows.cmake
|
||||
Qt_windows.cmake
|
||||
tiff_windows.cmake
|
||||
Wwise_windows.cmake
|
||||
)
|
||||
|
||||
@@ -1,37 +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(AWSNATIVE_SDK_LIB_PATH ${BASE_PATH}/lib/ios/$<IF:$<CONFIG:Debug>,Debug,Release>)
|
||||
|
||||
set(AWSNATIVESDK_CORE_LIBS
|
||||
${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-core.a
|
||||
${AWSNATIVE_SDK_LIB_PATH}/libcurl.a
|
||||
)
|
||||
set(AWSNATIVESDK_COMMON_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.a)
|
||||
set(AWSNATIVESDK_EVENTSTREAM_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-c-event-stream.a)
|
||||
set(AWSNATIVESDK_CHECKSUMS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-checksums.a)
|
||||
set(AWSNATIVESDK_COGNITOIDENTITY_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-cognito-identity.a)
|
||||
set(AWSNATIVESDK_COGNITOIDP_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-cognito-idp.a)
|
||||
set(AWSNATIVESDK_DEVICEFARM_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-devicefarm.a)
|
||||
set(AWSNATIVESDK_DYNAMODB_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-dynamodb.a)
|
||||
set(AWSNATIVESDK_GAMELIFT_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-gamelift.a)
|
||||
set(AWSNATIVESDK_IDENTITYMANAGEMENT_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-identity-management.a)
|
||||
set(AWSNATIVESDK_KINESIS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-kinesis.a)
|
||||
set(AWSNATIVESDK_LAMBDA_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-lambda.a)
|
||||
set(AWSNATIVESDK_MOBILEANALYTICS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-mobileanalytics.a)
|
||||
set(AWSNATIVESDK_QUEUES_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-queues.a)
|
||||
set(AWSNATIVESDK_S3_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-s3.a)
|
||||
set(AWSNATIVESDK_SNS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-sns.a)
|
||||
set(AWSNATIVESDK_SQS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-sqs.a)
|
||||
set(AWSNATIVESDK_STS_LIBS ${AWSNATIVE_SDK_LIB_PATH}/libaws-cpp-sdk-sts.a)
|
||||
|
||||
find_library(SECURITY_FRAMEWORK Security)
|
||||
set(AWSNATIVESDK_BUILD_DEPENDENCIES ${SECURITY_FRAMEWORK})
|
||||
@@ -21,6 +21,7 @@ ly_associate_package(PACKAGE_NAME zstd-1.35-multiplatform TARGETS zst
|
||||
ly_associate_package(PACKAGE_NAME glad-2.0.0-beta-rev2-multiplatform TARGETS glad PACKAGE_HASH ff97ee9664e97d0854b52a3734c2289329d9f2b4cd69478df6d0ca1f1c9392ee)
|
||||
|
||||
# platform-specific:
|
||||
ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev1-ios TARGETS AWSNativeSDK PACKAGE_HASH 9e1956b5bb10762cdb84a981dcd356419078f4296ffbc8c55717bc3f53b09d69)
|
||||
ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev1-ios TARGETS PhysX PACKAGE_HASH a2a48a09128337c72b9c2c1b8f43187c6c914e8509c9c6cd91810108748d7e09)
|
||||
ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-ios TARGETS mikkelsen PACKAGE_HASH 976aaa3ccd8582346132a10af253822ccc5d5bcc9ea5ba44d27848f65ee88a8a)
|
||||
ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-ios TARGETS googletest PACKAGE_HASH 2f121ad9784c0ab73dfaa58e1fee05440a82a07cc556bec162eeb407688111a7)
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
#
|
||||
|
||||
set(FILES
|
||||
AWSNativeSDK_ios.cmake
|
||||
BuiltInPackages_ios.cmake
|
||||
expat_ios.cmake
|
||||
FreeType2_ios.cmake
|
||||
|
||||
Vendored
-2
@@ -11,7 +11,6 @@
|
||||
|
||||
set(FILES
|
||||
BuiltInPackages.cmake
|
||||
FindAWSNativeSDK.cmake
|
||||
FindAWSGameLiftServerSDK.cmake
|
||||
Findcivetweb.cmake
|
||||
FindClang.cmake
|
||||
@@ -23,7 +22,6 @@ set(FILES
|
||||
FindFreeType2.cmake
|
||||
Findlibav.cmake
|
||||
FindOpenSSL.cmake
|
||||
FindQt.cmake
|
||||
FindRadTelemetry.cmake
|
||||
Findtiff.cmake
|
||||
FindVkValidation.cmake
|
||||
|
||||
Reference in New Issue
Block a user