[Cmake-commits] CMake branch, next, updated. v2.8.8-2829-ge871e04

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e871e04ec8619348e83ba1d88b34797b75f924e5 (commit)
       via  470f39cf4ea3da35716e6f4ea5bbdc17b5b0e814 (commit)
      from  08c18b79621aae38ab8df68b1bf6573b128d6cc2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e871e04ec8619348e83ba1d88b34797b75f924e5
commit e871e04ec8619348e83ba1d88b34797b75f924e5
Merge: 08c18b7 470f39c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 7 15:51:53 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 7 15:51:53 2012 -0400

    Merge topic 'vs-osx-framework-headers' into next
    
    470f39c VS: Restore header files marked as OS X Framework content (#13196)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=470f39cf4ea3da35716e6f4ea5bbdc17b5b0e814
commit 470f39cf4ea3da35716e6f4ea5bbdc17b5b0e814
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 7 15:24:16 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 7 15:28:19 2012 -0400

    VS: Restore header files marked as OS X Framework content (#13196)
    
    Header files listed in a target's PUBLIC_HEADER or similar properties
    are marked as OS X Framework content.  Refactoring performed by
    
     commit 11d9b211 (Add cmGeneratorTarget to represent a target during generation, 2012-03-07)
     commit 45c2f932 (Simplify cmMakefileTargetGenerator using cmGeneratorTarget, 2012-03-07)
     commit 328c0f65 (Simplify cmVisualStudio10TargetGenerator source classification, 2012-03-19)
    
    and related commits accidentally removed such files from treatment as
    normal header files by the VS generator (generators other than Makefiles
    and Xcode).  Move handling of such files out of cmGeneratorTarget and
    back to cmMakefileTargetGenerator.  The central cmGeneratorTarget
    classification will always treat them as header or extra sources.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 42dd428..6e2e23d 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -39,17 +39,10 @@ void cmGeneratorTarget::ClassifySources()
     {
     cmSourceFile* sf = *si;
     std::string ext = cmSystemTools::LowerCase(sf->GetExtension());
-    cmTarget::SourceFileFlags tsFlags =
-      this->Target->GetTargetSourceFileFlags(sf);
     if(sf->GetCustomCommand())
       {
       this->CustomCommands.push_back(sf);
       }
-    else if(tsFlags.Type != cmTarget::SourceFileTypeNormal)
-      {
-      this->OSXContent.push_back(sf);
-      if(isObjLib) { badObjLib.push_back(sf); }
-      }
     else if(sf->GetPropertyAsBool("HEADER_FILE_ONLY"))
       {
       this->HeaderSources.push_back(sf);
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 3e50656..5c7578d 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -37,7 +37,6 @@ public:
   std::vector<cmSourceFile*> HeaderSources;
   std::vector<cmSourceFile*> ObjectSources;
   std::vector<cmSourceFile*> ExternalObjects;
-  std::vector<cmSourceFile*> OSXContent;
   std::vector<cmSourceFile*> IDLSources;
   std::string ModuleDefinitionFile;
 
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index a0e0481..408f287 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -153,14 +153,8 @@ void cmMakefileTargetGenerator::WriteTargetBuildRules()
         }
       }
     }
-  for(std::vector<cmSourceFile*>::const_iterator
-        si = this->GeneratorTarget->OSXContent.begin();
-      si != this->GeneratorTarget->OSXContent.end(); ++si)
-    {
-    cmTarget::SourceFileFlags tsFlags =
-      this->Target->GetTargetSourceFileFlags(*si);
-    this->WriteMacOSXContentRules(**si, tsFlags.MacFolder);
-    }
+  this->WriteMacOSXContentRules(this->GeneratorTarget->HeaderSources);
+  this->WriteMacOSXContentRules(this->GeneratorTarget->ExtraSources);
   for(std::vector<cmSourceFile*>::const_iterator
         si = this->GeneratorTarget->ExternalObjects.begin();
       si != this->GeneratorTarget->ExternalObjects.end(); ++si)
@@ -354,6 +348,22 @@ void cmMakefileTargetGenerator::WriteTargetLanguageFlags()
 }
 
 //----------------------------------------------------------------------------
+void cmMakefileTargetGenerator::WriteMacOSXContentRules(
+  std::vector<cmSourceFile*> const& sources)
+{
+  for(std::vector<cmSourceFile*>::const_iterator
+        si = sources.begin(); si != sources.end(); ++si)
+    {
+    cmTarget::SourceFileFlags tsFlags =
+      this->Target->GetTargetSourceFileFlags(*si);
+    if(tsFlags.Type != cmTarget::SourceFileTypeNormal)
+      {
+      this->WriteMacOSXContentRules(**si, tsFlags.MacFolder);
+      }
+    }
+}
+
+//----------------------------------------------------------------------------
 void cmMakefileTargetGenerator::WriteMacOSXContentRules(cmSourceFile& source,
                                                         const char* pkgloc)
 {
diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h
index e1e554b..36a1f68 100644
--- a/Source/cmMakefileTargetGenerator.h
+++ b/Source/cmMakefileTargetGenerator.h
@@ -73,6 +73,7 @@ protected:
   void WriteTargetDependRules();
 
   // write rules for Mac OS X Application Bundle content.
+  void WriteMacOSXContentRules(std::vector<cmSourceFile*> const& sources);
   void WriteMacOSXContentRules(cmSourceFile& source, const char* pkgloc);
 
   // write the rules for an object
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index c6469f2..80007f1 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -396,7 +396,6 @@ cmNinjaTargetGenerator
      cmCustomCommand const* cc = (*si)->GetCustomCommand();
      this->GetLocalGenerator()->AddCustomCommandTarget(cc, this->GetTarget());
      }
-  // TODO: this->GeneratorTarget->OSXContent
   for(std::vector<cmSourceFile*>::const_iterator
         si = this->GeneratorTarget->ExternalObjects.begin();
       si != this->GeneratorTarget->ExternalObjects.end(); ++si)

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGeneratorTarget.cxx         |    7 -------
 Source/cmGeneratorTarget.h           |    1 -
 Source/cmMakefileTargetGenerator.cxx |   26 ++++++++++++++++++--------
 Source/cmMakefileTargetGenerator.h   |    1 +
 Source/cmNinjaTargetGenerator.cxx    |    1 -
 5 files changed, 19 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake