diff options
author | Brad King <brad.king@kitware.com> | 2018-09-07 14:56:17 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-09-12 16:46:25 (GMT) |
commit | 2f708f5d65557ecbfe4ebe7c14b02dbba6bf0ffe (patch) | |
tree | 1fa50eade95a0394af49aaca5489839dcfad5d29 /Source/cmGlobalGenerator.h | |
parent | 94a75801c834891f47358e9f5763c56245dff3fe (diff) | |
download | CMake-2f708f5d65557ecbfe4ebe7c14b02dbba6bf0ffe.zip CMake-2f708f5d65557ecbfe4ebe7c14b02dbba6bf0ffe.tar.gz CMake-2f708f5d65557ecbfe4ebe7c14b02dbba6bf0ffe.tar.bz2 |
Make internal TARGET_PROPERTY generator expressions more robust
While collecting usage requirements from the `INTERFACE_*` properties of
directly linked targets, we internally generate `TARGET_PROPERTY:` and
`TARGET_OBJECTS:` generator expressions to refer to those properties on
those targets. At the point we generate these expressions we already
have a pointer to an exact `cmGeneratorTarget` instance.
Switch from using the target name in these generator expressions to
using an internal unique name generated for each `cmGeneratorTarget`
instance to be referenced. This avoids depending on the user-facing
target name to find the same target we already have.
Diffstat (limited to 'Source/cmGlobalGenerator.h')
-rw-r--r-- | Source/cmGlobalGenerator.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 720938d..6b972eb 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -303,6 +303,10 @@ public: void IndexTarget(cmTarget* t); void IndexGeneratorTarget(cmGeneratorTarget* gt); + // Index the target using a name that is unique to that target + // even if other targets have the same name. + std::string IndexGeneratorTargetUniquely(cmGeneratorTarget const* gt); + static bool IsReservedTarget(std::string const& name); virtual const char* GetAllTargetName() const { return "ALL_BUILD"; } |