cmTarget: Move SOURCES property computation before the rest

The SOURCES have to be computed.

1 files changed, 85 insertions, 85 deletions

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ca2c37d..129dd63 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1167,6 +1167,91 @@ const char* cmTarget::GetProperty(const std::string& prop,
       }
     }
   }
+  if (prop == "SOURCES") {
+    if (this->Internal->SourceEntries.empty()) {
+      return CM_NULLPTR;
+    }
+
+    std::ostringstream ss;
+    const char* sep = "";
+    for (std::vector<std::string>::const_iterator i =
+           this->Internal->SourceEntries.begin();
+         i != this->Internal->SourceEntries.end(); ++i) {
+      std::string const& entry = *i;
+
+      std::vector<std::string> files;
+      cmSystemTools::ExpandListArgument(entry, files);
+      for (std::vector<std::string>::const_iterator li = files.begin();
+           li != files.end(); ++li) {
+        if (cmHasLiteralPrefix(*li, "$<TARGET_OBJECTS:") &&
+            (*li)[li->size() - 1] == '>') {
+          std::string objLibName = li->substr(17, li->size() - 18);
+
+          if (cmGeneratorExpression::Find(objLibName) != std::string::npos) {
+            ss << sep;
+            sep = ";";
+            ss << *li;
+            continue;
+          }
+
+          bool addContent = false;
+          bool noMessage = true;
+          std::ostringstream e;
+          cmake::MessageType messageType = cmake::AUTHOR_WARNING;
+          switch (context->GetPolicyStatus(cmPolicies::CMP0051)) {
+            case cmPolicies::WARN:
+              e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0051) << "\n";
+              noMessage = false;
+            case cmPolicies::OLD:
+              break;
+            case cmPolicies::REQUIRED_ALWAYS:
+            case cmPolicies::REQUIRED_IF_USED:
+            case cmPolicies::NEW:
+              addContent = true;
+          }
+          if (!noMessage) {
+            e << "Target \"" << this->Name
+              << "\" contains "
+                 "$<TARGET_OBJECTS> generator expression in its sources "
+                 "list.  "
+                 "This content was not previously part of the SOURCES "
+                 "property "
+                 "when that property was read at configure time.  Code "
+                 "reading "
+                 "that property needs to be adapted to ignore the generator "
+                 "expression using the string(GENEX_STRIP) command.";
+            context->IssueMessage(messageType, e.str());
+          }
+          if (addContent) {
+            ss << sep;
+            sep = ";";
+            ss << *li;
+          }
+        } else if (cmGeneratorExpression::Find(*li) == std::string::npos) {
+          ss << sep;
+          sep = ";";
+          ss << *li;
+        } else {
+          cmSourceFile* sf = this->Makefile->GetOrCreateSource(*li);
+          // Construct what is known about this source file location.
+          cmSourceFileLocation const& location = sf->GetLocation();
+          std::string sname = location.GetDirectory();
+          if (!sname.empty()) {
+            sname += "/";
+          }
+          sname += location.GetName();
+
+          ss << sep;
+          sep = ";";
+          // Append this list entry.
+          ss << sname;
+        }
+      }
+    }
+    static std::string srcs;
+    srcs = ss.str();
+    return srcs.c_str();
+  }
   static UNORDERED_SET<std::string> specialProps;
 #define MAKE_STATIC_PROP(PROP) static const std::string prop##PROP = #PROP
   MAKE_STATIC_PROP(LINK_LIBRARIES);
@@ -1256,91 +1341,6 @@ const char* cmTarget::GetProperty(const std::string& prop,
     if (prop == propSOURCE_DIR) {
       return this->GetMakefile()->GetCurrentSourceDirectory();
     }
-    if (prop == propSOURCES) {
-      if (this->Internal->SourceEntries.empty()) {
-        return CM_NULLPTR;
-      }
-
-      std::ostringstream ss;
-      const char* sep = "";
-      for (std::vector<std::string>::const_iterator i =
-             this->Internal->SourceEntries.begin();
-           i != this->Internal->SourceEntries.end(); ++i) {
-        std::string const& entry = *i;
-
-        std::vector<std::string> files;
-        cmSystemTools::ExpandListArgument(entry, files);
-        for (std::vector<std::string>::const_iterator li = files.begin();
-             li != files.end(); ++li) {
-          if (cmHasLiteralPrefix(*li, "$<TARGET_OBJECTS:") &&
-              (*li)[li->size() - 1] == '>') {
-            std::string objLibName = li->substr(17, li->size() - 18);
-
-            if (cmGeneratorExpression::Find(objLibName) != std::string::npos) {
-              ss << sep;
-              sep = ";";
-              ss << *li;
-              continue;
-            }
-
-            bool addContent = false;
-            bool noMessage = true;
-            std::ostringstream e;
-            cmake::MessageType messageType = cmake::AUTHOR_WARNING;
-            switch (context->GetPolicyStatus(cmPolicies::CMP0051)) {
-              case cmPolicies::WARN:
-                e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0051) << "\n";
-                noMessage = false;
-              case cmPolicies::OLD:
-                break;
-              case cmPolicies::REQUIRED_ALWAYS:
-              case cmPolicies::REQUIRED_IF_USED:
-              case cmPolicies::NEW:
-                addContent = true;
-            }
-            if (!noMessage) {
-              e << "Target \"" << this->Name
-                << "\" contains "
-                   "$<TARGET_OBJECTS> generator expression in its sources "
-                   "list.  "
-                   "This content was not previously part of the SOURCES "
-                   "property "
-                   "when that property was read at configure time.  Code "
-                   "reading "
-                   "that property needs to be adapted to ignore the generator "
-                   "expression using the string(GENEX_STRIP) command.";
-              context->IssueMessage(messageType, e.str());
-            }
-            if (addContent) {
-              ss << sep;
-              sep = ";";
-              ss << *li;
-            }
-          } else if (cmGeneratorExpression::Find(*li) == std::string::npos) {
-            ss << sep;
-            sep = ";";
-            ss << *li;
-          } else {
-            cmSourceFile* sf = this->Makefile->GetOrCreateSource(*li);
-            // Construct what is known about this source file location.
-            cmSourceFileLocation const& location = sf->GetLocation();
-            std::string sname = location.GetDirectory();
-            if (!sname.empty()) {
-              sname += "/";
-            }
-            sname += location.GetName();
-
-            ss << sep;
-            sep = ";";
-            // Append this list entry.
-            ss << sname;
-          }
-        }
-      }
-      static std::string srcs;
-      srcs = ss.str();
-      return srcs.c_str();
-    }
   }
 
   const char* retVal = this->Properties.GetPropertyValue(prop);