[Cmake-commits] CMake branch, next, updated. v3.1.1-2538-g2b24a11

Ben Boeckel ben.boeckel at kitware.com
Mon Feb 2 10:32:49 EST 2015


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  2b24a1129330027717429d0a2be1ce7d7bd4202a (commit)
       via  4c98de33d71fece4333607225ab030c1c7eee76c (commit)
       via  cf38f6868536e8439bc84d57363dcc51f1fea998 (commit)
       via  8d69764d06ba0dca6e1e15bd5efeaac640ece49b (commit)
       via  83ae27dcd18a746af35434bede9e3a7ee0aeef9b (commit)
      from  951b4a382df85ca097859fdfb81bb3a6b886a0b9 (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=2b24a1129330027717429d0a2be1ce7d7bd4202a
commit 2b24a1129330027717429d0a2be1ce7d7bd4202a
Merge: 951b4a3 4c98de3
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Feb 2 10:32:49 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 2 10:32:49 2015 -0500

    Merge topic 'fix-local-generator-config-check' into next
    
    4c98de33 cmLocalGenerator: fix the default configuration check
    cf38f686 CMake Nightly Date Stamp
    8d69764d CMake Nightly Date Stamp
    83ae27dc CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c98de33d71fece4333607225ab030c1c7eee76c
commit 4c98de33d71fece4333607225ab030c1c7eee76c
Author:     Ben Boeckel <mathstuf at gmail.com>
AuthorDate: Mon Feb 2 10:31:43 2015 -0500
Commit:     Ben Boeckel <mathstuf at gmail.com>
CommitDate: Mon Feb 2 10:31:43 2015 -0500

    cmLocalGenerator: fix the default configuration check
    
    Empty also means the default configuration should be used.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index af4c950..6b7a520 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -425,7 +425,7 @@ void cmLocalGenerator::GenerateInstallRules()
     {
     default_config = configurationTypes[0].c_str();
     }
-  if(!default_config)
+  if(!default_config || !*default_config)
     {
     default_config = "Release";
     }

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

Summary of changes:
 Source/CMakeVersion.cmake   |    2 +-
 Source/cmLocalGenerator.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list