SJ
44b053df58
* 1. Initial support for loading dylibs outside the bundle. 2. Child processes inherit parent's environment if no environment is explicitly specified(should change to append the parent's environment even if environment variables are explicitly specified). 3. Update some time functions to use system uptime instead of wall clock time when computing elapsed time. This fixes false timeouts when the OS goes to sleep. 4. Increase wait times for AssetBuilders and some Atom tools to connect to the AssetProcessor. This is needed because GateKeeper slows down first time bootup which results in asset processing failures. With this change we'll be able to run Editor and AssetProcessor from an install on Mac and we will also be able to build and run projects using the installed engine as an SDK. Signed-off-by: amzn-sj <srikkant@amazon.com> * 1. Remove debug messages. 2. Fix license 3. Pass parent's environment variables to child processes by default(on Mac). Signed-off-by: amzn-sj <srikkant@amazon.com> * 1. Add more detailed comments.2. Use a custom ly_copy for Mac and leave the default as is. Signed-off-by: amzn-sj <srikkant@amazon.com> * Address some feedback from review Signed-off-by: amzn-sj <srikkant@amazon.com>
39 lines
1.5 KiB
CMake
39 lines
1.5 KiB
CMake
#
|
|
# Copyright (c) Contributors to the Open 3D Engine Project.
|
|
# For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
|
#
|
|
# SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
#
|
|
#
|
|
|
|
# Set resources directory for app icons
|
|
target_sources(Editor PRIVATE ${CMAKE_CURRENT_LIST_DIR}/Images.xcassets)
|
|
set_target_properties(Editor PROPERTIES
|
|
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_LIST_DIR}/gui_info.plist
|
|
RESOURCE ${CMAKE_CURRENT_LIST_DIR}/Images.xcassets
|
|
XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME EditorAppIcon
|
|
)
|
|
|
|
# We cannot use ly_add_target here because we're already including this file from inside ly_add_target
|
|
# So we need to setup target, dependencies and install logic manually.
|
|
add_executable(EditorDummy Platform/Mac/main_dummy.cpp)
|
|
add_executable(AZ::EditorDummy ALIAS EditorDummy)
|
|
|
|
ly_target_link_libraries(EditorDummy
|
|
PRIVATE
|
|
AZ::AzCore
|
|
AZ::AzFramework)
|
|
|
|
ly_add_dependencies(Editor EditorDummy)
|
|
|
|
# Store the aliased target into a DIRECTORY property
|
|
set_property(DIRECTORY APPEND PROPERTY LY_DIRECTORY_TARGETS AZ::EditorDummy)
|
|
|
|
# Store the directory path in a GLOBAL property so that it can be accessed
|
|
# in the layout install logic. Skip if the directory has already been added
|
|
get_property(ly_all_target_directories GLOBAL PROPERTY LY_ALL_TARGET_DIRECTORIES)
|
|
if(NOT CMAKE_CURRENT_SOURCE_DIR IN_LIST ly_all_target_directories)
|
|
set_property(GLOBAL APPEND PROPERTY LY_ALL_TARGET_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR})
|
|
endif()
|
|
|
|
ly_install_add_install_path_setreg(Editor) |