[cmake-commits] king committed cmTarget.cxx 1.156 1.157

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv23687

Modified Files:
	cmTarget.cxx 
Log Message:
BUG: <CONFIG>_LOCATION property should use the config name in the directory and not $(OutDir).  This addresses bug#5363.


Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- cmTarget.cxx	12 Jul 2007 12:37:00 -0000	1.156
+++ cmTarget.cxx	1 Aug 2007 15:36:35 -0000	1.157
@@ -1277,16 +1277,22 @@
 //----------------------------------------------------------------------------
 const char* cmTarget::NormalGetLocation(const char* config)
 {
-  this->Location = this->GetDirectory();
+  this->Location = this->GetDirectory(config);
   if(!this->Location.empty())
     {
     this->Location += "/";
     }
-  const char* cfgid = this->Makefile->GetDefinition("CMAKE_CFG_INTDIR");
-  if(cfgid && strcmp(cfgid, ".") != 0)
+  if(!config)
     {
-    this->Location += cfgid;
-    this->Location += "/";
+    // No specific configuration was given so it will not appear on
+    // the result of GetDirectory.  Add a name here to be replaced at
+    // build time.
+    const char* cfgid = this->Makefile->GetDefinition("CMAKE_CFG_INTDIR");
+    if(cfgid && strcmp(cfgid, ".") != 0)
+      {
+      this->Location += cfgid;
+      this->Location += "/";
+      }
     }
   this->Location += this->GetFullName(config, false);
   return this->Location.c_str();