[Cmake-commits] CMake branch, next, updated. v3.0.0-4564-g7f962df

[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  7f962dfebf65a6d0aa386c5def86d85725da34bd (commit)
       via  e58f97531aa6e2a124540f38b5acd18fd989cf3b (commit)
       via  d0dd28fa92cb2223e20f3586b8973a931aa61dac (commit)
      from  4cedb1e377afb5ee7f6cbf8f2016bb0ff6d03e95 (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=7f962dfebf65a6d0aa386c5def86d85725da34bd
commit 7f962dfebf65a6d0aa386c5def86d85725da34bd
Merge: 4cedb1e e58f975
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 28 16:29:28 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 28 16:29:28 2014 -0400

    Merge topic 'vs10-system-hook' into next
    
    e58f9753 VS: Add a hook to adapt to SystemName and SystemVersion
    d0dd28fa VS: Save system name and version in global generator members


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e58f97531aa6e2a124540f38b5acd18fd989cf3b
commit e58f97531aa6e2a124540f38b5acd18fd989cf3b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 28 15:37:15 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 28 16:26:00 2014 -0400

    VS: Add a hook to adapt to SystemName and SystemVersion
    
    Add a virtual cmGlobalVisualStudio10Generator::InitializeSystem method
    called from SetSystemName once the SystemName and SystemVersion members
    have been populated.  This will give VS version-specific generators a
    chance to recognize and adapt to the target system.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index ad74537..32049b3 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -130,6 +130,10 @@ bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const& s,
 {
   this->SystemName = s;
   this->SystemVersion = mf->GetSafeDefinition("CMAKE_SYSTEM_VERSION");
+  if(!this->InitializeSystem(mf))
+    {
+    return false;
+    }
   if(this->PlatformName == "Itanium" || this->PlatformName == "x64")
     {
     if(this->IsExpressEdition() && !this->Find64BitTools(mf))
@@ -142,6 +146,12 @@ bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const& s,
 }
 
 //----------------------------------------------------------------------------
+bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile*)
+{
+  return true;
+}
+
+//----------------------------------------------------------------------------
 void cmGlobalVisualStudio10Generator
 ::AddVSPlatformToolsetDefinition(cmMakefile* mf) const
 {
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index dfdb649..4d7ff80 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -92,6 +92,7 @@ public:
 
 protected:
   virtual void Generate();
+  virtual bool InitializeSystem(cmMakefile* mf);
 
   virtual const char* GetIDEVersion() { return "10.0"; }
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0dd28fa92cb2223e20f3586b8973a931aa61dac
commit d0dd28fa92cb2223e20f3586b8973a931aa61dac
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 28 15:33:40 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 28 16:25:08 2014 -0400

    VS: Save system name and version in global generator members
    
    Add to cmGlobalVisualStudio10Generator members for SystemName and
    SystemVersion and populate them in SetSystemName.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index c1b087a..ad74537 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -128,6 +128,8 @@ cmGlobalVisualStudio10Generator::SetGeneratorToolset(std::string const& ts,
 bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const& s,
                                                     cmMakefile* mf)
 {
+  this->SystemName = s;
+  this->SystemVersion = mf->GetSafeDefinition("CMAKE_SYSTEM_VERSION");
   if(this->PlatformName == "Itanium" || this->PlatformName == "x64")
     {
     if(this->IsExpressEdition() && !this->Find64BitTools(mf))
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 9f154e9..dfdb649 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -99,6 +99,8 @@ protected:
 
   std::string GeneratorToolset;
   std::string DefaultPlatformToolset;
+  std::string SystemName;
+  std::string SystemVersion;
   bool ExpressEdition;
   bool MasmEnabled;
 

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

Summary of changes:
 Source/cmGlobalVisualStudio10Generator.cxx |   12 ++++++++++++
 Source/cmGlobalVisualStudio10Generator.h   |    3 +++
 2 files changed, 15 insertions(+)


hooks/post-receive
-- 
CMake