ENH: added DIRECTORY option to GET_DIRECTORY_PROPERTIES

4 files changed, 91 insertions, 19 deletions

diff --git a/Source/cmGetDirectoryPropertyCommand.cxx b/Source/cmGetDirectoryPropertyCommand.cxx
index 06302d8..735a03d 100644
--- a/Source/cmGetDirectoryPropertyCommand.cxx
+++ b/Source/cmGetDirectoryPropertyCommand.cxx
@@ -29,17 +29,55 @@ bool cmGetDirectoryPropertyCommand::InitialPass(
     }
   
   std::vector<std::string>::size_type cc;
-  std::string variable = args[0];
+  std::vector<std::string>::const_iterator i = args.begin();
+  std::string variable = *i;
+  ++i;
   std::string output = "";
+    
+  // get the directory argument if there is one
+  cmMakefile *dir = m_Makefile;
+  if (*i == "DIRECTORY")
+    {
+    ++i;
+    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 = m_Makefile->GetStartDirectory();
+      sd += "/";
+      sd += *i;
+      }
+    // lookup the makefile from the directory name
+    cmLocalGenerator *lg = 
+      m_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.");
+      return false;
+      }
+    dir = lg->GetMakefile();
+    ++i;
+    }
 
-  if ( args[1] == "VARIABLES" || args[1] == "CACHE_VARIABLES" )
+  // OK, now we have the directory to process, we just get the requested
+  // information out of it
+  
+  if ( *i == "VARIABLES" || *i == "CACHE_VARIABLES" )
     {
     int cacheonly = 0;
-    if ( args[1] == "CACHE_VARIABLES" )
+    if ( *i == "CACHE_VARIABLES" )
       {
       cacheonly = 1;
       }
-    std::vector<std::string> vars = m_Makefile->GetDefinitions(cacheonly);
+    std::vector<std::string> vars = dir->GetDefinitions(cacheonly);
     for ( cc = 0; cc < vars.size(); cc ++ )
       {
       if ( cc > 0 )
@@ -49,21 +87,21 @@ bool cmGetDirectoryPropertyCommand::InitialPass(
       output += vars[cc];
       }
     }
-  else if ( args[1] == "MACROS" )
+  else if ( *i == "MACROS" )
     {
-    m_Makefile->GetListOfMacros(output);
+    dir->GetListOfMacros(output);
     }
-  else if ( args[1] == "DEFINITIONS" )
+  else if ( *i == "DEFINITIONS" )
     {
-    output=m_Makefile->GetDefineFlags();
+    output = dir->GetDefineFlags();
     }
-  else if ( args[1] == "INCLUDE_DIRECTORIES" )
+  else if ( *i == "INCLUDE_DIRECTORIES" )
     {
     std::vector<std::string>::iterator it;
     int first = 1;
     cmOStringStream str;
-    for ( it = m_Makefile->GetIncludeDirectories().begin();
-      it != m_Makefile->GetIncludeDirectories().end();
+    for ( it = dir->GetIncludeDirectories().begin();
+      it != dir->GetIncludeDirectories().end();
       ++ it )
       {
       if ( !first )
@@ -75,17 +113,17 @@ bool cmGetDirectoryPropertyCommand::InitialPass(
       }
     output = str.str();
     }
-  else if ( args[1] == "INCLUDE_REGULAR_EXPRESSION" )
+  else if ( *i == "INCLUDE_REGULAR_EXPRESSION" )
     {
-    output = m_Makefile->GetIncludeRegularExpression();
+    output = dir->GetIncludeRegularExpression();
     }
-  else if ( args[1] == "LINK_DIRECTORIES" )
+  else if ( *i == "LINK_DIRECTORIES" )
     {
     std::vector<std::string>::iterator it;
     int first = 1;
     cmOStringStream str;
-    for ( it = m_Makefile->GetLinkDirectories().begin();
-      it != m_Makefile->GetLinkDirectories().end();
+    for ( it = dir->GetLinkDirectories().begin();
+      it != dir->GetLinkDirectories().end();
       ++ it )
       {
       if ( !first )
@@ -97,9 +135,20 @@ bool cmGetDirectoryPropertyCommand::InitialPass(
       }
     output = str.str();
     }
+  else if ( *i == "DEFINITION" )
+    {
+    ++i;
+    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());
+    }
   else
     {
-    const char *prop = m_Makefile->GetProperty(args[1].c_str());
+    const char *prop = dir->GetProperty(i->c_str());
     if (prop)
       {
       m_Makefile->AddDefinition(variable.c_str(), prop);
diff --git a/Source/cmGetDirectoryPropertyCommand.h b/Source/cmGetDirectoryPropertyCommand.h
index d7b2103..0befc65 100644
--- a/Source/cmGetDirectoryPropertyCommand.h
+++ b/Source/cmGetDirectoryPropertyCommand.h
@@ -52,12 +52,16 @@ public:
   virtual const char* GetFullDocumentation()
     {
       return
-        "  GET_DIRECTORY_PROPERTY(VAR property)\n"
+        "  GET_DIRECTORY_PROPERTY(VAR [DIRECTORY dir] property)\n"
         "Get a property from the Directory.  The value of the property is" 
         "stored in the variable VAR. If the property is not found,"
         "CMake will report an error. The properties include: VARIABLES, "
         "CACHE_VARIABLES, COMMANDS, MACROS, INCLUDE_DIRECTORIES, "
-        "LINK_DIRECTORIES, DEFINITIONS and INCLUDE_REGULAR_EXPRESSION.";
+        "LINK_DIRECTORIES, DEFINITIONS, INCLUDE_REGULAR_EXPRESSION and "
+        "DEFINITION varname.  If the DIRECTORY argument is provided then "
+        "the property of the provided directory will be retrieved "
+        "instead of the current directory. You can only get properties "
+        "of a directory during or after it has been traversed by cmake.";
     }
   
   cmTypeMacro(cmGetDirectoryPropertyCommand, cmCommand);
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 34b72cb..6dff598 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -888,6 +888,22 @@ void cmGlobalGenerator::FillProjectMap()
 }
 
 
+///! Find a local generator by its startdirectory
+cmLocalGenerator* cmGlobalGenerator::FindLocalGenerator(const char* start_dir)
+{
+  std::vector<cmLocalGenerator*>* gens = &m_LocalGenerators;
+  for(unsigned int i = 0; i < gens->size(); ++i)
+    {
+    std::string sd = (*gens)[i]->GetMakefile()->GetStartDirectory();
+    if (sd == start_dir)
+      {
+      return (*gens)[i];
+      }
+    }
+  return 0;
+}
+
+
 cmTarget* cmGlobalGenerator::FindTarget(const char* project, 
                                         const char* name)
 {
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 6ed8609..5552b50 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -146,6 +146,9 @@ public:
   ///! Find a target by name by searching the local generators.
   cmTarget* FindTarget(const char* project, const char* name);
 
+  ///! Find a local generator by its startdirectory
+  cmLocalGenerator* FindLocalGenerator(const char* start_dir);
+
 protected:
   // Fill the m_ProjectMap, this must be called after m_LocalGenerators has been populated.
   void FillProjectMap();