[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-468-g3ff5f78

[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  3ff5f7862607201bfe3b43f9abc6fe17197de9fb (commit)
       via  1ade687d8dbe2952bc12dabeaaaaf0abec5b98cf (commit)
      from  0c2d53012ef21d58db4bc242b500422ce19dc9e7 (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=3ff5f7862607201bfe3b43f9abc6fe17197de9fb
commit 3ff5f7862607201bfe3b43f9abc6fe17197de9fb
Merge: 0c2d530 1ade687
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 09:15:05 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 19 09:15:05 2015 -0500

    Merge topic 'cmake-gui-reset-generator-toolset-and-platform' into next
    
    1ade687d cmake-gui: Reset generator platform and toolset on configure (#15411)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ade687d8dbe2952bc12dabeaaaaf0abec5b98cf
commit 1ade687d8dbe2952bc12dabeaaaaf0abec5b98cf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 09:09:58 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 09:14:38 2015 -0500

    cmake-gui: Reset generator platform and toolset on configure (#15411)
    
    At the start of each configure step we already reset the generator
    selection (CMAKE_GENERATOR) to match that loaded for the current
    project.  Add missing code to reset the generator platform and toolset
    (CMAKE_GENERATOR_PLATFORM and CMAKE_GENERATOR_TOOLSET) also so that they
    do not leak across projects.

diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx
index b833648..996aa75 100644
--- a/Source/QtDialog/QCMake.cxx
+++ b/Source/QtDialog/QCMake.cxx
@@ -147,6 +147,8 @@ void QCMake::configure()
   this->CMakeInstance->SetStartOutputDirectory(this->BinaryDirectory.toLocal8Bit().data());
   this->CMakeInstance->SetGlobalGenerator(
     this->CMakeInstance->CreateGlobalGenerator(this->Generator.toLocal8Bit().data()));
+  this->CMakeInstance->SetGeneratorPlatform("");
+  this->CMakeInstance->SetGeneratorToolset("");
   this->CMakeInstance->LoadCache();
   this->CMakeInstance->SetSuppressDevWarnings(this->SuppressDevWarnings);
   this->CMakeInstance->SetWarnUninitialized(this->WarnUninitializedMode);

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

Summary of changes:
 Source/QtDialog/QCMake.cxx |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake