Commit Graph

63 Commits

Author SHA1 Message Date
amzn-sj 39d207095a Remove call to ly_get_absolute_pal_filename that's not needed 2021-06-09 15:31:33 -07:00
Esteban Papp 4b3d0d1054 LYN-4327 [SDK] External Gem's aren't added to the project solution when using SDK (#1191)
* should pickup the external directories registered by the project

* Add support for AzTest and AzTestRunner in the SDK

* missing IMPORT_LIB

* Moved where .Assets targets get generated so they are visible in the SDK

* generate the Directory.Build.props in the right path

* excluding target on platforms that dont support it
2021-06-08 14:01:50 -07:00
Esteban Papp 74e5090f26 Adding ExternalWarningLevel to the Directory.Build.props to get the default warning level for external headers to match the one we define through compile options (#1160) 2021-06-04 18:08:52 -07:00
lumberyard-employee-dm d9b57bce67 Fixed configuring of cmake when a project resides on a different drive than the engine (#1153) 2021-06-04 19:34:22 -05:00
Esteban Papp 08db058476 SPEC-2513 Fixes to enable w4436 and w4366 (#1157)
* Fix for w4457

* Nothing to fix, seems we deleted all the code that was causing this offense

* removing warning

* another warning that doesnt trigger
2021-06-04 16:41:24 -07:00
Esteban Papp cf35585bc0 Making incremental linking off by default (#1154) 2021-06-04 15:25:57 -07:00
Esteban Papp e71a4656bc SPEC-2513 Fixes to enable w4450 (#1145)
* Fix for w4457

* Nothing to fix, seems we deleted all the code that was causing this offense
2021-06-04 15:10:20 -07:00
Esteban Papp 76a6df341b SPEC-2513 Fixes to enable w4457 2021-06-04 10:51:47 -07:00
scottr 0d1b217b24 Merge branch 'main' into cpack_installer 2021-06-04 06:45:43 -07:00
lumberyard-employee-dm dce87534c7 Removing the Pyside implementation of the project manager python scripts (#1112)
* Removing the Pyside implementation of the project manager python scripts

* Removing reference to the scripts/project_manager directory 

The Install_common.cmake script reference to the project_manager directory has been removed.
2021-06-03 14:37:16 -05:00
Esteban Papp 5d7aae9bd8 SPEC-2513 Fixes to enable w4459 (#1107)
* fixing w4459

* Fixes for nounity

* putting OLD_APARAM_USER in a common place to avoid duplicated declarations
2021-06-03 11:12:54 -07:00
scottr 957937ffc2 Merge branch 'main' into cpack_installer 2021-06-03 10:54:46 -07:00
Esteban Papp 29c71b4e53 SPEC-2513 Fixes to enable w4701 (#1105)
* Some fixes

* more fixes

* fixes for debug
2021-06-03 09:30:33 -07:00
scottr 328ced0059 [cpack_installer] replaced missing get_target_property hack and fixed a typo 2021-06-03 07:24:30 -07:00
scottr b09f73378f [cpack_installer] replaced LY_DEFAULT_INSTALL_COMPONENT with built-in CMAKE_INSTALL_DEFAULT_COMPONENT_NAME. updated stale references to ly_install_target_COMPONENT with a get_prop call 2021-06-02 20:49:39 -07:00
Esteban Papp f1dbeb584a LYN-4206 CMake bakes install prefix during configure (#1100) 2021-06-02 16:50:18 -07:00
Esteban Papp 7d1fedc10c LYN-4128 EditorPythonBindings.Editor in debug does not load (missing python_d.dll) 2021-06-01 08:29:35 -07:00
lumberyard-employee-dm c67cd2dc4e Renaming the TargetCMakeLists.txt.in to InstalledTarget.in to get avoid it being picked up by the CopyrightValidator 2021-05-27 17:35:08 -05:00
lumberyard-employee-dm f6568f5c63 Re-added back an ly_setup_target function which configures the CMakeLists.txt template for a single target 2021-05-27 13:10:54 -07:00
lumberyard-employee-dm 18e479589d Updating the Install_common.cmake ly_setup_o3de_install() function to be
able forward all the ly_add_targets calls within a single source Engine
CMakeLists.txt to a single installed Engine CMakeLists.txt
2021-05-27 12:19:49 -07:00
lumberyard-employee-dm 5b8e759c2d Implemented changes in the ly_setup_target() command to forward the ly_create_alias() command calls to the configured CMakeLists.txt per installed target 2021-05-26 23:59:49 -05:00
lumberyard-employee-dm 84cf3bffde Updating the Install_common.cmake script to copy over the source engine.json templates array to the generated installed engine.json 2021-05-26 20:49:52 -05:00
lumberyard-employee-dm d536a9438d Revert "Fixes an issue with RUNTIME_DEPENDENCIES including too many targets during install"
This reverts commit f972edee01.
2021-05-25 17:36:16 -05:00
lumberyard-employee-dm b99bcea24a Updating the engine.json.in template for the cmake INSTALL target to add the list of external subdirectories to allow the installed layout to access the subdirectories via it's engine.json file 2021-05-24 00:43:21 -05:00
phistere cef7eacd24 Fixes install of scripts to include o3de folder 2021-05-19 13:25:51 -05:00
phistere f972edee01 Fixes an issue with RUNTIME_DEPENDENCIES including too many targets during install 2021-05-19 10:49:17 -05:00
pappeste 671f26bed4 fixing debug configuration and how we declare IMPORTED targets (instead of UNKNOW we use the actual type) 2021-05-11 19:06:07 -07:00
pappeste b3ae71a5d8 misc fixes 2021-05-10 16:03:00 -07:00
pappeste 65e0bd270e Fixing runtime dependencies (including qt deploy). Running AP/Editor again 2021-05-10 14:55:03 -07:00
pappeste 12cea5d029 Fixing headers and interface build dependencies 2021-05-10 13:58:22 -07:00
pappeste 33e4098741 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948
# Conflicts:
#	cmake/Platform/Common/Install_common.cmake
2021-05-10 12:01:49 -07:00
pappeste ac7024cc06 Making install to be completely a post-processing step. We need this so all dependencies are declared and ready when we generate the target files 2021-05-10 11:19:35 -07:00
phistere bedecebdcc Configures and installs an engine.json generated from a template. Fixes HEADERONLY targets for install. Fixes locating .ico resource file. Fix infinite loop in CMake configure on new projects. 2021-05-07 20:05:05 -05:00
pappeste bddbe43240 adding all the config folder for ImageProcessingAtom 2021-05-06 13:55:34 -07:00
pappeste 68f19644e7 typo 2021-05-05 16:42:50 -07:00
pappeste f6187f510a config file going to the wrong place 2021-05-05 16:21:25 -07:00
pappeste d27aa0f584 replaced ly_add_dependencies with ly_add_target_files so settingsregistry is happy 2021-05-05 12:31:34 -07:00
pappeste 7c9837dfd4 installing the gems.json files 2021-05-05 12:07:45 -07:00
pappeste b0732dd494 Changing find files to add_subdirectory to be able to have SettingsRegistry.cmake finding the path to the gems 2021-05-04 13:52:19 -07:00
pappeste 03ae0195a3 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	CMakeLists.txt
#	cmake/Platform/Common/Install_common.cmake
2021-05-03 18:18:20 -07:00
pappeste d1416d53e0 adding a file for ImageProcessing 2021-05-03 18:16:08 -07:00
pappeste 5c68647b6b fixing qt deploy and adding install of runtime dependencies 2021-05-03 17:16:03 -07:00
pappeste ed17d01028 making the runtime_dependencies a function so we can reuse internal functions for the install 2021-05-03 17:10:40 -07:00
Eric Phister 4485edf77d LYN-2578: Updates cmake install for 'scripts' directory. (#518)
* LYN-2578: Updates cmake install for 'scripts' directory.  Updates destination of certain binaries.
* LYN-2578: Updates to cmake install based on feedback.
2021-05-03 17:46:54 -05:00
pappeste a905f38cc4 qt deploy 2021-04-30 18:06:30 -07:00
scottr 37f0b44de4 [install_gem_assets_fix] include the Registry folder in the gem install filtering 2021-04-29 16:01:15 -07:00
scottr ce17170bae [install_gem_assets_fix] revert gem asset folder glob to use CMAKE_SOURCE_DIR instead of CMAKE_CURRENT_SOURCE_DIR 2021-04-29 14:40:49 -07:00
scottr 9df8ac76d4 [install_gem_assets_fix] fixed glob/filter logic for finding gem asset directories to install 2021-04-29 12:57:11 -07:00
lumberyard-employee-dm 3dec5d3b71 LYN-2537 engine assets (#254)
* LYN-2537 Moved the Engine and Editor folder to be within the EngineAssets folder

* Fixed Documentation in bootstrap.cfg to correct the path to the user project specific registry file

* Adding a newline to the output of AssetCatalog 'Registering asset..., but type is not set' message

* Updating the AssetProcessorPlatformConfig.setreg Scan Folder to detect
the @ENGINEROOT@/EngineAssets/Engine path for engine runtime assets and
@ENGINEROOT@/EngineAssets/Editor path for engine tool assets

* Updating references to Icons and other assets to account for moving the
Engine and Editor folder under a single EngineAssets folder

* Moving the Engine Settings Registry folder from Engine/Registry -> Registry

* Removed the LY_PROJECT_CMAKE_PATH define as it is not portable to other locations. It is hard coded to the project location that was used for the CMake configuration. Furthermore it paths with backslashes within it are treated as escape characters and not a path separator

* Updated the LyTestTools asset_processor.py script to copy the exclude.filetag from the EngineAssets/Engine directory now

* Fixed Atom Shader Preprocessing when running using an External Project

* Updated the TSGenerateAction.cpp to fix the build error with using a renamed variable

* Updated the Install_Common.cmake ly_setup_others function to install the
EngineAssets directory and the each of the Gem's Assets directory while
maintaining the relative directory structure to the Engine Root
Also updated the install step to install the Registry folder at the
engine root

* Fixed the copying of the Registry folder to be in the install root, instead of under a second 'Registry' folder

* Moving the AssetProcessorPlatformConfig.setreg file over to the Registry folder

* Updated the LyTestTools and C++ code to point that the new location of
the AssetProcessorPlatformConfig.setreg file inside of the Registry
folder

* Renamed Test AssetProcessor*Config.ini files to have the .setreg extension

* Converted the AssetProcessor test setreg files from ini format to json
format using the SerializeContextTools convert-ini command

* Updated the AssetProcessor CMakeLists.txt to copy over the test setreg files to the build folder

* Updated the assetprocessor test file list to point at the renamed AsssetProcessor*Config setreg filenames

* Removed the Output Prefix code from the AssetProcessor. The complexity that it brought to the AP code is not needed, as users can replicate the behavior by just moving there assets underneath a another folder, underneath the scan folder

* Adding back support to read the AssetProcessorPlatformConfig.setreg file from the asset root. This is only needed for C++ UnitTests as they run in an environment where the accessing the Engine Settings Registry is not available

* Updating the Install_common.cmake logic to copy any "Assets" folder to
the install layout.
The Script has also been updated to copy over the "Assets" folder in the
Engine Root to the install layout instead of an "EngineAssets" folder

* Updating References to EngineAssets source asset folder in code to be the Assets source folder

* Moved the Engine Source Asset folder of 'EngineAssets' to a new folder name of 'Assets'. This is inline with the naming scheme we use for Gem asset folders

* Adding the EngineFinder.cmake to the AutomatedTesting project to allow it to work in a project centric manner

* Updating the LyTestTools copy_assets_to_project function to be able to copy assets with folders to the temporary project root
Fixed an issue in LyTestTools where the temporary log directory could have shutil.rmtree being called twice on it leading to an exception which fails an automated test

Updated the asset_procesor_gui_tests_2 AddScanFolder test to not use the
output prefix, but instead place the source asset root into a
subdirectory

* Correct the AssetProcessorPlatformConfig Scan Folders for the EngineAssets directory to point at the Assets directory

* Updated the asset procesor batch dependency test scan folder to point at the 'Assets' folder instead of 'EngineAssets'
2021-04-28 21:38:43 -05:00
Esteban Papp 5d13ad963a SPEC-6437 Dlls should go to bin instead of profile (#287)
* renaming and organizing files

* removed unused files

* Removing unnecessary file

* moved file

* reverting movement of 3rdparty associations from gems to global

* removing unnecessary calls to ly_add_external_target_path

* fixing install prefix of ci_build

* Fixes to get 3rdparties declared in gems to be installed

* Allowing to install just one configuration

* Adding empty line at the end

* removing commented code

* setting IMPORETD_LOCATION_<CONFIG> and defaulting IMPORTED_LOCATION to the profile config in case other configs are not installed

* putting dlls/exe in the right place, with the right output subdirectory

* setting runtime dependencies for the dlls that we link against

* singular target location

* code review comments/fixes

* Fixing identation
2021-04-23 14:41:18 -07:00