[Cmake-commits] [cmake-commits] king committed cmTarget.cxx 1.214 1.215

[cmake-commits at cmake.org]

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

Modified Files:
	cmTarget.cxx 
Log Message:
BUG: A per-config target name postfix should be ignored for Mac bundle and framework names.


Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.214
retrieving revision 1.215
diff -C 2 -d -r1.214 -r1.215
*** cmTarget.cxx	8 Apr 2008 04:06:46 -0000	1.214
--- cmTarget.cxx	14 Apr 2008 19:27:26 -0000	1.215
***************
*** 135,140 ****
       "A postfix that will be applied to this target when build debug.",
       "A property on a target that specifies a postfix to add to the "
!      "target name when built in debug mode. For example foo.dll "
!      "versus fooD.dll");
  
    cm->DefineProperty
--- 135,140 ----
       "A postfix that will be applied to this target when build debug.",
       "A property on a target that specifies a postfix to add to the "
!      "target name when built in debug mode. For example \"foo.dll\" "
!      "versus \"fooD.dll\".  Ignored for Mac Frameworks and App Bundles.");
  
    cm->DefineProperty
***************
*** 2312,2315 ****
--- 2312,2321 ----
      configProp += "_POSTFIX";
      configPostfix = this->GetProperty(configProp.c_str());
+     // Mac application bundles and frameworks have no postfix.
+     if(configPostfix &&
+        (this->IsAppBundleOnApple() || this->IsFrameworkOnApple()))
+       {
+       configPostfix = 0;
+       }
      }
    const char* prefixVar = this->GetPrefixVariableInternal(type, implib);