[Cmake-commits] CMake branch, next, updated. v3.1.1-2540-gf0e2fdd

[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  f0e2fdd201e3b7b466efb0710d0cbad317bbc8bd (commit)
       via  fb828b44ebfd0f9a2c74d16efd15d4cc0716cb60 (commit)
      from  2b24a1129330027717429d0a2be1ce7d7bd4202a (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=f0e2fdd201e3b7b466efb0710d0cbad317bbc8bd
commit f0e2fdd201e3b7b466efb0710d0cbad317bbc8bd
Merge: 2b24a11 fb828b4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 09:31:41 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 3 09:31:41 2015 -0500

    Merge topic 'fix-local-generator-config-check' into next
    
    fb828b44 Revert "cmLocalGenerator: fix the default configuration check"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb828b44ebfd0f9a2c74d16efd15d4cc0716cb60
commit fb828b44ebfd0f9a2c74d16efd15d4cc0716cb60
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 09:31:05 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 3 09:31:05 2015 -0500

    Revert "cmLocalGenerator: fix the default configuration check"
    
    This reverts commit 4c98de33d71fece4333607225ab030c1c7eee76c.
    We have always supported an empty config.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6b7a520..af4c950 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 || !*default_config)
+  if(!default_config)
     {
     default_config = "Release";
     }

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

Summary of changes:
 Source/cmLocalGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake