diff options
author | Brad King <brad.king@kitware.com> | 2016-04-05 13:37:59 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-04-05 13:37:59 (GMT) |
commit | adea45e15abf95b53e13ea8564cad9fc8e35ed56 (patch) | |
tree | b8a655cd4d53b8cb5a691b6f88c3f825f617d157 /Source/cmLocalGenerator.h | |
parent | 6c60f116cb2bfe6753f526ceacfb5e54bc22efc5 (diff) | |
parent | 0e44f4894f23d5eccd8d360f3420c832f9433a20 (diff) | |
download | CMake-adea45e15abf95b53e13ea8564cad9fc8e35ed56.zip CMake-adea45e15abf95b53e13ea8564cad9fc8e35ed56.tar.gz CMake-adea45e15abf95b53e13ea8564cad9fc8e35ed56.tar.bz2 |
Merge topic 'fix-target-alias-in-subdir'
0e44f489 Rename local target lookup methods to clarify purpose
bc30f8b5 Fix lookup of an ALIAS target outside aliased target's directory (#16044)
Diffstat (limited to 'Source/cmLocalGenerator.h')
-rw-r--r-- | Source/cmLocalGenerator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 68e7667..b673a85 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -129,7 +129,8 @@ public: void AddImportedGeneratorTarget(cmGeneratorTarget* gt); void AddOwnedImportedGeneratorTarget(cmGeneratorTarget* gt); - cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const; + cmGeneratorTarget* + FindLocalNonAliasGeneratorTarget(const std::string& name) const; cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const; /** |