[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4149-gc7c9333

[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  c7c9333159d3f6c398b3db20250bb2914ade2739 (commit)
       via  1eb244a7c01c92497ad738049c7234d7d381d83b (commit)
      from  c2d78c1b479653571cd0cf62832c5c63534e5157 (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=c7c9333159d3f6c398b3db20250bb2914ade2739
commit c7c9333159d3f6c398b3db20250bb2914ade2739
Merge: c2d78c1 1eb244a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 12 11:08:15 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 12 11:08:15 2013 -0400

    Merge topic 'INTERFACE_LIBRARY-target-type' into next
    
    1eb244a Fix INTERFACE_LIBRARY handling in VS6 generator.

diff --cc Source/cmLocalVisualStudio6Generator.cxx
index e909e1c,cb30fa2..3d9bafa
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@@ -146,8 -151,10 +151,10 @@@ void cmLocalVisualStudio6Generator::Out
        case cmTarget::GLOBAL_TARGET:
          this->SetBuildType(UTILITY, l->first.c_str(), l->second);
          break;
+       case cmTarget::INTERFACE_LIBRARY:
+         break;
        default:
 -        cmSystemTools::Error("Bad target type", l->first.c_str());
 +        cmSystemTools::Error("Bad target type: ", l->first.c_str());
          break;
        }
      // INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1eb244a7c01c92497ad738049c7234d7d381d83b
commit 1eb244a7c01c92497ad738049c7234d7d381d83b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 12 17:06:58 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Sep 12 17:07:31 2013 +0200

    Fix INTERFACE_LIBRARY handling in VS6 generator.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 503b052..cb30fa2 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -91,6 +91,11 @@ void cmLocalVisualStudio6Generator::AddCMakeListsRules()
   for(cmTargets::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
+    if (l->second.GetType() == cmTarget::INTERFACE_LIBRARY)
+      {
+      continue;
+      }
+
     // Add a rule to regenerate the build system when the target
     // specification source changes.
     const char* suppRegenRule =
@@ -146,6 +151,8 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
       case cmTarget::GLOBAL_TARGET:
         this->SetBuildType(UTILITY, l->first.c_str(), l->second);
         break;
+      case cmTarget::INTERFACE_LIBRARY:
+        break;
       default:
         cmSystemTools::Error("Bad target type", l->first.c_str());
         break;

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

Summary of changes:
 Source/cmLocalVisualStudio6Generator.cxx |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake