[cmake-commits] david.cole committed cmGlobalXCodeGenerator.cxx 1.161 1.162 cmLocalGenerator.cxx 1.232 1.233 cmMakefileLibraryTargetGenerator.cxx 1.43 1.44 cmTarget.cxx 1.157 1.158

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalXCodeGenerator.cxx cmLocalGenerator.cxx 
	cmMakefileLibraryTargetGenerator.cxx cmTarget.cxx 
Log Message:
BUG: Only pay attention to the FRAMEWORK target property for SHARED library targets


Index: cmMakefileLibraryTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileLibraryTargetGenerator.cxx,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- cmMakefileLibraryTargetGenerator.cxx	18 Jun 2007 15:59:23 -0000	1.43
+++ cmMakefileLibraryTargetGenerator.cxx	1 Aug 2007 17:04:45 -0000	1.44
@@ -112,7 +112,7 @@
 void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink)
 {
 #ifdef __APPLE__
-  if(this->Target->GetPropertyAsBool("FRAMEWORK"))
+  if (this->Target->GetPropertyAsBool("FRAMEWORK"))
     {
     this->WriteFrameworkRules(relink);
     return;
@@ -505,7 +505,8 @@
     }
 #if defined(__APPLE__)
   // If we're creating a framework, place the output into a framework directory
-  if(this->Target->GetPropertyAsBool("FRAMEWORK"))
+  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
+      this->Target->GetPropertyAsBool("FRAMEWORK"))
     {
     this->CreateFramework(targetName, outpath);
     }

Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -d -r1.232 -r1.233
--- cmLocalGenerator.cxx	23 Jul 2007 13:06:48 -0000	1.232
+++ cmLocalGenerator.cxx	1 Aug 2007 17:04:45 -0000	1.233
@@ -1775,7 +1775,8 @@
           // do not add the target full name but just use the directory
           // name
 #ifdef __APPLE__
-          if(!tgt->GetPropertyAsBool("FRAMEWORK"))
+          if (!(tgt->GetType() == cmTarget::SHARED_LIBRARY &&
+                tgt->GetPropertyAsBool("FRAMEWORK")))
 #endif
             { 
             linkItem += "/";

Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- cmTarget.cxx	1 Aug 2007 15:36:35 -0000	1.157
+++ cmTarget.cxx	1 Aug 2007 17:04:45 -0000	1.158
@@ -1790,7 +1790,8 @@
     }
 #if defined(__APPLE__)
   // frameworks do not have a prefix or a suffix
-  if(this->GetPropertyAsBool("FRAMEWORK"))
+  if (this->GetType() == cmTarget::SHARED_LIBRARY &&
+      this->GetPropertyAsBool("FRAMEWORK"))
     {
     targetPrefix = 0;
     targetSuffix = 0;
@@ -2322,7 +2323,8 @@
 
 #if defined(__APPLE__)
     // frameworks do not have a prefix or a suffix
-    if(this->GetPropertyAsBool("FRAMEWORK"))
+    if (this->GetType() == cmTarget::SHARED_LIBRARY &&
+        this->GetPropertyAsBool("FRAMEWORK"))
       {
       out += "/";
       out += this->GetFullName(0, implib);

Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- cmGlobalXCodeGenerator.cxx	28 Jun 2007 13:09:26 -0000	1.161
+++ cmGlobalXCodeGenerator.cxx	1 Aug 2007 17:04:45 -0000	1.162
@@ -727,7 +727,8 @@
         buildFiles->AddObject(xsf);
         }
       }
-    if(cmtarget.GetPropertyAsBool("FRAMEWORK"))
+    if (cmtarget.GetType() == cmTarget::SHARED_LIBRARY &&
+        cmtarget.GetPropertyAsBool("FRAMEWORK"))
       {
       this->AddFrameworkPhases(&cmtarget, buildPhases);
       }
@@ -1239,7 +1240,8 @@
      target.GetType() == cmTarget::EXECUTABLE)
     {
     std::string pndir = target.GetDirectory();
-    if(target.GetPropertyAsBool("FRAMEWORK"))
+    if (target.GetType() == cmTarget::SHARED_LIBRARY &&
+        target.GetPropertyAsBool("FRAMEWORK"))
       {
       pndir += "/..";
       pndir = cmSystemTools::CollapseFullPath(pndir.c_str());
@@ -2053,7 +2055,8 @@
         }
       std::vector<cmSourceFile*>  classes = cmtarget.GetSourceFiles();
       // add framework copy headers
-      if(cmtarget.GetPropertyAsBool("FRAMEWORK"))
+      if (cmtarget.GetType() == cmTarget::SHARED_LIBRARY &&
+          cmtarget.GetPropertyAsBool("FRAMEWORK"))
         {
         const char* headers = cmtarget.GetProperty("FRAMEWORK_PUBLIC_HEADERS");
         if(!headers)