[Cmake-commits] CMake branch, next, updated. v3.5.2-815-g36ec325

[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  36ec325b71c4dcc5c65ae3c44c43b75efdf1500c (commit)
       via  2175e5bfa5a2f9f08d6f4f4db652b8f5fae08d79 (commit)
      from  e3d868ac2ff6360e72f95cc9b75ea31f8c75098c (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36ec325b71c4dcc5c65ae3c44c43b75efdf1500c
commit 36ec325b71c4dcc5c65ae3c44c43b75efdf1500c
Merge: e3d868a 2175e5b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 1 11:13:20 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 1 11:13:20 2016 -0400

    Merge topic 'minor-cleanups' into next
    
    2175e5bf cmGlobalGenerator: Make IsMultiConfig() const


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2175e5bfa5a2f9f08d6f4f4db652b8f5fae08d79
commit 2175e5bfa5a2f9f08d6f4f4db652b8f5fae08d79
Author:     Tobias Hunger <tobias.hunger at qt.io>
AuthorDate: Tue May 31 13:53:19 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 1 11:12:58 2016 -0400

    cmGlobalGenerator: Make IsMultiConfig() const

diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 2575911..68ff042 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -319,7 +319,7 @@ public:
 
   /** Return true if the generated build tree may contain multiple builds.
       i.e. "Can I build Debug and Release in the same tree?" */
-  virtual bool IsMultiConfig() { return false; }
+  virtual bool IsMultiConfig() const { return false; }
 
   std::string GetSharedLibFlagsForLanguage(std::string const& lang) const;
 
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index fb2cdbd..1d456ff 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -85,7 +85,7 @@ public:
 
   /** Return true if the generated build tree may contain multiple builds.
       i.e. "Can I build Debug and Release in the same tree?" */
-  virtual bool IsMultiConfig() { return true; }
+  virtual bool IsMultiConfig() const { return true; }
 
   /** Return true if building for Windows CE */
   virtual bool TargetsWindowsCE() const { return false; }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 6628cfc..b666594 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -3437,7 +3437,7 @@ std::string cmGlobalXCodeGenerator::ComputeInfoPListLocation(
 
 // Return true if the generated build tree may contain multiple builds.
 // i.e. "Can I build Debug and Release in the same tree?"
-bool cmGlobalXCodeGenerator::IsMultiConfig()
+bool cmGlobalXCodeGenerator::IsMultiConfig() const
 {
   // Old Xcode 1.5 is single config:
   if (this->XcodeVersion == 15) {
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 2ca4c19..0485d4f 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -79,7 +79,7 @@ public:
 
   /** Return true if the generated build tree may contain multiple builds.
       i.e. "Can I build Debug and Release in the same tree?" */
-  virtual bool IsMultiConfig();
+  virtual bool IsMultiConfig() const;
 
   virtual bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf);
   void AppendFlag(std::string& flags, std::string const& flag);

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

Summary of changes:
 Source/cmGlobalGenerator.h             |    2 +-
 Source/cmGlobalVisualStudioGenerator.h |    2 +-
 Source/cmGlobalXCodeGenerator.cxx      |    2 +-
 Source/cmGlobalXCodeGenerator.h        |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake