[Cmake-commits] CMake branch, next, updated. v3.0.1-5261-g621bd88

[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  621bd8816e011ac621d8db317b391be0e25d3045 (commit)
       via  db5a30b58946e4aa114ba778c74ffdeb2175106d (commit)
      from  b44bf8890f8128b26184cfdf5de58aae13c8157b (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=621bd8816e011ac621d8db317b391be0e25d3045
commit 621bd8816e011ac621d8db317b391be0e25d3045
Merge: b44bf88 db5a30b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 9 15:06:49 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 9 15:06:49 2014 -0400

    Merge topic 'vs-generator-platform' into next
    
    db5a30b5 enable_language: Initialize system-specific generator info only once


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db5a30b58946e4aa114ba778c74ffdeb2175106d
commit db5a30b58946e4aa114ba778c74ffdeb2175106d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 9 15:01:51 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 9 15:04:07 2014 -0400

    enable_language: Initialize system-specific generator info only once
    
    Call SetSystemName, SetGeneratorPlatform, and SetGeneratorToolset
    exactly once after reading CMakeSystem.cmake, and not again on another
    call to enable_language() or project().

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 90fd3f3..4375114 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -438,7 +438,8 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
 
   // try and load the CMakeSystem.cmake if it is there
   std::string fpath = rootBin;
-  if(!mf->GetDefinition("CMAKE_SYSTEM_LOADED"))
+  bool const readCMakeSystem = !mf->GetDefinition("CMAKE_SYSTEM_LOADED");
+  if(readCMakeSystem)
     {
     fpath += "/CMakeSystem.cmake";
     if(cmSystemTools::FileExists(fpath.c_str()))
@@ -472,28 +473,31 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
     mf->ReadListFile(0,fpath.c_str());
     }
 
-  // Tell the generator about the target system.
-  std::string system = mf->GetSafeDefinition("CMAKE_SYSTEM_NAME");
-  if(!this->SetSystemName(system, mf))
+  if(readCMakeSystem)
     {
-    cmSystemTools::SetFatalErrorOccured();
-    return;
-    }
+    // Tell the generator about the target system.
+    std::string system = mf->GetSafeDefinition("CMAKE_SYSTEM_NAME");
+    if(!this->SetSystemName(system, mf))
+      {
+      cmSystemTools::SetFatalErrorOccured();
+      return;
+      }
 
-  // Tell the generator about the platform, if any.
-  std::string platform = mf->GetSafeDefinition("CMAKE_GENERATOR_PLATFORM");
-  if(!this->SetGeneratorPlatform(platform, mf))
-    {
-    cmSystemTools::SetFatalErrorOccured();
-    return;
-    }
+    // Tell the generator about the platform, if any.
+    std::string platform = mf->GetSafeDefinition("CMAKE_GENERATOR_PLATFORM");
+    if(!this->SetGeneratorPlatform(platform, mf))
+      {
+      cmSystemTools::SetFatalErrorOccured();
+      return;
+      }
 
-  // Tell the generator about the toolset, if any.
-  std::string toolset = mf->GetSafeDefinition("CMAKE_GENERATOR_TOOLSET");
-  if(!this->SetGeneratorToolset(toolset, mf))
-    {
-    cmSystemTools::SetFatalErrorOccured();
-    return;
+    // Tell the generator about the toolset, if any.
+    std::string toolset = mf->GetSafeDefinition("CMAKE_GENERATOR_TOOLSET");
+    if(!this->SetGeneratorToolset(toolset, mf))
+      {
+      cmSystemTools::SetFatalErrorOccured();
+      return;
+      }
     }
 
   // **** Load the system specific initialization if not yet loaded

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

Summary of changes:
 Source/cmGlobalGenerator.cxx |   44 +++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
CMake