Cherrypick my linux/clang compile fixes from dev to point release #17771
Conversation
specifically, cherry-picks commit 6e77dfa changes to EncryptionCommon.cpp Fix for compile error on linux clang. Signed-off-by: Nicholas Lawson <70027408+nick-l-o3de@users.noreply.github.com>
Avoids a CMAKE error in certain conditions. See o3de#17098 Signed-off-by: Nicholas Lawson <70027408+nick-l-o3de@users.noreply.github.com>
are only built or aliased when tools are present for the platform. Signed-off-by: Nicholas Lawson <70027408+nick-l-o3de@users.noreply.github.com>
|
I updated it to make it instead so that everything that depends on tools only tries to create their alias or target if tools are built for the platform. I tested it by compiling (on linux) with the PAL_Linux.cmake file modified to make it so that building tools was set to FALSE. I also tried combinations of FALSE/TRUE for building tools and building tests. |
| ly_create_alias(NAME LyShineExamples.Tools NAMESPACE Gem TARGETS Gem::LyShineExamples Gem::LmbrCentral.Editor) | ||
| if (PAL_TRAIT_BUILD_HOST_TOOLS) | ||
| # only if building tools for this platform, alias to tool targets | ||
| ly_create_alias(NAME LyShineExamples.Builders NAMESPACE Gem TARGETS Gem::LyShineExamples Gem::UiBasics.Builders Gem::LmbrCentral.Editor) |
There was a problem hiding this comment.
With these updates, the Builders alias can be outside of the PAL_TRAIT_BUILD_HOST_TOOLS check right?
There was a problem hiding this comment.
Not sure what you mean by this. This particular change just reverts it to what it was before I made any changes. The problem with these was that previously before I made any changes, they only existed when PAL_TRAIT_BUILD_HOST_TOOLS was TRUE, but other parts of hte engine and other gems depended on them outside PAL_TRAIT_BUILD_HOST_TOOLS blocks.
I went and instead updated all the other stuff that depended on them to also depend on the PAL_TRAIT_BUILD_HOST_TOOLS being true, resolving the problem. All the other stuff that depended on these aliases and targets was in fact test or tool (or both) stuff anyway, or a typo.
This is a combination of commit 4a613a0 and commit 6e77dfa from development to this branch, fixing compile warnings/errors under linux in certain conditions (ie, release, profile, etc)
See #17098 for the one cherrypick
See https://github.com/o3de/o3de/pull/16645/files#diff-1d4eec4a38cbed22d33a569f28fa14d554ae1522f7a129cb3f6bba681a140465 for the other.
Note that the latter was part of the Script Only mode, but only the compile error fix was cherrypicked in here, not the feature itself.
Testing: Compile and run editor. Changes are compile errors and it simply did not compile before.