From 4ce9742ae33678d8fce189d172c2fffb1a43061c Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Sun, 8 Nov 2015 13:31:25 +0100
Subject: [PATCH] Alias: Fix access at generate-time (#15832)

Commit c389f8bb (cmLocalGenerator: Port Find method away from
GetGeneratorTarget, 2015-10-25) ported the implementation of
FindGeneratorTargetToUse away from the FindTargetToUse method,
but neglected to handle alias targets.

The latter method has a parameter to determine whether to
include alias targets in the search, but as that is only
needed at configure time, this generate-time equivalent does
not need the condition.
---
 Source/cmGlobalGenerator.cxx            | 6 ++++++
 Tests/AliasTarget/CMakeLists.txt        | 4 +++-
 Tests/AliasTarget/subdir/CMakeLists.txt | 3 +++
 Tests/AliasTarget/subdir/empty.cpp      | 7 +++++++
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 Tests/AliasTarget/subdir/CMakeLists.txt
 create mode 100644 Tests/AliasTarget/subdir/empty.cpp

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3d2db422f..2126c7180 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2274,6 +2274,12 @@ cmGlobalGenerator::FindTarget(const std::string& name,
 cmGeneratorTarget*
 cmGlobalGenerator::FindGeneratorTarget(const std::string& name) const
 {
+  std::map<std::string, std::string>::const_iterator ai =
+      this->AliasTargets.find(name);
+  if (ai != this->AliasTargets.end())
+    {
+    return this->FindGeneratorTargetImpl(ai->second);
+    }
   if (cmGeneratorTarget* tgt = this->FindGeneratorTargetImpl(name))
     {
     return tgt;
diff --git a/Tests/AliasTarget/CMakeLists.txt b/Tests/AliasTarget/CMakeLists.txt
index c50b4e6a8..e1d89666e 100644
--- a/Tests/AliasTarget/CMakeLists.txt
+++ b/Tests/AliasTarget/CMakeLists.txt
@@ -37,7 +37,9 @@ target_include_directories(bat PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
 add_executable(targetgenerator targetgenerator.cpp)
 add_executable(Generator::Target ALIAS targetgenerator)
 
-add_custom_target(usealias Generator::Target)
+add_subdirectory(subdir)
+
+add_custom_target(usealias Generator::Target $<TARGET_FILE:Sub::tgt>)
 add_dependencies(bat usealias)
 
 if (NOT TARGET Another::Alias)
diff --git a/Tests/AliasTarget/subdir/CMakeLists.txt b/Tests/AliasTarget/subdir/CMakeLists.txt
new file mode 100644
index 000000000..8c84aea3c
--- /dev/null
+++ b/Tests/AliasTarget/subdir/CMakeLists.txt
@@ -0,0 +1,3 @@
+
+add_library(tgt STATIC empty.cpp)
+add_library(Sub::tgt ALIAS tgt)
diff --git a/Tests/AliasTarget/subdir/empty.cpp b/Tests/AliasTarget/subdir/empty.cpp
new file mode 100644
index 000000000..b19427ad0
--- /dev/null
+++ b/Tests/AliasTarget/subdir/empty.cpp
@@ -0,0 +1,7 @@
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int main(void)
+{
+  return 0;
+}