[Cmake-commits] CMake branch, master, updated. v3.6.1-540-g2c0e87f

2016-08-03 Thread Kitware Robot 
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, master has been updated
   via  2c0e87fff3347189db7454cf55669eec45819d9a (commit)
  from  382c4fca6b895c2c7a68445918a8fd73a15e1f91 (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=2c0e87fff3347189db7454cf55669eec45819d9a
commit 2c0e87fff3347189db7454cf55669eec45819d9a
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Thu Aug 4 00:01:06 2016 -0400
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Aug 4 00:01:06 2016 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index a742e33..f8782b2 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 6)
-set(CMake_VERSION_PATCH 20160803)
+set(CMake_VERSION_PATCH 20160804)
 #set(CMake_VERSION_RC 1)

---

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


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

Re: [cmake-developers] [PATCH] Use full path for all source files in ninja build.

2016-08-03 Thread Chaoren Lin via cmake-developers 
> What about instead of "cd path && ninja", using "ninja -C path"?

I suppose we can also change "cmake --build path", to use "ninja -C path"
instead of "cd path && ninja",
but making ninja always use full paths for source files would have these
benefits:

   1. consistency with make (as pointed out by Brad)
   2. consistency regardless of where the build directory is located (in
   source, under source, or out of source)
   3. all three ways of invoking the build would work for IDEs (cmake
   --build, cd && ninja, ninja -C),
   so future IDE writers won't run into the sample problem no matter which
   way they choose


On Wed, Aug 3, 2016 at 1:12 PM, Ben Boeckel  wrote:

> On Wed, Aug 03, 2016 at 11:11:45 -0700, Chaoren Lin wrote:
> > Also, in the case of vim, the makeprg is user-supplied, so vim has no
> idea
> > that it contains a path.
>
> What about instead of "cd path && ninja", using "ninja -C path"?
>
> --Ben
>
-- 

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] [PATCH] Use full path for all source files in ninja build.

2016-08-03 Thread Ben Boeckel 
On Wed, Aug 03, 2016 at 11:11:45 -0700, Chaoren Lin wrote:
> Also, in the case of vim, the makeprg is user-supplied, so vim has no idea
> that it contains a path.

What about instead of "cd path && ninja", using "ninja -C path"?

--Ben
-- 

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] [PATCH] Let CMake know that clang uses the GCC toolchain.

2016-08-03 Thread Chaoren Lin via cmake-developers 
> It will take some investigation to decide how/whether to set SIMULATE_ID
> to GNU.

This seems like the right thing to do, and is more future proof than the
alternative.

On Wed, Aug 3, 2016 at 5:56 AM, Brad King  wrote:

> On 08/02/2016 06:59 PM, Chaoren Lin wrote:
> >> In the gcc-like variant the CMAKE_{C,CXX}_SIMULATE_ID
> >> should be detected as GNU and cause the existing code to work.
> >
> > Huh, it doesn't look like that variable is set automatically when using
> > clang with the gcc toolchain. Is that supposed to happen?
> > It should be set manually (say, in a toolchain file)?
>
> It is supposed to be detected automatically.  Whenever Clang is detected
> on Windows the _SIMULATE_ID should be detected too.  I found the problem.
> The simulate id detection is done here:
>
>
> https://gitlab.kitware.com/cmake/cmake/blob/v3.6.1/Modules/Compiler/Clang-DetermineCompilerInternal.cmake#L12-15
>
> and it only looks for MSVC.  Grepping for SIMULATE_ID reveals that it is
> used for Intel and Clang but only ever detects when MSVC is simulated.
> All consuming code paths are interested in whether SIMULATE_ID==MSVC
> and otherwise assume GNU, except cmGlobalNinjaGenerator::EnableLanguage.
>
> It will take some investigation to decide how/whether to set SIMULATE_ID
> to GNU.  Alternatively the corresponding test in the Ninja generator could
> be changed to look for `COMPILER_ID == Clang && SIMULATE_ID != MSVC`.
>
> -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

Re: [cmake-developers] [PATCH] Use full path for all source files in ninja build.

2016-08-03 Thread Chaoren Lin via cmake-developers 
> If you know /path/to/build why not just interpret relative paths with
> respect to it as a heuristic?  If the paths exist then use them.

It's... a bit complicated. Our IDE (Android Studio) calls another build
system (Gradle) which in turn calls CMake to trigger the build. So the IDE
itself doesn't see the build path, only the failure output.
Also, in the case of vim, the makeprg is user-supplied, so vim has no idea
that it contains a path.

> Another approach is to use ConvertToNinjaPath for all the build.ninja
> inputs and outputs on build statements but use something other than $in
> for the source file on the compilation rule.  Using an "IN_ABS = ..."
> variable could achieve this.

Thanks, I'll try this.

On Wed, Aug 3, 2016 at 5:56 AM, Brad King  wrote:

> On 08/02/2016 04:42 PM, Chaoren Lin wrote:
> > Our IDE uses "cmake --build /path/to/build" to invoke the build,
> > so that we only have to deal with CMake and not the underlying build
> system.
>
> If you know /path/to/build why not just interpret relative paths with
> respect to it as a heuristic?  If the paths exist then use them.
>
> > Maybe I can try to fix ninja to resolve paths before sending them to the
> compiler.
>
> The ninja build tool itself does not have enough information to make
> such a transformation.  CMake does though.  See below.
>
> > Or maybe just add a flag to ConvertToNinjaPath or something.
>
> ConvertToNinjaPath is called from several places that don't all know
> whether the file they are passing is a source file for compilation
> or not.
>
> Another approach is to use ConvertToNinjaPath for all the build.ninja
> inputs and outputs on build statements but use something other than $in
> for the source file on the compilation rule.  Using an "IN_ABS = ..."
> variable could achieve this.
>
> -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

Re: [cmake-developers] patches from pkgsrc

2016-08-03 Thread Brad King 
On 08/03/2016 11:47 AM, Patrick Welche wrote:
> One thing: in the "Treat BSDs more uniformly" patch, there was some:
> 
> +# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
> +#  include 
> +#  if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
> +#include 
> +#  endif
> +#  if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
> +#include 
> +#  endif
> +# endif
> 
> which I don't seem to see anymore - is that part superfluous?

The same block already occurs unconditionally a bit later in the file.

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

Re: [cmake-developers] patches from pkgsrc

2016-08-03 Thread Patrick Welche 
On Tue, Aug 02, 2016 at 01:08:23PM -0400, Brad King wrote:
> I've applied the KWSys parts to its upstream:
> 
> * http://review.source.kitware.com/21403 SystemInformation: Treat BSDs more 
> uniformly
> * http://review.source.kitware.com/21404 SystemInformation: Treat Solaris the 
> same as Linux
> * http://review.source.kitware.com/21405 SystemTools: Fix FileExists for some 
> SCO OpenServer file permissions
> 
> Once integrated there I can update CMake's copy.
> 
> I left out the "Use correct cmake macro." change because it is wrong.
> The SIZEOF_VOID_P macro is defined by code in CMakeLists.txt using
> the value of CMAKE_SIZEOF_VOID_P.  The former is a C++ preprocessor
> macro.  The latter is only visible in CMake code.

Thanks - I'll get rid fo the CMAKE_SIZEOF_VOID_P bit.

One thing: in the "Treat BSDs more uniformly" patch, there was some:

+# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
+#  include 
+#  if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
+#include 
+#  endif
+#  if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
+#include 
+#  endif
+# endif

which I don't seem to see anymore - is that part superfluous?


Cheers,

Patrick
-- 

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-commits] CMake branch, next, updated. v3.6.1-1094-gf07f592

2016-08-03 Thread 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  f07f592ef88d4db60780a737c78b2fc0aae3fec7 (commit)
   via  ff386d1121ec52854d522d3bb9c86fab286d58ef (commit)
  from  74da9df98805c96d2846be6c7f735aa9bd0f8030 (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=f07f592ef88d4db60780a737c78b2fc0aae3fec7
commit f07f592ef88d4db60780a737c78b2fc0aae3fec7
Merge: 74da9df ff386d1
Author: Brad King 
AuthorDate: Wed Aug 3 11:16:15 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 3 11:16:15 2016 -0400

Merge topic 'find-module-imported-fallback-to-release' into next

ff386d11 Modules: Make imported targets fall back to `Release`


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff386d1121ec52854d522d3bb9c86fab286d58ef
commit ff386d1121ec52854d522d3bb9c86fab286d58ef
Author: Brad King 
AuthorDate: Wed Aug 3 11:12:01 2016 -0400
Commit: Brad King 
CommitDate: Wed Aug 3 11:14:29 2016 -0400

Modules: Make imported targets fall back to `Release`

Find modules only detect Debug and Release configurations.  All other
configurations will fall back to the configuration listed as the first
entry in `IMPORTED_CONFIGURATIONS`.  Switch the order so that `Release`
is listed first, as this is a better fallback than `Debug` for the
`RelWithDebInfo` and `MinSizeRel` configurations.  See issue #16091.

This approach is recommended by documentation in `cmake-developer(7)`
added by commit v3.2.0-rc1~286^2~1 (Help: Document IMPORTED_CONFIGURATIONS
target property for Find modules, 2014-12-04).

diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake
index a7ffcfe..72032c7 100644
--- a/Modules/FindGTest.cmake
+++ b/Modules/FindGTest.cmake
@@ -226,13 +226,6 @@ if(GTEST_FOUND)
 IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
 IMPORTED_LOCATION "${GTEST_LIBRARY}")
 endif()
-if(EXISTS "${GTEST_LIBRARY_DEBUG}")
-set_property(TARGET GTest::GTest APPEND PROPERTY
-IMPORTED_CONFIGURATIONS DEBUG)
-set_target_properties(GTest::GTest PROPERTIES
-IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
-IMPORTED_LOCATION_DEBUG "${GTEST_LIBRARY_DEBUG}")
-endif()
 if(EXISTS "${GTEST_LIBRARY_RELEASE}")
 set_property(TARGET GTest::GTest APPEND PROPERTY
 IMPORTED_CONFIGURATIONS RELEASE)
@@ -240,6 +233,13 @@ if(GTEST_FOUND)
 IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
 IMPORTED_LOCATION_RELEASE "${GTEST_LIBRARY_RELEASE}")
 endif()
+if(EXISTS "${GTEST_LIBRARY_DEBUG}")
+set_property(TARGET GTest::GTest APPEND PROPERTY
+IMPORTED_CONFIGURATIONS DEBUG)
+set_target_properties(GTest::GTest PROPERTIES
+IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
+IMPORTED_LOCATION_DEBUG "${GTEST_LIBRARY_DEBUG}")
+endif()
   endif()
   if(NOT TARGET GTest::Main)
   add_library(GTest::Main UNKNOWN IMPORTED)
@@ -250,13 +250,6 @@ if(GTEST_FOUND)
   IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
   IMPORTED_LOCATION "${GTEST_MAIN_LIBRARY}")
   endif()
-  if(EXISTS "${GTEST_MAIN_LIBRARY_DEBUG}")
-set_property(TARGET GTest::Main APPEND PROPERTY
-IMPORTED_CONFIGURATIONS DEBUG)
-set_target_properties(GTest::Main PROPERTIES
-IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
-IMPORTED_LOCATION_DEBUG "${GTEST_MAIN_LIBRARY_DEBUG}")
-  endif()
   if(EXISTS "${GTEST_MAIN_LIBRARY_RELEASE}")
 set_property(TARGET GTest::Main APPEND PROPERTY
 IMPORTED_CONFIGURATIONS RELEASE)
@@ -264,5 +257,12 @@ if(GTEST_FOUND)
 IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
 IMPORTED_LOCATION_RELEASE "${GTEST_MAIN_LIBRARY_RELEASE}")
   endif()
+  if(EXISTS "${GTEST_MAIN_LIBRARY_DEBUG}")
+set_property(TARGET GTest::Main APPEND PROPERTY
+IMPORTED_CONFIGURATIONS DEBUG)
+set_target_properties(GTest::Main PROPERTIES
+IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
+IMPORTED_LOCATION_DEBUG "${GTEST_MAIN_LIBRARY_DEBUG}")
+  endif()
 endif()
 endif()
diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake
index 8f548cd..2bd39e8 100644
--- a/Modules/FindIce.cmake
+++

Re: [cmake-developers] patches from pkgsrc

2016-08-03 Thread Brad King 
On 08/02/2016 01:08 PM, Brad King wrote:
> I've applied the KWSys parts to its upstream:
> 
> * http://review.source.kitware.com/21403 SystemInformation: Treat BSDs more 
> uniformly
> * http://review.source.kitware.com/21404 SystemInformation: Treat Solaris the 
> same as Linux
> * http://review.source.kitware.com/21405 SystemTools: Fix FileExists for some 
> SCO OpenServer file permissions

These are now in KWSys `master`.  I've updated it in CMake:

 KWSys 2016-08-02 (3f55579d)
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e6ec47c

-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

Re: [cmake-developers] cmake -E capabilities [attempt 2]

2016-08-03 Thread Brad King 
On 08/02/2016 04:48 PM, Stephen Kelly wrote:
> The NewFactory methods in your patch don't return a new'd object, but 
> instead return static locals. The regular generators NewFactory methods 
> don't work that way, so you're introducing a pattern which is different to 
> what already exists and the commit message doesn't say why.

I've revised Tobias's commits to rename NewFactory to GetFactory and
explain some rationale in the commit message:

 Refactor extra generator registration to use factories
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a354f60c

 Report more information about extra generators in generator factories
 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd52a225

I don't think the granularity is too low for these particular changes.
The commit only looks large because it essentially updates the syntax
used to express a table of information.  Perhaps this syntax update and
the main logic updates could be separated but IMO it's good enough.

-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-commits] CMake branch, next, updated. v3.6.1-1089-g7b960cc

2016-08-03 Thread 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  7b960cc5502785e6bf4e7e0a4d166c71330bda55 (commit)
   via  cd52a225d298dc1a4924b82ebac0ac74fccf3356 (commit)
   via  a354f60ce07cd67bd60161824a4e74bf9068fea4 (commit)
  from  636110ae1f022f80fba39365240e1153b862 (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=7b960cc5502785e6bf4e7e0a4d166c71330bda55
commit 7b960cc5502785e6bf4e7e0a4d166c71330bda55
Merge: 636110a cd52a22
Author: Brad King 
AuthorDate: Wed Aug 3 09:45:03 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 3 09:45:03 2016 -0400

Merge topic 'extra-generator-factories' into next

cd52a225 Report more information about extra generators in generator 
factories
a354f60c Refactor extra generator registration to use factories


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd52a225d298dc1a4924b82ebac0ac74fccf3356
commit cd52a225d298dc1a4924b82ebac0ac74fccf3356
Author: Tobias Hunger 
AuthorDate: Thu Jul 21 13:24:11 2016 +0200
Commit: Brad King 
CommitDate: Wed Aug 3 09:44:40 2016 -0400

Report more information about extra generators in generator factories

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index fb77043..b11f4f6 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -824,6 +824,7 @@ void 
cmake::GetRegisteredGenerators(std::vector& generators)
   info.supportsToolset = (*i)->SupportsToolset();
   info.supportsPlatform = (*i)->SupportsPlatform();
   info.name = names[j];
+  info.baseName = names[j];
   info.isAlias = false;
   generators.push_back(info);
 }
@@ -840,6 +841,8 @@ void 
cmake::GetRegisteredGenerators(std::vector& generators)
   GeneratorInfo info;
   info.name = cmExternalMakefileProjectGenerator::CreateFullGeneratorName(
 (*i)->GetName(), *gen);
+  info.baseName = *gen;
+  info.extraName = (*i)->GetName();
   info.supportsPlatform = false;
   info.supportsToolset = false;
   info.isAlias = false;
@@ -849,6 +852,10 @@ void 
cmake::GetRegisteredGenerators(std::vector& generators)
  a != (*i)->Aliases.end(); ++a) {
   GeneratorInfo info;
   info.name = *a;
+  if (!genList.empty()) {
+info.baseName = genList.at(0);
+  }
+  info.extraName = (*i)->GetName();
   info.supportsPlatform = false;
   info.supportsToolset = false;
   info.isAlias = true;
diff --git a/Source/cmake.h b/Source/cmake.h
index 0fd2d31..304a15d 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -103,6 +103,8 @@ public:
   struct GeneratorInfo
   {
 std::string name;
+std::string baseName;
+std::string extraName;
 bool supportsToolset;
 bool supportsPlatform;
 bool isAlias;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a354f60ce07cd67bd60161824a4e74bf9068fea4
commit a354f60ce07cd67bd60161824a4e74bf9068fea4
Author: Tobias Hunger 
AuthorDate: Wed Jul 20 18:28:39 2016 +0200
Commit: Brad King 
CommitDate: Wed Aug 3 09:43:00 2016 -0400

Refactor extra generator registration to use factories

This will allow additional information about the availability
and capabilities of extra generators to be queried without
actually creating them.

Instead of a static NewFactory() method like the main generator
factories have, use a static GetFactory() method to get a pointer to a
statically allocated extra generator factory.  This simplifies memory
management.

diff --git a/Source/cmExternalMakefileProjectGenerator.cxx 
b/Source/cmExternalMakefileProjectGenerator.cxx
index 0e42d75..a527e50 100644
--- a/Source/cmExternalMakefileProjectGenerator.cxx
+++ b/Source/cmExternalMakefileProjectGenerator.cxx
@@ -33,28 +33,37 @@ std::string 
cmExternalMakefileProjectGenerator::CreateFullGeneratorName(
   return fullName;
 }
 
-std::string cmExternalMakefileProjectGenerator::GetGlobalGeneratorName(
-  const std::string& fullName)
+cmExternalMakefileProjectGeneratorFactory::
+  cmExternalMakefileProjectGeneratorFactory(const std::string& n,
+const std::string& doc)
+  : Name(n)
+  , Documentation(doc)
 {
-  // at least one global generator must be supported
-  assert(!this->SupportedGlobalGenerators.empty());
+}
 
-  if (fullName.empty()) {
-return "";
-  }
+cmExternalMakefileProjectGeneratorFactory::
+  ~cmExternalMakefileProjectGeneratorFactory()
+{
+}
 
-  // if we get only the short name, take the first global

[Cmake-commits] CMake branch, next, updated. v3.6.1-1086-g636110a

2016-08-03 Thread 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  636110ae1f022f80fba39365240e1153b862 (commit)
   via  41a8b8826b8977446cf5a95b77c59949674ab63a (commit)
  from  d2594605c46f3f388b9a13f9cea69ca774fa0f78 (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=636110ae1f022f80fba39365240e1153b862
commit 636110ae1f022f80fba39365240e1153b862
Merge: d259460 41a8b88
Author: Brad King 
AuthorDate: Wed Aug 3 09:42:36 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 3 09:42:36 2016 -0400

Merge topic 'extra-generator-factories' into next

41a8b882 fixup! Refactor extra generator registration to use factories


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41a8b8826b8977446cf5a95b77c59949674ab63a
commit 41a8b8826b8977446cf5a95b77c59949674ab63a
Author: Brad King 
AuthorDate: Wed Aug 3 09:41:58 2016 -0400
Commit: Brad King 
CommitDate: Wed Aug 3 09:41:58 2016 -0400

fixup! Refactor extra generator registration to use factories

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx 
b/Source/cmExtraCodeBlocksGenerator.cxx
index a846643..3a9bb9b 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -42,7 +42,7 @@ cmExtraCodeBlocksGenerator::cmExtraCodeBlocksGenerator()
 }
 
 cmExternalMakefileProjectGeneratorFactory*
-cmExtraCodeBlocksGenerator::NewFactory()
+cmExtraCodeBlocksGenerator::GetFactory()
 {
   static cmExternalMakefileProjectGeneratorSimpleFactory<
 cmExtraCodeBlocksGenerator>
diff --git a/Source/cmExtraCodeBlocksGenerator.h 
b/Source/cmExtraCodeBlocksGenerator.h
index 55e21c6..b39080c 100644
--- a/Source/cmExtraCodeBlocksGenerator.h
+++ b/Source/cmExtraCodeBlocksGenerator.h
@@ -28,7 +28,7 @@ class cmExtraCodeBlocksGenerator : public 
cmExternalMakefileProjectGenerator
 public:
   cmExtraCodeBlocksGenerator();
 
-  static cmExternalMakefileProjectGeneratorFactory* NewFactory();
+  static cmExternalMakefileProjectGeneratorFactory* GetFactory();
 
   void Generate() CM_OVERRIDE;
 
diff --git a/Source/cmExtraCodeLiteGenerator.cxx 
b/Source/cmExtraCodeLiteGenerator.cxx
index 2bb6ff4..eda6867 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -35,7 +35,7 @@ cmExtraCodeLiteGenerator::cmExtraCodeLiteGenerator()
 }
 
 cmExternalMakefileProjectGeneratorFactory*
-cmExtraCodeLiteGenerator::NewFactory()
+cmExtraCodeLiteGenerator::GetFactory()
 {
   static cmExternalMakefileProjectGeneratorSimpleFactory<
 cmExtraCodeLiteGenerator>
diff --git a/Source/cmExtraCodeLiteGenerator.h 
b/Source/cmExtraCodeLiteGenerator.h
index 9eb0fb3..e20e745 100644
--- a/Source/cmExtraCodeLiteGenerator.h
+++ b/Source/cmExtraCodeLiteGenerator.h
@@ -36,7 +36,7 @@ protected:
 public:
   cmExtraCodeLiteGenerator();
 
-  static cmExternalMakefileProjectGeneratorFactory* NewFactory();
+  static cmExternalMakefileProjectGeneratorFactory* GetFactory();
 
   void Generate() CM_OVERRIDE;
   void CreateProjectFile(const std::vector& lgs);
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index b26c4d0..8091bcf 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -55,7 +55,7 @@ cmExtraEclipseCDT4Generator::cmExtraEclipseCDT4Generator()
 }
 
 cmExternalMakefileProjectGeneratorFactory*
-cmExtraEclipseCDT4Generator::NewFactory()
+cmExtraEclipseCDT4Generator::GetFactory()
 {
   static cmExternalMakefileProjectGeneratorSimpleFactory<
 cmExtraEclipseCDT4Generator>
diff --git a/Source/cmExtraEclipseCDT4Generator.h 
b/Source/cmExtraEclipseCDT4Generator.h
index d1c4684..4b585c3 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Generator.h
@@ -35,7 +35,7 @@ public:
 
   cmExtraEclipseCDT4Generator();
 
-  static cmExternalMakefileProjectGeneratorFactory* NewFactory();
+  static cmExternalMakefileProjectGeneratorFactory* GetFactory();
 
   void EnableLanguage(std::vector const& languages, cmMakefile*,
   bool optional) CM_OVERRIDE;
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 8cc2b5e..4e72504 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -27,7 +27,7 @@ cmExtraKateGenerator::cmExtraKateGenerator()
 {
 }
 
-cmExternalMakefileProjectGeneratorFactory* cmExtraKateGenerator::NewFactory()
+cmExternalMakefileProjectGeneratorFactory* cmExtraKateGenerator::GetFactory()
 {
   static

[Cmake-commits] CMake branch, next, updated. v3.6.1-1084-gd259460

2016-08-03 Thread 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  d2594605c46f3f388b9a13f9cea69ca774fa0f78 (commit)
   via  c4f92c25d9222a8f6c6bcc112146b6784c61bb29 (commit)
  from  b9b234532cf6602938d843ae24915222af7b11ac (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=d2594605c46f3f388b9a13f9cea69ca774fa0f78
commit d2594605c46f3f388b9a13f9cea69ca774fa0f78
Merge: b9b2345 c4f92c2
Author: Brad King 
AuthorDate: Wed Aug 3 09:35:11 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 3 09:35:11 2016 -0400

Merge topic 'add-findszip' into next

c4f92c25 Revert "FindSZIP: Add a new find module to locate the SZIP 
library."


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4f92c25d9222a8f6c6bcc112146b6784c61bb29
commit c4f92c25d9222a8f6c6bcc112146b6784c61bb29
Author: Brad King 
AuthorDate: Wed Aug 3 09:34:55 2016 -0400
Commit: Brad King 
CommitDate: Wed Aug 3 09:34:55 2016 -0400

Revert "FindSZIP: Add a new find module to locate the SZIP library."

This reverts commit 412f76c6b8a713a158396f385bc0521cd3d39f7c.
It will be revised and restored.

diff --git a/Modules/FindSZIP.cmake b/Modules/FindSZIP.cmake
deleted file mode 100644
index db0a3c7..000
--- a/Modules/FindSZIP.cmake
+++ /dev/null
@@ -1,128 +0,0 @@
-#.rst:
-# FindSZIP
-# -
-#
-# Find SZIP, a compression library developed by HDF5.
-#
-# Once done this will define
-#
-# ::
-#   SZIP_FOUND - System has SZIP
-#   SZIP_INCLUDE_DIRS - The SZIP include directories to use
-#   SZIP_LIBRARIES - Link these to use SZIP
-#   SZIP_VERSION - The version of SZIP found
-# ::
-#
-# The following imported target is also created:
-#
-# ::
-# SZIP::SZIP
-# ::
-#
-# The following variable can be set to guide the search for SZIP libraries and
-# includes:
-#   SZIP_ROOT_DIR -
-# Search order preference is SZIP_ROOT_DIR followed by ENV{SZIP_INSTALL}.
-# If SZIP_ROOT_DIR is specified then it is searched exclusively, ignoring
-# default search paths.
-
-#=
-# Copyright 2006-2016 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-function(_SZIP_get_version)
-  set(scratch_dir ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/szip)
-  set(test_file ${scratch_dir}/cmake_szip_version.c)
-  file(WRITE ${test_file}
-"#include \n"
-"#include \n"
-"int main(void) {\n"
-"  char const* info_ver = \"INFO\" \":\" SZLIB_VERSION;\n"
-"  return 0;\n"
-"}")
-  try_compile(szip_version_test ${scratch_dir} ${test_file}
-CMAKE_FLAGS -DINCLUDE_DIRECTORIES=${SZIP_INCLUDE_DIR}
-COPY_FILE ${scratch_dir}/cmake_szip_version)
-  if(szip_version_test)
-file(STRINGS ${scratch_dir}/cmake_szip_version INFO_VER
-  REGEX "^INFO:([0-9]+(\\.[0-9]+(\\.[0-9]+)?)?)$")
-string(REGEX MATCH "^INFO:([0-9]+(\\.[0-9]+(\\.[0-9]+)?)?)$"
-  INFO_VER "${INFO_VER}")
-set(SZIP_VERSION ${CMAKE_MATCH_1} PARENT_SCOPE)
-  endif()
-endfunction()
-
-# If the root dir is explicitly specified, then ONLY look there
-message("SZIP_ROOT_DIR: ${SZIP_ROOT_DIR}")
-message("ENV{SZIP_INSTALL}: $ENV{SZIP_INSTALL}")
-if(SZIP_ROOT_DIR)
-  set(SZIP_SEARCH_OPTS PATHS ${SZIP_ROOT_DIR} NO_DEFAULT_PATH)
-elseif(NOT ("$ENV{SZIP_INSTALL}" STREQUAL ""))
-  message("DEBUG: ENV{SZIP_INSTALL}")
-  set(SZIP_SEARCH_OPTS HINTS ENV SZIP_INSTALL)
-endif()
-
-# Find the main header
-find_path(SZIP_INCLUDE_DIR NAMES szlib.h
-  ${SZIP_SEARCH_OPTS} PATH_SUFFIXES include include/szip Include Include/szip)
-mark_as_advanced(SZIP_INCLUDE_DIR)
-
-# Find the release library
-set(SZIP_LIBRARY_RELEASE_NAMES sz szip)
-if(WIN32)
-  list(APPEND SZIP_LIBRARY_RELEASE_NAMES libsz libszip)
-endif()
-find_library(SZIP_LIBRARY_RELEASE NAMES ${SZIP_LIBRARY_RELEASE_NAMES}
-  ${SZIP_SEARCH_OPTS} PATH_SUFFIXES lib Lib)
-
-# Find the debug library
-set(SZIP_LIBRARY_DEBUG_NAMES sz_d szip_d)
-if(WIN32)
-  list(APPEND SZIP_LIBARY_DEBUG_NAMES libsz_d libszip_d)
-endif()
-find_library(SZIP_LIBRARY_DEBUG NAMES ${SZIP_LIBRARY_DEBUG_NAMES}
-

[Cmake-commits] CMake branch, next, updated. v3.6.1-1082-gb9b2345

2016-08-03 Thread 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  b9b234532cf6602938d843ae24915222af7b11ac (commit)
   via  382c4fca6b895c2c7a68445918a8fd73a15e1f91 (commit)
   via  c2bc47f2662ec7e80469bee634c2444ee3d28bcc (commit)
   via  aabf8772fd3a2dde07d48d41658db728755e3041 (commit)
   via  a85e2a89de3d394d084703b29cd7e0ef3bf8f570 (commit)
   via  ec807f6edf7ddd49fc82638f176ac58d6eab6b80 (commit)
   via  ef729c5bc2591542eacbe2aaf46bde9b4ae6d2ed (commit)
   via  f8792c12b9e57dafcee2306e12dec268f9e147f2 (commit)
   via  7b65e49529bbc384b2f241685d647f26ac041d5b (commit)
   via  8ba870bad6210ae2c053ae4f7c19bcb9d8312eab (commit)
   via  573397bb540a1b1bbe991602d58835bb1a9f61e1 (commit)
   via  4b0e1dc0a4ae5f4fdb680e1ec27cd1f392d64ffb (commit)
   via  16e449cc7221cbf77a2bac02a91d986703fe6483 (commit)
   via  a382c3013c7b98a95c6d4ceb833721093a5c9ff3 (commit)
   via  33fe4751e8ccc1ad5342cb16a192cb3a69479845 (commit)
  from  22a76e3b9116497edf0585ede878f7ce28cba690 (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=b9b234532cf6602938d843ae24915222af7b11ac
commit b9b234532cf6602938d843ae24915222af7b11ac
Merge: 22a76e3 382c4fc
Author: Brad King 
AuthorDate: Wed Aug 3 09:26:19 2016 -0400
Commit: Brad King 
CommitDate: Wed Aug 3 09:26:19 2016 -0400

Merge branch 'master' into next


---

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


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.6.1-539-g382c4fc

2016-08-03 Thread 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, master has been updated
   via  382c4fca6b895c2c7a68445918a8fd73a15e1f91 (commit)
   via  e34e9c2705c9e0bb568f5f69a655a9d425ef8adb (commit)
   via  9a1b6c6037869edba1c44dcfa06da8201653ce1b (commit)
   via  31b6cf41c5a4e17ea97e0c94f0e81b9a18ce96b8 (commit)
  from  c2bc47f2662ec7e80469bee634c2444ee3d28bcc (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=382c4fca6b895c2c7a68445918a8fd73a15e1f91
commit 382c4fca6b895c2c7a68445918a8fd73a15e1f91
Merge: c2bc47f e34e9c2
Author: Brad King 
AuthorDate: Wed Aug 3 09:20:59 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 3 09:20:59 2016 -0400

Merge topic 'ccmake-vim-navigation'

e34e9c27 ccmake: Add VIM-like bindings for navigation
9a1b6c60 ccmake: Revise documentation for [d]
31b6cf41 ccmake: Fix typo in help (it's -> its)


---

Summary of changes:
 Help/release/dev/ccmake-vim-navigation.rst   |4 
 Source/CursesDialog/cmCursesBoolWidget.cxx   |3 ++-
 Source/CursesDialog/cmCursesMainForm.cxx |   24 ++--
 Source/CursesDialog/cmCursesStringWidget.cxx |   14 ++
 4 files changed, 30 insertions(+), 15 deletions(-)
 create mode 100644 Help/release/dev/ccmake-vim-navigation.rst


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.6.1-533-gaabf877

2016-08-03 Thread 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, master has been updated
   via  aabf8772fd3a2dde07d48d41658db728755e3041 (commit)
   via  85e0314201005c923420eb650a9629e38356b77a (commit)
  from  a85e2a89de3d394d084703b29cd7e0ef3bf8f570 (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=aabf8772fd3a2dde07d48d41658db728755e3041
commit aabf8772fd3a2dde07d48d41658db728755e3041
Merge: a85e2a8 85e0314
Author: Brad King 
AuthorDate: Wed Aug 3 09:20:54 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 3 09:20:54 2016 -0400

Merge topic 'gcc-fvisibility-version'

85e03142 GNU: Use -fvisibility on GCC 4.0 and 4.1 too


---

Summary of changes:
 Modules/Compiler/GNU.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.6.1-535-gc2bc47f

2016-08-03 Thread 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, master has been updated
   via  c2bc47f2662ec7e80469bee634c2444ee3d28bcc (commit)
   via  9970cdcb59e5d02da68c195799146f9bc91816e7 (commit)
  from  aabf8772fd3a2dde07d48d41658db728755e3041 (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=c2bc47f2662ec7e80469bee634c2444ee3d28bcc
commit c2bc47f2662ec7e80469bee634c2444ee3d28bcc
Merge: aabf877 9970cdc
Author: Brad King 
AuthorDate: Wed Aug 3 09:20:56 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 3 09:20:56 2016 -0400

Merge topic 'CMakeFindFrameworks-custom-locations'

9970cdcb CMakeFindFrameworks: Allow custom framework locations


---

Summary of changes:
 Modules/CMakeFindFrameworks.cmake |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.6.1-524-gf8792c1

2016-08-03 Thread 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, master has been updated
   via  f8792c12b9e57dafcee2306e12dec268f9e147f2 (commit)
   via  35995fa6b5872b58f086d16b16ca90d7d259d9b0 (commit)
   via  6bc3073e23af70bde3e8a7659aa51a784deeec9c (commit)
  from  7b65e49529bbc384b2f241685d647f26ac041d5b (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=f8792c12b9e57dafcee2306e12dec268f9e147f2
commit f8792c12b9e57dafcee2306e12dec268f9e147f2
Merge: 7b65e49 35995fa
Author: Brad King 
AuthorDate: Wed Aug 3 09:20:41 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 3 09:20:41 2016 -0400

Merge topic 'update-kwsys'

35995fa6 Merge branch 'upstream-KWSys' into update-kwsys
6bc3073e KWSys 2016-08-01 (560bcdbb)


---

Summary of changes:
 Source/kwsys/Directory.cxx  |   31 +--
 Source/kwsys/SystemTools.cxx|9 +++--
 Source/kwsys/SystemTools.hxx.in |1 +
 3 files changed, 29 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.6.1-526-gef729c5

2016-08-03 Thread 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, master has been updated
   via  ef729c5bc2591542eacbe2aaf46bde9b4ae6d2ed (commit)
   via  52aecc0c382384d5bea3c18d7894e80bc573d8d7 (commit)
  from  f8792c12b9e57dafcee2306e12dec268f9e147f2 (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=ef729c5bc2591542eacbe2aaf46bde9b4ae6d2ed
commit ef729c5bc2591542eacbe2aaf46bde9b4ae6d2ed
Merge: f8792c1 52aecc0
Author: Brad King 
AuthorDate: Wed Aug 3 09:20:44 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 3 09:20:44 2016 -0400

Merge topic 'ExternalProject-no-DS_Store'

52aecc0c ExternalProject: Ignore macOS .DS_Store files in tarball extraction


---

Summary of changes:
 Modules/ExternalProject.cmake |1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.6.1-531-ga85e2a8

2016-08-03 Thread 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, master has been updated
   via  a85e2a89de3d394d084703b29cd7e0ef3bf8f570 (commit)
   via  5790d9b6f5ae0b5bb8b0f2e4ec630a690b4b0301 (commit)
  from  ec807f6edf7ddd49fc82638f176ac58d6eab6b80 (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=a85e2a89de3d394d084703b29cd7e0ef3bf8f570
commit a85e2a89de3d394d084703b29cd7e0ef3bf8f570
Merge: ec807f6 5790d9b
Author: Brad King 
AuthorDate: Wed Aug 3 09:20:50 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 3 09:20:50 2016 -0400

Merge topic 'FindProtobuf-restore-PROTOBUF_IMPORT_DIRS'

5790d9b6 FindProtobuf: Restore support for PROTOBUF_IMPORT_DIRS


---

Summary of changes:
 Modules/FindProtobuf.cmake |8 
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.6.1-519-g8ba870b

2016-08-03 Thread 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, master has been updated
   via  8ba870bad6210ae2c053ae4f7c19bcb9d8312eab (commit)
   via  f4e979b126e41384b14f0d5ff8b41d81b6f41a00 (commit)
  from  573397bb540a1b1bbe991602d58835bb1a9f61e1 (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=8ba870bad6210ae2c053ae4f7c19bcb9d8312eab
commit 8ba870bad6210ae2c053ae4f7c19bcb9d8312eab
Merge: 573397b f4e979b
Author: Brad King 
AuthorDate: Wed Aug 3 09:20:35 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 3 09:20:35 2016 -0400

Merge topic 'FindCUDA-no-windows-librt'

f4e979b1 FindCUDA: Do not look for librt on Windows


---

Summary of changes:
 Modules/FindCUDA.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.6.1-521-g7b65e49

2016-08-03 Thread 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, master has been updated
   via  7b65e49529bbc384b2f241685d647f26ac041d5b (commit)
   via  e29bfbf272dbf4ea5f6a89084ec1f503fcf0e4f7 (commit)
  from  8ba870bad6210ae2c053ae4f7c19bcb9d8312eab (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=7b65e49529bbc384b2f241685d647f26ac041d5b
commit 7b65e49529bbc384b2f241685d647f26ac041d5b
Merge: 8ba870b e29bfbf
Author: Brad King 
AuthorDate: Wed Aug 3 09:20:38 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 3 09:20:38 2016 -0400

Merge topic 'wix-root-description'

e29bfbf2 CPackWIX: Support custom title and description for the root feature


---

Summary of changes:
 Help/release/dev/wix-root-description.rst |7 +++
 Modules/CPackWIX.cmake|   11 +++
 Source/CPack/WiX/cmCPackWIXGenerator.cxx  |9 -
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/wix-root-description.rst


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.6.1-517-g573397b

2016-08-03 Thread 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, master has been updated
   via  573397bb540a1b1bbe991602d58835bb1a9f61e1 (commit)
   via  15a6ae5cb7d2d7b67ef5704acd01b6f6765fd5d9 (commit)
  from  4b0e1dc0a4ae5f4fdb680e1ec27cd1f392d64ffb (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=573397bb540a1b1bbe991602d58835bb1a9f61e1
commit 573397bb540a1b1bbe991602d58835bb1a9f61e1
Merge: 4b0e1dc 15a6ae5
Author: Brad King 
AuthorDate: Wed Aug 3 09:20:32 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 3 09:20:32 2016 -0400

Merge topic 'FindCUDA-arch'

15a6ae5c FindCUDA: Add search path for nvcc on Arch


---

Summary of changes:
 Modules/FindCUDA.cmake |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.6.1-515-g4b0e1dc

2016-08-03 Thread 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, master has been updated
   via  4b0e1dc0a4ae5f4fdb680e1ec27cd1f392d64ffb (commit)
   via  7d7446c905623420482dda9eb6e10e0f604f6fd9 (commit)
  from  16e449cc7221cbf77a2bac02a91d986703fe6483 (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=4b0e1dc0a4ae5f4fdb680e1ec27cd1f392d64ffb
commit 4b0e1dc0a4ae5f4fdb680e1ec27cd1f392d64ffb
Merge: 16e449c 7d7446c
Author: Brad King 
AuthorDate: Wed Aug 3 09:20:29 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 3 09:20:29 2016 -0400

Merge topic 'doc-without-continue'

7d7446c9 Utilities/Sphinx: Remove use of continue() method


---

Summary of changes:
 Utilities/Sphinx/CMakeLists.txt |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.6.1-509-ga382c30

2016-08-03 Thread 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, master has been updated
   via  a382c3013c7b98a95c6d4ceb833721093a5c9ff3 (commit)
   via  8eb0b56c2ace0f005cba436268337f509e06033f (commit)
  from  33fe4751e8ccc1ad5342cb16a192cb3a69479845 (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=a382c3013c7b98a95c6d4ceb833721093a5c9ff3
commit a382c3013c7b98a95c6d4ceb833721093a5c9ff3
Merge: 33fe475 8eb0b56
Author: Brad King 
AuthorDate: Wed Aug 3 09:20:19 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 3 09:20:19 2016 -0400

Merge topic 'fix-findhdf5-definitions'

8eb0b56c FindHDF5: Make sure compile definition vars keep the -D flag


---

Summary of changes:
 Modules/FindHDF5.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.6.1-513-g16e449c

2016-08-03 Thread 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, master has been updated
   via  16e449cc7221cbf77a2bac02a91d986703fe6483 (commit)
   via  088f14eb725650158d256c28e86e44da3989ad9c (commit)
   via  27a3ca15e5e92abbdf9228a5ac83c190a5caf0a8 (commit)
   via  cc223e1eed69775a323a59628ad93fc79390c2f2 (commit)
  from  a382c3013c7b98a95c6d4ceb833721093a5c9ff3 (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=16e449cc7221cbf77a2bac02a91d986703fe6483
commit 16e449cc7221cbf77a2bac02a91d986703fe6483
Merge: a382c30 088f14e
Author: Brad King 
AuthorDate: Wed Aug 3 09:20:25 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 3 09:20:25 2016 -0400

Merge topic 'intel-gnu11-support'

088f14eb Intel-C: standard flags are also supported in 12.0
27a3ca15 Intel-C: support gnu89 and gnu99 extension flags
cc223e1e Intel-C: declare support for gnu11


---

Summary of changes:
 Modules/Compiler/Intel-C.cmake |8 
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

Re: [cmake-developers] [PATCH] Use full path for all source files in ninja build.

2016-08-03 Thread Brad King 
On 08/02/2016 04:42 PM, Chaoren Lin wrote:
> Our IDE uses "cmake --build /path/to/build" to invoke the build,
> so that we only have to deal with CMake and not the underlying build system.

If you know /path/to/build why not just interpret relative paths with
respect to it as a heuristic?  If the paths exist then use them.

> Maybe I can try to fix ninja to resolve paths before sending them to the 
> compiler.

The ninja build tool itself does not have enough information to make
such a transformation.  CMake does though.  See below.

> Or maybe just add a flag to ConvertToNinjaPath or something. 

ConvertToNinjaPath is called from several places that don't all know
whether the file they are passing is a source file for compilation
or not.

Another approach is to use ConvertToNinjaPath for all the build.ninja
inputs and outputs on build statements but use something other than $in
for the source file on the compilation rule.  Using an "IN_ABS = ..."
variable could achieve this.

-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

Re: [cmake-developers] [PATCH] Let CMake know that clang uses the GCC toolchain.

2016-08-03 Thread Brad King 
On 08/02/2016 06:59 PM, Chaoren Lin wrote:
>> In the gcc-like variant the CMAKE_{C,CXX}_SIMULATE_ID
>> should be detected as GNU and cause the existing code to work.
> 
> Huh, it doesn't look like that variable is set automatically when using
> clang with the gcc toolchain. Is that supposed to happen?
> It should be set manually (say, in a toolchain file)?

It is supposed to be detected automatically.  Whenever Clang is detected
on Windows the _SIMULATE_ID should be detected too.  I found the problem.
The simulate id detection is done here:

  
https://gitlab.kitware.com/cmake/cmake/blob/v3.6.1/Modules/Compiler/Clang-DetermineCompilerInternal.cmake#L12-15

and it only looks for MSVC.  Grepping for SIMULATE_ID reveals that it is
used for Intel and Clang but only ever detects when MSVC is simulated.
All consuming code paths are interested in whether SIMULATE_ID==MSVC
and otherwise assume GNU, except cmGlobalNinjaGenerator::EnableLanguage.

It will take some investigation to decide how/whether to set SIMULATE_ID
to GNU.  Alternatively the corresponding test in the Ninja generator could
be changed to look for `COMPILER_ID == Clang && SIMULATE_ID != MSVC`.

-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] target_link_libraries and flags issue with Visual Studio

2016-08-03 Thread Louis-Paul CORDIER 
On the target_link_libraries() command documentation page, it is written 
that it is possible to pass flags to this function, if they start with a 
'-' character.
This functionnality seems to be broken with Visual Studio. Indeed flags 
in the Visual Studio linker are using slashes instead of dash.


For instance, trying to enable map file generation in the linkers is 
failing:


target_link_libraries(${PROJECT_NAME} -MAP)

Resulting output in the linker command line is "-MAP" (note the presence 
of quotes). It should be /MAP (without quotes) in order to be properly 
recognized by the linker command-line parser. After few researches, it 
seems that this issue is 
similar:http://public.kitware.com/pipermail/cmake/2015-June/060989.html 



Context:

I have a library called lib_project. I have an executable my_project 
that links against lib_project. When linking the final binary, I need to 
enable UAC support in order to force execution of the binary as 
administrator 
(http://stackoverflow.com/questions/1655089/cmake-requireadministrator). 
lib_project uses a Windows API that needs administrator level set in the 
final executable. So I would like to force my_project to set this 
specific flag, but I would like to see this set in the CmakeLists.txt of 
lib_project. Regarding the documentation, the following command should 
do the trick (but not working currently):


target_link_libraries(lib_project PUBLIC -level='requireAdministrator' 
-uiAccess='false')


Please not that the -level can bring bugs as it could be interpreted by 
Cmake as "link against 'evel' library".


Do I have pointed a new bug in the Visual Studio generator? Would a 
target_link_flags() command be a good idea to implement?


Best regards,

L-P

-- 

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

[CMake] Boost 2 & CMake news

2016-08-03 Thread Nagy-Egri Máté Ferenc via CMake 
Does anyone know of the happening around Boost 2 and its possible adoption of 
CMake? I know Boost and CMake have a very long and very sad history, but I 
recall someone reporting on this list that he/she will attend a Boost 2 related 
conference and will again promote the benefits of CMake as opposed to the 
 Boost Build. What is the status of 
the initiative?
-- 

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