1 files changed, 66 insertions, 57 deletions

diff --git a/Source/cmGetDirectoryPropertyCommand.cxx b/Source/cmGetDirectoryPropertyCommand.cxx
index 9e76e1bc3..1005b1543 100644
--- a/Source/cmGetDirectoryPropertyCommand.cxx
+++ b/Source/cmGetDirectoryPropertyCommand.cxx
@@ -1,96 +1,105 @@
-/*============================================================================
-  CMake - Cross Platform Makefile Generator
-  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
-
-  Distributed under the OSI-approved BSD License (the "License");
-  see accompanying file Copyright.txt for details.
-
-  This software is distributed WITHOUT ANY WARRANTY; without even the
-  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the License for more information.
-============================================================================*/
+/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmGetDirectoryPropertyCommand.h"
 
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
+#include "cmPolicies.h"
+#include "cmSystemTools.h"
 #include "cmake.h"
 
+class cmExecutionStatus;
+
 // cmGetDirectoryPropertyCommand
-bool cmGetDirectoryPropertyCommand
-::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
+bool cmGetDirectoryPropertyCommand::InitialPass(
+  std::vector<std::string> const& args, cmExecutionStatus&)
 {
-  if(args.size() < 2 )
-    {
+  if (args.size() < 2) {
     this->SetError("called with incorrect number of arguments");
     return false;
-    }
+  }
 
   std::vector<std::string>::const_iterator i = args.begin();
-  std::string variable = *i;
+  std::string const& variable = *i;
   ++i;
-  std::string output = "";
 
   // get the directory argument if there is one
-  cmMakefile *dir = this->Makefile;
-  if (*i == "DIRECTORY")
-    {
+  cmMakefile* dir = this->Makefile;
+  if (*i == "DIRECTORY") {
     ++i;
-    if (i == args.end())
-      {
-      this->SetError
-        ("DIRECTORY argument provided without subsequent arguments");
+    if (i == args.end()) {
+      this->SetError(
+        "DIRECTORY argument provided without subsequent arguments");
       return false;
-      }
+    }
     std::string sd = *i;
     // make sure the start dir is a full path
-    if (!cmSystemTools::FileIsFullPath(sd.c_str()))
-      {
-      sd = this->Makefile->GetStartDirectory();
+    if (!cmSystemTools::FileIsFullPath(sd.c_str())) {
+      sd = this->Makefile->GetCurrentSourceDirectory();
       sd += "/";
       sd += *i;
-      }
+    }
 
     // The local generators are associated with collapsed paths.
-    sd = cmSystemTools::CollapseFullPath(sd.c_str());
+    sd = cmSystemTools::CollapseFullPath(sd);
 
     // lookup the makefile from the directory name
-    cmLocalGenerator *lg =
-      this->Makefile->GetLocalGenerator()->GetGlobalGenerator()->
-      FindLocalGenerator(sd.c_str());
-    if (!lg)
-      {
-      this->SetError
-        ("DIRECTORY argument provided but requested directory not found. "
-         "This could be because the directory argument was invalid or, "
-         "it is valid but has not been processed yet.");
+    dir = this->Makefile->GetGlobalGenerator()->FindMakefile(sd);
+    if (!dir) {
+      this->SetError(
+        "DIRECTORY argument provided but requested directory not found. "
+        "This could be because the directory argument was invalid or, "
+        "it is valid but has not been processed yet.");
       return false;
-      }
-    dir = lg->GetMakefile();
-    ++i;
     }
+    ++i;
+  }
 
   // OK, now we have the directory to process, we just get the requested
   // information out of it
 
-  if ( *i == "DEFINITION" )
-    {
+  if (*i == "DEFINITION") {
     ++i;
-    if (i == args.end())
-      {
+    if (i == args.end()) {
       this->SetError("A request for a variable definition was made without "
                      "providing the name of the variable to get.");
       return false;
-      }
-    output = dir->GetSafeDefinition(i->c_str());
-    this->Makefile->AddDefinition(variable.c_str(), output.c_str());
-    return true;
     }
-
-  const char *prop = dir->GetProperty(i->c_str());
-  if (prop)
-    {
-    this->Makefile->AddDefinition(variable.c_str(), prop);
+    std::string output = dir->GetSafeDefinition(*i);
+    this->Makefile->AddDefinition(variable, output.c_str());
     return true;
+  }
+
+  const char* prop = CM_NULLPTR;
+  if (!i->empty()) {
+    if (*i == "DEFINITIONS") {
+      switch (this->Makefile->GetPolicyStatus(cmPolicies::CMP0059)) {
+        case cmPolicies::WARN:
+          this->Makefile->IssueMessage(
+            cmake::AUTHOR_WARNING,
+            cmPolicies::GetPolicyWarning(cmPolicies::CMP0059));
+          CM_FALLTHROUGH;
+        case cmPolicies::OLD:
+          this->StoreResult(variable, this->Makefile->GetDefineFlagsCMP0059());
+          return true;
+        case cmPolicies::NEW:
+        case cmPolicies::REQUIRED_ALWAYS:
+        case cmPolicies::REQUIRED_IF_USED:
+          break;
+      }
     }
-  this->Makefile->AddDefinition(variable.c_str(), "");
+    prop = dir->GetProperty(*i);
+  }
+  this->StoreResult(variable, prop);
   return true;
 }
 
+void cmGetDirectoryPropertyCommand::StoreResult(std::string const& variable,
+                                                const char* prop)
+{
+  if (prop) {
+    this->Makefile->AddDefinition(variable, prop);
+    return;
+  }
+  this->Makefile->AddDefinition(variable, "");
+}