[Cmake-commits] CMake branch, next, updated. v2.8.6-1741-ga476a91

[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  a476a91a749d49c8f75da0ffbc2ee1fd3f882b8c (commit)
       via  b0f0b3e4405cb663fd5757441f556ee6cd3fac8c (commit)
      from  6b93e43277c4ddf50a549f1d7e0e80e621315a57 (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=a476a91a749d49c8f75da0ffbc2ee1fd3f882b8c
commit a476a91a749d49c8f75da0ffbc2ee1fd3f882b8c
Merge: 6b93e43 b0f0b3e
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Nov 1 12:02:21 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 1 12:02:21 2011 -0400

    Merge topic 'fix-12549-one-more-SCC-setting' into next
    
    b0f0b3e VS: Add VS_SCC_AUXPATH target property (#12549)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0f0b3e4405cb663fd5757441f556ee6cd3fac8c
commit b0f0b3e4405cb663fd5757441f556ee6cd3fac8c
Author:     Robert Dailey <rcdailey at gmail.com>
AuthorDate: Mon Oct 31 19:04:08 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Nov 1 11:29:08 2011 -0400

    VS: Add VS_SCC_AUXPATH target property (#12549)
    
    Maps to SccAuxPath tag in VCPROJ files.

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index d9b2772..ae70759 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1811,11 +1811,18 @@ void cmLocalVisualStudio7Generator::WriteProjectSCC(std::ostream& fout,
   const char* vsProjectname = target.GetProperty("VS_SCC_PROJECTNAME");
   const char* vsLocalpath = target.GetProperty("VS_SCC_LOCALPATH");
   const char* vsProvider = target.GetProperty("VS_SCC_PROVIDER");
+
   if(vsProvider && vsLocalpath && vsProjectname)
     {
     fout << "\tSccProjectName=\"" << vsProjectname << "\"\n"
          << "\tSccLocalPath=\"" << vsLocalpath << "\"\n"
          << "\tSccProvider=\"" << vsProvider << "\"\n";
+
+    const char* vsAuxPath = target.GetProperty("VS_SCC_AUXPATH");
+    if(vsAuxPath)
+      {
+      fout << "\tSccAuxPath=\"" << vsAuxPath << "\"\n";
+      }
     }
 }
 
diff --git a/Source/cmSetTargetPropertiesCommand.h b/Source/cmSetTargetPropertiesCommand.h
index 320378d..f001a11 100644
--- a/Source/cmSetTargetPropertiesCommand.h
+++ b/Source/cmSetTargetPropertiesCommand.h
@@ -140,7 +140,8 @@ public:
         "the target in an IDE like visual studio.  VS_KEYWORD can be set "
         "to change the visual studio keyword, for example QT integration "
         "works better if this is set to Qt4VSv1.0.\n"
-        "VS_SCC_PROJECTNAME, VS_SCC_LOCALPATH, VS_SCC_PROVIDER can be set "
+        "VS_SCC_PROJECTNAME, VS_SCC_LOCALPATH, VS_SCC_PROVIDER and "
+        "VS_SCC_AUXPATH can be set "
         "to add support for source control bindings in a  Visual Studio "
         "project file.\n"
         "VS_GLOBAL_<variable> can be set to add a Visual Studio "
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f7d3ba9..6bf7ec9 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1011,7 +1011,7 @@ void cmTarget::DefineProperties(cmake *cm)
      "provider property.");
   cm->DefineProperty
     ("VS_SCC_LOCALPATH", cmProperty::TARGET,
-     "Visual Studio Source Code Control Provider.",
+     "Visual Studio Source Code Control Local Path.",
      "Can be set to change the visual studio source code control "
      "local path property.");
   cm->DefineProperty
@@ -1020,6 +1020,11 @@ void cmTarget::DefineProperties(cmake *cm)
      "Can be set to change the visual studio source code control "
      "project name property.");
   cm->DefineProperty
+    ("VS_SCC_AUXPATH", cmProperty::TARGET,
+     "Visual Studio Source Code Control Aux Path.",
+     "Can be set to change the visual studio source code control "
+     "auxpath property.");
+  cm->DefineProperty
     ("VS_GLOBAL_<variable>", cmProperty::TARGET,
      "Visual Studio project-specific global variable.",
      "Tell the Visual Studio generator to set the global variable "
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 551b0ad..45a79c8 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -182,7 +182,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   const char* vsLocalPath = this->Target->GetProperty("VS_SCC_LOCALPATH");
   const char* vsProvider = this->Target->GetProperty("VS_SCC_PROVIDER");
 
-  if ( vsProjectName && vsLocalPath && vsProvider)
+  if( vsProjectName && vsLocalPath && vsProvider )
     {
     this->WriteString("<SccProjectName>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(vsProjectName) <<
@@ -193,6 +193,14 @@ void cmVisualStudio10TargetGenerator::Generate()
     this->WriteString("<SccProvider>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(vsProvider) <<
       "</SccProvider>\n";
+
+    const char* vsAuxPath = this->Target->GetProperty("VS_SCC_AUXPATH");
+    if( vsAuxPath )
+      {
+      this->WriteString("<SccAuxPath>", 2);
+       (*this->BuildFileStream) << cmVS10EscapeXML(vsAuxPath) <<
+         "</SccAuxPath>\n";
+      }
     }
 
   this->WriteString("<Keyword>Win32Proj</Keyword>\n", 2);

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

Summary of changes:
 Source/cmLocalVisualStudio7Generator.cxx   |    7 +++++++
 Source/cmSetTargetPropertiesCommand.h      |    3 ++-
 Source/cmTarget.cxx                        |    7 ++++++-
 Source/cmVisualStudio10TargetGenerator.cxx |   10 +++++++++-
 4 files changed, 24 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake