1 files changed, 54 insertions, 38 deletions

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f39cd4b..c9aabb8 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1043,6 +1043,9 @@ private:
   static const char* ComputeLocationForBuild(cmTarget const* tgt);
   static const char* ComputeLocation(cmTarget const* tgt,
                                      std::string const& config);
+  static const char* GetLocation(cmTarget const* tgt,
+                                 std::string const& config,
+                                 cmMakefile* context);
 
   static const char* GetSources(cmTarget const* tgt, cmMakefile* context);
 };
@@ -1114,6 +1117,52 @@ const char* cmTargetPropertyComputer::ComputeLocation(
   return loc.c_str();
 }
 
+const char* cmTargetPropertyComputer::GetLocation(cmTarget const* tgt,
+                                                  const std::string& prop,
+                                                  cmMakefile* context)
+{
+  // Watch for special "computed" properties that are dependent on
+  // other properties or variables.  Always recompute them.
+  if (tgt->GetType() == cmState::EXECUTABLE ||
+      tgt->GetType() == cmState::STATIC_LIBRARY ||
+      tgt->GetType() == cmState::SHARED_LIBRARY ||
+      tgt->GetType() == cmState::MODULE_LIBRARY ||
+      tgt->GetType() == cmState::UNKNOWN_LIBRARY) {
+    static const std::string propLOCATION = "LOCATION";
+    if (prop == propLOCATION) {
+      if (!tgt->IsImported() &&
+          !HandleLocationPropertyPolicy(tgt->GetName(), context)) {
+        return CM_NULLPTR;
+      }
+      return ComputeLocationForBuild(tgt);
+    }
+
+    // Support "LOCATION_<CONFIG>".
+    else if (cmHasLiteralPrefix(prop, "LOCATION_")) {
+      if (!tgt->IsImported() &&
+          !HandleLocationPropertyPolicy(tgt->GetName(), context)) {
+        return CM_NULLPTR;
+      }
+      const char* configName = prop.c_str() + 9;
+      return ComputeLocation(tgt, configName);
+    }
+
+    // Support "<CONFIG>_LOCATION".
+    else if (cmHasLiteralSuffix(prop, "_LOCATION") &&
+             !cmHasLiteralPrefix(prop, "XCODE_ATTRIBUTE_")) {
+      std::string configName(prop.c_str(), prop.size() - 9);
+      if (configName != "IMPORTED") {
+        if (!tgt->IsImported() &&
+            !HandleLocationPropertyPolicy(tgt->GetName(), context)) {
+          return CM_NULLPTR;
+        }
+        return ComputeLocation(tgt, configName);
+      }
+    }
+  }
+  return CM_NULLPTR;
+}
+
 const char* cmTargetPropertyComputer::GetSources(cmTarget const* tgt,
                                                  cmMakefile* context)
 {
@@ -1207,44 +1256,11 @@ const char* cmTargetPropertyComputer::GetProperty(cmTarget const* tgt,
                                                   const std::string& prop,
                                                   cmMakefile* context)
 {
-  // Watch for special "computed" properties that are dependent on
-  // other properties or variables.  Always recompute them.
-  if (tgt->GetType() == cmState::EXECUTABLE ||
-      tgt->GetType() == cmState::STATIC_LIBRARY ||
-      tgt->GetType() == cmState::SHARED_LIBRARY ||
-      tgt->GetType() == cmState::MODULE_LIBRARY ||
-      tgt->GetType() == cmState::UNKNOWN_LIBRARY) {
-    static const std::string propLOCATION = "LOCATION";
-    if (prop == propLOCATION) {
-      if (!tgt->IsImported() &&
-          !HandleLocationPropertyPolicy(tgt->GetName(), context)) {
-        return CM_NULLPTR;
-      }
-      return ComputeLocationForBuild(tgt);
-    }
-
-    // Support "LOCATION_<CONFIG>".
-    else if (cmHasLiteralPrefix(prop, "LOCATION_")) {
-      if (!tgt->IsImported() &&
-          !HandleLocationPropertyPolicy(tgt->GetName(), context)) {
-        return CM_NULLPTR;
-      }
-      const char* configName = prop.c_str() + 9;
-      return ComputeLocation(tgt, configName);
-    }
-
-    // Support "<CONFIG>_LOCATION".
-    else if (cmHasLiteralSuffix(prop, "_LOCATION") &&
-             !cmHasLiteralPrefix(prop, "XCODE_ATTRIBUTE_")) {
-      std::string configName(prop.c_str(), prop.size() - 9);
-      if (configName != "IMPORTED") {
-        if (!tgt->IsImported() &&
-            !HandleLocationPropertyPolicy(tgt->GetName(), context)) {
-          return CM_NULLPTR;
-        }
-        return ComputeLocation(tgt, configName);
-      }
-    }
+  if (const char* loc = GetLocation(tgt, prop, context)) {
+    return loc;
+  }
+  if (cmSystemTools::GetFatalErrorOccured()) {
+    return CM_NULLPTR;
   }
   if (prop == "SOURCES") {
     return GetSources(tgt, context);