From 13dc7bdb5e3a0eaaf3607b154bba77a01404a788 Mon Sep 17 00:00:00 2001
From: Kitware Robot <kwrobot@kitware.com>
Date: Fri, 6 Nov 2015 00:01:05 -0500
Subject: [PATCH] CMake Nightly Date Stamp

---
 Source/CMakeVersion.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index b93e0c9..62142c6 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 4)
-set(CMake_VERSION_PATCH 20151105)
+set(CMake_VERSION_PATCH 20151106)
 #set(CMake_VERSION_RC 1)
-- 
2.4.9 (Apple Git-60)

From 383253943e04c13a76fdbce615a06e3f3c23964f Mon Sep 17 00:00:00 2001
From: Bartosz Kosiorek <gang65@poczta.onet.pl>
Date: Mon, 9 Nov 2015 23:15:47 +0100
Subject: [PATCH] Add support for iOS Frameworks (bug 15833)

---
 Source/cmMakefileLibraryTargetGenerator.cxx | 13 ++++++++++---
 Source/cmOSXBundleGenerator.cxx             | 26 ++++++++++++++++++++++++++
 Source/cmOSXBundleGenerator.h               |  4 ++++
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 1923ea4..0b0bf54 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -275,9 +275,16 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::string outpathImp;
   if(this->GeneratorTarget->IsFrameworkOnApple())
     {
-    outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
-    this->OSXBundleGenerator->CreateFramework(targetName, outpath);
-    outpath += "/";
+      outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
+      if(this->Makefile->PlatformIsAppleIos())
+        {
+        this->OSXBundleGenerator->CreateIOSFramework(targetName, outpath);
+        }
+      else
+        {
+        this->OSXBundleGenerator->CreateFramework(targetName, outpath);
+        }
+      outpath += "/";
     }
   else if(this->GeneratorTarget->IsCFBundleOnApple())
     {
diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 3c4aa00..fe4921d 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -67,6 +67,32 @@ void cmOSXBundleGenerator::CreateAppBundle(const std::string& targetName,
 }
 
 //----------------------------------------------------------------------------
+void cmOSXBundleGenerator::CreateIOSFramework(const std::string& targetName,
+                                              const std::string& outpath)
+{
+  if (this->MustSkip())
+    return;
+
+  assert(this->MacContentFolders);
+
+  // Compute framework directory names.
+  std::string out = outpath + "/" +
+  this->GT->GetFrameworkDirectory(this->ConfigName, false);
+
+  std::string frameworkVersion = this->GT->GetFrameworkVersion();
+
+  // Configure the Info.plist file into the Resources directory.
+  std::string plist = out;
+  plist += "/Info.plist";
+
+  std::string name = cmSystemTools::GetFilenameName(targetName);
+  this->LocalGenerator->GenerateFrameworkInfoPList(this->GT,
+                                                   name,
+                                                   plist.c_str());
+  this->Makefile->AddCMakeOutputFile(plist);
+}
+
+//----------------------------------------------------------------------------
 void cmOSXBundleGenerator::CreateFramework(
   const std::string& targetName, const std::string& outpath)
 {
diff --git a/Source/cmOSXBundleGenerator.h b/Source/cmOSXBundleGenerator.h
index f945c15..ab1721f 100644
--- a/Source/cmOSXBundleGenerator.h
+++ b/Source/cmOSXBundleGenerator.h
@@ -37,6 +37,10 @@ public:
   void CreateFramework(const std::string& targetName,
                        const std::string& root);
 
+  // create a framework at a given root
+  void CreateIOSFramework(const std::string& targetName,
+                          const std::string& root);
+
   // create a cf bundle at a given root
   void CreateCFBundle(const std::string& targetName,
                       const std::string& root);
-- 
2.4.9 (Apple Git-60)

From 310f742df490c9cc18589d318ef3928c8daae69f Mon Sep 17 00:00:00 2001
From: Bartosz Kosiorek <bartosz.kosiorek@tomtom.com>
Date: Thu, 12 Nov 2015 08:44:07 +0100
Subject: [PATCH] Fix iOS Framework directory structure (#15833)

---
 Source/cmOSXBundleGenerator.cxx | 127 +++++++++++++++++++++-------------------
 1 file changed, 67 insertions(+), 60 deletions(-)

diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 3c4aa00..38ff0de 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -85,80 +85,87 @@ void cmOSXBundleGenerator::CreateFramework(
 
   std::string frameworkVersion = this->GT->GetFrameworkVersion();
 
-  // Configure the Info.plist file into the Resources directory.
-  this->MacContentFolders->insert("Resources");
+  // Configure the Info.plist file
   std::string plist = newoutpath;
-  plist += "/Resources/Info.plist";
+  if(!this->Makefile->PlatformIsAppleIos())
+    {
+    // Configure the Info.plist file into the Resources directory.
+    this->MacContentFolders->insert("Resources");
+    plist += "/Resources";
+    }
+  plist += "/Info.plist";
   std::string name = cmSystemTools::GetFilenameName(targetName);
   this->LocalGenerator->GenerateFrameworkInfoPList(this->GT,
                                                    name,
                                                    plist.c_str());
 
-  // TODO: Use the cmMakefileTargetGenerator::ExtraFiles vector to
-  // drive rules to create these files at build time.
-  std::string oldName;
-  std::string newName;
-
-
-  // Make foo.framework/Versions
-  std::string versions = contentdir;
-  versions += "Versions";
-  cmSystemTools::MakeDirectory(versions.c_str());
-
-  // Make foo.framework/Versions/version
-  cmSystemTools::MakeDirectory(newoutpath.c_str());
-
-  // Current -> version
-  oldName = frameworkVersion;
-  newName = versions;
-  newName += "/Current";
-  cmSystemTools::RemoveFile(newName);
-  cmSystemTools::CreateSymlink(oldName, newName);
-  this->Makefile->AddCMakeOutputFile(newName);
-
-  // foo -> Versions/Current/foo
-  oldName = "Versions/Current/";
-  oldName += name;
-  newName = contentdir;
-  newName += name;
-  cmSystemTools::RemoveFile(newName);
-  cmSystemTools::CreateSymlink(oldName, newName);
-  this->Makefile->AddCMakeOutputFile(newName);
-
-  // Resources -> Versions/Current/Resources
-  if(this->MacContentFolders->find("Resources") !=
-     this->MacContentFolders->end())
-    {
-    oldName = "Versions/Current/Resources";
-    newName = contentdir;
-    newName += "Resources";
-    cmSystemTools::RemoveFile(newName);
-    cmSystemTools::CreateSymlink(oldName, newName);
-    this->Makefile->AddCMakeOutputFile(newName);
-    }
-
-  // Headers -> Versions/Current/Headers
-  if(this->MacContentFolders->find("Headers") !=
-     this->MacContentFolders->end())
+  if(!this->Makefile->PlatformIsAppleIos())
     {
-    oldName = "Versions/Current/Headers";
-    newName = contentdir;
-    newName += "Headers";
+    // TODO: Use the cmMakefileTargetGenerator::ExtraFiles vector to
+    // drive rules to create these files at build time.
+    std::string oldName;
+    std::string newName;
+    
+    // Make foo.framework/Versions
+    std::string versions = contentdir;
+    versions += "Versions";
+    cmSystemTools::MakeDirectory(versions.c_str());
+    
+    // Make foo.framework/Versions/version
+    cmSystemTools::MakeDirectory(newoutpath.c_str());
+    
+    // Current -> version
+    oldName = frameworkVersion;
+    newName = versions;
+    newName += "/Current";
     cmSystemTools::RemoveFile(newName);
     cmSystemTools::CreateSymlink(oldName, newName);
     this->Makefile->AddCMakeOutputFile(newName);
-    }
-
-  // PrivateHeaders -> Versions/Current/PrivateHeaders
-  if(this->MacContentFolders->find("PrivateHeaders") !=
-     this->MacContentFolders->end())
-    {
-    oldName = "Versions/Current/PrivateHeaders";
+    
+    // foo -> Versions/Current/foo
+    oldName = "Versions/Current/";
+    oldName += name;
     newName = contentdir;
-    newName += "PrivateHeaders";
+    newName += name;
     cmSystemTools::RemoveFile(newName);
     cmSystemTools::CreateSymlink(oldName, newName);
     this->Makefile->AddCMakeOutputFile(newName);
+    
+    // Resources -> Versions/Current/Resources
+    if(this->MacContentFolders->find("Resources") !=
+       this->MacContentFolders->end())
+      {
+      oldName = "Versions/Current/Resources";
+      newName = contentdir;
+      newName += "Resources";
+      cmSystemTools::RemoveFile(newName);
+      cmSystemTools::CreateSymlink(oldName, newName);
+      this->Makefile->AddCMakeOutputFile(newName);
+      }
+    
+    // Headers -> Versions/Current/Headers
+    if(this->MacContentFolders->find("Headers") !=
+       this->MacContentFolders->end())
+      {
+      oldName = "Versions/Current/Headers";
+      newName = contentdir;
+      newName += "Headers";
+      cmSystemTools::RemoveFile(newName);
+      cmSystemTools::CreateSymlink(oldName, newName);
+      this->Makefile->AddCMakeOutputFile(newName);
+      }
+    
+    // PrivateHeaders -> Versions/Current/PrivateHeaders
+    if(this->MacContentFolders->find("PrivateHeaders") !=
+       this->MacContentFolders->end())
+      {
+      oldName = "Versions/Current/PrivateHeaders";
+      newName = contentdir;
+      newName += "PrivateHeaders";
+      cmSystemTools::RemoveFile(newName);
+      cmSystemTools::CreateSymlink(oldName, newName);
+      this->Makefile->AddCMakeOutputFile(newName);
+      }
     }
 }
 
-- 
2.4.9 (Apple Git-60)