[Cmake-commits] CMake branch, master, updated. v3.2.2-1213-gbe248ab

[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, master has been updated
       via  be248ab435b4a538f29337b8d136729436a816b4 (commit)
       via  fa9eb814b36894635e22ffdcac3103ee980b0398 (commit)
       via  1933f3d1a3a2be6949c439e18e03a048ef286be7 (commit)
       via  9e4b6cc2cebc7af40432f5027d2960c0cc68515f (commit)
       via  991f5e4968ce7b86aea12224b4cecc1be3ed92d9 (commit)
       via  57bdc1a2f7d416c106c4bef8f3543eec74c3c391 (commit)
      from  0cbc69b9ea97a44280350a58a365c617896e4589 (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=be248ab435b4a538f29337b8d136729436a816b4
commit be248ab435b4a538f29337b8d136729436a816b4
Merge: 0cbc69b fa9eb81
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 19 11:09:39 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 19 11:09:39 2015 -0400

    Merge topic 'refactor-cmLocalGenerator'
    
    fa9eb814 cmLocalGenerator: Remove redundant path access.
    1933f3d1 cmLocalGenerator: Remove redundant path conversions.
    9e4b6cc2 cmState: Store computed relative paths to to current directories.
    991f5e49 cmState::Snapshot: Store components for current directories.
    57bdc1a2 cmState: Compute and store directory components.

diff --cc Source/CTest/cmCTestLaunch.cxx
index d3edc80,1e67136..6f43a1e
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@@@ -750,9 -750,11 +750,11 @@@ int cmCTestLaunch::Main(int argc, cons
  void cmCTestLaunch::LoadConfig()
  {
    cmake cm;
+   cm.SetHomeDirectory("");
+   cm.SetHomeOutputDirectory("");
    cmGlobalGenerator gg;
    gg.SetCMakeInstance(&cm);
 -  cmsys::auto_ptr<cmLocalGenerator> lg(gg.CreateLocalGenerator());
 +  cmsys::auto_ptr<cmLocalGenerator> lg(gg.MakeLocalGenerator());
    cmMakefile* mf = lg->GetMakefile();
    std::string fname = this->LogDir;
    fname += "CTestLaunchConfig.cmake";
diff --cc Source/CTest/cmCTestTestHandler.cxx
index 5d40f91,0b7ff33..b1c479e
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@@ -1571,9 -1571,11 +1571,11 @@@ void cmCTestTestHandler::GetListOfTests
    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
      "Constructing a list of tests" << std::endl, this->Quiet);
    cmake cm;
+   cm.SetHomeDirectory("");
+   cm.SetHomeOutputDirectory("");
    cmGlobalGenerator gg;
    gg.SetCMakeInstance(&cm);
 -  cmsys::auto_ptr<cmLocalGenerator> lg(gg.CreateLocalGenerator());
 +  cmsys::auto_ptr<cmLocalGenerator> lg(gg.MakeLocalGenerator());
    cmMakefile *mf = lg->GetMakefile();
    mf->AddDefinition("CTEST_CONFIGURATION_TYPE",
      this->CTest->GetConfigType().c_str());
diff --cc Source/cmCTest.cxx
index f3c4da5,4245352..211c83c
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@@ -510,9 -510,11 +510,11 @@@ int cmCTest::Initialize(const char* bin
      }
  
    cmake cm;
+   cm.SetHomeDirectory("");
+   cm.SetHomeOutputDirectory("");
    cmGlobalGenerator gg;
    gg.SetCMakeInstance(&cm);
 -  cmsys::auto_ptr<cmLocalGenerator> lg(gg.CreateLocalGenerator());
 +  cmsys::auto_ptr<cmLocalGenerator> lg(gg.MakeLocalGenerator());
    cmMakefile *mf = lg->GetMakefile();
    if ( !this->ReadCustomConfigurationFileTree(this->BinaryDir.c_str(), mf) )
      {
diff --cc Source/cmGraphVizWriter.cxx
index 7cad8a1,bffcb7c..bbbfc24
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@@ -65,9 -65,11 +65,11 @@@ void cmGraphVizWriter::ReadSettings(con
                                      const char* fallbackSettingsFileName)
  {
    cmake cm;
+   cm.SetHomeDirectory("");
+   cm.SetHomeOutputDirectory("");
    cmGlobalGenerator ggi;
    ggi.SetCMakeInstance(&cm);
 -  cmsys::auto_ptr<cmLocalGenerator> lg(ggi.CreateLocalGenerator());
 +  cmsys::auto_ptr<cmLocalGenerator> lg(ggi.MakeLocalGenerator());
    cmMakefile *mf = lg->GetMakefile();
  
    const char* inFileName = settingsFileName;
diff --cc Source/cmake.cxx
index d783976,706f50f..b2c603f
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@@ -1925,9 -1925,11 +1925,11 @@@ int cmake::CheckBuildSystem(
    // Read the rerun check file and use it to decide whether to do the
    // global generate.
    cmake cm;
+   cm.SetHomeDirectory("");
+   cm.SetHomeOutputDirectory("");
    cmGlobalGenerator gg;
    gg.SetCMakeInstance(&cm);
 -  cmsys::auto_ptr<cmLocalGenerator> lg(gg.CreateLocalGenerator());
 +  cmsys::auto_ptr<cmLocalGenerator> lg(gg.MakeLocalGenerator());
    cmMakefile* mf = lg->GetMakefile();
    if(!mf->ReadListFile(this->CheckBuildSystemArgument.c_str()) ||
       cmSystemTools::GetErrorOccuredFlag())

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

Summary of changes:
 Source/CPack/cmCPackGenerator.cxx           |    2 +
 Source/CPack/cpack.cxx                      |    2 +
 Source/CTest/cmCTestBuildAndTestHandler.cxx |    2 +
 Source/CTest/cmCTestLaunch.cxx              |    2 +
 Source/CTest/cmCTestScriptHandler.cxx       |    2 +
 Source/CTest/cmCTestTestHandler.cxx         |    2 +
 Source/CursesDialog/ccmake.cxx              |    2 +
 Source/QtDialog/CMakeSetup.cxx              |    2 +
 Source/cmCTest.cxx                          |    2 +
 Source/cmGraphVizWriter.cxx                 |    2 +
 Source/cmLocalGenerator.cxx                 |  162 +++------------------------
 Source/cmLocalGenerator.h                   |   19 ----
 Source/cmLocalUnixMakefileGenerator3.cxx    |   11 +-
 Source/cmState.cxx                          |  150 +++++++++++++++++++++++++
 Source/cmState.h                            |   28 +++++
 Source/cmake.cxx                            |    5 +
 Source/cmakemain.cxx                        |    6 +
 Source/ctest.cxx                            |    2 +
 18 files changed, 230 insertions(+), 173 deletions(-)


hooks/post-receive
-- 
CMake