[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4136-g2f89fc9

[Stephen Kelly]

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  2f89fc9b3a47be5864fb8c86038c1c5b60c85c55 (commit)
       via  dde0d2247265eb4f770114693b5a20ebf40bb460 (commit)
       via  b5c4b175928b80e6b4249b307d4cbd6c56a0c561 (commit)
      from  0b4389f4042d39b8b0af5c4c6791b1aa99de3fe2 (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=2f89fc9b3a47be5864fb8c86038c1c5b60c85c55
commit 2f89fc9b3a47be5864fb8c86038c1c5b60c85c55
Merge: 0b4389f dde0d22
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 12 02:33:10 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 12 02:33:10 2013 -0400

    Merge topic 'INTERFACE_LIBRARY-target-type' into next
    
    dde0d22 Add some early exits for INTERFACE_LIBRARY on Xcode.
    b5c4b17 Add missing enum handling.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dde0d2247265eb4f770114693b5a20ebf40bb460
commit dde0d2247265eb4f770114693b5a20ebf40bb460
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 12 08:32:13 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Sep 12 08:32:13 2013 +0200

    Add some early exits for INTERFACE_LIBRARY on Xcode.
    
    We don't want to create buildsystem targets for these.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index ea5781f..9260b81 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -972,6 +972,11 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       continue;
       }
 
+    if(cmtarget.GetType() == cmTarget::INTERFACE_LIBRARY)
+      {
+      continue;
+      }
+
     if(cmtarget.GetType() == cmTarget::UTILITY ||
        cmtarget.GetType() == cmTarget::GLOBAL_TARGET)
       {
@@ -1679,6 +1684,11 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                                  cmXCodeObject* buildSettings,
                                                  const char* configName)
 {
+  if(target.GetType() == cmTarget::INTERFACE_LIBRARY)
+    {
+    return;
+    }
+
   std::string flags;
   std::string defFlags;
   bool shared = ((target.GetType() == cmTarget::SHARED_LIBRARY) ||
@@ -2543,6 +2553,10 @@ cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
                                           cmXCodeObject* buildPhases)
 {
+  if(cmtarget.GetType() == cmTarget::INTERFACE_LIBRARY)
+    {
+    return 0;
+    }
   cmXCodeObject* target =
     this->CreateObject(cmXCodeObject::PBXNativeTarget);
   target->AddAttribute("buildPhases", buildPhases);
@@ -2749,6 +2763,10 @@ void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
   cmTarget* cmtarget = target->GetTarget();
+  if(cmtarget->GetType() == cmTarget::INTERFACE_LIBRARY)
+    {
+    return;
+    }
   if(!cmtarget)
     {
     cmSystemTools::Error("Error no target on xobject\n");
@@ -2885,6 +2903,10 @@ void cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         {
         continue;
         }
+      if(cmtarget.GetType() == cmTarget::INTERFACE_TARGET)
+        {
+        continue;
+        }
 
       // add the soon to be generated Info.plist file as a source for a
       // MACOSX_BUNDLE file

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5c4b175928b80e6b4249b307d4cbd6c56a0c561
commit b5c4b175928b80e6b4249b307d4cbd6c56a0c561
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 12 08:25:09 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Sep 12 08:25:09 2013 +0200

    Add missing enum handling.

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 0838d57..bfbe138 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1258,6 +1258,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     }
     case cmTarget::UTILITY:
     case cmTarget::GLOBAL_TARGET:
+    case cmTarget::INTERFACE_LIBRARY:
       break;
     }
 }
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index c15c115..be18ceb 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -490,6 +490,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
         break;
       case cmTarget::GLOBAL_TARGET:
       case cmTarget::UNKNOWN_LIBRARY:
+      case cmTarget::INTERFACE_LIBRARY:
         break;
       }
     configType += "</ConfigurationType>\n";

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx          |   22 ++++++++++++++++++++++
 Source/cmLocalVisualStudio7Generator.cxx   |    1 +
 Source/cmVisualStudio10TargetGenerator.cxx |    1 +
 3 files changed, 24 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake