From 14dbb3b2c3b848c08820f9ee8d469d4cc6bd2f0f Mon Sep 17 00:00:00 2001
From: rcdailey <rcdailey@gmail.com>
Date: Mon, 31 Oct 2011 19:04:08 -0500
Subject: [PATCH 1/2] Add support for SccAuxPath tag in VCPROJ files. Set
 using VS_SCC_AUXPATH target property.

---
 Source/cmLocalVisualStudio7Generator.cxx   |    4 +++-
 Source/cmVisualStudio10TargetGenerator.cxx |   10 +++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index d9b2772..04fa0af 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1811,10 +1811,12 @@ 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)
+  const char* vsAuxPath = target.GetProperty("VS_SCC_AUXPATH");
+  if(vsProvider && vsLocalpath && vsProjectname && vsAuxPath)
     {
     fout << "\tSccProjectName=\"" << vsProjectname << "\"\n"
          << "\tSccLocalPath=\"" << vsLocalpath << "\"\n"
+         << "\tSccAuxPath=\"" << vsAuxPath << "\"\n"
          << "\tSccProvider=\"" << vsProvider << "\"\n";
     }
 }
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 551b0ad..f0fd9bb 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -181,9 +181,10 @@ void cmVisualStudio10TargetGenerator::Generate()
   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");
+  const char* vsAuxPath = this->Target->GetProperty("VS_SCC_AUXPATH");
 
-  if ( vsProjectName && vsLocalPath && vsProvider)
-    {
+  if( vsProjectName && vsLocalPath && vsProvider && vsAuxPath )
+  {
     this->WriteString("<SccProjectName>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(vsProjectName) <<
       "</SccProjectName>\n";
@@ -193,7 +194,10 @@ void cmVisualStudio10TargetGenerator::Generate()
     this->WriteString("<SccProvider>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(vsProvider) <<
       "</SccProvider>\n";
-    }
+    this->WriteString("<SccAuxPath>", 2);
+    (*this->BuildFileStream) << cmVS10EscapeXML(vsAuxPath) <<
+      "</SccAuxPath>\n";
+  }
 
   this->WriteString("<Keyword>Win32Proj</Keyword>\n", 2);
   this->WriteString("<Platform>", 2);
-- 
1.7.7.1.msysgit.0

From 72663d3f76e25bce0d046ac04dd1401ea962610d Mon Sep 17 00:00:00 2001
From: rcdailey <rcdailey@gmail.com>
Date: Tue, 1 Nov 2011 07:10:01 -0500
Subject: [PATCH 2/2] AuxPath is now optional

---
 Source/cmLocalVisualStudio7Generator.cxx   |   12 ++++++++----
 Source/cmVisualStudio10TargetGenerator.cxx |   13 ++++++++-----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 04fa0af..2189245 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1811,14 +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");
-  const char* vsAuxPath = target.GetProperty("VS_SCC_AUXPATH");
-  if(vsProvider && vsLocalpath && vsProjectname && vsAuxPath)
-    {
+
+  if(vsProvider && vsLocalpath && vsProjectname)
+  {
     fout << "\tSccProjectName=\"" << vsProjectname << "\"\n"
          << "\tSccLocalPath=\"" << vsLocalpath << "\"\n"
-         << "\tSccAuxPath=\"" << vsAuxPath << "\"\n"
          << "\tSccProvider=\"" << vsProvider << "\"\n";
+
+    const char* vsAuxPath = target.GetProperty("VS_SCC_AUXPATH");
+    if( vsAuxPath ) {
+      fout << "\tSccAuxPath=\"" << vsAuxPath << "\"\n";
     }
+  }
 }
 
 void
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index f0fd9bb..c540801 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -181,9 +181,8 @@ void cmVisualStudio10TargetGenerator::Generate()
   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");
-  const char* vsAuxPath = this->Target->GetProperty("VS_SCC_AUXPATH");
 
-  if( vsProjectName && vsLocalPath && vsProvider && vsAuxPath )
+  if( vsProjectName && vsLocalPath && vsProvider )
   {
     this->WriteString("<SccProjectName>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(vsProjectName) <<
@@ -194,9 +193,13 @@ void cmVisualStudio10TargetGenerator::Generate()
     this->WriteString("<SccProvider>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(vsProvider) <<
       "</SccProvider>\n";
-    this->WriteString("<SccAuxPath>", 2);
-    (*this->BuildFileStream) << cmVS10EscapeXML(vsAuxPath) <<
-      "</SccAuxPath>\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);
-- 
1.7.7.1.msysgit.0