ENH: Combined cmTarget::GetDirectory and cmTarget::GetOutputDir since they are nearly the same. This is another step for bug#2240.

1 files changed, 6 insertions, 2 deletions

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 3cffff6..f3e59e5 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1093,14 +1093,18 @@ void cmTarget::SetProperty(const char* prop, const char* value)
 
 const char* cmTarget::GetDirectory(const char* config)
 {
-  this->Directory = this->GetOutputDir();
   if(config)
     {
+    this->Directory = this->GetOutputDir();
     // Add the configuration's subdirectory.
     this->Makefile->GetLocalGenerator()->GetGlobalGenerator()->
       AppendDirectoryForConfig("/", config, "", this->Directory);
+    return this->Directory.c_str();
+    }
+  else
+    {
+    return this->GetOutputDir();
     }
-  return this->Directory.c_str();
 }
 
 const char* cmTarget::GetLocation(const char* config)