Re: [cmake-developers] Some trivial patches

2016-06-02 Thread Daniel Pfeifer 
On Thu, Jun 2, 2016 at 11:15 AM, Tobias Hunger  wrote:
> On Mi, 2016-06-01 at 11:18 -0400, Brad King wrote:
>> On 06/01/2016 05:04 AM, Tobias Hunger wrote:
>> > Attached you will find a couple of really small changes that add const to a
>> > method and fix a couple of typos in comments. Trivial stuff.
>>
>> Thanks.  I've applied the changes:
>>
>>  cmSearchPath: Fix typo in comment
>>  https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=814e774e
>>
>>  cmSourceFileLocation: Fix typo in comment
>>  https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd4fef64
>>
>>  cmGlobalGenerator: Make IsMultiConfig() const
>>  https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2175e5bf
>>
>> > This is mostly to figure out how to contribute code:-)
>>
>> Good job.  For large changes (e.g. cmake-daemon work) feel free
>> to publish your branch somewhere and post a link here.  For most
>> changes please post here.
>
> Why did the typo fixes end up in the master branch and the const fix in the 
> next
> branch?

Because of the code freeze for CMake 3.6:
http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/16479

> Do I need to do something to get it from next to master at some point?

No.
-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers

Re: [cmake-developers] Some trivial patches

2016-06-02 Thread Tobias Hunger 
On Mi, 2016-06-01 at 11:18 -0400, Brad King wrote:
> On 06/01/2016 05:04 AM, Tobias Hunger wrote:
> > Attached you will find a couple of really small changes that add const to a
> > method and fix a couple of typos in comments. Trivial stuff.
> 
> Thanks.  I've applied the changes:
> 
>  cmSearchPath: Fix typo in comment
>  https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=814e774e
> 
>  cmSourceFileLocation: Fix typo in comment
>  https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd4fef64
> 
>  cmGlobalGenerator: Make IsMultiConfig() const
>  https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2175e5bf
> 
> > This is mostly to figure out how to contribute code:-)
> 
> Good job.  For large changes (e.g. cmake-daemon work) feel free
> to publish your branch somewhere and post a link here.  For most
> changes please post here.

Why did the typo fixes end up in the master branch and the const fix in the next
branch?

Do I need to do something to get it from next to master at some point?

Best Regards,
Tobias

-- 
Tobias Hunger, Senior Software Engineer | The Qt Company
The Qt Company GmbH, Rudower Chaussee 13, D-12489 Berlin
Geschäftsführer: Mika Pälsi, Juha Varelius, Mika Harjuaho. Sitz der
Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, HRB 144331 B
-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers

Re: [cmake-developers] Some trivial patches

2016-06-01 Thread Brad King 
On 06/01/2016 05:04 AM, Tobias Hunger wrote:
> Attached you will find a couple of really small changes that add const to a
> method and fix a couple of typos in comments. Trivial stuff.

Thanks.  I've applied the changes:

 cmSearchPath: Fix typo in comment
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=814e774e

 cmSourceFileLocation: Fix typo in comment
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd4fef64

 cmGlobalGenerator: Make IsMultiConfig() const
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2175e5bf

> This is mostly to figure out how to contribute code:-)

Good job.  For large changes (e.g. cmake-daemon work) feel free
to publish your branch somewhere and post a link here.  For most
changes please post here.

> Is this the preferred way you want your patches?
> Or do I need to inline them somehow?

Either attachments or inline is fine.

> How can I create an account in the bug tracker?

Unfortunately we had to turn off self-registration due to recent
spam attacks (by human registrants).  While we explore alternatives
it is a manual process. I'll contact you privately.

Thanks,
-Brad
-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers

[cmake-developers] Some trivial patches

2016-06-01 Thread Tobias Hunger 
Hi CMake Developers!

Attached you will find a couple of really small changes that add const to a
method and fix a couple of typos in comments. Trivial stuff.

This is mostly to figure out how to contribute code:-)

Is this the preferred way you want your patches? Or do I need to inline
them somehow?

How can I create an account in the bug tracker?

Best Regards,
Tobias

--
Tobias Hunger, Senior Software Engineer | The Qt Company
The Qt Company GmbH, Rudower Chaussee 13, D-12489 Berlin
Geschäftsführer: Mika Pälsi, Juha Varelius, Mika Harjuaho. Sitz der
Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, HRB 144331 B
From 2e3d372dd5026a257cd11badd87dbfff7255851d Mon Sep 17 00:00:00 2001
From: Tobias Hunger 
Date: Tue, 31 May 2016 13:53:19 +0200
Subject: [PATCH 01/11] cmGlobalGenerator: Make IsMultiConfig() const

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

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);
-- 
2.8.3

From 122c333c7820fd245a7a04851e4ac29cf58573a9 Mon Sep 17 00:00:00 2001
From: Tobias Hunger 
Date: Tue, 31 May 2016 17:15:22 +0200
Subject: [PATCH 02/11] Fix typo

---
 Source/cmSearchPath.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/cmSearchPath.h b/Source/cmSearchPath.h
index 4b37a3a..835196f 100644
--- a/Source/cmSearchPath.h
+++ b/Source/cmSearchPath.h
@@ -26,7 +26,7 @@ class cmSearchPath
 {
 public:
   // cmSearchPath must be initialized from a valid pointer.  The only reason
-  // for teh default is to allow it to be easily used in stl containers.
+  // for the default is to allow it to be easily used in stl containers.
   // Attempting to initialize with a NULL value will fail an assertion
   cmSearchPath(cmFindCommon* findCmd = 0);
   ~cmSearchPath();
-- 
2.8.3

From dfc0409147b6bb07e95226e2dd56b001f2cc6dc8 Mon Sep 17 00:00:00 2001
From: Tobias Hunger 
Date: Tue, 31 May 2016 17:15:56 +0200
Subject: [PATCH 03/11] Fix typo

---
 Source/cmSourceFileLocation.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/cmSourceFileLocation.h b/Source/cmSourceFileLocation.h
index af3651a..7989173 100644
--- a/Source/cmSourceFileLocation.h
+++ b/Source/cmSourceFileLocation.h
@@ -39,7 +39,7 @@ public:
   cmSourceFileLocation& operator=(const cmSourceFileLocation& loc);
 
   /**
-   * Return whether the givne source file location could refers to the
+   * Return whether the given source file location could refers to the
* same source file as this location given the level of ambiguity in
*