[Cmake-commits] CMake branch, next, updated. v2.8.3-1397-g535706d

[Brad King]

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  535706df769cf75b92397bdaa3ba9f3e5ac6220a (commit)
       via  9859c64ffcc1450ce5dd23eb5c78fad58b030696 (commit)
      from  bbd7597e74c7cfbfb11d3651d9b635941aa3af74 (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=535706df769cf75b92397bdaa3ba9f3e5ac6220a
commit 535706df769cf75b92397bdaa3ba9f3e5ac6220a
Merge: bbd7597 9859c64
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 17 15:51:30 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 17 15:51:30 2011 -0500

    Merge topic 'vs-Fortran-SCC-issue-10237' into next
    
    9859c64 Honor VS_SCC_* properties in Fortran targets (#10237)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9859c64ffcc1450ce5dd23eb5c78fad58b030696
commit 9859c64ffcc1450ce5dd23eb5c78fad58b030696
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 17 15:41:24 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 17 15:41:24 2011 -0500

    Honor VS_SCC_* properties in Fortran targets (#10237)
    
    Factor out generation of SccProjectName, SccLocalPath, and SccProvider
    from cmLocalVisualStudio7Generator::WriteProjectStart and call it from
    cmLocalVisualStudio7Generator::WriteProjectStartFortran too.

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 21f6460..34756d8 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1706,6 +1706,22 @@ void cmLocalVisualStudio7Generator
   event.Finish();
 }
 
+void cmLocalVisualStudio7Generator::WriteProjectSCC(std::ostream& fout,
+                                                    cmTarget& target)
+{
+  // if we have all the required Source code control tags
+  // then add that to the project
+  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";
+    }
+}
+
 void
 cmLocalVisualStudio7Generator
 ::WriteProjectStartFortran(std::ostream& fout,
@@ -1773,6 +1789,7 @@ cmLocalVisualStudio7Generator
     {
     fout << "\tProjectType=\"" << projectType << "\"\n";
     }
+  this->WriteProjectSCC(fout, target);
   fout<< "\tKeyword=\"" << keyword << "\">\n" 
        << "\tProjectGUID=\"{" << gg->GetGUID(libName) << "}\">\n"
        << "\t<Platforms>\n"
@@ -1813,9 +1830,6 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
     {
     keyword = "Win32Proj";
     }
-  const char* vsProjectname = target.GetProperty("VS_SCC_PROJECTNAME");
-  const char* vsLocalpath = target.GetProperty("VS_SCC_LOCALPATH");
-  const char* vsProvider = target.GetProperty("VS_SCC_PROVIDER");
   cmGlobalVisualStudio7Generator* gg =
     static_cast<cmGlobalVisualStudio7Generator *>(this->GlobalGenerator);
   fout << "\tName=\"" << projLabel << "\"\n";
@@ -1823,14 +1837,7 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
     {
     fout << "\tProjectGUID=\"{" << gg->GetGUID(libName) << "}\"\n";
     }
-  // if we have all the required Source code control tags
-  // then add that to the project
-  if(vsProvider && vsLocalpath && vsProjectname)
-    {
-    fout << "\tSccProjectName=\"" << vsProjectname << "\"\n"
-         << "\tSccLocalPath=\"" << vsLocalpath << "\"\n"
-         << "\tSccProvider=\"" << vsProvider << "\"\n";
-    }
+  this->WriteProjectSCC(fout, target);
   fout << "\tKeyword=\"" << keyword << "\">\n"
        << "\t<Platforms>\n"
        << "\t\t<Platform\n\t\t\tName=\"" << this->PlatformName << "\"/>\n"
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index 19f7b97..160e2d4 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -102,6 +102,7 @@ private:
                        cmTarget& t, bool debug);
   void OutputLibraryDirectories(std::ostream& fout,
                                 std::vector<std::string> const& dirs);
+  void WriteProjectSCC(std::ostream& fout, cmTarget& target);
   void WriteProjectStart(std::ostream& fout, const char *libName,
                          cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
   void WriteProjectStartFortran(std::ostream& fout, const char *libName,

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

Summary of changes:
 Source/cmLocalVisualStudio7Generator.cxx |   29 ++++++++++++++++++-----------
 Source/cmLocalVisualStudio7Generator.h   |    1 +
 2 files changed, 19 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake