[Cmake-commits] CMake branch, master, updated. v3.7.0-rc2-321-gc1a5205

[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  c1a520513d4c7504fc9e9e4d9e56acc24569f490 (commit)
  from  f660832999e086f02a9f3552c028aed900cd7249 (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=c1a520513d4c7504fc9e9e4d9e56acc24569f490
commit c1a520513d4c7504fc9e9e4d9e56acc24569f490
Author: Kitware Robot 
AuthorDate: Tue Oct 25 00:01:04 2016 -0400
Commit: Kitware Robot 
CommitDate: Tue Oct 25 00:01:04 2016 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index a2acd97..c656fba 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 7)
-set(CMake_VERSION_PATCH 20161024)
+set(CMake_VERSION_PATCH 20161025)
 #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

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-727-g1529102

[Daniel Pfeifer]

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  1529102dab129c3d2e1010f1e37544fd4a698f5d (commit)
   via  c15dc1972839e175afaa9011f74376dadf08277f (commit)
  from  2b3a600e8570df998247ed89da75522cb97e8563 (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=1529102dab129c3d2e1010f1e37544fd4a698f5d
commit 1529102dab129c3d2e1010f1e37544fd4a698f5d
Merge: 2b3a600 c15dc19
Author: Daniel Pfeifer 
AuthorDate: Mon Oct 24 16:36:31 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 16:36:31 2016 -0400

Merge topic 'cm_unordered_set' into next

c15dc197 Introduce CM_UNORDERED_SET


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c15dc1972839e175afaa9011f74376dadf08277f
commit c15dc1972839e175afaa9011f74376dadf08277f
Author: Daniel Pfeifer 
AuthorDate: Mon Oct 24 22:33:18 2016 +0200
Commit: Daniel Pfeifer 
CommitDate: Mon Oct 24 22:34:52 2016 +0200

Introduce CM_UNORDERED_SET

Avoid duplicating switch among std::unordered_set, cmsys::hash_set, and
std::set.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 8ac302a..ca056c0 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -21,6 +21,7 @@
 #include "cmTargetLinkLibraryType.h"
 #include "cmTargetPropertyComputer.h"
 #include "cm_auto_ptr.hxx"
+#include "cm_unordered_set.hxx"
 #include "cmake.h"
 
 #include 
@@ -34,16 +35,6 @@
 #include 
 #include 
 
-#if defined(CMake_HAVE_CXX_UNORDERED_SET)
-#include 
-#define UNORDERED_SET std::unordered_set
-#elif defined(CMAKE_BUILD_WITH_CMAKE)
-#include 
-#define UNORDERED_SET cmsys::hash_set
-#else
-#define UNORDERED_SET std::set
-#endif
-
 template <>
 const char* cmTargetPropertyComputer::GetSources(
   cmGeneratorTarget const* tgt, cmMessenger* /* messenger */,
@@ -926,7 +917,7 @@ static void AddInterfaceEntries(
 static bool processSources(
   cmGeneratorTarget const* tgt,
   const std::vector& entries,
-  std::vector& srcs, UNORDERED_SET& uniqueSrcs,
+  std::vector& srcs, CM_UNORDERED_SET& uniqueSrcs,
   cmGeneratorExpressionDAGChecker* dagChecker, std::string const& config,
   bool debugSources)
 {
@@ -1053,7 +1044,7 @@ void 
cmGeneratorTarget::GetSourceFiles(std::vector& files,
   cmGeneratorExpressionDAGChecker dagChecker(this->GetName(), "SOURCES",
  CM_NULLPTR, CM_NULLPTR);
 
-  UNORDERED_SET uniqueSrcs;
+  CM_UNORDERED_SET uniqueSrcs;
   bool contextDependentDirectSources =
 processSources(this, this->SourceEntries, files, uniqueSrcs, &dagChecker,
config, debugSources);
@@ -1592,7 +1583,7 @@ class cmTargetCollectLinkLanguages
 public:
   cmTargetCollectLinkLanguages(cmGeneratorTarget const* target,
const std::string& config,
-   UNORDERED_SET& languages,
+   CM_UNORDERED_SET& languages,
cmGeneratorTarget const* head)
 : Config(config)
 , Languages(languages)
@@ -1659,7 +1650,7 @@ public:
 
 private:
   std::string Config;
-  UNORDERED_SET& Languages;
+  CM_UNORDERED_SET& Languages;
   cmGeneratorTarget const* HeadTarget;
   const cmGeneratorTarget* Target;
   std::set Visited;
@@ -1731,7 +1722,7 @@ void cmGeneratorTarget::ComputeLinkClosure(const 
std::string& config,
LinkClosure& lc) const
 {
   // Get languages built in this target.
-  UNORDERED_SET languages;
+  CM_UNORDERED_SET languages;
   cmLinkImplementation const* impl = this->GetLinkImplementation(config);
   assert(impl);
   for (std::vector::const_iterator li = impl->Languages.begin();
@@ -1748,7 +1739,7 @@ void cmGeneratorTarget::ComputeLinkClosure(const 
std::string& config,
   }
 
   // Store the transitive closure of languages.
-  for (UNORDERED_SET::const_iterator li = languages.begin();
+  for (CM_UNORDERED_SET::const_iterator li = languages.begin();
li != languages.end(); ++li) {
 lc.Languages.push_back(*li);
   }
@@ -1769,7 +1760,7 @@ void cmGeneratorTarget::ComputeLinkClosure(const 
std::string& config,
 }
 
 // Now consider languages that propagate from linked targets.
-for (UNORDERED_SET::const_iterator sit = languages.begin();
+for (CM_UNORDERED_SET::const_iterator sit = languages.begin();
  sit != languages.end(); ++sit) {
   std::string propagates =
 "CMAKE_" + *sit + "_LINKER_PREFERENCE_PROPAGATES";
@@ -2338,7 +2329,7 @@ static void processIncludeDirectories(
   cmGeneratorTarget const* tgt,
   const std::vector& entries,
   std::vector& includ

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-725-g2b3a600

[Daniel Pfeifer]

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  2b3a600e8570df998247ed89da75522cb97e8563 (commit)
   via  15aa814b85a90fb8e8798eb99617d27957c28f36 (commit)
  from  08714bc5fcc28cc8e66faa6bd6f06c9a1c1b7cc2 (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=2b3a600e8570df998247ed89da75522cb97e8563
commit 2b3a600e8570df998247ed89da75522cb97e8563
Merge: 08714bc 15aa814
Author: Daniel Pfeifer 
AuthorDate: Mon Oct 24 15:50:58 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 15:50:58 2016 -0400

Merge topic 'remove-cmobject' into next

15aa814b Remove cmObject.h and cmTypeMacro.h


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15aa814b85a90fb8e8798eb99617d27957c28f36
commit 15aa814b85a90fb8e8798eb99617d27957c28f36
Author: Daniel Pfeifer 
AuthorDate: Sun Oct 23 01:19:00 2016 +0200
Commit: Daniel Pfeifer 
CommitDate: Mon Oct 24 21:49:28 2016 +0200

Remove cmObject.h and cmTypeMacro.h

diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.h 
b/Source/CPack/IFW/cmCPackIFWGenerator.h
index 88a3741..d656063 100644
--- a/Source/CPack/IFW/cmCPackIFWGenerator.h
+++ b/Source/CPack/IFW/cmCPackIFWGenerator.h
@@ -10,7 +10,6 @@
 #include "cmCPackIFWInstaller.h"
 #include "cmCPackIFWPackage.h"
 #include "cmCPackIFWRepository.h"
-#include "cmTypeMacro.h"
 
 #include 
 #include 
diff --git a/Source/CPack/cmCPack7zGenerator.h 
b/Source/CPack/cmCPack7zGenerator.h
index 063b032..a617d9b 100644
--- a/Source/CPack/cmCPack7zGenerator.h
+++ b/Source/CPack/cmCPack7zGenerator.h
@@ -7,7 +7,6 @@
 
 #include "cmCPackArchiveGenerator.h"
 #include "cmCPackGenerator.h"
-#include "cmTypeMacro.h"
 
 /** \class cmCPack7zGenerator
  * \brief A generator for 7z files
diff --git a/Source/CPack/cmCPackArchiveGenerator.h 
b/Source/CPack/cmCPackArchiveGenerator.h
index 7010664..df02ae8 100644
--- a/Source/CPack/cmCPackArchiveGenerator.h
+++ b/Source/CPack/cmCPackArchiveGenerator.h
@@ -7,7 +7,6 @@
 
 #include "cmArchiveWrite.h"
 #include "cmCPackGenerator.h"
-#include "cmTypeMacro.h"
 
 #include 
 #include 
diff --git a/Source/CPack/cmCPackDebGenerator.h 
b/Source/CPack/cmCPackDebGenerator.h
index f46ae5a..7db933e 100644
--- a/Source/CPack/cmCPackDebGenerator.h
+++ b/Source/CPack/cmCPackDebGenerator.h
@@ -6,7 +6,6 @@
 #include 
 
 #include "cmCPackGenerator.h"
-#include "cmTypeMacro.h"
 
 #include 
 #include 
diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h
index a7652b1..f32dd70 100644
--- a/Source/CPack/cmCPackGenerator.h
+++ b/Source/CPack/cmCPackGenerator.h
@@ -6,9 +6,7 @@
 #include 
 
 #include "cmCPackComponentGroup.h"
-#include "cmObject.h"
 #include "cmSystemTools.h"
-#include "cmTypeMacro.h"
 
 #include 
 #include 
diff --git a/Source/CPack/cmCPackGeneratorFactory.h 
b/Source/CPack/cmCPackGeneratorFactory.h
index 5381eb2..0a98f91 100644
--- a/Source/CPack/cmCPackGeneratorFactory.h
+++ b/Source/CPack/cmCPackGeneratorFactory.h
@@ -5,9 +5,6 @@
 
 #include 
 
-#include "cmObject.h"
-#include "cmTypeMacro.h"
-
 #include 
 #include 
 #include 
diff --git a/Source/CPack/cmCPackLog.h b/Source/CPack/cmCPackLog.h
index 2ac805d..9ffe5c4 100644
--- a/Source/CPack/cmCPackLog.h
+++ b/Source/CPack/cmCPackLog.h
@@ -5,9 +5,6 @@
 
 #include 
 
-#include "cmObject.h"
-#include "cmTypeMacro.h"
-
 #include 
 #include 
 #include 
diff --git a/Source/CPack/cmCPackNSISGenerator.h 
b/Source/CPack/cmCPackNSISGenerator.h
index d61341c..b4bf2d4 100644
--- a/Source/CPack/cmCPackNSISGenerator.h
+++ b/Source/CPack/cmCPackNSISGenerator.h
@@ -6,7 +6,6 @@
 #include 
 
 #include "cmCPackGenerator.h"
-#include "cmTypeMacro.h"
 
 #include 
 #include 
diff --git a/Source/CPack/cmCPackPKGGenerator.h 
b/Source/CPack/cmCPackPKGGenerator.h
index 5569185..bb3c1a7 100644
--- a/Source/CPack/cmCPackPKGGenerator.h
+++ b/Source/CPack/cmCPackPKGGenerator.h
@@ -3,6 +3,9 @@
 #ifndef cmCPackPKGGenerator_h
 #define cmCPackPKGGenerator_h
 
+#include 
+#include 
+
 #include "cmCPackGenerator.h"
 
 class cmCPackComponent;
diff --git a/Source/CPack/cmCPackRPMGenerator.h 
b/Source/CPack/cmCPackRPMGenerator.h
index f8bcbfe..4d48bd8 100644
--- a/Source/CPack/cmCPackRPMGenerator.h
+++ b/Source/CPack/cmCPackRPMGenerator.h
@@ -6,7 +6,6 @@
 #include 
 
 #include "cmCPackGenerator.h"
-#include "cmTypeMacro.h"
 
 #include 
 
diff --git a/Source/CPack/cmCPackSTGZGenerator.h 
b/Source/CPack/cmCPackSTGZGenerator.h
index a1bee5f..4b9c1c6 100644
--- a/Source/CPack/cmCPackSTGZGenerator.h
+++ b/Source/CPack/cmCPackSTGZGenerator.h
@@ -7,7 +7,6 @@
 
 #include "cmCPackGenerator.h"
 #include "cmCPackTGZGenerator.h"
-#include "cmTypeMacro.h"
 

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-723-g08714bc

[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  08714bc5fcc28cc8e66faa6bd6f06c9a1c1b7cc2 (commit)
   via  9b8dc79cc84d12c1e661ca3cd77b773b463508d7 (commit)
  from  818f49597debd3636bbb96e6aecc4c4f648c0320 (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=08714bc5fcc28cc8e66faa6bd6f06c9a1c1b7cc2
commit 08714bc5fcc28cc8e66faa6bd6f06c9a1c1b7cc2
Merge: 818f495 9b8dc79
Author: Brad King 
AuthorDate: Mon Oct 24 14:37:22 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 14:37:22 2016 -0400

Merge topic 'cmake-server-message-quoting' into next

9b8dc79c cmake-server: Change message wrapper to avoid ambiguity with 
content


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b8dc79cc84d12c1e661ca3cd77b773b463508d7
commit 9b8dc79cc84d12c1e661ca3cd77b773b463508d7
Author: Brad King 
AuthorDate: Mon Oct 24 10:44:44 2016 -0400
Commit: Brad King 
CommitDate: Mon Oct 24 14:36:13 2016 -0400

cmake-server: Change message wrapper to avoid ambiguity with content

Change our message wrapper from

[== CMake Server ==[ ... ]== CMake Server ==]

to

[== "CMake Server" ==[ ... ]== "CMake Server" ==]

to guarantee that no JSON content can ever contain the ending string
(because it would be encoded as `]== \"CMake Server\" ==]`).

diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst
index 5eec009..a72af14 100644
--- a/Help/manual/cmake-server.7.rst
+++ b/Help/manual/cmake-server.7.rst
@@ -57,17 +57,17 @@ or using a named pipe (with the ``--pipe `` 
parameter).
 When connecting to the server (via named pipe or by starting it in ``--debug``
 mode), the server will reply with a hello message::
 
-  [== CMake Server ==[
+  [== "CMake Server" ==[
   {"supportedProtocolVersions":[{"major":1,"minor":0}],"type":"hello"}
-  ]== CMake Server ==]
+  ]== "CMake Server" ==]
 
 Messages sent to and from the process are wrapped in magic strings::
 
-  [== CMake Server ==[
+  [== "CMake Server" ==[
   {
 ... some JSON message ...
   }
-  ]== CMake Server ==]
+  ]== "CMake Server" ==]
 
 The server is now ready to accept further requests via the named pipe
 or stdin.
@@ -87,7 +87,7 @@ the response into the given filename.
 
 This is a response from the cmake server with "showStats" set to true::
 
-  [== CMake Server ==[
+  [== "CMake Server" ==[
   {
 "cookie":"",
 "errorMessage":"Waiting for type \"handshake\".",
@@ -100,7 +100,7 @@ This is a response from the cmake server with "showStats" 
set to true::
   "totalTime":0.025995
 }
   }
-  ]== CMake Server ==]
+  ]== "CMake Server" ==]
 
 The server has made a copy of this response into the file /tmp/error.txt and
 took 0.011 seconds to turn the JSON response into a string, and it took 0.025
@@ -137,9 +137,9 @@ contain values.
 
 Example::
 
-  [== CMake Server ==[
+  [== "CMake Server" ==[
   {"cookie":"zimtstern","inReplyTo":"handshake","type":"reply"}
-  ]== CMake Server ==]
+  ]== "CMake Server" ==]
 
 
 Type "error"
@@ -150,9 +150,9 @@ contain an "errorMessage".
 
 Example::
 
-  [== CMake Server ==[
+  [== "CMake Server" ==[
   {"cookie":"","errorMessage":"Protocol version not 
supported.","inReplyTo":"handshake","type":"error"}
-  ]== CMake Server ==]
+  ]== "CMake Server" ==]
 
 
 Type "progress"
@@ -181,9 +181,9 @@ box title.
 
 Example::
 
-  [== CMake Server ==[
+  [== "CMake Server" ==[
   {"cookie":"","message":"Something happened.","title":"Title 
Text","inReplyTo":"handshake","type":"message"}
-  ]== CMake Server ==]
+  ]== "CMake Server" ==]
 
 
 Type "signal"
@@ -208,13 +208,13 @@ an influence on the build system is changed.
 
 The "dirty" signal may look like this::
 
-  [== CMake Server ==[
+  [== "CMake Server" ==[
   {
 "cookie":"",
 "inReplyTo":"",
 "name":"dirty",
 "type":"signal"}
-  ]== CMake Server ==]
+  ]== "CMake Server" ==]
 
 
 "fileChange" Signal
@@ -226,7 +226,7 @@ that was detected. Possible changes are "change" and 
"rename".
 
 The "fileChange" signal looks like this::
 
-  [== CMake Server ==[
+  [== "CMake Server" ==[
   {
 "cookie":"",
 "inReplyTo":"",
@@ -234,7 +234,7 @@ The "fileChange" signal looks like this::
 "path":"/absolute/CMakeLists.txt",
 "properties":["change"],
 "type":"signal"}
-  ]== CMake Server ==]
+  ]== "CMake Server" ==]
 
 
 Specific Message Types
@@ -256,9 +256,9 @@ these requires a special command line argument when 
starting the cmake server mo
 
 Example::
 
-  [== CMake Server ==[
+  [== "CMake Server" ==[
   {"supportedProtocolVersions":[{"major":0,"minor

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-721-g818f495

[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  818f49597debd3636bbb96e6aecc4c4f648c0320 (commit)
   via  881585f9757972473519d5394ea04a7d962ac70e (commit)
  from  ccf17096071718ea9d7ed75d37fd1e7c8fdad196 (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=818f49597debd3636bbb96e6aecc4c4f648c0320
commit 818f49597debd3636bbb96e6aecc4c4f648c0320
Merge: ccf1709 881585f
Author: Brad King 
AuthorDate: Mon Oct 24 14:30:13 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 14:30:13 2016 -0400

Merge topic 'intel-compile-features-windows' into next

881585f9 Intel: Fix compiler extension flags on Windows


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=881585f9757972473519d5394ea04a7d962ac70e
commit 881585f9757972473519d5394ea04a7d962ac70e
Author: Brad King 
AuthorDate: Mon Oct 24 14:16:22 2016 -0400
Commit: Brad King 
CommitDate: Mon Oct 24 14:29:40 2016 -0400

Intel: Fix compiler extension flags on Windows

The extension flags enabled by commit v3.6.0-rc1~120^2~1 (Features:
Record standard flags for Intel C/C++ on Windows, 2016-04-18) of the
form `-Qstd=gnu++11` are not supported by the Intel C/C++ Compiler for
Windows.  Fall back to using the non-extension form of the flags.

Issue: #16384

diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index 1d09bd5..61adf40 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -9,20 +9,22 @@ set(CMAKE_DEPFILE_FLAGS_C "-MD -MT  -MF ")
 
 if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC")
   set(_std -Qstd)
+  set(_ext c)
 else()
   set(_std -std)
+  set(_ext gnu)
 endif()
 
 if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
   set(CMAKE_C11_STANDARD_COMPILE_OPTION "${_std}=c11")
-  set(CMAKE_C11_EXTENSION_COMPILE_OPTION "${_std}=gnu11")
+  set(CMAKE_C11_EXTENSION_COMPILE_OPTION "${_std}=${_ext}11")
 endif()
 
 if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0)
   set(CMAKE_C90_STANDARD_COMPILE_OPTION "${_std}=c89")
-  set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=gnu89")
+  set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=${_ext}89")
   set(CMAKE_C99_STANDARD_COMPILE_OPTION "${_std}=c99")
-  set(CMAKE_C99_EXTENSION_COMPILE_OPTION "${_std}=gnu99")
+  set(CMAKE_C99_EXTENSION_COMPILE_OPTION "${_std}=${_ext}99")
 endif()
 
 if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1)
@@ -42,6 +44,7 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1)
 endif()
 
 unset(_std)
+unset(_ext)
 
 macro(cmake_record_c_compile_features)
   macro(_get_intel_c_features std_version list)
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index 3cc4503..73dd7fa 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -9,8 +9,10 @@ set(CMAKE_DEPFILE_FLAGS_CXX "-MD -MT  -MF ")
 
 if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
   set(_std -Qstd)
+  set(_ext c++)
 else()
   set(_std -std)
+  set(_ext gnu++)
 endif()
 
 if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.2)
@@ -25,15 +27,15 @@ endif()
 
 if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0)
   set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "${_std}=c++11")
-  set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "${_std}=gnu++11")
+  set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "${_std}=${_ext}11")
 elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
   set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "${_std}=c++0x")
-  set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "${_std}=gnu++0x")
+  set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "${_std}=${_ext}0x")
 endif()
 
 if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
   set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "${_std}=c++98")
-  set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "${_std}=gnu++98")
+  set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "${_std}=${_ext}98")
 endif()
 
 if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
@@ -50,6 +52,7 @@ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
 endif()
 
 unset(_std)
+unset(_ext)
 
 macro(cmake_record_cxx_compile_features)
   macro(_get_intel_features std_version list)

---

Summary of changes:
 Modules/Compiler/Intel-C.cmake   |9 ++---
 Modules/Compiler/Intel-CXX.cmake |9 ++---
 2 files changed, 12 insertions(+), 6 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, next, updated. v3.7.0-rc2-719-gccf1709

[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  ccf17096071718ea9d7ed75d37fd1e7c8fdad196 (commit)
   via  9f1429e274df81344d260c8e42b3387a402940f1 (commit)
  from  fddee52d5bdf90d806834411062b3af37a6332bc (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=ccf17096071718ea9d7ed75d37fd1e7c8fdad196
commit ccf17096071718ea9d7ed75d37fd1e7c8fdad196
Merge: fddee52 9f1429e
Author: Brad King 
AuthorDate: Mon Oct 24 14:05:55 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 14:05:55 2016 -0400

Merge topic 'st2-fix-regex' into next

9f1429e2 Sublime: Update generated diagnostic matching expression for MSVC


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f1429e274df81344d260c8e42b3387a402940f1
commit 9f1429e274df81344d260c8e42b3387a402940f1
Author: Bruno Pedrosa 
AuthorDate: Thu Oct 20 02:35:58 2016 +0200
Commit: Brad King 
CommitDate: Mon Oct 24 14:02:52 2016 -0400

Sublime: Update generated diagnostic matching expression for MSVC

Update the generated `file_regex` to match MSVC-style messages in
addition to the GCC-style messages already matched.  Use non-capturing
sub-patterns to tolerate the differences in message formats while still
capturing the four pieces of information in proper group numbers (file
name, line number, column number, message).

Closes: #16375

diff --git a/Source/cmExtraSublimeTextGenerator.cxx 
b/Source/cmExtraSublimeTextGenerator.cxx
index 41f82a2..b9e4246 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -271,7 +271,9 @@ void cmExtraSublimeTextGenerator::AppendTarget(
<< this->BuildMakeCommand(make, makefileName.c_str(), targetName)
<< "],\n";
   fout << "\t\t\t\"working_dir\": \"${project_path}\",\n";
-  fout << "\t\t\t\"file_regex\": \"^(..[^:]*):([0-9]+):?([0-9]+)?:? (.*)$\"\n";
+  fout << "\t\t\t\"file_regex\": \""
+  "^(..[^:]*)(?::|()([0-9]+)(?::|))(?:([0-9]+):)?s*(.*)"
+  "\"\n";
   fout << "\t\t}";
 }
 

---

Summary of changes:
 Source/cmExtraSublimeTextGenerator.cxx |4 +++-
 1 file changed, 3 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, next, updated. v3.7.0-rc2-717-gfddee52

[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  fddee52d5bdf90d806834411062b3af37a6332bc (commit)
   via  4c272adbe1d67af4779f4e72d9562457ed851dac (commit)
   via  6205f1797e33c22ab1f9cda8598d02b24497b806 (commit)
  from  2d4e1942743e5d150076e57b2cc5efef7f9ab115 (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=fddee52d5bdf90d806834411062b3af37a6332bc
commit fddee52d5bdf90d806834411062b3af37a6332bc
Merge: 2d4e194 4c272ad
Author: Brad King 
AuthorDate: Mon Oct 24 13:57:12 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 13:57:12 2016 -0400

Merge topic 'android-pic' into next

4c272adb Android: Link position-independent executables with proper flags
6205f179 Android: Set CMAKE_POSITION_INDEPENDENT_CODE automatically


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c272adbe1d67af4779f4e72d9562457ed851dac
commit 4c272adbe1d67af4779f4e72d9562457ed851dac
Author: Brad King 
AuthorDate: Mon Oct 24 11:45:18 2016 -0400
Commit: Brad King 
CommitDate: Mon Oct 24 11:45:18 2016 -0400

Android: Link position-independent executables with proper flags

Add `-fPIE -pie` to the default executable link flags when
`CMAKE_POSITION_INDEPENDENT_CODE` is enabled.  This is required by
Android 16 and above for executables to run on the device.

Closes: #16382

diff --git a/Modules/Platform/Android/abi-common.cmake 
b/Modules/Platform/Android/abi-common.cmake
index 533bd90..3b0eb01 100644
--- a/Modules/Platform/Android/abi-common.cmake
+++ b/Modules/Platform/Android/abi-common.cmake
@@ -8,6 +8,10 @@ if(NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE
   set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()
 
+if(CMAKE_POSITION_INDEPENDENT_CODE)
+  string(APPEND _ANDROID_ABI_INIT_EXE_LDFLAGS " -fPIE -pie")
+endif()
+
 string(APPEND _ANDROID_ABI_INIT_EXE_LDFLAGS " -Wl,--gc-sections")
 
 if(NOT _ANDROID_ABI_INIT_EXE_LDFLAGS_NO_nocopyreloc)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6205f1797e33c22ab1f9cda8598d02b24497b806
commit 6205f1797e33c22ab1f9cda8598d02b24497b806
Author: Brad King 
AuthorDate: Mon Oct 24 11:40:53 2016 -0400
Commit: Brad King 
CommitDate: Mon Oct 24 11:40:53 2016 -0400

Android: Set CMAKE_POSITION_INDEPENDENT_CODE automatically

If the toolchain file or cache does not set this, enable it
automatically based on the Android API version.  Versions 16
and above expect position independent code.

Use the main `CMAKE_POSITION_INDEPENDENT_CODE` setting in favor of
hard-coding `-fpic` or `-fPIC` in the compiler flags for each ABI.
This allows CMake to use `-fpie` or `-fPIE` as needed when sources
are meant for executables, and `-fpic` or `-fPIC` for other sources.

diff --git a/Modules/Platform/Android/abi-arm64-v8a-Clang.cmake 
b/Modules/Platform/Android/abi-arm64-v8a-Clang.cmake
index e56b67b..f4717d5 100644
--- a/Modules/Platform/Android/abi-arm64-v8a-Clang.cmake
+++ b/Modules/Platform/Android/abi-arm64-v8a-Clang.cmake
@@ -1,10 +1,6 @@
 # /build/core/toolchains/aarch64-linux-android-clang/setup.mk
 set(_ANDROID_ABI_CLANG_TARGET "aarch64-none-linux-android")
 
-string(APPEND _ANDROID_ABI_INIT_CFLAGS
-  " -fpic"
-  )
-
 # Suppress -Wl,-z,nocopyreloc flag on arm64-v8a
 set(_ANDROID_ABI_INIT_EXE_LDFLAGS_NO_nocopyreloc 1)
 
diff --git a/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake 
b/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake
index 0bcfc86..b71a674 100644
--- a/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake
+++ b/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake
@@ -1,7 +1,4 @@
 # /build/core/toolchains/aarch64-linux-android-4.9/setup.mk
-string(APPEND _ANDROID_ABI_INIT_CFLAGS
-  " -fpic"
-  )
 
 # Suppress -Wl,-z,nocopyreloc flag on arm64-v8a
 set(_ANDROID_ABI_INIT_EXE_LDFLAGS_NO_nocopyreloc 1)
diff --git a/Modules/Platform/Android/abi-armeabi-Clang.cmake 
b/Modules/Platform/Android/abi-armeabi-Clang.cmake
index 4fc3009..b857bd3 100644
--- a/Modules/Platform/Android/abi-armeabi-Clang.cmake
+++ b/Modules/Platform/Android/abi-armeabi-Clang.cmake
@@ -14,7 +14,6 @@ endif()
 string(APPEND _ANDROID_ABI_INIT_CFLAGS
   " -msoft-float"
   " -mtune=xscale"
-  " -fpic"
   )
 
 include(Platform/Android/abi-common-Clang)
diff --git a/Modules/Platform/Android/abi-armeabi-GNU.cmake 
b/Modules/Platform/Android/abi-armeabi-GNU.cmake
index 10cac00..33e8b31 100644
--- a/Modules/Platform/Android/abi-armeabi-GNU.cmake
+++ b/Modules/Platform/Android/abi-armeabi-GNU.cmake
@@ -12,7 +12,6 @@ endif()
 string(APPEND _ANDROID_ABI_INIT_CFLAGS
   " -msoft-float"
   " -mtune=xscale"
-  " -fpic"
   )
 
 include

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-714-g2d4e194

[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  2d4e1942743e5d150076e57b2cc5efef7f9ab115 (commit)
   via  e983bd326a9e3b7902d8f7cf0d891030ad3bd4c1 (commit)
  from  dc8b205f50d910eabbd0ef5b75873045aa862ea8 (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=2d4e1942743e5d150076e57b2cc5efef7f9ab115
commit 2d4e1942743e5d150076e57b2cc5efef7f9ab115
Merge: dc8b205 e983bd3
Author: Brad King 
AuthorDate: Mon Oct 24 10:32:15 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 10:32:15 2016 -0400

Merge topic 'ninja-subdir-binary-dir' into next

e983bd32 Ninja: Use binary dir for `$subdir/all` targets


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e983bd326a9e3b7902d8f7cf0d891030ad3bd4c1
commit e983bd326a9e3b7902d8f7cf0d891030ad3bd4c1
Author: Alexis Murzeau 
AuthorDate: Sun Oct 23 18:58:28 2016 +0200
Commit: Brad King 
CommitDate: Mon Oct 24 10:30:02 2016 -0400

Ninja: Use binary dir for `$subdir/all` targets

The targets added by commit v3.6.0-rc1~240^2~2 (Ninja: Add `$subdir/all`
targets, 2016-03-11) use as `$subdir` the relative path from the top of
the source tree to the current source directory.  This is not correct
when using `add_subdirectory(test test_bin)`.  Instead we need to use
the relative path from the top of the binary tree to the current binary
directory as was done for related targets by commit v3.7.0-rc1~268^2
(Ninja: Add `$subdir/{test,install,package}` targets, 2016-08-05).

diff --git a/Source/cmGlobalNinjaGenerator.cxx 
b/Source/cmGlobalNinjaGenerator.cxx
index 182d7e4..ee594b0 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -879,20 +879,6 @@ std::string cmGlobalNinjaGenerator::ConvertToNinjaPath(
   return convPath;
 }
 
-std::string cmGlobalNinjaGenerator::ConvertToNinjaFolderRule(
-  const std::string& path)
-{
-  cmLocalNinjaGenerator* ng =
-static_cast(this->LocalGenerators[0]);
-  std::string convPath = ng->ConvertToRelativePath(
-this->LocalGenerators[0]->GetState()->GetSourceDirectory(), path + "/all");
-  convPath = this->NinjaOutputPath(convPath);
-#ifdef _WIN32
-  std::replace(convPath.begin(), convPath.end(), '/', '\\');
-#endif
-  return convPath;
-}
-
 void cmGlobalNinjaGenerator::AddCXXCompileCommand(
   const std::string& commandLine, const std::string& sourceFile)
 {
@@ -1119,11 +1105,11 @@ void 
cmGlobalNinjaGenerator::WriteFolderTargets(std::ostream& os)
  this->LocalGenerators.begin();
lgi != this->LocalGenerators.end(); ++lgi) {
 cmLocalGenerator const* lg = *lgi;
-const std::string currentSourceFolder(
-  lg->GetStateSnapshot().GetDirectory().GetCurrentSource());
+const std::string currentBinaryFolder(
+  lg->GetStateSnapshot().GetDirectory().GetCurrentBinary());
 // The directory-level rule should depend on the target-level rules
 // for all targets in the directory.
-targetsPerFolder[currentSourceFolder] = cmNinjaDeps();
+targetsPerFolder[currentBinaryFolder] = cmNinjaDeps();
 for (std::vector::const_iterator ti =
lg->GetGeneratorTargets().begin();
  ti != lg->GetGeneratorTargets().end(); ++ti) {
@@ -1136,7 +1122,7 @@ void 
cmGlobalNinjaGenerator::WriteFolderTargets(std::ostream& os)
type == cmStateEnums::OBJECT_LIBRARY ||
type == cmStateEnums::UTILITY) &&
   !gt->GetPropertyAsBool("EXCLUDE_FROM_ALL")) {
-targetsPerFolder[currentSourceFolder].push_back(gt->GetName());
+targetsPerFolder[currentBinaryFolder].push_back(gt->GetName());
   }
 }
 
@@ -1147,28 +1133,30 @@ void 
cmGlobalNinjaGenerator::WriteFolderTargets(std::ostream& os)
 for (std::vector::const_iterator stateIt =
children.begin();
  stateIt != children.end(); ++stateIt) {
-  targetsPerFolder[currentSourceFolder].push_back(
-this->ConvertToNinjaFolderRule(
-  stateIt->GetDirectory().GetCurrentSource()));
+  std::string const currentBinaryDir =
+stateIt->GetDirectory().GetCurrentBinary();
+
+  targetsPerFolder[currentBinaryFolder].push_back(
+this->ConvertToNinjaPath(currentBinaryDir + "/all"));
 }
   }
 
-  std::string const rootSourceDir =
-this->LocalGenerators[0]->GetSourceDirectory();
+  std::string const rootBinaryDir =
+this->LocalGenerators[0]->GetBinaryDirectory();
   for (std::map::const_iterator it =
  targetsPerFolder.begin();
it != targetsPerFolder.end(); ++it) {
 cmGlobalNinjaGenerator::WriteDivider(os);
-std::string const& currentSourc

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-710-g74e42fb

[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  74e42fbdb1619cc2d68f08910aaae96a78142058 (commit)
   via  48189697eb2ac97407cf4ffc0d2f3e600f3cd6ac (commit)
  from  94b9567e93acf6740f78acb49b6efec097ad56dd (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=74e42fbdb1619cc2d68f08910aaae96a78142058
commit 74e42fbdb1619cc2d68f08910aaae96a78142058
Merge: 94b9567 4818969
Author: Brad King 
AuthorDate: Mon Oct 24 10:28:08 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 10:28:08 2016 -0400

Merge topic 'doc-cmake-server-typos' into next

48189697 Help: Fix cmake-server documentation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48189697eb2ac97407cf4ffc0d2f3e600f3cd6ac
commit 48189697eb2ac97407cf4ffc0d2f3e600f3cd6ac
Author: Tobias Hunger 
AuthorDate: Fri Oct 21 19:11:41 2016 +0200
Commit: Brad King 
CommitDate: Fri Oct 21 13:37:10 2016 -0400

Help: Fix cmake-server documentation

Some information was not updated to reflect the latest implementation.

Reported-by: Sylvain Joubert 

diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst
index afd4e2b..5eec009 100644
--- a/Help/manual/cmake-server.7.rst
+++ b/Help/manual/cmake-server.7.rst
@@ -250,7 +250,9 @@ This is the only message ever sent by the server that is 
not of type "reply",
 
 It will contain "supportedProtocolVersions" with an array of server protocol
 versions supported by the cmake server. These are JSON objects with "major" and
-"minor" keys containing non-negative integer values.
+"minor" keys containing non-negative integer values. Some versions may be 
marked
+as experimental. These will contain the "isExperimental" key set to true. 
Enabling
+these requires a special command line argument when starting the cmake server 
mode.
 
 Example::
 
@@ -403,7 +405,7 @@ CMake will reply like this (after reporting progress for 
some time)::
 Type "compute"
 ^^
 
-This requist will generate build system files in the build directory and
+This request will generate build system files in the build directory and
 is only available after a project was successfully "configure"d.
 
 Example::
@@ -426,8 +428,19 @@ The "codemodel" request can be used after a project was 
"compute"d successfully.
 
 It will list the complete project structure as it is known to cmake.
 
-The reply will contain a key "projects", which will contain a list of
-project objects, one for each (sub-)project defined in the cmake build system.
+The reply will contain a key "configurations", which will contain a list of
+configuration objects. Configuration objects are used to destinquish between
+different configurations the build directory might have enabled. While most
+generators only support one configuration, others might support several.
+
+Each configuration object can have the following keys:
+
+"name"
+  contains the name of the configuration. The name may be empty.
+"projects"
+  contains a list of project objects, one for each build project.
+
+Project objects define one (sub-)project defined in the cmake build system.
 
 Each project object can have the following keys:
 
@@ -437,19 +450,8 @@ Each project object can have the following keys:
   contains the current source directory
 "buildDirectory"
   contains the current build directory.
-"configurations"
-  contains a list of configuration objects.
-
-Configuration objects are used to destinquish between different
-configurations the build directory might have enabled. While most generators
-only support one configuration, others support several.
-
-Each configuration object can have the following keys:
-
-"name"
-  contains the name of the configuration. The name may be empty.
 "targets"
-  contains a list of target objects, one for each build target.
+  contains a list of build system target objects.
 
 Target objects define individual build targets for a certain configuration.
 
@@ -520,88 +522,53 @@ sourceDirectory of the target.
 Example::
 
   [== CMake Server ==[
-  {"type":"project"}
+  {"type":"codemodel"}
   ]== CMake Server ==]
 
 CMake will reply::
 
   [== CMake Server ==[
   {
-"cookie":"",
-"type":"reply",
-"inReplyTo":"project",
-
-"projects":
-[
+"configurations": [
   {
-"name":"CMAKE_FORM",
-"sourceDirectory":"/home/code/src/cmake/Source/CursesDialog/form"
-"buildDirectory":"/tmp/cmake-build-test/Source/CursesDialog/form",
-"configurations":
-[
+"name": "",
+"projects": [
   {
-"name":"",
-"targ

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-712-gdc8b205

[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  dc8b205f50d910eabbd0ef5b75873045aa862ea8 (commit)
   via  f660832999e086f02a9f3552c028aed900cd7249 (commit)
  from  74e42fbdb1619cc2d68f08910aaae96a78142058 (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=dc8b205f50d910eabbd0ef5b75873045aa862ea8
commit dc8b205f50d910eabbd0ef5b75873045aa862ea8
Merge: 74e42fb f660832
Author: Brad King 
AuthorDate: Mon Oct 24 10:28:33 2016 -0400
Commit: Brad King 
CommitDate: Mon Oct 24 10:28:33 2016 -0400

Merge branch 'master' into next


---

Summary of changes:


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.7.0-rc2-320-gf660832

[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  f660832999e086f02a9f3552c028aed900cd7249 (commit)
   via  48189697eb2ac97407cf4ffc0d2f3e600f3cd6ac (commit)
  from  92be048b7f40f4ca352bc0ef85c8e1bf4dfc0702 (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=f660832999e086f02a9f3552c028aed900cd7249
commit f660832999e086f02a9f3552c028aed900cd7249
Merge: 92be048 4818969
Author: Brad King 
AuthorDate: Mon Oct 24 10:28:19 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 10:28:19 2016 -0400

Merge topic 'doc-cmake-server-typos'

48189697 Help: Fix cmake-server documentation


---

Summary of changes:
 Help/manual/cmake-server.7.rst |  129 +++-
 1 file changed, 48 insertions(+), 81 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.7.0-rc2-298-g1ae2c23

[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  1ae2c232b652b69bb7605eae765a86c3bb520b8f (commit)
   via  1a74e719068c97518d6f9521c86862a17166f32e (commit)
  from  9a901dc78de32519dae234719370b5330d5564b4 (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=1ae2c232b652b69bb7605eae765a86c3bb520b8f
commit 1ae2c232b652b69bb7605eae765a86c3bb520b8f
Merge: 9a901dc 1a74e71
Author: Brad King 
AuthorDate: Mon Oct 24 10:16:33 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 10:16:33 2016 -0400

Merge topic 'cm_unordered_map'

1a74e719 Introduce CM_UNORDERED_MAP


---

Summary of changes:
 Source/cmDefinitions.h  |   21 ++---
 Source/cmFileTimeComparison.cxx |   34 ++
 Source/cmGlobalGenerator.h  |   25 -
 Source/cmMakefile.h |   31 ---
 Source/cmTarget.h   |   19 ++-
 Source/cm_unordered_map.hxx |   25 +
 Source/cmake.cxx|7 ++-
 7 files changed, 41 insertions(+), 121 deletions(-)
 create mode 100644 Source/cm_unordered_map.hxx


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.7.0-rc2-314-gc1b96fd

[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  c1b96fddf835d5faf27698d5a1637bd1507274e0 (commit)
   via  2214011f7b3b13fe7ae0f68f0f9d49af11e12edd (commit)
   via  7f9a8d53aa8a3595f4f1f2f81607f8df3627642d (commit)
   via  fb0b087c4dc65f18aef431e41de3aa9b91e35371 (commit)
   via  2169b0faa40a20cd9aae25f9170cca074579a023 (commit)
   via  9855ebf11a1556bd0b73a1eaec39232842871528 (commit)
  from  b899c0a92f6833c4996276d86d9e0fb3d42df77c (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=c1b96fddf835d5faf27698d5a1637bd1507274e0
commit c1b96fddf835d5faf27698d5a1637bd1507274e0
Merge: b899c0a 2214011
Author: Brad King 
AuthorDate: Mon Oct 24 10:16:43 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 10:16:43 2016 -0400

Merge topic 'remove-cmobject-uses'

2214011f Make cmCPackGenerator not inherit from cmObject
7f9a8d53 Make cmCPackGeneratorFactory not inherit from cmObject
fb0b087c Make cmCTestGenericHandler not inherit from cmObject
2169b0fa Make cmCPackLog not inherit from cmObject
9855ebf1 Make cmCommand not inherit from cmObject


---

Summary of changes:
 Source/CPack/cmCPackArchiveGenerator.h|2 +-
 Source/CPack/cmCPackGenerator.h   |9 +
 Source/CPack/cmCPackGeneratorFactory.h|6 ++
 Source/CPack/cmCPackLog.h |6 ++
 Source/CTest/cmCTestBuildAndTestHandler.h |2 +-
 Source/CTest/cmCTestBuildCommand.h|2 --
 Source/CTest/cmCTestBuildHandler.h|2 +-
 Source/CTest/cmCTestCommand.h |2 --
 Source/CTest/cmCTestConfigureCommand.h|2 --
 Source/CTest/cmCTestConfigureHandler.h|2 +-
 Source/CTest/cmCTestCoverageCommand.h |2 +-
 Source/CTest/cmCTestCoverageHandler.h |2 +-
 Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h |2 --
 Source/CTest/cmCTestGenericHandler.h  |4 ++--
 Source/CTest/cmCTestHandlerCommand.h  |2 --
 Source/CTest/cmCTestMemCheckCommand.h |2 --
 Source/CTest/cmCTestMemCheckHandler.h |2 +-
 Source/CTest/cmCTestReadCustomFilesCommand.h  |2 --
 Source/CTest/cmCTestRunScriptCommand.h|2 --
 Source/CTest/cmCTestScriptHandler.h   |2 +-
 Source/CTest/cmCTestSleepCommand.h|2 --
 Source/CTest/cmCTestStartCommand.h|2 --
 Source/CTest/cmCTestSubmitCommand.h   |2 +-
 Source/CTest/cmCTestSubmitHandler.h   |2 +-
 Source/CTest/cmCTestTestCommand.h |2 --
 Source/CTest/cmCTestTestHandler.cxx   |8 
 Source/CTest/cmCTestTestHandler.h |2 +-
 Source/CTest/cmCTestUpdateCommand.h   |2 --
 Source/CTest/cmCTestUpdateHandler.h   |2 +-
 Source/CTest/cmCTestUploadCommand.h   |2 +-
 Source/CTest/cmCTestUploadHandler.h   |2 +-
 Source/cmAddCompileOptionsCommand.h   |2 --
 Source/cmAddCustomCommandCommand.h|2 --
 Source/cmAddCustomTargetCommand.h |2 --
 Source/cmAddDefinitionsCommand.h  |2 --
 Source/cmAddDependenciesCommand.h |2 --
 Source/cmAddExecutableCommand.h   |2 --
 Source/cmAddLibraryCommand.h  |2 --
 Source/cmAddSubDirectoryCommand.h |2 --
 Source/cmAddTestCommand.h |2 --
 Source/cmAuxSourceDirectoryCommand.h  |2 --
 Source/cmBreakCommand.h   |2 --
 Source/cmBuildCommand.h   |2 --
 Source/cmBuildNameCommand.h   |1 -
 Source/cmCMakeHostSystemInformationCommand.h  |2 --
 Source/cmCMakeMinimumRequired.h   |2 --
 Source/cmCMakePolicyCommand.h |2 --
 Source/cmCommand.h|   14 +-
 Source/cmConfigureFileCommand.h   |2 --
 Source/cmContinueCommand.h|2 --
 Source/cmCoreTryCompile.h |2 --
 Source/cmCreateTestSourceList.h   |2 --
 Source/cmDefinePropertyCommand.h  |2 --
 Source/cmElseCommand.h|2 --
 Source/cmElseIfCommand.h  |2

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-708-g94b9567

[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  94b9567e93acf6740f78acb49b6efec097ad56dd (commit)
   via  92be048b7f40f4ca352bc0ef85c8e1bf4dfc0702 (commit)
  from  1732d1498b32e173dcf9642964fd7128f04397d0 (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=94b9567e93acf6740f78acb49b6efec097ad56dd
commit 94b9567e93acf6740f78acb49b6efec097ad56dd
Merge: 1732d14 92be048
Author: Brad King 
AuthorDate: Mon Oct 24 10:21:00 2016 -0400
Commit: Brad King 
CommitDate: Mon Oct 24 10:21:00 2016 -0400

Merge branch 'master' into next


---

Summary of changes:


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.7.0-rc2-318-g92be048

[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  92be048b7f40f4ca352bc0ef85c8e1bf4dfc0702 (commit)
   via  c401f95888938562881cd5d7c21ccea5974fe130 (commit)
  from  21f449214d9bf4c8fa99b3a90029cff2171e3fac (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=92be048b7f40f4ca352bc0ef85c8e1bf4dfc0702
commit 92be048b7f40f4ca352bc0ef85c8e1bf4dfc0702
Merge: 21f4492 c401f95
Author: Brad King 
AuthorDate: Mon Oct 24 10:20:50 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 10:20:50 2016 -0400

Merge topic 'cmcommand-no-disable'

c401f958 Remove cmCommand::Enabled and all related accessors


---

Summary of changes:
 Source/cmCommand.h|   24 +---
 Source/cmMakefile.cxx |2 +-
 2 files changed, 2 insertions(+), 24 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, next, updated. v3.7.0-rc2-706-g1732d14

[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  1732d1498b32e173dcf9642964fd7128f04397d0 (commit)
   via  c401f95888938562881cd5d7c21ccea5974fe130 (commit)
  from  c9c61385c9710e273c2287a0d5ced8080e5bc908 (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=1732d1498b32e173dcf9642964fd7128f04397d0
commit 1732d1498b32e173dcf9642964fd7128f04397d0
Merge: c9c6138 c401f95
Author: Brad King 
AuthorDate: Mon Oct 24 10:19:32 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 10:19:32 2016 -0400

Merge topic 'cmcommand-no-disable' into next

c401f958 Remove cmCommand::Enabled and all related accessors


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c401f95888938562881cd5d7c21ccea5974fe130
commit c401f95888938562881cd5d7c21ccea5974fe130
Author: Daniel Pfeifer 
AuthorDate: Sun Oct 23 08:55:19 2016 +0200
Commit: Brad King 
CommitDate: Mon Oct 24 10:19:09 2016 -0400

Remove cmCommand::Enabled and all related accessors

Enabled is never set to false.  Remove the member variable and all
related getters and setters.

diff --git a/Source/cmCommand.h b/Source/cmCommand.h
index 65bb7c5..b263a61 100644
--- a/Source/cmCommand.h
+++ b/Source/cmCommand.h
@@ -23,11 +23,10 @@ class cmCommand
 {
 public:
   /**
-   * Construct the command. By default it is enabled with no makefile.
+   * Construct the command. By default it has no makefile.
*/
   cmCommand()
 : Makefile(CM_NULLPTR)
-, Enabled(true)
   {
   }
 
@@ -92,26 +91,6 @@ public:
   virtual std::string GetName() const = 0;
 
   /**
-   * Enable the command.
-   */
-  void EnabledOn() { this->Enabled = true; }
-
-  /**
-   * Disable the command.
-   */
-  void EnabledOff() { this->Enabled = false; }
-
-  /**
-   * Query whether the command is enabled.
-   */
-  bool GetEnabled() const { return this->Enabled; }
-
-  /**
-   * Disable or enable the command.
-   */
-  void SetEnabled(bool enabled) { this->Enabled = enabled; }
-
-  /**
* Return the last error string.
*/
   const char* GetError();
@@ -129,7 +108,6 @@ protected:
   cmCommandArgumentsHelper Helper;
 
 private:
-  bool Enabled;
   std::string Error;
 };
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 00c0e82..741ffb8 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -266,7 +266,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& 
lff,
 pcmd->SetMakefile(this);
 
 // Decide whether to invoke the command.
-if (pcmd->GetEnabled() && !cmSystemTools::GetFatalErrorOccured() &&
+if (!cmSystemTools::GetFatalErrorOccured() &&
 (this->GetCMakeInstance()->GetWorkingMode() != cmake::SCRIPT_MODE ||
  pcmd->IsScriptable()))
 

---

Summary of changes:
 Source/cmCommand.h|   24 +---
 Source/cmMakefile.cxx |2 +-
 2 files changed, 2 insertions(+), 24 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, next, updated. v3.7.0-rc2-704-gc9c6138

[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  c9c61385c9710e273c2287a0d5ced8080e5bc908 (commit)
   via  21f449214d9bf4c8fa99b3a90029cff2171e3fac (commit)
   via  c1b96fddf835d5faf27698d5a1637bd1507274e0 (commit)
   via  b899c0a92f6833c4996276d86d9e0fb3d42df77c (commit)
   via  3d5ec790eea47a91c6f70d172c42839db02b8467 (commit)
   via  1ae2c232b652b69bb7605eae765a86c3bb520b8f (commit)
   via  9a901dc78de32519dae234719370b5330d5564b4 (commit)
   via  aae5a9feb1b07bfae6968f2dfb3b3057a04b3c89 (commit)
   via  af782d021345506bb4e0d1e832a7b77fb8a0b12a (commit)
  from  82876f13bc5d093e450895ee72d4ac4f38988f71 (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=c9c61385c9710e273c2287a0d5ced8080e5bc908
commit c9c61385c9710e273c2287a0d5ced8080e5bc908
Merge: 82876f1 21f4492
Author: Brad King 
AuthorDate: Mon Oct 24 10:17:12 2016 -0400
Commit: Brad King 
CommitDate: Mon Oct 24 10:17:12 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.7.0-rc2-316-g21f4492

[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  21f449214d9bf4c8fa99b3a90029cff2171e3fac (commit)
   via  e3770c56a8ef6b20f473556a1ca29ea6e0f51f7f (commit)
  from  c1b96fddf835d5faf27698d5a1637bd1507274e0 (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=21f449214d9bf4c8fa99b3a90029cff2171e3fac
commit 21f449214d9bf4c8fa99b3a90029cff2171e3fac
Merge: c1b96fd e3770c5
Author: Brad King 
AuthorDate: Mon Oct 24 10:16:47 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 10:16:47 2016 -0400

Merge topic 'parallel-boostrap-test'

e3770c56 BootstrapTest: Use --parallel=... argument.


---

Summary of changes:
 Tests/BootstrapTest.cmake |9 +++--
 Tests/CMakeLists.txt  |4 ++--
 2 files changed, 9 insertions(+), 4 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.7.0-rc2-308-gb899c0a

[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  b899c0a92f6833c4996276d86d9e0fb3d42df77c (commit)
   via  569509f4bfbf44c67e237a01f957fdfe52223cfa (commit)
   via  6c9b3b5c03b41842d3d79c1bd80691be7e5c6f89 (commit)
   via  8483dab8e16b9734ac7d2b90b95d474ce8502e40 (commit)
   via  4fb70919a57582e4ca7c2a9f6bc4f72b38f9af86 (commit)
   via  608afd4f62f57fe3f9dcac1e9cc94b8bd1adf9c6 (commit)
   via  64f9c282f3337335c05a062f341fd5155cade51c (commit)
   via  f69e768d94ff5e0238cbb924836737c4ce11a930 (commit)
  from  3d5ec790eea47a91c6f70d172c42839db02b8467 (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=b899c0a92f6833c4996276d86d9e0fb3d42df77c
commit b899c0a92f6833c4996276d86d9e0fb3d42df77c
Merge: 3d5ec79 569509f
Author: Brad King 
AuthorDate: Mon Oct 24 10:16:40 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 10:16:40 2016 -0400

Merge topic 'separate-compilation'

569509f4 Fix newly discovered clang-tidy issues
6c9b3b5c cmCommand: implement functions in cxx file
8483dab8 bootstrap: Sort source files lexicographically
4fb70919 Create all commands from a single function
608afd4f Separate compilation for commands included in cmBootstrapCommands2
64f9c282 Separate compilation for commands included in cmBootstrapCommands1
f69e768d Separate compilation for commands included in cmCommands


---

Summary of changes:
 Source/CMakeLists.txt  |  287 +++-
 Source/cmAddCompileOptionsCommand.cxx  |4 +
 Source/cmAddCompileOptionsCommand.h|7 +
 Source/cmAddExecutableCommand.cxx  |2 +
 Source/cmAddLibraryCommand.cxx |6 +-
 Source/cmAddSubDirectoryCommand.cxx|2 +
 Source/cmAuxSourceDirectoryCommand.cxx |   10 +-
 Source/cmAuxSourceDirectoryCommand.h   |7 +
 Source/cmBootstrapCommands1.cxx|   87 ---
 Source/cmBootstrapCommands2.cxx|   94 
 Source/cmBuildNameCommand.cxx  |8 +
 Source/cmBuildNameCommand.h|7 +
 Source/cmCMakeHostSystemInformationCommand.cxx |7 +
 Source/cmCMakeHostSystemInformationCommand.h   |   11 +-
 Source/cmCMakeMinimumRequired.cxx  |1 +
 Source/cmCPluginAPI.cxx|6 +-
 Source/cmCommand.cxx   |   48 
 Source/cmCommand.h |   48 +---
 Source/cmCommands.cxx  |  238 
 Source/cmCommands.cxx.in   |   10 -
 Source/cmCommands.h|   10 +-
 Source/cmCommandsForBootstrap.cxx  |7 -
 Source/cmConditionEvaluator.cxx|   12 +-
 Source/cmConfigureFileCommand.cxx  |2 +
 Source/cmContinueCommand.cxx   |3 +
 Source/cmCreateTestSourceList.cxx  |1 +
 Source/cmElseIfCommand.cxx |2 +
 Source/cmElseIfCommand.h   |9 +-
 Source/cmExportCommand.cxx |   18 +-
 Source/cmExportCommand.h   |8 +-
 Source/cmExportLibraryDependenciesCommand.cxx  |   12 +-
 Source/cmExportLibraryDependenciesCommand.h|7 +
 Source/cmFLTKWrapUICommand.cxx |8 +
 Source/cmFLTKWrapUICommand.h   |8 +
 Source/cmFileCommand.cxx   |8 +-
 Source/cmFindBase.cxx  |3 +-
 Source/cmFindCommon.cxx|2 +
 Source/cmFindLibraryCommand.cxx|4 +
 Source/cmFindPackageCommand.cxx|   19 +-
 Source/cmFindPathCommand.cxx   |2 +
 Source/cmFindProgramCommand.cxx|2 +
 Source/cmForEachCommand.cxx|2 +
 Source/cmFunctionCommand.cxx   |2 +
 Source/cmGetCMakePropertyCommand.cxx   |1 +
 Source/cmGetDirectoryPropertyCommand.cxx   |2 +
 Source/cmHexFileConverter.cxx  |4 +-
 Source/cmIfCommand.cxx |1 +
 Source/cmIncludeCommand.cxx|3 +
 Source/cmIncludeDirectoryCommand.cxx   |2 +
 Source/cmIncludeExternalMSProjectCommand.cxx   |6 +
 Source/cmIncludeExternalMSProjectCommand.h |7 +
 Source/cmInstallCommand.cxx|2 +
 Source/cmInstallFilesCommand.cxx   |2 +
 Source/cmInsta

[Cmake-commits] CMake branch, master, updated. v3.7.0-rc2-300-g3d5ec79

[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  3d5ec790eea47a91c6f70d172c42839db02b8467 (commit)
   via  295c8efa359cbee22e45e6e9358990209b35aa39 (commit)
  from  1ae2c232b652b69bb7605eae765a86c3bb520b8f (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=3d5ec790eea47a91c6f70d172c42839db02b8467
commit 3d5ec790eea47a91c6f70d172c42839db02b8467
Merge: 1ae2c23 295c8ef
Author: Brad King 
AuthorDate: Mon Oct 24 10:16:37 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 10:16:37 2016 -0400

Merge topic 'android-link-exe'

295c8efa Android: Add missing link flags for device executables


---

Summary of changes:
 Modules/Platform/Android-Common.cmake  |4 
 Modules/Platform/Android/abi-arm64-v8a-Clang.cmake |3 +++
 Modules/Platform/Android/abi-arm64-v8a-GNU.cmake   |3 +++
 Modules/Platform/Android/abi-common.cmake  |6 ++
 4 files changed, 16 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, next, updated. v3.7.0-rc2-695-g82876f1

[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  82876f13bc5d093e450895ee72d4ac4f38988f71 (commit)
   via  569509f4bfbf44c67e237a01f957fdfe52223cfa (commit)
   via  6c9b3b5c03b41842d3d79c1bd80691be7e5c6f89 (commit)
   via  8483dab8e16b9734ac7d2b90b95d474ce8502e40 (commit)
   via  4fb70919a57582e4ca7c2a9f6bc4f72b38f9af86 (commit)
   via  608afd4f62f57fe3f9dcac1e9cc94b8bd1adf9c6 (commit)
   via  64f9c282f3337335c05a062f341fd5155cade51c (commit)
   via  f69e768d94ff5e0238cbb924836737c4ce11a930 (commit)
  from  4ce2ab4db04cb2278c451b03a039caa00e4381f6 (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=82876f13bc5d093e450895ee72d4ac4f38988f71
commit 82876f13bc5d093e450895ee72d4ac4f38988f71
Merge: 4ce2ab4 569509f
Author: Brad King 
AuthorDate: Mon Oct 24 10:05:36 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 10:05:36 2016 -0400

Merge topic 'separate-compilation' into next

569509f4 Fix newly discovered clang-tidy issues
6c9b3b5c cmCommand: implement functions in cxx file
8483dab8 bootstrap: Sort source files lexicographically
4fb70919 Create all commands from a single function
608afd4f Separate compilation for commands included in cmBootstrapCommands2
64f9c282 Separate compilation for commands included in cmBootstrapCommands1
f69e768d Separate compilation for commands included in cmCommands


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=569509f4bfbf44c67e237a01f957fdfe52223cfa
commit 569509f4bfbf44c67e237a01f957fdfe52223cfa
Author: Daniel Pfeifer 
AuthorDate: Fri Oct 21 21:32:43 2016 +0200
Commit: Daniel Pfeifer 
CommitDate: Fri Oct 21 21:32:43 2016 +0200

Fix newly discovered clang-tidy issues

Clang-tidy reports some issues only from the currently compiled source
file and its associated header file.  Separating the compilation of
commands exposed some clang-tidy issues that were not reported previously.
Fix them.

diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index 18118a3..56cf91a 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -270,8 +270,8 @@ bool 
cmAddLibraryCommand::InitialPass(std::vector const& args,
 yet its linker language. */
   if ((type == cmStateEnums::SHARED_LIBRARY ||
type == cmStateEnums::MODULE_LIBRARY) &&
-  (this->Makefile->GetState()->GetGlobalPropertyAsBool(
- "TARGET_SUPPORTS_SHARED_LIBS") == false)) {
+  !this->Makefile->GetState()->GetGlobalPropertyAsBool(
+"TARGET_SUPPORTS_SHARED_LIBS")) {
 std::ostringstream w;
 w << "ADD_LIBRARY called with "
   << (type == cmStateEnums::SHARED_LIBRARY ? "SHARED" : "MODULE")
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index 4c0b649..7d98e73 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -222,7 +222,7 @@ bool cmConditionEvaluator::GetBooleanValue(
 double d = strtod(arg.c_str(), &end);
 if (*end == '\0') {
   // The whole string is a number.  Use C conversion to bool.
-  return d ? true : false;
+  return static_cast(d);
 }
   }
 
@@ -444,7 +444,7 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList& 
newArgs, std::string&,
   if (this->IsKeyword(keyCOMMAND, *arg) && argP1 != newArgs.end()) {
 cmCommand* command =
   this->Makefile.GetState()->GetCommand(argP1->c_str());
-this->HandlePredicate(command ? true : false, reducible, arg, newArgs,
+this->HandlePredicate(command != CM_NULLPTR, reducible, arg, newArgs,
   argP1, argP2);
   }
   // does a policy exist
@@ -456,7 +456,7 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList& 
newArgs, std::string&,
   // does a target exist
   if (this->IsKeyword(keyTARGET, *arg) && argP1 != newArgs.end()) {
 this->HandlePredicate(
-  this->Makefile.FindTargetToUse(argP1->GetValue()) ? true : false,
+  this->Makefile.FindTargetToUse(argP1->GetValue()) != CM_NULLPTR,
   reducible, arg, newArgs, argP1, argP2);
   }
   // does a test exist
@@ -464,7 +464,7 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList& 
newArgs, std::string&,
   this->Policy64Status != cmPolicies::WARN) {
 if (this->IsKeyword(keyTEST, *arg) && argP1 != newArgs.end()) {
   const cmTest* haveTest = this->Makefile.GetTest(argP1->c_str());
-  this->HandlePredicate(haveTest ? true : false, reducible, arg,
+  this->HandlePredicate(haveTest != C

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-687-g4ce2ab4

[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  4ce2ab4db04cb2278c451b03a039caa00e4381f6 (commit)
   via  be38bde9b8cbabd2b2fd629fc336c04ada52c38d (commit)
  from  4f8633666382e9b518a5af001146c9f8abfb9844 (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=4ce2ab4db04cb2278c451b03a039caa00e4381f6
commit 4ce2ab4db04cb2278c451b03a039caa00e4381f6
Merge: 4f86336 be38bde
Author: Brad King 
AuthorDate: Mon Oct 24 10:05:10 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 10:05:10 2016 -0400

Merge topic 'separate-compilation' into next

be38bde9 Revise topic 'separate-compilation' style


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be38bde9b8cbabd2b2fd629fc336c04ada52c38d
commit be38bde9b8cbabd2b2fd629fc336c04ada52c38d
Author: Brad King 
AuthorDate: Mon Oct 24 10:02:14 2016 -0400
Commit: Brad King 
CommitDate: Mon Oct 24 10:02:14 2016 -0400

Revise topic 'separate-compilation' style

diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index 50c3e7e..b70074e 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -11,8 +11,8 @@
 #include "cmGlobalGenerator.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmVersion.h"
 #include "cmState.h"
+#include "cmVersion.h"
 
 #include 
 
diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx
index 5bc953a..56be0cb 100644
--- a/Source/cmFindLibraryCommand.cxx
+++ b/Source/cmFindLibraryCommand.cxx
@@ -2,8 +2,8 @@
file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmFindLibraryCommand.h"
 
-#include "cmState.h"
 #include "cmGlobalGenerator.h"
+#include "cmState.h"
 #include "cmSystemTools.h"
 #include "cmVersion.h"
 
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index 1b1d58e..9da4cf6 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -2,8 +2,8 @@
file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmFunctionCommand.h"
 
-#include "cmSystemTools.h"
 #include "cmState.h"
+#include "cmSystemTools.h"
 #include "cmake.h"
 
 // define the class for function commands
diff --git a/Source/cmGetCMakePropertyCommand.cxx 
b/Source/cmGetCMakePropertyCommand.cxx
index 90813ae..01b41e8 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -4,9 +4,9 @@
 
 #include "cmAlgorithms.h"
 #include "cmGlobalGenerator.h"
+#include "cmState.h"
 #include "cmStateTypes.h"
 #include "cmake.h"
-#include "cmState.h"
 
 // cmGetCMakePropertyCommand
 bool cmGetCMakePropertyCommand::InitialPass(
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 1651950..cb8bd58 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -3,9 +3,9 @@
 #include "cmMacroCommand.h"
 
 #include "cmAlgorithms.h"
+#include "cmState.h"
 #include "cmSystemTools.h"
 #include "cmake.h"
-#include "cmState.h"
 
 // define the class for macro commands
 class cmMacroHelperCommand : public cmCommand
diff --git a/Source/cmMarkAsAdvancedCommand.cxx 
b/Source/cmMarkAsAdvancedCommand.cxx
index 46e6043..7297193 100644
--- a/Source/cmMarkAsAdvancedCommand.cxx
+++ b/Source/cmMarkAsAdvancedCommand.cxx
@@ -2,8 +2,8 @@
file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmMarkAsAdvancedCommand.h"
 
-#include "cmSystemTools.h"
 #include "cmState.h"
+#include "cmSystemTools.h"
 
 // cmMarkAsAdvancedCommand
 bool cmMarkAsAdvancedCommand::InitialPass(std::vector const& args,
diff --git a/Source/cmOptionCommand.cxx b/Source/cmOptionCommand.cxx
index 8343d1c..d6efa2c 100644
--- a/Source/cmOptionCommand.cxx
+++ b/Source/cmOptionCommand.cxx
@@ -2,8 +2,8 @@
file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmOptionCommand.h"
 
-#include "cmSystemTools.h"
 #include "cmState.h"
+#include "cmSystemTools.h"
 
 // cmOptionCommand
 bool cmOptionCommand::InitialPass(std::vector const& args,
diff --git a/Source/cmSetCommand.cxx b/Source/cmSetCommand.cxx
index d93df64..9f59db4 100644
--- a/Source/cmSetCommand.cxx
+++ b/Source/cmSetCommand.cxx
@@ -2,8 +2,8 @@
file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmSetCommand.h"
 
-#include "cmSystemTools.h"
 #include "cmState.h"
+#include "cmSystemTools.h"
 
 // cmSetCommand
 bool cmSetCommand::InitialPass(std::vector const& args,
diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx
index 9d88493..552f918 100644
--- a/Source/cmSetPropertyCommand.cxx
+++ b/Source/cmSetPropertyCommand.cxx
@@ -7,8 +

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-685-g4f86336

[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  4f8633666382e9b518a5af001146c9f8abfb9844 (commit)
   via  9af394a2ce6f0815323e9213784494b225bc2a6f (commit)
  from  4df5915b50c57b3f028cb3fb7555c42384bd34e8 (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=4f8633666382e9b518a5af001146c9f8abfb9844
commit 4f8633666382e9b518a5af001146c9f8abfb9844
Merge: 4df5915 9af394a
Author: Brad King 
AuthorDate: Mon Oct 24 10:04:41 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 10:04:41 2016 -0400

Merge topic 'cmcommand-no-disable' into next

9af394a2 Revert topic 'cmcommand-no-disable'

diff --cc Source/cmCommand.h
index b263a61,9299c71..65bb7c5
--- a/Source/cmCommand.h
+++ b/Source/cmCommand.h
@@@ -19,11 -19,13 +19,11 @@@
   * to support such features as enable/disable, inheritance,
   * documentation, and construction.
   */
 -class cmCommand : public cmObject
 +class cmCommand
  {
  public:
 -  cmTypeMacro(cmCommand, cmObject);
 -
/**
-* Construct the command. By default it has no makefile.
+* Construct the command. By default it is enabled with no makefile.
 */
cmCommand()
  : Makefile(CM_NULLPTR)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9af394a2ce6f0815323e9213784494b225bc2a6f
commit 9af394a2ce6f0815323e9213784494b225bc2a6f
Author: Brad King 
AuthorDate: Mon Oct 24 10:03:15 2016 -0400
Commit: Brad King 
CommitDate: Mon Oct 24 10:03:15 2016 -0400

Revert topic 'cmcommand-no-disable'

It will be rebased and restored to avoid conflicts.

diff --git a/Source/cmCommand.h b/Source/cmCommand.h
index 5adca64..9299c71 100644
--- a/Source/cmCommand.h
+++ b/Source/cmCommand.h
@@ -25,10 +25,11 @@ public:
   cmTypeMacro(cmCommand, cmObject);
 
   /**
-   * Construct the command. By default it has no makefile.
+   * Construct the command. By default it is enabled with no makefile.
*/
   cmCommand()
 : Makefile(CM_NULLPTR)
+, Enabled(true)
   {
   }
 
@@ -95,6 +96,26 @@ public:
   virtual std::string GetName() const = 0;
 
   /**
+   * Enable the command.
+   */
+  void EnabledOn() { this->Enabled = true; }
+
+  /**
+   * Disable the command.
+   */
+  void EnabledOff() { this->Enabled = false; }
+
+  /**
+   * Query whether the command is enabled.
+   */
+  bool GetEnabled() const { return this->Enabled; }
+
+  /**
+   * Disable or enable the command.
+   */
+  void SetEnabled(bool enabled) { this->Enabled = enabled; }
+
+  /**
* Return the last error string.
*/
   const char* GetError();
@@ -112,6 +133,7 @@ protected:
   cmCommandArgumentsHelper Helper;
 
 private:
+  bool Enabled;
   std::string Error;
 };
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 741ffb8..00c0e82 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -266,7 +266,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& 
lff,
 pcmd->SetMakefile(this);
 
 // Decide whether to invoke the command.
-if (!cmSystemTools::GetFatalErrorOccured() &&
+if (pcmd->GetEnabled() && !cmSystemTools::GetFatalErrorOccured() &&
 (this->GetCMakeInstance()->GetWorkingMode() != cmake::SCRIPT_MODE ||
  pcmd->IsScriptable()))
 

---

Summary of changes:
 Source/cmCommand.h|   24 +++-
 Source/cmMakefile.cxx |2 +-
 2 files changed, 24 insertions(+), 2 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, next, updated. v3.7.0-rc2-683-g4df5915

[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  4df5915b50c57b3f028cb3fb7555c42384bd34e8 (commit)
   via  1a74e719068c97518d6f9521c86862a17166f32e (commit)
  from  50c3bb901aad305cb7bfa1971d0ee1aeac226389 (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=4df5915b50c57b3f028cb3fb7555c42384bd34e8
commit 4df5915b50c57b3f028cb3fb7555c42384bd34e8
Merge: 50c3bb9 1a74e71
Author: Brad King 
AuthorDate: Mon Oct 24 10:00:00 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 10:00:00 2016 -0400

Merge topic 'cm_unordered_map' into next

1a74e719 Introduce CM_UNORDERED_MAP


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a74e719068c97518d6f9521c86862a17166f32e
commit 1a74e719068c97518d6f9521c86862a17166f32e
Author: Daniel Pfeifer 
AuthorDate: Fri Oct 21 23:52:51 2016 +0200
Commit: Brad King 
CommitDate: Mon Oct 24 09:58:52 2016 -0400

Introduce CM_UNORDERED_MAP

Avoid duplicating switch among std::unordered_map, cmsys::hash_map, and
std::map.

diff --git a/Source/cmDefinitions.h b/Source/cmDefinitions.h
index 569b3a2..8dfb9ea 100644
--- a/Source/cmDefinitions.h
+++ b/Source/cmDefinitions.h
@@ -6,20 +6,11 @@
 #include 
 
 #include "cmLinkedTree.h"
+#include "cm_unordered_map.hxx"
 
 #include 
 #include 
 
-#if defined(CMAKE_BUILD_WITH_CMAKE)
-#ifdef CMake_HAVE_CXX_UNORDERED_MAP
-#include 
-#else
-#include "cmsys/hash_map.hxx"
-#endif
-#else
-#include 
-#endif
-
 /** \class cmDefinitions
  * \brief Store a scope of variable definitions for CMake language.
  *
@@ -85,15 +76,7 @@ private:
   };
   static Def NoDef;
 
-#if defined(CMAKE_BUILD_WITH_CMAKE)
-#ifdef CMake_HAVE_CXX_UNORDERED_MAP
-  typedef std::unordered_map MapType;
-#else
-  typedef cmsys::hash_map MapType;
-#endif
-#else
-  typedef std::map MapType;
-#endif
+  typedef CM_UNORDERED_MAP MapType;
   MapType Map;
 
   static Def const& GetInternal(const std::string& key, StackIter begin,
diff --git a/Source/cmFileTimeComparison.cxx b/Source/cmFileTimeComparison.cxx
index a6c9cd0..55d8c2a 100644
--- a/Source/cmFileTimeComparison.cxx
+++ b/Source/cmFileTimeComparison.cxx
@@ -7,14 +7,7 @@
 #include 
 #include 
 
-// Use a hash table to avoid duplicate file time checks from disk.
-#if defined(CMAKE_BUILD_WITH_CMAKE)
-#ifdef CMake_HAVE_CXX_UNORDERED_MAP
-#include 
-#else
-#include 
-#endif
-#endif
+#include "cm_unordered_map.hxx"
 
 // Use a platform-specific API to get file times efficiently.
 #if !defined(_WIN32) || defined(__CYGWIN__)
@@ -35,27 +28,9 @@ public:
   bool FileTimesDiffer(const char* f1, const char* f2);
 
 private:
-#if defined(CMAKE_BUILD_WITH_CMAKE)
-  // Use a hash table to efficiently map from file name to modification time.
-  class HashString
-  {
-  public:
-size_t operator()(const std::string& s) const { return h(s.c_str()); }
-#ifdef CMake_HAVE_CXX_UNORDERED_MAP
-std::hash h;
-#else
-cmsys::hash h;
-#endif
-  };
-#ifdef CMake_HAVE_CXX_UNORDERED_MAP
-  typedef std::unordered_map
+  typedef CM_UNORDERED_MAP
 FileStatsMap;
   FileStatsMap Files;
-#endif
 
   // Internal methods to lookup and compare modification times.
   inline bool Stat(const char* fname, cmFileTimeComparison_Type* st);
@@ -68,7 +43,6 @@ private:
 bool cmFileTimeComparisonInternal::Stat(const char* fname,
 cmFileTimeComparison_Type* st)
 {
-#if defined(CMAKE_BUILD_WITH_CMAKE)
   // Use the stored time if available.
   cmFileTimeComparisonInternal::FileStatsMap::iterator fit =
 this->Files.find(fname);
@@ -76,7 +50,6 @@ bool cmFileTimeComparisonInternal::Stat(const char* fname,
 *st = fit->second;
 return true;
   }
-#endif
 
 #if !defined(_WIN32) || defined(__CYGWIN__)
   // POSIX version.  Use the stat function.
@@ -97,11 +70,8 @@ bool cmFileTimeComparisonInternal::Stat(const char* fname,
   *st = fdata.ftLastWriteTime;
 #endif
 
-#if defined(CMAKE_BUILD_WITH_CMAKE)
   // Store the time for future use.
   this->Files[fname] = *st;
-#endif
-
   return true;
 }
 
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index d8d47a1..4bf4bd1 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -12,6 +12,7 @@
 #include "cmTarget.h"
 #include "cmTargetDepend.h"
 #include "cm_codecvt.hxx"
+#include "cm_unordered_map.hxx"
 
 #include 
 #include 
@@ -22,11 +23,6 @@
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 #include "cmFileLockPool.h"
-#ifdef CMake_HAVE_CXX_UNORDERED_MAP
-#include 
-#else
-#include 
-#endif
 #endif
 
 class cmCustomCommandLines;
@@ -468,22 +464,9 @@ protected:
   const char* GetPredefinedTargetsFolder()

[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-681-g50c3bb9

[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  50c3bb901aad305cb7bfa1971d0ee1aeac226389 (commit)
   via  b3b41d113196e5cd8bf8263f08c0ace03faa3ed6 (commit)
  from  e6402444f1f837efb452c50c106a738a66b59d48 (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=50c3bb901aad305cb7bfa1971d0ee1aeac226389
commit 50c3bb901aad305cb7bfa1971d0ee1aeac226389
Merge: e640244 b3b41d1
Author: Brad King 
AuthorDate: Mon Oct 24 09:57:22 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Oct 24 09:57:22 2016 -0400

Merge topic 'cm_unordered_map' into next

b3b41d11 fixup! Introduce CM_UNORDERED_MAP


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3b41d113196e5cd8bf8263f08c0ace03faa3ed6
commit b3b41d113196e5cd8bf8263f08c0ace03faa3ed6
Author: Brad King 
AuthorDate: Mon Oct 24 09:57:08 2016 -0400
Commit: Brad King 
CommitDate: Mon Oct 24 09:57:08 2016 -0400

fixup! Introduce CM_UNORDERED_MAP

diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index d6a0dfb..3067f2c 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -884,7 +884,7 @@ private:
*/
   cmSourceFile* LinearGetSourceFileWithOutput(const std::string& cname) const;
 
-// A map for fast output to input look up.
+  // A map for fast output to input look up.
   typedef CM_UNORDERED_MAP OutputToSourceMap;
   OutputToSourceMap OutputToSource;
 

---

Summary of changes:
 Source/cmMakefile.h |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