[Cmake-commits] CMake branch, next, updated. v2.8.5-1345-g7bde5d7

[David Cole]

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  7bde5d734e10c285fda2e69dbdb20897d8549fec (commit)
       via  05ddfbfe95c4536521084975be6e9cadf0ee05f9 (commit)
      from  ff049a3e8ed0ad4dbc79bc647b9a35f7fa914eea (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=7bde5d734e10c285fda2e69dbdb20897d8549fec
commit 7bde5d734e10c285fda2e69dbdb20897d8549fec
Merge: ff049a3 05ddfbf
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Jul 29 14:50:04 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 29 14:50:04 2011 -0400

    Merge topic 'fix-12299-add-vs10-scc-support' into next
    
    05ddfbf VS10: Add SCC support


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05ddfbfe95c4536521084975be6e9cadf0ee05f9
commit 05ddfbfe95c4536521084975be6e9cadf0ee05f9
Author:     Steven Velez <sbv1976 at gmail.com>
AuthorDate: Tue Jun 14 09:45:52 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Jul 29 14:06:28 2011 -0400

    VS10: Add SCC support
    
    Honor the properties that were added for earlier versions
    of visual studio.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index d710405..ac4296c 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -178,8 +178,23 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<ProjectGUID>", 2);
   (*this->BuildFileStream) <<  "{" << this->GUID << "}</ProjectGUID>\n";
 
-  this->WriteString("<SccProjectName />\n", 2);
-  this->WriteString("<SccLocalPath />\n", 2);
+  const char* vsProjectName = this->Target->GetProperty("VS_SCC_PROJECTNAME");
+  const char* vsLocalPath = this->Target->GetProperty("VS_SCC_LOCALPATH");
+  const char* vsProvider = this->Target->GetProperty("VS_SCC_PROVIDER");
+
+  if ( vsProjectName && vsLocalPath && vsProvider)
+    {
+    this->WriteString("<SccProjectName>", 2);
+    (*this->BuildFileStream) << cmVS10EscapeXML(vsProjectName) <<
+      "</SccProjectName>\n";
+    this->WriteString("<SccLocalPath>", 2);
+    (*this->BuildFileStream) << cmVS10EscapeXML(vsLocalPath) <<
+      "</SccLocalPath>\n";
+    this->WriteString("<SccProvider>", 2);
+    (*this->BuildFileStream) << cmVS10EscapeXML(vsProvider) <<
+      "</SccProvider>\n";
+    }
+
   this->WriteString("<Keyword>Win32Proj</Keyword>\n", 2);
   this->WriteString("<Platform>", 2);
   (*this->BuildFileStream) << this->Platform << "</Platform>\n";

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake