[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1395-gf66b533

[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  f66b5335ecbd4ca3da7055ef46b45bb862c2ddc3 (commit)
       via  d36d47b7c74b0b3ae0c6d65d782009ddb6c66353 (commit)
       via  e8e683a03de7a3d92fff0b7595abccca31259b7a (commit)
      from  e6b15956f860685e2ba116e01e3c34967717929d (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=f66b5335ecbd4ca3da7055ef46b45bb862c2ddc3
commit f66b5335ecbd4ca3da7055ef46b45bb862c2ddc3
Merge: e6b1595 d36d47b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Mar 23 07:55:06 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Mar 23 07:55:06 2014 -0400

    Merge topic 'target-sources-refactor' into next
    
    d36d47b7 Exclude files from object libraries.
    e8e683a0 Resolve unused warning.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d36d47b7c74b0b3ae0c6d65d782009ddb6c66353
commit d36d47b7c74b0b3ae0c6d65d782009ddb6c66353
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Mar 23 12:45:38 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Mar 23 12:45:38 2014 +0100

    Exclude files from object libraries.
    
    They are handled separately.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index e99f3a4..adc1975 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -324,6 +324,11 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
   for(std::vector<cmSourceFile*>::const_iterator i = classes.begin();
       i != classes.end(); i++)
     {
+    if (!(*i)->GetObjectLibrary().empty())
+      {
+      continue;
+      }
+
     // Add the file to the list of sources.
     std::string source = (*i)->GetFullPath();
     cmSourceGroup* sourceGroup =
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index e8562ca..8bac10d 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1401,6 +1401,10 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
   for(std::vector<cmSourceFile*>::const_iterator i = classes.begin();
       i != classes.end(); i++)
     {
+    if (!(*i)->GetObjectLibrary().empty())
+      {
+      continue;
+      }
     // Add the file to the list of sources.
     std::string source = (*i)->GetFullPath();
     if(cmSystemTools::UpperCase((*i)->GetExtension()) == "DEF")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8e683a03de7a3d92fff0b7595abccca31259b7a
commit e8e683a03de7a3d92fff0b7595abccca31259b7a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Mar 23 12:42:28 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Mar 23 12:42:28 2014 +0100

    Resolve unused warning.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index e3ab142..e99f3a4 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -253,7 +253,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
                                            makefileIn.c_str(), commandLines,
                                            comment.c_str(),
                                            no_working_directory, true);
-  if(cmSourceFile* file = this->Makefile->GetSource(makefileIn.c_str()))
+  if(this->Makefile->GetSource(makefileIn.c_str()))
     {
     tgt.AddSource(makefileIn);
     }

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

Summary of changes:
 Source/cmLocalVisualStudio6Generator.cxx |    7 ++++++-
 Source/cmLocalVisualStudio7Generator.cxx |    4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake