From kwrobot at kitware.com  Sun Jan  1 00:01:07 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Sun,  1 Jan 2017 00:01:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-920-gea0db79
Message-ID: <20170101050107.B392DFA103@public.kitware.com>

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  ea0db79e65fb943381c8a3358fd18ba2516e29bd (commit)
      from  fbf0f0b3b6a2a6c7cfd8bc7eca2cfbd0263670f9 (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=ea0db79e65fb943381c8a3358fd18ba2516e29bd
commit ea0db79e65fb943381c8a3358fd18ba2516e29bd
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sun Jan 1 00:01:03 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun Jan 1 00:01:03 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index a76da12..7614110 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 20161231)
+set(CMake_VERSION_PATCH 20170101)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Mon Jan  2 00:01:09 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Mon,  2 Jan 2017 00:01:09 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-921-gc8084b3
Message-ID: <20170102050109.CC044FA5FF@public.kitware.com>

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  c8084b3020b51150ecb5b1dc3b91758b171c93f4 (commit)
      from  ea0db79e65fb943381c8a3358fd18ba2516e29bd (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=c8084b3020b51150ecb5b1dc3b91758b171c93f4
commit c8084b3020b51150ecb5b1dc3b91758b171c93f4
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Mon Jan 2 00:01:06 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jan 2 00:01:06 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 7614110..e92bafa 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 20170101)
+set(CMake_VERSION_PATCH 20170102)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Tue Jan  3 00:01:07 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Tue,  3 Jan 2017 00:01:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-922-gbd9b53a
Message-ID: <20170103050107.68A4EFA637@public.kitware.com>

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  bd9b53ab33bb2185d526e8897cbd8f95c680b2c7 (commit)
      from  c8084b3020b51150ecb5b1dc3b91758b171c93f4 (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=bd9b53ab33bb2185d526e8897cbd8f95c680b2c7
commit bd9b53ab33bb2185d526e8897cbd8f95c680b2c7
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Tue Jan 3 00:01:04 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jan 3 00:01:04 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index e92bafa..3a63eac 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 20170102)
+set(CMake_VERSION_PATCH 20170103)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Wed Jan  4 00:01:07 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Wed,  4 Jan 2017 00:01:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-923-gc628fd2
Message-ID: <20170104050121.D7E2BFA562@public.kitware.com>

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  c628fd2fab273999e959aad00834369924dd9d06 (commit)
      from  bd9b53ab33bb2185d526e8897cbd8f95c680b2c7 (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=c628fd2fab273999e959aad00834369924dd9d06
commit c628fd2fab273999e959aad00834369924dd9d06
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Wed Jan 4 00:01:03 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jan 4 00:01:03 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 3a63eac..ff2c903 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 20170103)
+set(CMake_VERSION_PATCH 20170104)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From ben.boeckel at kitware.com  Wed Jan  4 08:06:01 2017
From: ben.boeckel at kitware.com (Ben Boeckel)
Date: Wed,  4 Jan 2017 08:06:01 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1877-gd0868c9
Message-ID: <20170104130601.89C49FA680@public.kitware.com>

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  d0868c9866d1bec94285c51bf2c6258e1c835223 (commit)
       via  78c5db6a0ad90eec54958e06e7b9dcac9b6cc8ab (commit)
      from  040e28be7c196697a103e19725d1c9ef392d2471 (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=d0868c9866d1bec94285c51bf2c6258e1c835223
commit d0868c9866d1bec94285c51bf2c6258e1c835223
Merge: 040e28b 78c5db6
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jan 4 08:05:59 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 4 08:05:59 2017 -0500

    Merge topic 'codeblocks-nmake-makefiles-jom' into next
    
    78c5db6a Allow CodeBlocks for NMake Makefiles JOM


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78c5db6a0ad90eec54958e06e7b9dcac9b6cc8ab
commit 78c5db6a0ad90eec54958e06e7b9dcac9b6cc8ab
Author:     Konstantin Podsvirov <konstantin at podsvirov.pro>
AuthorDate: Fri Dec 23 12:50:40 2016 +0300
Commit:     Konstantin Podsvirov <konstantin at podsvirov.pro>
CommitDate: Fri Dec 23 12:50:40 2016 +0300

    Allow CodeBlocks for NMake Makefiles JOM

diff --git a/Help/generator/CodeBlocks.rst b/Help/generator/CodeBlocks.rst
index 01798c7..d03cb0c 100644
--- a/Help/generator/CodeBlocks.rst
+++ b/Help/generator/CodeBlocks.rst
@@ -18,6 +18,9 @@ This "extra" generator may be specified as:
 ``CodeBlocks - NMake Makefiles``
  Generate with :generator:`NMake Makefiles`.
 
+``CodeBlocks - NMake Makefiles JOM``
+ Generate with :generator:`NMake Makefiles JOM`.
+
 ``CodeBlocks - Ninja``
  Generate with :generator:`Ninja`.
 
diff --git a/Help/release/3.7.rst b/Help/release/3.7.rst
index 4c51af4..e42ce48 100644
--- a/Help/release/3.7.rst
+++ b/Help/release/3.7.rst
@@ -46,6 +46,9 @@ Generators
   :variable:`CMAKE_CODELITE_USE_TARGETS` option
   to change project creation from projects to targets.
 
+* The :generator:`CodeBlocks` now can generate with
+  :generator:`NMake Makefiles JOM`.
+
 Commands
 --------
 
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 18c732d..bc81a6a 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -49,6 +49,7 @@ cmExtraCodeBlocksGenerator::GetFactory()
 #if defined(_WIN32)
     factory.AddSupportedGlobalGenerator("MinGW Makefiles");
     factory.AddSupportedGlobalGenerator("NMake Makefiles");
+    factory.AddSupportedGlobalGenerator("NMake Makefiles JOM");
 // disable until somebody actually tests it:
 // this->AddSupportedGlobalGenerator("MSYS Makefiles");
 #endif
@@ -743,7 +744,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
   }
 
   std::string generator = this->GlobalGenerator->GetName();
-  if (generator == "NMake Makefiles") {
+  if (generator == "NMake Makefiles" || generator == "NMake Makefiles JOM") {
     // For Windows ConvertToOutputPath already adds quotes when required.
     // These need to be escaped, see
     // https://gitlab.kitware.com/cmake/cmake/issues/13952

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

Summary of changes:
 Help/generator/CodeBlocks.rst         |    3 +++
 Help/release/3.7.rst                  |    3 +++
 Source/cmExtraCodeBlocksGenerator.cxx |    3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Thu Jan  5 00:01:08 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Thu,  5 Jan 2017 00:01:08 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-924-g5df77fb
Message-ID: <20170105050109.30A34FA681@public.kitware.com>

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  5df77fba5327ce78d297587be1a29fe7688b6b42 (commit)
      from  c628fd2fab273999e959aad00834369924dd9d06 (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=5df77fba5327ce78d297587be1a29fe7688b6b42
commit 5df77fba5327ce78d297587be1a29fe7688b6b42
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Thu Jan 5 00:01:05 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jan 5 00:01:05 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index ff2c903..4d7be8d 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 20170104)
+set(CMake_VERSION_PATCH 20170105)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Fri Jan  6 00:01:16 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Fri,  6 Jan 2017 00:01:16 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-925-g7373505
Message-ID: <20170106050116.980CAFA46E@public.kitware.com>

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  737350526234269b79c52f9dc567e0f1d93b13f2 (commit)
      from  5df77fba5327ce78d297587be1a29fe7688b6b42 (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=737350526234269b79c52f9dc567e0f1d93b13f2
commit 737350526234269b79c52f9dc567e0f1d93b13f2
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Fri Jan 6 00:01:04 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jan 6 00:01:04 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 4d7be8d..2ab85a8 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 20170105)
+set(CMake_VERSION_PATCH 20170106)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sat Jan  7 00:01:07 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Sat,  7 Jan 2017 00:01:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-926-g0d8874e
Message-ID: <20170107050107.6743FFA5D7@public.kitware.com>

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  0d8874e49374fda8513f1f3c5fa1797aa86d90ed (commit)
      from  737350526234269b79c52f9dc567e0f1d93b13f2 (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=0d8874e49374fda8513f1f3c5fa1797aa86d90ed
commit 0d8874e49374fda8513f1f3c5fa1797aa86d90ed
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sat Jan 7 00:01:03 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sat Jan 7 00:01:03 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 2ab85a8..0a050e0 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 20170106)
+set(CMake_VERSION_PATCH 20170107)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sun Jan  8 00:01:07 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Sun,  8 Jan 2017 00:01:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-927-g9cad0ec
Message-ID: <20170108050108.986B6FA5D5@public.kitware.com>

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  9cad0ec691f3d019a8737c4a6bb61c11573e6062 (commit)
      from  0d8874e49374fda8513f1f3c5fa1797aa86d90ed (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=9cad0ec691f3d019a8737c4a6bb61c11573e6062
commit 9cad0ec691f3d019a8737c4a6bb61c11573e6062
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sun Jan 8 00:01:04 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun Jan 8 00:01:04 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 0a050e0..d6394db 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 20170107)
+set(CMake_VERSION_PATCH 20170108)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Mon Jan  9 00:01:07 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Mon,  9 Jan 2017 00:01:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-928-g976574b
Message-ID: <20170109050107.279DCFA567@public.kitware.com>

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  976574b01009e11326c7894edf35a4f315b216d4 (commit)
      from  9cad0ec691f3d019a8737c4a6bb61c11573e6062 (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=976574b01009e11326c7894edf35a4f315b216d4
commit 976574b01009e11326c7894edf35a4f315b216d4
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Mon Jan 9 00:01:04 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jan 9 00:01:04 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index d6394db..6b0bfe4 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 20170108)
+set(CMake_VERSION_PATCH 20170109)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan  9 15:46:50 2017
From: brad.king at kitware.com (Brad King)
Date: Mon,  9 Jan 2017 15:46:50 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1879-g6681122
Message-ID: <20170109204650.E4C77FA2F0@public.kitware.com>

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  6681122a8fd8d93bb49c79d8ba448fc870fd6747 (commit)
       via  2a9429bbd2b67c9c639492bafc645ddd1eeee7c7 (commit)
      from  d0868c9866d1bec94285c51bf2c6258e1c835223 (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=6681122a8fd8d93bb49c79d8ba448fc870fd6747
commit 6681122a8fd8d93bb49c79d8ba448fc870fd6747
Merge: d0868c9 2a9429b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 15:46:49 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 15:46:49 2017 -0500

    Merge topic '16253-xcode-effective-platform-name' into next
    
    2a9429bb Revert topic '16253-xcode-effective-platform-name'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a9429bbd2b67c9c639492bafc645ddd1eeee7c7
commit 2a9429bbd2b67c9c639492bafc645ddd1eeee7c7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 15:46:26 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 9 15:46:26 2017 -0500

    Revert topic '16253-xcode-effective-platform-name'
    
    It needs some revision and test fixes.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c2a76e4..b6db0d6 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4419,9 +4419,9 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
 
   // The generator may add the configuration's subdirectory.
   if (!conf.empty()) {
-    bool useEPN = this->Makefile->ShouldEmitEffectivePlatformName();
+    bool iosPlatform = this->Makefile->PlatformIsAppleIos();
     std::string suffix =
-      usesDefaultOutputDir && useEPN ? "${EFFECTIVE_PLATFORM_NAME}" : "";
+      usesDefaultOutputDir && iosPlatform ? "${EFFECTIVE_PLATFORM_NAME}" : "";
     this->LocalGenerator->GetGlobalGenerator()->AppendDirectoryForConfig(
       "/", conf, suffix, out);
   }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index c2767f0..2808051 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2342,8 +2342,8 @@ void cmGlobalGenerator::AddGlobalTarget_Install(
     singleLine.push_back(cmd);
     if (cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.') {
       std::string cfgArg = "-DBUILD_TYPE=";
-      bool useEPN = mf->ShouldEmitEffectivePlatformName();
-      if (useEPN) {
+      bool iosPlatform = mf->PlatformIsAppleIos();
+      if (iosPlatform) {
         cfgArg += "$(CONFIGURATION)";
         singleLine.push_back(cfgArg);
         cfgArg = "-DEFFECTIVE_PLATFORM_NAME=$(EFFECTIVE_PLATFORM_NAME)";
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0656b0a..fccb486 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2184,22 +2184,6 @@ bool cmMakefile::PlatformIsAppleIos() const
   return false;
 }
 
-bool cmMakefile::ShouldEmitEffectivePlatformName() const
-{
-  bool isXcode = this->IsOn("XCODE");
-  if (!isXcode) {
-    return false;
-  }
-
-  const char* xcodeVersion = this->GetDefinition("XCODE_VERSION");
-  if (!xcodeVersion ||
-      cmSystemTools::VersionCompareGreater("5", xcodeVersion)) {
-    return false;
-  }
-
-  return true;
-}
-
 const char* cmMakefile::GetSONameFlag(const std::string& language) const
 {
   std::string name = "CMAKE_SHARED_LIBRARY_SONAME";
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index f929951..3484e5a 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -427,9 +427,6 @@ public:
   /** Return whether the target platform is Apple iOS.  */
   bool PlatformIsAppleIos() const;
 
-  /** Return whether the generator should use EFFECTIVE_PLATFORM_NAME.  */
-  bool ShouldEmitEffectivePlatformName() const;
-
   /** Retrieve soname flag for the specified language if supported */
   const char* GetSONameFlag(const std::string& language) const;
 
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index 57766db..60912c2 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -18,27 +18,6 @@ run_cmake(PerConfigPerSourceFlags)
 # Use a single build tree for a few tests without cleaning.
 
 if(NOT XCODE_VERSION VERSION_LESS 5)
-  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeMultiplatform-build)
-  set(RunCMake_TEST_NO_CLEAN 1)
-  set(RunCMake_TEST_OPTIONS)
-
-  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
-  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
-
-  run_cmake(XcodeMultiplatform)
-
-  run_cmake_command(XcodeMultiplatform-macosx-build ${CMAKE_COMMAND} --build . -- -sdk macosx)
-  run_cmake_command(XcodeMultiplatform-iphonesimulator-build ${CMAKE_COMMAND} --build . -- -sdk iphonesimulator)
-
-  run_cmake_command(XcodeMultiplatform-macosx-install ${CMAKE_COMMAND} --build . --target install -- -sdk macosx DESTDIR=${RunCMake_TEST_BINARY_DIR}/_install_macosx)
-  run_cmake_command(XcodeMultiplatform-iphonesimulator-install ${CMAKE_COMMAND} --build . --target install -- -sdk iphonesimulator DESTDIR=${RunCMake_TEST_BINARY_DIR}/_install_iphonesimulator)
-
-  unset(RunCMake_TEST_BINARY_DIR)
-  unset(RunCMake_TEST_NO_CLEAN)
-  unset(RunCMake_TEST_OPTIONS)
-endif()
-
-if(NOT XCODE_VERSION VERSION_LESS 5)
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeInstallIOS-build)
   set(RunCMake_TEST_NO_CLEAN 1)
   set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_BINARY_DIR}/ios_install")
diff --git a/Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake b/Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake
deleted file mode 100644
index 166ce85..0000000
--- a/Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-cmake_minimum_required(VERSION 3.3)
-enable_language(CXX)
-
-set(CMAKE_XCODE_ATTRIBUTE_SUPPORTED_PLATFORMS "macosx iphonesimulator")
-set(CMAKE_MACOSX_BUNDLE true)
-
-add_library(library STATIC foo.cpp)
-
-add_executable(main main.cpp)
-target_link_libraries(main library)
-
-install(TARGETS library ARCHIVE DESTINATION lib)

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

Summary of changes:
 Source/cmGeneratorTarget.cxx                       |    4 ++--
 Source/cmGlobalGenerator.cxx                       |    4 ++--
 Source/cmMakefile.cxx                              |   16 ---------------
 Source/cmMakefile.h                                |    3 ---
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake     |   21 --------------------
 .../RunCMake/XcodeProject/XcodeMultiplatform.cmake |   12 -----------
 6 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan  9 15:55:03 2017
From: brad.king at kitware.com (Brad King)
Date: Mon,  9 Jan 2017 15:55:03 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1881-gd497b25
Message-ID: <20170109205503.27308FA567@public.kitware.com>

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  d497b25dcc2d84a7222b32182586ecc4995221ec (commit)
       via  cda9a904b5ef76d923a072a45c0c15fd1d87d6be (commit)
      from  6681122a8fd8d93bb49c79d8ba448fc870fd6747 (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=d497b25dcc2d84a7222b32182586ecc4995221ec
commit d497b25dcc2d84a7222b32182586ecc4995221ec
Merge: 6681122 cda9a90
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 15:55:02 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 15:55:02 2017 -0500

    Merge topic 'sparc-libatomic' into next
    
    cda9a904 Explicitly link against libatomic on Linux/sparc for `__atomic_fetch_add_4`


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cda9a904b5ef76d923a072a45c0c15fd1d87d6be
commit cda9a904b5ef76d923a072a45c0c15fd1d87d6be
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Dec 19 14:47:01 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 9 15:51:35 2017 -0500

    Explicitly link against libatomic on Linux/sparc for `__atomic_fetch_add_4`
    
    On this platform atomic instructions are implemented using `libatomic`
    so we need to link it to use them.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index d15fdbe..388bf89 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -785,6 +785,15 @@ target_link_libraries(CMakeLib cmsys
   ${CMake_KWIML_LIBRARIES}
   )
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
+  # the atomic instructions are implemented using libatomic on some platforms,
+  # so linking to that may be required
+  check_library_exists(atomic __atomic_fetch_add_4 "" LIBATOMIC_NEEDED)
+  if(LIBATOMIC_NEEDED)
+    target_link_libraries(CMakeLib atomic)
+  endif()
+endif()
+
 # On Apple we need CoreFoundation
 if(APPLE)
   target_link_libraries(CMakeLib "-framework CoreFoundation")

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan  9 16:01:56 2017
From: brad.king at kitware.com (Brad King)
Date: Mon,  9 Jan 2017 16:01:56 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1883-g07d6480
Message-ID: <20170109210156.381F6FA5B9@public.kitware.com>

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  07d64808b353bb14faa959596f0489a17f5f85f6 (commit)
       via  567a4fe9b1984d5c770afab8bd677bcee3841659 (commit)
      from  d497b25dcc2d84a7222b32182586ecc4995221ec (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=07d64808b353bb14faa959596f0489a17f5f85f6
commit 07d64808b353bb14faa959596f0489a17f5f85f6
Merge: d497b25 567a4fe
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:01:55 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 16:01:55 2017 -0500

    Merge topic 'read-only-type-target-property' into next
    
    567a4fe9 Revert "cmTarget: Enforce TYPE being a read-only property"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=567a4fe9b1984d5c770afab8bd677bcee3841659
commit 567a4fe9b1984d5c770afab8bd677bcee3841659
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:01:40 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 9 16:01:40 2017 -0500

    Revert "cmTarget: Enforce TYPE being a read-only property"
    
    This reverts commit fd466d3fd3070b36aadbd7457ddb644b33d40a61.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 9261ca8..ee4ff39 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -858,12 +858,6 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
   }
-  if (prop == "TYPE") {
-    std::ostringstream e;
-    e << "TYPE property is read-only\n";
-    this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
-    return;
-  }
   if (prop == "EXPORT_NAME" && this->IsImported()) {
     std::ostringstream e;
     e << "EXPORT_NAME property can't be set on imported targets (\""
diff --git a/Tests/RunCMake/set_property/RunCMakeTest.cmake b/Tests/RunCMake/set_property/RunCMakeTest.cmake
index 1ddacee..37c7124 100644
--- a/Tests/RunCMake/set_property/RunCMakeTest.cmake
+++ b/Tests/RunCMake/set_property/RunCMakeTest.cmake
@@ -6,5 +6,4 @@ run_cmake(COMPILE_OPTIONS)
 run_cmake(INCLUDE_DIRECTORIES)
 run_cmake(LINK_LIBRARIES)
 run_cmake(SOURCES)
-run_cmake(TYPE)
 run_cmake(USER_PROP)
diff --git a/Tests/RunCMake/set_property/TYPE-result.txt b/Tests/RunCMake/set_property/TYPE-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/set_property/TYPE-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/set_property/TYPE-stderr.txt b/Tests/RunCMake/set_property/TYPE-stderr.txt
deleted file mode 100644
index 6226051..0000000
--- a/Tests/RunCMake/set_property/TYPE-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-TYPE property is read-only
\ No newline at end of file
diff --git a/Tests/RunCMake/set_property/TYPE.cmake b/Tests/RunCMake/set_property/TYPE.cmake
deleted file mode 100644
index 8481266..0000000
--- a/Tests/RunCMake/set_property/TYPE.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-add_custom_target(CustomTarget)
-set_property(TARGET CustomTarget PROPERTY TYPE foo)

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

Summary of changes:
 Source/cmTarget.cxx                            |    6 ------
 Tests/RunCMake/set_property/RunCMakeTest.cmake |    1 -
 Tests/RunCMake/set_property/TYPE-result.txt    |    1 -
 Tests/RunCMake/set_property/TYPE-stderr.txt    |    1 -
 Tests/RunCMake/set_property/TYPE.cmake         |    2 --
 5 files changed, 11 deletions(-)
 delete mode 100644 Tests/RunCMake/set_property/TYPE-result.txt
 delete mode 100644 Tests/RunCMake/set_property/TYPE-stderr.txt
 delete mode 100644 Tests/RunCMake/set_property/TYPE.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan  9 16:02:08 2017
From: brad.king at kitware.com (Brad King)
Date: Mon,  9 Jan 2017 16:02:08 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1885-g8be34d3
Message-ID: <20170109210208.9F95CFA5B9@public.kitware.com>

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  8be34d3d4c4669793f8a400dfa111230d92af701 (commit)
       via  98f2143305b8b8c5ce08dfa38ee79750696865a6 (commit)
      from  07d64808b353bb14faa959596f0489a17f5f85f6 (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=8be34d3d4c4669793f8a400dfa111230d92af701
commit 8be34d3d4c4669793f8a400dfa111230d92af701
Merge: 07d6480 98f2143
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:02:07 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 16:02:07 2017 -0500

    Merge topic 'read-only-type-target-property' into next
    
    98f21433 cmTarget: Enforce TYPE being a read-only property


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98f2143305b8b8c5ce08dfa38ee79750696865a6
commit 98f2143305b8b8c5ce08dfa38ee79750696865a6
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Thu Dec 29 23:11:50 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 9 16:00:39 2017 -0500

    cmTarget: Enforce TYPE being a read-only property

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ee4ff39..9261ca8 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -858,6 +858,12 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
   }
+  if (prop == "TYPE") {
+    std::ostringstream e;
+    e << "TYPE property is read-only\n";
+    this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
+    return;
+  }
   if (prop == "EXPORT_NAME" && this->IsImported()) {
     std::ostringstream e;
     e << "EXPORT_NAME property can't be set on imported targets (\""
diff --git a/Tests/RunCMake/set_property/RunCMakeTest.cmake b/Tests/RunCMake/set_property/RunCMakeTest.cmake
index 37c7124..1ddacee 100644
--- a/Tests/RunCMake/set_property/RunCMakeTest.cmake
+++ b/Tests/RunCMake/set_property/RunCMakeTest.cmake
@@ -6,4 +6,5 @@ run_cmake(COMPILE_OPTIONS)
 run_cmake(INCLUDE_DIRECTORIES)
 run_cmake(LINK_LIBRARIES)
 run_cmake(SOURCES)
+run_cmake(TYPE)
 run_cmake(USER_PROP)
diff --git a/Tests/RunCMake/set_property/TYPE-result.txt b/Tests/RunCMake/set_property/TYPE-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/set_property/TYPE-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/set_property/TYPE-stderr.txt b/Tests/RunCMake/set_property/TYPE-stderr.txt
new file mode 100644
index 0000000..fbc8653
--- /dev/null
+++ b/Tests/RunCMake/set_property/TYPE-stderr.txt
@@ -0,0 +1 @@
+TYPE property is read-only
diff --git a/Tests/RunCMake/set_property/TYPE.cmake b/Tests/RunCMake/set_property/TYPE.cmake
new file mode 100644
index 0000000..8481266
--- /dev/null
+++ b/Tests/RunCMake/set_property/TYPE.cmake
@@ -0,0 +1,2 @@
+add_custom_target(CustomTarget)
+set_property(TARGET CustomTarget PROPERTY TYPE foo)

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

Summary of changes:
 Source/cmTarget.cxx                                              |    6 ++++++
 Tests/RunCMake/set_property/RunCMakeTest.cmake                   |    1 +
 .../BadSYSROOT-result.txt => set_property/TYPE-result.txt}       |    0
 Tests/RunCMake/set_property/TYPE-stderr.txt                      |    1 +
 Tests/RunCMake/set_property/TYPE.cmake                           |    2 ++
 5 files changed, 10 insertions(+)
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => set_property/TYPE-result.txt} (100%)
 create mode 100644 Tests/RunCMake/set_property/TYPE-stderr.txt
 create mode 100644 Tests/RunCMake/set_property/TYPE.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan  9 16:06:30 2017
From: brad.king at kitware.com (Brad King)
Date: Mon,  9 Jan 2017 16:06:30 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1887-g73677b9
Message-ID: <20170109210631.5CB79FA5F3@public.kitware.com>

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  73677b9fab31d1f68cf0d5dfe2bb68f4b9887d81 (commit)
       via  cfbc407faab422db01e4a7d2c4e5a7c3acdc9951 (commit)
      from  8be34d3d4c4669793f8a400dfa111230d92af701 (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=73677b9fab31d1f68cf0d5dfe2bb68f4b9887d81
commit 73677b9fab31d1f68cf0d5dfe2bb68f4b9887d81
Merge: 8be34d3 cfbc407
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:06:29 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 16:06:29 2017 -0500

    Merge topic 'gcc-34-features' into next
    
    cfbc407f Revert topic 'gcc-34-features'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfbc407faab422db01e4a7d2c4e5a7c3acdc9951
commit cfbc407faab422db01e4a7d2c4e5a7c3acdc9951
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:06:14 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 9 16:06:14 2017 -0500

    Revert topic 'gcc-34-features'
    
    It will be revised and restored with an alternative approach.

diff --git a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
index 7da526a..9b35f27 100644
--- a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
@@ -32,14 +32,14 @@ if (CMAKE_CXX_COMPILE_FEATURES)
   endif()
   add_executable(target_compile_features${target_suffix} main.cpp)
   target_compile_features(target_compile_features${target_suffix}
-    PRIVATE cxx_long_long_type
+    PRIVATE cxx_auto_type
   )
 
-  add_library(lib_long_long_type lib_long_long_type.cpp)
-  target_compile_features(lib_long_long_type
-    PUBLIC cxx_long_long_type
+  add_library(lib_auto_type lib_auto_type.cpp)
+  target_compile_features(lib_auto_type
+    PUBLIC cxx_auto_type
   )
 
   add_executable(lib_user lib_user.cpp)
-  target_link_libraries(lib_user lib_long_long_type)
+  target_link_libraries(lib_user lib_auto_type)
 endif()
diff --git a/Tests/CMakeCommands/target_compile_features/lib_auto_type.cpp b/Tests/CMakeCommands/target_compile_features/lib_auto_type.cpp
new file mode 100644
index 0000000..71b2215
--- /dev/null
+++ b/Tests/CMakeCommands/target_compile_features/lib_auto_type.cpp
@@ -0,0 +1,6 @@
+
+int getAutoTypeImpl()
+{
+  auto i = 0;
+  return i;
+}
diff --git a/Tests/CMakeCommands/target_compile_features/lib_auto_type.h b/Tests/CMakeCommands/target_compile_features/lib_auto_type.h
new file mode 100644
index 0000000..c825b10
--- /dev/null
+++ b/Tests/CMakeCommands/target_compile_features/lib_auto_type.h
@@ -0,0 +1,8 @@
+
+int getAutoTypeImpl();
+
+int getAutoType()
+{
+  auto i = getAutoTypeImpl();
+  return i;
+}
diff --git a/Tests/CMakeCommands/target_compile_features/lib_long_long_type.cpp b/Tests/CMakeCommands/target_compile_features/lib_long_long_type.cpp
deleted file mode 100644
index 4d3a896..0000000
--- a/Tests/CMakeCommands/target_compile_features/lib_long_long_type.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-
-int getLLTypeImpl(long long &l)
-{
-  int i = 64;
-  while(l) {
-    if(l & 1)
-      i--;
-    l >>= 1;
-  }
-  return i;
-}
diff --git a/Tests/CMakeCommands/target_compile_features/lib_long_long_type.h b/Tests/CMakeCommands/target_compile_features/lib_long_long_type.h
deleted file mode 100644
index 8111382..0000000
--- a/Tests/CMakeCommands/target_compile_features/lib_long_long_type.h
+++ /dev/null
@@ -1,8 +0,0 @@
-
-int getLLTypeImpl(long long &);
-
-int getLLType(int i)
-{
-  long long l = i;
-  return getLLTypeImpl(l);
-}
diff --git a/Tests/CMakeCommands/target_compile_features/lib_user.cpp b/Tests/CMakeCommands/target_compile_features/lib_user.cpp
index 8e6f860..541e528 100644
--- a/Tests/CMakeCommands/target_compile_features/lib_user.cpp
+++ b/Tests/CMakeCommands/target_compile_features/lib_user.cpp
@@ -1,7 +1,7 @@
 
-#include "lib_long_long_type.h"
+#include "lib_auto_type.h"
 
 int main(int argc, char** argv)
 {
-  return getLLType(42);
+  return getAutoType();
 }
diff --git a/Tests/CMakeCommands/target_compile_features/main.cpp b/Tests/CMakeCommands/target_compile_features/main.cpp
index aee232a..6f5daee 100644
--- a/Tests/CMakeCommands/target_compile_features/main.cpp
+++ b/Tests/CMakeCommands/target_compile_features/main.cpp
@@ -1,6 +1,6 @@
 
 int main(int, char**)
 {
-  long long i = 1 << 31;
-  return (i << 1) == 0;
+  auto i = 0;
+  return i;
 }
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 7c5aa88..0405def 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -278,7 +278,7 @@ if (CMAKE_CXX_COMPILE_FEATURES)
 
   add_executable(CompileFeatures main.cpp)
   set_property(TARGET CompileFeatures
-    PROPERTY COMPILE_FEATURES "cxx_long_long_type"
+    PROPERTY COMPILE_FEATURES "cxx_auto_type"
   )
   set_property(TARGET CompileFeatures
     PROPERTY CXX_STANDARD_REQUIRED TRUE
@@ -291,7 +291,7 @@ if (CMAKE_CXX_COMPILE_FEATURES)
 
   add_library(iface INTERFACE)
   set_property(TARGET iface
-    PROPERTY INTERFACE_COMPILE_FEATURES "cxx_long_long_type"
+    PROPERTY INTERFACE_COMPILE_FEATURES "cxx_auto_type"
   )
   add_executable(IfaceCompileFeatures main.cpp)
   target_link_libraries(IfaceCompileFeatures iface)
diff --git a/Tests/CompileFeatures/main.cpp b/Tests/CompileFeatures/main.cpp
index 5472cab..c5a7a46 100644
--- a/Tests/CompileFeatures/main.cpp
+++ b/Tests/CompileFeatures/main.cpp
@@ -1,6 +1,6 @@
 
 int main(int, char**)
 {
-  long long value = 1 << 31;
-  return (value << 1) == 0;
+  auto value = 0;
+  return value;
 }

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

Summary of changes:
 Tests/CMakeCommands/target_compile_features/CMakeLists.txt  |   10 +++++-----
 .../CMakeCommands/target_compile_features/lib_auto_type.cpp |    6 ++++++
 Tests/CMakeCommands/target_compile_features/lib_auto_type.h |    8 ++++++++
 .../target_compile_features/lib_long_long_type.cpp          |   11 -----------
 .../target_compile_features/lib_long_long_type.h            |    8 --------
 Tests/CMakeCommands/target_compile_features/lib_user.cpp    |    4 ++--
 Tests/CMakeCommands/target_compile_features/main.cpp        |    4 ++--
 Tests/CompileFeatures/CMakeLists.txt                        |    4 ++--
 Tests/CompileFeatures/main.cpp                              |    4 ++--
 9 files changed, 27 insertions(+), 32 deletions(-)
 create mode 100644 Tests/CMakeCommands/target_compile_features/lib_auto_type.cpp
 create mode 100644 Tests/CMakeCommands/target_compile_features/lib_auto_type.h
 delete mode 100644 Tests/CMakeCommands/target_compile_features/lib_long_long_type.cpp
 delete mode 100644 Tests/CMakeCommands/target_compile_features/lib_long_long_type.h


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan  9 16:11:59 2017
From: brad.king at kitware.com (Brad King)
Date: Mon,  9 Jan 2017 16:11:59 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1899-gc354e66
Message-ID: <20170109211159.9B237F7866@public.kitware.com>

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  c354e6695678ce81925ff73327bdfb4f7b5f9b7b (commit)
       via  976574b01009e11326c7894edf35a4f315b216d4 (commit)
       via  9cad0ec691f3d019a8737c4a6bb61c11573e6062 (commit)
       via  0d8874e49374fda8513f1f3c5fa1797aa86d90ed (commit)
       via  737350526234269b79c52f9dc567e0f1d93b13f2 (commit)
       via  5df77fba5327ce78d297587be1a29fe7688b6b42 (commit)
       via  c628fd2fab273999e959aad00834369924dd9d06 (commit)
       via  bd9b53ab33bb2185d526e8897cbd8f95c680b2c7 (commit)
       via  c8084b3020b51150ecb5b1dc3b91758b171c93f4 (commit)
       via  ea0db79e65fb943381c8a3358fd18ba2516e29bd (commit)
       via  fbf0f0b3b6a2a6c7cfd8bc7eca2cfbd0263670f9 (commit)
       via  da04b68f3937ae2d4497068b41e7cd69d449320a (commit)
      from  73677b9fab31d1f68cf0d5dfe2bb68f4b9887d81 (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=c354e6695678ce81925ff73327bdfb4f7b5f9b7b
commit c354e6695678ce81925ff73327bdfb4f7b5f9b7b
Merge: 73677b9 976574b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:11:50 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 9 16:11:50 2017 -0500

    Merge branch 'master' into next


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan  9 16:17:10 2017
From: brad.king at kitware.com (Brad King)
Date: Mon,  9 Jan 2017 16:17:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1901-g12663fc
Message-ID: <20170109211710.C2396F9AF6@public.kitware.com>

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  12663fc8718aa156afdf43697193747b35348988 (commit)
       via  2f4e5ed66dc34a5f4ecb80d38d291d1e78ac12f7 (commit)
      from  c354e6695678ce81925ff73327bdfb4f7b5f9b7b (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=12663fc8718aa156afdf43697193747b35348988
commit 12663fc8718aa156afdf43697193747b35348988
Merge: c354e66 2f4e5ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:17:10 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 16:17:10 2017 -0500

    Merge topic 'cpack-deb-package-version-override-fix' into next
    
    2f4e5ed6 CPackDeb: use CPACK_DEBIAN_PACKAGE_VERSION


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f4e5ed66dc34a5f4ecb80d38d291d1e78ac12f7
commit 2f4e5ed66dc34a5f4ecb80d38d291d1e78ac12f7
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Tue Dec 20 14:09:20 2016 +0100
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Tue Dec 20 14:09:20 2016 +0100

    CPackDeb: use CPACK_DEBIAN_PACKAGE_VERSION

diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index bee69d9..ddf8b23 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -914,7 +914,7 @@ function(cpack_deb_prepare_package_vars)
         extract_so_info("${_FILE}" libname soversion)
         if(libname AND soversion)
           list(APPEND CPACK_DEBIAN_PACKAGE_SHLIBS_LIST
-               "${libname} ${soversion} ${CPACK_DEBIAN_PACKAGE_NAME} (${CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY} ${CPACK_PACKAGE_VERSION})")
+               "${libname} ${soversion} ${CPACK_DEBIAN_PACKAGE_NAME} (${CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY} ${CPACK_DEBIAN_PACKAGE_VERSION})")
         else()
           message(AUTHOR_WARNING "Shared library '${_FILE}' is missing soname or soversion. Library will not be added to DEBIAN/shlibs control file.")
         endif()
@@ -967,7 +967,7 @@ function(cpack_deb_prepare_package_vars)
       # Patch package file name to be in corrent debian format:
       # <foo>_<VersionNumber>-<DebianRevisionNumber>_<DebianArchitecture>.deb
       set(CPACK_OUTPUT_FILE_NAME
-        "${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
+        "${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
     else()
       cmake_policy(PUSH)
         cmake_policy(SET CMP0010 NEW)

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan  9 16:27:18 2017
From: brad.king at kitware.com (Brad King)
Date: Mon,  9 Jan 2017 16:27:18 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-930-g8f9e088
Message-ID: <20170109212718.97681F9FE7@public.kitware.com>

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  8f9e0884d4f948526c08c35dde345a142352d549 (commit)
       via  4087d0ae85cd9835296a82e0d5a63db0feabcb93 (commit)
      from  976574b01009e11326c7894edf35a4f315b216d4 (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=8f9e0884d4f948526c08c35dde345a142352d549
commit 8f9e0884d4f948526c08c35dde345a142352d549
Merge: 976574b 4087d0a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:27:16 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 16:27:16 2017 -0500

    Merge topic 'pgi-ninja-fortran'
    
    4087d0ae PGI: Add support for Fortran with the Ninja generator


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

Summary of changes:
 Modules/Compiler/PGI-Fortran.cmake |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan  9 16:27:21 2017
From: brad.king at kitware.com (Brad King)
Date: Mon,  9 Jan 2017 16:27:21 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-932-ga0ed39a
Message-ID: <20170109212721.CA4C1F9AEE@public.kitware.com>

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  a0ed39ac2207edbda08b1459096d2c1bf757cc71 (commit)
       via  7789dd9a1ae79d6747883739a21cf90c139d1e54 (commit)
      from  8f9e0884d4f948526c08c35dde345a142352d549 (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=a0ed39ac2207edbda08b1459096d2c1bf757cc71
commit a0ed39ac2207edbda08b1459096d2c1bf757cc71
Merge: 8f9e088 7789dd9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:27:19 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 16:27:19 2017 -0500

    Merge topic 'mr-reset-error-flag-on-configure'
    
    7789dd9a server-mode: Call ResetErrorOccured before configure


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

Summary of changes:
 Source/cmServerProtocol.cxx |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan  9 16:27:24 2017
From: brad.king at kitware.com (Brad King)
Date: Mon,  9 Jan 2017 16:27:24 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-934-g0dabeb6
Message-ID: <20170109212724.D8473FA031@public.kitware.com>

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  0dabeb6024b352bc7d5f9e1dce63ad87186ce36f (commit)
       via  8e4d286e7b105407d523ccf745198d0400b5fdb3 (commit)
      from  a0ed39ac2207edbda08b1459096d2c1bf757cc71 (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=0dabeb6024b352bc7d5f9e1dce63ad87186ce36f
commit 0dabeb6024b352bc7d5f9e1dce63ad87186ce36f
Merge: a0ed39a 8e4d286
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:27:22 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 16:27:22 2017 -0500

    Merge topic 'fix-required-var-error-typo'
    
    8e4d286e Fix typo in error message on missing required variable


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan  9 16:27:27 2017
From: brad.king at kitware.com (Brad King)
Date: Mon,  9 Jan 2017 16:27:27 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-936-gcda3a69
Message-ID: <20170109212727.E5B0EFA00C@public.kitware.com>

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  cda3a69b1bcc2e83806f7423c6970a794be8261f (commit)
       via  98f2143305b8b8c5ce08dfa38ee79750696865a6 (commit)
      from  0dabeb6024b352bc7d5f9e1dce63ad87186ce36f (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=cda3a69b1bcc2e83806f7423c6970a794be8261f
commit cda3a69b1bcc2e83806f7423c6970a794be8261f
Merge: 0dabeb6 98f2143
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:27:25 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 16:27:25 2017 -0500

    Merge topic 'read-only-type-target-property'
    
    98f21433 cmTarget: Enforce TYPE being a read-only property


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

Summary of changes:
 Source/cmTarget.cxx                                              |    6 ++++++
 Tests/RunCMake/set_property/RunCMakeTest.cmake                   |    1 +
 .../BadSYSROOT-result.txt => set_property/TYPE-result.txt}       |    0
 Tests/RunCMake/set_property/TYPE-stderr.txt                      |    1 +
 Tests/RunCMake/set_property/TYPE.cmake                           |    2 ++
 5 files changed, 10 insertions(+)
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => set_property/TYPE-result.txt} (100%)
 create mode 100644 Tests/RunCMake/set_property/TYPE-stderr.txt
 create mode 100644 Tests/RunCMake/set_property/TYPE.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan  9 16:27:30 2017
From: brad.king at kitware.com (Brad King)
Date: Mon,  9 Jan 2017 16:27:30 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-938-g4ce6cd2
Message-ID: <20170109212730.AD86EFA0A9@public.kitware.com>

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  4ce6cd2bcfa847fe2e9926d97f27be1d89fe1c4b (commit)
       via  88f07fb417a25f98662da2abf09a9db03f48eb7f (commit)
      from  cda3a69b1bcc2e83806f7423c6970a794be8261f (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=4ce6cd2bcfa847fe2e9926d97f27be1d89fe1c4b
commit 4ce6cd2bcfa847fe2e9926d97f27be1d89fe1c4b
Merge: cda3a69 88f07fb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:27:28 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 16:27:28 2017 -0500

    Merge topic '15687-revisit-xcode-system-include'
    
    88f07fb4 Xcode: Properly mark SYSTEM includes as such


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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx                      |   16 ++++++++++++++++
 Tests/IncludeDirectories/CMakeLists.txt                |    4 +++-
 .../SystemIncludeDirectories/CMakeLists.txt            |   15 +++++++++++----
 3 files changed, 30 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan  9 16:27:33 2017
From: brad.king at kitware.com (Brad King)
Date: Mon,  9 Jan 2017 16:27:33 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-940-geee51e2
Message-ID: <20170109212733.7F3F8FA0AC@public.kitware.com>

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  eee51e24d2290771ad3dded566ef897243f21331 (commit)
       via  2f4e5ed66dc34a5f4ecb80d38d291d1e78ac12f7 (commit)
      from  4ce6cd2bcfa847fe2e9926d97f27be1d89fe1c4b (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=eee51e24d2290771ad3dded566ef897243f21331
commit eee51e24d2290771ad3dded566ef897243f21331
Merge: 4ce6cd2 2f4e5ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:27:31 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 16:27:31 2017 -0500

    Merge topic 'cpack-deb-package-version-override-fix'
    
    2f4e5ed6 CPackDeb: use CPACK_DEBIAN_PACKAGE_VERSION


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

Summary of changes:
 Modules/CPackDeb.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan  9 16:27:54 2017
From: brad.king at kitware.com (Brad King)
Date: Mon,  9 Jan 2017 16:27:54 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1908-g0e1c33d
Message-ID: <20170109212754.19D78FA0A9@public.kitware.com>

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  0e1c33dcb83294825f0f1785895684721f99875b (commit)
       via  eee51e24d2290771ad3dded566ef897243f21331 (commit)
       via  4ce6cd2bcfa847fe2e9926d97f27be1d89fe1c4b (commit)
       via  cda3a69b1bcc2e83806f7423c6970a794be8261f (commit)
       via  0dabeb6024b352bc7d5f9e1dce63ad87186ce36f (commit)
       via  a0ed39ac2207edbda08b1459096d2c1bf757cc71 (commit)
       via  8f9e0884d4f948526c08c35dde345a142352d549 (commit)
      from  12663fc8718aa156afdf43697193747b35348988 (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=0e1c33dcb83294825f0f1785895684721f99875b
commit 0e1c33dcb83294825f0f1785895684721f99875b
Merge: 12663fc eee51e2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:27:42 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 9 16:27:42 2017 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan  9 16:33:19 2017
From: brad.king at kitware.com (Brad King)
Date: Mon,  9 Jan 2017 16:33:19 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1910-ga2773b1
Message-ID: <20170109213319.ED492FA2A7@public.kitware.com>

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  a2773b1709e7c853512981039144ed53e3ef802f (commit)
       via  33e628ee809cd1d7ec2a8a0290ac0351fa4d499b (commit)
      from  0e1c33dcb83294825f0f1785895684721f99875b (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=a2773b1709e7c853512981039144ed53e3ef802f
commit a2773b1709e7c853512981039144ed53e3ef802f
Merge: 0e1c33d 33e628e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:33:19 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 16:33:19 2017 -0500

    Merge topic 'cmake-server-do-not-crash-on-interface-lib' into next
    
    33e628ee server-mode: Do not crash when running into INTERFACE_LIBRARY


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33e628ee809cd1d7ec2a8a0290ac0351fa4d499b
commit 33e628ee809cd1d7ec2a8a0290ac0351fa4d499b
Author:     Tobias Hunger <tobias.hunger at qt.io>
AuthorDate: Fri Jan 6 15:18:52 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 9 16:31:11 2017 -0500

    server-mode: Do not crash when running into INTERFACE_LIBRARY
    
    Closes: #16539

diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index e159c8f..c3bffd6 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -720,12 +720,16 @@ static Json::Value DumpTarget(cmGeneratorTarget* target,
 
   Json::Value result = Json::objectValue;
   result[kNAME_KEY] = target->GetName();
-
   result[kTYPE_KEY] = typeName;
-  result[kFULL_NAME_KEY] = target->GetFullName(config);
   result[kSOURCE_DIRECTORY_KEY] = lg->GetCurrentSourceDirectory();
   result[kBUILD_DIRECTORY_KEY] = lg->GetCurrentBinaryDirectory();
 
+  if (type == cmState::INTERFACE_LIBRARY) {
+    return result;
+  }
+
+  result[kFULL_NAME_KEY] = target->GetFullName(config);
+
   if (target->HaveWellDefinedOutputFiles()) {
     Json::Value artifacts = Json::arrayValue;
     artifacts.append(target->GetFullPath(config, false));

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

Summary of changes:
 Source/cmServerProtocol.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan  9 16:41:54 2017
From: brad.king at kitware.com (Brad King)
Date: Mon,  9 Jan 2017 16:41:54 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1913-g73b4584
Message-ID: <20170109214154.4555DF50B4@public.kitware.com>

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  73b458473d4bf8001037b9605543b03099d0c481 (commit)
       via  0471d13ecd2ff4d4a0e824a1b1d0d850ea070d05 (commit)
       via  c0bd1eb6d0da40d429120e925aa755a1f5a754e8 (commit)
      from  a2773b1709e7c853512981039144ed53e3ef802f (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=73b458473d4bf8001037b9605543b03099d0c481
commit 73b458473d4bf8001037b9605543b03099d0c481
Merge: a2773b1 0471d13
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:41:53 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 16:41:53 2017 -0500

    Merge topic 'cmake-server-do-not-crash-on-interface-lib-for-master' into next
    
    0471d13e Merge branch 'cmake-server-do-not-crash-on-interface-lib' into cmake-server-do-not-crash-on-interface-lib-for-master
    c0bd1eb6 server-mode: Do not crash when running into INTERFACE_LIBRARY


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0471d13ecd2ff4d4a0e824a1b1d0d850ea070d05
commit 0471d13ecd2ff4d4a0e824a1b1d0d850ea070d05
Merge: c0bd1eb 33e628e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:41:32 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 9 16:41:32 2017 -0500

    Merge branch 'cmake-server-do-not-crash-on-interface-lib' into cmake-server-do-not-crash-on-interface-lib-for-master


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0bd1eb6d0da40d429120e925aa755a1f5a754e8
commit c0bd1eb6d0da40d429120e925aa755a1f5a754e8
Author:     Tobias Hunger <tobias.hunger at qt.io>
AuthorDate: Fri Jan 6 15:18:52 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 9 16:40:46 2017 -0500

    server-mode: Do not crash when running into INTERFACE_LIBRARY
    
    Closes: #16539

diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index a86236c..334a05a 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -731,12 +731,16 @@ static Json::Value DumpTarget(cmGeneratorTarget* target,
 
   Json::Value result = Json::objectValue;
   result[kNAME_KEY] = target->GetName();
-
   result[kTYPE_KEY] = typeName;
-  result[kFULL_NAME_KEY] = target->GetFullName(config);
   result[kSOURCE_DIRECTORY_KEY] = lg->GetCurrentSourceDirectory();
   result[kBUILD_DIRECTORY_KEY] = lg->GetCurrentBinaryDirectory();
 
+  if (type == cmStateEnums::INTERFACE_LIBRARY) {
+    return result;
+  }
+
+  result[kFULL_NAME_KEY] = target->GetFullName(config);
+
   if (target->HaveWellDefinedOutputFiles()) {
     Json::Value artifacts = Json::arrayValue;
     artifacts.append(target->GetFullPath(config, false));

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan  9 16:46:31 2017
From: brad.king at kitware.com (Brad King)
Date: Mon,  9 Jan 2017 16:46:31 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1915-g2d08b22
Message-ID: <20170109214631.9C590FA279@public.kitware.com>

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  2d08b225f78c13781887dc26ff3a3ce621394262 (commit)
       via  c6c976f2c2a3e6503fff3bc77c9f7b8c61cd7e0b (commit)
      from  73b458473d4bf8001037b9605543b03099d0c481 (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=2d08b225f78c13781887dc26ff3a3ce621394262
commit 2d08b225f78c13781887dc26ff3a3ce621394262
Merge: 73b4584 c6c976f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:46:30 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 16:46:30 2017 -0500

    Merge topic 'codeblocks-nmake-makefiles-jom' into next
    
    c6c976f2 Revert "Allow CodeBlocks for NMake Makefiles JOM"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6c976f2c2a3e6503fff3bc77c9f7b8c61cd7e0b
commit c6c976f2c2a3e6503fff3bc77c9f7b8c61cd7e0b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:46:22 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 9 16:46:22 2017 -0500

    Revert "Allow CodeBlocks for NMake Makefiles JOM"
    
    This reverts commit 78c5db6a0ad90eec54958e06e7b9dcac9b6cc8ab.

diff --git a/Help/generator/CodeBlocks.rst b/Help/generator/CodeBlocks.rst
index d03cb0c..01798c7 100644
--- a/Help/generator/CodeBlocks.rst
+++ b/Help/generator/CodeBlocks.rst
@@ -18,9 +18,6 @@ This "extra" generator may be specified as:
 ``CodeBlocks - NMake Makefiles``
  Generate with :generator:`NMake Makefiles`.
 
-``CodeBlocks - NMake Makefiles JOM``
- Generate with :generator:`NMake Makefiles JOM`.
-
 ``CodeBlocks - Ninja``
  Generate with :generator:`Ninja`.
 
diff --git a/Help/release/3.7.rst b/Help/release/3.7.rst
index e42ce48..4c51af4 100644
--- a/Help/release/3.7.rst
+++ b/Help/release/3.7.rst
@@ -46,9 +46,6 @@ Generators
   :variable:`CMAKE_CODELITE_USE_TARGETS` option
   to change project creation from projects to targets.
 
-* The :generator:`CodeBlocks` now can generate with
-  :generator:`NMake Makefiles JOM`.
-
 Commands
 --------
 
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index bc81a6a..18c732d 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -49,7 +49,6 @@ cmExtraCodeBlocksGenerator::GetFactory()
 #if defined(_WIN32)
     factory.AddSupportedGlobalGenerator("MinGW Makefiles");
     factory.AddSupportedGlobalGenerator("NMake Makefiles");
-    factory.AddSupportedGlobalGenerator("NMake Makefiles JOM");
 // disable until somebody actually tests it:
 // this->AddSupportedGlobalGenerator("MSYS Makefiles");
 #endif
@@ -744,7 +743,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
   }
 
   std::string generator = this->GlobalGenerator->GetName();
-  if (generator == "NMake Makefiles" || generator == "NMake Makefiles JOM") {
+  if (generator == "NMake Makefiles") {
     // For Windows ConvertToOutputPath already adds quotes when required.
     // These need to be escaped, see
     // https://gitlab.kitware.com/cmake/cmake/issues/13952

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

Summary of changes:
 Help/generator/CodeBlocks.rst         |    3 ---
 Help/release/3.7.rst                  |    3 ---
 Source/cmExtraCodeBlocksGenerator.cxx |    3 +--
 3 files changed, 1 insertion(+), 8 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Tue Jan 10 00:01:08 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Tue, 10 Jan 2017 00:01:08 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-941-gaff368b
Message-ID: <20170110050108.375C5FA356@public.kitware.com>

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  aff368bb8456694e2550e2f69451456728ab31eb (commit)
      from  eee51e24d2290771ad3dded566ef897243f21331 (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=aff368bb8456694e2550e2f69451456728ab31eb
commit aff368bb8456694e2550e2f69451456728ab31eb
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Tue Jan 10 00:01:04 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jan 10 00:01:04 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 6b0bfe4..7a2482a 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 20170109)
+set(CMake_VERSION_PATCH 20170110)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From domen.vrankar at gmail.com  Tue Jan 10 02:25:23 2017
From: domen.vrankar at gmail.com (Domen Vrankar)
Date: Tue, 10 Jan 2017 02:25:23 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1919-g18e54de
Message-ID: <20170110072524.AC86FFA498@public.kitware.com>

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  18e54de628127ac7dd948f473db3977c350c4bca (commit)
       via  699ce812f43553bb6b6732141d62e77716ad8726 (commit)
       via  4ce8a4d0a18702cf228beaa6a9ecc7b38e355751 (commit)
       via  e0bfd3f4f565ea936f665a461380079573521916 (commit)
      from  2d08b225f78c13781887dc26ff3a3ce621394262 (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=18e54de628127ac7dd948f473db3977c350c4bca
commit 18e54de628127ac7dd948f473db3977c350c4bca
Merge: 2d08b22 699ce81
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Jan 10 02:25:10 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 02:25:10 2017 -0500

    Merge topic 'cpack-rpm-user-bin-spec-file-fix' into next
    
    699ce812 CPack/RPM test - custom binary spec file handling
    4ce8a4d0 CPack test additional std out/err regex file overloads
    e0bfd3f4 CPack/RPM fix - custom binary spec file handling


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=699ce812f43553bb6b6732141d62e77716ad8726
commit 699ce812f43553bb6b6732141d62e77716ad8726
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Mon Jan 9 21:08:47 2017 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Mon Jan 9 21:10:16 2017 +0100

    CPack/RPM test - custom binary spec file handling

diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index 3077340..d550ec7 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -4,6 +4,7 @@ include(RunCMake)
 include("${RunCMake_SOURCE_DIR}/CPackTestHelpers.cmake")
 
 # run_cpack_test args: TEST_NAME "GENERATORS" RUN_CMAKE_BUILD_STEP "PACKAGING_TYPES"
+run_cpack_test(CUSTOM_BINARY_SPEC_FILE "RPM" false "MONOLITHIC;COMPONENT")
 run_cpack_test(CUSTOM_NAMES "RPM;DEB" true "COMPONENT")
 run_cpack_test(DEBUGINFO "RPM" true "COMPONENT")
 run_cpack_test(DEPENDENCIES "RPM;DEB" true "COMPONENT")
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
new file mode 100644
index 0000000..694dc00
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
@@ -0,0 +1,9 @@
+set(EXPECTED_FILES_COUNT "1")
+set(EXPECTED_FILE_CONTENT_1_LIST "/usr;/usr/foo;/usr/foo/CMakeLists.txt")
+
+if(PACKAGING_TYPE STREQUAL "COMPONENT")
+  set(EXPECTED_FILES_COUNT "2")
+  set(EXPECTED_FILE_1_COMPONENT "test")
+  set(EXPECTED_FILE_2_COMPONENT "test2")
+  set(EXPECTED_FILE_CONTENT_2_LIST "/usr;/usr/bar;/usr/bar/CMakeLists.txt")
+endif()
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
new file mode 100644
index 0000000..e6d86d0
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
@@ -0,0 +1,2 @@
+^CPackRPM: Will use USER specified spec file: (/[^/]*)*/CUSTOM_BINARY_SPEC_FILE/custom\.spec\.in
+CPackRPM: Will use GENERATED spec file:.*/Tests/RunCMake/RPM/CPack/CUSTOM_BINARY_SPEC_FILE-build/_CPack_Packages/.*/RPM/SPECS/custom_binary_spec_file-test2\.spec$
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
new file mode 100644
index 0000000..d7bb7af
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
@@ -0,0 +1 @@
+CPackRPM: Will use USER specified spec file: (/[^/]*)*/CUSTOM_BINARY_SPEC_FILE/custom\.spec\.in
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
new file mode 100644
index 0000000..db0ac6f
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
@@ -0,0 +1,80 @@
+# -*- rpm-spec -*-
+BuildRoot:      %_topdir/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@
+Summary:        @CPACK_RPM_PACKAGE_SUMMARY@
+Name:           @CPACK_RPM_PACKAGE_NAME@
+Version:        @CPACK_RPM_PACKAGE_VERSION@
+Release:        @CPACK_RPM_PACKAGE_RELEASE@
+License:        @CPACK_RPM_PACKAGE_LICENSE@
+Group:          @CPACK_RPM_PACKAGE_GROUP@
+Vendor:         @CPACK_RPM_PACKAGE_VENDOR@
+
+ at TMP_RPM_URL@
+ at TMP_RPM_REQUIRES@
+ at TMP_RPM_REQUIRES_PRE@
+ at TMP_RPM_REQUIRES_POST@
+ at TMP_RPM_REQUIRES_PREUN@
+ at TMP_RPM_REQUIRES_POSTUN@
+ at TMP_RPM_PROVIDES@
+ at TMP_RPM_OBSOLETES@
+ at TMP_RPM_CONFLICTS@
+ at TMP_RPM_SUGGESTS@
+ at TMP_RPM_AUTOPROV@
+ at TMP_RPM_AUTOREQ@
+ at TMP_RPM_AUTOREQPROV@
+ at TMP_RPM_BUILDARCH@
+ at TMP_RPM_PREFIXES@
+
+ at TMP_RPM_DEBUGINFO@
+
+%define _rpmdir %_topdir/RPMS
+%define _srcrpmdir %_topdir/SRPMS
+ at FILE_NAME_DEFINE@
+%define _unpackaged_files_terminate_build 0
+ at TMP_RPM_SPEC_INSTALL_POST@
+ at CPACK_RPM_SPEC_MORE_DEFINE@
+ at CPACK_RPM_COMPRESSION_TYPE_TMP@
+
+%description
+ at CPACK_RPM_PACKAGE_DESCRIPTION@
+
+# This is a shortcutted spec file generated by CMake RPM generator
+# we skip _install step because CPack does that for us.
+# We do only save CPack installed tree in _prepr
+# and then restore it in build.
+%prep
+mv $RPM_BUILD_ROOT %_topdir/tmpBBroot
+
+%install
+if [ -e $RPM_BUILD_ROOT ];
+then
+  rm -rf $RPM_BUILD_ROOT
+fi
+mv %_topdir/tmpBBroot $RPM_BUILD_ROOT
+
+ at TMP_RPM_DEBUGINFO_INSTALL@
+
+%clean
+
+%post
+ at RPM_SYMLINK_POSTINSTALL@
+ at CPACK_RPM_SPEC_POSTINSTALL@
+
+%postun
+ at CPACK_RPM_SPEC_POSTUNINSTALL@
+
+%pre
+ at CPACK_RPM_SPEC_PREINSTALL@
+
+%preun
+ at CPACK_RPM_SPEC_PREUNINSTALL@
+
+%files
+%defattr(@TMP_DEFAULT_FILE_PERMISSIONS@, at TMP_DEFAULT_USER@, at TMP_DEFAULT_GROUP@, at TMP_DEFAULT_DIR_PERMISSIONS@)
+ at CPACK_RPM_INSTALL_FILES@
+ at CPACK_RPM_ABSOLUTE_INSTALL_FILES@
+ at CPACK_RPM_USER_INSTALL_FILES@
+
+%changelog
+ at CPACK_RPM_SPEC_CHANGELOG@
+
+ at TMP_OTHER_COMPONENTS@
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake
new file mode 100644
index 0000000..a604863
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake
@@ -0,0 +1,9 @@
+install(FILES CMakeLists.txt DESTINATION foo COMPONENT test)
+
+if(PACKAGING_TYPE STREQUAL "MONOLITHIC")
+  set(CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_CURRENT_LIST_DIR}/custom.spec.in")
+elseif(PACKAGING_TYPE STREQUAL "COMPONENT")
+  install(FILES CMakeLists.txt DESTINATION bar COMPONENT test2)
+  set(CPACK_RPM_TEST_USER_BINARY_SPECFILE
+    "${CMAKE_CURRENT_LIST_DIR}/custom.spec.in")
+endif()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ce8a4d0a18702cf228beaa6a9ecc7b38e355751
commit 4ce8a4d0a18702cf228beaa6a9ecc7b38e355751
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Dec 23 23:26:45 2016 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Mon Jan 9 21:10:16 2017 +0100

    CPack test additional std out/err regex file overloads
    
    Added std out/std err expected regex file name
    overloads for packaging type.

diff --git a/Tests/RunCMake/CPack/CPackTestHelpers.cmake b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
index 89da610..f883c69 100644
--- a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
+++ b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
@@ -60,7 +60,11 @@ function(run_cpack_test_common_ TEST_NAME types build SUBTEST_SUFFIX source PACK
       )
 
     foreach(o out err)
-      if(SUBTEST_SUFFIX AND EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
+      if(SUBTEST_SUFFIX AND EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
+        set(RunCMake-std${o}-file "tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt")
+      elseif(EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-std${o}.txt)
+        set(RunCMake-std${o}-file "tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-std${o}.txt")
+      elseif(SUBTEST_SUFFIX AND EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
         set(RunCMake-std${o}-file "tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt")
       elseif(EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-std${o}.txt)
         set(RunCMake-std${o}-file "tests/${TEST_NAME}/${TEST_TYPE}-std${o}.txt")
diff --git a/Tests/RunCMake/CPack/README.txt b/Tests/RunCMake/CPack/README.txt
index f51d254..7c98f69 100644
--- a/Tests/RunCMake/CPack/README.txt
+++ b/Tests/RunCMake/CPack/README.txt
@@ -155,8 +155,18 @@ VerifyResult.cmake script also automatically prints out standard output and
 standard error from CPack execution phase that is compared with
 '<test_name>/<generator_name>-stdout.txt' regular expression and
 and '<test_name>/<generator_name>-stderr.txt' regular expresson respectively.
-NOTE: For subtests generator name can also be suffixed with subtest name and in
-      such case subtest file is preferred.
+NOTE: For subtests generator name can also be suffixed with subtest name and/or
+      packaging type (MONOLITHIC, COMPONENT, GROUP) and in such cases the
+      preferences of which file will be used are as follows:
+        - generator name + packaging type + subtest name
+        - generator name + packaging type
+        - generator name + subtest name
+        - generator name
+        - default generator
+      File name format: '<generator_name>-<packaging_type>-<subtest_name>-std<type>.txt'
+                        where <type> can either be 'out' or 'err'.
+      File name format: '<generator_name>-<packaging_type>-std<type>.txt'
+                        where <type> can either be 'out' or 'err'.
       File name format: '<generator_name>-<subtest_name>-std<type>.txt' where
                         <type> can either be 'out' or 'err'.
 NOTE: If none of the comparison files are present then the default generator
@@ -223,3 +233,4 @@ To add a new generator we must
 - if needed add 'default_expected_std<type>.txt' files where <type> is either
   'out' or 'err' which will contain default expected output of package
   generation regular expression.
+- add generator to list of other CPack generators in RunCMake/CMakeLists.txt

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0bfd3f4f565ea936f665a461380079573521916
commit e0bfd3f4f565ea936f665a461380079573521916
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Mon Jan 9 21:07:46 2017 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Mon Jan 9 21:10:03 2017 +0100

    CPack/RPM fix - custom binary spec file handling
    
    Fixes #16507

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 5021c41..e1bcb48 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -2470,11 +2470,12 @@ Vendor:         \@CPACK_RPM_PACKAGE_VENDOR\@
       endforeach()
     endif()
 
+    set(RPMBUILD_FLAGS "-bb")
+
     # We should generate a USER spec file template:
     #  - either because the user asked for it : CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE
     #  - or the user did not provide one : NOT CPACK_RPM_USER_BINARY_SPECFILE
     if(CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE OR NOT CPACK_RPM_USER_BINARY_SPECFILE)
-      set(RPMBUILD_FLAGS "-bb")
 
       file(WRITE ${CPACK_RPM_BINARY_SPECFILE}.in
         "# -*- rpm-spec -*-

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

Summary of changes:


hooks/post-receive
-- 
CMake

From domen.vrankar at gmail.com  Tue Jan 10 02:31:42 2017
From: domen.vrankar at gmail.com (Domen Vrankar)
Date: Tue, 10 Jan 2017 02:31:42 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1923-g1f2f6e0
Message-ID: <20170110073142.88A68FA4F2@public.kitware.com>

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  1f2f6e07bb430fb36bba3acef474b2ce8e1ceaa2 (commit)
       via  23435daa22f650a1a6509025fb2d38e8714f8ceb (commit)
       via  9a0bf4d558cfd16917d2cb5c41a754740f159c98 (commit)
       via  d9775228dabb1424d2f8d1a250c5a0e6ffad47b1 (commit)
      from  18e54de628127ac7dd948f473db3977c350c4bca (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=1f2f6e07bb430fb36bba3acef474b2ce8e1ceaa2
commit 1f2f6e07bb430fb36bba3acef474b2ce8e1ceaa2
Merge: 18e54de 23435da
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Jan 10 02:31:41 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 02:31:41 2017 -0500

    Merge topic 'cpack-rpm-user-bin-spec-file-fix' into next
    
    23435daa Revert "CPack/RPM fix - custom binary spec file handling"
    9a0bf4d5 Revert "CPack test additional std out/err regex file overloads"
    d9775228 Revert "CPack/RPM test - custom binary spec file handling"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23435daa22f650a1a6509025fb2d38e8714f8ceb
commit 23435daa22f650a1a6509025fb2d38e8714f8ceb
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Jan 10 08:28:17 2017 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Tue Jan 10 08:28:17 2017 +0100

    Revert "CPack/RPM fix - custom binary spec file handling"
    
    This reverts commit e0bfd3f4f565ea936f665a461380079573521916.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index e1bcb48..5021c41 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -2470,12 +2470,11 @@ Vendor:         \@CPACK_RPM_PACKAGE_VENDOR\@
       endforeach()
     endif()
 
-    set(RPMBUILD_FLAGS "-bb")
-
     # We should generate a USER spec file template:
     #  - either because the user asked for it : CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE
     #  - or the user did not provide one : NOT CPACK_RPM_USER_BINARY_SPECFILE
     if(CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE OR NOT CPACK_RPM_USER_BINARY_SPECFILE)
+      set(RPMBUILD_FLAGS "-bb")
 
       file(WRITE ${CPACK_RPM_BINARY_SPECFILE}.in
         "# -*- rpm-spec -*-

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a0bf4d558cfd16917d2cb5c41a754740f159c98
commit 9a0bf4d558cfd16917d2cb5c41a754740f159c98
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Jan 10 08:28:16 2017 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Tue Jan 10 08:28:16 2017 +0100

    Revert "CPack test additional std out/err regex file overloads"
    
    This reverts commit 4ce8a4d0a18702cf228beaa6a9ecc7b38e355751.

diff --git a/Tests/RunCMake/CPack/CPackTestHelpers.cmake b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
index f883c69..89da610 100644
--- a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
+++ b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
@@ -60,11 +60,7 @@ function(run_cpack_test_common_ TEST_NAME types build SUBTEST_SUFFIX source PACK
       )
 
     foreach(o out err)
-      if(SUBTEST_SUFFIX AND EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
-        set(RunCMake-std${o}-file "tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt")
-      elseif(EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-std${o}.txt)
-        set(RunCMake-std${o}-file "tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-std${o}.txt")
-      elseif(SUBTEST_SUFFIX AND EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
+      if(SUBTEST_SUFFIX AND EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
         set(RunCMake-std${o}-file "tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt")
       elseif(EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-std${o}.txt)
         set(RunCMake-std${o}-file "tests/${TEST_NAME}/${TEST_TYPE}-std${o}.txt")
diff --git a/Tests/RunCMake/CPack/README.txt b/Tests/RunCMake/CPack/README.txt
index 7c98f69..f51d254 100644
--- a/Tests/RunCMake/CPack/README.txt
+++ b/Tests/RunCMake/CPack/README.txt
@@ -155,18 +155,8 @@ VerifyResult.cmake script also automatically prints out standard output and
 standard error from CPack execution phase that is compared with
 '<test_name>/<generator_name>-stdout.txt' regular expression and
 and '<test_name>/<generator_name>-stderr.txt' regular expresson respectively.
-NOTE: For subtests generator name can also be suffixed with subtest name and/or
-      packaging type (MONOLITHIC, COMPONENT, GROUP) and in such cases the
-      preferences of which file will be used are as follows:
-        - generator name + packaging type + subtest name
-        - generator name + packaging type
-        - generator name + subtest name
-        - generator name
-        - default generator
-      File name format: '<generator_name>-<packaging_type>-<subtest_name>-std<type>.txt'
-                        where <type> can either be 'out' or 'err'.
-      File name format: '<generator_name>-<packaging_type>-std<type>.txt'
-                        where <type> can either be 'out' or 'err'.
+NOTE: For subtests generator name can also be suffixed with subtest name and in
+      such case subtest file is preferred.
       File name format: '<generator_name>-<subtest_name>-std<type>.txt' where
                         <type> can either be 'out' or 'err'.
 NOTE: If none of the comparison files are present then the default generator
@@ -233,4 +223,3 @@ To add a new generator we must
 - if needed add 'default_expected_std<type>.txt' files where <type> is either
   'out' or 'err' which will contain default expected output of package
   generation regular expression.
-- add generator to list of other CPack generators in RunCMake/CMakeLists.txt

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9775228dabb1424d2f8d1a250c5a0e6ffad47b1
commit d9775228dabb1424d2f8d1a250c5a0e6ffad47b1
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Jan 10 08:28:06 2017 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Tue Jan 10 08:28:06 2017 +0100

    Revert "CPack/RPM test - custom binary spec file handling"
    
    This reverts commit 699ce812f43553bb6b6732141d62e77716ad8726.

diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index d550ec7..3077340 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -4,7 +4,6 @@ include(RunCMake)
 include("${RunCMake_SOURCE_DIR}/CPackTestHelpers.cmake")
 
 # run_cpack_test args: TEST_NAME "GENERATORS" RUN_CMAKE_BUILD_STEP "PACKAGING_TYPES"
-run_cpack_test(CUSTOM_BINARY_SPEC_FILE "RPM" false "MONOLITHIC;COMPONENT")
 run_cpack_test(CUSTOM_NAMES "RPM;DEB" true "COMPONENT")
 run_cpack_test(DEBUGINFO "RPM" true "COMPONENT")
 run_cpack_test(DEPENDENCIES "RPM;DEB" true "COMPONENT")
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
deleted file mode 100644
index 694dc00..0000000
--- a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-set(EXPECTED_FILES_COUNT "1")
-set(EXPECTED_FILE_CONTENT_1_LIST "/usr;/usr/foo;/usr/foo/CMakeLists.txt")
-
-if(PACKAGING_TYPE STREQUAL "COMPONENT")
-  set(EXPECTED_FILES_COUNT "2")
-  set(EXPECTED_FILE_1_COMPONENT "test")
-  set(EXPECTED_FILE_2_COMPONENT "test2")
-  set(EXPECTED_FILE_CONTENT_2_LIST "/usr;/usr/bar;/usr/bar/CMakeLists.txt")
-endif()
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
deleted file mode 100644
index e6d86d0..0000000
--- a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-^CPackRPM: Will use USER specified spec file: (/[^/]*)*/CUSTOM_BINARY_SPEC_FILE/custom\.spec\.in
-CPackRPM: Will use GENERATED spec file:.*/Tests/RunCMake/RPM/CPack/CUSTOM_BINARY_SPEC_FILE-build/_CPack_Packages/.*/RPM/SPECS/custom_binary_spec_file-test2\.spec$
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
deleted file mode 100644
index d7bb7af..0000000
--- a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-CPackRPM: Will use USER specified spec file: (/[^/]*)*/CUSTOM_BINARY_SPEC_FILE/custom\.spec\.in
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
deleted file mode 100644
index db0ac6f..0000000
--- a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- rpm-spec -*-
-BuildRoot:      %_topdir/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@
-Summary:        @CPACK_RPM_PACKAGE_SUMMARY@
-Name:           @CPACK_RPM_PACKAGE_NAME@
-Version:        @CPACK_RPM_PACKAGE_VERSION@
-Release:        @CPACK_RPM_PACKAGE_RELEASE@
-License:        @CPACK_RPM_PACKAGE_LICENSE@
-Group:          @CPACK_RPM_PACKAGE_GROUP@
-Vendor:         @CPACK_RPM_PACKAGE_VENDOR@
-
- at TMP_RPM_URL@
- at TMP_RPM_REQUIRES@
- at TMP_RPM_REQUIRES_PRE@
- at TMP_RPM_REQUIRES_POST@
- at TMP_RPM_REQUIRES_PREUN@
- at TMP_RPM_REQUIRES_POSTUN@
- at TMP_RPM_PROVIDES@
- at TMP_RPM_OBSOLETES@
- at TMP_RPM_CONFLICTS@
- at TMP_RPM_SUGGESTS@
- at TMP_RPM_AUTOPROV@
- at TMP_RPM_AUTOREQ@
- at TMP_RPM_AUTOREQPROV@
- at TMP_RPM_BUILDARCH@
- at TMP_RPM_PREFIXES@
-
- at TMP_RPM_DEBUGINFO@
-
-%define _rpmdir %_topdir/RPMS
-%define _srcrpmdir %_topdir/SRPMS
- at FILE_NAME_DEFINE@
-%define _unpackaged_files_terminate_build 0
- at TMP_RPM_SPEC_INSTALL_POST@
- at CPACK_RPM_SPEC_MORE_DEFINE@
- at CPACK_RPM_COMPRESSION_TYPE_TMP@
-
-%description
- at CPACK_RPM_PACKAGE_DESCRIPTION@
-
-# This is a shortcutted spec file generated by CMake RPM generator
-# we skip _install step because CPack does that for us.
-# We do only save CPack installed tree in _prepr
-# and then restore it in build.
-%prep
-mv $RPM_BUILD_ROOT %_topdir/tmpBBroot
-
-%install
-if [ -e $RPM_BUILD_ROOT ];
-then
-  rm -rf $RPM_BUILD_ROOT
-fi
-mv %_topdir/tmpBBroot $RPM_BUILD_ROOT
-
- at TMP_RPM_DEBUGINFO_INSTALL@
-
-%clean
-
-%post
- at RPM_SYMLINK_POSTINSTALL@
- at CPACK_RPM_SPEC_POSTINSTALL@
-
-%postun
- at CPACK_RPM_SPEC_POSTUNINSTALL@
-
-%pre
- at CPACK_RPM_SPEC_PREINSTALL@
-
-%preun
- at CPACK_RPM_SPEC_PREUNINSTALL@
-
-%files
-%defattr(@TMP_DEFAULT_FILE_PERMISSIONS@, at TMP_DEFAULT_USER@, at TMP_DEFAULT_GROUP@, at TMP_DEFAULT_DIR_PERMISSIONS@)
- at CPACK_RPM_INSTALL_FILES@
- at CPACK_RPM_ABSOLUTE_INSTALL_FILES@
- at CPACK_RPM_USER_INSTALL_FILES@
-
-%changelog
- at CPACK_RPM_SPEC_CHANGELOG@
-
- at TMP_OTHER_COMPONENTS@
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake
deleted file mode 100644
index a604863..0000000
--- a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-install(FILES CMakeLists.txt DESTINATION foo COMPONENT test)
-
-if(PACKAGING_TYPE STREQUAL "MONOLITHIC")
-  set(CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_CURRENT_LIST_DIR}/custom.spec.in")
-elseif(PACKAGING_TYPE STREQUAL "COMPONENT")
-  install(FILES CMakeLists.txt DESTINATION bar COMPONENT test2)
-  set(CPACK_RPM_TEST_USER_BINARY_SPECFILE
-    "${CMAKE_CURRENT_LIST_DIR}/custom.spec.in")
-endif()

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

Summary of changes:
 Modules/CPackRPM.cmake                             |    3 +-
 Tests/RunCMake/CPack/CPackTestHelpers.cmake        |    6 +-
 Tests/RunCMake/CPack/README.txt                    |   15 +---
 Tests/RunCMake/CPack/RunCMakeTest.cmake            |    1 -
 .../CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake    |    9 ---
 .../RPM-COMPONENT-stderr.txt                       |    2 -
 .../RPM-MONOLITHIC-stderr.txt                      |    1 -
 .../tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in   |   80 --------------------
 .../CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake |    9 ---
 9 files changed, 4 insertions(+), 122 deletions(-)
 delete mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
 delete mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
 delete mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
 delete mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
 delete mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake


hooks/post-receive
-- 
CMake

From domen.vrankar at gmail.com  Tue Jan 10 02:38:13 2017
From: domen.vrankar at gmail.com (Domen Vrankar)
Date: Tue, 10 Jan 2017 02:38:13 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1925-g8dc707a
Message-ID: <20170110073813.4E1A9FA565@public.kitware.com>

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  8dc707a2ffd830f95271275808b645a372e7cebd (commit)
       via  574c81e28cef6737adc1619ce3b44b43bdcf308b (commit)
      from  1f2f6e07bb430fb36bba3acef474b2ce8e1ceaa2 (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=8dc707a2ffd830f95271275808b645a372e7cebd
commit 8dc707a2ffd830f95271275808b645a372e7cebd
Merge: 1f2f6e0 574c81e
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Jan 10 02:38:12 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 02:38:12 2017 -0500

    Merge topic 'cpack-rpm-user-binary-spec-file-fix' into next
    
    574c81e2 CPack/RPM fix - custom binary spec file handling


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=574c81e28cef6737adc1619ce3b44b43bdcf308b
commit 574c81e28cef6737adc1619ce3b44b43bdcf308b
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Jan 10 08:37:14 2017 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Tue Jan 10 08:37:14 2017 +0100

    CPack/RPM fix - custom binary spec file handling
    
    Fixes #16507

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 0640630..673aaea 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -2269,8 +2269,8 @@ Vendor:         \@CPACK_RPM_PACKAGE_VENDOR\@
     # We should generate a USER spec file template:
     #  - either because the user asked for it : CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE
     #  - or the user did not provide one : NOT CPACK_RPM_USER_BINARY_SPECFILE
+    set(RPMBUILD_FLAGS "-bb")
     if(CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE OR NOT CPACK_RPM_USER_BINARY_SPECFILE)
-      set(RPMBUILD_FLAGS "-bb")
 
       file(WRITE ${CPACK_RPM_BINARY_SPECFILE}.in
         "# -*- rpm-spec -*-

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

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


hooks/post-receive
-- 
CMake

From domen.vrankar at gmail.com  Tue Jan 10 02:41:10 2017
From: domen.vrankar at gmail.com (Domen Vrankar)
Date: Tue, 10 Jan 2017 02:41:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1928-gf14f487
Message-ID: <20170110074110.F2C20F50B4@public.kitware.com>

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  f14f4875429bcc4445ec06328f42d3243bd36892 (commit)
       via  adbf72280d1eb823402c4cc7f2c27ec0ef16062a (commit)
       via  aff368bb8456694e2550e2f69451456728ab31eb (commit)
      from  8dc707a2ffd830f95271275808b645a372e7cebd (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=f14f4875429bcc4445ec06328f42d3243bd36892
commit f14f4875429bcc4445ec06328f42d3243bd36892
Merge: 8dc707a adbf722
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Jan 10 02:41:09 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 02:41:09 2017 -0500

    Merge topic 'cpack-test-extra-std-out-err-file-overloads' into next
    
    adbf7228 CPack test additional std out/err regex file overloads
    aff368bb CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adbf72280d1eb823402c4cc7f2c27ec0ef16062a
commit adbf72280d1eb823402c4cc7f2c27ec0ef16062a
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Dec 23 23:26:45 2016 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Tue Jan 10 08:40:16 2017 +0100

    CPack test additional std out/err regex file overloads
    
    Added std out/std err expected regex file name
    overloads for packaging type.

diff --git a/Tests/RunCMake/CPack/CPackTestHelpers.cmake b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
index 89da610..f883c69 100644
--- a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
+++ b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
@@ -60,7 +60,11 @@ function(run_cpack_test_common_ TEST_NAME types build SUBTEST_SUFFIX source PACK
       )
 
     foreach(o out err)
-      if(SUBTEST_SUFFIX AND EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
+      if(SUBTEST_SUFFIX AND EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
+        set(RunCMake-std${o}-file "tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt")
+      elseif(EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-std${o}.txt)
+        set(RunCMake-std${o}-file "tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-std${o}.txt")
+      elseif(SUBTEST_SUFFIX AND EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
         set(RunCMake-std${o}-file "tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt")
       elseif(EXISTS ${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-std${o}.txt)
         set(RunCMake-std${o}-file "tests/${TEST_NAME}/${TEST_TYPE}-std${o}.txt")
diff --git a/Tests/RunCMake/CPack/README.txt b/Tests/RunCMake/CPack/README.txt
index f51d254..7c98f69 100644
--- a/Tests/RunCMake/CPack/README.txt
+++ b/Tests/RunCMake/CPack/README.txt
@@ -155,8 +155,18 @@ VerifyResult.cmake script also automatically prints out standard output and
 standard error from CPack execution phase that is compared with
 '<test_name>/<generator_name>-stdout.txt' regular expression and
 and '<test_name>/<generator_name>-stderr.txt' regular expresson respectively.
-NOTE: For subtests generator name can also be suffixed with subtest name and in
-      such case subtest file is preferred.
+NOTE: For subtests generator name can also be suffixed with subtest name and/or
+      packaging type (MONOLITHIC, COMPONENT, GROUP) and in such cases the
+      preferences of which file will be used are as follows:
+        - generator name + packaging type + subtest name
+        - generator name + packaging type
+        - generator name + subtest name
+        - generator name
+        - default generator
+      File name format: '<generator_name>-<packaging_type>-<subtest_name>-std<type>.txt'
+                        where <type> can either be 'out' or 'err'.
+      File name format: '<generator_name>-<packaging_type>-std<type>.txt'
+                        where <type> can either be 'out' or 'err'.
       File name format: '<generator_name>-<subtest_name>-std<type>.txt' where
                         <type> can either be 'out' or 'err'.
 NOTE: If none of the comparison files are present then the default generator
@@ -223,3 +233,4 @@ To add a new generator we must
 - if needed add 'default_expected_std<type>.txt' files where <type> is either
   'out' or 'err' which will contain default expected output of package
   generation regular expression.
+- add generator to list of other CPack generators in RunCMake/CMakeLists.txt

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

Summary of changes:
 Source/CMakeVersion.cmake                   |    2 +-
 Tests/RunCMake/CPack/CPackTestHelpers.cmake |    6 +++++-
 Tests/RunCMake/CPack/README.txt             |   15 +++++++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 09:28:38 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 09:28:38 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1930-gb641f2b
Message-ID: <20170110142838.4D711FA6E8@public.kitware.com>

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  b641f2b873d55f8ba7b99db906fe6a780a910369 (commit)
       via  4164078c8540bbf75b47afd5c1bee0acbbd5b253 (commit)
      from  f14f4875429bcc4445ec06328f42d3243bd36892 (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=b641f2b873d55f8ba7b99db906fe6a780a910369
commit b641f2b873d55f8ba7b99db906fe6a780a910369
Merge: f14f487 4164078
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 09:28:37 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 09:28:37 2017 -0500

    Merge topic '16204-regex-explorer-match-all' into next
    
    4164078c cmake-gui: Add MATCHALL option to Regex Explorer


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4164078c8540bbf75b47afd5c1bee0acbbd5b253
commit 4164078c8540bbf75b47afd5c1bee0acbbd5b253
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Tue Dec 27 16:38:09 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 09:28:13 2017 -0500

    cmake-gui: Add MATCHALL option to Regex Explorer
    
    Closes: #16204

diff --git a/Source/QtDialog/RegexExplorer.cxx b/Source/QtDialog/RegexExplorer.cxx
index 1512166..abed70e 100644
--- a/Source/QtDialog/RegexExplorer.cxx
+++ b/Source/QtDialog/RegexExplorer.cxx
@@ -64,10 +64,32 @@ void RegexExplorer::on_inputText_textChanged()
     return;
   }
 
+  std::string matchingText;
+
+  if (matchAll->isChecked()) {
+    const char* p = m_text.c_str();
+    while (m_regexParser.find(p)) {
+      std::string::size_type l = m_regexParser.start();
+      std::string::size_type r = m_regexParser.end();
+      if (r - l == 0) {
+        // matched empty string
+        clearMatch();
+        return;
+      }
+      if (!matchingText.empty()) {
+        matchingText += ";";
+      }
+      matchingText += std::string(p + l, r - l);
+      p += r;
+    }
+  } else {
+    matchingText = m_regexParser.match(0);
+  }
+
 #ifdef QT_NO_STL
-  QString matchText = m_regexParser.match(0).c_str();
+  QString matchText = matchingText.c_str();
 #else
-  QString matchText = QString::fromStdString(m_regexParser.match(0));
+  QString matchText = QString::fromStdString(matchingText);
 #endif
   match0->setPlainText(matchText);
 
@@ -95,8 +117,16 @@ void RegexExplorer::on_matchNumber_currentIndexChanged(int index)
   matchN->setPlainText(match);
 }
 
+void RegexExplorer::on_matchAll_toggled(bool checked)
+{
+  Q_UNUSED(checked);
+
+  on_inputText_textChanged();
+}
+
 void RegexExplorer::clearMatch()
 {
+  m_matched = false;
   match0->clear();
   matchN->clear();
 }
diff --git a/Source/QtDialog/RegexExplorer.h b/Source/QtDialog/RegexExplorer.h
index f1c1e5f..caef975 100644
--- a/Source/QtDialog/RegexExplorer.h
+++ b/Source/QtDialog/RegexExplorer.h
@@ -22,6 +22,7 @@ private slots:
   void on_regularExpression_textChanged(const QString& text);
   void on_inputText_textChanged();
   void on_matchNumber_currentIndexChanged(int index);
+  void on_matchAll_toggled(bool checked);
 
 private:
   static void setStatusColor(QWidget* widget, bool successful);
diff --git a/Source/QtDialog/RegexExplorer.ui b/Source/QtDialog/RegexExplorer.ui
index 2c2d761..0af69999 100644
--- a/Source/QtDialog/RegexExplorer.ui
+++ b/Source/QtDialog/RegexExplorer.ui
@@ -104,11 +104,38 @@
     <widget class="QLineEdit" name="regularExpression"/>
    </item>
    <item>
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Complete Match</string>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Complete Match</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_5">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="matchAll">
+       <property name="text">
+        <string>Match All</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item>
     <widget class="QPlainTextEdit" name="match0">

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 09:34:45 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 09:34:45 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-945-g9239141
Message-ID: <20170110143445.C9291FA81A@public.kitware.com>

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  9239141e954c6b9eaba53fcad46fa2de24d8ba44 (commit)
       via  0471d13ecd2ff4d4a0e824a1b1d0d850ea070d05 (commit)
       via  c0bd1eb6d0da40d429120e925aa755a1f5a754e8 (commit)
       via  33e628ee809cd1d7ec2a8a0290ac0351fa4d499b (commit)
      from  aff368bb8456694e2550e2f69451456728ab31eb (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=9239141e954c6b9eaba53fcad46fa2de24d8ba44
commit 9239141e954c6b9eaba53fcad46fa2de24d8ba44
Merge: aff368b 0471d13
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 09:34:43 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 09:34:43 2017 -0500

    Merge topic 'cmake-server-do-not-crash-on-interface-lib-for-master'
    
    0471d13e Merge branch 'cmake-server-do-not-crash-on-interface-lib' into cmake-server-do-not-crash-on-interface-lib-for-master
    c0bd1eb6 server-mode: Do not crash when running into INTERFACE_LIBRARY
    33e628ee server-mode: Do not crash when running into INTERFACE_LIBRARY


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

Summary of changes:
 Source/cmServerProtocol.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 09:34:49 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 09:34:49 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-947-gea62999
Message-ID: <20170110143449.1115DFA820@public.kitware.com>

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  ea62999f457a4263702a7f01e2c9bd8070da1e01 (commit)
       via  574c81e28cef6737adc1619ce3b44b43bdcf308b (commit)
      from  9239141e954c6b9eaba53fcad46fa2de24d8ba44 (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=ea62999f457a4263702a7f01e2c9bd8070da1e01
commit ea62999f457a4263702a7f01e2c9bd8070da1e01
Merge: 9239141 574c81e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 09:34:46 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 09:34:46 2017 -0500

    Merge topic 'cpack-rpm-user-binary-spec-file-fix'
    
    574c81e2 CPack/RPM fix - custom binary spec file handling


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 09:34:52 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 09:34:52 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-949-g039a7df
Message-ID: <20170110143452.032CFFA822@public.kitware.com>

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  039a7df9bada6d061f34728a0bb57fdcb9e277c1 (commit)
       via  adbf72280d1eb823402c4cc7f2c27ec0ef16062a (commit)
      from  ea62999f457a4263702a7f01e2c9bd8070da1e01 (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=039a7df9bada6d061f34728a0bb57fdcb9e277c1
commit 039a7df9bada6d061f34728a0bb57fdcb9e277c1
Merge: ea62999 adbf722
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 09:34:49 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 09:34:49 2017 -0500

    Merge topic 'cpack-test-extra-std-out-err-file-overloads'
    
    adbf7228 CPack test additional std out/err regex file overloads


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

Summary of changes:
 Tests/RunCMake/CPack/CPackTestHelpers.cmake |    6 +++++-
 Tests/RunCMake/CPack/README.txt             |   15 +++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 09:34:55 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 09:34:55 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-951-g2c8eb26
Message-ID: <20170110143455.0A351FA822@public.kitware.com>

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  2c8eb2696a8f3505d45ed5accfa94b3e5541e169 (commit)
       via  6daa2d384ef7f6f9edd5fed18c830168f7496881 (commit)
      from  039a7df9bada6d061f34728a0bb57fdcb9e277c1 (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=2c8eb2696a8f3505d45ed5accfa94b3e5541e169
commit 2c8eb2696a8f3505d45ed5accfa94b3e5541e169
Merge: 039a7df 6daa2d3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 09:34:52 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 09:34:52 2017 -0500

    Merge topic 'cpack-deb-md5sums-paths-fix'
    
    6daa2d38 CPack/Deb invalid md5sums file fix


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

Summary of changes:
 Source/CPack/cmCPackDebGenerator.cxx                             |    6 +++++-
 Tests/RunCMake/CPack/RunCMakeTest.cmake                          |    1 +
 Tests/RunCMake/CPack/tests/{DIST => MD5SUMS}/ExpectedFiles.cmake |    0
 Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake            |    3 +++
 Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake                    |    5 +++++
 5 files changed, 14 insertions(+), 1 deletion(-)
 copy Tests/RunCMake/CPack/tests/{DIST => MD5SUMS}/ExpectedFiles.cmake (100%)
 create mode 100644 Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake
 create mode 100644 Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 09:34:58 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 09:34:58 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-955-gc43cf15
Message-ID: <20170110143458.36DBCFA820@public.kitware.com>

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  c43cf158d74460440dc5a3d0aec984c754f57958 (commit)
       via  36bc7e4c3f91c560df8051afedddea3f49474264 (commit)
       via  05c14ea0a97f3e8a7287f3e0bbc57f91e2a6e490 (commit)
       via  5b0a64ebc5d03a4dd0022b87e8e6cb77c3db013b (commit)
      from  2c8eb2696a8f3505d45ed5accfa94b3e5541e169 (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=c43cf158d74460440dc5a3d0aec984c754f57958
commit c43cf158d74460440dc5a3d0aec984c754f57958
Merge: 2c8eb26 36bc7e4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 09:34:55 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 09:34:55 2017 -0500

    Merge topic 'cpack-new-tests'
    
    36bc7e4c store old locale to a temporary variable
    05c14ea0 RunCMake.CPack_* add COMPONENT to minimal test
    5b0a64eb CPack/Archive minimal tests for more formats


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

Summary of changes:
 Source/cmLocale.h                                  |    5 +-
 Tests/RunCMake/CMakeLists.txt                      |    2 +-
 Tests/RunCMake/CPack/7Z/Helpers.cmake              |    3 +
 .../CPack/{TGZ => 7Z}/Prerequirements.cmake        |    0
 .../{TGZ => 7Z}/packaging_COMPONENT_default.cmake  |    0
 .../common_helpers.cmake}                          |   16 ++---
 Tests/RunCMake/CPack/RunCMakeTest.cmake            |    2 +-
 Tests/RunCMake/CPack/TBZ2/Helpers.cmake            |    3 +
 .../CPack/{TGZ => TBZ2}/Prerequirements.cmake      |    0
 .../packaging_COMPONENT_default.cmake              |    0
 Tests/RunCMake/CPack/TGZ/Helpers.cmake             |   63 +-------------------
 Tests/RunCMake/CPack/TXZ/Helpers.cmake             |    3 +
 .../CPack/{TGZ => TXZ}/Prerequirements.cmake       |    0
 .../{TGZ => TXZ}/packaging_COMPONENT_default.cmake |    0
 Tests/RunCMake/CPack/TZ/Helpers.cmake              |    3 +
 .../CPack/{TGZ => TZ}/Prerequirements.cmake        |    0
 .../{TGZ => TZ}/packaging_COMPONENT_default.cmake  |    0
 Tests/RunCMake/CPack/ZIP/Helpers.cmake             |    3 +
 .../CPack/{TGZ => ZIP}/Prerequirements.cmake       |    0
 .../{TGZ => ZIP}/packaging_COMPONENT_default.cmake |    0
 Tests/RunCMake/CPack/tests/MINIMAL/test.cmake      |    4 ++
 21 files changed, 34 insertions(+), 73 deletions(-)
 create mode 100644 Tests/RunCMake/CPack/7Z/Helpers.cmake
 copy Tests/RunCMake/CPack/{TGZ => 7Z}/Prerequirements.cmake (100%)
 copy Tests/RunCMake/CPack/{TGZ => 7Z}/packaging_COMPONENT_default.cmake (100%)
 copy Tests/RunCMake/CPack/{TGZ/Helpers.cmake => ArchiveCommon/common_helpers.cmake} (77%)
 create mode 100644 Tests/RunCMake/CPack/TBZ2/Helpers.cmake
 copy Tests/RunCMake/CPack/{TGZ => TBZ2}/Prerequirements.cmake (100%)
 copy Tests/RunCMake/CPack/{TGZ => TBZ2}/packaging_COMPONENT_default.cmake (100%)
 create mode 100644 Tests/RunCMake/CPack/TXZ/Helpers.cmake
 copy Tests/RunCMake/CPack/{TGZ => TXZ}/Prerequirements.cmake (100%)
 copy Tests/RunCMake/CPack/{TGZ => TXZ}/packaging_COMPONENT_default.cmake (100%)
 create mode 100644 Tests/RunCMake/CPack/TZ/Helpers.cmake
 copy Tests/RunCMake/CPack/{TGZ => TZ}/Prerequirements.cmake (100%)
 copy Tests/RunCMake/CPack/{TGZ => TZ}/packaging_COMPONENT_default.cmake (100%)
 create mode 100644 Tests/RunCMake/CPack/ZIP/Helpers.cmake
 copy Tests/RunCMake/CPack/{TGZ => ZIP}/Prerequirements.cmake (100%)
 copy Tests/RunCMake/CPack/{TGZ => ZIP}/packaging_COMPONENT_default.cmake (100%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 09:35:00 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 09:35:00 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-957-g914728f
Message-ID: <20170110143500.EFB04FA81F@public.kitware.com>

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  914728f8d724e834a402619d05309ad8154ba59d (commit)
       via  4164078c8540bbf75b47afd5c1bee0acbbd5b253 (commit)
      from  c43cf158d74460440dc5a3d0aec984c754f57958 (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=914728f8d724e834a402619d05309ad8154ba59d
commit 914728f8d724e834a402619d05309ad8154ba59d
Merge: c43cf15 4164078
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 09:34:58 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 09:34:58 2017 -0500

    Merge topic '16204-regex-explorer-match-all'
    
    4164078c cmake-gui: Add MATCHALL option to Regex Explorer


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

Summary of changes:
 Source/QtDialog/RegexExplorer.cxx |   34 ++++++++++++++++++++++++++++++++--
 Source/QtDialog/RegexExplorer.h   |    1 +
 Source/QtDialog/RegexExplorer.ui  |   37 ++++++++++++++++++++++++++++++++-----
 3 files changed, 65 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 09:35:16 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 09:35:16 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1937-g89a350e
Message-ID: <20170110143516.02FDDFA820@public.kitware.com>

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  89a350e455008070ec9c4c6ed55e1e4fb681921b (commit)
       via  914728f8d724e834a402619d05309ad8154ba59d (commit)
       via  c43cf158d74460440dc5a3d0aec984c754f57958 (commit)
       via  2c8eb2696a8f3505d45ed5accfa94b3e5541e169 (commit)
       via  039a7df9bada6d061f34728a0bb57fdcb9e277c1 (commit)
       via  ea62999f457a4263702a7f01e2c9bd8070da1e01 (commit)
       via  9239141e954c6b9eaba53fcad46fa2de24d8ba44 (commit)
      from  b641f2b873d55f8ba7b99db906fe6a780a910369 (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=89a350e455008070ec9c4c6ed55e1e4fb681921b
commit 89a350e455008070ec9c4c6ed55e1e4fb681921b
Merge: b641f2b 914728f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 09:35:06 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 09:35:06 2017 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 09:53:51 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 09:53:51 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1939-g4b74150
Message-ID: <20170110145351.67923FA3EB@public.kitware.com>

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  4b74150218a9c0ab28070d10c87f4391b724bba6 (commit)
       via  5ffee691ee0c55d043238960cf1149cbcfb86047 (commit)
      from  89a350e455008070ec9c4c6ed55e1e4fb681921b (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=4b74150218a9c0ab28070d10c87f4391b724bba6
commit 4b74150218a9c0ab28070d10c87f4391b724bba6
Merge: 89a350e 5ffee69
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 09:53:50 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 09:53:50 2017 -0500

    Merge topic 'pgsql-yum' into next
    
    5ffee691 FindPostgreSQL: automatically find installations from yum.postgresql.org


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ffee691ee0c55d043238960cf1149cbcfb86047
commit 5ffee691ee0c55d043238960cf1149cbcfb86047
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Dec 29 11:05:36 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 09:52:42 2017 -0500

    FindPostgreSQL: automatically find installations from yum.postgresql.org
    
    In commit v3.3.0-rc1~4^2 (FindPostgreSQL: Search some more common
    packaging locations) the PostgreSQL_ADDITIONAL_SEARCH_PATHS variable was
    removed. This was used e.g. by osm2pgsql to be able to build on CentOS
    with recent PostgreSQL versions. At least add those locations from
    yum.postgresql.org, which is a more or less official location.

diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake
index 874128c..9e2194c 100644
--- a/Modules/FindPostgreSQL.cmake
+++ b/Modules/FindPostgreSQL.cmake
@@ -88,8 +88,13 @@ foreach(suffix ${PostgreSQL_KNOWN_VERSIONS})
         "PostgreSQL/${suffix}/include/server")
   endif()
   if(UNIX)
+    list(APPEND PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES
+        "pgsql-${suffix}/lib")
+    list(APPEND PostgreSQL_INCLUDE_ADDITIONAL_SEARCH_SUFFIXES
+        "pgsql-${suffix}/include")
     list(APPEND PostgreSQL_TYPE_ADDITIONAL_SEARCH_SUFFIXES
-        "postgresql/${suffix}/server")
+        "postgresql/${suffix}/server"
+        "pgsql-${suffix}/include/server")
   endif()
 endforeach()
 

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 10:23:19 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 10:23:19 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1951-g29234c0
Message-ID: <20170110152319.563B9FA650@public.kitware.com>

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  29234c055a20494f76f9653fa11df5bc7d901ebd (commit)
       via  c52e556f1324662f168daf8e32366e3144e523d0 (commit)
       via  eabef10641eb8c995a5e1f732b4d2c2caea1b655 (commit)
       via  372f25218eaecf27916760990c39ffdf376494e3 (commit)
       via  0db926e9ea39c71cf8caa15bfaebc1a1474613be (commit)
       via  eb0d73faea66a440ff5594752de1d251e81dbbd4 (commit)
       via  a899d1f02d75de80161dcd6544ddacd45d231c84 (commit)
       via  cf394dbe507c5bcd076c02c9654eb44174682ad7 (commit)
       via  5443e3966190b3e4aaad445e2a406d6ac9d0d9fa (commit)
       via  d17683e7dfee0bc7b12afbd62e57c7d512cbc73a (commit)
       via  306c30e6007215ff4adfa9c5be28284ba8ac05ad (commit)
       via  bc5d62e4f7e190b567fd5e9f5364fa78da076ff5 (commit)
      from  4b74150218a9c0ab28070d10c87f4391b724bba6 (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=29234c055a20494f76f9653fa11df5bc7d901ebd
commit 29234c055a20494f76f9653fa11df5bc7d901ebd
Merge: 4b74150 c52e556
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 10:23:17 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 10:23:17 2017 -0500

    Merge topic 'cuda-windows' into next
    
    c52e556f CUDA: Enable CudaOnly.SeparateCompilation test runtime calls
    eabef106 CUDA: Port test cases to Windows with MSVC host compiler
    372f2521 CUDA: Populate NVIDIA compiler information on Windows
    0db926e9 CUDA: Detect implicit link information on Windows
    eb0d73fa CUDA: Find MSVC binutils on Windows
    a899d1f0 CUDA: Populate compiler PDB placeholder during device linking
    cf394dbe CUDA: Use `.obj` object file extension on Windows
    5443e396 CUDA: Detect MSVC architecture id
    d17683e7 CUDA: Detect use of MSVC host compiler
    306c30e6 CUDA: Allow platform files to set device linking rules
    bc5d62e4 CMakeParseImplicitLinkInfo: Add support for MSVC invoked by CUDA nvcc


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c52e556f1324662f168daf8e32366e3144e523d0
commit c52e556f1324662f168daf8e32366e3144e523d0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 15 15:17:08 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 11:12:15 2016 -0500

    CUDA: Enable CudaOnly.SeparateCompilation test runtime calls
    
    Uncomment the calls in `main.cpp` (and fix the signatures).

diff --git a/Tests/CudaOnly/SeparateCompilation/main.cu b/Tests/CudaOnly/SeparateCompilation/main.cu
index d4520ae..5c8e150 100644
--- a/Tests/CudaOnly/SeparateCompilation/main.cu
+++ b/Tests/CudaOnly/SeparateCompilation/main.cu
@@ -4,12 +4,12 @@
 #include "file1.h"
 #include "file2.h"
 
-// result_type file4_launch_kernel(int x);
-// result_type file5_launch_kernel(int x);
+int file4_launch_kernel(int x);
+int file5_launch_kernel(int x);
 
 int main(int argc, char **argv)
 {
-  // file4_launch_kernel(42);
-  // file5_launch_kernel(42);
+  file4_launch_kernel(42);
+  file5_launch_kernel(42);
   return 0;
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eabef10641eb8c995a5e1f732b4d2c2caea1b655
commit eabef10641eb8c995a5e1f732b4d2c2caea1b655
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 7 11:45:44 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 11:12:14 2016 -0500

    CUDA: Port test cases to Windows with MSVC host compiler

diff --git a/Tests/Cuda/Complex/dynamic.cpp b/Tests/Cuda/Complex/dynamic.cpp
index d579f1e..3848ce7 100644
--- a/Tests/Cuda/Complex/dynamic.cpp
+++ b/Tests/Cuda/Complex/dynamic.cpp
@@ -1,5 +1,11 @@
 
-int dynamic_base_func(int x)
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#else
+#define EXPORT
+#endif
+
+EXPORT int dynamic_base_func(int x)
 {
   return x * x;
 }
diff --git a/Tests/Cuda/Complex/dynamic.cu b/Tests/Cuda/Complex/dynamic.cu
index ea52acb..a23dc25 100644
--- a/Tests/Cuda/Complex/dynamic.cu
+++ b/Tests/Cuda/Complex/dynamic.cu
@@ -3,9 +3,15 @@
 #include <cuda.h>
 #include <iostream>
 
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#else
+#define EXPORT
+#endif
+
 int dynamic_base_func(int);
 
-int __host__ cuda_dynamic_host_func(int x)
+EXPORT int __host__ cuda_dynamic_host_func(int x)
 {
   return dynamic_base_func(x);
 }
@@ -16,7 +22,7 @@ void DetermineIfValidCudaDevice()
 {
 }
 
-void cuda_dynamic_lib_func()
+EXPORT void cuda_dynamic_lib_func()
 {
   DetermineIfValidCudaDevice <<<1,1>>> ();
   cudaError_t err = cudaGetLastError();
diff --git a/Tests/Cuda/Complex/main.cpp b/Tests/Cuda/Complex/main.cpp
index 32312d0..5a3f820 100644
--- a/Tests/Cuda/Complex/main.cpp
+++ b/Tests/Cuda/Complex/main.cpp
@@ -3,8 +3,14 @@
 #include "file1.h"
 #include "file2.h"
 
-int call_cuda_seperable_code(int x);
-int mixed_launch_kernel(int x);
+#ifdef _WIN32
+#define IMPORT __declspec(dllimport)
+#else
+#define IMPORT
+#endif
+
+IMPORT int call_cuda_seperable_code(int x);
+IMPORT int mixed_launch_kernel(int x);
 
 int main(int argc, char** argv)
 {
diff --git a/Tests/Cuda/Complex/mixed.cpp b/Tests/Cuda/Complex/mixed.cpp
index 205f091..bd32e51 100644
--- a/Tests/Cuda/Complex/mixed.cpp
+++ b/Tests/Cuda/Complex/mixed.cpp
@@ -1,6 +1,14 @@
 
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#define IMPORT __declspec(dllimport)
+#else
+#define EXPORT
+#define IMPORT
+#endif
+
 int dynamic_base_func(int);
-int cuda_dynamic_host_func(int);
+IMPORT int cuda_dynamic_host_func(int);
 int file3_launch_kernel(int);
 
 int dynamic_final_func(int x)
@@ -8,7 +16,7 @@ int dynamic_final_func(int x)
   return cuda_dynamic_host_func(dynamic_base_func(x));
 }
 
-int call_cuda_seperable_code(int x)
+EXPORT int call_cuda_seperable_code(int x)
 {
   return file3_launch_kernel(x);
 }
diff --git a/Tests/Cuda/Complex/mixed.cu b/Tests/Cuda/Complex/mixed.cu
index 45b412f..7051de0 100644
--- a/Tests/Cuda/Complex/mixed.cu
+++ b/Tests/Cuda/Complex/mixed.cu
@@ -4,10 +4,18 @@
 #include "file1.h"
 #include "file2.h"
 
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#define IMPORT __declspec(dllimport)
+#else
+#define EXPORT
+#define IMPORT
+#endif
+
 result_type __device__ file1_func(int x);
 result_type_dynamic __device__ file2_func(int x);
 
-void __host__ cuda_dynamic_lib_func();
+IMPORT void __host__ cuda_dynamic_lib_func();
 
 static
 __global__
@@ -17,7 +25,7 @@ void mixed_kernel(result_type& r, int x)
   result_type_dynamic rd = file2_func(x);
 }
 
-int mixed_launch_kernel(int x)
+EXPORT int mixed_launch_kernel(int x)
 {
   cuda_dynamic_lib_func();
 
diff --git a/Tests/CudaOnly/EnableStandard/main.cu b/Tests/CudaOnly/EnableStandard/main.cu
index 83e9dfd..f7144e6 100644
--- a/Tests/CudaOnly/EnableStandard/main.cu
+++ b/Tests/CudaOnly/EnableStandard/main.cu
@@ -1,8 +1,14 @@
 
 #include <iostream>
 
+#ifdef _WIN32
+#define IMPORT __declspec(dllimport)
+#else
+#define IMPORT
+#endif
+
 int static_cuda11_func(int);
-int shared_cuda11_func(int);
+IMPORT int shared_cuda11_func(int);
 
 void test_functions()
 {
diff --git a/Tests/CudaOnly/EnableStandard/shared.cu b/Tests/CudaOnly/EnableStandard/shared.cu
index 28555b3..ccdd0b2 100644
--- a/Tests/CudaOnly/EnableStandard/shared.cu
+++ b/Tests/CudaOnly/EnableStandard/shared.cu
@@ -1,9 +1,15 @@
 
 #include <type_traits>
 
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#else
+#define EXPORT
+#endif
+
 using tt = std::true_type;
 using ft = std::false_type;
-int __host__ shared_cuda11_func(int x)
+EXPORT int __host__ shared_cuda11_func(int x)
 {
   return x * x + std::integral_constant<int, 17>::value;
 }
diff --git a/Tests/CudaOnly/WithDefs/CMakeLists.txt b/Tests/CudaOnly/WithDefs/CMakeLists.txt
index c4ca8b9..6c4011c 100644
--- a/Tests/CudaOnly/WithDefs/CMakeLists.txt
+++ b/Tests/CudaOnly/WithDefs/CMakeLists.txt
@@ -4,7 +4,12 @@ project (CudaOnlyWithDefs CUDA)
 
 #verify that we can pass explicit cuda arch flags
 set(CMAKE_CUDA_FLAGS "-gencode arch=compute_30,code=compute_30")
-set(debug_compile_flags --generate-code arch=compute_20,code=sm_20 -Xcompiler=-Werror)
+set(debug_compile_flags --generate-code arch=compute_20,code=sm_20)
+if(CMAKE_CUDA_SIMULATE_ID STREQUAL "MSVC")
+  list(APPEND debug_compile_flags -Xcompiler=-WX)
+else()
+  list(APPEND debug_compile_flags -Xcompiler=-Werror)
+endif()
 set(release_compile_defs DEFREL)
 
 #Goal for this example:
diff --git a/Tests/CudaOnly/WithDefs/main.notcu b/Tests/CudaOnly/WithDefs/main.notcu
index 33a49d2..67bf10c 100644
--- a/Tests/CudaOnly/WithDefs/main.notcu
+++ b/Tests/CudaOnly/WithDefs/main.notcu
@@ -2,12 +2,21 @@
 #include <cuda_runtime.h>
 #include <iostream>
 
+#ifndef PACKED_DEFINE
+#error "PACKED_DEFINE not defined!"
+#endif
+
 static
 __global__
 void DetermineIfValidCudaDevice()
 {
 }
 
+#ifdef _MSC_VER
+#pragma pack(push,1)
+#undef PACKED_DEFINE
+#define PACKED_DEFINE
+#endif
 struct PACKED_DEFINE result_type
 {
   bool valid;
@@ -16,6 +25,9 @@ struct PACKED_DEFINE result_type
 #error missing DEFREL flag
 #endif
 };
+#ifdef _MSC_VER
+#pragma pack(pop)
+#endif
 
 result_type can_launch_kernel()
 {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=372f25218eaecf27916760990c39ffdf376494e3
commit 372f25218eaecf27916760990c39ffdf376494e3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 13:10:12 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 11:12:14 2016 -0500

    CUDA: Populate NVIDIA compiler information on Windows
    
    Port Windows-specific compilation and linking rules over from the
    `Platform/Windows-MSVC` module and adapt it for NVIDIA CUDA.  On Windows
    nvcc and its host compiler (MSVC) do not understand or use options like
    `-fPIC` or `-std=`, so condition those out.

diff --git a/Modules/Compiler/NVIDIA-CUDA.cmake b/Modules/Compiler/NVIDIA-CUDA.cmake
index 605d555..ae35132 100644
--- a/Modules/Compiler/NVIDIA-CUDA.cmake
+++ b/Modules/Compiler/NVIDIA-CUDA.cmake
@@ -1,14 +1,15 @@
 set(CMAKE_CUDA_VERBOSE_FLAG "-v")
 
-
-set(CMAKE_CUDA_COMPILE_OPTIONS_PIE -Xcompiler=-fPIE)
-set(CMAKE_CUDA_COMPILE_OPTIONS_PIC -Xcompiler=-fPIC)
-#CMAKE_SHARED_LIBRARY_CUDA_FLAGS is sent to the host linker so we don' need
-#to forward it through nvcc
-set(CMAKE_SHARED_LIBRARY_CUDA_FLAGS -fPIC)
+if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STREQUAL "xMSVC")
+  set(CMAKE_CUDA_COMPILE_OPTIONS_PIE -Xcompiler=-fPIE)
+  set(CMAKE_CUDA_COMPILE_OPTIONS_PIC -Xcompiler=-fPIC)
+  set(CMAKE_CUDA_COMPILE_OPTIONS_VISIBILITY -Xcompiler=-fvisibility=)
+  # CMAKE_SHARED_LIBRARY_CUDA_FLAGS is sent to the host linker so we
+  # don't need to forward it through nvcc.
+  set(CMAKE_SHARED_LIBRARY_CUDA_FLAGS -fPIC)
+endif()
 set(CMAKE_SHARED_LIBRARY_CREATE_CUDA_FLAGS -shared)
 set(CMAKE_INCLUDE_SYSTEM_FLAG_CUDA -isystem=)
-set(CMAKE_CUDA_COMPILE_OPTIONS_VISIBILITY -Xcompiler=-fvisibility=)
 
 string(APPEND CMAKE_CUDA_FLAGS_INIT " ")
 string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -g")
@@ -16,9 +17,12 @@ string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG")
 string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -O3 -DNDEBUG")
 string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
 
-set(CMAKE_CUDA98_STANDARD_COMPILE_OPTION "")
-set(CMAKE_CUDA98_EXTENSION_COMPILE_OPTION "")
-set(CMAKE_CUDA11_STANDARD_COMPILE_OPTION "-std=c++11")
-set(CMAKE_CUDA11_EXTENSION_COMPILE_OPTION "-std=c++11")
-
-set(CMAKE_CUDA_STANDARD_DEFAULT 98)
+if("x${CMAKE_CUDA_SIMULATE_ID}" STREQUAL "xMSVC")
+  set(CMAKE_CUDA_STANDARD_DEFAULT "")
+else()
+  set(CMAKE_CUDA_STANDARD_DEFAULT 98)
+  set(CMAKE_CUDA98_STANDARD_COMPILE_OPTION "")
+  set(CMAKE_CUDA98_EXTENSION_COMPILE_OPTION "")
+  set(CMAKE_CUDA11_STANDARD_COMPILE_OPTION "-std=c++11")
+  set(CMAKE_CUDA11_EXTENSION_COMPILE_OPTION "-std=c++11")
+endif()
diff --git a/Modules/Platform/Windows-NVIDIA-CUDA.cmake b/Modules/Platform/Windows-NVIDIA-CUDA.cmake
new file mode 100644
index 0000000..80ecfbc
--- /dev/null
+++ b/Modules/Platform/Windows-NVIDIA-CUDA.cmake
@@ -0,0 +1,42 @@
+include(Platform/Windows-MSVC)
+
+set(CMAKE_CUDA_COMPILE_PTX_COMPILATION
+  "<CMAKE_CUDA_COMPILER> ${CMAKE_CUDA_HOST_FLAGS} <DEFINES> <INCLUDES> <FLAGS> -x cu -ptx <SOURCE> -o <OBJECT> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
+set(CMAKE_CUDA_COMPILE_SEPARABLE_COMPILATION
+  "<CMAKE_CUDA_COMPILER> ${CMAKE_CUDA_HOST_FLAGS} <DEFINES> <INCLUDES> <FLAGS> -x cu -dc <SOURCE> -o <OBJECT> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
+set(CMAKE_CUDA_COMPILE_WHOLE_COMPILATION
+  "<CMAKE_CUDA_COMPILER> ${CMAKE_CUDA_HOST_FLAGS} <DEFINES> <INCLUDES> <FLAGS> -x cu -c <SOURCE> -o <OBJECT> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
+
+set(__IMPLICT_LINKS )
+foreach(dir ${CMAKE_CUDA_HOST_IMPLICIT_LINK_DIRECTORIES})
+  string(APPEND __IMPLICT_LINKS " -LIBPATH:\"${dir}\"")
+endforeach()
+foreach(lib ${CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES})
+  string(APPEND __IMPLICT_LINKS " \"${lib}\"")
+endforeach()
+set(CMAKE_CUDA_LINK_EXECUTABLE
+   "<CMAKE_CUDA_HOST_LINK_LAUNCHER> <CMAKE_CUDA_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <LINK_LIBRARIES>${__IMPLICT_LINKS}")
+
+set(_CMAKE_VS_LINK_DLL "<CMAKE_COMMAND> -E vs_link_dll --intdir=<OBJECT_DIR> --manifests <MANIFESTS> -- ")
+set(_CMAKE_VS_LINK_EXE "<CMAKE_COMMAND> -E vs_link_exe --intdir=<OBJECT_DIR> --manifests <MANIFESTS> -- ")
+set(CMAKE_CUDA_CREATE_SHARED_LIBRARY
+  "${_CMAKE_VS_LINK_DLL}<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /dll /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} <LINK_FLAGS> <LINK_LIBRARIES>${__IMPLICT_LINKS} ${CMAKE_END_TEMP_FILE}")
+
+set(CMAKE_CUDA_CREATE_SHARED_MODULE ${CMAKE_CUDA_CREATE_SHARED_LIBRARY})
+set(CMAKE_CUDA_CREATE_STATIC_LIBRARY  "<CMAKE_LINKER> /lib ${CMAKE_CL_NOLOGO} <LINK_FLAGS> /out:<TARGET> <OBJECTS> ")
+set(CMAKE_CUDA_LINKER_SUPPORTS_PDB ON)
+set(CMAKE_CUDA_LINK_EXECUTABLE
+  "${_CMAKE_VS_LINK_EXE}<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} <CMAKE_CUDA_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${__IMPLICT_LINKS} ${CMAKE_END_TEMP_FILE}")
+unset(_CMAKE_VS_LINK_EXE)
+unset(_CMAKE_VS_LINK_EXE)
+
+set(CMAKE_CUDA_DEVICE_LINK_LIBRARY
+  "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> <LANGUAGE_COMPILE_FLAGS> -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
+set(CMAKE_CUDA_DEVICE_LINK_EXECUTABLE
+  "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
+
+string(APPEND CMAKE_CUDA_FLAGS_INIT " -Xcompiler=-GR,-EHsc")
+string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -Xcompiler=-MDd,-Zi,-RTC1")
+string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -Xcompiler=-MD")
+string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -Xcompiler=-MD")
+string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -Xcompiler=-MD")

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0db926e9ea39c71cf8caa15bfaebc1a1474613be
commit 0db926e9ea39c71cf8caa15bfaebc1a1474613be
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 13:06:49 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 11:12:14 2016 -0500

    CUDA: Detect implicit link information on Windows
    
    The `nvcc -v` output on Windows uses response files, so load the one we
    need to extract the full link line.

diff --git a/Modules/CMakeDetermineCUDACompiler.cmake b/Modules/CMakeDetermineCUDACompiler.cmake
index 22c53d9..bef6d0e 100644
--- a/Modules/CMakeDetermineCUDACompiler.cmake
+++ b/Modules/CMakeDetermineCUDACompiler.cmake
@@ -60,7 +60,7 @@ if(NOT CMAKE_CUDA_COMPILER_ID_RUN)
   set(CMAKE_CXX_COMPILER_ID_TOOL_MATCH_REGEX "\nLd[^\n]*(\n[ \t]+[^\n]*)*\n[ \t]+([^ \t\r\n]+)[^\r\n]*-o[^\r\n]*CompilerIdCUDA/(\\./)?(CompilerIdCUDA.xctest/)?CompilerIdCUDA[ \t\n\\\"]")
   set(CMAKE_CXX_COMPILER_ID_TOOL_MATCH_INDEX 2)
 
-  set(CMAKE_CUDA_COMPILER_ID_FLAGS_ALWAYS "-v")
+  set(CMAKE_CUDA_COMPILER_ID_FLAGS_ALWAYS -v --keep --keep-dir tmp)
   if(CMAKE_CUDA_HOST_COMPILER)
       list(APPEND CMAKE_CUDA_COMPILER_ID_FLAGS_ALWAYS "-ccbin=${CMAKE_CUDA_HOST_COMPILER}")
   endif()
@@ -106,6 +106,14 @@ if(CMAKE_CUDA_COMPILER_ID STREQUAL NVIDIA)
       if("${_nvcc_output_line}" MATCHES "^ *nvlink")
         string(APPEND _nvcc_log "    ignoring nvlink line\n")
       elseif(_nvcc_libraries)
+        if("${_nvcc_output_line}" MATCHES "(@\"?tmp/a\\.exe\\.res\"?)")
+          set(_nvcc_link_res_arg "${CMAKE_MATCH_1}")
+          set(_nvcc_link_res "${CMAKE_PLATFORM_INFO_DIR}/CompilerIdCUDA/tmp/a.exe.res")
+          if(EXISTS "${_nvcc_link_res}")
+            file(READ "${_nvcc_link_res}" _nvcc_link_res_content)
+            string(REPLACE "${_nvcc_link_res_arg}" "${_nvcc_link_res_content}" _nvcc_output_line "${_nvcc_output_line}")
+          endif()
+        endif()
         string(FIND "${_nvcc_output_line}" "${_nvcc_libraries}" _nvcc_libraries_pos)
         if(NOT _nvcc_libraries_pos EQUAL -1)
           set(_nvcc_link_line "${_nvcc_output_line}")
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index eae139d..bb34de5 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -131,6 +131,7 @@ function(CMAKE_DETERMINE_COMPILER_ID_BUILD lang testflags src)
   # Create a clean working directory.
   file(REMOVE_RECURSE ${CMAKE_${lang}_COMPILER_ID_DIR})
   file(MAKE_DIRECTORY ${CMAKE_${lang}_COMPILER_ID_DIR})
+  file(MAKE_DIRECTORY ${CMAKE_${lang}_COMPILER_ID_DIR}/tmp)
   CMAKE_DETERMINE_COMPILER_ID_WRITE("${lang}" "${src}")
 
   # Construct a description of this test case.
diff --git a/Modules/CMakeTestCUDACompiler.cmake b/Modules/CMakeTestCUDACompiler.cmake
index 670b31d..80113cb 100644
--- a/Modules/CMakeTestCUDACompiler.cmake
+++ b/Modules/CMakeTestCUDACompiler.cmake
@@ -58,6 +58,11 @@ else()
   include(${CMAKE_ROOT}/Modules/CMakeDetermineCompilerABI.cmake)
   CMAKE_DETERMINE_COMPILER_ABI(CUDA ${CMAKE_ROOT}/Modules/CMakeCUDACompilerABI.cu)
 
+  if("x${CMAKE_CUDA_SIMULATE_ID}" STREQUAL "xMSVC")
+    set(CMAKE_CUDA_IMPLICIT_LINK_LIBRARIES "${CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES}")
+    set(CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES "${CMAKE_CUDA_HOST_IMPLICIT_LINK_DIRECTORIES}")
+  endif()
+
   # Re-configure to save learned information.
   configure_file(
     ${CMAKE_ROOT}/Modules/CMakeCUDACompiler.cmake.in

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb0d73faea66a440ff5594752de1d251e81dbbd4
commit eb0d73faea66a440ff5594752de1d251e81dbbd4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 13:05:20 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 11:12:13 2016 -0500

    CUDA: Find MSVC binutils on Windows
    
    On Windows the host link launcher is just `link.exe`.  Find and use that
    instead of trying to extract the launcher from the `nvcc -v` output.

diff --git a/Modules/CMakeDetermineCUDACompiler.cmake b/Modules/CMakeDetermineCUDACompiler.cmake
index d3024c7..22c53d9 100644
--- a/Modules/CMakeDetermineCUDACompiler.cmake
+++ b/Modules/CMakeDetermineCUDACompiler.cmake
@@ -116,9 +116,13 @@ if(CMAKE_CUDA_COMPILER_ID STREQUAL NVIDIA)
   endif()
 
   if(_nvcc_link_line)
-    #extract the compiler that is being used for linking
-    separate_arguments(_nvcc_link_line_args UNIX_COMMAND "${_nvcc_link_line}")
-    list(GET _nvcc_link_line_args 0 CMAKE_CUDA_HOST_LINK_LAUNCHER)
+    if("x${CMAKE_CUDA_SIMULATE_ID}" STREQUAL "xMSVC")
+      set(CMAKE_CUDA_HOST_LINK_LAUNCHER "${CMAKE_LINKER}")
+    else()
+      #extract the compiler that is being used for linking
+      separate_arguments(_nvcc_link_line_args UNIX_COMMAND "${_nvcc_link_line}")
+      list(GET _nvcc_link_line_args 0 CMAKE_CUDA_HOST_LINK_LAUNCHER)
+    endif()
 
     #prefix the line with cuda-fake-ld so that implicit link info believes it is
     #a link line
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake
index 75a031e..4c0486e 100644
--- a/Modules/CMakeFindBinUtils.cmake
+++ b/Modules/CMakeFindBinUtils.cmake
@@ -25,6 +25,7 @@ if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC"
    OR "x${CMAKE_Fortran_SIMULATE_ID}" STREQUAL "xMSVC"
    OR "x${CMAKE_C_COMPILER_ID}" STREQUAL "xMSVC"
    OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC"
+   OR "x${CMAKE_CUDA_SIMULATE_ID}" STREQUAL "xMSVC"
    OR (CMAKE_GENERATOR MATCHES "Visual Studio"
        AND NOT CMAKE_VS_PLATFORM_NAME STREQUAL "Tegra-Android"))
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a899d1f02d75de80161dcd6544ddacd45d231c84
commit a899d1f02d75de80161dcd6544ddacd45d231c84
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 13:02:11 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 11:11:31 2016 -0500

    CUDA: Populate compiler PDB placeholder during device linking
    
    The device link step runs the host compiler internally so we need to use
    the proper compiler PDB file with MSVC.

diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 480bb34..4bc706c 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -230,6 +230,11 @@ void cmMakefileExecutableTargetGenerator::WriteDeviceExecutableRule(
         this->LocalGenerator->GetCurrentBinaryDirectory(), targetOutputReal),
       output);
 
+    std::string targetFullPathCompilePDB = this->ComputeTargetCompilePDB();
+    std::string targetOutPathCompilePDB =
+      this->LocalGenerator->ConvertToOutputFormat(targetFullPathCompilePDB,
+                                                  cmOutputConverter::SHELL);
+
     vars.Language = linkLanguage.c_str();
     vars.Objects = buildObjs.c_str();
     vars.ObjectDir = objectDir.c_str();
@@ -237,6 +242,7 @@ void cmMakefileExecutableTargetGenerator::WriteDeviceExecutableRule(
     vars.LinkLibraries = linkLibs.c_str();
     vars.Flags = flags.c_str();
     vars.LinkFlags = linkFlags.c_str();
+    vars.TargetCompilePDB = targetOutPathCompilePDB.c_str();
 
     std::string launcher;
 
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index d4ad16d..27b7c21 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -366,12 +366,18 @@ void cmMakefileLibraryTargetGenerator::WriteDeviceLibraryRules(
         this->LocalGenerator->GetCurrentBinaryDirectory(), targetOutputReal),
       output);
 
+    std::string targetFullPathCompilePDB = this->ComputeTargetCompilePDB();
+    std::string targetOutPathCompilePDB =
+      this->LocalGenerator->ConvertToOutputFormat(targetFullPathCompilePDB,
+                                                  cmOutputConverter::SHELL);
+
     vars.Objects = buildObjs.c_str();
     vars.ObjectDir = objectDir.c_str();
     vars.Target = target.c_str();
     vars.LinkLibraries = linkLibs.c_str();
     vars.ObjectsQuoted = buildObjs.c_str();
     vars.LinkFlags = linkFlags.c_str();
+    vars.TargetCompilePDB = targetOutPathCompilePDB.c_str();
 
     // Add language feature flags.
     std::string langFlags;
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 10ee70d..bc8d8ff 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -229,6 +229,7 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkRule(bool useResponseFile)
     vars.SONameFlag = "$SONAME_FLAG";
     vars.TargetSOName = "$SONAME";
     vars.TargetPDB = "$TARGET_PDB";
+    vars.TargetCompilePDB = "$TARGET_COMPILE_PDB";
 
     vars.Flags = "$FLAGS";
     vars.LinkFlags = "$LINK_FLAGS";
@@ -716,6 +717,8 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkStatement()
     this->ConvertToNinjaPath(objPath), cmOutputConverter::SHELL);
   EnsureDirectoryExists(objPath);
 
+  this->SetMsvcTargetPdbVariable(vars);
+
   if (this->GetGlobalGenerator()->IsGCCOnWindows()) {
     // ar.exe can't handle backslashes in rsp files (implicitly used by gcc)
     std::string& linkLibraries = vars["LINK_LIBRARIES"];

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf394dbe507c5bcd076c02c9654eb44174682ad7
commit cf394dbe507c5bcd076c02c9654eb44174682ad7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 13:01:49 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 11:10:41 2016 -0500

    CUDA: Use `.obj` object file extension on Windows

diff --git a/Modules/CMakeCUDAInformation.cmake b/Modules/CMakeCUDAInformation.cmake
index cb0eef5..abc4b66 100644
--- a/Modules/CMakeCUDAInformation.cmake
+++ b/Modules/CMakeCUDAInformation.cmake
@@ -1,7 +1,11 @@
 # Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
 # file Copyright.txt or https://cmake.org/licensing for details.
 
-set(CMAKE_CUDA_OUTPUT_EXTENSION .o)
+if(UNIX)
+  set(CMAKE_CUDA_OUTPUT_EXTENSION .o)
+else()
+  set(CMAKE_CUDA_OUTPUT_EXTENSION .obj)
+endif()
 set(CMAKE_INCLUDE_FLAG_CUDA "-I")
 
 # Load compiler-specific information.
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 069011d..480bb34 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -104,10 +104,12 @@ void cmMakefileExecutableTargetGenerator::WriteDeviceExecutableRule(
 
   // Get the language to use for linking this library.
   std::string linkLanguage = "CUDA";
+  std::string const objExt =
+    this->Makefile->GetSafeDefinition("CMAKE_CUDA_OUTPUT_EXTENSION");
 
   // Get the name of the device object to generate.
   std::string const targetOutputReal =
-    this->GeneratorTarget->ObjectDirectory + "cmake_device_link.o";
+    this->GeneratorTarget->ObjectDirectory + "cmake_device_link" + objExt;
   this->DeviceLinkObject = targetOutputReal;
 
   this->NumberOfProgressActions++;
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 2b0e1b1..d4ad16d 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -281,6 +281,8 @@ void cmMakefileLibraryTargetGenerator::WriteDeviceLibraryRules(
 
   // Get the language to use for linking this library.
   std::string linkLanguage = "CUDA";
+  std::string const objExt =
+    this->Makefile->GetSafeDefinition("CMAKE_CUDA_OUTPUT_EXTENSION");
 
   // Create set of linking flags.
   std::string linkFlags;
@@ -288,7 +290,7 @@ void cmMakefileLibraryTargetGenerator::WriteDeviceLibraryRules(
 
   // Get the name of the device object to generate.
   std::string const targetOutputReal =
-    this->GeneratorTarget->ObjectDirectory + "cmake_device_link.o";
+    this->GeneratorTarget->ObjectDirectory + "cmake_device_link" + objExt;
   this->DeviceLinkObject = targetOutputReal;
 
   this->NumberOfProgressActions++;
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 0db5687..10ee70d 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -602,10 +602,12 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkStatement()
   // First and very important step is to make sure while inside this
   // step our link language is set to CUDA
   std::string cudaLinkLanguage = "CUDA";
+  std::string const objExt =
+    this->Makefile->GetSafeDefinition("CMAKE_CUDA_OUTPUT_EXTENSION");
 
   std::string const cfgName = this->GetConfigName();
-  std::string const targetOutputReal =
-    ConvertToNinjaPath(genTarget.ObjectDirectory + "cmake_device_link.o");
+  std::string const targetOutputReal = ConvertToNinjaPath(
+    genTarget.ObjectDirectory + "cmake_device_link" + objExt);
 
   std::string const targetOutputImplib =
     ConvertToNinjaPath(genTarget.GetFullPath(cfgName,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5443e3966190b3e4aaad445e2a406d6ac9d0d9fa
commit 5443e3966190b3e4aaad445e2a406d6ac9d0d9fa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 13:00:43 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 11:08:00 2016 -0500

    CUDA: Detect MSVC architecture id

diff --git a/Modules/CMakeCUDACompiler.cmake.in b/Modules/CMakeCUDACompiler.cmake.in
index 18291b5..1ba42d9 100644
--- a/Modules/CMakeCUDACompiler.cmake.in
+++ b/Modules/CMakeCUDACompiler.cmake.in
@@ -6,6 +6,7 @@ set(CMAKE_CUDA_COMPILER_VERSION "@CMAKE_CUDA_COMPILER_VERSION@")
 set(CMAKE_CUDA_STANDARD_COMPUTED_DEFAULT "@CMAKE_CUDA_STANDARD_COMPUTED_DEFAULT@")
 set(CMAKE_CUDA_SIMULATE_ID "@CMAKE_CUDA_SIMULATE_ID@")
 set(CMAKE_CUDA_SIMULATE_VERSION "@CMAKE_CUDA_SIMULATE_VERSION@")
+ at SET_MSVC_CUDA_ARCHITECTURE_ID@
 
 set(CMAKE_CUDA_COMPILER_ENV_VAR "CUDACXX")
 set(CMAKE_CUDA_HOST_COMPILER_ENV_VAR "CUDAHOSTCXX")
diff --git a/Modules/CMakeDetermineCUDACompiler.cmake b/Modules/CMakeDetermineCUDACompiler.cmake
index e03de7e..d3024c7 100644
--- a/Modules/CMakeDetermineCUDACompiler.cmake
+++ b/Modules/CMakeDetermineCUDACompiler.cmake
@@ -70,6 +70,10 @@ if(NOT CMAKE_CUDA_COMPILER_ID_RUN)
 endif()
 
 include(CMakeFindBinUtils)
+if(MSVC_CUDA_ARCHITECTURE_ID)
+  set(SET_MSVC_CUDA_ARCHITECTURE_ID
+    "set(MSVC_CUDA_ARCHITECTURE_ID ${MSVC_CUDA_ARCHITECTURE_ID})")
+endif()
 
 #if this compiler vendor is matches NVIDIA we can determine
 #what the host compiler is. This only needs to be done if the CMAKE_CUDA_HOST_COMPILER
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index f506500..0e90d35 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -54,6 +54,8 @@ if(NOT MSVC_VERSION)
     set(_compiler_version ${CMAKE_CXX_SIMULATE_VERSION})
   elseif(CMAKE_Fortran_SIMULATE_VERSION)
     set(_compiler_version ${CMAKE_Fortran_SIMULATE_VERSION})
+  elseif(CMAKE_CUDA_SIMULATE_VERSION)
+    set(_compiler_version ${CMAKE_CUDA_SIMULATE_VERSION})
   elseif(CMAKE_C_COMPILER_VERSION)
     set(_compiler_version ${CMAKE_C_COMPILER_VERSION})
   else()
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 23caead..8ad2efe 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -344,7 +344,8 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
 {
   cmMakefile* mf = this->GetMakefile();
   if (mf->GetDefinition("MSVC_C_ARCHITECTURE_ID") ||
-      mf->GetDefinition("MSVC_CXX_ARCHITECTURE_ID")) {
+      mf->GetDefinition("MSVC_CXX_ARCHITECTURE_ID") ||
+      mf->GetDefinition("MSVC_CUDA_ARCHITECTURE_ID")) {
     std::string pdbPath;
     std::string compilePdbPath = this->ComputeTargetCompilePDB();
     if (this->GeneratorTarget->GetType() == cmStateEnums::EXECUTABLE ||

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d17683e7dfee0bc7b12afbd62e57c7d512cbc73a
commit d17683e7dfee0bc7b12afbd62e57c7d512cbc73a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 12:58:35 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 11:08:00 2016 -0500

    CUDA: Detect use of MSVC host compiler
    
    Report it in `CMAKE_CUDA_SIMULATE_{ID,VERSION}`.

diff --git a/Modules/CMakeCUDACompiler.cmake.in b/Modules/CMakeCUDACompiler.cmake.in
index 8a6c0bc..18291b5 100644
--- a/Modules/CMakeCUDACompiler.cmake.in
+++ b/Modules/CMakeCUDACompiler.cmake.in
@@ -4,6 +4,8 @@ set(CMAKE_CUDA_HOST_LINK_LAUNCHER "@CMAKE_CUDA_HOST_LINK_LAUNCHER@")
 set(CMAKE_CUDA_COMPILER_ID "@CMAKE_CUDA_COMPILER_ID@")
 set(CMAKE_CUDA_COMPILER_VERSION "@CMAKE_CUDA_COMPILER_VERSION@")
 set(CMAKE_CUDA_STANDARD_COMPUTED_DEFAULT "@CMAKE_CUDA_STANDARD_COMPUTED_DEFAULT@")
+set(CMAKE_CUDA_SIMULATE_ID "@CMAKE_CUDA_SIMULATE_ID@")
+set(CMAKE_CUDA_SIMULATE_VERSION "@CMAKE_CUDA_SIMULATE_VERSION@")
 
 set(CMAKE_CUDA_COMPILER_ENV_VAR "CUDACXX")
 set(CMAKE_CUDA_HOST_COMPILER_ENV_VAR "CUDAHOSTCXX")
diff --git a/Modules/CMakeCUDACompilerId.cu.in b/Modules/CMakeCUDACompilerId.cu.in
index a20f1b1..018bab7 100644
--- a/Modules/CMakeCUDACompilerId.cu.in
+++ b/Modules/CMakeCUDACompilerId.cu.in
@@ -9,6 +9,9 @@
    because some compilers will just produce instructions to fill the
    array rather than assigning a pointer to a static array.  */
 char const* info_compiler = "INFO" ":" "compiler[" COMPILER_ID "]";
+#ifdef SIMULATE_ID
+char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]";
+#endif
 
 @CMAKE_CUDA_COMPILER_ID_PLATFORM_CONTENT@
 @CMAKE_CUDA_COMPILER_ID_ERROR_FOR_TEST@
@@ -35,6 +38,12 @@ int main(int argc, char* argv[])
 #ifdef COMPILER_VERSION_MAJOR
   require += info_version[argc];
 #endif
+#ifdef SIMULATE_ID
+  require += info_simulate[argc];
+#endif
+#ifdef SIMULATE_VERSION_MAJOR
+  require += info_simulate_version[argc];
+#endif
   require += info_language_dialect_default[argc];
   (void)argv;
   return require;
diff --git a/Modules/Compiler/NVIDIA-DetermineCompiler.cmake b/Modules/Compiler/NVIDIA-DetermineCompiler.cmake
index 32ccf8a..cb0beaf 100644
--- a/Modules/Compiler/NVIDIA-DetermineCompiler.cmake
+++ b/Modules/Compiler/NVIDIA-DetermineCompiler.cmake
@@ -4,4 +4,14 @@ set(_compiler_id_pp_test "defined(__NVCC__)")
 set(_compiler_id_version_compute "
 # define @PREFIX at COMPILER_VERSION_MAJOR @MACRO_DEC@(__CUDACC_VER_MAJOR__)
 # define @PREFIX at COMPILER_VERSION_MINOR @MACRO_DEC@(__CUDACC_VER_MINOR__)
-# define @PREFIX at COMPILER_VERSION_PATCH @MACRO_DEC@(__CUDACC_VER_BUILD__)")
+# define @PREFIX at COMPILER_VERSION_PATCH @MACRO_DEC@(__CUDACC_VER_BUILD__)
+# if defined(_MSC_VER)
+   /* _MSC_VER = VVRR */
+#  define @PREFIX at SIMULATE_VERSION_MAJOR @MACRO_DEC@(_MSC_VER / 100)
+#  define @PREFIX at SIMULATE_VERSION_MINOR @MACRO_DEC@(_MSC_VER % 100)
+# endif")
+
+set(_compiler_id_simulate "
+# if defined(_MSC_VER)
+#  define @PREFIX at SIMULATE_ID \"MSVC\"
+# endif")

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=306c30e6007215ff4adfa9c5be28284ba8ac05ad
commit 306c30e6007215ff4adfa9c5be28284ba8ac05ad
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 13:04:18 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 11:08:00 2016 -0500

    CUDA: Allow platform files to set device linking rules
    
    Condition the default settings on the rule variables not already being
    set.

diff --git a/Modules/CMakeCUDAInformation.cmake b/Modules/CMakeCUDAInformation.cmake
index 202a7a6..cb0eef5 100644
--- a/Modules/CMakeCUDAInformation.cmake
+++ b/Modules/CMakeCUDAInformation.cmake
@@ -177,11 +177,14 @@ if(NOT CMAKE_CUDA_LINK_EXECUTABLE)
 endif()
 
 #These are used when linking relocatable (dc) cuda code
-set(CMAKE_CUDA_DEVICE_LINK_LIBRARY
-      "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> <LANGUAGE_COMPILE_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
-set(CMAKE_CUDA_DEVICE_LINK_EXECUTABLE
-      "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
-
+if(NOT CMAKE_CUDA_DEVICE_LINK_LIBRARY)
+  set(CMAKE_CUDA_DEVICE_LINK_LIBRARY
+    "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> <LANGUAGE_COMPILE_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+endif()
+if(NOT CMAKE_CUDA_DEVICE_LINK_EXECUTABLE)
+  set(CMAKE_CUDA_DEVICE_LINK_EXECUTABLE
+    "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+endif()
 
 mark_as_advanced(
 CMAKE_CUDA_FLAGS

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc5d62e4f7e190b567fd5e9f5364fa78da076ff5
commit bc5d62e4f7e190b567fd5e9f5364fa78da076ff5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 11:08:53 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 11:07:59 2016 -0500

    CMakeParseImplicitLinkInfo: Add support for MSVC invoked by CUDA nvcc

diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake b/Modules/CMakeParseImplicitLinkInfo.cmake
index 2031ba5..3469d34 100644
--- a/Modules/CMakeParseImplicitLinkInfo.cmake
+++ b/Modules/CMakeParseImplicitLinkInfo.cmake
@@ -45,6 +45,7 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj
       endif()
       list(GET args 0 cmd)
     endif()
+    set(is_msvc 0)
     if("${cmd}" MATCHES "${linker_regex}")
       string(APPEND log "  link line: [${line}]\n")
       string(REGEX REPLACE ";-([LYz]);" ";-\\1" args "${args}")
@@ -54,6 +55,17 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj
           string(REGEX REPLACE "^-L" "" dir "${arg}")
           list(APPEND implicit_dirs_tmp ${dir})
           string(APPEND log "    arg [${arg}] ==> dir [${dir}]\n")
+        elseif("${arg}" MATCHES "^[-/]LIBPATH:(.+)")
+          # MSVC search path.
+          set(dir "${CMAKE_MATCH_1}")
+          list(APPEND implicit_dirs_tmp ${dir})
+          string(APPEND log "    arg [${arg}] ==> dir [${dir}]\n")
+        elseif(is_msvc AND "${arg}" STREQUAL "-link")
+          string(APPEND log "    arg [${arg}] ==> ignore MSVC cl option\n")
+        elseif(is_msvc AND "${arg}" MATCHES "^(.*\\.[Ll][Ii][Bb])$")
+          set(lib "${CMAKE_MATCH_1}")
+          list(APPEND implicit_libs_tmp ${lib})
+          string(APPEND log "    arg [${arg}] ==> lib [${lib}]\n")
         elseif("${arg}" MATCHES "^-l([^:].*)$")
           # Unix library.
           set(lib "${CMAKE_MATCH_1}")
@@ -82,6 +94,9 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj
           # Link editor option.
           list(APPEND implicit_libs_tmp ${arg})
           string(APPEND log "    arg [${arg}] ==> opt [${arg}]\n")
+        elseif("${arg}" STREQUAL "cl.exe")
+          string(APPEND log "    arg [${arg}] ==> recognize MSVC cl\n")
+          set(is_msvc 1)
         else()
           string(APPEND log "    arg [${arg}] ==> ignore\n")
         endif()
diff --git a/Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in b/Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in
index 1313dbf..d6d2357 100644
--- a/Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in
+++ b/Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in
@@ -518,6 +518,13 @@ set(msys_g77_libs "frtbegin;g2c;mingw32;moldname;mingwex;msvcrt;user32;kernel32;
 set(msys_g77_dirs "C:/some-mingw/lib/gcc/mingw32/3.4.5;C:/some-mingw/lib/gcc;/some-mingw/lib;C:/some-mingw/lib")
 list(APPEND platforms msys_g77)
 
+#-----------------------------------------------------------------------------
+# MSVC from NVIDIA CUDA
+
+set(nvcc_msvc_text [[cuda-fake-ld cl.exe -nologo "tmp/a_dlink.obj" "tmp/CMakeCUDACompilerId.obj" -link -INCREMENTAL:NO   "/LIBPATH:C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v8.0/bin/../lib/x64" cudadevrt.lib  cudart_static.lib -Fe"a.exe"]])
+set(nvcc_msvc_libs "cudadevrt.lib;cudart_static.lib")
+set(nvcc_msvc_dirs "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v8.0/lib/x64")
+list(APPEND platforms nvcc_msvc)
 
 #-----------------------------------------------------------------------------
 # Test parsing for all above examples.

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

Summary of changes:
 Modules/CMakeCUDACompiler.cmake.in              |    3 ++
 Modules/CMakeCUDACompilerId.cu.in               |    9 +++++
 Modules/CMakeCUDAInformation.cmake              |   19 ++++++----
 Modules/CMakeDetermineCUDACompiler.cmake        |   24 ++++++++++---
 Modules/CMakeDetermineCompilerId.cmake          |    1 +
 Modules/CMakeFindBinUtils.cmake                 |    1 +
 Modules/CMakeParseImplicitLinkInfo.cmake        |   15 ++++++++
 Modules/CMakeTestCUDACompiler.cmake             |    5 +++
 Modules/Compiler/NVIDIA-CUDA.cmake              |   30 +++++++++-------
 Modules/Compiler/NVIDIA-DetermineCompiler.cmake |   12 ++++++-
 Modules/Platform/Windows-MSVC.cmake             |    2 ++
 Modules/Platform/Windows-NVIDIA-CUDA.cmake      |   42 +++++++++++++++++++++++
 Source/cmMakefileExecutableTargetGenerator.cxx  |   10 +++++-
 Source/cmMakefileLibraryTargetGenerator.cxx     |   10 +++++-
 Source/cmNinjaNormalTargetGenerator.cxx         |    9 +++--
 Source/cmNinjaTargetGenerator.cxx               |    3 +-
 Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in  |    7 ++++
 Tests/Cuda/Complex/dynamic.cpp                  |    8 ++++-
 Tests/Cuda/Complex/dynamic.cu                   |   10 ++++--
 Tests/Cuda/Complex/main.cpp                     |   10 ++++--
 Tests/Cuda/Complex/mixed.cpp                    |   12 +++++--
 Tests/Cuda/Complex/mixed.cu                     |   12 +++++--
 Tests/CudaOnly/EnableStandard/main.cu           |    8 ++++-
 Tests/CudaOnly/EnableStandard/shared.cu         |    8 ++++-
 Tests/CudaOnly/SeparateCompilation/main.cu      |    8 ++---
 Tests/CudaOnly/WithDefs/CMakeLists.txt          |    7 +++-
 Tests/CudaOnly/WithDefs/main.notcu              |   12 +++++++
 27 files changed, 252 insertions(+), 45 deletions(-)
 create mode 100644 Modules/Platform/Windows-NVIDIA-CUDA.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 10:23:32 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 10:23:32 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1958-gae4b031
Message-ID: <20170110152332.6FBDAFA658@public.kitware.com>

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  ae4b031f2bcd15bb06edb97a217d8461926cc950 (commit)
       via  c93e85d87e683e4c20e5f29726889279aea9d921 (commit)
       via  18c8278b622e4cb9b155c5dc4ceac93322bed85f (commit)
       via  d47bda00b2e46b3fd6f9e050f3f21b5337ac244b (commit)
       via  efdfc26e14b5a4d8b52a1021ffe85418cdfc802f (commit)
       via  ad5b702c0914e0912693b9e5a84d9fe4bb53d720 (commit)
       via  def7395f6278c096ab8f4f418cd5db5059c8c314 (commit)
      from  29234c055a20494f76f9653fa11df5bc7d901ebd (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=ae4b031f2bcd15bb06edb97a217d8461926cc950
commit ae4b031f2bcd15bb06edb97a217d8461926cc950
Merge: 29234c0 c93e85d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 10:23:30 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 10:23:30 2017 -0500

    Merge topic 'vs15-detect-from-installer' into next
    
    c93e85d8 VS: Use Visual Studio Installer to locate VS 2017
    18c8278b VS: Add helper class to interact with Visual Studio Installer
    d47bda00 VS: Fix VS 2017 Windows Store toolset selection
    efdfc26e VS: Drop check for VS 15 Express Edition
    ad5b702c VS: Port Visual Studio Setup third-party header to MinGW
    def7395f VS: Add Visual Studio Setup third-party header


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c93e85d87e683e4c20e5f29726889279aea9d921
commit c93e85d87e683e4c20e5f29726889279aea9d921
Author:     Iyyappa Murugandi <iyyappam at microsoft.com>
AuthorDate: Wed Dec 14 18:53:30 2016 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 09:58:43 2016 -0500

    VS: Use Visual Studio Installer to locate VS 2017
    
    VS 2017 and later may no longer populate the Windows Registry entries
    CMake has traditionally used to find the VS installations.  This is
    because VS now supports having multiple installations of the same
    version.  The Visual Studio Installer tool provides a COM interface we
    can query to locate installations.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index dde6e82..e27615a 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -425,20 +425,6 @@ std::string cmGlobalVisualStudio10Generator::FindMSBuildCommand()
     }
   }
 
-  // Search where VS15Preview places it.
-  mskey = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VS7;";
-  mskey += this->GetIDEVersion();
-  if (cmSystemTools::ReadRegistryValue(mskey.c_str(), msbuild,
-                                       cmSystemTools::KeyWOW64_32)) {
-    cmSystemTools::ConvertToUnixSlashes(msbuild);
-    msbuild += "/MSBuild/";
-    msbuild += this->GetIDEVersion();
-    msbuild += "/Bin/MSBuild.exe";
-    if (cmSystemTools::FileExists(msbuild, true)) {
-      return msbuild;
-    }
-  }
-
   msbuild = "MSBuild.exe";
   return msbuild;
 }
diff --git a/Source/cmGlobalVisualStudio15Generator.cxx b/Source/cmGlobalVisualStudio15Generator.cxx
index 4299081..d11ee7c 100644
--- a/Source/cmGlobalVisualStudio15Generator.cxx
+++ b/Source/cmGlobalVisualStudio15Generator.cxx
@@ -8,6 +8,7 @@
 #include "cmMakefile.h"
 #include "cmVS141CLFlagTable.h"
 #include "cmVS141CSharpFlagTable.h"
+#include "cmVSSetupHelper.h"
 
 static const char vs15generatorName[] = "Visual Studio 15 2017";
 
@@ -126,21 +127,44 @@ bool cmGlobalVisualStudio15Generator::SelectWindowsStoreToolset(
 
 bool cmGlobalVisualStudio15Generator::IsWindowsDesktopToolsetInstalled() const
 {
-  const char desktop10Key[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
-                              "VisualStudio\\15.0\\VC\\Runtimes";
-
-  std::vector<std::string> vc15;
-  return cmSystemTools::GetRegistrySubKeys(desktop10Key, vc15,
-                                           cmSystemTools::KeyWOW64_32);
+  return vsSetupAPIHelper.IsVS2017Installed();
 }
 
 bool cmGlobalVisualStudio15Generator::IsWindowsStoreToolsetInstalled() const
 {
-  const char universal10Key[] =
-    "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
-    "VisualStudio\\15.0\\Setup\\Build Tools for Windows 10;SrcPath";
+  return vsSetupAPIHelper.IsWin10SDKInstalled();
+}
+
+std::string cmGlobalVisualStudio15Generator::FindMSBuildCommand()
+{
+  std::string msbuild;
+
+  // Ask Visual Studio Installer tool.
+  std::string vs;
+  if (vsSetupAPIHelper.GetVSInstanceInfo(vs)) {
+    msbuild = vs + "/MSBuild/15.0/Bin/MSBuild.exe";
+    if (cmSystemTools::FileExists(msbuild)) {
+      return msbuild;
+    }
+  }
+
+  msbuild = "MSBuild.exe";
+  return msbuild;
+}
+
+std::string cmGlobalVisualStudio15Generator::FindDevEnvCommand()
+{
+  std::string devenv;
+
+  // Ask Visual Studio Installer tool.
+  std::string vs;
+  if (vsSetupAPIHelper.GetVSInstanceInfo(vs)) {
+    devenv = vs + "/Common7/IDE/devenv.com";
+    if (cmSystemTools::FileExists(devenv)) {
+      return devenv;
+    }
+  }
 
-  std::string win10SDK;
-  return cmSystemTools::ReadRegistryValue(universal10Key, win10SDK,
-                                          cmSystemTools::KeyWOW64_32);
+  devenv = "devenv.com";
+  return devenv;
 }
diff --git a/Source/cmGlobalVisualStudio15Generator.h b/Source/cmGlobalVisualStudio15Generator.h
index 59eb11a..781b41e 100644
--- a/Source/cmGlobalVisualStudio15Generator.h
+++ b/Source/cmGlobalVisualStudio15Generator.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "cmGlobalVisualStudio14Generator.h"
+#include "cmVSSetupHelper.h"
 
 class cmGlobalGeneratorFactory;
 class cmake;
@@ -39,7 +40,11 @@ protected:
   // of the toolset is installed
   bool IsWindowsStoreToolsetInstalled() const;
 
+  std::string FindMSBuildCommand() CM_OVERRIDE;
+  std::string FindDevEnvCommand() CM_OVERRIDE;
+
 private:
   class Factory;
+  mutable cmVSSetupAPIHelper vsSetupAPIHelper;
 };
 #endif
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 733e0e4..6141f50 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -64,6 +64,7 @@
 #include "cmGlobalVisualStudio71Generator.h"
 #include "cmGlobalVisualStudio8Generator.h"
 #include "cmGlobalVisualStudio9Generator.h"
+#include "cmVSSetupHelper.h"
 
 #define CMAKE_HAVE_VS_GENERATORS
 #endif
@@ -1470,18 +1471,23 @@ void cmake::CreateDefaultGlobalGenerator()
     "\\Setup\\VC;ProductDir", //
     ";InstallDir"             //
   };
-  for (VSVersionedGenerator const* g = cmArrayBegin(vsGenerators);
-       found.empty() && g != cmArrayEnd(vsGenerators); ++g) {
-    for (const char* const* v = cmArrayBegin(vsVariants);
-         found.empty() && v != cmArrayEnd(vsVariants); ++v) {
-      for (const char* const* e = cmArrayBegin(vsEntries);
-           found.empty() && e != cmArrayEnd(vsEntries); ++e) {
-        std::string const reg = vsregBase + *v + g->MSVersion + *e;
-        std::string dir;
-        if (cmSystemTools::ReadRegistryValue(reg, dir,
-                                             cmSystemTools::KeyWOW64_32) &&
-            cmSystemTools::PathExists(dir)) {
-          found = g->GeneratorName;
+  cmVSSetupAPIHelper vsSetupAPIHelper;
+  if (vsSetupAPIHelper.IsVS2017Installed()) {
+    found = "Visual Studio 15 2017";
+  } else {
+    for (VSVersionedGenerator const* g = cmArrayBegin(vsGenerators);
+         found.empty() && g != cmArrayEnd(vsGenerators); ++g) {
+      for (const char* const* v = cmArrayBegin(vsVariants);
+           found.empty() && v != cmArrayEnd(vsVariants); ++v) {
+        for (const char* const* e = cmArrayBegin(vsEntries);
+             found.empty() && e != cmArrayEnd(vsEntries); ++e) {
+          std::string const reg = vsregBase + *v + g->MSVersion + *e;
+          std::string dir;
+          if (cmSystemTools::ReadRegistryValue(reg, dir,
+                                               cmSystemTools::KeyWOW64_32) &&
+              cmSystemTools::PathExists(dir)) {
+            found = g->GeneratorName;
+          }
         }
       }
     }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18c8278b622e4cb9b155c5dc4ceac93322bed85f
commit 18c8278b622e4cb9b155c5dc4ceac93322bed85f
Author:     Iyyappa Murugandi <iyyappam at microsoft.com>
AuthorDate: Wed Dec 14 18:53:30 2016 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 09:58:43 2016 -0500

    VS: Add helper class to interact with Visual Studio Installer
    
    VS 2017 exports a COM component which can be queried to find if VS 2017
    is installed and also other components such as VC toolset and Windows
    SDKs.  Add a helper class to interact with this interface.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index d15fdbe..57b7b25 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -710,6 +710,8 @@ if (WIN32)
       cmGhsMultiTargetGenerator.h
       cmGhsMultiGpj.cxx
       cmGhsMultiGpj.h
+      cmVSSetupHelper.cxx
+      cmVSSetupHelper.h
       )
 
     # Add a manifest file to executables on Windows to allow for
diff --git a/Source/cmVSSetupHelper.cxx b/Source/cmVSSetupHelper.cxx
new file mode 100644
index 0000000..d675a2c
--- /dev/null
+++ b/Source/cmVSSetupHelper.cxx
@@ -0,0 +1,395 @@
+/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+   file Copyright.txt or https://cmake.org/licensing for details.  */
+#include "cmVSSetupHelper.h"
+
+#ifndef VSSetupConstants
+#define VSSetupConstants
+/* clang-format off */
+const IID IID_ISetupConfiguration = {
+  0x42843719, 0xDB4C, 0x46C2,
+  { 0x8E, 0x7C, 0x64, 0xF1, 0x81, 0x6E, 0xFD, 0x5B }
+};
+const IID IID_ISetupConfiguration2 = {
+  0x26AAB78C, 0x4A60, 0x49D6,
+  { 0xAF, 0x3B, 0x3C, 0x35, 0xBC, 0x93, 0x36, 0x5D }
+};
+const IID IID_ISetupPackageReference = {
+  0xda8d8a16, 0xb2b6, 0x4487,
+  { 0xa2, 0xf1, 0x59, 0x4c, 0xcc, 0xcd, 0x6b, 0xf5 }
+};
+const IID IID_ISetupHelper = {
+  0x42b21b78, 0x6192, 0x463e,
+  { 0x87, 0xbf, 0xd5, 0x77, 0x83, 0x8f, 0x1d, 0x5c }
+};
+const IID IID_IEnumSetupInstances = {
+  0x6380BCFF, 0x41D3, 0x4B2E,
+  { 0x8B, 0x2E, 0xBF, 0x8A, 0x68, 0x10, 0xC8, 0x48 }
+};
+const IID IID_ISetupInstance2 = {
+  0x89143C9A, 0x05AF, 0x49B0,
+  { 0xB7, 0x17, 0x72, 0xE2, 0x18, 0xA2, 0x18, 0x5C }
+};
+const IID IID_ISetupInstance = {
+  0xB41463C3, 0x8866, 0x43B5,
+  { 0xBC, 0x33, 0x2B, 0x06, 0x76, 0xF7, 0xF4, 0x2E }
+};
+const CLSID CLSID_SetupConfiguration = {
+  0x177F0C4A, 0x1CD3, 0x4DE7,
+  { 0xA3, 0x2C, 0x71, 0xDB, 0xBB, 0x9F, 0xA3, 0x6D }
+};
+/* clang-format on */
+#endif
+
+const WCHAR* VCToolsetComponent =
+  L"Microsoft.VisualStudio.Component.VC.Tools.x86.x64";
+const WCHAR* Win10SDKComponent =
+  L"Microsoft.VisualStudio.Component.Windows10SDK";
+const WCHAR* Win81SDKComponent =
+  L"Microsoft.VisualStudio.Component.Windows81SDK";
+const WCHAR* ComponentType = L"Component";
+
+cmVSSetupAPIHelper::cmVSSetupAPIHelper()
+  : setupConfig(NULL)
+  , setupConfig2(NULL)
+  , setupHelper(NULL)
+  , initializationFailure(false)
+{
+  comInitialized = CoInitializeEx(NULL, 0);
+  if (SUCCEEDED(comInitialized)) {
+    Initialize();
+  } else {
+    initializationFailure = true;
+  }
+}
+
+cmVSSetupAPIHelper::~cmVSSetupAPIHelper()
+{
+  setupHelper = NULL;
+  setupConfig2 = NULL;
+  setupConfig = NULL;
+  if (SUCCEEDED(comInitialized))
+    CoUninitialize();
+}
+
+bool cmVSSetupAPIHelper::IsVS2017Installed()
+{
+  bool ret = false;
+  if (chosenInstanceInfo.VSInstallLocation.compare(L"") == 0) {
+    ret = EnumerateAndChooseVSInstance();
+  }
+
+  return ret;
+}
+
+bool cmVSSetupAPIHelper::IsWin10SDKInstalled()
+{
+  bool isWin10SDKInstalled = false;
+  if (chosenInstanceInfo.VSInstallLocation.compare(L"") == 0) {
+    if (EnumerateAndChooseVSInstance() &&
+        chosenInstanceInfo.VSInstallLocation.compare(L"") != 0) {
+      isWin10SDKInstalled = chosenInstanceInfo.IsWin10SDKInstalled;
+    }
+  } else {
+    isWin10SDKInstalled = chosenInstanceInfo.IsWin10SDKInstalled;
+  }
+
+  return isWin10SDKInstalled;
+}
+
+bool cmVSSetupAPIHelper::IsWin81SDKInstalled()
+{
+  bool isWin81SDKInstalled = false;
+  if (chosenInstanceInfo.VSInstallLocation.compare(L"") == 0) {
+    if (EnumerateAndChooseVSInstance() &&
+        chosenInstanceInfo.VSInstallLocation.compare(L"") != 0) {
+      isWin81SDKInstalled = chosenInstanceInfo.IsWin81SDKInstalled;
+    }
+  } else {
+    isWin81SDKInstalled = chosenInstanceInfo.IsWin81SDKInstalled;
+  }
+
+  return isWin81SDKInstalled;
+}
+
+bool cmVSSetupAPIHelper::CheckInstalledComponent(
+  SmartCOMPtr<ISetupPackageReference> package, bool& bVCToolset,
+  bool& bWin10SDK, bool& bWin81SDK)
+{
+  bool ret = false;
+  bVCToolset = bWin10SDK = bWin81SDK = false;
+  SmartBSTR bstrId;
+  if (FAILED(package->GetId(&bstrId))) {
+    return ret;
+  }
+
+  SmartBSTR bstrType;
+  if (FAILED(package->GetType(&bstrType))) {
+    return ret;
+  }
+
+  std::wstring id = std::wstring(bstrId);
+  std::wstring type = std::wstring(bstrType);
+  if (id.compare(VCToolsetComponent) == 0 &&
+      type.compare(ComponentType) == 0) {
+    bVCToolset = true;
+    ret = true;
+  }
+
+  // Checks for any version of Win10 SDK. The version is appended at the end of
+  // the
+  // component name ex: Microsoft.VisualStudio.Component.Windows10SDK.10240
+  if (id.find(Win10SDKComponent) != std::wstring::npos &&
+      type.compare(ComponentType) == 0) {
+    bWin10SDK = true;
+    ret = true;
+  }
+
+  if (id.compare(Win81SDKComponent) == 0 && type.compare(ComponentType) == 0) {
+    bWin81SDK = true;
+    ret = true;
+  }
+
+  return ret;
+}
+
+// Gather additional info such as if VCToolset, WinSDKs are installed, location
+// of VS and version information.
+bool cmVSSetupAPIHelper::GetVSInstanceInfo(
+  SmartCOMPtr<ISetupInstance2> pInstance, VSInstanceInfo& vsInstanceInfo)
+{
+  bool isVCToolSetInstalled = false;
+  if (pInstance == NULL)
+    return false;
+
+  SmartBSTR bstrId;
+  if (SUCCEEDED(pInstance->GetInstanceId(&bstrId))) {
+    vsInstanceInfo.InstanceId = std::wstring(bstrId);
+  } else {
+    return false;
+  }
+
+  InstanceState state;
+  if (FAILED(pInstance->GetState(&state))) {
+    return false;
+  }
+
+  ULONGLONG ullVersion = 0;
+  SmartBSTR bstrVersion;
+  if (FAILED(pInstance->GetInstallationVersion(&bstrVersion))) {
+    return false;
+  } else {
+    vsInstanceInfo.Version = std::wstring(bstrVersion);
+    if (FAILED(setupHelper->ParseVersion(bstrVersion, &ullVersion))) {
+      vsInstanceInfo.ullVersion = 0;
+    } else {
+      vsInstanceInfo.ullVersion = ullVersion;
+    }
+  }
+
+  // Reboot may have been required before the installation path was created.
+  SmartBSTR bstrInstallationPath;
+  if ((eLocal & state) == eLocal) {
+    if (FAILED(pInstance->GetInstallationPath(&bstrInstallationPath))) {
+      return false;
+    } else {
+      vsInstanceInfo.VSInstallLocation = std::wstring(bstrInstallationPath);
+    }
+  }
+
+  // Reboot may have been required before the product package was registered
+  // (last).
+  if ((eRegistered & state) == eRegistered) {
+    SmartCOMPtr<ISetupPackageReference> product;
+    if (FAILED(pInstance->GetProduct(&product)) || !product) {
+      return false;
+    }
+
+    LPSAFEARRAY lpsaPackages;
+    if (FAILED(pInstance->GetPackages(&lpsaPackages)) ||
+        lpsaPackages == NULL) {
+      return false;
+    }
+
+    int lower = lpsaPackages->rgsabound[0].lLbound;
+    int upper = lpsaPackages->rgsabound[0].cElements + lower;
+
+    IUnknown** ppData = (IUnknown**)lpsaPackages->pvData;
+    for (int i = lower; i < upper; i++) {
+      SmartCOMPtr<ISetupPackageReference> package = NULL;
+      if (FAILED(ppData[i]->QueryInterface(IID_ISetupPackageReference,
+                                           (void**)&package)) ||
+          package == NULL)
+        continue;
+
+      bool vcToolsetInstalled = false, win10SDKInstalled = false,
+           win81SDkInstalled = false;
+      bool ret = CheckInstalledComponent(package, vcToolsetInstalled,
+                                         win10SDKInstalled, win81SDkInstalled);
+      if (ret) {
+        isVCToolSetInstalled |= vcToolsetInstalled;
+        vsInstanceInfo.IsWin10SDKInstalled |= win10SDKInstalled;
+        vsInstanceInfo.IsWin81SDKInstalled |= win81SDkInstalled;
+      }
+    }
+
+    SafeArrayDestroy(lpsaPackages);
+  }
+
+  return isVCToolSetInstalled;
+}
+
+bool cmVSSetupAPIHelper::GetVSInstanceInfo(std::string& vsInstallLocation)
+{
+  vsInstallLocation = "";
+  bool isInstalled = false;
+
+  if (chosenInstanceInfo.VSInstallLocation.compare(L"") == 0) {
+    isInstalled = EnumerateAndChooseVSInstance();
+  }
+
+  // Enumerate and choose best VS instance
+  if (chosenInstanceInfo.VSInstallLocation.compare(L"") != 0) {
+    std::string str(chosenInstanceInfo.VSInstallLocation.begin(),
+                    chosenInstanceInfo.VSInstallLocation.end());
+    vsInstallLocation = str;
+    isInstalled = true;
+  }
+
+  return isInstalled;
+}
+
+bool cmVSSetupAPIHelper::EnumerateAndChooseVSInstance()
+{
+  bool isVSInstanceExists = false;
+  if (chosenInstanceInfo.VSInstallLocation.compare(L"") != 0) {
+    return true;
+  }
+
+  if (initializationFailure || setupConfig == NULL || setupConfig2 == NULL ||
+      setupHelper == NULL)
+    return false;
+
+  std::vector<VSInstanceInfo> vecVSInstances;
+  SmartCOMPtr<IEnumSetupInstances> enumInstances = NULL;
+  if (FAILED(
+        setupConfig2->EnumInstances((IEnumSetupInstances**)&enumInstances)) ||
+      !enumInstances) {
+    return false;
+  }
+
+  SmartCOMPtr<ISetupInstance> instance;
+  while (SUCCEEDED(enumInstances->Next(1, &instance, NULL)) && instance) {
+    SmartCOMPtr<ISetupInstance2> instance2 = NULL;
+    if (FAILED(
+          instance->QueryInterface(IID_ISetupInstance2, (void**)&instance2)) ||
+        !instance2) {
+      instance = NULL;
+      continue;
+    }
+
+    VSInstanceInfo instanceInfo;
+    bool isInstalled = GetVSInstanceInfo(instance2, instanceInfo);
+    instance = instance2 = NULL;
+
+    if (isInstalled) {
+      vecVSInstances.push_back(instanceInfo);
+    }
+  }
+
+  if (vecVSInstances.size() > 0) {
+    isVSInstanceExists = true;
+    int index = ChooseVSInstance(vecVSInstances);
+    chosenInstanceInfo = vecVSInstances[index];
+  }
+
+  return isVSInstanceExists;
+}
+
+int cmVSSetupAPIHelper::ChooseVSInstance(
+  const std::vector<VSInstanceInfo>& vecVSInstances)
+{
+  if (vecVSInstances.size() == 0)
+    return -1;
+
+  if (vecVSInstances.size() == 1)
+    return 0;
+
+  unsigned int chosenIndex = 0;
+  for (unsigned int i = 1; i < vecVSInstances.size(); i++) {
+    // If the current has Win10 SDK but not the chosen one, then choose the
+    // current VS instance
+    if (!vecVSInstances[chosenIndex].IsWin10SDKInstalled &&
+        vecVSInstances[i].IsWin10SDKInstalled) {
+      chosenIndex = i;
+      continue;
+    }
+
+    // If the chosen one has Win10 SDK but the current one is not, then look at
+    // the next VS instance even the current
+    // instance version may be higher
+    if (vecVSInstances[chosenIndex].IsWin10SDKInstalled &&
+        !vecVSInstances[i].IsWin10SDKInstalled) {
+      continue;
+    }
+
+    // If both chosen one and current one doesn't have Win10 SDK but the
+    // current one has Win8.1 SDK installed,
+    // then choose the current one
+    if (!vecVSInstances[chosenIndex].IsWin10SDKInstalled &&
+        !vecVSInstances[i].IsWin10SDKInstalled &&
+        !vecVSInstances[chosenIndex].IsWin81SDKInstalled &&
+        vecVSInstances[i].IsWin81SDKInstalled) {
+      chosenIndex = i;
+      continue;
+    }
+
+    // If there is no difference in WinSDKs then look for the highest version
+    // of installed VS
+    if ((vecVSInstances[chosenIndex].IsWin10SDKInstalled ==
+         vecVSInstances[i].IsWin10SDKInstalled) &&
+        (vecVSInstances[chosenIndex].IsWin81SDKInstalled ==
+         vecVSInstances[i].IsWin81SDKInstalled) &&
+        vecVSInstances[chosenIndex].Version < vecVSInstances[i].Version) {
+      chosenIndex = i;
+      continue;
+    }
+  }
+
+  return chosenIndex;
+}
+
+bool cmVSSetupAPIHelper::Initialize()
+{
+  if (initializationFailure)
+    return false;
+
+  if (FAILED(comInitialized)) {
+    initializationFailure = true;
+    return false;
+  }
+
+  if (FAILED(setupConfig.CoCreateInstance(CLSID_SetupConfiguration, NULL,
+                                          IID_ISetupConfiguration,
+                                          CLSCTX_INPROC_SERVER)) ||
+      setupConfig == NULL) {
+    initializationFailure = true;
+    return false;
+  }
+
+  if (FAILED(setupConfig.QueryInterface(IID_ISetupConfiguration2,
+                                        (void**)&setupConfig2)) ||
+      setupConfig2 == NULL) {
+    initializationFailure = true;
+    return false;
+  }
+
+  if (FAILED(
+        setupConfig.QueryInterface(IID_ISetupHelper, (void**)&setupHelper)) ||
+      setupHelper == NULL) {
+    initializationFailure = true;
+    return false;
+  }
+
+  initializationFailure = false;
+  return true;
+}
diff --git a/Source/cmVSSetupHelper.h b/Source/cmVSSetupHelper.h
new file mode 100644
index 0000000..d2f514c
--- /dev/null
+++ b/Source/cmVSSetupHelper.h
@@ -0,0 +1,154 @@
+/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+   file Copyright.txt or https://cmake.org/licensing for details.  */
+#ifndef cmVSSetupHelper_h
+#define cmVSSetupHelper_h
+
+#ifndef NOMINMAX
+#define NOMINMAX // Undefine min and max defined by windows.h
+#endif
+
+// Published by Visual Studio Setup team
+#include "cmvssetup/Setup.Configuration.h"
+
+#include <string>
+#include <vector>
+
+#include <windows.h>
+
+template <class T>
+class SmartCOMPtr
+{
+public:
+  SmartCOMPtr() { ptr = NULL; }
+  SmartCOMPtr(T* p)
+  {
+    ptr = p;
+    if (ptr != NULL)
+      ptr->AddRef();
+  }
+  SmartCOMPtr(const SmartCOMPtr<T>& sptr)
+  {
+    ptr = sptr.ptr;
+    if (ptr != NULL)
+      ptr->AddRef();
+  }
+  T** operator&() { return &ptr; }
+  T* operator->() { return ptr; }
+  T* operator=(T* p)
+  {
+    if (*this != p) {
+      ptr = p;
+      if (ptr != NULL)
+        ptr->AddRef();
+    }
+    return *this;
+  }
+  operator T*() const { return ptr; }
+  template <class I>
+  HRESULT QueryInterface(REFCLSID rclsid, I** pp)
+  {
+    if (pp != NULL) {
+      return ptr->QueryInterface(rclsid, (void**)pp);
+    } else {
+      return E_FAIL;
+    }
+  }
+  HRESULT CoCreateInstance(REFCLSID clsid, IUnknown* pUnknown,
+                           REFIID interfaceId, DWORD dwClsContext = CLSCTX_ALL)
+  {
+    HRESULT hr = ::CoCreateInstance(clsid, pUnknown, dwClsContext, interfaceId,
+                                    (void**)&ptr);
+    return hr;
+  }
+  ~SmartCOMPtr()
+  {
+    if (ptr != NULL)
+      ptr->Release();
+  }
+
+private:
+  T* ptr;
+};
+
+class SmartBSTR
+{
+public:
+  SmartBSTR() { str = NULL; }
+  SmartBSTR(const SmartBSTR& src)
+  {
+    if (src.str != NULL) {
+      str = ::SysAllocStringByteLen((char*)str, ::SysStringByteLen(str));
+    } else {
+      str = ::SysAllocStringByteLen(NULL, 0);
+    }
+  }
+  SmartBSTR& operator=(const SmartBSTR& src)
+  {
+    if (str != src.str) {
+      ::SysFreeString(str);
+      if (src.str != NULL) {
+        str = ::SysAllocStringByteLen((char*)str, ::SysStringByteLen(str));
+      } else {
+        str = ::SysAllocStringByteLen(NULL, 0);
+      }
+    }
+    return *this;
+  }
+  operator BSTR() const { return str; }
+  BSTR* operator&() throw() { return &str; }
+  ~SmartBSTR() throw() { ::SysFreeString(str); }
+private:
+  BSTR str;
+};
+
+struct VSInstanceInfo
+{
+  std::wstring InstanceId;
+  std::wstring VSInstallLocation;
+  std::wstring Version;
+  ULONGLONG ullVersion;
+  bool IsWin10SDKInstalled;
+  bool IsWin81SDKInstalled;
+
+  VSInstanceInfo()
+  {
+    InstanceId = VSInstallLocation = Version = L"";
+    ullVersion = 0;
+    IsWin10SDKInstalled = IsWin81SDKInstalled = false;
+  }
+};
+
+class cmVSSetupAPIHelper
+{
+public:
+  cmVSSetupAPIHelper();
+  ~cmVSSetupAPIHelper();
+
+  bool IsVS2017Installed();
+  bool GetVSInstanceInfo(std::string& vsInstallLocation);
+  bool IsWin10SDKInstalled();
+  bool IsWin81SDKInstalled();
+
+private:
+  bool Initialize();
+  bool GetVSInstanceInfo(SmartCOMPtr<ISetupInstance2> instance2,
+                         VSInstanceInfo& vsInstanceInfo);
+  bool CheckInstalledComponent(SmartCOMPtr<ISetupPackageReference> package,
+                               bool& bVCToolset, bool& bWin10SDK,
+                               bool& bWin81SDK);
+  int ChooseVSInstance(const std::vector<VSInstanceInfo>& vecVSInstances);
+  bool EnumerateAndChooseVSInstance();
+
+  // COM ptrs to query about VS instances
+  SmartCOMPtr<ISetupConfiguration> setupConfig;
+  SmartCOMPtr<ISetupConfiguration2> setupConfig2;
+  SmartCOMPtr<ISetupHelper> setupHelper;
+  // used to indicate failure in Initialize(), so we don't have to call again
+  bool initializationFailure;
+  // indicated if COM initialization is successful
+  HRESULT comInitialized;
+  // current best instance of VS selected
+  VSInstanceInfo chosenInstanceInfo;
+};
+
+#endif

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d47bda00b2e46b3fd6f9e050f3f21b5337ac244b
commit d47bda00b2e46b3fd6f9e050f3f21b5337ac244b
Author:     Iyyappa Murugandi <iyyappam at microsoft.com>
AuthorDate: Wed Dec 14 18:53:30 2016 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 09:58:31 2016 -0500

    VS: Fix VS 2017 Windows Store toolset selection
    
    VS 2017 uses the `v141` toolset, not `v140`.

diff --git a/Source/cmGlobalVisualStudio15Generator.cxx b/Source/cmGlobalVisualStudio15Generator.cxx
index fe4b91c..4299081 100644
--- a/Source/cmGlobalVisualStudio15Generator.cxx
+++ b/Source/cmGlobalVisualStudio15Generator.cxx
@@ -114,7 +114,7 @@ bool cmGlobalVisualStudio15Generator::SelectWindowsStoreToolset(
   if (cmHasLiteralPrefix(this->SystemVersion, "10.0")) {
     if (this->IsWindowsStoreToolsetInstalled() &&
         this->IsWindowsDesktopToolsetInstalled()) {
-      toolset = "v140"; // VS 15 uses v140 toolset
+      toolset = "v141"; // VS 15 uses v141 toolset
       return true;
     } else {
       return false;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efdfc26e14b5a4d8b52a1021ffe85418cdfc802f
commit efdfc26e14b5a4d8b52a1021ffe85418cdfc802f
Author:     Iyyappa Murugandi <iyyappam at microsoft.com>
AuthorDate: Wed Dec 14 18:53:30 2016 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 09:58:31 2016 -0500

    VS: Drop check for VS 15 Express Edition
    
    There is no such version of VS 2017.

diff --git a/Source/cmGlobalVisualStudio15Generator.cxx b/Source/cmGlobalVisualStudio15Generator.cxx
index 20d30bc..fe4b91c 100644
--- a/Source/cmGlobalVisualStudio15Generator.cxx
+++ b/Source/cmGlobalVisualStudio15Generator.cxx
@@ -80,11 +80,7 @@ cmGlobalVisualStudio15Generator::cmGlobalVisualStudio15Generator(
   cmake* cm, const std::string& name, const std::string& platformName)
   : cmGlobalVisualStudio14Generator(cm, name, platformName)
 {
-  std::string vc15Express;
-  this->ExpressEdition = cmSystemTools::ReadRegistryValue(
-    "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\15.0\\Setup\\VC;"
-    "ProductDir",
-    vc15Express, cmSystemTools::KeyWOW64_32);
+  this->ExpressEdition = false;
   this->DefaultPlatformToolset = "v141";
   this->DefaultClFlagTable = cmVS141CLFlagTable;
   this->DefaultCSharpFlagTable = cmVS141CSharpFlagTable;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad5b702c0914e0912693b9e5a84d9fe4bb53d720
commit ad5b702c0914e0912693b9e5a84d9fe4bb53d720
Author:     Iyyappa Murugandi <iyyappam at microsoft.com>
AuthorDate: Thu Dec 15 16:38:51 2016 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 09:58:31 2016 -0500

    VS: Port Visual Studio Setup third-party header to MinGW
    
    The `Setup.Configuration.h` which is released by Microsoft is specific
    to MSVC.  Update it to compile with non-MS toolchains like MinGW.

diff --git a/Utilities/cmvssetup/Setup.Configuration.h b/Utilities/cmvssetup/Setup.Configuration.h
index ef26119..cc01d27 100644
--- a/Utilities/cmvssetup/Setup.Configuration.h
+++ b/Utilities/cmvssetup/Setup.Configuration.h
@@ -8,6 +8,7 @@
 
 #ifndef SetupConfiguration_h
 #define SetupConfiguration_h
+
 #include <objbase.h>
 
 // Constants
@@ -20,6 +21,8 @@
 #define E_FILENOTFOUND HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)
 #endif
 
+#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
+
 // Enumerations
 //
 /// <summary>
@@ -482,4 +485,494 @@ STDMETHODIMP GetSetupConfiguration(
 #ifdef __cplusplus
 }
 #endif
+
+#else
+
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+#define VS_SETUP_GCC_DIAGNOSTIC_PUSHED
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
+
+#ifndef MAXUINT
+#define MAXUINT     ((UINT)~((UINT)0))
+#endif
+
+#ifndef DECLSPEC_NOVTABLE
+#if (_MSC_VER >= 1100) && defined(__cplusplus)
+#define DECLSPEC_NOVTABLE   __declspec(novtable)
+#else
+#define DECLSPEC_NOVTABLE
+#endif
+#endif
+
+// Enumerations
+//
+/// <summary>
+/// The state of an instance.
+/// </summary>
+enum InstanceState
+{
+  /// <summary>
+  /// The instance state has not been determined.
+  /// </summary>
+  eNone = 0,
+
+  /// <summary>
+  /// The instance installation path exists.
+  /// </summary>
+  eLocal = 1,
+
+  /// <summary>
+  /// A product is registered to the instance.
+  /// </summary>
+  eRegistered = 2,
+
+  /// <summary>
+  /// No reboot is required for the instance.
+  /// </summary>
+  eNoRebootRequired = 4,
+
+  /// <summary>
+  /// The instance represents a complete install.
+  /// </summary>
+  eComplete = MAXUINT,
+};
+
+// Forward interface declarations
+//
+#ifndef __ISetupInstance_FWD_DEFINED__
+#define __ISetupInstance_FWD_DEFINED__
+typedef struct ISetupInstance ISetupInstance;
+#endif
+
+#ifndef __ISetupInstance2_FWD_DEFINED__
+#define __ISetupInstance2_FWD_DEFINED__
+typedef struct ISetupInstance2 ISetupInstance2;
+#endif
+
+#ifndef __IEnumSetupInstances_FWD_DEFINED__
+#define __IEnumSetupInstances_FWD_DEFINED__
+typedef struct IEnumSetupInstances IEnumSetupInstances;
+#endif
+
+#ifndef __ISetupConfiguration_FWD_DEFINED__
+#define __ISetupConfiguration_FWD_DEFINED__
+typedef struct ISetupConfiguration ISetupConfiguration;
+#endif
+
+#ifndef __ISetupConfiguration2_FWD_DEFINED__
+#define __ISetupConfiguration2_FWD_DEFINED__
+typedef struct ISetupConfiguration2 ISetupConfiguration2;
+#endif
+
+#ifndef __ISetupPackageReference_FWD_DEFINED__
+#define __ISetupPackageReference_FWD_DEFINED__
+typedef struct ISetupPackageReference ISetupPackageReference;
+#endif
+
+#ifndef __ISetupHelper_FWD_DEFINED__
+#define __ISetupHelper_FWD_DEFINED__
+typedef struct ISetupHelper ISetupHelper;
+#endif
+
+// Forward class declarations
+//
+#ifndef __SetupConfiguration_FWD_DEFINED__
+#define __SetupConfiguration_FWD_DEFINED__
+
+#ifdef __cplusplus
+typedef class SetupConfiguration SetupConfiguration;
+#endif
+
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+  // Interface definitions
+  //
+  EXTERN_C const IID IID_ISetupInstance;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+  /// <summary>
+  /// Information about an instance of a product.
+  /// </summary>
+  struct DECLSPEC_UUID("B41463C3-8866-43B5-BC33-2B0676F7F42E") DECLSPEC_NOVTABLE ISetupInstance : public IUnknown
+  {
+    /// <summary>
+    /// Gets the instance identifier (should match the name of the parent instance directory).
+    /// </summary>
+    /// <param name="pbstrInstanceId">The instance identifier.</param>
+    /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist.</returns>
+    STDMETHOD(GetInstanceId)(
+      BSTR* pbstrInstanceId
+      ) = 0;
+
+  /// <summary>
+  /// Gets the local date and time when the installation was originally installed.
+  /// </summary>
+  /// <param name="pInstallDate">The local date and time when the installation was originally installed.</param>
+  /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the property is not defined.</returns>
+  STDMETHOD(GetInstallDate)(
+    LPFILETIME pInstallDate
+    ) = 0;
+
+  /// <summary>
+  /// Gets the unique name of the installation, often indicating the branch and other information used for telemetry.
+  /// </summary>
+  /// <param name="pbstrInstallationName">The unique name of the installation, often indicating the branch and other information used for telemetry.</param>
+  /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the property is not defined.</returns>
+  STDMETHOD(GetInstallationName)(
+    BSTR* pbstrInstallationName
+    ) = 0;
+
+  /// <summary>
+  /// Gets the path to the installation root of the product.
+  /// </summary>
+  /// <param name="pbstrInstallationPath">The path to the installation root of the product.</param>
+  /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the property is not defined.</returns>
+  STDMETHOD(GetInstallationPath)(
+    BSTR* pbstrInstallationPath
+    ) = 0;
+
+  /// <summary>
+  /// Gets the version of the product installed in this instance.
+  /// </summary>
+  /// <param name="pbstrInstallationVersion">The version of the product installed in this instance.</param>
+  /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the property is not defined.</returns>
+  STDMETHOD(GetInstallationVersion)(
+    BSTR* pbstrInstallationVersion
+    ) = 0;
+
+  /// <summary>
+  /// Gets the display name (title) of the product installed in this instance.
+  /// </summary>
+  /// <param name="lcid">The LCID for the display name.</param>
+  /// <param name="pbstrDisplayName">The display name (title) of the product installed in this instance.</param>
+  /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the property is not defined.</returns>
+  STDMETHOD(GetDisplayName)(
+    LCID lcid,
+    BSTR* pbstrDisplayName
+    ) = 0;
+
+  /// <summary>
+  /// Gets the description of the product installed in this instance.
+  /// </summary>
+  /// <param name="lcid">The LCID for the description.</param>
+  /// <param name="pbstrDescription">The description of the product installed in this instance.</param>
+  /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the property is not defined.</returns>
+  STDMETHOD(GetDescription)(
+    LCID lcid,
+    BSTR* pbstrDescription
+    ) = 0;
+
+  /// <summary>
+  /// Resolves the optional relative path to the root path of the instance.
+  /// </summary>
+  /// <param name="pwszRelativePath">A relative path within the instance to resolve, or NULL to get the root path.</param>
+  /// <param name="pbstrAbsolutePath">The full path to the optional relative path within the instance. If the relative path is NULL, the root path will always terminate in a backslash.</param>
+  /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the property is not defined.</returns>
+  STDMETHOD(ResolvePath)(
+    LPCOLESTR pwszRelativePath,
+    BSTR* pbstrAbsolutePath
+    ) = 0;
+  };
+#endif
+
+  EXTERN_C const IID IID_ISetupInstance2;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+  /// <summary>
+  /// Information about an instance of a product.
+  /// </summary>
+  struct DECLSPEC_UUID("89143C9A-05AF-49B0-B717-72E218A2185C") DECLSPEC_NOVTABLE ISetupInstance2 : public ISetupInstance
+  {
+    /// <summary>
+    /// Gets the state of the instance.
+    /// </summary>
+    /// <param name="pState">The state of the instance.</param>
+    /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist.</returns>
+    STDMETHOD(GetState)(
+      InstanceState* pState
+      ) = 0;
+
+  /// <summary>
+  /// Gets an array of package references registered to the instance.
+  /// </summary>
+  /// <param name="ppsaPackages">Pointer to an array of <see cref="ISetupPackageReference"/>.</param>
+  /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the packages property is not defined.</returns>
+  STDMETHOD(GetPackages)(
+    LPSAFEARRAY* ppsaPackages
+    ) = 0;
+
+  /// <summary>
+  /// Gets a pointer to the <see cref="ISetupPackageReference"/> that represents the registered product.
+  /// </summary>
+  /// <param name="ppPackage">Pointer to an instance of <see cref="ISetupPackageReference"/>. This may be NULL if <see cref="GetState"/> does not return <see cref="eComplete"/>.</param>
+  /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the packages property is not defined.</returns>
+  STDMETHOD(GetProduct)(
+    ISetupPackageReference** ppPackage
+    ) = 0;
+
+  /// <summary>
+  /// Gets the relative path to the product application, if available.
+  /// </summary>
+  /// <param name="pbstrProductPath">The relative path to the product application, if available.</param>
+  /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist.</returns>
+  STDMETHOD(GetProductPath)(
+    BSTR* pbstrProductPath
+    ) = 0;
+  };
+#endif
+
+  EXTERN_C const IID IID_IEnumSetupInstances;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+  /// <summary>
+  /// A enumerator of installed <see cref="ISetupInstance"/> objects.
+  /// </summary>
+  struct DECLSPEC_UUID("6380BCFF-41D3-4B2E-8B2E-BF8A6810C848") DECLSPEC_NOVTABLE IEnumSetupInstances : public IUnknown
+  {
+    /// <summary>
+    /// Retrieves the next set of product instances in the enumeration sequence.
+    /// </summary>
+    /// <param name="celt">The number of product instances to retrieve.</param>
+    /// <param name="rgelt">A pointer to an array of <see cref="ISetupInstance"/>.</param>
+    /// <param name="pceltFetched">A pointer to the number of product instances retrieved. If celt is 1 this parameter may be NULL.</param>
+    /// <returns>S_OK if the number of elements were fetched, S_FALSE if nothing was fetched (at end of enumeration), E_INVALIDARG if celt is greater than 1 and pceltFetched is NULL, or E_OUTOFMEMORY if an <see cref="ISetupInstance"/> could not be allocated.</returns>
+    STDMETHOD(Next)(
+      ULONG celt,
+      ISetupInstance** rgelt,
+      ULONG* pceltFetched
+      ) = 0;
+
+  /// <summary>
+  /// Skips the next set of product instances in the enumeration sequence.
+  /// </summary>
+  /// <param name="celt">The number of product instances to skip.</param>
+  /// <returns>S_OK if the number of elements could be skipped; otherwise, S_FALSE;</returns>
+  STDMETHOD(Skip)(
+    ULONG celt
+    ) = 0;
+
+  /// <summary>
+  /// Resets the enumeration sequence to the beginning.
+  /// </summary>
+  /// <returns>Always returns S_OK;</returns>
+  STDMETHOD(Reset)(void) = 0;
+
+  /// <summary>
+  /// Creates a new enumeration object in the same state as the current enumeration object: the new object points to the same place in the enumeration sequence.
+  /// </summary>
+  /// <param name="ppenum">A pointer to a pointer to a new <see cref="IEnumSetupInstances"/> interface. If the method fails, this parameter is undefined.</param>
+  /// <returns>S_OK if a clone was returned; otherwise, E_OUTOFMEMORY.</returns>
+  STDMETHOD(Clone)(
+    IEnumSetupInstances** ppenum
+    ) = 0;
+  };
+#endif
+
+  EXTERN_C const IID IID_ISetupConfiguration;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+  /// <summary>
+  /// Gets information about product instances set up on the machine.
+  /// </summary>
+  struct DECLSPEC_UUID("42843719-DB4C-46C2-8E7C-64F1816EFD5B") DECLSPEC_NOVTABLE ISetupConfiguration : public IUnknown
+  {
+    /// <summary>
+    /// Enumerates all completed product instances installed.
+    /// </summary>
+    /// <param name="ppEnumInstances">An enumeration of completed, installed product instances.</param>
+    /// <returns>Standard HRESULT indicating success or failure.</returns>
+    STDMETHOD(EnumInstances)(
+      IEnumSetupInstances** ppEnumInstances
+      ) = 0;
+
+  /// <summary>
+  /// Gets the instance for the current process path.
+  /// </summary>
+  /// <param name="ppInstance">The instance for the current process path.</param>
+  /// <returns>The instance for the current process path, or E_NOTFOUND if not found.</returns>
+  STDMETHOD(GetInstanceForCurrentProcess)(
+    ISetupInstance** ppInstance
+    ) = 0;
+
+  /// <summary>
+  /// Gets the instance for the given path.
+  /// </summary>
+  /// <param name="ppInstance">The instance for the given path.</param>
+  /// <returns>The instance for the given path, or E_NOTFOUND if not found.</returns>
+  STDMETHOD(GetInstanceForPath)(
+    LPCWSTR wzPath,
+    ISetupInstance** ppInstance
+    ) = 0;
+  };
+#endif
+
+  EXTERN_C const IID IID_ISetupConfiguration2;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+  /// <summary>
+  /// Gets information about product instances.
+  /// </summary>
+  struct DECLSPEC_UUID("26AAB78C-4A60-49D6-AF3B-3C35BC93365D") DECLSPEC_NOVTABLE ISetupConfiguration2 : public ISetupConfiguration
+  {
+    /// <summary>
+    /// Enumerates all product instances.
+    /// </summary>
+    /// <param name="ppEnumInstances">An enumeration of all product instances.</param>
+    /// <returns>Standard HRESULT indicating success or failure.</returns>
+    STDMETHOD(EnumAllInstances)(
+      IEnumSetupInstances** ppEnumInstances
+      ) = 0;
+  };
+#endif
+
+  EXTERN_C const IID IID_ISetupPackageReference;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+  /// <summary>
+  /// A reference to a package.
+  /// </summary>
+  struct DECLSPEC_UUID("da8d8a16-b2b6-4487-a2f1-594ccccd6bf5") DECLSPEC_NOVTABLE ISetupPackageReference : public IUnknown
+  {
+    /// <summary>
+    /// Gets the general package identifier.
+    /// </summary>
+    /// <param name="pbstrId">The general package identifier.</param>
+    /// <returns>Standard HRESULT indicating success or failure.</returns>
+    STDMETHOD(GetId)(
+      BSTR* pbstrId
+      ) = 0;
+
+  /// <summary>
+  /// Gets the version of the package.
+  /// </summary>
+  /// <param name="pbstrVersion">The version of the package.</param>
+  /// <returns>Standard HRESULT indicating success or failure.</returns>
+  STDMETHOD(GetVersion)(
+    BSTR* pbstrVersion
+    ) = 0;
+
+  /// <summary>
+  /// Gets the target process architecture of the package.
+  /// </summary>
+  /// <param name="pbstrChip">The target process architecture of the package.</param>
+  /// <returns>Standard HRESULT indicating success or failure.</returns>
+  STDMETHOD(GetChip)(
+    BSTR* pbstrChip
+    ) = 0;
+
+  /// <summary>
+  /// Gets the language and optional region identifier.
+  /// </summary>
+  /// <param name="pbstrLanguage">The language and optional region identifier.</param>
+  /// <returns>Standard HRESULT indicating success or failure.</returns>
+  STDMETHOD(GetLanguage)(
+    BSTR* pbstrLanguage
+    ) = 0;
+
+  /// <summary>
+  /// Gets the build branch of the package.
+  /// </summary>
+  /// <param name="pbstrBranch">The build branch of the package.</param>
+  /// <returns>Standard HRESULT indicating success or failure.</returns>
+  STDMETHOD(GetBranch)(
+    BSTR* pbstrBranch
+    ) = 0;
+
+  /// <summary>
+  /// Gets the type of the package.
+  /// </summary>
+  /// <param name="pbstrType">The type of the package.</param>
+  /// <returns>Standard HRESULT indicating success or failure.</returns>
+  STDMETHOD(GetType)(
+    BSTR* pbstrType
+    ) = 0;
+
+  /// <summary>
+  /// Gets the unique identifier consisting of all defined tokens.
+  /// </summary>
+  /// <param name="pbstrUniqueId">The unique identifier consisting of all defined tokens.</param>
+  /// <returns>Standard HRESULT indicating success or failure, including E_UNEXPECTED if no Id was defined (required).</returns>
+  STDMETHOD(GetUniqueId)(
+    BSTR* pbstrUniqueId
+    ) = 0;
+  };
+#endif
+
+  EXTERN_C const IID IID_ISetupHelper;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+  /// <summary>
+  /// Helper functions.
+  /// </summary>
+  /// <remarks>
+  /// You can query for this interface from the <see cref="SetupConfiguration"/> class.
+  /// </remarks>
+  struct DECLSPEC_UUID("42b21b78-6192-463e-87bf-d577838f1d5c") DECLSPEC_NOVTABLE ISetupHelper : public IUnknown
+  {
+    /// <summary>
+    /// Parses a dotted quad version string into a 64-bit unsigned integer.
+    /// </summary>
+    /// <param name="pwszVersion">The dotted quad version string to parse, e.g. 1.2.3.4.</param>
+    /// <param name="pullVersion">A 64-bit unsigned integer representing the version. You can compare this to other versions.</param>
+    /// <returns>Standard HRESULT indicating success or failure.</returns>
+    STDMETHOD(ParseVersion)(
+      LPCOLESTR pwszVersion,
+      PULONGLONG pullVersion
+      ) = 0;
+
+  /// <summary>
+  /// Parses a dotted quad version string into a 64-bit unsigned integer.
+  /// </summary>
+  /// <param name="pwszVersionRange">The string containing 1 or 2 dotted quad version strings to parse, e.g. [1.0,) that means 1.0.0.0 or newer.</param>
+  /// <param name="pullMinVersion">A 64-bit unsigned integer representing the minimum version, which may be 0. You can compare this to other versions.</param>
+  /// <param name="pullMaxVersion">A 64-bit unsigned integer representing the maximum version, which may be MAXULONGLONG. You can compare this to other versions.</param>
+  /// <returns>Standard HRESULT indicating success or failure.</returns>
+  STDMETHOD(ParseVersionRange)(
+    LPCOLESTR pwszVersionRange,
+    PULONGLONG pullMinVersion,
+    PULONGLONG pullMaxVersion
+    ) = 0;
+  };
+#endif
+
+  // Class declarations
+  //
+  EXTERN_C const CLSID CLSID_SetupConfiguration;
+
+#ifdef __cplusplus
+  /// <summary>
+  /// This class implements <see cref="ISetupConfiguration"/>, <see cref="ISetupConfiguration2"/>, and <see cref="ISetupHelper"/>.
+  /// </summary>
+  class DECLSPEC_UUID("177F0C4A-1CD3-4DE7-A32C-71DBBB9FA36D") SetupConfiguration;
+#endif
+
+  // Function declarations
+  //
+  /// <summary>
+  /// Gets an <see cref="ISetupConfiguration"/> that provides information about product instances installed on the machine.
+  /// </summary>
+  /// <param name="ppConfiguration">The <see cref="ISetupConfiguration"/> that provides information about product instances installed on the machine.</param>
+  /// <param name="pReserved">Reserved for future use.</param>
+  /// <returns>Standard HRESULT indicating success or failure.</returns>
+  STDMETHODIMP GetSetupConfiguration(
+    ISetupConfiguration** ppConfiguration,
+    LPVOID pReserved
+  );
+
+#ifdef __cplusplus
+}
+#endif
+
+#ifdef VS_SETUP_GCC_DIAGNOSTIC_PUSHED
+#pragma GCC diagnostic pop
+#undef VS_SETUP_GCC_DIAGNOSTIC_PUSHED
+#endif
+
+#endif
 #endif

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=def7395f6278c096ab8f4f418cd5db5059c8c314
commit def7395f6278c096ab8f4f418cd5db5059c8c314
Author:     Iyyappa Murugandi <iyyappam at microsoft.com>
AuthorDate: Wed Dec 14 18:53:30 2016 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 09:43:10 2016 -0500

    VS: Add Visual Studio Setup third-party header
    
    The Visual Studio Setup team releases a `Setup.Configuration.h` header
    under the MIT License for use by external applications to interact with
    the Visual Studio Installer tool [1].  Import it into our source tree
    for use by CMake.
    
    [1] https://github.com/microsoft/vs-setup-samples

diff --git a/Utilities/cmvssetup/.gitattributes b/Utilities/cmvssetup/.gitattributes
new file mode 100644
index 0000000..562b12e
--- /dev/null
+++ b/Utilities/cmvssetup/.gitattributes
@@ -0,0 +1 @@
+* -whitespace
diff --git a/Utilities/cmvssetup/Setup.Configuration.h b/Utilities/cmvssetup/Setup.Configuration.h
new file mode 100644
index 0000000..ef26119
--- /dev/null
+++ b/Utilities/cmvssetup/Setup.Configuration.h
@@ -0,0 +1,485 @@
+// <copyright file="Setup.Configuration.h" company="Microsoft Corporation">
+// Copyright (C) Microsoft Corporation. All rights reserved.
+// </copyright>
+
+// This file is licensed under "The MIT License(MIT)".
+// This file is released by Visual Studio setup team for consumption by external applications.
+// For more information please look at this git repo https://github.com/microsoft/vs-setup-samples
+
+#ifndef SetupConfiguration_h
+#define SetupConfiguration_h
+#include <objbase.h>
+
+// Constants
+//
+#ifndef E_NOTFOUND
+#define E_NOTFOUND HRESULT_FROM_WIN32(ERROR_NOT_FOUND)
+#endif
+
+#ifndef E_FILENOTFOUND
+#define E_FILENOTFOUND HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)
+#endif
+
+// Enumerations
+//
+/// <summary>
+/// The state of an instance.
+/// </summary>
+enum InstanceState
+{
+    /// <summary>
+    /// The instance state has not been determined.
+    /// </summary>
+    eNone = 0,
+
+    /// <summary>
+    /// The instance installation path exists.
+    /// </summary>
+    eLocal = 1,
+
+    /// <summary>
+    /// A product is registered to the instance.
+    /// </summary>
+    eRegistered = 2,
+
+    /// <summary>
+    /// No reboot is required for the instance.
+    /// </summary>
+    eNoRebootRequired = 4,
+
+    /// <summary>
+    /// The instance represents a complete install.
+    /// </summary>
+    eComplete = MAXUINT,
+};
+
+// Forward interface declarations
+//
+#ifndef __ISetupInstance_FWD_DEFINED__
+#define __ISetupInstance_FWD_DEFINED__
+typedef struct ISetupInstance ISetupInstance;
+#endif
+
+#ifndef __ISetupInstance2_FWD_DEFINED__
+#define __ISetupInstance2_FWD_DEFINED__
+typedef struct ISetupInstance2 ISetupInstance2;
+#endif
+
+#ifndef __IEnumSetupInstances_FWD_DEFINED__
+#define __IEnumSetupInstances_FWD_DEFINED__
+typedef struct IEnumSetupInstances IEnumSetupInstances;
+#endif
+
+#ifndef __ISetupConfiguration_FWD_DEFINED__
+#define __ISetupConfiguration_FWD_DEFINED__
+typedef struct ISetupConfiguration ISetupConfiguration;
+#endif
+
+#ifndef __ISetupConfiguration2_FWD_DEFINED__
+#define __ISetupConfiguration2_FWD_DEFINED__
+typedef struct ISetupConfiguration2 ISetupConfiguration2;
+#endif
+
+#ifndef __ISetupPackageReference_FWD_DEFINED__
+#define __ISetupPackageReference_FWD_DEFINED__
+typedef struct ISetupPackageReference ISetupPackageReference;
+#endif
+
+#ifndef __ISetupHelper_FWD_DEFINED__
+#define __ISetupHelper_FWD_DEFINED__
+typedef struct ISetupHelper ISetupHelper;
+#endif
+
+// Forward class declarations
+//
+#ifndef __SetupConfiguration_FWD_DEFINED__
+#define __SetupConfiguration_FWD_DEFINED__
+
+#ifdef __cplusplus
+typedef class SetupConfiguration SetupConfiguration;
+#endif
+
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Interface definitions
+//
+EXTERN_C const IID IID_ISetupInstance;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+/// <summary>
+/// Information about an instance of a product.
+/// </summary>
+struct DECLSPEC_UUID("B41463C3-8866-43B5-BC33-2B0676F7F42E") DECLSPEC_NOVTABLE ISetupInstance : public IUnknown
+{
+    /// <summary>
+    /// Gets the instance identifier (should match the name of the parent instance directory).
+    /// </summary>
+    /// <param name="pbstrInstanceId">The instance identifier.</param>
+    /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist.</returns>
+    STDMETHOD(GetInstanceId)(
+        _Out_ BSTR* pbstrInstanceId
+        ) = 0;
+
+    /// <summary>
+    /// Gets the local date and time when the installation was originally installed.
+    /// </summary>
+    /// <param name="pInstallDate">The local date and time when the installation was originally installed.</param>
+    /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the property is not defined.</returns>
+    STDMETHOD(GetInstallDate)(
+        _Out_ LPFILETIME pInstallDate
+        ) = 0;
+
+    /// <summary>
+    /// Gets the unique name of the installation, often indicating the branch and other information used for telemetry.
+    /// </summary>
+    /// <param name="pbstrInstallationName">The unique name of the installation, often indicating the branch and other information used for telemetry.</param>
+    /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the property is not defined.</returns>
+    STDMETHOD(GetInstallationName)(
+        _Out_ BSTR* pbstrInstallationName
+        ) = 0;
+
+    /// <summary>
+    /// Gets the path to the installation root of the product.
+    /// </summary>
+    /// <param name="pbstrInstallationPath">The path to the installation root of the product.</param>
+    /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the property is not defined.</returns>
+    STDMETHOD(GetInstallationPath)(
+        _Out_ BSTR* pbstrInstallationPath
+        ) = 0;
+
+    /// <summary>
+    /// Gets the version of the product installed in this instance.
+    /// </summary>
+    /// <param name="pbstrInstallationVersion">The version of the product installed in this instance.</param>
+    /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the property is not defined.</returns>
+    STDMETHOD(GetInstallationVersion)(
+        _Out_ BSTR* pbstrInstallationVersion
+        ) = 0;
+
+    /// <summary>
+    /// Gets the display name (title) of the product installed in this instance.
+    /// </summary>
+    /// <param name="lcid">The LCID for the display name.</param>
+    /// <param name="pbstrDisplayName">The display name (title) of the product installed in this instance.</param>
+    /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the property is not defined.</returns>
+    STDMETHOD(GetDisplayName)(
+        _In_ LCID lcid,
+        _Out_ BSTR* pbstrDisplayName
+        ) = 0;
+
+    /// <summary>
+    /// Gets the description of the product installed in this instance.
+    /// </summary>
+    /// <param name="lcid">The LCID for the description.</param>
+    /// <param name="pbstrDescription">The description of the product installed in this instance.</param>
+    /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the property is not defined.</returns>
+    STDMETHOD(GetDescription)(
+        _In_ LCID lcid,
+        _Out_ BSTR* pbstrDescription
+        ) = 0;
+
+    /// <summary>
+    /// Resolves the optional relative path to the root path of the instance.
+    /// </summary>
+    /// <param name="pwszRelativePath">A relative path within the instance to resolve, or NULL to get the root path.</param>
+    /// <param name="pbstrAbsolutePath">The full path to the optional relative path within the instance. If the relative path is NULL, the root path will always terminate in a backslash.</param>
+    /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the property is not defined.</returns>
+    STDMETHOD(ResolvePath)(
+        _In_opt_z_ LPCOLESTR pwszRelativePath,
+        _Out_ BSTR* pbstrAbsolutePath
+        ) = 0;
+};
+#endif
+
+EXTERN_C const IID IID_ISetupInstance2;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+/// <summary>
+/// Information about an instance of a product.
+/// </summary>
+struct DECLSPEC_UUID("89143C9A-05AF-49B0-B717-72E218A2185C") DECLSPEC_NOVTABLE ISetupInstance2 : public ISetupInstance
+{
+    /// <summary>
+    /// Gets the state of the instance.
+    /// </summary>
+    /// <param name="pState">The state of the instance.</param>
+    /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist.</returns>
+    STDMETHOD(GetState)(
+        _Out_ InstanceState* pState
+        ) = 0;
+
+    /// <summary>
+    /// Gets an array of package references registered to the instance.
+    /// </summary>
+    /// <param name="ppsaPackages">Pointer to an array of <see cref="ISetupPackageReference"/>.</param>
+    /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the packages property is not defined.</returns>
+    STDMETHOD(GetPackages)(
+        _Out_ LPSAFEARRAY* ppsaPackages
+        ) = 0;
+
+    /// <summary>
+    /// Gets a pointer to the <see cref="ISetupPackageReference"/> that represents the registered product.
+    /// </summary>
+    /// <param name="ppPackage">Pointer to an instance of <see cref="ISetupPackageReference"/>. This may be NULL if <see cref="GetState"/> does not return <see cref="eComplete"/>.</param>
+    /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the packages property is not defined.</returns>
+    STDMETHOD(GetProduct)(
+        _Outptr_result_maybenull_ ISetupPackageReference** ppPackage
+        ) = 0;
+
+    /// <summary>
+    /// Gets the relative path to the product application, if available.
+    /// </summary>
+    /// <param name="pbstrProductPath">The relative path to the product application, if available.</param>
+    /// <returns>Standard HRESULT indicating success or failure, including E_FILENOTFOUND if the instance state does not exist.</returns>
+    STDMETHOD(GetProductPath)(
+        _Outptr_result_maybenull_ BSTR* pbstrProductPath
+        ) = 0;
+};
+#endif
+
+EXTERN_C const IID IID_IEnumSetupInstances;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+/// <summary>
+/// A enumerator of installed <see cref="ISetupInstance"/> objects.
+/// </summary>
+struct DECLSPEC_UUID("6380BCFF-41D3-4B2E-8B2E-BF8A6810C848") DECLSPEC_NOVTABLE IEnumSetupInstances : public IUnknown
+{
+    /// <summary>
+    /// Retrieves the next set of product instances in the enumeration sequence.
+    /// </summary>
+    /// <param name="celt">The number of product instances to retrieve.</param>
+    /// <param name="rgelt">A pointer to an array of <see cref="ISetupInstance"/>.</param>
+    /// <param name="pceltFetched">A pointer to the number of product instances retrieved. If celt is 1 this parameter may be NULL.</param>
+    /// <returns>S_OK if the number of elements were fetched, S_FALSE if nothing was fetched (at end of enumeration), E_INVALIDARG if celt is greater than 1 and pceltFetched is NULL, or E_OUTOFMEMORY if an <see cref="ISetupInstance"/> could not be allocated.</returns>
+    STDMETHOD(Next)(
+        _In_ ULONG celt,
+        _Out_writes_to_(celt, *pceltFetched) ISetupInstance** rgelt,
+        _Out_opt_ _Deref_out_range_(0, celt) ULONG* pceltFetched
+        ) = 0;
+
+    /// <summary>
+    /// Skips the next set of product instances in the enumeration sequence.
+    /// </summary>
+    /// <param name="celt">The number of product instances to skip.</param>
+    /// <returns>S_OK if the number of elements could be skipped; otherwise, S_FALSE;</returns>
+    STDMETHOD(Skip)(
+        _In_ ULONG celt
+        ) = 0;
+
+    /// <summary>
+    /// Resets the enumeration sequence to the beginning.
+    /// </summary>
+    /// <returns>Always returns S_OK;</returns>
+    STDMETHOD(Reset)(void) = 0;
+
+    /// <summary>
+    /// Creates a new enumeration object in the same state as the current enumeration object: the new object points to the same place in the enumeration sequence.
+    /// </summary>
+    /// <param name="ppenum">A pointer to a pointer to a new <see cref="IEnumSetupInstances"/> interface. If the method fails, this parameter is undefined.</param>
+    /// <returns>S_OK if a clone was returned; otherwise, E_OUTOFMEMORY.</returns>
+    STDMETHOD(Clone)(
+        _Deref_out_opt_ IEnumSetupInstances** ppenum
+        ) = 0;
+};
+#endif
+
+EXTERN_C const IID IID_ISetupConfiguration;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+/// <summary>
+/// Gets information about product instances set up on the machine.
+/// </summary>
+struct DECLSPEC_UUID("42843719-DB4C-46C2-8E7C-64F1816EFD5B") DECLSPEC_NOVTABLE ISetupConfiguration : public IUnknown
+{
+    /// <summary>
+    /// Enumerates all completed product instances installed.
+    /// </summary>
+    /// <param name="ppEnumInstances">An enumeration of completed, installed product instances.</param>
+    /// <returns>Standard HRESULT indicating success or failure.</returns>
+    STDMETHOD(EnumInstances)(
+        _Out_ IEnumSetupInstances** ppEnumInstances
+        ) = 0;
+
+    /// <summary>
+    /// Gets the instance for the current process path.
+    /// </summary>
+    /// <param name="ppInstance">The instance for the current process path.</param>
+    /// <returns>The instance for the current process path, or E_NOTFOUND if not found.</returns>
+    STDMETHOD(GetInstanceForCurrentProcess)(
+        _Out_ ISetupInstance** ppInstance
+        ) = 0;
+
+    /// <summary>
+    /// Gets the instance for the given path.
+    /// </summary>
+    /// <param name="ppInstance">The instance for the given path.</param>
+    /// <returns>The instance for the given path, or E_NOTFOUND if not found.</returns>
+    STDMETHOD(GetInstanceForPath)(
+        _In_z_ LPCWSTR wzPath,
+        _Out_ ISetupInstance** ppInstance
+        ) = 0;
+};
+#endif
+
+EXTERN_C const IID IID_ISetupConfiguration2;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+/// <summary>
+/// Gets information about product instances.
+/// </summary>
+struct DECLSPEC_UUID("26AAB78C-4A60-49D6-AF3B-3C35BC93365D") DECLSPEC_NOVTABLE ISetupConfiguration2 : public ISetupConfiguration
+{
+    /// <summary>
+    /// Enumerates all product instances.
+    /// </summary>
+    /// <param name="ppEnumInstances">An enumeration of all product instances.</param>
+    /// <returns>Standard HRESULT indicating success or failure.</returns>
+    STDMETHOD(EnumAllInstances)(
+        _Out_ IEnumSetupInstances** ppEnumInstances
+        ) = 0;
+};
+#endif
+
+EXTERN_C const IID IID_ISetupPackageReference;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+/// <summary>
+/// A reference to a package.
+/// </summary>
+struct DECLSPEC_UUID("da8d8a16-b2b6-4487-a2f1-594ccccd6bf5") DECLSPEC_NOVTABLE ISetupPackageReference : public IUnknown
+{
+    /// <summary>
+    /// Gets the general package identifier.
+    /// </summary>
+    /// <param name="pbstrId">The general package identifier.</param>
+    /// <returns>Standard HRESULT indicating success or failure.</returns>
+    STDMETHOD(GetId)(
+        _Out_ BSTR* pbstrId
+        ) = 0;
+
+    /// <summary>
+    /// Gets the version of the package.
+    /// </summary>
+    /// <param name="pbstrVersion">The version of the package.</param>
+    /// <returns>Standard HRESULT indicating success or failure.</returns>
+    STDMETHOD(GetVersion)(
+        _Out_ BSTR* pbstrVersion
+        ) = 0;
+
+    /// <summary>
+    /// Gets the target process architecture of the package.
+    /// </summary>
+    /// <param name="pbstrChip">The target process architecture of the package.</param>
+    /// <returns>Standard HRESULT indicating success or failure.</returns>
+    STDMETHOD(GetChip)(
+        _Out_ BSTR* pbstrChip
+        ) = 0;
+
+    /// <summary>
+    /// Gets the language and optional region identifier.
+    /// </summary>
+    /// <param name="pbstrLanguage">The language and optional region identifier.</param>
+    /// <returns>Standard HRESULT indicating success or failure.</returns>
+    STDMETHOD(GetLanguage)(
+        _Out_ BSTR* pbstrLanguage
+        ) = 0;
+
+    /// <summary>
+    /// Gets the build branch of the package.
+    /// </summary>
+    /// <param name="pbstrBranch">The build branch of the package.</param>
+    /// <returns>Standard HRESULT indicating success or failure.</returns>
+    STDMETHOD(GetBranch)(
+        _Out_ BSTR* pbstrBranch
+        ) = 0;
+
+    /// <summary>
+    /// Gets the type of the package.
+    /// </summary>
+    /// <param name="pbstrType">The type of the package.</param>
+    /// <returns>Standard HRESULT indicating success or failure.</returns>
+    STDMETHOD(GetType)(
+        _Out_ BSTR* pbstrType
+        ) = 0;
+
+    /// <summary>
+    /// Gets the unique identifier consisting of all defined tokens.
+    /// </summary>
+    /// <param name="pbstrUniqueId">The unique identifier consisting of all defined tokens.</param>
+    /// <returns>Standard HRESULT indicating success or failure, including E_UNEXPECTED if no Id was defined (required).</returns>
+    STDMETHOD(GetUniqueId)(
+        _Out_ BSTR* pbstrUniqueId
+        ) = 0;
+};
+#endif
+
+EXTERN_C const IID IID_ISetupHelper;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+/// <summary>
+/// Helper functions.
+/// </summary>
+/// <remarks>
+/// You can query for this interface from the <see cref="SetupConfiguration"/> class.
+/// </remarks>
+struct DECLSPEC_UUID("42b21b78-6192-463e-87bf-d577838f1d5c") DECLSPEC_NOVTABLE ISetupHelper : public IUnknown
+{
+    /// <summary>
+    /// Parses a dotted quad version string into a 64-bit unsigned integer.
+    /// </summary>
+    /// <param name="pwszVersion">The dotted quad version string to parse, e.g. 1.2.3.4.</param>
+    /// <param name="pullVersion">A 64-bit unsigned integer representing the version. You can compare this to other versions.</param>
+    /// <returns>Standard HRESULT indicating success or failure.</returns>
+    STDMETHOD(ParseVersion)(
+        _In_ LPCOLESTR pwszVersion,
+        _Out_ PULONGLONG pullVersion
+        ) = 0;
+
+    /// <summary>
+    /// Parses a dotted quad version string into a 64-bit unsigned integer.
+    /// </summary>
+    /// <param name="pwszVersionRange">The string containing 1 or 2 dotted quad version strings to parse, e.g. [1.0,) that means 1.0.0.0 or newer.</param>
+    /// <param name="pullMinVersion">A 64-bit unsigned integer representing the minimum version, which may be 0. You can compare this to other versions.</param>
+    /// <param name="pullMaxVersion">A 64-bit unsigned integer representing the maximum version, which may be MAXULONGLONG. You can compare this to other versions.</param>
+    /// <returns>Standard HRESULT indicating success or failure.</returns>
+    STDMETHOD(ParseVersionRange)(
+        _In_ LPCOLESTR pwszVersionRange,
+        _Out_ PULONGLONG pullMinVersion,
+        _Out_ PULONGLONG pullMaxVersion
+        ) = 0;
+};
+#endif
+
+// Class declarations
+//
+EXTERN_C const CLSID CLSID_SetupConfiguration;
+
+#ifdef __cplusplus
+/// <summary>
+/// This class implements <see cref="ISetupConfiguration"/>, <see cref="ISetupConfiguration2"/>, and <see cref="ISetupHelper"/>.
+/// </summary>
+class DECLSPEC_UUID("177F0C4A-1CD3-4DE7-A32C-71DBBB9FA36D") SetupConfiguration;
+#endif
+
+// Function declarations
+//
+/// <summary>
+/// Gets an <see cref="ISetupConfiguration"/> that provides information about product instances installed on the machine.
+/// </summary>
+/// <param name="ppConfiguration">The <see cref="ISetupConfiguration"/> that provides information about product instances installed on the machine.</param>
+/// <param name="pReserved">Reserved for future use.</param>
+/// <returns>Standard HRESULT indicating success or failure.</returns>
+STDMETHODIMP GetSetupConfiguration(
+    _Out_ ISetupConfiguration** ppConfiguration,
+    _Reserved_ LPVOID pReserved
+);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

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

Summary of changes:
 Source/CMakeLists.txt                          |    2 +
 Source/cmGlobalVisualStudio10Generator.cxx     |   14 -
 Source/cmGlobalVisualStudio15Generator.cxx     |   56 +-
 Source/cmGlobalVisualStudio15Generator.h       |    5 +
 Source/cmVSSetupHelper.cxx                     |  395 ++++++++++
 Source/cmVSSetupHelper.h                       |  154 ++++
 Source/cmake.cxx                               |   30 +-
 Utilities/{cmcurl => cmvssetup}/.gitattributes |    0
 Utilities/cmvssetup/Setup.Configuration.h      |  978 ++++++++++++++++++++++++
 9 files changed, 1590 insertions(+), 44 deletions(-)
 create mode 100644 Source/cmVSSetupHelper.cxx
 create mode 100644 Source/cmVSSetupHelper.h
 copy Utilities/{cmcurl => cmvssetup}/.gitattributes (100%)
 create mode 100644 Utilities/cmvssetup/Setup.Configuration.h


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 10:53:23 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 10:53:23 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1960-g3ae275f
Message-ID: <20170110155323.A376FFA3B3@public.kitware.com>

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  3ae275f4f8a4dcf6721c0112b7d4cfcb9366a35e (commit)
       via  154def305e7a95d9280573b053170b17539c9f69 (commit)
      from  ae4b031f2bcd15bb06edb97a217d8461926cc950 (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=3ae275f4f8a4dcf6721c0112b7d4cfcb9366a35e
commit 3ae275f4f8a4dcf6721c0112b7d4cfcb9366a35e
Merge: ae4b031 154def3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 10:53:22 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 10:53:22 2017 -0500

    Merge topic 'SublimeText-no-VERBOSE' into next
    
    154def30 Sublime: Do not build with verbose output


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=154def305e7a95d9280573b053170b17539c9f69
commit 154def305e7a95d9280573b053170b17539c9f69
Author:     Richard Collins <the.hungarian at gmail.com>
AuthorDate: Fri Dec 16 12:41:55 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 10:52:48 2017 -0500

    Sublime: Do not build with verbose output
    
    Remove the hard-coded use of `make VERBOSE=1` and `ninja -v`.

diff --git a/Help/release/dev/SublimeText-no-VERBOSE.rst b/Help/release/dev/SublimeText-no-VERBOSE.rst
new file mode 100644
index 0000000..70dfa2b
--- /dev/null
+++ b/Help/release/dev/SublimeText-no-VERBOSE.rst
@@ -0,0 +1,6 @@
+SublimeText-no-VERBOSE
+----------------------
+
+* The :generator:`Sublime Text 2` generator no longer runs the native
+  build command (e.g. ``ninja`` or ``make``) with verbose build output
+  enabled.
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index dfefefe..36ba520 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -323,16 +323,12 @@ std::string cmExtraSublimeTextGenerator::BuildMakeCommand(
     std::string makefileName = cmSystemTools::ConvertToOutputPath(makefile);
     command += ", \"/NOLOGO\", \"/f\", \"";
     command += makefileName + "\"";
-    command += ", \"VERBOSE=1\", \"";
-    command += target;
-    command += "\"";
+    command += ", \"" + target + "\"";
   } else if (generator == "Ninja") {
     std::string makefileName = cmSystemTools::ConvertToOutputPath(makefile);
     command += ", \"-f\", \"";
     command += makefileName + "\"";
-    command += ", \"-v\", \"";
-    command += target;
-    command += "\"";
+    command += ", \"" + target + "\"";
   } else {
     std::string makefileName;
     if (generator == "MinGW Makefiles") {
@@ -344,9 +340,7 @@ std::string cmExtraSublimeTextGenerator::BuildMakeCommand(
     }
     command += ", \"-f\", \"";
     command += makefileName + "\"";
-    command += ", \"VERBOSE=1\", \"";
-    command += target;
-    command += "\"";
+    command += ", \"" + target + "\"";
   }
   return command;
 }

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

Summary of changes:
 Help/release/dev/SublimeText-no-VERBOSE.rst |    6 ++++++
 Source/cmExtraSublimeTextGenerator.cxx      |   12 +++---------
 2 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 Help/release/dev/SublimeText-no-VERBOSE.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 10:57:20 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 10:57:20 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1962-gf79c8a9
Message-ID: <20170110155720.8FBB7FA6B5@public.kitware.com>

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  f79c8a9fa000f7e3b4cdb984cd91a709cb42bce6 (commit)
       via  b1dc4ddbdd651e8bdd30878fa9afc840d97c9114 (commit)
      from  3ae275f4f8a4dcf6721c0112b7d4cfcb9366a35e (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=f79c8a9fa000f7e3b4cdb984cd91a709cb42bce6
commit f79c8a9fa000f7e3b4cdb984cd91a709cb42bce6
Merge: 3ae275f b1dc4dd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 10:57:19 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 10:57:19 2017 -0500

    Merge topic 'BundleUtilities-symlink-structure' into next
    
    b1dc4ddb BundleUtilities: Maintain symlink structure


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1dc4ddbdd651e8bdd30878fa9afc840d97c9114
commit b1dc4ddbdd651e8bdd30878fa9afc840d97c9114
Author:     Martin Koegler <martin.koegler at chello.at>
AuthorDate: Fri Dec 9 21:55:22 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 10:55:41 2017 -0500

    BundleUtilities: Maintain symlink structure
    
    Closes: #15047

diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index b1610e2..5d6f402 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -624,6 +624,33 @@ function(get_bundle_keys app libs dirs keys_var)
       endif()
     endforeach()
 
+    # preserve library symlink structure
+    foreach(key ${${keys_var}})
+      if("${${key}_COPYFLAG}" STREQUAL 1)
+        if(IS_SYMLINK "${${key}_RESOLVED_ITEM}")
+          get_filename_component(target "${${key}_RESOLVED_ITEM}" REALPATH)
+          set_bundle_key_values(${keys_var} "${exe}" "${target}" "${exepath}" "${dirs}" 1 "${exe_rpaths}")
+          get_item_key("${target}" targetkey)
+
+          if(WIN32)
+            # ignore case on Windows
+            string(TOLOWER "${${key}_RESOLVED_ITEM}" resolved_item_compare)
+            string(TOLOWER "${${targetkey}_RESOLVED_EMBEDDED_ITEM}" resolved_embedded_item_compare)
+          else()
+            set(resolved_item_compare "${${key}_RESOLVED_ITEM}")
+            set(resolved_embedded_item_compare "${${targetkey}_RESOLVED_EMBEDDED_ITEM}")
+          endif()
+          get_filename_component(resolved_item_compare "${resolved_item_compare}" NAME)
+          get_filename_component(resolved_embedded_item_compare "${resolved_embedded_item_compare}" NAME)
+
+          if(NOT "${resolved_item_compare}" STREQUAL "${resolved_embedded_item_compare}")
+            set(${key}_COPYFLAG "2")
+            set(${key}_RESOLVED_ITEM "${${targetkey}_RESOLVED_EMBEDDED_ITEM}")
+          endif()
+
+        endif()
+      endif()
+    endforeach()
     # Propagate values to caller's scope:
     #
     set(${keys_var} ${${keys_var}} PARENT_SCOPE)
@@ -640,6 +667,24 @@ function(get_bundle_keys app libs dirs keys_var)
   endif()
 endfunction()
 
+function(link_resolved_item_into_bundle resolved_item resolved_embedded_item)
+  if(WIN32)
+    # ignore case on Windows
+    string(TOLOWER "${resolved_item}" resolved_item_compare)
+    string(TOLOWER "${resolved_embedded_item}" resolved_embedded_item_compare)
+  else()
+    set(resolved_item_compare "${resolved_item}")
+    set(resolved_embedded_item_compare "${resolved_embedded_item}")
+  endif()
+
+  if("${resolved_item_compare}" STREQUAL "${resolved_embedded_item_compare}")
+    message(STATUS "warning: resolved_item == resolved_embedded_item - not linking...")
+  else()
+    get_filename_component(target_dir "${resolved_embedded_item}" DIRECTORY)
+    file(RELATIVE_PATH symlink_target "${target_dir}" "${resolved_item}")
+    execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${symlink_target}" "${resolved_embedded_item}")
+  endif()
+endfunction()
 
 function(copy_resolved_item_into_bundle resolved_item resolved_embedded_item)
   if(WIN32)
@@ -854,7 +899,9 @@ function(fixup_bundle app libs dirs)
     set(i 0)
     foreach(key ${keys})
       math(EXPR i ${i}+1)
-      if(${${key}_COPYFLAG})
+      if("${${key}_COPYFLAG}" STREQUAL "2")
+        message(STATUS "${i}/${n}: linking '${${key}_RESOLVED_ITEM}' -> '${${key}_RESOLVED_EMBEDDED_ITEM}'")
+      elseif(${${key}_COPYFLAG})
         message(STATUS "${i}/${n}: copying '${${key}_RESOLVED_ITEM}'")
       else()
         message(STATUS "${i}/${n}: *NOT* copying '${${key}_RESOLVED_ITEM}'")
@@ -872,7 +919,10 @@ function(fixup_bundle app libs dirs)
         message(STATUS "")
       endif()
 
-      if(${${key}_COPYFLAG})
+      if("${${key}_COPYFLAG}" STREQUAL "2")
+        link_resolved_item_into_bundle("${${key}_RESOLVED_ITEM}"
+          "${${key}_RESOLVED_EMBEDDED_ITEM}")
+      elseif(${${key}_COPYFLAG})
         set(item "${${key}_ITEM}")
         if(item MATCHES "[^/]+\\.framework/")
           copy_resolved_framework_into_bundle("${${key}_RESOLVED_ITEM}"
@@ -889,7 +939,9 @@ function(fixup_bundle app libs dirs)
       math(EXPR i ${i}+1)
       if(APPLE)
         message(STATUS "${i}/${n}: fixing up '${${key}_RESOLVED_EMBEDDED_ITEM}'")
-        fixup_bundle_item("${${key}_RESOLVED_EMBEDDED_ITEM}" "${exepath}" "${dirs}")
+        if(NOT "${${key}_COPYFLAG}" STREQUAL "2")
+          fixup_bundle_item("${${key}_RESOLVED_EMBEDDED_ITEM}" "${exepath}" "${dirs}")
+        endif()
       else()
         message(STATUS "${i}/${n}: fix-up not required on this platform '${${key}_RESOLVED_EMBEDDED_ITEM}'")
       endif()

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

Summary of changes:
 Modules/BundleUtilities.cmake |   58 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 11:00:20 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 11:00:20 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1964-gda90f24
Message-ID: <20170110160020.812BCFA720@public.kitware.com>

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  da90f247541d7a3e3cd8ae32fe74450e8ffb46b8 (commit)
       via  3578e86272b16b303edd640f29781dd316a857a4 (commit)
      from  f79c8a9fa000f7e3b4cdb984cd91a709cb42bce6 (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=da90f247541d7a3e3cd8ae32fe74450e8ffb46b8
commit da90f247541d7a3e3cd8ae32fe74450e8ffb46b8
Merge: f79c8a9 3578e86
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 11:00:19 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 11:00:19 2017 -0500

    Merge topic 'issue-16513-concrt140-dll' into next
    
    3578e862 InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3578e86272b16b303edd640f29781dd316a857a4
commit 3578e86272b16b303edd640f29781dd316a857a4
Author:     Taylor Braun-Jones <taylor at braun-jones.org>
AuthorDate: Fri Dec 16 18:02:48 2016 -0500
Commit:     Taylor Braun-Jones <taylor at braun-jones.org>
CommitDate: Fri Dec 16 18:02:48 2016 -0500

    InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0
    
    Fixes #16513

diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index b0446c9..f4ae091 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -182,7 +182,10 @@ if(MSVC)
         "${MSVC${v}_CRT_DIR}/msvcp${v}0.dll"
         )
       if(NOT v VERSION_LESS 14)
-        list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/vcruntime${v}0.dll")
+        list(APPEND __install__libs
+            "${MSVC${v}_CRT_DIR}/vcruntime${v}0.dll"
+            "${MSVC${v}_CRT_DIR}/concrt${v}0.dll"
+            )
       else()
         list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/msvcr${v}0.dll")
       endif()
@@ -197,7 +200,10 @@ if(MSVC)
         "${MSVC${v}_CRT_DIR}/msvcp${v}0d.dll"
         )
       if(NOT v VERSION_LESS 14)
-        list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/vcruntime${v}0d.dll")
+        list(APPEND __install__libs
+            "${MSVC${v}_CRT_DIR}/vcruntime${v}0d.dll"
+            "${MSVC${v}_CRT_DIR}/concrt${v}0d.dll"
+            )
       else()
         list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/msvcr${v}0d.dll")
       endif()

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

Summary of changes:
 Modules/InstallRequiredSystemLibraries.cmake |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From domen.vrankar at gmail.com  Tue Jan 10 12:48:51 2017
From: domen.vrankar at gmail.com (Domen Vrankar)
Date: Tue, 10 Jan 2017 12:48:51 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1966-g63a8770
Message-ID: <20170110174851.36A9EFA556@public.kitware.com>

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  63a8770f08d0bcb239ceaaa18f5a6ee99af38be2 (commit)
       via  af77368ed3d81c877fc19a64831aff380cf4646e (commit)
      from  da90f247541d7a3e3cd8ae32fe74450e8ffb46b8 (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=63a8770f08d0bcb239ceaaa18f5a6ee99af38be2
commit 63a8770f08d0bcb239ceaaa18f5a6ee99af38be2
Merge: da90f24 af77368
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Jan 10 12:48:49 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 12:48:49 2017 -0500

    Merge topic 'cpack-rpm-user-binary-spec-file-test' into next
    
    af77368e CPack/RPM test for using custom binary spec file


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af77368ed3d81c877fc19a64831aff380cf4646e
commit af77368ed3d81c877fc19a64831aff380cf4646e
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Jan 10 18:47:52 2017 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Tue Jan 10 18:47:52 2017 +0100

    CPack/RPM test for using custom binary spec file

diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index af44182..ebaf792 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -4,6 +4,7 @@ include(RunCMake)
 include("${RunCMake_SOURCE_DIR}/CPackTestHelpers.cmake")
 
 # run_cpack_test args: TEST_NAME "GENERATORS" RUN_CMAKE_BUILD_STEP "PACKAGING_TYPES"
+run_cpack_test(CUSTOM_BINARY_SPEC_FILE "RPM" false "MONOLITHIC;COMPONENT")
 run_cpack_test(CUSTOM_NAMES "RPM;DEB" true "COMPONENT")
 run_cpack_test(DEBUGINFO "RPM" true "COMPONENT")
 run_cpack_test(DEPENDENCIES "RPM;DEB" true "COMPONENT")
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
new file mode 100644
index 0000000..694dc00
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
@@ -0,0 +1,9 @@
+set(EXPECTED_FILES_COUNT "1")
+set(EXPECTED_FILE_CONTENT_1_LIST "/usr;/usr/foo;/usr/foo/CMakeLists.txt")
+
+if(PACKAGING_TYPE STREQUAL "COMPONENT")
+  set(EXPECTED_FILES_COUNT "2")
+  set(EXPECTED_FILE_1_COMPONENT "test")
+  set(EXPECTED_FILE_2_COMPONENT "test2")
+  set(EXPECTED_FILE_CONTENT_2_LIST "/usr;/usr/bar;/usr/bar/CMakeLists.txt")
+endif()
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
new file mode 100644
index 0000000..e6d86d0
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
@@ -0,0 +1,2 @@
+^CPackRPM: Will use USER specified spec file: (/[^/]*)*/CUSTOM_BINARY_SPEC_FILE/custom\.spec\.in
+CPackRPM: Will use GENERATED spec file:.*/Tests/RunCMake/RPM/CPack/CUSTOM_BINARY_SPEC_FILE-build/_CPack_Packages/.*/RPM/SPECS/custom_binary_spec_file-test2\.spec$
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
new file mode 100644
index 0000000..d7bb7af
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
@@ -0,0 +1 @@
+CPackRPM: Will use USER specified spec file: (/[^/]*)*/CUSTOM_BINARY_SPEC_FILE/custom\.spec\.in
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
new file mode 100644
index 0000000..db0ac6f
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
@@ -0,0 +1,80 @@
+# -*- rpm-spec -*-
+BuildRoot:      %_topdir/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@
+Summary:        @CPACK_RPM_PACKAGE_SUMMARY@
+Name:           @CPACK_RPM_PACKAGE_NAME@
+Version:        @CPACK_RPM_PACKAGE_VERSION@
+Release:        @CPACK_RPM_PACKAGE_RELEASE@
+License:        @CPACK_RPM_PACKAGE_LICENSE@
+Group:          @CPACK_RPM_PACKAGE_GROUP@
+Vendor:         @CPACK_RPM_PACKAGE_VENDOR@
+
+ at TMP_RPM_URL@
+ at TMP_RPM_REQUIRES@
+ at TMP_RPM_REQUIRES_PRE@
+ at TMP_RPM_REQUIRES_POST@
+ at TMP_RPM_REQUIRES_PREUN@
+ at TMP_RPM_REQUIRES_POSTUN@
+ at TMP_RPM_PROVIDES@
+ at TMP_RPM_OBSOLETES@
+ at TMP_RPM_CONFLICTS@
+ at TMP_RPM_SUGGESTS@
+ at TMP_RPM_AUTOPROV@
+ at TMP_RPM_AUTOREQ@
+ at TMP_RPM_AUTOREQPROV@
+ at TMP_RPM_BUILDARCH@
+ at TMP_RPM_PREFIXES@
+
+ at TMP_RPM_DEBUGINFO@
+
+%define _rpmdir %_topdir/RPMS
+%define _srcrpmdir %_topdir/SRPMS
+ at FILE_NAME_DEFINE@
+%define _unpackaged_files_terminate_build 0
+ at TMP_RPM_SPEC_INSTALL_POST@
+ at CPACK_RPM_SPEC_MORE_DEFINE@
+ at CPACK_RPM_COMPRESSION_TYPE_TMP@
+
+%description
+ at CPACK_RPM_PACKAGE_DESCRIPTION@
+
+# This is a shortcutted spec file generated by CMake RPM generator
+# we skip _install step because CPack does that for us.
+# We do only save CPack installed tree in _prepr
+# and then restore it in build.
+%prep
+mv $RPM_BUILD_ROOT %_topdir/tmpBBroot
+
+%install
+if [ -e $RPM_BUILD_ROOT ];
+then
+  rm -rf $RPM_BUILD_ROOT
+fi
+mv %_topdir/tmpBBroot $RPM_BUILD_ROOT
+
+ at TMP_RPM_DEBUGINFO_INSTALL@
+
+%clean
+
+%post
+ at RPM_SYMLINK_POSTINSTALL@
+ at CPACK_RPM_SPEC_POSTINSTALL@
+
+%postun
+ at CPACK_RPM_SPEC_POSTUNINSTALL@
+
+%pre
+ at CPACK_RPM_SPEC_PREINSTALL@
+
+%preun
+ at CPACK_RPM_SPEC_PREUNINSTALL@
+
+%files
+%defattr(@TMP_DEFAULT_FILE_PERMISSIONS@, at TMP_DEFAULT_USER@, at TMP_DEFAULT_GROUP@, at TMP_DEFAULT_DIR_PERMISSIONS@)
+ at CPACK_RPM_INSTALL_FILES@
+ at CPACK_RPM_ABSOLUTE_INSTALL_FILES@
+ at CPACK_RPM_USER_INSTALL_FILES@
+
+%changelog
+ at CPACK_RPM_SPEC_CHANGELOG@
+
+ at TMP_OTHER_COMPONENTS@
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake
new file mode 100644
index 0000000..a604863
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake
@@ -0,0 +1,9 @@
+install(FILES CMakeLists.txt DESTINATION foo COMPONENT test)
+
+if(PACKAGING_TYPE STREQUAL "MONOLITHIC")
+  set(CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_CURRENT_LIST_DIR}/custom.spec.in")
+elseif(PACKAGING_TYPE STREQUAL "COMPONENT")
+  install(FILES CMakeLists.txt DESTINATION bar COMPONENT test2)
+  set(CPACK_RPM_TEST_USER_BINARY_SPECFILE
+    "${CMAKE_CURRENT_LIST_DIR}/custom.spec.in")
+endif()

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

Summary of changes:
 Tests/RunCMake/CPack/RunCMakeTest.cmake            |    1 +
 .../CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake    |    9 +++
 .../RPM-COMPONENT-stderr.txt                       |    2 +
 .../RPM-MONOLITHIC-stderr.txt                      |    1 +
 .../tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in   |   80 ++++++++++++++++++++
 .../CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake |    9 +++
 6 files changed, 102 insertions(+)
 create mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
 create mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
 create mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
 create mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 12:51:32 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 12:51:32 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1969-g31e1ebf
Message-ID: <20170110175133.4F7E5FA68E@public.kitware.com>

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  31e1ebf7015852bae9dbc5204e37534ae29c8548 (commit)
       via  b7f0b1240f9c251d059fafcde878168f2b9a6664 (commit)
       via  ba8bb32162ae7bc42c4a3a521a4e4b98274d9d8e (commit)
      from  63a8770f08d0bcb239ceaaa18f5a6ee99af38be2 (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=31e1ebf7015852bae9dbc5204e37534ae29c8548
commit 31e1ebf7015852bae9dbc5204e37534ae29c8548
Merge: 63a8770 b7f0b12
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 12:51:31 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 12:51:31 2017 -0500

    Merge topic 'solaris-build-fixes' into next
    
    b7f0b124 libuv requires _XOPEN_SOURCE 600 on Solaris 11
    ba8bb321 Disable libuv on Solaris 10


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7f0b1240f9c251d059fafcde878168f2b9a6664
commit b7f0b1240f9c251d059fafcde878168f2b9a6664
Author:     Eric Berge <eric.berge at quantum.com>
AuthorDate: Wed Dec 21 15:38:28 2016 -0600
Commit:     Eric Berge <eric.berge at quantum.com>
CommitDate: Wed Dec 21 22:11:28 2016 -0600

    libuv requires _XOPEN_SOURCE 600 on Solaris 11
    
    This avoid build errors from the
        /usr/include/sys/feature_tests.h
    include file which disallows setting XOpen
    versions less than 6 when in C99 mode.

diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt
index 1b384b5..a8e25ba 100644
--- a/Utilities/cmlibuv/CMakeLists.txt
+++ b/Utilities/cmlibuv/CMakeLists.txt
@@ -218,8 +218,16 @@ if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
     )
   list(APPEND uv_defines
     __EXTENSIONS__
-    _XOPEN_SOURCE=500
     )
+  if(CMAKE_SYSTEM_VERSION STREQUAL "5.10")
+    list(APPEND uv_defines
+      _XOPEN_SOURCE=500
+      )
+  else()
+    list(APPEND uv_defines
+      _XOPEN_SOURCE=600
+      )
+  endif()
   list(APPEND uv_sources
     src/unix/sunos.c
     )

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba8bb32162ae7bc42c4a3a521a4e4b98274d9d8e
commit ba8bb32162ae7bc42c4a3a521a4e4b98274d9d8e
Author:     Eric Berge <eric.berge at quantum.com>
AuthorDate: Wed Dec 21 15:34:11 2016 -0600
Commit:     Eric Berge <eric.berge at quantum.com>
CommitDate: Wed Dec 21 15:34:11 2016 -0600

    Disable libuv on Solaris 10
    
    Two issues need to be resolved to add Solaris 10
    libuv support:
    
    1. libuv needs to provide alternative functionality
       for systems that do not support mkdtemp()
    2. cmake should set SUNOS_NO_IFADDRS for Solaris 10
       builds (but not Solaris 11)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7aa8010..bec81a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -510,6 +510,9 @@ int main(void) { return 0; }
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
       # Disable until it can be ported.
       set(CMAKE_USE_LIBUV 0)
+    elseif(CMAKE_SYSTEM STREQUAL "SunOS-5.10")
+      # Disable until it can be ported.
+      set(CMAKE_USE_LIBUV 0)
     endif()
   endif()
   if(CMAKE_USE_LIBUV)

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

Summary of changes:
 CMakeLists.txt                   |    3 +++
 Utilities/cmlibuv/CMakeLists.txt |   10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 13:07:54 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 13:07:54 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1971-g14f8a66
Message-ID: <20170110180754.77433FAB4A@public.kitware.com>

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  14f8a662df08f79471f199ff40444593933e509d (commit)
       via  b8968b4b3984b425497324c302948a197b2badbd (commit)
      from  31e1ebf7015852bae9dbc5204e37534ae29c8548 (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=14f8a662df08f79471f199ff40444593933e509d
commit 14f8a662df08f79471f199ff40444593933e509d
Merge: 31e1ebf b8968b4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 13:07:53 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 13:07:53 2017 -0500

    Merge topic 'UseSWIG-implicit-depends' into next
    
    b8968b4b UseSWIG: Automatically scan dependencies of SWIG files for Makefiles


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8968b4b3984b425497324c302948a197b2badbd
commit b8968b4b3984b425497324c302948a197b2badbd
Author:     Alexey Sokolov <sokolov at google.com>
AuthorDate: Wed Dec 21 01:53:41 2016 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 13:05:59 2017 -0500

    UseSWIG: Automatically scan dependencies of SWIG files for Makefiles
    
    Issue: #4147

diff --git a/Copyright.txt b/Copyright.txt
index aa91102..daaa1d1 100644
--- a/Copyright.txt
+++ b/Copyright.txt
@@ -37,6 +37,7 @@ The following individuals and institutions are among the Contributors:
 * Aleksey Avdeev <solo at altlinux.ru>
 * Alexander Neundorf <neundorf at kde.org>
 * Alexander Smorkalov <alexander.smorkalov at itseez.com>
+* Alexey Sokolov <sokolov at google.com>
 * Alex Turbov <i.zaufi at gmail.com>
 * Andreas Pakulat <apaku at gmx.de>
 * Andreas Schneider <asn at cryptomilk.org>
@@ -54,6 +55,7 @@ The following individuals and institutions are among the Contributors:
 * Eran Ifrah <eran.ifrah at gmail.com>
 * Esben Mose Hansen, Ange Optimization ApS
 * Geoffrey Viola <geoffrey.viola at asirobots.com>
+* Google Inc
 * Gregor Jasny
 * Helio Chissini de Castro <helio at kde.org>
 * Ilya Lavrenov <ilya.lavrenov at itseez.com>
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 651f9f1..ffb72a0 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -212,6 +212,7 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
     "${swig_source_file_fullname}"
     MAIN_DEPENDENCY "${swig_source_file_fullname}"
     DEPENDS ${SWIG_MODULE_${name}_EXTRA_DEPS}
+    IMPLICIT_DEPENDS CXX "${swig_source_file_fullname}"
     COMMENT "Swig source")
   set_source_files_properties("${swig_generated_file_fullname}" ${swig_extra_generated_files}
     PROPERTIES GENERATED 1)
diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx
index e6000db..9d4b9cc 100644
--- a/Source/cmDependsC.cxx
+++ b/Source/cmDependsC.cxx
@@ -12,7 +12,7 @@
 #include "cmSystemTools.h"
 
 #define INCLUDE_REGEX_LINE                                                    \
-  "^[ \t]*#[ \t]*(include|import)[ \t]*[<\"]([^\">]+)([\">])"
+  "^[ \t]*[#%][ \t]*(include|import)[ \t]*[<\"]([^\">]+)([\">])"
 
 #define INCLUDE_REGEX_LINE_MARKER "#IncludeRegexLine: "
 #define INCLUDE_REGEX_SCAN_MARKER "#IncludeRegexScan: "
@@ -420,7 +420,7 @@ void cmDependsC::SetupTransforms()
   if (!this->TransformRules.empty()) {
     // Construct the regular expression to match lines to be
     // transformed.
-    std::string xform = "^([ \t]*#[ \t]*(include|import)[ \t]*)(";
+    std::string xform = "^([ \t]*[#%][ \t]*(include|import)[ \t]*)(";
     const char* sep = "";
     for (TransformRulesType::const_iterator tri = this->TransformRules.begin();
          tri != this->TransformRules.end(); ++tri) {

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

Summary of changes:
 Copyright.txt         |    2 ++
 Modules/UseSWIG.cmake |    1 +
 Source/cmDependsC.cxx |    4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 13:14:22 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 13:14:22 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1973-gd954016
Message-ID: <20170110181422.C561AFA5E5@public.kitware.com>

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  d954016868c66aa78b66bd94c2d744b8cc42738a (commit)
       via  513ef514e51702bf7775f79119f8e3e39ccbb784 (commit)
      from  14f8a662df08f79471f199ff40444593933e509d (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=d954016868c66aa78b66bd94c2d744b8cc42738a
commit d954016868c66aa78b66bd94c2d744b8cc42738a
Merge: 14f8a66 513ef51
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 13:14:22 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 13:14:22 2017 -0500

    Merge topic 'AndroidTestUtilities-fix-cleanup' into next
    
    513ef514 AndroidTestUtilities: fix cleanup operation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=513ef514e51702bf7775f79119f8e3e39ccbb784
commit 513ef514e51702bf7775f79119f8e3e39ccbb784
Author:     Ruslan Baratov <ruslan_baratov at yahoo.com>
AuthorDate: Tue Dec 27 21:15:36 2016 +0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 13:12:45 2017 -0500

    AndroidTestUtilities: fix cleanup operation
    
    `su` is not available by default on all devices:
    
    ```
    > adb shell "echo ls /data/local/tmp | su"
    /system/bin/sh: su: not found
    > echo $?
    0
    ```
    
    Also since `execute_adb_command` use `execute_process` under the hood
    the pipeline (`|`) will not be treated as special symbol and will be
    process just like one more command line argument for the `adb`.

diff --git a/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake b/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake
index f5f2564..d8ca730 100644
--- a/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake
+++ b/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake
@@ -117,7 +117,7 @@ function(android_push_test_files_to_device)
   check_device_file_exists(${_ptd_DEV_TEST_DIR} test_dir_exists)
   if(test_dir_exists)
     # This is protected in the SetupProjectTests module.
-    execute_adb_command(shell echo rm -r ${_ptd_DEV_TEST_DIR} | su)
+    execute_adb_command(shell rm -r ${_ptd_DEV_TEST_DIR})
   endif()
   execute_adb_command(shell mkdir -p ${_ptd_DEV_TEST_DIR})
 

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 13:16:36 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 13:16:36 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1975-g014c446
Message-ID: <20170110181636.168DFFA703@public.kitware.com>

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  014c446aeeecb24be2a0494f1031cd992fd3d045 (commit)
       via  a9b93501d435bcd30a96e3091255e509fedbb39f (commit)
      from  d954016868c66aa78b66bd94c2d744b8cc42738a (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=014c446aeeecb24be2a0494f1031cd992fd3d045
commit 014c446aeeecb24be2a0494f1031cd992fd3d045
Merge: d954016 a9b9350
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 13:16:35 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 13:16:35 2017 -0500

    Merge topic 'FindBoost-1.63' into next
    
    a9b93501 FindBoost: Add support for 1.63


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9b93501d435bcd30a96e3091255e509fedbb39f
commit a9b93501d435bcd30a96e3091255e509fedbb39f
Author:     Roger Leigh <r.leigh at dundee.ac.uk>
AuthorDate: Tue Dec 27 12:02:54 2016 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 13:15:34 2017 -0500

    FindBoost: Add support for 1.63

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index ce4f47c..69476203 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -742,6 +742,21 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
     set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
     set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
     set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
+  elseif(NOT Boost_VERSION VERSION_LESS 106300 AND Boost_VERSION VERSION_LESS 106400)
+    set(_Boost_CHRONO_DEPENDENCIES system)
+    set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
+    set(_Boost_COROUTINE_DEPENDENCIES context system)
+    set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time)
+    set(_Boost_FILESYSTEM_DEPENDENCIES system)
+    set(_Boost_IOSTREAMS_DEPENDENCIES regex)
+    set(_Boost_LOG_DEPENDENCIES date_time log_setup system filesystem thread regex chrono atomic)
+    set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic)
+    set(_Boost_MPI_DEPENDENCIES serialization)
+    set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
+    set(_Boost_RANDOM_DEPENDENCIES system)
+    set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
+    set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
+    set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
   else()
     message(WARNING "Imported targets not available for Boost version ${Boost_VERSION}")
     set(_Boost_IMPORTED_TARGETS FALSE)
@@ -948,7 +963,7 @@ else()
   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
   # _Boost_COMPONENT_DEPENDENCIES.
   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
-    "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
+    "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
     "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
     "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
     "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48" "1.47.0" "1.47" "1.46.1"

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

Summary of changes:
 Modules/FindBoost.cmake |   17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 13:27:15 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 13:27:15 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1978-g44c85ae
Message-ID: <20170110182715.A2E02FA8B0@public.kitware.com>

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  44c85ae38a4401379c411a1e3fefce8aefce0eed (commit)
       via  8deb913d983eee5ad1439ccb98244817d8912602 (commit)
       via  eadd395a1396ed78a3ecea7740f8f4735ab84453 (commit)
      from  014c446aeeecb24be2a0494f1031cd992fd3d045 (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=44c85ae38a4401379c411a1e3fefce8aefce0eed
commit 44c85ae38a4401379c411a1e3fefce8aefce0eed
Merge: 014c446 8deb913
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 13:27:15 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 13:27:15 2017 -0500

    Merge topic 'FindGTest-fixups' into next
    
    8deb913d FindGTest: add lib search path for MSVC x64 platform
    eadd395a FindGTest: Fix documented GTEST_MSVC_SEARCH default value


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8deb913d983eee5ad1439ccb98244817d8912602
commit 8deb913d983eee5ad1439ccb98244817d8912602
Author:     Dong XiaoC <godxcgo at foxmail.com>
AuthorDate: Fri Dec 23 06:31:11 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 13:26:33 2017 -0500

    FindGTest: add lib search path for MSVC x64 platform

diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake
index 931cc18..6540171 100644
--- a/Modules/FindGTest.cmake
+++ b/Modules/FindGTest.cmake
@@ -160,11 +160,17 @@ if(MSVC)
     if(GTEST_MSVC_SEARCH STREQUAL "MD")
         list(APPEND _gtest_libpath_suffixes
             msvc/gtest-md/Debug
-            msvc/gtest-md/Release)
+            msvc/gtest-md/Release
+            msvc/x64/Debug
+            msvc/x64/Release
+            )
     elseif(GTEST_MSVC_SEARCH STREQUAL "MT")
         list(APPEND _gtest_libpath_suffixes
             msvc/gtest/Debug
-            msvc/gtest/Release)
+            msvc/gtest/Release
+            msvc/x64/Debug
+            msvc/x64/Release
+            )
     endif()
 endif()
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eadd395a1396ed78a3ecea7740f8f4735ab84453
commit eadd395a1396ed78a3ecea7740f8f4735ab84453
Author:     Dong XiaoC <godxcgo at foxmail.com>
AuthorDate: Fri Dec 23 06:28:25 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 13:25:59 2017 -0500

    FindGTest: Fix documented GTEST_MSVC_SEARCH default value
    
    Documentation updates in commit v3.5.0-rc1~124^2~2 (FindGTest: Add
    imported targets and update documentation, 2015-12-10) accidentally
    changed the documented default to the wrong value.  Restore the
    documentation to refer to the actual default used in the implementation.

diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake
index 76ab716..931cc18 100644
--- a/Modules/FindGTest.cmake
+++ b/Modules/FindGTest.cmake
@@ -49,8 +49,8 @@
 #   The root directory of the Google Test installation (may also be
 #   set as an environment variable)
 # ``GTEST_MSVC_SEARCH``
-#   If compiling with MSVC, this variable can be set to ``MD`` or
-#   ``MT`` (the default) to enable searching a GTest build tree
+#   If compiling with MSVC, this variable can be set to ``MT`` or
+#   ``MD`` (the default) to enable searching a GTest build tree
 #
 #
 # Example usage

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

Summary of changes:
 Modules/FindGTest.cmake |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 13:43:37 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 13:43:37 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1980-g0287d41
Message-ID: <20170110184337.D7041F9939@public.kitware.com>

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  0287d41c435914431fee29ce064a480c5eb59174 (commit)
       via  696339a9d571ff7d37222296164dd738a6a2b042 (commit)
      from  44c85ae38a4401379c411a1e3fefce8aefce0eed (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=0287d41c435914431fee29ce064a480c5eb59174
commit 0287d41c435914431fee29ce064a480c5eb59174
Merge: 44c85ae 696339a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 13:43:36 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 13:43:36 2017 -0500

    Merge topic 'FindOpenSSL-check-both' into next
    
    696339a9 FindOpenSSL: Check that both CRYPTO and SSL libraries are present


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=696339a9d571ff7d37222296164dd738a6a2b042
commit 696339a9d571ff7d37222296164dd738a6a2b042
Author:     Harry Mallon <harry at codexdigital.com>
AuthorDate: Tue Jan 3 19:10:53 2017 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 13:42:48 2017 -0500

    FindOpenSSL: Check that both CRYPTO and SSL libraries are present
    
    * Strawberry perl on Windows installs one that is found by the
      default finder
    
    While at it, de-duplicate code setting `OPENSSL_LIBRARIES`.

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 30fc5c6..6259ce1 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -204,7 +204,6 @@ if(WIN32 AND NOT CYGWIN)
                      SSL_EAY_LIBRARY_DEBUG SSL_EAY_LIBRARY_RELEASE)
     set(OPENSSL_SSL_LIBRARY ${SSL_EAY_LIBRARY} )
     set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_LIBRARY} )
-    set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
   elseif(MINGW)
     # same player, for MinGW
     set(LIB_EAY_NAMES crypto libeay32)
@@ -232,7 +231,6 @@ if(WIN32 AND NOT CYGWIN)
     mark_as_advanced(SSL_EAY LIB_EAY)
     set(OPENSSL_SSL_LIBRARY ${SSL_EAY} )
     set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
-    set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
     unset(LIB_EAY_NAMES)
     unset(SSL_EAY_NAMES)
   else()
@@ -264,7 +262,6 @@ if(WIN32 AND NOT CYGWIN)
     mark_as_advanced(SSL_EAY LIB_EAY)
     set(OPENSSL_SSL_LIBRARY ${SSL_EAY} )
     set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
-    set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
   endif()
 else()
 
@@ -298,8 +295,6 @@ else()
   set(OPENSSL_SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY})
   set(OPENSSL_CRYPTO_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
 
-  set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
-
 endif()
 
 function(from_hex HEX DEC)
@@ -371,10 +366,13 @@ endif ()
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 
+set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} )
+
 if (OPENSSL_VERSION)
   find_package_handle_standard_args(OpenSSL
     REQUIRED_VARS
-      OPENSSL_LIBRARIES
+      OPENSSL_SSL_LIBRARY
+      OPENSSL_CRYPTO_LIBRARY
       OPENSSL_INCLUDE_DIR
     VERSION_VAR
       OPENSSL_VERSION
@@ -383,7 +381,8 @@ if (OPENSSL_VERSION)
   )
 else ()
   find_package_handle_standard_args(OpenSSL "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
-    OPENSSL_LIBRARIES
+    OPENSSL_SSL_LIBRARY
+    OPENSSL_CRYPTO_LIBRARY
     OPENSSL_INCLUDE_DIR
   )
 endif ()

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

Summary of changes:
 Modules/FindOpenSSL.cmake |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 13:53:14 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 13:53:14 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1982-gdeefc13
Message-ID: <20170110185314.63361FA267@public.kitware.com>

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  deefc1319b83543ff4ffe65feded4ddc290b6a54 (commit)
       via  6ad05df8bafd62b7ecb70d68cb395b72caf5fd8b (commit)
      from  0287d41c435914431fee29ce064a480c5eb59174 (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=deefc1319b83543ff4ffe65feded4ddc290b6a54
commit deefc1319b83543ff4ffe65feded4ddc290b6a54
Merge: 0287d41 6ad05df
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 13:53:13 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 13:53:13 2017 -0500

    Merge topic 'android_clang_asm' into next
    
    6ad05df8 Android: Set compiler target platform when compiling ASM with Clang


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ad05df8bafd62b7ecb70d68cb395b72caf5fd8b
commit 6ad05df8bafd62b7ecb70d68cb395b72caf5fd8b
Author:     Florent Castelli <florent.castelli at gmail.com>
AuthorDate: Fri Jan 6 23:33:37 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 13:51:42 2017 -0500

    Android: Set compiler target platform when compiling ASM with Clang

diff --git a/Modules/Platform/Android-Clang-ASM.cmake b/Modules/Platform/Android-Clang-ASM.cmake
new file mode 100644
index 0000000..6448da6
--- /dev/null
+++ b/Modules/Platform/Android-Clang-ASM.cmake
@@ -0,0 +1,2 @@
+include(Platform/Android-Clang)
+__android_compiler_clang(ASM)
diff --git a/Modules/Platform/Android-Clang.cmake b/Modules/Platform/Android-Clang.cmake
index f0cf4a5..f739ab1 100644
--- a/Modules/Platform/Android-Clang.cmake
+++ b/Modules/Platform/Android-Clang.cmake
@@ -35,7 +35,9 @@ include(Platform/Android-Common)
 include(Platform/Android/abi-${CMAKE_ANDROID_ARCH_ABI}-Clang)
 
 macro(__android_compiler_clang lang)
-  __android_compiler_common(${lang})
+  if(NOT "x${lang}" STREQUAL "xASM")
+    __android_compiler_common(${lang})
+  endif()
   if(NOT CMAKE_${lang}_COMPILER_TARGET)
     set(CMAKE_${lang}_COMPILER_TARGET "${_ANDROID_ABI_CLANG_TARGET}")
   endif()

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

Summary of changes:
 .../Platform/{Android-Clang-C.cmake => Android-Clang-ASM.cmake}    |    2 +-
 Modules/Platform/Android-Clang.cmake                               |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
 copy Modules/Platform/{Android-Clang-C.cmake => Android-Clang-ASM.cmake} (51%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 13:59:50 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 13:59:50 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1984-gb4636f7
Message-ID: <20170110185950.99921FA40A@public.kitware.com>

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  b4636f780f83e0da8431a5cfd6725878baf65aab (commit)
       via  7a9b109e598b5beea2f5d370a8ed60bf28ec29ba (commit)
      from  deefc1319b83543ff4ffe65feded4ddc290b6a54 (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=b4636f780f83e0da8431a5cfd6725878baf65aab
commit b4636f780f83e0da8431a5cfd6725878baf65aab
Merge: deefc13 7a9b109
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 13:59:50 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 13:59:50 2017 -0500

    Merge topic 'asan_overriding_user_options' into next
    
    7a9b109e ctest_memcheck: Append sanitizers user options to allow overriding


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a9b109e598b5beea2f5d370a8ed60bf28ec29ba
commit 7a9b109e598b5beea2f5d370a8ed60bf28ec29ba
Author:     Sylvain Joubert <joubert.sy at gmail.com>
AuthorDate: Mon Dec 19 11:59:45 2016 +0100
Commit:     Sylvain Joubert <joubert.sy at gmail.com>
CommitDate: Mon Dec 19 11:59:45 2016 +0100

    ctest_memcheck: Append sanitizers user options to allow overriding

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 2c31f60..8686d77 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -602,7 +602,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       if (this->MemoryTesterStyle ==
           cmCTestMemCheckHandler::ADDRESS_SANITIZER) {
         envVar = "ASAN_OPTIONS";
-        extraOptions += " detect_leaks=1";
+        extraOptions = "detect_leaks=1 " + extraOptions;
       } else if (this->MemoryTesterStyle ==
                  cmCTestMemCheckHandler::THREAD_SANITIZER) {
         envVar = "TSAN_OPTIONS";

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 14:13:34 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 14:13:34 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1986-g202c24a
Message-ID: <20170110191334.EF723F9586@public.kitware.com>

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  202c24a3e137558723f8d781ccbdd3665daa8b2e (commit)
       via  524f5ee186f95a0dc0dc449e437910a72b175893 (commit)
      from  b4636f780f83e0da8431a5cfd6725878baf65aab (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=202c24a3e137558723f8d781ccbdd3665daa8b2e
commit 202c24a3e137558723f8d781ccbdd3665daa8b2e
Merge: b4636f7 524f5ee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 14:13:34 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 14:13:34 2017 -0500

    Merge topic 'android_clang_asm' into next
    
    524f5ee1 Android: Set compiler target platform when compiling ASM with Clang


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=524f5ee186f95a0dc0dc449e437910a72b175893
commit 524f5ee186f95a0dc0dc449e437910a72b175893
Author:     Florent Castelli <florent.castelli at gmail.com>
AuthorDate: Fri Jan 6 23:33:37 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 14:12:46 2017 -0500

    Android: Set compiler target platform when compiling ASM with Clang
    
    Closes: #16535

diff --git a/Modules/Platform/Android-Clang-ASM.cmake b/Modules/Platform/Android-Clang-ASM.cmake
new file mode 100644
index 0000000..6448da6
--- /dev/null
+++ b/Modules/Platform/Android-Clang-ASM.cmake
@@ -0,0 +1,2 @@
+include(Platform/Android-Clang)
+__android_compiler_clang(ASM)
diff --git a/Modules/Platform/Android-Clang.cmake b/Modules/Platform/Android-Clang.cmake
index f0cf4a5..f739ab1 100644
--- a/Modules/Platform/Android-Clang.cmake
+++ b/Modules/Platform/Android-Clang.cmake
@@ -35,7 +35,9 @@ include(Platform/Android-Common)
 include(Platform/Android/abi-${CMAKE_ANDROID_ARCH_ABI}-Clang)
 
 macro(__android_compiler_clang lang)
-  __android_compiler_common(${lang})
+  if(NOT "x${lang}" STREQUAL "xASM")
+    __android_compiler_common(${lang})
+  endif()
   if(NOT CMAKE_${lang}_COMPILER_TARGET)
     set(CMAKE_${lang}_COMPILER_TARGET "${_ANDROID_ABI_CLANG_TARGET}")
   endif()

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 14:16:53 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 14:16:53 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1988-gf1926db
Message-ID: <20170110191653.9D98AFA559@public.kitware.com>

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  f1926db39ba43c3ba8d3397425fd93de71d6bbf1 (commit)
       via  2ad86c4232bec1eb5205f67a350084cc77018f27 (commit)
      from  202c24a3e137558723f8d781ccbdd3665daa8b2e (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=f1926db39ba43c3ba8d3397425fd93de71d6bbf1
commit f1926db39ba43c3ba8d3397425fd93de71d6bbf1
Merge: 202c24a 2ad86c4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 14:16:52 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 14:16:52 2017 -0500

    Merge topic 'asan_overriding_user_options' into next
    
    2ad86c42 Revert "ctest_memcheck: Append sanitizers user options to allow overriding"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ad86c4232bec1eb5205f67a350084cc77018f27
commit 2ad86c4232bec1eb5205f67a350084cc77018f27
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 14:16:45 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 14:16:45 2017 -0500

    Revert "ctest_memcheck: Append sanitizers user options to allow overriding"
    
    This reverts commit 7a9b109e598b5beea2f5d370a8ed60bf28ec29ba.

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 8686d77..2c31f60 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -602,7 +602,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       if (this->MemoryTesterStyle ==
           cmCTestMemCheckHandler::ADDRESS_SANITIZER) {
         envVar = "ASAN_OPTIONS";
-        extraOptions = "detect_leaks=1 " + extraOptions;
+        extraOptions += " detect_leaks=1";
       } else if (this->MemoryTesterStyle ==
                  cmCTestMemCheckHandler::THREAD_SANITIZER) {
         envVar = "TSAN_OPTIONS";

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 14:25:19 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 14:25:19 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-1990-gb526e70
Message-ID: <20170110192519.25C32FA660@public.kitware.com>

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  b526e70725cc58b1bc51c0d5c4f3f9c00a908387 (commit)
       via  ff91b1514be75dee07e8009a60ad39284e8844b4 (commit)
      from  f1926db39ba43c3ba8d3397425fd93de71d6bbf1 (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=b526e70725cc58b1bc51c0d5c4f3f9c00a908387
commit b526e70725cc58b1bc51c0d5c4f3f9c00a908387
Merge: f1926db ff91b15
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 14:25:18 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 14:25:18 2017 -0500

    Merge topic 'FindBoost-find-default' into next
    
    ff91b151 FindBoost: Search official location of prebuilt binaries on Windows


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff91b1514be75dee07e8009a60ad39284e8844b4
commit ff91b1514be75dee07e8009a60ad39284e8844b4
Author:     Alex Turbov <i.zaufi at gmail.com>
AuthorDate: Wed Dec 21 16:12:09 2016 +0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 14:21:53 2017 -0500

    FindBoost: Search official location of prebuilt binaries on Windows
    
    Make it possible to find Boost in the default install path (`c:\boost`)
    of an official prebuilt binaries installation even when `BOOST_ROOT`
    has not been specified.

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index e6bf3dc..ee5e668 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -877,7 +877,7 @@ endfunction()
 # This function would append corresponding directories if MSVC is a current compiler,
 # so having `BOOST_ROOT` would be enough to specify to find everything.
 #
-macro(_Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlibvar basedir)
+macro(_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlibvar basedir)
   if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
     if(CMAKE_SIZEOF_VOID_P EQUAL 8)
       set(_arch_suffix 64)
@@ -885,19 +885,19 @@ macro(_Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlibvar base
       set(_arch_suffix 32)
     endif()
     if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10)
-      list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-15.0)
+      list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-15.0)
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
-      list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-14.0)
+      list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-14.0)
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18)
-      list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-12.0)
+      list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-12.0)
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17)
-      list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-11.0)
+      list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-11.0)
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
-      list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-10.0)
+      list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-10.0)
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15)
-      list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-9.0)
+      list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-9.0)
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14)
-      list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-8.0)
+      list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-8.0)
     endif()
   endif()
 endmacro()
@@ -1361,10 +1361,10 @@ foreach(c DEBUG RELEASE)
 
     if(BOOST_ROOT)
       list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} ${BOOST_ROOT}/lib ${BOOST_ROOT}/stage/lib)
-      _Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} BOOST_ROOT)
+      _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${BOOST_ROOT}")
     elseif(_ENV_BOOST_ROOT)
       list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} ${_ENV_BOOST_ROOT}/lib ${_ENV_BOOST_ROOT}/stage/lib)
-      _Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} _ENV_BOOST_ROOT)
+      _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${_ENV_BOOST_ROOT}")
     endif()
 
     list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c}
@@ -1372,6 +1372,7 @@ foreach(c DEBUG RELEASE)
       ${Boost_INCLUDE_DIR}/../lib
       ${Boost_INCLUDE_DIR}/stage/lib
       )
+    _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${Boost_INCLUDE_DIR}/..")
     if( Boost_NO_SYSTEM_PATHS )
       list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH)
     else()
@@ -1380,6 +1381,7 @@ foreach(c DEBUG RELEASE)
         C:/boost
         /sw/local/lib
         )
+      _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "C:/boost")
     endif()
   endif()
 endforeach()

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

Summary of changes:
 Modules/FindBoost.cmake |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 14:32:47 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 14:32:47 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2023-g25b5e76
Message-ID: <20170110193247.C8CD4FA6DB@public.kitware.com>

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  25b5e76e15b3b5fe6e0aacd5345ecd1f3d360e5b (commit)
       via  b393e63bc9b98b429dc1bbaf21a4e2d481dfec4b (commit)
       via  331eb74b795cae914ec88e58f2c0bec69c17a853 (commit)
       via  cbc07d331d1d5429dc1e0b7c6c7949ff8d9efdf1 (commit)
       via  c17e0a3ad58f06fcb0827910af520405670b3d51 (commit)
       via  53787bf8de2d3981f650e9036bb89cb6ed884a75 (commit)
       via  8dbdd3e726ead25c179e6eb4ffab212a1db3aba8 (commit)
       via  0699760d5c8b644242ddd4ac6d07d8c4c68f2b94 (commit)
       via  a84f0bb726ebcc8e9bf3db0b99e5b6fd8a720045 (commit)
       via  7b766b83952ec4c431a55d2f6e589a5f806834c9 (commit)
       via  2964b8cca4155fa318722f6ef17f0d4d56ee2f29 (commit)
       via  d58b6bf31c18cfedd4a2f15e009b8e5cbdc21b6e (commit)
       via  94c319f93309ff4cddd0280cdcbd48b50492db36 (commit)
       via  966be439e07131c3ff84175c1a9e3b6336908d8e (commit)
       via  de531432887487943dbe4ae5a1bde762d5582e06 (commit)
       via  d8e45536fb3637454cf17a638dcd9fc236e94660 (commit)
       via  d9313a82906ced0ff3c76828e86d9d7a248a5e49 (commit)
       via  32d3540e090c4a24d55b99c49c094a9cb574c9b3 (commit)
       via  e7280a7f1743d73cdab41ed709a9e1d0f99b6342 (commit)
       via  63d3ca4c1cab0c7b9c71d6c051c3b4c053eb7627 (commit)
       via  6ae19bf32e232beb59a0c427d82c0761e8248ab8 (commit)
       via  9986da4f0f2f49c0d7d260f9d21deaa906708376 (commit)
       via  d51cc88e844c78c01c1616e6a2fb102c0682dd00 (commit)
       via  cf1d5a9cdba49a2e9f08879d756ae118b22bfc6a (commit)
       via  f962275987e17cf94da663a919f52b6d0c8f44f4 (commit)
       via  c736c41ad192c89e1c74751a8f401c75955f5f3b (commit)
       via  cbd650c2642e40369eaa53d20dafee6cdccae4af (commit)
       via  0b1527ff3d1781380756ee72a9641b7c5c7c87cc (commit)
       via  2b9d795e63acf723a6abd79f3195ec70476442a5 (commit)
       via  2cfcdf757d032cdea8b980792007a6f9d749e6fb (commit)
       via  2f67aef23d4192fadb222dc79311fb5ffbbc36ce (commit)
       via  794fdf40a1bc85dded519d7c737f73690e3a6e42 (commit)
       via  a1e49bb155132606ed9f590c0b62e68f2e288d0b (commit)
      from  b526e70725cc58b1bc51c0d5c4f3f9c00a908387 (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=25b5e76e15b3b5fe6e0aacd5345ecd1f3d360e5b
commit 25b5e76e15b3b5fe6e0aacd5345ecd1f3d360e5b
Merge: b526e70 b393e63
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 14:32:45 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 14:32:45 2017 -0500

    Merge topic 'Autogen_Simplify' into next
    
    b393e63b AUTOGEN: Release notes for SKIP_AUTOX
    331eb74b AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC
    cbc07d33 AUTOGEN: Documentation for SKIP_AUTOX source file properties
    c17e0a3a AUTOGEN: Tests: AUTORCC SKIP_AUTORCC and SKIP_AUTOGEN test
    53787bf8 AUTOGEN: Tests: AUTOUIC SKIP_AUTOUIC and SKIP_AUTOGEN test
    8dbdd3e7 AUTOGEN: Tests: AUTOMOC SKIP_AUTOMOC and SKIP_AUTOGEN test
    0699760d AUTOGEN: Generators: Do moc/uic skip test during file list generation
    a84f0bb7 AUTOGEN: Generators: Message upper/lower case unification
    7b766b83 AUTOGEN: Generators: Use single moc/uic skip test method only
    2964b8cc AUTOGEN: Generators: Use AUTOMOC/UIC/RCC instead of AUTOGEN in messages
    d58b6bf3 AUTOGEN: Generators: Moc/UicSkipTest methods
    94c319f9 AUTOGEN: Generators: Use separate header lists for MOC and UIC
    966be439 AUTOGEN: Generators: Be verbose about skipping files
    de531432 AUTOGEN: Generators: Remove unused variable
    d8e45536 AUTOGEN: Initializer: Always remember skipped files
    d9313a82 AUTOGEN: Initializer: Enable SKIP_AUTOGEN on all AUTOGEN generated sources
    ...


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b393e63bc9b98b429dc1bbaf21a4e2d481dfec4b
commit b393e63bc9b98b429dc1bbaf21a4e2d481dfec4b
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Mon Jan 2 18:02:53 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:17 2017 +0100

    AUTOGEN: Release notes for SKIP_AUTOX

diff --git a/Help/release/dev/QtAutogen_Skip.rst b/Help/release/dev/QtAutogen_Skip.rst
new file mode 100644
index 0000000..37f795c
--- /dev/null
+++ b/Help/release/dev/QtAutogen_Skip.rst
@@ -0,0 +1,12 @@
+QtAutogen_Skip
+--------------
+
+* The source file properties
+  :prop_sf:`SKIP_AUTOMOC`,
+  :prop_sf:`SKIP_AUTOUIC`,
+  :prop_sf:`SKIP_AUTORCC` and
+  :prop_sf:`SKIP_AUTOGEN`
+  allow to exclude files from
+  :prop_tgt:`AUTOMOC`,
+  :prop_tgt:`AUTOUIC` and
+  :prop_tgt:`AUTORCC` processing.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=331eb74b795cae914ec88e58f2c0bec69c17a853
commit 331eb74b795cae914ec88e58f2c0bec69c17a853
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Mon Jan 2 17:45:17 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:17 2017 +0100

    AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC

diff --git a/Help/manual/cmake-qt.7.rst b/Help/manual/cmake-qt.7.rst
index 80b0f49..c348f3f 100644
--- a/Help/manual/cmake-qt.7.rst
+++ b/Help/manual/cmake-qt.7.rst
@@ -83,6 +83,9 @@ following targets by setting the :variable:`CMAKE_AUTOMOC` variable.  The
 options to pass to ``moc``. The :variable:`CMAKE_AUTOMOC_MOC_OPTIONS`
 variable may be populated to pre-set the options for all following targets.
 
+Source C++ files can be excluded from :prop_tgt:`AUTOMOC` processing by
+enabling :prop_sf:`SKIP_AUTOMOC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
 .. _`Qt AUTOUIC`:
 
 AUTOUIC
@@ -151,6 +154,9 @@ result of linking with the :prop_tgt:`IMPORTED` target:
 
 .. _`Qt AUTORCC`:
 
+Source files can be excluded from :prop_tgt:`AUTOUIC` processing by
+enabling :prop_sf:`SKIP_AUTOUIC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
 AUTORCC
 ^^^^^^^
 
@@ -171,6 +177,9 @@ populated to pre-set the options for all following targets.  The
 ``<name>.qrc`` file to set particular options for the file.  This
 overrides options from the :prop_tgt:`AUTORCC_OPTIONS` target property.
 
+Source files can be excluded from :prop_tgt:`AUTORCC` processing by
+enabling :prop_sf:`SKIP_AUTORCC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
 qtmain.lib on Windows
 =====================
 
diff --git a/Help/prop_tgt/AUTOMOC.rst b/Help/prop_tgt/AUTOMOC.rst
index 30a39b1..b42643f 100644
--- a/Help/prop_tgt/AUTOMOC.rst
+++ b/Help/prop_tgt/AUTOMOC.rst
@@ -47,5 +47,8 @@ See the documentation for this variable for more details.
 The global property :prop_gbl:`AUTOGEN_TARGETS_FOLDER` can be used to group the
 automoc targets together in an IDE, e.g.  in MSVS.
 
+Source C++ files can be excluded from :prop_tgt:`AUTOMOC` processing by
+enabling :prop_sf:`SKIP_AUTOMOC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
 See the :manual:`cmake-qt(7)` manual for more information on using CMake
 with Qt.
diff --git a/Help/prop_tgt/AUTORCC.rst b/Help/prop_tgt/AUTORCC.rst
index 158fdf8..1ad0895 100644
--- a/Help/prop_tgt/AUTORCC.rst
+++ b/Help/prop_tgt/AUTORCC.rst
@@ -24,5 +24,8 @@ generate unspecified unique names for ``rcc``.  Therefore if
 ``Q_INIT_RESOURCE()`` or ``Q_CLEANUP_RESOURCE()`` need to be used the
 ``.qrc`` file name must be unique.
 
+Source files can be excluded from :prop_tgt:`AUTORCC` processing by
+enabling :prop_sf:`SKIP_AUTORCC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
 See the :manual:`cmake-qt(7)` manual for more information on using CMake
 with Qt.
diff --git a/Help/prop_tgt/AUTOUIC.rst b/Help/prop_tgt/AUTOUIC.rst
index 4e60ec3..fbf24c3 100644
--- a/Help/prop_tgt/AUTOUIC.rst
+++ b/Help/prop_tgt/AUTOUIC.rst
@@ -20,5 +20,8 @@ Additional command line options for ``uic`` can be set via the
 The global property :prop_gbl:`AUTOGEN_TARGETS_FOLDER` can be used to group the
 autouic targets together in an IDE, e.g. in MSVS.
 
+Source files can be excluded from :prop_tgt:`AUTOUIC` processing by
+enabling :prop_sf:`SKIP_AUTOUIC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
 See the :manual:`cmake-qt(7)` manual for more information on using CMake
 with Qt.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbc07d331d1d5429dc1e0b7c6c7949ff8d9efdf1
commit cbc07d331d1d5429dc1e0b7c6c7949ff8d9efdf1
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Mon Jan 2 17:28:36 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:17 2017 +0100

    AUTOGEN: Documentation for SKIP_AUTOX source file properties

diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 971834e..c93ace1 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -357,6 +357,10 @@ Properties on Source Files
    /prop_sf/MACOSX_PACKAGE_LOCATION
    /prop_sf/OBJECT_DEPENDS
    /prop_sf/OBJECT_OUTPUTS
+   /prop_sf/SKIP_AUTOGEN
+   /prop_sf/SKIP_AUTOMOC
+   /prop_sf/SKIP_AUTORCC
+   /prop_sf/SKIP_AUTOUIC
    /prop_sf/SYMBOLIC
    /prop_sf/VS_DEPLOYMENT_CONTENT
    /prop_sf/VS_DEPLOYMENT_LOCATION
diff --git a/Help/prop_sf/SKIP_AUTOGEN.rst b/Help/prop_sf/SKIP_AUTOGEN.rst
new file mode 100644
index 0000000..6bf2409
--- /dev/null
+++ b/Help/prop_sf/SKIP_AUTOGEN.rst
@@ -0,0 +1,8 @@
+SKIP_AUTOGEN
+------------
+
+Exclude the source file from :prop_tgt:`AUTOMOC`, :prop_tgt:`AUTOUIC` and
+:prop_tgt:`AUTORCC` processing (for Qt projects).
+
+For finer control see :prop_sf:`SKIP_AUTOMOC`, :prop_sf:`SKIP_AUTOUIC` and
+:prop_sf:`SKIP_AUTORCC`.
diff --git a/Help/prop_sf/SKIP_AUTOMOC.rst b/Help/prop_sf/SKIP_AUTOMOC.rst
new file mode 100644
index 0000000..2245ca6
--- /dev/null
+++ b/Help/prop_sf/SKIP_AUTOMOC.rst
@@ -0,0 +1,6 @@
+SKIP_AUTOMOC
+------------
+
+Exclude the source file from :prop_tgt:`AUTOMOC` processing (for Qt projects).
+
+For broader control see :prop_sf:`SKIP_AUTOGEN`
diff --git a/Help/prop_sf/SKIP_AUTORCC.rst b/Help/prop_sf/SKIP_AUTORCC.rst
new file mode 100644
index 0000000..394d8f8
--- /dev/null
+++ b/Help/prop_sf/SKIP_AUTORCC.rst
@@ -0,0 +1,6 @@
+SKIP_AUTORCC
+------------
+
+Exclude the source file from :prop_tgt:`AUTORCC` processing (for Qt projects).
+
+For broader control see :prop_sf:`SKIP_AUTOGEN`
diff --git a/Help/prop_sf/SKIP_AUTOUIC.rst b/Help/prop_sf/SKIP_AUTOUIC.rst
new file mode 100644
index 0000000..50f78ef
--- /dev/null
+++ b/Help/prop_sf/SKIP_AUTOUIC.rst
@@ -0,0 +1,6 @@
+SKIP_AUTOUIC
+------------
+
+Exclude the source file from :prop_tgt:`AUTOUIC` processing (for Qt projects).
+
+For broader control see :prop_sf:`SKIP_AUTOGEN`

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c17e0a3ad58f06fcb0827910af520405670b3d51
commit c17e0a3ad58f06fcb0827910af520405670b3d51
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Sun Jan 1 16:45:40 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:17 2017 +0100

    AUTOGEN: Tests: AUTORCC SKIP_AUTORCC and SKIP_AUTOGEN test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 045f5b9..4b90ad8 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -181,6 +181,27 @@ set_property(TARGET skipUicB PROPERTY AUTOUIC ON)
 set_property(TARGET skipUicB PROPERTY AUTOMOC ON)
 target_link_libraries(skipUicB ${QT_LIBRARIES})
 
+# -- Test: AUTORCC, SKIP_AUTORCC
+# Test for SKIP_AUTORCC and SKIP_AUTOGEN on an AUTORCC enabled target
+set(skipRccSources
+  skipRcc.cpp
+  skipSource/skipRccBad1.qrc
+  skipSource/skipRccBad2.qrc
+  skipSource/skipRccGood.qrc
+)
+set_property(SOURCE skipSource/skipRccBad1.qrc PROPERTY SKIP_AUTORCC ON)
+set_property(SOURCE skipSource/skipRccBad2.qrc PROPERTY SKIP_AUTOGEN ON)
+# AUTORCC enabled
+add_executable(skipRccA ${skipRccSources})
+set_property(TARGET skipRccA PROPERTY AUTORCC ON)
+target_link_libraries(skipRccA ${QT_LIBRARIES})
+# AUTORCC, AUTOUIC and AUTOMOC enabled
+add_executable(skipRccB ${skipRccSources})
+set_property(TARGET skipRccB PROPERTY AUTORCC ON)
+set_property(TARGET skipRccB PROPERTY AUTOUIC ON)
+set_property(TARGET skipRccB PROPERTY AUTOMOC ON)
+target_link_libraries(skipRccB ${QT_LIBRARIES})
+
 # -- Test: AUTOMOC AUTORCC
 # Source files with the same basename in different subdirectories
 add_subdirectory(sameName)
diff --git a/Tests/QtAutogen/skipRcc.cpp b/Tests/QtAutogen/skipRcc.cpp
new file mode 100644
index 0000000..ec57110
--- /dev/null
+++ b/Tests/QtAutogen/skipRcc.cpp
@@ -0,0 +1,9 @@
+
+extern int qInitResources_skipRccGood();
+
+int main(int, char**)
+{
+  // Fails to link if the symbol is not present.
+  qInitResources_skipRccGood();
+  return 0;
+}
diff --git a/Tests/QtAutogen/skipSource/skipRccBad1.qrc b/Tests/QtAutogen/skipSource/skipRccBad1.qrc
new file mode 100644
index 0000000..6cbd9ed
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/skipRccBad1.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>skipRccGood.cpp</file>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+</qresource>
+</RCC>
diff --git a/Tests/QtAutogen/skipSource/skipRccBad2.qrc b/Tests/QtAutogen/skipSource/skipRccBad2.qrc
new file mode 100644
index 0000000..b32c589
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/skipRccBad2.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><
+<qresource>
+    <file>skipRccGood.cpp</file>
+</qresource>
+</RCC>
diff --git a/Tests/QtAutogen/skipSource/skipRccGood.qrc b/Tests/QtAutogen/skipSource/skipRccGood.qrc
new file mode 100644
index 0000000..21a94b0
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/skipRccGood.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>skipRccBad1.qrc</file>
+    <file>skipRccBad2.qrc</file>
+</qresource>
+</RCC>

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53787bf8de2d3981f650e9036bb89cb6ed884a75
commit 53787bf8de2d3981f650e9036bb89cb6ed884a75
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Sun Jan 1 15:42:32 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:16 2017 +0100

    AUTOGEN: Tests: AUTOUIC SKIP_AUTOUIC and SKIP_AUTOGEN test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 068b037..045f5b9 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -161,6 +161,26 @@ set_property(TARGET skipMocB PROPERTY AUTOMOC ON)
 set_property(TARGET skipMocB PROPERTY AUTOUIC ON)
 target_link_libraries(skipMocB ${QT_LIBRARIES})
 
+# -- Test: AUTOUIC, SKIP_AUTOUIC
+# Test for SKIP_AUTOUIC and SKIP_AUTOGEN on an AUTOUIC enabled target
+set(skipUicSources
+  skipUic.cpp
+  skipSource/skipUicGen.cpp
+  skipSource/skipUicNoGen1.cpp
+  skipSource/skipUicNoGen2.cpp
+)
+set_property(SOURCE skipSource/skipUicNoGen1.cpp PROPERTY SKIP_AUTOUIC ON)
+set_property(SOURCE skipSource/skipUicNoGen2.cpp PROPERTY SKIP_AUTOGEN ON)
+# AUTOUIC enabled
+add_executable(skipUicA ${skipUicSources})
+set_property(TARGET skipUicA PROPERTY AUTOUIC ON)
+target_link_libraries(skipUicA ${QT_LIBRARIES})
+# AUTOUIC and AUTOMOC enabled
+add_executable(skipUicB ${skipUicSources})
+set_property(TARGET skipUicB PROPERTY AUTOUIC ON)
+set_property(TARGET skipUicB PROPERTY AUTOMOC ON)
+target_link_libraries(skipUicB ${QT_LIBRARIES})
+
 # -- Test: AUTOMOC AUTORCC
 # Source files with the same basename in different subdirectories
 add_subdirectory(sameName)
diff --git a/Tests/QtAutogen/skipSource/skipUicGen.cpp b/Tests/QtAutogen/skipSource/skipUicGen.cpp
new file mode 100644
index 0000000..d2a55a6
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/skipUicGen.cpp
@@ -0,0 +1,7 @@
+
+#include "skipUicGen.hpp"
+#include "ui_uigen2.h"
+
+void skipGen()
+{
+}
diff --git a/Tests/QtAutogen/skipSource/skipUicGen.hpp b/Tests/QtAutogen/skipSource/skipUicGen.hpp
new file mode 100644
index 0000000..3669f0e
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/skipUicGen.hpp
@@ -0,0 +1,8 @@
+#ifndef SKIPUICGEN_HPP
+#define SKIPUICGEN_HPP
+
+#include "ui_uigen1.h"
+
+void skipGen();
+
+#endif
diff --git a/Tests/QtAutogen/skipSource/skipUicNoGen1.cpp b/Tests/QtAutogen/skipSource/skipUicNoGen1.cpp
new file mode 100644
index 0000000..f591a42
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/skipUicNoGen1.cpp
@@ -0,0 +1,7 @@
+
+#include "skipUicNoGen1.hpp"
+#include "ui_nogen2.h"
+
+void skipNoGen1()
+{
+}
diff --git a/Tests/QtAutogen/skipSource/skipUicNoGen1.hpp b/Tests/QtAutogen/skipSource/skipUicNoGen1.hpp
new file mode 100644
index 0000000..2864695
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/skipUicNoGen1.hpp
@@ -0,0 +1,8 @@
+#ifndef SKIPUICNOGEN1_H
+#define SKIPUICNOGEN1_H
+
+#include "ui_nogen1.h"
+
+void skipNoGen1();
+
+#endif
diff --git a/Tests/QtAutogen/skipSource/skipUicNoGen2.cpp b/Tests/QtAutogen/skipSource/skipUicNoGen2.cpp
new file mode 100644
index 0000000..8c1c324
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/skipUicNoGen2.cpp
@@ -0,0 +1,7 @@
+
+#include "skipUicNoGen2.hpp"
+#include "ui_nogen2.h"
+
+void skipNoGen2()
+{
+}
diff --git a/Tests/QtAutogen/skipSource/skipUicNoGen2.hpp b/Tests/QtAutogen/skipSource/skipUicNoGen2.hpp
new file mode 100644
index 0000000..7c38193
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/skipUicNoGen2.hpp
@@ -0,0 +1,8 @@
+#ifndef SKIPUICNOGEN2_H
+#define SKIPUICNOGEN2_H
+
+#include "ui_nogen1.h"
+
+void skipNoGen2();
+
+#endif
diff --git a/Tests/QtAutogen/skipSource/ui_nogen1.h b/Tests/QtAutogen/skipSource/ui_nogen1.h
new file mode 100644
index 0000000..a7be52b
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/ui_nogen1.h
@@ -0,0 +1,6 @@
+#ifndef UI_NOGEN1_H
+#define UI_NOGEN1_H
+
+void ui_nogen1();
+
+#endif
diff --git a/Tests/QtAutogen/skipSource/ui_nogen2.h b/Tests/QtAutogen/skipSource/ui_nogen2.h
new file mode 100644
index 0000000..5d547d4
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/ui_nogen2.h
@@ -0,0 +1,6 @@
+#ifndef UI_NOGEN2_H
+#define UI_NOGEN2_H
+
+void ui_nogen2();
+
+#endif
\ No newline at end of file
diff --git a/Tests/QtAutogen/skipSource/uigen1.ui b/Tests/QtAutogen/skipSource/uigen1.ui
new file mode 100644
index 0000000..fc7cb82
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/uigen1.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>UiGen1</class>
+ <widget class="QWidget" name="UiGen1">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QTreeView" name="treeView"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Tests/QtAutogen/skipSource/uigen2.ui b/Tests/QtAutogen/skipSource/uigen2.ui
new file mode 100644
index 0000000..01f08d2
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/uigen2.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>UiGen2</class>
+ <widget class="QWidget" name="UiGen2">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QTreeView" name="treeView"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Tests/QtAutogen/skipUic.cpp b/Tests/QtAutogen/skipUic.cpp
new file mode 100644
index 0000000..0adf011
--- /dev/null
+++ b/Tests/QtAutogen/skipUic.cpp
@@ -0,0 +1,22 @@
+
+#include "skipSource/skipUicGen.hpp"
+#include "skipSource/skipUicNoGen1.hpp"
+#include "skipSource/skipUicNoGen2.hpp"
+
+int main(int, char**)
+{
+  skipGen();
+  skipNoGen1();
+  skipNoGen2();
+
+  return 0;
+}
+
+// -- Function definitions
+void ui_nogen1()
+{
+}
+
+void ui_nogen2()
+{
+}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8dbdd3e726ead25c179e6eb4ffab212a1db3aba8
commit 8dbdd3e726ead25c179e6eb4ffab212a1db3aba8
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Sat Dec 31 10:25:38 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:16 2017 +0100

    AUTOGEN: Tests: AUTOMOC SKIP_AUTOMOC and SKIP_AUTOGEN test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 6d4e2c4..068b037 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -139,6 +139,28 @@ if (automoc_rerun_result)
   message(SEND_ERROR "Second build of automoc_rerun failed.")
 endif()
 
+# -- Test: AUTOMOC, SKIP_AUTOMOC
+# Test for SKIP_AUTOMOC and SKIP_AUTOGEN on an AUTOMOC enabled target
+qtx_wrap_cpp(skipMocWrapMoc
+  skipSource/qItemA.hpp
+  skipSource/qItemB.hpp)
+set(skipMocSources
+  skipMoc.cpp
+  skipSource/qItemA.cpp
+  skipSource/qItemB.cpp
+  skipSource/qItemC.cpp)
+set_property(SOURCE skipSource/qItemA.cpp PROPERTY SKIP_AUTOMOC ON)
+set_property(SOURCE skipSource/qItemB.cpp PROPERTY SKIP_AUTOGEN ON)
+# AUTOMOC enabled only
+add_executable(skipMocA ${skipMocSources} ${skipMocWrapMoc})
+set_property(TARGET skipMocA PROPERTY AUTOMOC ON)
+target_link_libraries(skipMocA ${QT_LIBRARIES})
+# AUTOMOC and AUTOUIC enabled
+add_executable(skipMocB ${skipMocSources} ${skipMocWrapMoc})
+set_property(TARGET skipMocB PROPERTY AUTOMOC ON)
+set_property(TARGET skipMocB PROPERTY AUTOUIC ON)
+target_link_libraries(skipMocB ${QT_LIBRARIES})
+
 # -- Test: AUTOMOC AUTORCC
 # Source files with the same basename in different subdirectories
 add_subdirectory(sameName)
diff --git a/Tests/QtAutogen/skipMoc.cpp b/Tests/QtAutogen/skipMoc.cpp
new file mode 100644
index 0000000..85305f5
--- /dev/null
+++ b/Tests/QtAutogen/skipMoc.cpp
@@ -0,0 +1,14 @@
+
+#include "skipSource/qItemA.hpp"
+#include "skipSource/qItemB.hpp"
+#include "skipSource/qItemC.hpp"
+
+int main(int, char**)
+{
+  QItemA itemA;
+  QItemA itemB;
+  QItemA itemC;
+
+  // Fails to link if the symbol is not present.
+  return 0;
+}
diff --git a/Tests/QtAutogen/skipSource/qItemA.cpp b/Tests/QtAutogen/skipSource/qItemA.cpp
new file mode 100644
index 0000000..522c2c7
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/qItemA.cpp
@@ -0,0 +1,5 @@
+#include "qItemA.hpp"
+
+void QItemA::go()
+{
+}
diff --git a/Tests/QtAutogen/skipSource/qItemA.hpp b/Tests/QtAutogen/skipSource/qItemA.hpp
new file mode 100644
index 0000000..d295faf
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/qItemA.hpp
@@ -0,0 +1,13 @@
+#ifndef QITEMA_HPP
+#define QITEMA_HPP
+
+#include <QObject>
+
+class QItemA : public QObject
+{
+  Q_OBJECT
+  Q_SLOT
+  void go();
+};
+
+#endif
diff --git a/Tests/QtAutogen/skipSource/qItemB.cpp b/Tests/QtAutogen/skipSource/qItemB.cpp
new file mode 100644
index 0000000..636e15d
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/qItemB.cpp
@@ -0,0 +1,5 @@
+#include "qItemB.hpp"
+
+void QItemB::go()
+{
+}
diff --git a/Tests/QtAutogen/skipSource/qItemB.hpp b/Tests/QtAutogen/skipSource/qItemB.hpp
new file mode 100644
index 0000000..1775915
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/qItemB.hpp
@@ -0,0 +1,13 @@
+#ifndef QITEMB_HPP
+#define QITEMB_HPP
+
+#include <QObject>
+
+class QItemB : public QObject
+{
+  Q_OBJECT
+  Q_SLOT
+  void go();
+};
+
+#endif
diff --git a/Tests/QtAutogen/skipSource/qItemC.cpp b/Tests/QtAutogen/skipSource/qItemC.cpp
new file mode 100644
index 0000000..700abd6
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/qItemC.cpp
@@ -0,0 +1,5 @@
+#include "qItemC.hpp"
+
+void QItemC::go()
+{
+}
diff --git a/Tests/QtAutogen/skipSource/qItemC.hpp b/Tests/QtAutogen/skipSource/qItemC.hpp
new file mode 100644
index 0000000..f06bda2
--- /dev/null
+++ b/Tests/QtAutogen/skipSource/qItemC.hpp
@@ -0,0 +1,13 @@
+#ifndef QITEMC_HPP
+#define QITEMC_HPP
+
+#include <QObject>
+
+class QItemC : public QObject
+{
+  Q_OBJECT
+  Q_SLOT
+  void go();
+};
+
+#endif

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0699760d5c8b644242ddd4ac6d07d8c4c68f2b94
commit 0699760d5c8b644242ddd4ac6d07d8c4c68f2b94
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 4 13:32:11 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:16 2017 +0100

    AUTOGEN: Generators: Do moc/uic skip test during file list generation

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 0a8c459..f5c33fe 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -534,8 +534,16 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
   }
 
   // Parse headers
-  headerFilesMoc.insert(this->Headers.begin(), this->Headers.end());
-  headerFilesUic.insert(this->Headers.begin(), this->Headers.end());
+  for (std::vector<std::string>::const_iterator it = this->Headers.begin();
+       it != this->Headers.end(); ++it) {
+    const std::string& headerName = *it;
+    if (!this->MocSkipTest(headerName)) {
+      headerFilesMoc.insert(this->Headers.begin(), this->Headers.end());
+    }
+    if (!this->UicSkipTest(headerName)) {
+      headerFilesUic.insert(this->Headers.begin(), this->Headers.end());
+    }
+  }
   this->ParseHeaders(headerFilesMoc, headerFilesUic, includedMocs,
                      notIncludedMocs, includedUis);
 
@@ -577,10 +585,12 @@ bool cmQtAutoGenerators::ParseSourceFile(
     this->LogWarning(err.str());
   } else {
     // Parse source contents for MOC
-    success = this->ParseContentForMoc(
-      absFilename, contentsString, headerExtensions, includedMocs, relaxed);
+    if (success && !this->MocSkipTest(absFilename)) {
+      success = this->ParseContentForMoc(
+        absFilename, contentsString, headerExtensions, includedMocs, relaxed);
+    }
     // Parse source contents for UIC
-    if (success) {
+    if (success && !this->UicSkipTest(absFilename)) {
       this->ParseContentForUic(absFilename, contentsString, includedUis);
     }
   }
@@ -610,10 +620,6 @@ void cmQtAutoGenerators::ParseContentForUic(
   const std::string& absFilename, const std::string& contentsString,
   std::map<std::string, std::vector<std::string> >& includedUis)
 {
-  if (this->UicSkipTest(absFilename)) {
-    return;
-  }
-
   // Process
   if (this->Verbose) {
     std::ostringstream err;
@@ -644,10 +650,6 @@ bool cmQtAutoGenerators::ParseContentForMoc(
   const std::vector<std::string>& headerExtensions,
   std::map<std::string, std::string>& includedMocs, bool relaxed)
 {
-  if (this->MocSkipTest(absFilename)) {
-    return true;
-  }
-
   // Process
   if (this->Verbose) {
     std::ostringstream err;
@@ -895,8 +897,7 @@ void cmQtAutoGenerators::ParseHeaders(
     const std::string contents = ReadAll(headerName);
 
     // Parse header content for MOC
-    if (!this->MocSkipTest(headerName) &&
-        (absHeadersMoc.find(headerName) != absHeadersMoc.end()) &&
+    if ((absHeadersMoc.find(headerName) != absHeadersMoc.end()) &&
         (includedMocs.find(headerName) == includedMocs.end())) {
       // Process
       if (this->Verbose) {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a84f0bb726ebcc8e9bf3db0b99e5b6fd8a720045
commit a84f0bb726ebcc8e9bf3db0b99e5b6fd8a720045
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 4 13:18:23 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:16 2017 +0100

    AUTOGEN: Generators: Message upper/lower case unification

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 8fea817..0a8c459 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -198,7 +198,7 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(
 
   if (!makefile->ReadListFile(filename.c_str())) {
     std::ostringstream err;
-    err << "AUTOGEN: error processing file: " << filename << std::endl;
+    err << "AutoGen: error processing file: " << filename << std::endl;
     this->LogError(err.str());
     return false;
   }
@@ -328,7 +328,7 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(
     }
     if (this->RccSources.size() != rccInputLists.size()) {
       std::ostringstream err;
-      err << "AUTOGEN: RCC sources lists size missmatch in: " << filename;
+      err << "AutoGen: RCC sources lists size missmatch in: " << filename;
       err << std::endl;
       this->LogError(err.str());
       return false;
@@ -572,7 +572,7 @@ bool cmQtAutoGenerators::ParseSourceFile(
   const std::string contentsString = ReadAll(absFilename);
   if (contentsString.empty()) {
     std::ostringstream err;
-    err << "AUTOGEN: warning: " << absFilename << "\n"
+    err << "AutoGen: Warning: " << absFilename << "\n"
         << "The file is empty\n";
     this->LogWarning(err.str());
   } else {
@@ -617,7 +617,7 @@ void cmQtAutoGenerators::ParseContentForUic(
   // Process
   if (this->Verbose) {
     std::ostringstream err;
-    err << "AUTOUIC: Checking " << absFilename << "\n";
+    err << "AutoUic: Checking " << absFilename << "\n";
     this->LogInfo(err.str());
   }
 
@@ -651,7 +651,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
   // Process
   if (this->Verbose) {
     std::ostringstream err;
-    err << "AUTOMOC: Checking " << absFilename << "\n";
+    err << "AutoMoc: Checking " << absFilename << "\n";
     this->LogInfo(err.str());
   }
 
@@ -705,7 +705,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
           }
         } else {
           std::ostringstream err;
-          err << "AUTOMOC: error: " << absFilename << "\n"
+          err << "AutoMoc: Error: " << absFilename << "\n"
               << "The file includes the moc file \"" << currentMoc
               << "\", but could not find header \"" << basename << '{'
               << this->JoinExts(headerExtensions) << "}\" ";
@@ -733,7 +733,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
               fileToMoc = headerToMoc;
               if (!requiresMoc && basename == scannedFileBasename) {
                 std::ostringstream err;
-                err << "AUTOMOC: warning: " << absFilename << "\n"
+                err << "AutoMoc: Warning: " << absFilename << "\n"
                     << "The file includes the moc file \"" << currentMoc
                     << "\", but does not contain a " << macroName
                     << " macro. Running moc on "
@@ -743,7 +743,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
                 this->LogWarning(err.str());
               } else {
                 std::ostringstream err;
-                err << "AUTOMOC: warning: " << absFilename << "\n"
+                err << "AutoMoc: Warning: " << absFilename << "\n"
                     << "The file includes the moc file \"" << currentMoc
                     << "\" instead of \"moc_" << basename
                     << ".cpp\". Running moc on "
@@ -754,7 +754,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
               }
             } else {
               std::ostringstream err;
-              err << "AUTOMOC: error: " << absFilename << "\n"
+              err << "AutoMoc: Error: " << absFilename << "\n"
                   << "The file includes the moc file \"" << currentMoc
                   << "\", which seems to be the moc file from a different "
                      "source file. CMake also could not find a matching "
@@ -772,7 +772,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
           if (basename != scannedFileBasename) {
             // Don't allow FOO.moc include other than self in strict mode
             std::ostringstream err;
-            err << "AUTOMOC: error: " << absFilename << "\n"
+            err << "AutoMoc: Error: " << absFilename << "\n"
                 << "The file includes the moc file \"" << currentMoc
                 << "\", which seems to be the moc file from a different "
                    "source file. This is not supported. Include \""
@@ -803,7 +803,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
     if (relaxed && ownMocUnderscoreIncluded) {
       // This is for KDE4 compatibility:
       std::ostringstream err;
-      err << "AUTOMOC: warning: " << absFilename << "\n"
+      err << "AutoMoc: Warning: " << absFilename << "\n"
           << "The file contains a " << macroName
           << " macro, but does not include "
           << "\"" << scannedFileBasename << ".moc\", but instead includes "
@@ -820,7 +820,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
     } else {
       // Otherwise always error out since it will not compile:
       std::ostringstream err;
-      err << "AUTOMOC: error: " << absFilename << "\n"
+      err << "AutoMoc: Error: " << absFilename << "\n"
           << "The file contains a " << macroName
           << " macro, but does not include "
           << "\"" << scannedFileBasename << ".moc\" !\n";
@@ -901,7 +901,7 @@ void cmQtAutoGenerators::ParseHeaders(
       // Process
       if (this->Verbose) {
         std::ostringstream err;
-        err << "AUTOMOC: Checking " << headerName << "\n";
+        err << "AutoMoc: Checking " << headerName << "\n";
         this->LogInfo(err.str());
       }
       std::string macroName;
@@ -932,7 +932,7 @@ bool cmQtAutoGenerators::GenerateMocFiles(
     mergedMocs.insert(notIncludedMocs.begin(), notIncludedMocs.end());
     if (this->NameCollisionTest(mergedMocs, collisions)) {
       std::ostringstream err;
-      err << "AUTOMOC: error: "
+      err << "AutoMoc: Error: "
              "The same moc file will be generated "
              "from different sources."
           << std::endl
@@ -1003,7 +1003,7 @@ bool cmQtAutoGenerators::GenerateMocFiles(
       // nothing changed: don't touch the moc_compilation.cpp file
       if (this->Verbose) {
         std::ostringstream err;
-        err << "AUTOMOC: " << this->OutMocCppFilenameRel << " still up to date"
+        err << "AutoMoc: " << this->OutMocCppFilenameRel << " still up to date"
             << std::endl;
         this->LogInfo(err.str());
       }
@@ -1025,7 +1025,7 @@ bool cmQtAutoGenerators::GenerateMocFiles(
     if (!outfile) {
       success = false;
       std::ostringstream err;
-      err << "AUTOMOC: error opening " << this->OutMocCppFilenameAbs << "\n";
+      err << "AutoMoc: error opening " << this->OutMocCppFilenameAbs << "\n";
       this->LogError(err.str());
     } else {
       outfile << automocSource;
@@ -1033,7 +1033,7 @@ bool cmQtAutoGenerators::GenerateMocFiles(
       if (!outfile.good()) {
         success = false;
         std::ostringstream err;
-        err << "AUTOMOC: error writing " << this->OutMocCppFilenameAbs << "\n";
+        err << "AutoMoc: error writing " << this->OutMocCppFilenameAbs << "\n";
         this->LogError(err.str());
       }
     }
@@ -1090,7 +1090,7 @@ bool cmQtAutoGenerators::GenerateMoc(const std::string& sourceFile,
     if (!result || retVal) {
       {
         std::ostringstream err;
-        err << "AUTOMOC: error: moc process for " << mocFileRel << " failed:\n"
+        err << "AutoMoc: Error: moc process for " << mocFileRel << " failed:\n"
             << output << std::endl;
         this->LogError(err.str());
       }
@@ -1133,7 +1133,7 @@ bool cmQtAutoGenerators::GenerateUiFiles(
     std::multimap<std::string, std::string> collisions;
     if (this->NameCollisionTest(testMap, collisions)) {
       std::ostringstream err;
-      err << "AUTOUIC: error: The same ui_NAME.h file will be generated "
+      err << "AutoUic: Error: The same ui_NAME.h file will be generated "
              "from different sources."
           << std::endl
           << "To avoid this error rename the source files." << std::endl;
@@ -1214,7 +1214,7 @@ bool cmQtAutoGenerators::GenerateUi(const std::string& realName,
     if (!result || retVal) {
       {
         std::ostringstream err;
-        err << "AUTOUIC: error: uic process for " << uicFileRel
+        err << "AutoUic: Error: uic process for " << uicFileRel
             << " needed by\n \"" << realName << "\"\nfailed:\n"
             << output << std::endl;
         this->LogError(err.str());
@@ -1263,7 +1263,7 @@ bool cmQtAutoGenerators::GenerateQrcFiles()
     std::multimap<std::string, std::string> collisions;
     if (this->NameCollisionTest(qrcGenMap, collisions)) {
       std::ostringstream err;
-      err << "AUTORCC: error: The same qrc_NAME.cpp file"
+      err << "AutoRcc: Error: The same qrc_NAME.cpp file"
              " will be generated from different sources."
           << std::endl
           << "To avoid this error rename the source .qrc files." << std::endl;
@@ -1350,7 +1350,7 @@ bool cmQtAutoGenerators::GenerateQrc(const std::string& qrcInputFile,
     if (!result || retVal) {
       {
         std::ostringstream err;
-        err << "AUTORCC: error: rcc process for " << qrcOutputFile
+        err << "AutoRcc: Error: rcc process for " << qrcOutputFile
             << " failed:\n"
             << output << std::endl;
         this->LogError(err.str());
@@ -1495,7 +1495,7 @@ bool cmQtAutoGenerators::MakeParentDirectory(const std::string& filename)
     success = cmsys::SystemTools::MakeDirectory(dirName);
     if (!success) {
       std::ostringstream err;
-      err << "AUTOGEN: Directory creation failed: " << dirName << std::endl;
+      err << "AutoGen: Directory creation failed: " << dirName << std::endl;
       this->LogError(err.str());
     }
   }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b766b83952ec4c431a55d2f6e589a5f806834c9
commit 7b766b83952ec4c431a55d2f6e589a5f806834c9
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 4 13:08:25 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:16 2017 +0100

    AUTOGEN: Generators: Use single moc/uic skip test method only

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 24d2dd7..8fea817 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -610,7 +610,7 @@ void cmQtAutoGenerators::ParseContentForUic(
   const std::string& absFilename, const std::string& contentsString,
   std::map<std::string, std::vector<std::string> >& includedUis)
 {
-  if (this->UicExecutable.empty() || this->UicSkipTest(absFilename)) {
+  if (this->UicSkipTest(absFilename)) {
     return;
   }
 
@@ -644,7 +644,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
   const std::vector<std::string>& headerExtensions,
   std::map<std::string, std::string>& includedMocs, bool relaxed)
 {
-  if (this->MocExecutable.empty() || this->MocSkipTest(absFilename)) {
+  if (this->MocSkipTest(absFilename)) {
     return true;
   }
 
@@ -838,25 +838,22 @@ void cmQtAutoGenerators::SearchHeadersForSourceFile(
   std::set<std::string>& absHeadersMoc, std::set<std::string>& absHeadersUic)
 {
   // search for header files and private header files we may need to moc:
-  const std::string basename =
-    cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename);
-  const std::string absPath = cmsys::SystemTools::GetFilenamePath(
-                                cmsys::SystemTools::GetRealPath(absFilename)) +
-    '/';
+  std::string basepath = cmsys::SystemTools::GetFilenamePath(
+    cmsys::SystemTools::GetRealPath(absFilename));
+  basepath += '/';
+  basepath += cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename);
 
   // Search for regular header
   for (std::vector<std::string>::const_iterator ext = headerExtensions.begin();
        ext != headerExtensions.end(); ++ext) {
-    const std::string headerName = absPath + basename + "." + (*ext);
+    const std::string headerName = basepath + "." + (*ext);
     if (cmsys::SystemTools::FileExists(headerName.c_str())) {
       // Moc headers
-      if (!this->MocExecutable.empty() &&
-          !ListContains(this->SkipMoc, absFilename)) {
+      if (!this->MocSkipTest(absFilename) && !this->MocSkipTest(headerName)) {
         absHeadersMoc.insert(headerName);
       }
       // Uic headers
-      if (!this->UicExecutable.empty() &&
-          !ListContains(this->SkipUic, absFilename)) {
+      if (!this->UicSkipTest(absFilename) && !this->UicSkipTest(headerName)) {
         absHeadersUic.insert(headerName);
       }
       break;
@@ -865,17 +862,15 @@ void cmQtAutoGenerators::SearchHeadersForSourceFile(
   // Search for private header
   for (std::vector<std::string>::const_iterator ext = headerExtensions.begin();
        ext != headerExtensions.end(); ++ext) {
-    const std::string privateHeaderName = absPath + basename + "_p." + (*ext);
-    if (cmsys::SystemTools::FileExists(privateHeaderName.c_str())) {
+    const std::string headerName = basepath + "_p." + (*ext);
+    if (cmsys::SystemTools::FileExists(headerName.c_str())) {
       // Moc headers
-      if (!this->MocExecutable.empty() &&
-          !ListContains(this->SkipMoc, absFilename)) {
-        absHeadersMoc.insert(privateHeaderName);
+      if (!this->MocSkipTest(absFilename) && !this->MocSkipTest(headerName)) {
+        absHeadersMoc.insert(headerName);
       }
       // Uic headers
-      if (!this->UicExecutable.empty() &&
-          !ListContains(this->SkipUic, absFilename)) {
-        absHeadersUic.insert(privateHeaderName);
+      if (!this->UicSkipTest(absFilename) && !this->UicSkipTest(headerName)) {
+        absHeadersUic.insert(headerName);
       }
       break;
     }
@@ -900,23 +895,21 @@ void cmQtAutoGenerators::ParseHeaders(
     const std::string contents = ReadAll(headerName);
 
     // Parse header content for MOC
-    if (!this->MocExecutable.empty() &&
+    if (!this->MocSkipTest(headerName) &&
         (absHeadersMoc.find(headerName) != absHeadersMoc.end()) &&
         (includedMocs.find(headerName) == includedMocs.end())) {
-      if (!this->MocSkipTest(headerName)) {
-        // Process
-        if (this->Verbose) {
-          std::ostringstream err;
-          err << "AUTOMOC: Checking " << headerName << "\n";
-          this->LogInfo(err.str());
-        }
-        std::string macroName;
-        if (this->requiresMocing(contents, macroName)) {
-          notIncludedMocs[headerName] = fpathCheckSum.getPart(headerName) +
-            "/moc_" +
-            cmsys::SystemTools::GetFilenameWithoutLastExtension(headerName) +
-            ".cpp";
-        }
+      // Process
+      if (this->Verbose) {
+        std::ostringstream err;
+        err << "AUTOMOC: Checking " << headerName << "\n";
+        this->LogInfo(err.str());
+      }
+      std::string macroName;
+      if (this->requiresMocing(contents, macroName)) {
+        notIncludedMocs[headerName] = fpathCheckSum.getPart(headerName) +
+          "/moc_" +
+          cmsys::SystemTools::GetFilenameWithoutLastExtension(headerName) +
+          ".cpp";
       }
     }
 
@@ -1372,19 +1365,19 @@ bool cmQtAutoGenerators::GenerateQrc(const std::string& qrcInputFile,
 }
 
 /**
- * @brief Tests if the file name is in the skip list
+ * @brief Tests if the file should be ignored for moc scanning
+ * @return True if the file should be ignored
  */
 bool cmQtAutoGenerators::MocSkipTest(const std::string& absFilename)
 {
-  if (ListContains(this->SkipMoc, absFilename)) {
-    if (this->Verbose) {
-      std::ostringstream msg;
-      msg << "AUTOMOC: Skipping " << absFilename << "\n";
-      this->LogInfo(msg.str());
+  // Test if moc scanning is enabled
+  if (!this->MocExecutable.empty()) {
+    // Test if the file name is on the skip list
+    if (!ListContains(this->SkipMoc, absFilename)) {
+      return false;
     }
-    return true;
   }
-  return false;
+  return true;
 }
 
 /**
@@ -1392,15 +1385,14 @@ bool cmQtAutoGenerators::MocSkipTest(const std::string& absFilename)
  */
 bool cmQtAutoGenerators::UicSkipTest(const std::string& absFilename)
 {
-  if (ListContains(this->SkipUic, absFilename)) {
-    if (this->Verbose) {
-      std::ostringstream msg;
-      msg << "AUTOUIC: Skipping " << absFilename << "\n";
-      this->LogInfo(msg.str());
+  // Test if uic scanning is enabled
+  if (!this->UicExecutable.empty()) {
+    // Test if the file name is on the skip list
+    if (!ListContains(this->SkipUic, absFilename)) {
+      return false;
     }
-    return true;
   }
-  return false;
+  return true;
 }
 
 /**

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2964b8cca4155fa318722f6ef17f0d4d56ee2f29
commit 2964b8cca4155fa318722f6ef17f0d4d56ee2f29
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Sun Jan 1 16:10:49 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:16 2017 +0100

    AUTOGEN: Generators: Use AUTOMOC/UIC/RCC instead of AUTOGEN in messages

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 9c8594b..24d2dd7 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -705,7 +705,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
           }
         } else {
           std::ostringstream err;
-          err << "AUTOGEN: error: " << absFilename << "\n"
+          err << "AUTOMOC: error: " << absFilename << "\n"
               << "The file includes the moc file \"" << currentMoc
               << "\", but could not find header \"" << basename << '{'
               << this->JoinExts(headerExtensions) << "}\" ";
@@ -939,7 +939,7 @@ bool cmQtAutoGenerators::GenerateMocFiles(
     mergedMocs.insert(notIncludedMocs.begin(), notIncludedMocs.end());
     if (this->NameCollisionTest(mergedMocs, collisions)) {
       std::ostringstream err;
-      err << "AUTOGEN: error: "
+      err << "AUTOMOC: error: "
              "The same moc file will be generated "
              "from different sources."
           << std::endl
@@ -1010,7 +1010,7 @@ bool cmQtAutoGenerators::GenerateMocFiles(
       // nothing changed: don't touch the moc_compilation.cpp file
       if (this->Verbose) {
         std::ostringstream err;
-        err << "AUTOGEN: " << this->OutMocCppFilenameRel << " still up to date"
+        err << "AUTOMOC: " << this->OutMocCppFilenameRel << " still up to date"
             << std::endl;
         this->LogInfo(err.str());
       }
@@ -1032,7 +1032,7 @@ bool cmQtAutoGenerators::GenerateMocFiles(
     if (!outfile) {
       success = false;
       std::ostringstream err;
-      err << "AUTOGEN: error opening " << this->OutMocCppFilenameAbs << "\n";
+      err << "AUTOMOC: error opening " << this->OutMocCppFilenameAbs << "\n";
       this->LogError(err.str());
     } else {
       outfile << automocSource;
@@ -1040,7 +1040,7 @@ bool cmQtAutoGenerators::GenerateMocFiles(
       if (!outfile.good()) {
         success = false;
         std::ostringstream err;
-        err << "AUTOGEN: error writing " << this->OutMocCppFilenameAbs << "\n";
+        err << "AUTOMOC: error writing " << this->OutMocCppFilenameAbs << "\n";
         this->LogError(err.str());
       }
     }
@@ -1097,7 +1097,7 @@ bool cmQtAutoGenerators::GenerateMoc(const std::string& sourceFile,
     if (!result || retVal) {
       {
         std::ostringstream err;
-        err << "AUTOGEN: error: moc process for " << mocFileRel << " failed:\n"
+        err << "AUTOMOC: error: moc process for " << mocFileRel << " failed:\n"
             << output << std::endl;
         this->LogError(err.str());
       }
@@ -1140,7 +1140,7 @@ bool cmQtAutoGenerators::GenerateUiFiles(
     std::multimap<std::string, std::string> collisions;
     if (this->NameCollisionTest(testMap, collisions)) {
       std::ostringstream err;
-      err << "AUTOGEN: error: The same ui_NAME.h file will be generated "
+      err << "AUTOUIC: error: The same ui_NAME.h file will be generated "
              "from different sources."
           << std::endl
           << "To avoid this error rename the source files." << std::endl;
@@ -1270,7 +1270,7 @@ bool cmQtAutoGenerators::GenerateQrcFiles()
     std::multimap<std::string, std::string> collisions;
     if (this->NameCollisionTest(qrcGenMap, collisions)) {
       std::ostringstream err;
-      err << "AUTOGEN: error: The same qrc_NAME.cpp file"
+      err << "AUTORCC: error: The same qrc_NAME.cpp file"
              " will be generated from different sources."
           << std::endl
           << "To avoid this error rename the source .qrc files." << std::endl;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d58b6bf31c18cfedd4a2f15e009b8e5cbdc21b6e
commit d58b6bf31c18cfedd4a2f15e009b8e5cbdc21b6e
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Sun Jan 1 15:58:34 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:16 2017 +0100

    AUTOGEN: Generators: Moc/UicSkipTest methods

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index fac9d54..9c8594b 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -610,16 +610,7 @@ void cmQtAutoGenerators::ParseContentForUic(
   const std::string& absFilename, const std::string& contentsString,
   std::map<std::string, std::vector<std::string> >& includedUis)
 {
-  if (this->UicExecutable.empty()) {
-    return;
-  }
-  // Check skip list
-  if (ListContains(this->SkipUic, absFilename)) {
-    if (this->Verbose) {
-      std::ostringstream err;
-      err << "AUTOUIC: Skipping " << absFilename << "\n";
-      this->LogInfo(err.str());
-    }
+  if (this->UicExecutable.empty() || this->UicSkipTest(absFilename)) {
     return;
   }
 
@@ -653,16 +644,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
   const std::vector<std::string>& headerExtensions,
   std::map<std::string, std::string>& includedMocs, bool relaxed)
 {
-  if (this->MocExecutable.empty()) {
-    return true;
-  }
-  // Check skip list
-  if (ListContains(this->SkipMoc, absFilename)) {
-    if (this->Verbose) {
-      std::ostringstream err;
-      err << "AUTOMOC: Skipping " << absFilename << "\n";
-      this->LogInfo(err.str());
-    }
+  if (this->MocExecutable.empty() || this->MocSkipTest(absFilename)) {
     return true;
   }
 
@@ -921,14 +903,7 @@ void cmQtAutoGenerators::ParseHeaders(
     if (!this->MocExecutable.empty() &&
         (absHeadersMoc.find(headerName) != absHeadersMoc.end()) &&
         (includedMocs.find(headerName) == includedMocs.end())) {
-      if (ListContains(this->SkipMoc, headerName)) {
-        // Skip
-        if (this->Verbose) {
-          std::ostringstream err;
-          err << "AUTOMOC: Skipping " << headerName << "\n";
-          this->LogInfo(err.str());
-        }
-      } else {
+      if (!this->MocSkipTest(headerName)) {
         // Process
         if (this->Verbose) {
           std::ostringstream err;
@@ -1397,6 +1372,38 @@ bool cmQtAutoGenerators::GenerateQrc(const std::string& qrcInputFile,
 }
 
 /**
+ * @brief Tests if the file name is in the skip list
+ */
+bool cmQtAutoGenerators::MocSkipTest(const std::string& absFilename)
+{
+  if (ListContains(this->SkipMoc, absFilename)) {
+    if (this->Verbose) {
+      std::ostringstream msg;
+      msg << "AUTOMOC: Skipping " << absFilename << "\n";
+      this->LogInfo(msg.str());
+    }
+    return true;
+  }
+  return false;
+}
+
+/**
+ * @brief Tests if the file name is in the skip list
+ */
+bool cmQtAutoGenerators::UicSkipTest(const std::string& absFilename)
+{
+  if (ListContains(this->SkipUic, absFilename)) {
+    if (this->Verbose) {
+      std::ostringstream msg;
+      msg << "AUTOUIC: Skipping " << absFilename << "\n";
+      this->LogInfo(msg.str());
+    }
+    return true;
+  }
+  return false;
+}
+
+/**
  * @brief Collects name collisions as output/input pairs
  * @return True if there were collisions
  */
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 1036cb7..d0c7066 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -86,6 +86,9 @@ private:
 
   void Init();
 
+  bool MocSkipTest(const std::string& absFilename);
+  bool UicSkipTest(const std::string& absFilename);
+
   bool NameCollisionTest(const std::map<std::string, std::string>& genFiles,
                          std::multimap<std::string, std::string>& collisions);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=94c319f93309ff4cddd0280cdcbd48b50492db36
commit 94c319f93309ff4cddd0280cdcbd48b50492db36
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Sat Dec 31 13:04:38 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:16 2017 +0100

    AUTOGEN: Generators: Use separate header lists for MOC and UIC
    
    This is necessary for the skipMoc and skipUic lists to work properly.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index b323609..fac9d54 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -511,7 +511,8 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
   std::map<std::string, std::string> notIncludedMocs;
   std::map<std::string, std::vector<std::string> > includedUis;
   // collects all headers which may need to be mocced
-  std::set<std::string> headerFiles;
+  std::set<std::string> headerFilesMoc;
+  std::set<std::string> headerFilesUic;
 
   // Parse sources
   {
@@ -527,14 +528,16 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
         return false;
       }
       // Find additional headers
-      this->SearchHeadersForCppFile(absFilename, headerExtensions,
-                                    headerFiles);
+      this->SearchHeadersForSourceFile(absFilename, headerExtensions,
+                                       headerFilesMoc, headerFilesUic);
     }
   }
 
   // Parse headers
-  headerFiles.insert(this->Headers.begin(), this->Headers.end());
-  this->ParseHeaders(headerFiles, includedMocs, notIncludedMocs, includedUis);
+  headerFilesMoc.insert(this->Headers.begin(), this->Headers.end());
+  headerFilesUic.insert(this->Headers.begin(), this->Headers.end());
+  this->ParseHeaders(headerFilesMoc, headerFilesUic, includedMocs,
+                     notIncludedMocs, includedUis);
 
   // Generate files
   if (!this->MocExecutable.empty()) {
@@ -847,10 +850,10 @@ bool cmQtAutoGenerators::ParseContentForMoc(
   return true;
 }
 
-void cmQtAutoGenerators::SearchHeadersForCppFile(
+void cmQtAutoGenerators::SearchHeadersForSourceFile(
   const std::string& absFilename,
   const std::vector<std::string>& headerExtensions,
-  std::set<std::string>& absHeaders)
+  std::set<std::string>& absHeadersMoc, std::set<std::string>& absHeadersUic)
 {
   // search for header files and private header files we may need to moc:
   const std::string basename =
@@ -859,37 +862,64 @@ void cmQtAutoGenerators::SearchHeadersForCppFile(
                                 cmsys::SystemTools::GetRealPath(absFilename)) +
     '/';
 
+  // Search for regular header
   for (std::vector<std::string>::const_iterator ext = headerExtensions.begin();
        ext != headerExtensions.end(); ++ext) {
     const std::string headerName = absPath + basename + "." + (*ext);
     if (cmsys::SystemTools::FileExists(headerName.c_str())) {
-      absHeaders.insert(headerName);
+      // Moc headers
+      if (!this->MocExecutable.empty() &&
+          !ListContains(this->SkipMoc, absFilename)) {
+        absHeadersMoc.insert(headerName);
+      }
+      // Uic headers
+      if (!this->UicExecutable.empty() &&
+          !ListContains(this->SkipUic, absFilename)) {
+        absHeadersUic.insert(headerName);
+      }
       break;
     }
   }
+  // Search for private header
   for (std::vector<std::string>::const_iterator ext = headerExtensions.begin();
        ext != headerExtensions.end(); ++ext) {
     const std::string privateHeaderName = absPath + basename + "_p." + (*ext);
     if (cmsys::SystemTools::FileExists(privateHeaderName.c_str())) {
-      absHeaders.insert(privateHeaderName);
+      // Moc headers
+      if (!this->MocExecutable.empty() &&
+          !ListContains(this->SkipMoc, absFilename)) {
+        absHeadersMoc.insert(privateHeaderName);
+      }
+      // Uic headers
+      if (!this->UicExecutable.empty() &&
+          !ListContains(this->SkipUic, absFilename)) {
+        absHeadersUic.insert(privateHeaderName);
+      }
       break;
     }
   }
 }
 
 void cmQtAutoGenerators::ParseHeaders(
-  const std::set<std::string>& absHeaders,
+  const std::set<std::string>& absHeadersMoc,
+  const std::set<std::string>& absHeadersUic,
   const std::map<std::string, std::string>& includedMocs,
   std::map<std::string, std::string>& notIncludedMocs,
   std::map<std::string, std::vector<std::string> >& includedUis)
 {
-  for (std::set<std::string>::const_iterator hIt = absHeaders.begin();
-       hIt != absHeaders.end(); ++hIt) {
+  // Merged header files list to read files only once
+  std::set<std::string> headerFiles;
+  headerFiles.insert(absHeadersMoc.begin(), absHeadersMoc.end());
+  headerFiles.insert(absHeadersUic.begin(), absHeadersUic.end());
+
+  for (std::set<std::string>::const_iterator hIt = headerFiles.begin();
+       hIt != headerFiles.end(); ++hIt) {
     const std::string& headerName = *hIt;
     const std::string contents = ReadAll(headerName);
 
     // Parse header content for MOC
     if (!this->MocExecutable.empty() &&
+        (absHeadersMoc.find(headerName) != absHeadersMoc.end()) &&
         (includedMocs.find(headerName) == includedMocs.end())) {
       if (ListContains(this->SkipMoc, headerName)) {
         // Skip
@@ -916,7 +946,9 @@ void cmQtAutoGenerators::ParseHeaders(
     }
 
     // Parse header content for UIC
-    this->ParseContentForUic(headerName, contents, includedUis);
+    if (absHeadersUic.find(headerName) != absHeadersUic.end()) {
+      this->ParseContentForUic(headerName, contents, includedUis);
+    }
   }
 }
 
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index dac23d9..1036cb7 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -55,13 +55,15 @@ private:
     std::map<std::string, std::string>& includedMocs,
     std::map<std::string, std::vector<std::string> >& includedUis,
     bool relaxed);
-  void SearchHeadersForCppFile(
+  void SearchHeadersForSourceFile(
     const std::string& absFilename,
     const std::vector<std::string>& headerExtensions,
-    std::set<std::string>& absHeaders);
+    std::set<std::string>& absHeadersMoc,
+    std::set<std::string>& absHeadersUic);
 
   void ParseHeaders(
-    const std::set<std::string>& absHeaders,
+    const std::set<std::string>& absHeadersMoc,
+    const std::set<std::string>& absHeadersUic,
     const std::map<std::string, std::string>& includedMocs,
     std::map<std::string, std::string>& notIncludedMocs,
     std::map<std::string, std::vector<std::string> >& includedUis);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=966be439e07131c3ff84175c1a9e3b6336908d8e
commit 966be439e07131c3ff84175c1a9e3b6336908d8e
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Sat Dec 31 11:51:39 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:15 2017 +0100

    AUTOGEN: Generators: Be verbose about skipping files

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index c162c87..b323609 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -607,11 +607,20 @@ void cmQtAutoGenerators::ParseContentForUic(
   const std::string& absFilename, const std::string& contentsString,
   std::map<std::string, std::vector<std::string> >& includedUis)
 {
-  if (this->UicExecutable.empty() ||
-      ListContains(this->SkipUic, absFilename)) {
+  if (this->UicExecutable.empty()) {
+    return;
+  }
+  // Check skip list
+  if (ListContains(this->SkipUic, absFilename)) {
+    if (this->Verbose) {
+      std::ostringstream err;
+      err << "AUTOUIC: Skipping " << absFilename << "\n";
+      this->LogInfo(err.str());
+    }
     return;
   }
 
+  // Process
   if (this->Verbose) {
     std::ostringstream err;
     err << "AUTOUIC: Checking " << absFilename << "\n";
@@ -641,11 +650,20 @@ bool cmQtAutoGenerators::ParseContentForMoc(
   const std::vector<std::string>& headerExtensions,
   std::map<std::string, std::string>& includedMocs, bool relaxed)
 {
-  if (this->MocExecutable.empty() ||
-      ListContains(this->SkipMoc, absFilename)) {
+  if (this->MocExecutable.empty()) {
+    return true;
+  }
+  // Check skip list
+  if (ListContains(this->SkipMoc, absFilename)) {
+    if (this->Verbose) {
+      std::ostringstream err;
+      err << "AUTOMOC: Skipping " << absFilename << "\n";
+      this->LogInfo(err.str());
+    }
     return true;
   }
 
+  // Process
   if (this->Verbose) {
     std::ostringstream err;
     err << "AUTOMOC: Checking " << absFilename << "\n";
@@ -872,21 +890,28 @@ void cmQtAutoGenerators::ParseHeaders(
 
     // Parse header content for MOC
     if (!this->MocExecutable.empty() &&
-        !ListContains(this->SkipMoc, headerName) &&
         (includedMocs.find(headerName) == includedMocs.end())) {
-
-      if (this->Verbose) {
-        std::ostringstream err;
-        err << "AUTOMOC: Checking " << headerName << "\n";
-        this->LogInfo(err.str());
-      }
-
-      std::string macroName;
-      if (this->requiresMocing(contents, macroName)) {
-        notIncludedMocs[headerName] = fpathCheckSum.getPart(headerName) +
-          "/moc_" +
-          cmsys::SystemTools::GetFilenameWithoutLastExtension(headerName) +
-          ".cpp";
+      if (ListContains(this->SkipMoc, headerName)) {
+        // Skip
+        if (this->Verbose) {
+          std::ostringstream err;
+          err << "AUTOMOC: Skipping " << headerName << "\n";
+          this->LogInfo(err.str());
+        }
+      } else {
+        // Process
+        if (this->Verbose) {
+          std::ostringstream err;
+          err << "AUTOMOC: Checking " << headerName << "\n";
+          this->LogInfo(err.str());
+        }
+        std::string macroName;
+        if (this->requiresMocing(contents, macroName)) {
+          notIncludedMocs[headerName] = fpathCheckSum.getPart(headerName) +
+            "/moc_" +
+            cmsys::SystemTools::GetFilenameWithoutLastExtension(headerName) +
+            ".cpp";
+        }
       }
     }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de531432887487943dbe4ae5a1bde762d5582e06
commit de531432887487943dbe4ae5a1bde762d5582e06
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Thu Dec 29 17:16:12 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:15 2017 +0100

    AUTOGEN: Generators: Remove unused variable

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 4b5e113..c162c87 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -666,13 +666,12 @@ bool cmQtAutoGenerators::ParseContentForMoc(
   std::string ownMocUnderscoreFile;
   std::string ownMocHeaderFile;
 
-  std::string::size_type matchOffset = 0;
   // first a simple string check for "moc" is *much* faster than the regexp,
   // and if the string search already fails, we don't have to try the
   // expensive regexp
-  if (strstr(contentsString.c_str(), "moc") != CM_NULLPTR) {
+  const char* contentChars = contentsString.c_str();
+  if (strstr(contentChars, "moc") != CM_NULLPTR) {
     // Iterate over all included moc files
-    const char* contentChars = contentsString.c_str();
     while (this->RegExpMocInclude.find(contentChars)) {
       const std::string currentMoc = this->RegExpMocInclude.match(1);
       // Basename of the current moc include

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8e45536fb3637454cf17a638dcd9fc236e94660
commit d8e45536fb3637454cf17a638dcd9fc236e94660
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Sat Dec 31 11:17:07 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:15 2017 +0100

    AUTOGEN: Initializer: Always remember skipped files

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index b74fbf3..6d4c302 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -101,14 +101,17 @@ static std::string GetQtMajorVersion(cmGeneratorTarget const* target)
 static void SetupSourceFiles(cmGeneratorTarget const* target,
                              std::vector<std::string>& mocUicSources,
                              std::vector<std::string>& mocUicHeaders,
-                             std::vector<std::string>& skipMoc,
-                             std::vector<std::string>& skipUic)
+                             std::vector<std::string>& skipMocList,
+                             std::vector<std::string>& skipUicList)
 {
   cmMakefile* makefile = target->Target->GetMakefile();
 
   std::vector<cmSourceFile*> srcFiles;
   target->GetConfigCommonSourceFiles(srcFiles);
 
+  const bool targetMoc = target->GetPropertyAsBool("AUTOMOC");
+  const bool targetUic = target->GetPropertyAsBool("AUTOUIC");
+
   cmFilePathChecksum fpathCheckSum(makefile);
   for (std::vector<cmSourceFile*>::const_iterator fileIt = srcFiles.begin();
        fileIt != srcFiles.end(); ++fileIt) {
@@ -123,32 +126,38 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
     if (cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED"))) {
       continue;
     }
-    if (cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOGEN"))) {
-      continue;
-    }
-    const bool fileSkipUic =
-      cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOUIC"));
-    const bool fileSkipMoc =
-      cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOMOC"));
-    if (fileSkipUic && fileSkipMoc) {
-      continue;
-    }
-
-    // Use file
     const std::string absFile =
       cmsys::SystemTools::GetRealPath(sf->GetFullPath());
-    // Add file name to sources or headers list
-    if (fileType == cmSystemTools::CXX_FILE_FORMAT) {
-      mocUicSources.push_back(absFile);
-    } else if (fileType == cmSystemTools::HEADER_FILE_FORMAT) {
-      mocUicHeaders.push_back(absFile);
-    }
-    // Add file name to skip lists on demand
-    if (fileSkipUic) {
-      skipUic.push_back(absFile);
-    }
-    if (fileSkipMoc) {
-      skipMoc.push_back(absFile);
+    // Skip flags
+    const bool skipAll =
+      cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOGEN"));
+    const bool skipMoc =
+      skipAll || cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOMOC"));
+    const bool skipUic =
+      skipAll || cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOUIC"));
+    // Add file name to skip lists.
+    // Do this even when the file is not added to the sources/headers lists
+    // because the file name may be extracted from an other file when
+    // processing
+    if (skipMoc) {
+      skipMocList.push_back(absFile);
+    }
+    if (skipUic) {
+      skipUicList.push_back(absFile);
+    }
+
+    if ((targetMoc && !skipMoc) || (targetUic && !skipUic)) {
+      // Add file name to sources or headers list
+      switch (fileType) {
+        case cmSystemTools::CXX_FILE_FORMAT:
+          mocUicSources.push_back(absFile);
+          break;
+        case cmSystemTools::HEADER_FILE_FORMAT:
+          mocUicHeaders.push_back(absFile);
+          break;
+        default:
+          break;
+      }
     }
   }
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9313a82906ced0ff3c76828e86d9d7a248a5e49
commit d9313a82906ced0ff3c76828e86d9d7a248a5e49
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Dec 28 12:15:11 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:15 2017 +0100

    AUTOGEN: Initializer: Enable SKIP_AUTOGEN on all AUTOGEN generated sources

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index de0c212..b74fbf3 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -646,7 +646,8 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenSources(
     cmMakefile* makefile = target->Target->GetMakefile();
     const std::string mocCppFile =
       GetAutogenTargetBuildDir(target) + "moc_compilation.cpp";
-    makefile->GetOrCreateSource(mocCppFile, true);
+    cmSourceFile* gf = makefile->GetOrCreateSource(mocCppFile, true);
+    gf->SetProperty("SKIP_AUTOGEN", "On");
     target->AddSource(mocCppFile);
   }
 }
@@ -778,7 +779,8 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
           rccOutputFile += ".cpp";
 
           // Add rcc output file to origin target sources
-          makefile->GetOrCreateSource(rccOutputFile, true);
+          cmSourceFile* gf = makefile->GetOrCreateSource(rccOutputFile, true);
+          gf->SetProperty("SKIP_AUTOGEN", "On");
           target->AddSource(rccOutputFile);
           // Register rcc output file as generated
           autogenOutputFiles.push_back(rccOutputFile);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32d3540e090c4a24d55b99c49c094a9cb574c9b3
commit 32d3540e090c4a24d55b99c49c094a9cb574c9b3
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Dec 28 12:01:31 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:15 2017 +0100

    AUTOGEN: Initializer: Introduce SKIP_AUTOGEN checks

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 5304aec..de0c212 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -123,6 +123,9 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
     if (cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED"))) {
       continue;
     }
+    if (cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOGEN"))) {
+      continue;
+    }
     const bool fileSkipUic =
       cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOUIC"));
     const bool fileSkipMoc =
@@ -578,7 +581,9 @@ static void RccSetupAutoTarget(cmGeneratorTarget const* target,
     std::string ext = sf->GetExtension();
     if (ext == "qrc") {
       std::string absFile = cmsys::SystemTools::GetRealPath(sf->GetFullPath());
-      bool skip = cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTORCC"));
+      const bool skip =
+        cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOGEN")) ||
+        cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTORCC"));
 
       if (!skip) {
         _rcc_files += sepRccFiles;
@@ -756,6 +761,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
          fileIt != srcFiles.end(); ++fileIt) {
       cmSourceFile* sf = *fileIt;
       if (sf->GetExtension() == "qrc" &&
+          !cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOGEN")) &&
           !cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTORCC"))) {
         {
           const std::string absFile =

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7280a7f1743d73cdab41ed709a9e1d0f99b6342
commit e7280a7f1743d73cdab41ed709a9e1d0f99b6342
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Dec 28 11:56:20 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:15 2017 +0100

    AUTOGEN: Rename config variables
    
    The new names describe the variables use cases better.

diff --git a/Modules/AutogenInfo.cmake.in b/Modules/AutogenInfo.cmake.in
index 84b0f4d..3fafaff 100644
--- a/Modules/AutogenInfo.cmake.in
+++ b/Modules/AutogenInfo.cmake.in
@@ -1,7 +1,7 @@
-set(AM_SOURCES @_cpp_files@ )
-set(AM_SKIP_MOC @_skip_moc@ )
-set(AM_SKIP_UIC @_skip_uic@ )
-set(AM_HEADERS @_moc_headers@ )
+set(AM_SOURCES @_moc_uic_sources@)
+set(AM_HEADERS @_moc_uic_headers@)
+set(AM_SKIP_MOC @_skip_moc@)
+set(AM_SKIP_UIC @_skip_uic@)
 set(AM_MOC_COMPILE_DEFINITIONS @_moc_compile_defs@)
 set(AM_MOC_INCLUDES @_moc_incs@)
 set(AM_MOC_OPTIONS @_moc_options@)
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 0ed43b1..5304aec 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -99,9 +99,9 @@ static std::string GetQtMajorVersion(cmGeneratorTarget const* target)
 }
 
 static void SetupSourceFiles(cmGeneratorTarget const* target,
+                             std::vector<std::string>& mocUicSources,
+                             std::vector<std::string>& mocUicHeaders,
                              std::vector<std::string>& skipMoc,
-                             std::vector<std::string>& sources,
-                             std::vector<std::string>& headers,
                              std::vector<std::string>& skipUic)
 {
   cmMakefile* makefile = target->Target->GetMakefile();
@@ -136,9 +136,9 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
       cmsys::SystemTools::GetRealPath(sf->GetFullPath());
     // Add file name to sources or headers list
     if (fileType == cmSystemTools::CXX_FILE_FORMAT) {
-      sources.push_back(absFile);
+      mocUicSources.push_back(absFile);
     } else if (fileType == cmSystemTools::HEADER_FILE_FORMAT) {
-      headers.push_back(absFile);
+      mocUicHeaders.push_back(absFile);
     }
     // Add file name to skip lists on demand
     if (fileSkipUic) {
@@ -171,7 +171,6 @@ static void GetCompileDefinitionsAndDirectories(
 static void MocSetupAutoTarget(
   cmGeneratorTarget const* target, const std::string& autogenTargetName,
   std::vector<std::string> const& skipMoc,
-  std::vector<std::string> const& mocHeaders,
   std::map<std::string, std::string>& configIncludes,
   std::map<std::string, std::string>& configDefines)
 {
@@ -185,9 +184,6 @@ static void MocSetupAutoTarget(
   makefile->AddDefinition(
     "_skip_moc",
     cmOutputConverter::EscapeForCMake(cmJoin(skipMoc, ";")).c_str());
-  makefile->AddDefinition(
-    "_moc_headers",
-    cmOutputConverter::EscapeForCMake(cmJoin(mocHeaders, ";")).c_str());
   bool relaxedMode = makefile->IsOn("CMAKE_AUTOMOC_RELAXED_MODE");
   makefile->AddDefinition("_moc_relaxed_mode", relaxedMode ? "TRUE" : "FALSE");
 
@@ -863,10 +859,10 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
     cmOutputConverter::EscapeForCMake(target->GetName()).c_str());
   makefile->AddDefinition("_target_qt_version", qtMajorVersion.c_str());
 
-  std::vector<std::string> skipUic;
+  std::vector<std::string> mocUicSources;
+  std::vector<std::string> mocUicHeaders;
   std::vector<std::string> skipMoc;
-  std::vector<std::string> mocSources;
-  std::vector<std::string> mocHeaders;
+  std::vector<std::string> skipUic;
   std::map<std::string, std::string> configMocIncludes;
   std::map<std::string, std::string> configMocDefines;
   std::map<std::string, std::string> configUicOptions;
@@ -874,14 +870,18 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
   if (target->GetPropertyAsBool("AUTOMOC") ||
       target->GetPropertyAsBool("AUTOUIC") ||
       target->GetPropertyAsBool("AUTORCC")) {
-    SetupSourceFiles(target, skipMoc, mocSources, mocHeaders, skipUic);
+    SetupSourceFiles(target, mocUicSources, mocUicHeaders, skipMoc, skipUic);
   }
   makefile->AddDefinition(
-    "_cpp_files",
-    cmOutputConverter::EscapeForCMake(cmJoin(mocSources, ";")).c_str());
+    "_moc_uic_sources",
+    cmOutputConverter::EscapeForCMake(cmJoin(mocUicSources, ";")).c_str());
+  makefile->AddDefinition(
+    "_moc_uic_headers",
+    cmOutputConverter::EscapeForCMake(cmJoin(mocUicHeaders, ";")).c_str());
+
   if (target->GetPropertyAsBool("AUTOMOC")) {
-    MocSetupAutoTarget(target, autogenTargetName, skipMoc, mocHeaders,
-                       configMocIncludes, configMocDefines);
+    MocSetupAutoTarget(target, autogenTargetName, skipMoc, configMocIncludes,
+                       configMocDefines);
   }
   if (target->GetPropertyAsBool("AUTOUIC")) {
     UicSetupAutoTarget(target, skipUic, configUicOptions);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63d3ca4c1cab0c7b9c71d6c051c3b4c053eb7627
commit 63d3ca4c1cab0c7b9c71d6c051c3b4c053eb7627
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Dec 28 11:43:25 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:15 2017 +0100

    AUTOGEN: Make skipMoc and skipUic blacklists behave the same way
    
    Before skipMoc was a list of files that were not included in the
    sources. Now the skipMoc files are added to the sources as well in case
    they are needed for uic processing. skipMoc becomes a blacklist just like
    skipUic.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index f0847b1..0ed43b1 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -100,8 +100,8 @@ static std::string GetQtMajorVersion(cmGeneratorTarget const* target)
 
 static void SetupSourceFiles(cmGeneratorTarget const* target,
                              std::vector<std::string>& skipMoc,
-                             std::vector<std::string>& mocSources,
-                             std::vector<std::string>& mocHeaders,
+                             std::vector<std::string>& sources,
+                             std::vector<std::string>& headers,
                              std::vector<std::string>& skipUic)
 {
   cmMakefile* makefile = target->Target->GetMakefile();
@@ -113,26 +113,39 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
   for (std::vector<cmSourceFile*>::const_iterator fileIt = srcFiles.begin();
        fileIt != srcFiles.end(); ++fileIt) {
     cmSourceFile* sf = *fileIt;
+    const cmSystemTools::FileFormat fileType =
+      cmSystemTools::GetFileFormat(sf->GetExtension().c_str());
+
+    if (!(fileType == cmSystemTools::CXX_FILE_FORMAT) &&
+        !(fileType == cmSystemTools::HEADER_FILE_FORMAT)) {
+      continue;
+    }
+    if (cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED"))) {
+      continue;
+    }
+    const bool fileSkipUic =
+      cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOUIC"));
+    const bool fileSkipMoc =
+      cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOMOC"));
+    if (fileSkipUic && fileSkipMoc) {
+      continue;
+    }
+
+    // Use file
     const std::string absFile =
       cmsys::SystemTools::GetRealPath(sf->GetFullPath());
-    const std::string ext = sf->GetExtension();
-
-    if (cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOUIC"))) {
+    // Add file name to sources or headers list
+    if (fileType == cmSystemTools::CXX_FILE_FORMAT) {
+      sources.push_back(absFile);
+    } else if (fileType == cmSystemTools::HEADER_FILE_FORMAT) {
+      headers.push_back(absFile);
+    }
+    // Add file name to skip lists on demand
+    if (fileSkipUic) {
       skipUic.push_back(absFile);
     }
-
-    if (!cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED"))) {
-      if (cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOMOC"))) {
-        skipMoc.push_back(absFile);
-      } else {
-        cmSystemTools::FileFormat fileType =
-          cmSystemTools::GetFileFormat(ext.c_str());
-        if (fileType == cmSystemTools::CXX_FILE_FORMAT) {
-          mocSources.push_back(absFile);
-        } else if (fileType == cmSystemTools::HEADER_FILE_FORMAT) {
-          mocHeaders.push_back(absFile);
-        }
-      }
+    if (fileSkipMoc) {
+      skipMoc.push_back(absFile);
     }
   }
 }
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 5877619..4b5e113 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -89,6 +89,12 @@ static std::string ReadAll(const std::string& filename)
   return stream.str();
 }
 
+static bool ListContains(const std::vector<std::string>& list,
+                         const std::string& entry)
+{
+  return (std::find(list.begin(), list.end(), entry) != list.end());
+}
+
 cmQtAutoGenerators::cmQtAutoGenerators()
   : Verbose(cmsys::SystemTools::HasEnv("VERBOSE"))
   , ColorOutput(true)
@@ -502,56 +508,35 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
 
   // key = moc source filepath, value = moc output filepath
   std::map<std::string, std::string> includedMocs;
-  // collect all headers which may need to be mocced
+  std::map<std::string, std::string> notIncludedMocs;
+  std::map<std::string, std::vector<std::string> > includedUis;
+  // collects all headers which may need to be mocced
   std::set<std::string> headerFiles;
 
-  const std::vector<std::string>& headerExtensions =
-    makefile->GetCMakeInstance()->GetHeaderExtensions();
-
-  std::map<std::string, std::vector<std::string> > includedUis;
-  std::map<std::string, std::vector<std::string> > skippedUis;
-
-  for (std::vector<std::string>::const_iterator it = this->Sources.begin();
-       it != this->Sources.end(); ++it) {
-    const std::string& absFilename = *it;
-    const bool skipUic = std::find(this->SkipUic.begin(), this->SkipUic.end(),
-                                   absFilename) != this->SkipUic.end();
-    std::map<std::string, std::vector<std::string> >& uiFiles =
-      skipUic ? skippedUis : includedUis;
-    if (this->Verbose) {
-      std::ostringstream err;
-      err << "AUTOGEN: Checking " << absFilename << std::endl;
-      this->LogInfo(err.str());
-    }
-    // Parse source file for MOC/UIC
-    if (!this->ParseSourceFile(absFilename, headerExtensions, includedMocs,
-                               uiFiles, this->MocRelaxedMode)) {
-      return false;
-    }
-    // Find additional headers
-    this->SearchHeadersForCppFile(absFilename, headerExtensions, headerFiles);
-  }
+  // Parse sources
+  {
+    const std::vector<std::string>& headerExtensions =
+      makefile->GetCMakeInstance()->GetHeaderExtensions();
 
-  for (std::vector<std::string>::const_iterator it = this->SkipMoc.begin();
-       it != this->SkipMoc.end(); ++it) {
-    if (std::find(this->SkipUic.begin(), this->SkipUic.end(), *it) !=
-        this->SkipUic.end()) {
+    for (std::vector<std::string>::const_iterator it = this->Sources.begin();
+         it != this->Sources.end(); ++it) {
       const std::string& absFilename = *it;
-      if (this->Verbose) {
-        std::ostringstream err;
-        err << "AUTOGEN: Checking " << absFilename << std::endl;
-        this->LogInfo(err.str());
+      // Parse source file for MOC/UIC
+      if (!this->ParseSourceFile(absFilename, headerExtensions, includedMocs,
+                                 includedUis, this->MocRelaxedMode)) {
+        return false;
       }
-      this->ParseForUic(absFilename, includedUis);
+      // Find additional headers
+      this->SearchHeadersForCppFile(absFilename, headerExtensions,
+                                    headerFiles);
     }
   }
 
+  // Parse headers
   headerFiles.insert(this->Headers.begin(), this->Headers.end());
-
-  // key = moc source filepath, value = moc output filename
-  std::map<std::string, std::string> notIncludedMocs;
   this->ParseHeaders(headerFiles, includedMocs, notIncludedMocs, includedUis);
 
+  // Generate files
   if (!this->MocExecutable.empty()) {
     if (!this->GenerateMocFiles(includedMocs, notIncludedMocs)) {
       return false;
@@ -588,11 +573,13 @@ bool cmQtAutoGenerators::ParseSourceFile(
         << "The file is empty\n";
     this->LogWarning(err.str());
   } else {
-    // Parse source contents for UIC
-    this->ParseContentForUic(absFilename, contentsString, includedUis);
     // Parse source contents for MOC
     success = this->ParseContentForMoc(
       absFilename, contentsString, headerExtensions, includedMocs, relaxed);
+    // Parse source contents for UIC
+    if (success) {
+      this->ParseContentForUic(absFilename, contentsString, includedUis);
+    }
   }
   return success;
 }
@@ -616,31 +603,21 @@ bool cmQtAutoGenerators::requiresMocing(const std::string& text,
   return false;
 }
 
-void cmQtAutoGenerators::ParseForUic(
-  const std::string& absFilename,
+void cmQtAutoGenerators::ParseContentForUic(
+  const std::string& absFilename, const std::string& contentsString,
   std::map<std::string, std::vector<std::string> >& includedUis)
 {
-  if (this->UicExecutable.empty()) {
+  if (this->UicExecutable.empty() ||
+      ListContains(this->SkipUic, absFilename)) {
     return;
   }
-  const std::string contentsString = ReadAll(absFilename);
-  if (contentsString.empty()) {
+
+  if (this->Verbose) {
     std::ostringstream err;
-    err << "AUTOGEN: warning: " << absFilename << ": file is empty\n"
-        << std::endl;
-    this->LogWarning(err.str());
-    return;
+    err << "AUTOUIC: Checking " << absFilename << "\n";
+    this->LogInfo(err.str());
   }
-  this->ParseContentForUic(absFilename, contentsString, includedUis);
-}
 
-void cmQtAutoGenerators::ParseContentForUic(
-  const std::string& absFilename, const std::string& contentsString,
-  std::map<std::string, std::vector<std::string> >& includedUis)
-{
-  if (this->UicExecutable.empty()) {
-    return;
-  }
   const std::string realName = cmsys::SystemTools::GetRealPath(absFilename);
   const char* contentChars = contentsString.c_str();
   if (strstr(contentChars, "ui_") != CM_NULLPTR) {
@@ -664,10 +641,17 @@ bool cmQtAutoGenerators::ParseContentForMoc(
   const std::vector<std::string>& headerExtensions,
   std::map<std::string, std::string>& includedMocs, bool relaxed)
 {
-  if (this->MocExecutable.empty()) {
+  if (this->MocExecutable.empty() ||
+      ListContains(this->SkipMoc, absFilename)) {
     return true;
   }
 
+  if (this->Verbose) {
+    std::ostringstream err;
+    err << "AUTOMOC: Checking " << absFilename << "\n";
+    this->LogInfo(err.str());
+  }
+
   const std::string scannedFileAbsPath =
     cmsys::SystemTools::GetFilenamePath(
       cmsys::SystemTools::GetRealPath(absFilename)) +
@@ -887,11 +871,14 @@ void cmQtAutoGenerators::ParseHeaders(
     const std::string& headerName = *hIt;
     const std::string contents = ReadAll(headerName);
 
+    // Parse header content for MOC
     if (!this->MocExecutable.empty() &&
-        includedMocs.find(headerName) == includedMocs.end()) {
+        !ListContains(this->SkipMoc, headerName) &&
+        (includedMocs.find(headerName) == includedMocs.end())) {
+
       if (this->Verbose) {
         std::ostringstream err;
-        err << "AUTOGEN: Checking " << headerName << std::endl;
+        err << "AUTOMOC: Checking " << headerName << "\n";
         this->LogInfo(err.str());
       }
 
@@ -903,6 +890,8 @@ void cmQtAutoGenerators::ParseHeaders(
           ".cpp";
       }
     }
+
+    // Parse header content for UIC
     this->ParseContentForUic(headerName, contents, includedUis);
   }
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ae19bf32e232beb59a0c427d82c0761e8248ab8
commit 6ae19bf32e232beb59a0c427d82c0761e8248ab8
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Dec 28 10:25:16 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:14 2017 +0100

    AUTOGEN: Generators: Add dedicated method for moc content parsing

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 33550b0..5877619 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -580,19 +580,90 @@ bool cmQtAutoGenerators::ParseSourceFile(
   std::map<std::string, std::string>& includedMocs,
   std::map<std::string, std::vector<std::string> >& includedUis, bool relaxed)
 {
+  bool success = true;
   const std::string contentsString = ReadAll(absFilename);
   if (contentsString.empty()) {
     std::ostringstream err;
     err << "AUTOGEN: warning: " << absFilename << "\n"
         << "The file is empty\n";
     this->LogWarning(err.str());
-    return true;
+  } else {
+    // Parse source contents for UIC
+    this->ParseContentForUic(absFilename, contentsString, includedUis);
+    // Parse source contents for MOC
+    success = this->ParseContentForMoc(
+      absFilename, contentsString, headerExtensions, includedMocs, relaxed);
+  }
+  return success;
+}
+
+bool cmQtAutoGenerators::requiresMocing(const std::string& text,
+                                        std::string& macroName)
+{
+  // Run a simple check before an expensive regular expression check
+  if (strstr(text.c_str(), "Q_OBJECT") != CM_NULLPTR) {
+    if (this->RegExpQObject.find(text)) {
+      macroName = "Q_OBJECT";
+      return true;
+    }
+  }
+  if (strstr(text.c_str(), "Q_GADGET") != CM_NULLPTR) {
+    if (this->RegExpQGadget.find(text)) {
+      macroName = "Q_GADGET";
+      return true;
+    }
   }
+  return false;
+}
 
-  // Parse source contents for UIC
+void cmQtAutoGenerators::ParseForUic(
+  const std::string& absFilename,
+  std::map<std::string, std::vector<std::string> >& includedUis)
+{
+  if (this->UicExecutable.empty()) {
+    return;
+  }
+  const std::string contentsString = ReadAll(absFilename);
+  if (contentsString.empty()) {
+    std::ostringstream err;
+    err << "AUTOGEN: warning: " << absFilename << ": file is empty\n"
+        << std::endl;
+    this->LogWarning(err.str());
+    return;
+  }
   this->ParseContentForUic(absFilename, contentsString, includedUis);
+}
 
-  // Continue with moc parsing on demand
+void cmQtAutoGenerators::ParseContentForUic(
+  const std::string& absFilename, const std::string& contentsString,
+  std::map<std::string, std::vector<std::string> >& includedUis)
+{
+  if (this->UicExecutable.empty()) {
+    return;
+  }
+  const std::string realName = cmsys::SystemTools::GetRealPath(absFilename);
+  const char* contentChars = contentsString.c_str();
+  if (strstr(contentChars, "ui_") != CM_NULLPTR) {
+    while (this->RegExpUicInclude.find(contentChars)) {
+      const std::string currentUi = this->RegExpUicInclude.match(1);
+      const std::string basename =
+        cmsys::SystemTools::GetFilenameWithoutLastExtension(currentUi);
+      // basename should be the part of the ui filename used for
+      // finding the correct header, so we need to remove the ui_ part
+      includedUis[realName].push_back(basename.substr(3));
+      contentChars += this->RegExpUicInclude.end();
+    }
+  }
+}
+
+/**
+ * @return True on success
+ */
+bool cmQtAutoGenerators::ParseContentForMoc(
+  const std::string& absFilename, const std::string& contentsString,
+  const std::vector<std::string>& headerExtensions,
+  std::map<std::string, std::string>& includedMocs, bool relaxed)
+{
   if (this->MocExecutable.empty()) {
     return true;
   }
@@ -775,65 +846,6 @@ bool cmQtAutoGenerators::ParseSourceFile(
   return true;
 }
 
-bool cmQtAutoGenerators::requiresMocing(const std::string& text,
-                                        std::string& macroName)
-{
-  // Run a simple check before an expensive regular expression check
-  if (strstr(text.c_str(), "Q_OBJECT") != CM_NULLPTR) {
-    if (this->RegExpQObject.find(text)) {
-      macroName = "Q_OBJECT";
-      return true;
-    }
-  }
-  if (strstr(text.c_str(), "Q_GADGET") != CM_NULLPTR) {
-    if (this->RegExpQGadget.find(text)) {
-      macroName = "Q_GADGET";
-      return true;
-    }
-  }
-  return false;
-}
-
-void cmQtAutoGenerators::ParseForUic(
-  const std::string& absFilename,
-  std::map<std::string, std::vector<std::string> >& includedUis)
-{
-  if (this->UicExecutable.empty()) {
-    return;
-  }
-  const std::string contentsString = ReadAll(absFilename);
-  if (contentsString.empty()) {
-    std::ostringstream err;
-    err << "AUTOGEN: warning: " << absFilename << ": file is empty\n"
-        << std::endl;
-    this->LogWarning(err.str());
-    return;
-  }
-  this->ParseContentForUic(absFilename, contentsString, includedUis);
-}
-
-void cmQtAutoGenerators::ParseContentForUic(
-  const std::string& absFilename, const std::string& contentsString,
-  std::map<std::string, std::vector<std::string> >& includedUis)
-{
-  if (this->UicExecutable.empty()) {
-    return;
-  }
-  const std::string realName = cmsys::SystemTools::GetRealPath(absFilename);
-  const char* contentChars = contentsString.c_str();
-  if (strstr(contentChars, "ui_") != CM_NULLPTR) {
-    while (this->RegExpUicInclude.find(contentChars)) {
-      const std::string currentUi = this->RegExpUicInclude.match(1);
-      const std::string basename =
-        cmsys::SystemTools::GetFilenameWithoutLastExtension(currentUi);
-      // basename should be the part of the ui filename used for
-      // finding the correct header, so we need to remove the ui_ part
-      includedUis[realName].push_back(basename.substr(3));
-      contentChars += this->RegExpUicInclude.end();
-    }
-  }
-}
-
 void cmQtAutoGenerators::SearchHeadersForCppFile(
   const std::string& absFilename,
   const std::vector<std::string>& headerExtensions,
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index f86e7c3..dac23d9 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -72,6 +72,12 @@ private:
     const std::string& fileName, const std::string& contentsString,
     std::map<std::string, std::vector<std::string> >& includedUis);
 
+  bool ParseContentForMoc(const std::string& absFilename,
+                          const std::string& contentsString,
+                          const std::vector<std::string>& headerExtensions,
+                          std::map<std::string, std::string>& includedMocs,
+                          bool relaxed);
+
   void ParseForUic(
     const std::string& fileName,
     std::map<std::string, std::vector<std::string> >& includedUis);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9986da4f0f2f49c0d7d260f9d21deaa906708376
commit 9986da4f0f2f49c0d7d260f9d21deaa906708376
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Tue Dec 27 19:08:23 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:14 2017 +0100

    AUTOGEN: Generators: Split config SKIP_MOC and SKIP_UIC into vectors

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 5a370fe..33550b0 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -227,7 +227,8 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(
                                     this->Headers);
 
   // - Moc
-  this->SkipMoc = makefile->GetSafeDefinition("AM_SKIP_MOC");
+  cmSystemTools::ExpandListArgument(makefile->GetSafeDefinition("AM_SKIP_MOC"),
+                                    this->SkipMoc);
   {
     std::string compileDefsPropOrig = "AM_MOC_COMPILE_DEFINITIONS";
     std::string compileDefsProp = compileDefsPropOrig;
@@ -254,7 +255,8 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(
   this->MocOptionsStr = makefile->GetSafeDefinition("AM_MOC_OPTIONS");
 
   // - Uic
-  this->SkipUic = makefile->GetSafeDefinition("AM_SKIP_UIC");
+  cmSystemTools::ExpandListArgument(makefile->GetSafeDefinition("AM_SKIP_UIC"),
+                                    this->SkipUic);
   {
     const char* uicOptionsFiles =
       makefile->GetSafeDefinition("AM_UIC_OPTIONS_FILES");
@@ -508,14 +510,12 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
 
   std::map<std::string, std::vector<std::string> > includedUis;
   std::map<std::string, std::vector<std::string> > skippedUis;
-  std::vector<std::string> uicSkipped;
-  cmSystemTools::ExpandListArgument(this->SkipUic, uicSkipped);
 
   for (std::vector<std::string>::const_iterator it = this->Sources.begin();
        it != this->Sources.end(); ++it) {
     const std::string& absFilename = *it;
-    const bool skipUic = std::find(uicSkipped.begin(), uicSkipped.end(),
-                                   absFilename) != uicSkipped.end();
+    const bool skipUic = std::find(this->SkipUic.begin(), this->SkipUic.end(),
+                                   absFilename) != this->SkipUic.end();
     std::map<std::string, std::vector<std::string> >& uiFiles =
       skipUic ? skippedUis : includedUis;
     if (this->Verbose) {
@@ -532,21 +532,17 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
     this->SearchHeadersForCppFile(absFilename, headerExtensions, headerFiles);
   }
 
-  {
-    std::vector<std::string> mocSkipped;
-    cmSystemTools::ExpandListArgument(this->SkipMoc, mocSkipped);
-    for (std::vector<std::string>::const_iterator it = mocSkipped.begin();
-         it != mocSkipped.end(); ++it) {
-      if (std::find(uicSkipped.begin(), uicSkipped.end(), *it) !=
-          uicSkipped.end()) {
-        const std::string& absFilename = *it;
-        if (this->Verbose) {
-          std::ostringstream err;
-          err << "AUTOGEN: Checking " << absFilename << std::endl;
-          this->LogInfo(err.str());
-        }
-        this->ParseForUic(absFilename, includedUis);
+  for (std::vector<std::string>::const_iterator it = this->SkipMoc.begin();
+       it != this->SkipMoc.end(); ++it) {
+    if (std::find(this->SkipUic.begin(), this->SkipUic.end(), *it) !=
+        this->SkipUic.end()) {
+      const std::string& absFilename = *it;
+      if (this->Verbose) {
+        std::ostringstream err;
+        err << "AUTOGEN: Checking " << absFilename << std::endl;
+        this->LogInfo(err.str());
       }
+      this->ParseForUic(absFilename, includedUis);
     }
   }
 
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index bffdee2..f86e7c3 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -119,7 +119,7 @@ private:
   std::vector<std::string> Sources;
   std::vector<std::string> Headers;
   // - Moc
-  std::string SkipMoc;
+  std::vector<std::string> SkipMoc;
   std::string MocCompileDefinitionsStr;
   std::string MocIncludesStr;
   std::string MocOptionsStr;
@@ -129,7 +129,7 @@ private:
   std::list<std::string> MocDefinitions;
   std::vector<std::string> MocOptions;
   // - Uic
-  std::string SkipUic;
+  std::vector<std::string> SkipUic;
   std::vector<std::string> UicTargetOptions;
   std::map<std::string, std::string> UicOptions;
   // - Rcc

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d51cc88e844c78c01c1616e6a2fb102c0682dd00
commit d51cc88e844c78c01c1616e6a2fb102c0682dd00
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Tue Dec 27 19:03:14 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:14 2017 +0100

    AUTOGEN: Generators: Split config headers/sources into vector

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index f2f1505..5a370fe 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -221,8 +221,10 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(
   this->RccExecutable = makefile->GetSafeDefinition("AM_QT_RCC_EXECUTABLE");
 
   // - File Lists
-  this->Sources = makefile->GetSafeDefinition("AM_SOURCES");
-  this->Headers = makefile->GetSafeDefinition("AM_HEADERS");
+  cmSystemTools::ExpandListArgument(makefile->GetSafeDefinition("AM_SOURCES"),
+                                    this->Sources);
+  cmSystemTools::ExpandListArgument(makefile->GetSafeDefinition("AM_HEADERS"),
+                                    this->Headers);
 
   // - Moc
   this->SkipMoc = makefile->GetSafeDefinition("AM_SKIP_MOC");
@@ -501,9 +503,6 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
   // collect all headers which may need to be mocced
   std::set<std::string> headerFiles;
 
-  std::vector<std::string> sourceFiles;
-  cmSystemTools::ExpandListArgument(this->Sources, sourceFiles);
-
   const std::vector<std::string>& headerExtensions =
     makefile->GetCMakeInstance()->GetHeaderExtensions();
 
@@ -512,13 +511,13 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
   std::vector<std::string> uicSkipped;
   cmSystemTools::ExpandListArgument(this->SkipUic, uicSkipped);
 
-  for (std::vector<std::string>::const_iterator it = sourceFiles.begin();
-       it != sourceFiles.end(); ++it) {
-    const bool skipUic =
-      std::find(uicSkipped.begin(), uicSkipped.end(), *it) != uicSkipped.end();
+  for (std::vector<std::string>::const_iterator it = this->Sources.begin();
+       it != this->Sources.end(); ++it) {
+    const std::string& absFilename = *it;
+    const bool skipUic = std::find(uicSkipped.begin(), uicSkipped.end(),
+                                   absFilename) != uicSkipped.end();
     std::map<std::string, std::vector<std::string> >& uiFiles =
       skipUic ? skippedUis : includedUis;
-    const std::string& absFilename = *it;
     if (this->Verbose) {
       std::ostringstream err;
       err << "AUTOGEN: Checking " << absFilename << std::endl;
@@ -551,9 +550,7 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
     }
   }
 
-  std::vector<std::string> headerFilesVec;
-  cmSystemTools::ExpandListArgument(this->Headers, headerFilesVec);
-  headerFiles.insert(headerFilesVec.begin(), headerFilesVec.end());
+  headerFiles.insert(this->Headers.begin(), this->Headers.end());
 
   // key = moc source filepath, value = moc output filename
   std::map<std::string, std::string> notIncludedMocs;
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index c6fe3b6..bffdee2 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -116,8 +116,8 @@ private:
   std::string UicExecutable;
   std::string RccExecutable;
   // - File lists
-  std::string Sources;
-  std::string Headers;
+  std::vector<std::string> Sources;
+  std::vector<std::string> Headers;
   // - Moc
   std::string SkipMoc;
   std::string MocCompileDefinitionsStr;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf1d5a9cdba49a2e9f08879d756ae118b22bfc6a
commit cf1d5a9cdba49a2e9f08879d756ae118b22bfc6a
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Tue Dec 27 18:55:51 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:14 2017 +0100

    AUTOGEN: Generators: Rename ParseForUic method

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 561e566..f2f1505 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -597,7 +597,7 @@ bool cmQtAutoGenerators::ParseSourceFile(
   }
 
   // Parse source contents for UIC
-  this->ParseForUic(absFilename, contentsString, includedUis);
+  this->ParseContentForUic(absFilename, contentsString, includedUis);
 
   // Continue with moc parsing on demand
   if (this->MocExecutable.empty()) {
@@ -816,10 +816,10 @@ void cmQtAutoGenerators::ParseForUic(
     this->LogWarning(err.str());
     return;
   }
-  this->ParseForUic(absFilename, contentsString, includedUis);
+  this->ParseContentForUic(absFilename, contentsString, includedUis);
 }
 
-void cmQtAutoGenerators::ParseForUic(
+void cmQtAutoGenerators::ParseContentForUic(
   const std::string& absFilename, const std::string& contentsString,
   std::map<std::string, std::vector<std::string> >& includedUis)
 {
@@ -898,7 +898,7 @@ void cmQtAutoGenerators::ParseHeaders(
           ".cpp";
       }
     }
-    this->ParseForUic(headerName, contents, includedUis);
+    this->ParseContentForUic(headerName, contents, includedUis);
   }
 }
 
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index b6bca8a..c6fe3b6 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -68,7 +68,7 @@ private:
 
   bool requiresMocing(const std::string& text, std::string& macroName);
 
-  void ParseForUic(
+  void ParseContentForUic(
     const std::string& fileName, const std::string& contentsString,
     std::map<std::string, std::vector<std::string> >& includedUis);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f962275987e17cf94da663a919f52b6d0c8f44f4
commit f962275987e17cf94da663a919f52b6d0c8f44f4
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Tue Dec 27 18:37:30 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:14 2017 +0100

    AUTOGEN: Generators: Group static function definitions

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 6a7f828..561e566 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -80,6 +80,15 @@ static bool FileNameIsUnique(const std::string& filePath,
   return true;
 }
 
+static std::string ReadAll(const std::string& filename)
+{
+  cmsys::ifstream file(filename.c_str());
+  std::ostringstream stream;
+  stream << file.rdbuf();
+  file.close();
+  return stream.str();
+}
+
 cmQtAutoGenerators::cmQtAutoGenerators()
   : Verbose(cmsys::SystemTools::HasEnv("VERBOSE"))
   , ColorOutput(true)
@@ -472,15 +481,6 @@ void cmQtAutoGenerators::Init()
   }
 }
 
-static std::string ReadAll(const std::string& filename)
-{
-  cmsys::ifstream file(filename.c_str());
-  std::ostringstream stream;
-  stream << file.rdbuf();
-  file.close();
-  return stream.str();
-}
-
 bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
 {
   // If settings changed everything needs to be re-generated.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c736c41ad192c89e1c74751a8f401c75955f5f3b
commit c736c41ad192c89e1c74751a8f401c75955f5f3b
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Tue Dec 27 14:52:49 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:14 2017 +0100

    AUTOGEN: Generators: Use precompiled regular expressions

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 8439f2a..6a7f828 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -6,7 +6,6 @@
 #include <assert.h>
 #include <cmConfigure.h>
 #include <cmsys/FStream.hxx>
-#include <cmsys/RegularExpression.hxx>
 #include <cmsys/Terminal.h>
 #include <iostream>
 #include <sstream>
@@ -28,27 +27,6 @@
 #include <unistd.h>
 #endif
 
-static bool requiresMocing(const std::string& text, std::string& macroName)
-{
-  // this simple check is much much faster than the regexp
-  if (strstr(text.c_str(), "Q_OBJECT") == CM_NULLPTR &&
-      strstr(text.c_str(), "Q_GADGET") == CM_NULLPTR) {
-    return false;
-  }
-
-  cmsys::RegularExpression qObjectRegExp("[\n][ \t]*Q_OBJECT[^a-zA-Z0-9_]");
-  if (qObjectRegExp.find(text)) {
-    macroName = "Q_OBJECT";
-    return true;
-  }
-  cmsys::RegularExpression qGadgetRegExp("[\n][ \t]*Q_GADGET[^a-zA-Z0-9_]");
-  if (qGadgetRegExp.find(text)) {
-    macroName = "Q_GADGET";
-    return true;
-  }
-  return false;
-}
-
 static std::string findMatchingHeader(
   const std::string& absPath, const std::string& mocSubDir,
   const std::string& basename,
@@ -120,6 +98,15 @@ cmQtAutoGenerators::cmQtAutoGenerators()
       this->ColorOutput = false;
     }
   }
+
+  // Precompile regular expressions
+  this->RegExpQObject.compile("[\n][ \t]*Q_OBJECT[^a-zA-Z0-9_]");
+  this->RegExpQGadget.compile("[\n][ \t]*Q_GADGET[^a-zA-Z0-9_]");
+  this->RegExpMocInclude.compile(
+    "[\n][ \t]*#[ \t]*include[ \t]+"
+    "[\"<](([^ \">]+/)?moc_[^ \">/]+\\.cpp|[^ \">]+\\.moc)[\">]");
+  this->RegExpUicInclude.compile("[\n][ \t]*#[ \t]*include[ \t]+"
+                                 "[\"<](([^ \">]+/)?ui_[^ \">/]+\\.h)[\">]");
 }
 
 void cmQtAutoGenerators::MergeUicOptions(
@@ -600,10 +587,6 @@ bool cmQtAutoGenerators::ParseSourceFile(
   std::map<std::string, std::string>& includedMocs,
   std::map<std::string, std::vector<std::string> >& includedUis, bool relaxed)
 {
-  cmsys::RegularExpression mocIncludeRegExp(
-    "[\n][ \t]*#[ \t]*include[ \t]+"
-    "[\"<](([^ \">]+/)?moc_[^ \">/]+\\.cpp|[^ \">]+\\.moc)[\">]");
-
   const std::string contentsString = ReadAll(absFilename);
   if (contentsString.empty()) {
     std::ostringstream err;
@@ -629,7 +612,7 @@ bool cmQtAutoGenerators::ParseSourceFile(
     cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename);
 
   std::string macroName;
-  const bool requiresMoc = requiresMocing(contentsString, macroName);
+  const bool requiresMoc = this->requiresMocing(contentsString, macroName);
   bool ownDotMocIncluded = false;
   bool ownMocUnderscoreIncluded = false;
   std::string ownMocUnderscoreFile;
@@ -642,8 +625,8 @@ bool cmQtAutoGenerators::ParseSourceFile(
   if (strstr(contentsString.c_str(), "moc") != CM_NULLPTR) {
     // Iterate over all included moc files
     const char* contentChars = contentsString.c_str();
-    while (mocIncludeRegExp.find(contentChars)) {
-      const std::string currentMoc = mocIncludeRegExp.match(1);
+    while (this->RegExpMocInclude.find(contentChars)) {
+      const std::string currentMoc = this->RegExpMocInclude.match(1);
       // Basename of the current moc include
       std::string basename =
         cmsys::SystemTools::GetFilenameWithoutLastExtension(currentMoc);
@@ -758,7 +741,7 @@ bool cmQtAutoGenerators::ParseSourceFile(
         }
       }
       // Forward content pointer
-      contentChars += mocIncludeRegExp.end();
+      contentChars += this->RegExpMocInclude.end();
     }
   }
 
@@ -799,6 +782,25 @@ bool cmQtAutoGenerators::ParseSourceFile(
   return true;
 }
 
+bool cmQtAutoGenerators::requiresMocing(const std::string& text,
+                                        std::string& macroName)
+{
+  // Run a simple check before an expensive regular expression check
+  if (strstr(text.c_str(), "Q_OBJECT") != CM_NULLPTR) {
+    if (this->RegExpQObject.find(text)) {
+      macroName = "Q_OBJECT";
+      return true;
+    }
+  }
+  if (strstr(text.c_str(), "Q_GADGET") != CM_NULLPTR) {
+    if (this->RegExpQGadget.find(text)) {
+      macroName = "Q_GADGET";
+      return true;
+    }
+  }
+  return false;
+}
+
 void cmQtAutoGenerators::ParseForUic(
   const std::string& absFilename,
   std::map<std::string, std::vector<std::string> >& includedUis)
@@ -825,20 +827,16 @@ void cmQtAutoGenerators::ParseForUic(
     return;
   }
   const std::string realName = cmsys::SystemTools::GetRealPath(absFilename);
-  cmsys::RegularExpression uiIncludeRegExp(
-    "[\n][ \t]*#[ \t]*include[ \t]+"
-    "[\"<](([^ \">]+/)?ui_[^ \">/]+\\.h)[\">]");
-
   const char* contentChars = contentsString.c_str();
   if (strstr(contentChars, "ui_") != CM_NULLPTR) {
-    while (uiIncludeRegExp.find(contentChars)) {
-      const std::string currentUi = uiIncludeRegExp.match(1);
+    while (this->RegExpUicInclude.find(contentChars)) {
+      const std::string currentUi = this->RegExpUicInclude.match(1);
       const std::string basename =
         cmsys::SystemTools::GetFilenameWithoutLastExtension(currentUi);
       // basename should be the part of the ui filename used for
       // finding the correct header, so we need to remove the ui_ part
       includedUis[realName].push_back(basename.substr(3));
-      contentChars += uiIncludeRegExp.end();
+      contentChars += this->RegExpUicInclude.end();
     }
   }
 }
@@ -893,7 +891,7 @@ void cmQtAutoGenerators::ParseHeaders(
       }
 
       std::string macroName;
-      if (requiresMocing(contents, macroName)) {
+      if (this->requiresMocing(contents, macroName)) {
         notIncludedMocs[headerName] = fpathCheckSum.getPart(headerName) +
           "/moc_" +
           cmsys::SystemTools::GetFilenameWithoutLastExtension(headerName) +
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 08f98b5..b6bca8a 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -5,6 +5,7 @@
 
 #include <cmConfigure.h> // IWYU pragma: keep
 #include <cmFilePathChecksum.h>
+#include <cmsys/RegularExpression.hxx>
 
 #include <list>
 #include <map>
@@ -65,6 +66,8 @@ private:
     std::map<std::string, std::string>& notIncludedMocs,
     std::map<std::string, std::vector<std::string> >& includedUis);
 
+  bool requiresMocing(const std::string& text, std::string& macroName);
+
   void ParseForUic(
     const std::string& fileName, const std::string& contentsString,
     std::map<std::string, std::vector<std::string> >& includedUis);
@@ -138,6 +141,10 @@ private:
   std::string OldCompileSettingsStr;
   // - Utility
   cmFilePathChecksum fpathCheckSum;
+  cmsys::RegularExpression RegExpQObject;
+  cmsys::RegularExpression RegExpQGadget;
+  cmsys::RegularExpression RegExpMocInclude;
+  cmsys::RegularExpression RegExpUicInclude;
   // - Flags
   bool IncludeProjectDirsBefore;
   bool Verbose;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbd650c2642e40369eaa53d20dafee6cdccae4af
commit cbd650c2642e40369eaa53d20dafee6cdccae4af
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Tue Dec 27 14:26:56 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:14 2017 +0100

    AUTOGEN: Generators: Use unified ParseSourceFile and drop old methods

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 41bb6f9..8439f2a 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -537,17 +537,12 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
       err << "AUTOGEN: Checking " << absFilename << std::endl;
       this->LogInfo(err.str());
     }
-    if (this->MocRelaxedMode) {
-      if (!this->ParseCppFile(absFilename, headerExtensions, includedMocs,
-                              uiFiles)) {
-        return false;
-      }
-    } else {
-      if (!this->StrictParseCppFile(absFilename, headerExtensions,
-                                    includedMocs, uiFiles)) {
-        return false;
-      }
+    // Parse source file for MOC/UIC
+    if (!this->ParseSourceFile(absFilename, headerExtensions, includedMocs,
+                               uiFiles, this->MocRelaxedMode)) {
+      return false;
     }
+    // Find additional headers
     this->SearchHeadersForCppFile(absFilename, headerExtensions, headerFiles);
   }
 
@@ -599,311 +594,6 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
 /**
  * @return True on success
  */
-bool cmQtAutoGenerators::ParseCppFile(
-  const std::string& absFilename,
-  const std::vector<std::string>& headerExtensions,
-  std::map<std::string, std::string>& includedMocs,
-  std::map<std::string, std::vector<std::string> >& includedUis)
-{
-  cmsys::RegularExpression mocIncludeRegExp(
-    "[\n][ \t]*#[ \t]*include[ \t]+"
-    "[\"<](([^ \">]+/)?moc_[^ \">/]+\\.cpp|[^ \">]+\\.moc)[\">]");
-
-  const std::string contentsString = ReadAll(absFilename);
-  if (contentsString.empty()) {
-    std::ostringstream err;
-    err << "AUTOGEN: warning: " << absFilename << ": file is empty\n"
-        << std::endl;
-    this->LogWarning(err.str());
-    return true;
-  }
-  this->ParseForUic(absFilename, contentsString, includedUis);
-  if (this->MocExecutable.empty()) {
-    return true;
-  }
-
-  const std::string absPath = cmsys::SystemTools::GetFilenamePath(
-                                cmsys::SystemTools::GetRealPath(absFilename)) +
-    '/';
-  const std::string scannedFileBasename =
-    cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename);
-  std::string macroName;
-  const bool requiresMoc = requiresMocing(contentsString, macroName);
-  bool dotMocIncluded = false;
-  bool mocUnderscoreIncluded = false;
-  std::string ownMocUnderscoreFile;
-  std::string ownDotMocFile;
-  std::string ownMocHeaderFile;
-
-  std::string::size_type matchOffset = 0;
-  // first a simple string check for "moc" is *much* faster than the regexp,
-  // and if the string search already fails, we don't have to try the
-  // expensive regexp
-  if ((strstr(contentsString.c_str(), "moc") != CM_NULLPTR) &&
-      (mocIncludeRegExp.find(contentsString))) {
-    // for every moc include in the file
-    do {
-      const std::string currentMoc = mocIncludeRegExp.match(1);
-
-      std::string basename =
-        cmsys::SystemTools::GetFilenameWithoutLastExtension(currentMoc);
-      const bool mocUnderscoreStyle = cmHasLiteralPrefix(basename, "moc_");
-
-      // If the moc include is of the moc_foo.cpp style we expect
-      // the Q_OBJECT class declaration in a header file.
-      // If the moc include is of the foo.moc style we need to look for
-      // a Q_OBJECT macro in the current source file, if it contains the
-      // macro we generate the moc file from the source file.
-      if (mocUnderscoreStyle) {
-        // basename should be the part of the moc filename used for
-        // finding the correct header, so we need to remove the moc_ part
-        basename = basename.substr(4);
-        std::string mocSubDir = extractSubDir(absPath, currentMoc);
-        std::string headerToMoc =
-          findMatchingHeader(absPath, mocSubDir, basename, headerExtensions);
-
-        if (!headerToMoc.empty()) {
-          includedMocs[headerToMoc] = currentMoc;
-          if (basename == scannedFileBasename) {
-            mocUnderscoreIncluded = true;
-            ownMocUnderscoreFile = currentMoc;
-            ownMocHeaderFile = headerToMoc;
-          }
-        } else {
-          std::ostringstream err;
-          err << "AUTOGEN: error: " << absFilename << ": The file "
-              << "includes the moc file \"" << currentMoc << "\", "
-              << "but could not find header \"" << basename << '{'
-              << this->JoinExts(headerExtensions) << "}\" ";
-          if (mocSubDir.empty()) {
-            err << "in " << absPath << "\n" << std::endl;
-          } else {
-            err << "neither in " << absPath << " nor in " << mocSubDir << "\n"
-                << std::endl;
-          }
-          this->LogError(err.str());
-          return false;
-        }
-      } else {
-        std::string fileToMoc = absFilename;
-        if (!requiresMoc || basename != scannedFileBasename) {
-          std::string mocSubDir = extractSubDir(absPath, currentMoc);
-          std::string headerToMoc =
-            findMatchingHeader(absPath, mocSubDir, basename, headerExtensions);
-          if (!headerToMoc.empty()) {
-            // this is for KDE4 compatibility:
-            fileToMoc = headerToMoc;
-            if (!requiresMoc && basename == scannedFileBasename) {
-              std::ostringstream err;
-              err << "AUTOGEN: warning: " << absFilename
-                  << ": The file "
-                     "includes the moc file \""
-                  << currentMoc << "\", but does not contain a " << macroName
-                  << " macro. Running moc on "
-                  << "\"" << headerToMoc << "\" ! Include \"moc_" << basename
-                  << ".cpp\" for a compatibility with "
-                     "strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n"
-                  << std::endl;
-              this->LogWarning(err.str());
-            } else {
-              std::ostringstream err;
-              err << "AUTOGEN: warning: " << absFilename
-                  << ": The file "
-                     "includes the moc file \""
-                  << currentMoc << "\" instead of \"moc_" << basename
-                  << ".cpp\". "
-                     "Running moc on "
-                  << "\"" << headerToMoc << "\" ! Include \"moc_" << basename
-                  << ".cpp\" for compatibility with "
-                     "strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n"
-                  << std::endl;
-              this->LogWarning(err.str());
-            }
-          } else {
-            std::ostringstream err;
-            err << "AUTOGEN: error: " << absFilename
-                << ": The file "
-                   "includes the moc file \""
-                << currentMoc
-                << "\", which seems to be the moc file from a different "
-                   "source file. CMake also could not find a matching "
-                   "header.\n"
-                << std::endl;
-            this->LogError(err.str());
-            return false;
-          }
-        } else {
-          dotMocIncluded = true;
-          ownDotMocFile = currentMoc;
-        }
-        includedMocs[fileToMoc] = currentMoc;
-      }
-      matchOffset += mocIncludeRegExp.end();
-    } while (mocIncludeRegExp.find(contentsString.c_str() + matchOffset));
-  }
-
-  // In this case, check whether the scanned file itself contains a Q_OBJECT.
-  // If this is the case, the moc_foo.cpp should probably be generated from
-  // foo.cpp instead of foo.h, because otherwise it won't build.
-  // But warn, since this is not how it is supposed to be used.
-  if (!dotMocIncluded && requiresMoc) {
-    if (mocUnderscoreIncluded) {
-      // this is for KDE4 compatibility:
-      std::ostringstream err;
-      err << "AUTOGEN: warning: " << absFilename << ": The file "
-          << "contains a " << macroName << " macro, but does not "
-                                           "include "
-          << "\"" << scannedFileBasename << ".moc\", but instead "
-                                            "includes "
-          << "\"" << ownMocUnderscoreFile << "\". Running moc on "
-          << "\"" << absFilename << "\" ! Better include \""
-          << scannedFileBasename
-          << ".moc\" for compatibility with "
-             "strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n"
-          << std::endl;
-      this->LogWarning(err.str());
-
-      includedMocs[absFilename] = ownMocUnderscoreFile;
-      includedMocs.erase(ownMocHeaderFile);
-    } else {
-      // otherwise always error out since it will not compile:
-      std::ostringstream err;
-      err << "AUTOGEN: error: " << absFilename << ": The file "
-          << "contains a " << macroName << " macro, but does not "
-                                           "include "
-          << "\"" << scannedFileBasename << ".moc\" !\n"
-          << std::endl;
-      this->LogError(err.str());
-      return false;
-    }
-  }
-
-  return true;
-}
-
-/**
- * @return True on success
- */
-bool cmQtAutoGenerators::StrictParseCppFile(
-  const std::string& absFilename,
-  const std::vector<std::string>& headerExtensions,
-  std::map<std::string, std::string>& includedMocs,
-  std::map<std::string, std::vector<std::string> >& includedUis)
-{
-  cmsys::RegularExpression mocIncludeRegExp(
-    "[\n][ \t]*#[ \t]*include[ \t]+"
-    "[\"<](([^ \">]+/)?moc_[^ \">/]+\\.cpp|[^ \">]+\\.moc)[\">]");
-
-  const std::string contentsString = ReadAll(absFilename);
-  if (contentsString.empty()) {
-    std::ostringstream err;
-    err << "AUTOGEN: warning: " << absFilename << ": file is empty\n"
-        << std::endl;
-    this->LogWarning(err.str());
-    return true;
-  }
-  this->ParseForUic(absFilename, contentsString, includedUis);
-  if (this->MocExecutable.empty()) {
-    return true;
-  }
-
-  const std::string absPath = cmsys::SystemTools::GetFilenamePath(
-                                cmsys::SystemTools::GetRealPath(absFilename)) +
-    '/';
-  const std::string scannedFileBasename =
-    cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename);
-
-  bool dotMocIncluded = false;
-
-  std::string::size_type matchOffset = 0;
-  // first a simple string check for "moc" is *much* faster than the regexp,
-  // and if the string search already fails, we don't have to try the
-  // expensive regexp
-  if ((strstr(contentsString.c_str(), "moc") != CM_NULLPTR) &&
-      (mocIncludeRegExp.find(contentsString))) {
-    // for every moc include in the file
-    do {
-      const std::string currentMoc = mocIncludeRegExp.match(1);
-
-      std::string basename =
-        cmsys::SystemTools::GetFilenameWithoutLastExtension(currentMoc);
-      const bool mocUnderscoreStyle = cmHasLiteralPrefix(basename, "moc_");
-
-      // If the moc include is of the moc_foo.cpp style we expect
-      // the Q_OBJECT class declaration in a header file.
-      // If the moc include is of the foo.moc style we need to look for
-      // a Q_OBJECT macro in the current source file, if it contains the
-      // macro we generate the moc file from the source file.
-      if (mocUnderscoreStyle) {
-        // basename should be the part of the moc filename used for
-        // finding the correct header, so we need to remove the moc_ part
-        basename = basename.substr(4);
-        std::string mocSubDir = extractSubDir(absPath, currentMoc);
-        std::string headerToMoc =
-          findMatchingHeader(absPath, mocSubDir, basename, headerExtensions);
-
-        if (!headerToMoc.empty()) {
-          includedMocs[headerToMoc] = currentMoc;
-        } else {
-          std::ostringstream err;
-          err << "AUTOGEN: error: " << absFilename << " The file "
-              << "includes the moc file \"" << currentMoc << "\", "
-              << "but could not find header \"" << basename << '{'
-              << this->JoinExts(headerExtensions) << "}\" ";
-          if (mocSubDir.empty()) {
-            err << "in " << absPath << "\n" << std::endl;
-          } else {
-            err << "neither in " << absPath << " nor in " << mocSubDir << "\n"
-                << std::endl;
-          }
-          this->LogError(err.str());
-          return false;
-        }
-      } else {
-        if (basename != scannedFileBasename) {
-          std::ostringstream err;
-          err << "AUTOGEN: error: " << absFilename
-              << ": The file "
-                 "includes the moc file \""
-              << currentMoc
-              << "\", which seems to be the moc file from a different "
-                 "source file. This is not supported. "
-                 "Include \""
-              << scannedFileBasename << ".moc\" to run "
-                                        "moc on this source file.\n"
-              << std::endl;
-          this->LogError(err.str());
-          return false;
-        }
-        dotMocIncluded = true;
-        includedMocs[absFilename] = currentMoc;
-      }
-      matchOffset += mocIncludeRegExp.end();
-    } while (mocIncludeRegExp.find(contentsString.c_str() + matchOffset));
-  }
-
-  // In this case, check whether the scanned file itself contains a Q_OBJECT.
-  // If this is the case, the moc_foo.cpp should probably be generated from
-  // foo.cpp instead of foo.h, because otherwise it won't build.
-  // But warn, since this is not how it is supposed to be used.
-  std::string macroName;
-  if (!dotMocIncluded && requiresMocing(contentsString, macroName)) {
-    // otherwise always error out since it will not compile:
-    std::ostringstream err;
-    err << "AUTOGEN: error: " << absFilename << ": The file "
-        << "contains a " << macroName << " macro, but does not include "
-        << "\"" << scannedFileBasename << ".moc\" !\n"
-        << std::endl;
-    this->LogError(err.str());
-    return false;
-  }
-
-  return true;
-}
-
-/**
- * @return True on success
- */
 bool cmQtAutoGenerators::ParseSourceFile(
   const std::string& absFilename,
   const std::vector<std::string>& headerExtensions,
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index f6fbed3..08f98b5 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -48,16 +48,6 @@ private:
   bool GenerateQrc(const std::string& qrcInputFile,
                    const std::string& qrcOutputFile, bool unique_n);
 
-  bool ParseCppFile(
-    const std::string& absFilename,
-    const std::vector<std::string>& headerExtensions,
-    std::map<std::string, std::string>& includedMocs,
-    std::map<std::string, std::vector<std::string> >& includedUis);
-  bool StrictParseCppFile(
-    const std::string& absFilename,
-    const std::vector<std::string>& headerExtensions,
-    std::map<std::string, std::string>& includedMocs,
-    std::map<std::string, std::vector<std::string> >& includedUis);
   bool ParseSourceFile(
     const std::string& absFilename,
     const std::vector<std::string>& headerExtensions,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b1527ff3d1781380756ee72a9641b7c5c7c87cc
commit 0b1527ff3d1781380756ee72a9641b7c5c7c87cc
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Tue Dec 27 14:16:10 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:13 2017 +0100

    AUTOGEN: Generators: Introduce unified ParseSourceFile
    
    The new cmQtAutoGenerators::ParseSourceFile method combines the
    functionality of ParseCppFile and StrictParseCppFile in a single method
    to avoid code duplication. Relaxed or strict mode is selected by an
    additional bool argument.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index a0949d4..41bb6f9 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -901,6 +901,214 @@ bool cmQtAutoGenerators::StrictParseCppFile(
   return true;
 }
 
+/**
+ * @return True on success
+ */
+bool cmQtAutoGenerators::ParseSourceFile(
+  const std::string& absFilename,
+  const std::vector<std::string>& headerExtensions,
+  std::map<std::string, std::string>& includedMocs,
+  std::map<std::string, std::vector<std::string> >& includedUis, bool relaxed)
+{
+  cmsys::RegularExpression mocIncludeRegExp(
+    "[\n][ \t]*#[ \t]*include[ \t]+"
+    "[\"<](([^ \">]+/)?moc_[^ \">/]+\\.cpp|[^ \">]+\\.moc)[\">]");
+
+  const std::string contentsString = ReadAll(absFilename);
+  if (contentsString.empty()) {
+    std::ostringstream err;
+    err << "AUTOGEN: warning: " << absFilename << "\n"
+        << "The file is empty\n";
+    this->LogWarning(err.str());
+    return true;
+  }
+
+  // Parse source contents for UIC
+  this->ParseForUic(absFilename, contentsString, includedUis);
+
+  // Continue with moc parsing on demand
+  if (this->MocExecutable.empty()) {
+    return true;
+  }
+
+  const std::string scannedFileAbsPath =
+    cmsys::SystemTools::GetFilenamePath(
+      cmsys::SystemTools::GetRealPath(absFilename)) +
+    '/';
+  const std::string scannedFileBasename =
+    cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename);
+
+  std::string macroName;
+  const bool requiresMoc = requiresMocing(contentsString, macroName);
+  bool ownDotMocIncluded = false;
+  bool ownMocUnderscoreIncluded = false;
+  std::string ownMocUnderscoreFile;
+  std::string ownMocHeaderFile;
+
+  std::string::size_type matchOffset = 0;
+  // first a simple string check for "moc" is *much* faster than the regexp,
+  // and if the string search already fails, we don't have to try the
+  // expensive regexp
+  if (strstr(contentsString.c_str(), "moc") != CM_NULLPTR) {
+    // Iterate over all included moc files
+    const char* contentChars = contentsString.c_str();
+    while (mocIncludeRegExp.find(contentChars)) {
+      const std::string currentMoc = mocIncludeRegExp.match(1);
+      // Basename of the current moc include
+      std::string basename =
+        cmsys::SystemTools::GetFilenameWithoutLastExtension(currentMoc);
+
+      // If the moc include is of the moc_foo.cpp style we expect
+      // the Q_OBJECT class declaration in a header file.
+      // If the moc include is of the foo.moc style we need to look for
+      // a Q_OBJECT macro in the current source file, if it contains the
+      // macro we generate the moc file from the source file.
+      if (cmHasLiteralPrefix(basename, "moc_")) {
+        // Include: moc_FOO.cxx
+        // basename should be the part of the moc filename used for
+        // finding the correct header, so we need to remove the moc_ part
+        basename = basename.substr(4);
+        const std::string mocSubDir =
+          extractSubDir(scannedFileAbsPath, currentMoc);
+        const std::string headerToMoc = findMatchingHeader(
+          scannedFileAbsPath, mocSubDir, basename, headerExtensions);
+
+        if (!headerToMoc.empty()) {
+          includedMocs[headerToMoc] = currentMoc;
+          if (relaxed && (basename == scannedFileBasename)) {
+            ownMocUnderscoreIncluded = true;
+            ownMocUnderscoreFile = currentMoc;
+            ownMocHeaderFile = headerToMoc;
+          }
+        } else {
+          std::ostringstream err;
+          err << "AUTOGEN: error: " << absFilename << "\n"
+              << "The file includes the moc file \"" << currentMoc
+              << "\", but could not find header \"" << basename << '{'
+              << this->JoinExts(headerExtensions) << "}\" ";
+          if (mocSubDir.empty()) {
+            err << "in " << scannedFileAbsPath << "\n";
+          } else {
+            err << "neither in " << scannedFileAbsPath << " nor in "
+                << mocSubDir << "\n";
+          }
+          this->LogError(err.str());
+          return false;
+        }
+      } else {
+        // Include: FOO.moc
+        std::string fileToMoc;
+        if (relaxed) {
+          // Mode: Relaxed
+          if (!requiresMoc || basename != scannedFileBasename) {
+            const std::string mocSubDir =
+              extractSubDir(scannedFileAbsPath, currentMoc);
+            const std::string headerToMoc = findMatchingHeader(
+              scannedFileAbsPath, mocSubDir, basename, headerExtensions);
+            if (!headerToMoc.empty()) {
+              // This is for KDE4 compatibility:
+              fileToMoc = headerToMoc;
+              if (!requiresMoc && basename == scannedFileBasename) {
+                std::ostringstream err;
+                err << "AUTOMOC: warning: " << absFilename << "\n"
+                    << "The file includes the moc file \"" << currentMoc
+                    << "\", but does not contain a " << macroName
+                    << " macro. Running moc on "
+                    << "\"" << headerToMoc << "\" ! Include \"moc_" << basename
+                    << ".cpp\" for a compatibility with "
+                       "strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n";
+                this->LogWarning(err.str());
+              } else {
+                std::ostringstream err;
+                err << "AUTOMOC: warning: " << absFilename << "\n"
+                    << "The file includes the moc file \"" << currentMoc
+                    << "\" instead of \"moc_" << basename
+                    << ".cpp\". Running moc on "
+                    << "\"" << headerToMoc << "\" ! Include \"moc_" << basename
+                    << ".cpp\" for compatibility with "
+                       "strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n";
+                this->LogWarning(err.str());
+              }
+            } else {
+              std::ostringstream err;
+              err << "AUTOMOC: error: " << absFilename << "\n"
+                  << "The file includes the moc file \"" << currentMoc
+                  << "\", which seems to be the moc file from a different "
+                     "source file. CMake also could not find a matching "
+                     "header.\n";
+              this->LogError(err.str());
+              return false;
+            }
+          } else {
+            // Include self
+            fileToMoc = absFilename;
+            ownDotMocIncluded = true;
+          }
+        } else {
+          // Mode: Strict
+          if (basename != scannedFileBasename) {
+            // Don't allow FOO.moc include other than self in strict mode
+            std::ostringstream err;
+            err << "AUTOMOC: error: " << absFilename << "\n"
+                << "The file includes the moc file \"" << currentMoc
+                << "\", which seems to be the moc file from a different "
+                   "source file. This is not supported. Include \""
+                << scannedFileBasename
+                << ".moc\" to run moc on this source file.\n";
+            this->LogError(err.str());
+            return false;
+          } else {
+            // Include self
+            fileToMoc = absFilename;
+            ownDotMocIncluded = true;
+          }
+        }
+        if (!fileToMoc.empty()) {
+          includedMocs[fileToMoc] = currentMoc;
+        }
+      }
+      // Forward content pointer
+      contentChars += mocIncludeRegExp.end();
+    }
+  }
+
+  // In this case, check whether the scanned file itself contains a Q_OBJECT.
+  // If this is the case, the moc_foo.cpp should probably be generated from
+  // foo.cpp instead of foo.h, because otherwise it won't build.
+  // But warn, since this is not how it is supposed to be used.
+  if (requiresMoc && !ownDotMocIncluded) {
+    if (relaxed && ownMocUnderscoreIncluded) {
+      // This is for KDE4 compatibility:
+      std::ostringstream err;
+      err << "AUTOMOC: warning: " << absFilename << "\n"
+          << "The file contains a " << macroName
+          << " macro, but does not include "
+          << "\"" << scannedFileBasename << ".moc\", but instead includes "
+          << "\"" << ownMocUnderscoreFile << "\". Running moc on "
+          << "\"" << absFilename << "\" ! Better include \""
+          << scannedFileBasename
+          << ".moc\" for compatibility with "
+             "strict mode (see CMAKE_AUTOMOC_RELAXED_MODE).\n";
+      this->LogWarning(err.str());
+
+      // Use scanned source file instead of scanned header file as moc source
+      includedMocs[absFilename] = ownMocUnderscoreFile;
+      includedMocs.erase(ownMocHeaderFile);
+    } else {
+      // Otherwise always error out since it will not compile:
+      std::ostringstream err;
+      err << "AUTOMOC: error: " << absFilename << "\n"
+          << "The file contains a " << macroName
+          << " macro, but does not include "
+          << "\"" << scannedFileBasename << ".moc\" !\n";
+      this->LogError(err.str());
+      return false;
+    }
+  }
+
+  return true;
+}
+
 void cmQtAutoGenerators::ParseForUic(
   const std::string& absFilename,
   std::map<std::string, std::vector<std::string> >& includedUis)
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 24960a5..f6fbed3 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -58,6 +58,12 @@ private:
     const std::vector<std::string>& headerExtensions,
     std::map<std::string, std::string>& includedMocs,
     std::map<std::string, std::vector<std::string> >& includedUis);
+  bool ParseSourceFile(
+    const std::string& absFilename,
+    const std::vector<std::string>& headerExtensions,
+    std::map<std::string, std::string>& includedMocs,
+    std::map<std::string, std::vector<std::string> >& includedUis,
+    bool relaxed);
   void SearchHeadersForCppFile(
     const std::string& absFilename,
     const std::vector<std::string>& headerExtensions,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b9d795e63acf723a6abd79f3195ec70476442a5
commit 2b9d795e63acf723a6abd79f3195ec70476442a5
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Tue Dec 27 10:54:54 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:13 2017 +0100

    AUTOGEN: Generators: Comments

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 6543ac6..a0949d4 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -62,6 +62,7 @@ static std::string findMatchingHeader(
       header = sourceFilePath;
       break;
     }
+    // Try subdirectory instead
     if (!mocSubDir.empty()) {
       sourceFilePath = mocSubDir + basename + "." + (*ext);
       if (cmsys::SystemTools::FileExists(sourceFilePath.c_str())) {
@@ -653,7 +654,6 @@ bool cmQtAutoGenerators::ParseCppFile(
       // If the moc include is of the foo.moc style we need to look for
       // a Q_OBJECT macro in the current source file, if it contains the
       // macro we generate the moc file from the source file.
-      // Q_OBJECT
       if (mocUnderscoreStyle) {
         // basename should be the part of the moc filename used for
         // finding the correct header, so we need to remove the moc_ part

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cfcdf757d032cdea8b980792007a6f9d749e6fb
commit 2cfcdf757d032cdea8b980792007a6f9d749e6fb
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Tue Dec 27 10:51:14 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:13 2017 +0100

    AUTOGEN: Generators: Variable rename

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 1ada434..6543ac6 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -646,7 +646,7 @@ bool cmQtAutoGenerators::ParseCppFile(
 
       std::string basename =
         cmsys::SystemTools::GetFilenameWithoutLastExtension(currentMoc);
-      const bool moc_style = cmHasLiteralPrefix(basename, "moc_");
+      const bool mocUnderscoreStyle = cmHasLiteralPrefix(basename, "moc_");
 
       // If the moc include is of the moc_foo.cpp style we expect
       // the Q_OBJECT class declaration in a header file.
@@ -654,7 +654,7 @@ bool cmQtAutoGenerators::ParseCppFile(
       // a Q_OBJECT macro in the current source file, if it contains the
       // macro we generate the moc file from the source file.
       // Q_OBJECT
-      if (moc_style) {
+      if (mocUnderscoreStyle) {
         // basename should be the part of the moc filename used for
         // finding the correct header, so we need to remove the moc_ part
         basename = basename.substr(4);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f67aef23d4192fadb222dc79311fb5ffbbc36ce
commit 2f67aef23d4192fadb222dc79311fb5ffbbc36ce
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Sat Dec 24 16:28:01 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:13 2017 +0100

    AUTOGEN: Generators: Cleanup and optimize ParseForUic method

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 01cc1b3..1ada434 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -931,23 +931,17 @@ void cmQtAutoGenerators::ParseForUic(
     "[\n][ \t]*#[ \t]*include[ \t]+"
     "[\"<](([^ \">]+/)?ui_[^ \">/]+\\.h)[\">]");
 
-  std::string::size_type matchOffset = 0;
-  if ((strstr(contentsString.c_str(), "ui_") != CM_NULLPTR) &&
-      (uiIncludeRegExp.find(contentsString))) {
-    do {
+  const char* contentChars = contentsString.c_str();
+  if (strstr(contentChars, "ui_") != CM_NULLPTR) {
+    while (uiIncludeRegExp.find(contentChars)) {
       const std::string currentUi = uiIncludeRegExp.match(1);
-
-      std::string basename =
+      const std::string basename =
         cmsys::SystemTools::GetFilenameWithoutLastExtension(currentUi);
-
       // basename should be the part of the ui filename used for
       // finding the correct header, so we need to remove the ui_ part
-      basename = basename.substr(3);
-
-      includedUis[realName].push_back(basename);
-
-      matchOffset += uiIncludeRegExp.end();
-    } while (uiIncludeRegExp.find(contentsString.c_str() + matchOffset));
+      includedUis[realName].push_back(basename.substr(3));
+      contentChars += uiIncludeRegExp.end();
+    }
   }
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=794fdf40a1bc85dded519d7c737f73690e3a6e42
commit 794fdf40a1bc85dded519d7c737f73690e3a6e42
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Sat Dec 24 16:00:09 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:13 2017 +0100

    AUTOGEN: Generators: Cleanup variable initialization

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 98b3de3..01cc1b3 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -926,15 +926,12 @@ void cmQtAutoGenerators::ParseForUic(
   if (this->UicExecutable.empty()) {
     return;
   }
+  const std::string realName = cmsys::SystemTools::GetRealPath(absFilename);
   cmsys::RegularExpression uiIncludeRegExp(
     "[\n][ \t]*#[ \t]*include[ \t]+"
     "[\"<](([^ \">]+/)?ui_[^ \">/]+\\.h)[\">]");
 
   std::string::size_type matchOffset = 0;
-
-  const std::string realName = cmsys::SystemTools::GetRealPath(absFilename);
-
-  matchOffset = 0;
   if ((strstr(contentsString.c_str(), "ui_") != CM_NULLPTR) &&
       (uiIncludeRegExp.find(contentsString))) {
     do {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1e49bb155132606ed9f590c0b62e68f2e288d0b
commit a1e49bb155132606ed9f590c0b62e68f2e288d0b
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Sat Dec 24 17:36:56 2016 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jan 10 12:49:13 2017 +0100

    AUTOGEN: Generators: rename makeParentDirectory to MakeParentDirectory

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index a9a9c49..98b3de3 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1113,7 +1113,7 @@ bool cmQtAutoGenerators::GenerateMocFiles(
     this->LogBold(msg);
   }
   // Make sure the parent directory exists
-  bool success = this->makeParentDirectory(this->OutMocCppFilenameAbs);
+  bool success = this->MakeParentDirectory(this->OutMocCppFilenameAbs);
   if (success) {
     cmsys::ofstream outfile;
     outfile.open(this->OutMocCppFilenameAbs.c_str(), std::ios::trunc);
@@ -1154,7 +1154,7 @@ bool cmQtAutoGenerators::GenerateMoc(const std::string& sourceFile,
     this->LogBold("Generating MOC source " + mocFileRel);
 
     // Make sure the parent directory exists
-    if (!this->makeParentDirectory(mocFileAbs)) {
+    if (!this->MakeParentDirectory(mocFileAbs)) {
       this->RunMocFailed = true;
       return false;
     }
@@ -1276,7 +1276,7 @@ bool cmQtAutoGenerators::GenerateUi(const std::string& realName,
     this->LogBold("Generating UIC header " + uicFileRel);
 
     // Make sure the parent directory exists
-    if (!this->makeParentDirectory(uicFileAbs)) {
+    if (!this->MakeParentDirectory(uicFileAbs)) {
       this->RunUicFailed = true;
       return false;
     }
@@ -1415,7 +1415,7 @@ bool cmQtAutoGenerators::GenerateQrc(const std::string& qrcInputFile,
     }
 
     // Make sure the parent directory exists
-    if (!this->makeParentDirectory(qrcOutputFile)) {
+    if (!this->MakeParentDirectory(qrcOutputFile)) {
       this->RunRccFailed = true;
       return false;
     }
@@ -1551,7 +1551,7 @@ void cmQtAutoGenerators::LogCommand(const std::vector<std::string>& command)
  * @brief Generates the parent directory of the given file on demand
  * @return True on success
  */
-bool cmQtAutoGenerators::makeParentDirectory(const std::string& filename)
+bool cmQtAutoGenerators::MakeParentDirectory(const std::string& filename)
 {
   bool success = true;
   const std::string dirName = cmSystemTools::GetFilenamePath(filename);
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index c241579..24960a5 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -91,7 +91,7 @@ private:
   void LogError(const std::string& message);
   void LogCommand(const std::vector<std::string>& command);
 
-  bool makeParentDirectory(const std::string& filename);
+  bool MakeParentDirectory(const std::string& filename);
 
   std::string JoinExts(const std::vector<std::string>& lst);
 

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

Summary of changes:
 Help/manual/cmake-properties.7.rst           |    4 +
 Help/manual/cmake-qt.7.rst                   |    9 +
 Help/prop_sf/SKIP_AUTOGEN.rst                |    8 +
 Help/prop_sf/SKIP_AUTOMOC.rst                |    6 +
 Help/prop_sf/SKIP_AUTORCC.rst                |    6 +
 Help/prop_sf/SKIP_AUTOUIC.rst                |    6 +
 Help/prop_tgt/AUTOMOC.rst                    |    3 +
 Help/prop_tgt/AUTORCC.rst                    |    3 +
 Help/prop_tgt/AUTOUIC.rst                    |    3 +
 Help/release/dev/QtAutogen_Skip.rst          |   12 +
 Modules/AutogenInfo.cmake.in                 |    8 +-
 Source/cmQtAutoGeneratorInitializer.cxx      |  102 ++--
 Source/cmQtAutoGenerators.cxx                |  741 ++++++++++++--------------
 Source/cmQtAutoGenerators.h                  |   46 +-
 Tests/QtAutogen/CMakeLists.txt               |   63 +++
 Tests/QtAutogen/skipMoc.cpp                  |   14 +
 Tests/QtAutogen/skipRcc.cpp                  |    9 +
 Tests/QtAutogen/skipSource/qItemA.cpp        |    5 +
 Tests/QtAutogen/skipSource/qItemA.hpp        |   13 +
 Tests/QtAutogen/skipSource/qItemB.cpp        |    5 +
 Tests/QtAutogen/skipSource/qItemB.hpp        |   13 +
 Tests/QtAutogen/skipSource/qItemC.cpp        |    5 +
 Tests/QtAutogen/skipSource/qItemC.hpp        |   13 +
 Tests/QtAutogen/skipSource/skipRccBad1.qrc   |    5 +
 Tests/QtAutogen/skipSource/skipRccBad2.qrc   |    5 +
 Tests/QtAutogen/skipSource/skipRccGood.qrc   |    6 +
 Tests/QtAutogen/skipSource/skipUicGen.cpp    |    7 +
 Tests/QtAutogen/skipSource/skipUicGen.hpp    |    8 +
 Tests/QtAutogen/skipSource/skipUicNoGen1.cpp |    7 +
 Tests/QtAutogen/skipSource/skipUicNoGen1.hpp |    8 +
 Tests/QtAutogen/skipSource/skipUicNoGen2.cpp |    7 +
 Tests/QtAutogen/skipSource/skipUicNoGen2.hpp |    8 +
 Tests/QtAutogen/skipSource/ui_nogen1.h       |    6 +
 Tests/QtAutogen/skipSource/ui_nogen2.h       |    6 +
 Tests/QtAutogen/skipSource/uigen1.ui         |   24 +
 Tests/QtAutogen/skipSource/uigen2.ui         |   24 +
 Tests/QtAutogen/skipUic.cpp                  |   22 +
 37 files changed, 782 insertions(+), 458 deletions(-)
 create mode 100644 Help/prop_sf/SKIP_AUTOGEN.rst
 create mode 100644 Help/prop_sf/SKIP_AUTOMOC.rst
 create mode 100644 Help/prop_sf/SKIP_AUTORCC.rst
 create mode 100644 Help/prop_sf/SKIP_AUTOUIC.rst
 create mode 100644 Help/release/dev/QtAutogen_Skip.rst
 create mode 100644 Tests/QtAutogen/skipMoc.cpp
 create mode 100644 Tests/QtAutogen/skipRcc.cpp
 create mode 100644 Tests/QtAutogen/skipSource/qItemA.cpp
 create mode 100644 Tests/QtAutogen/skipSource/qItemA.hpp
 create mode 100644 Tests/QtAutogen/skipSource/qItemB.cpp
 create mode 100644 Tests/QtAutogen/skipSource/qItemB.hpp
 create mode 100644 Tests/QtAutogen/skipSource/qItemC.cpp
 create mode 100644 Tests/QtAutogen/skipSource/qItemC.hpp
 create mode 100644 Tests/QtAutogen/skipSource/skipRccBad1.qrc
 create mode 100644 Tests/QtAutogen/skipSource/skipRccBad2.qrc
 create mode 100644 Tests/QtAutogen/skipSource/skipRccGood.qrc
 create mode 100644 Tests/QtAutogen/skipSource/skipUicGen.cpp
 create mode 100644 Tests/QtAutogen/skipSource/skipUicGen.hpp
 create mode 100644 Tests/QtAutogen/skipSource/skipUicNoGen1.cpp
 create mode 100644 Tests/QtAutogen/skipSource/skipUicNoGen1.hpp
 create mode 100644 Tests/QtAutogen/skipSource/skipUicNoGen2.cpp
 create mode 100644 Tests/QtAutogen/skipSource/skipUicNoGen2.hpp
 create mode 100644 Tests/QtAutogen/skipSource/ui_nogen1.h
 create mode 100644 Tests/QtAutogen/skipSource/ui_nogen2.h
 create mode 100644 Tests/QtAutogen/skipSource/uigen1.ui
 create mode 100644 Tests/QtAutogen/skipSource/uigen2.ui
 create mode 100644 Tests/QtAutogen/skipUic.cpp


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 15:37:15 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 15:37:15 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2028-g19e5a8a
Message-ID: <20170110203716.27B1BFA75E@public.kitware.com>

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  19e5a8a29816e5f9a61b53a444a127b87c55c12e (commit)
       via  e537bd91129fc1616f787b64024f1b08d0f7ae45 (commit)
       via  0a2e588585a951b1f26cfa9094e0709f1d026b1e (commit)
       via  cdacfbd255dcf640be7dd4971a1be616d015b3fd (commit)
       via  cf590c1236e40eaff9fe76ec918fad33df4f6be4 (commit)
      from  25b5e76e15b3b5fe6e0aacd5345ecd1f3d360e5b (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=19e5a8a29816e5f9a61b53a444a127b87c55c12e
commit 19e5a8a29816e5f9a61b53a444a127b87c55c12e
Merge: 25b5e76 e537bd9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 15:37:11 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 15:37:11 2017 -0500

    Merge topic 'ctest_memcheck-leak_sanitizer' into next
    
    e537bd91 ctest_memcheck: do not add detect_leaks=1 to ASAN_OPTIONS
    0a2e5885 ctest_memcheck: join *SAN_OPTIONS with :
    cdacfbd2 MEMORYCHECK_SUPPRESSIONS_FILE: add support for sanitizers
    cf590c12 ctest_memcheck: add support for standalone LeakSanitizer


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e537bd91129fc1616f787b64024f1b08d0f7ae45
commit e537bd91129fc1616f787b64024f1b08d0f7ae45
Author:     Jamie Snape <jamie.snape at kitware.com>
AuthorDate: Mon Jan 9 13:43:19 2017 -0500
Commit:     Jamie Snape <jamie.snape at kitware.com>
CommitDate: Mon Jan 9 13:43:19 2017 -0500

    ctest_memcheck: do not add detect_leaks=1 to ASAN_OPTIONS

diff --git a/Help/release/dev/ctest_memcheck-leak_sanitizer.rst b/Help/release/dev/ctest_memcheck-leak_sanitizer.rst
index 60b4a22..3fa5c49 100644
--- a/Help/release/dev/ctest_memcheck-leak_sanitizer.rst
+++ b/Help/release/dev/ctest_memcheck-leak_sanitizer.rst
@@ -4,6 +4,11 @@ ctest_memcheck-leak_sanitizer
 * The :command:`ctest_memcheck` command learned to support ``LeakSanitizer``
   independently from ``AddressSanitizer``.
 
+* The :command:`ctest_memcheck` command no longer automatically adds
+  ``leak_check=1`` to the options used by ``AddressSanitizer``. The default
+  behavior of ``AddressSanitizer`` is to run `LeakSanitizer` to check leaks
+  unless ``leak_check=0``.
+
 * The :command:`ctest_memcheck` command learned to read the location of
   suppressions files for sanitizers from the
   :variable:`CTEST_MEMORYCHECK_SUPPRESSIONS_FILE` variable.
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index fc07249..4d23e45 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -618,7 +618,6 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       if (this->MemoryTesterStyle ==
           cmCTestMemCheckHandler::ADDRESS_SANITIZER) {
         envVar = "ASAN_OPTIONS";
-        extraOptions += ":detect_leaks=1";
       } else if (this->MemoryTesterStyle ==
                  cmCTestMemCheckHandler::LEAK_SANITIZER) {
         envVar = "LSAN_OPTIONS";

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a2e588585a951b1f26cfa9094e0709f1d026b1e
commit 0a2e588585a951b1f26cfa9094e0709f1d026b1e
Author:     Jamie Snape <jamie.snape at kitware.com>
AuthorDate: Mon Jan 9 13:39:08 2017 -0500
Commit:     Jamie Snape <jamie.snape at kitware.com>
CommitDate: Mon Jan 9 13:39:08 2017 -0500

    ctest_memcheck: join *SAN_OPTIONS with :

diff --git a/Help/release/dev/ctest_memcheck-leak_sanitizer.rst b/Help/release/dev/ctest_memcheck-leak_sanitizer.rst
index 1348c278a..60b4a22 100644
--- a/Help/release/dev/ctest_memcheck-leak_sanitizer.rst
+++ b/Help/release/dev/ctest_memcheck-leak_sanitizer.rst
@@ -7,3 +7,8 @@ ctest_memcheck-leak_sanitizer
 * The :command:`ctest_memcheck` command learned to read the location of
   suppressions files for sanitizers from the
   :variable:`CTEST_MEMORYCHECK_SUPPRESSIONS_FILE` variable.
+
+* The :command:`ctest_memcheck` command was fixed to correctly append extra
+  sanitizer options read from the
+  :variable:`CTEST_MEMORYCHECK_SANITIZER_OPTIONS` variable to the environment
+  variables used internally by the sanitizers.
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 81b73aa..fc07249 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -607,18 +607,18 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       this->MemoryTesterDynamicOptions.push_back("-E");
       this->MemoryTesterDynamicOptions.push_back("env");
       std::string envVar;
-      std::string extraOptions =
+      std::string extraOptions = ":" +
         this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
       std::string suppressionsOption;
       if (!this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile")
              .empty()) {
-        suppressionsOption = " suppressions=" +
+        suppressionsOption = ":suppressions=" +
           this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile");
       }
       if (this->MemoryTesterStyle ==
           cmCTestMemCheckHandler::ADDRESS_SANITIZER) {
         envVar = "ASAN_OPTIONS";
-        extraOptions += " detect_leaks=1";
+        extraOptions += ":detect_leaks=1";
       } else if (this->MemoryTesterStyle ==
                  cmCTestMemCheckHandler::LEAK_SANITIZER) {
         envVar = "LSAN_OPTIONS";
@@ -633,7 +633,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
         envVar = "UBSAN_OPTIONS";
       }
       std::string outputFile =
-        envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\" ";
+        envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\"";
       this->MemoryTesterEnvironmentVariable =
         outputFile + extraOptions + suppressionsOption;
       break;
diff --git a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
index 25bb6a2..352a381 100644
--- a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
@@ -32,7 +32,7 @@ unset(CTEST_EXTRA_CODE)
 #-----------------------------------------------------------------------------
 # add standalone LeakSanitizer test
 set(CTEST_EXTRA_CODE
-"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1 report_bugs=1 history_size=5 exitcode=55\")
+"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1:report_bugs=1:history_size=5:exitcode=55\")
 ")
 set(CMAKELISTS_EXTRA_CODE
 "add_test(NAME TestSan COMMAND \"${CMAKE_COMMAND}\"
@@ -45,7 +45,7 @@ unset(CTEST_EXTRA_CODE)
 #-----------------------------------------------------------------------------
 # add AddressSanitizer test
 set(CTEST_EXTRA_CODE
-"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1 report_bugs=1 history_size=5 exitcode=55\")
+"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1:report_bugs=1:history_size=5:exitcode=55\")
 ")
 set(CMAKELISTS_EXTRA_CODE
 "add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\"
@@ -58,7 +58,7 @@ unset(CTEST_EXTRA_CODE)
 #-----------------------------------------------------------------------------
 # add AddressSanitizer/LeakSanitizer test
 set(CTEST_EXTRA_CODE
-"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1 report_bugs=1 history_size=5 exitcode=55\")
+"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1:report_bugs=1:history_size=5:exitcode=55\")
 ")
 set(CMAKELISTS_EXTRA_CODE
 "add_test(NAME TestSan COMMAND \"${CMAKE_COMMAND}\"
@@ -71,7 +71,7 @@ unset(CTEST_EXTRA_CODE)
 #-----------------------------------------------------------------------------
 # add MemorySanitizer test
 set(CTEST_EXTRA_CODE
-"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"simulate_sanitizer=1 report_bugs=1 history_size=5 exitcode=55\")
+"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"simulate_sanitizer=1:report_bugs=1:history_size=5:exitcode=55\")
 ")
 set(CMAKELISTS_EXTRA_CODE
 "add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\"
@@ -164,7 +164,7 @@ unset(CTEST_SUFFIX_CODE)
 set(CTEST_SUFFIX_CODE "message(\"Defect count: \${defect_count}\")")
 set(CTEST_MEMCHECK_ARGS "DEFECT_COUNT defect_count")
 set(CTEST_EXTRA_CODE
-"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1 report_bugs=1 history_size=5 exitcode=55\")
+"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1:report_bugs=1:history_size=5:exitcode=55\")
 ")
 set(CMAKELISTS_EXTRA_CODE
 "add_test(NAME TestSan COMMAND \"${CMAKE_COMMAND}\"

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cdacfbd255dcf640be7dd4971a1be616d015b3fd
commit cdacfbd255dcf640be7dd4971a1be616d015b3fd
Author:     Jamie Snape <jamie.snape at kitware.com>
AuthorDate: Mon Jan 9 13:39:06 2017 -0500
Commit:     Jamie Snape <jamie.snape at kitware.com>
CommitDate: Mon Jan 9 13:39:06 2017 -0500

    MEMORYCHECK_SUPPRESSIONS_FILE: add support for sanitizers

diff --git a/Help/release/dev/ctest_memcheck-leak_sanitizer.rst b/Help/release/dev/ctest_memcheck-leak_sanitizer.rst
index 0150da3..1348c278a 100644
--- a/Help/release/dev/ctest_memcheck-leak_sanitizer.rst
+++ b/Help/release/dev/ctest_memcheck-leak_sanitizer.rst
@@ -3,3 +3,7 @@ ctest_memcheck-leak_sanitizer
 
 * The :command:`ctest_memcheck` command learned to support ``LeakSanitizer``
   independently from ``AddressSanitizer``.
+
+* The :command:`ctest_memcheck` command learned to read the location of
+  suppressions files for sanitizers from the
+  :variable:`CTEST_MEMORYCHECK_SUPPRESSIONS_FILE` variable.
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 5dec355..81b73aa 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -609,6 +609,12 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       std::string envVar;
       std::string extraOptions =
         this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
+      std::string suppressionsOption;
+      if (!this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile")
+             .empty()) {
+        suppressionsOption = " suppressions=" +
+          this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile");
+      }
       if (this->MemoryTesterStyle ==
           cmCTestMemCheckHandler::ADDRESS_SANITIZER) {
         envVar = "ASAN_OPTIONS";
@@ -628,7 +634,8 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       }
       std::string outputFile =
         envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\" ";
-      this->MemoryTesterEnvironmentVariable = outputFile + extraOptions;
+      this->MemoryTesterEnvironmentVariable =
+        outputFile + extraOptions + suppressionsOption;
       break;
     }
     default:

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf590c1236e40eaff9fe76ec918fad33df4f6be4
commit cf590c1236e40eaff9fe76ec918fad33df4f6be4
Author:     Jamie Snape <jamie.snape at kitware.com>
AuthorDate: Mon Jan 9 13:15:42 2017 -0500
Commit:     Jamie Snape <jamie.snape at kitware.com>
CommitDate: Mon Jan 9 13:15:42 2017 -0500

    ctest_memcheck: add support for standalone LeakSanitizer

diff --git a/Help/release/dev/ctest_memcheck-leak_sanitizer.rst b/Help/release/dev/ctest_memcheck-leak_sanitizer.rst
new file mode 100644
index 0000000..0150da3
--- /dev/null
+++ b/Help/release/dev/ctest_memcheck-leak_sanitizer.rst
@@ -0,0 +1,5 @@
+ctest_memcheck-leak_sanitizer
+=============================
+
+* The :command:`ctest_memcheck` command learned to support ``LeakSanitizer``
+  independently from ``AddressSanitizer``.
diff --git a/Help/variable/CTEST_MEMORYCHECK_TYPE.rst b/Help/variable/CTEST_MEMORYCHECK_TYPE.rst
index b963293..b8b4c30 100644
--- a/Help/variable/CTEST_MEMORYCHECK_TYPE.rst
+++ b/Help/variable/CTEST_MEMORYCHECK_TYPE.rst
@@ -4,5 +4,5 @@ CTEST_MEMORYCHECK_TYPE
 Specify the CTest ``MemoryCheckType`` setting
 in a :manual:`ctest(1)` dashboard client script.
 Valid values are ``Valgrind``, ``Purify``, ``BoundsChecker``, and
-``ThreadSanitizer``, ``AddressSanitizer``, ``MemorySanitizer``, and
+``ThreadSanitizer``, ``AddressSanitizer``, ``LeakSanitizer``, ``MemorySanitizer``, and
 ``UndefinedBehaviorSanitizer``.
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 2c31f60..5dec355 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -305,6 +305,9 @@ void cmCTestMemCheckHandler::GenerateDartOutput(cmXMLWriter& xml)
     case cmCTestMemCheckHandler::ADDRESS_SANITIZER:
       xml.Attribute("Checker", "AddressSanitizer");
       break;
+    case cmCTestMemCheckHandler::LEAK_SANITIZER:
+      xml.Attribute("Checker", "LeakSanitizer");
+      break;
     case cmCTestMemCheckHandler::THREAD_SANITIZER:
       xml.Attribute("Checker", "ThreadSanitizer");
       break;
@@ -459,6 +462,12 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
     this->LogWithPID = true; // even if we give the log file the pid is added
   }
   if (this->CTest->GetCTestConfiguration("MemoryCheckType") ==
+      "LeakSanitizer") {
+    this->MemoryTester = this->CTest->GetCTestConfiguration("CMakeCommand");
+    this->MemoryTesterStyle = cmCTestMemCheckHandler::LEAK_SANITIZER;
+    this->LogWithPID = true; // even if we give the log file the pid is added
+  }
+  if (this->CTest->GetCTestConfiguration("MemoryCheckType") ==
       "ThreadSanitizer") {
     this->MemoryTester = this->CTest->GetCTestConfiguration("CMakeCommand");
     this->MemoryTesterStyle = cmCTestMemCheckHandler::THREAD_SANITIZER;
@@ -586,6 +595,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
     }
     // these are almost the same but the env var used is different
     case cmCTestMemCheckHandler::ADDRESS_SANITIZER:
+    case cmCTestMemCheckHandler::LEAK_SANITIZER:
     case cmCTestMemCheckHandler::THREAD_SANITIZER:
     case cmCTestMemCheckHandler::MEMORY_SANITIZER:
     case cmCTestMemCheckHandler::UB_SANITIZER: {
@@ -604,6 +614,9 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
         envVar = "ASAN_OPTIONS";
         extraOptions += " detect_leaks=1";
       } else if (this->MemoryTesterStyle ==
+                 cmCTestMemCheckHandler::LEAK_SANITIZER) {
+        envVar = "LSAN_OPTIONS";
+      } else if (this->MemoryTesterStyle ==
                  cmCTestMemCheckHandler::THREAD_SANITIZER) {
         envVar = "TSAN_OPTIONS";
       } else if (this->MemoryTesterStyle ==
@@ -644,6 +657,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckOutput(const std::string& str,
     case cmCTestMemCheckHandler::PURIFY:
       return this->ProcessMemCheckPurifyOutput(str, log, results);
     case cmCTestMemCheckHandler::ADDRESS_SANITIZER:
+    case cmCTestMemCheckHandler::LEAK_SANITIZER:
     case cmCTestMemCheckHandler::THREAD_SANITIZER:
     case cmCTestMemCheckHandler::MEMORY_SANITIZER:
     case cmCTestMemCheckHandler::UB_SANITIZER:
@@ -680,6 +694,9 @@ bool cmCTestMemCheckHandler::ProcessMemCheckSanitizerOutput(
     case cmCTestMemCheckHandler::ADDRESS_SANITIZER:
       regex = "ERROR: AddressSanitizer: (.*) on.*";
       break;
+    case cmCTestMemCheckHandler::LEAK_SANITIZER:
+      // use leakWarning regex
+      break;
     case cmCTestMemCheckHandler::THREAD_SANITIZER:
       regex = "WARNING: ThreadSanitizer: (.*) \\(pid=.*\\)";
       break;
diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h
index 5faace0..ff8b593 100644
--- a/Source/CTest/cmCTestMemCheckHandler.h
+++ b/Source/CTest/cmCTestMemCheckHandler.h
@@ -47,6 +47,7 @@ private:
     BOUNDS_CHECKER,
     // checkers after here do not use the standard error list
     ADDRESS_SANITIZER,
+    LEAK_SANITIZER,
     THREAD_SANITIZER,
     MEMORY_SANITIZER,
     UB_SANITIZER
diff --git a/Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-result.txt b/Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-result.txt
new file mode 100644
index 0000000..b57e2de
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-result.txt
@@ -0,0 +1 @@
+(-1|255)
diff --git a/Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-stderr.txt
new file mode 100644
index 0000000..327bd5c
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-stderr.txt
@@ -0,0 +1 @@
+Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
diff --git a/Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-stdout.txt
new file mode 100644
index 0000000..97a8a9b
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-stdout.txt
@@ -0,0 +1,3 @@
+Memory checking results:
+Direct leak - 2
+Indirect leak - 1
diff --git a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
index 212bfdb..25bb6a2 100644
--- a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
@@ -30,7 +30,7 @@ unset(CMAKELISTS_EXTRA_CODE)
 unset(CTEST_EXTRA_CODE)
 
 #-----------------------------------------------------------------------------
-# add LeakSanitizer test
+# add standalone LeakSanitizer test
 set(CTEST_EXTRA_CODE
 "set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1 report_bugs=1 history_size=5 exitcode=55\")
 ")
@@ -38,7 +38,7 @@ set(CMAKELISTS_EXTRA_CODE
 "add_test(NAME TestSan COMMAND \"${CMAKE_COMMAND}\"
 -P \"${RunCMake_SOURCE_DIR}/testLeakSanitizer.cmake\")
 ")
-run_mc_test(DummyLeakSanitizer "" -DMEMCHECK_TYPE=AddressSanitizer)
+run_mc_test(DummyLeakSanitizer "" -DMEMCHECK_TYPE=LeakSanitizer)
 unset(CMAKELISTS_EXTRA_CODE)
 unset(CTEST_EXTRA_CODE)
 
@@ -56,6 +56,19 @@ unset(CMAKELISTS_EXTRA_CODE)
 unset(CTEST_EXTRA_CODE)
 
 #-----------------------------------------------------------------------------
+# add AddressSanitizer/LeakSanitizer test
+set(CTEST_EXTRA_CODE
+"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1 report_bugs=1 history_size=5 exitcode=55\")
+")
+set(CMAKELISTS_EXTRA_CODE
+"add_test(NAME TestSan COMMAND \"${CMAKE_COMMAND}\"
+-P \"${RunCMake_SOURCE_DIR}/testAddressLeakSanitizer.cmake\")
+")
+run_mc_test(DummyAddressLeakSanitizer "" -DMEMCHECK_TYPE=AddressSanitizer)
+unset(CMAKELISTS_EXTRA_CODE)
+unset(CTEST_EXTRA_CODE)
+
+#-----------------------------------------------------------------------------
 # add MemorySanitizer test
 set(CTEST_EXTRA_CODE
 "set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"simulate_sanitizer=1 report_bugs=1 history_size=5 exitcode=55\")
@@ -157,7 +170,7 @@ set(CMAKELISTS_EXTRA_CODE
 "add_test(NAME TestSan COMMAND \"${CMAKE_COMMAND}\"
 -P \"${RunCMake_SOURCE_DIR}/testLeakSanitizer.cmake\")
 ")
-run_mc_test(DummyLeakSanitizerPrintDefects "" -DMEMCHECK_TYPE=AddressSanitizer)
+run_mc_test(DummyLeakSanitizerPrintDefects "" -DMEMCHECK_TYPE=LeakSanitizer)
 unset(CMAKELISTS_EXTRA_CODE)
 unset(CTEST_EXTRA_CODE)
 unset(CTEST_MEMCHECK_ARGS)
diff --git a/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake
similarity index 87%
copy from Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
copy to Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake
index 02030be..2a57b11 100644
--- a/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake
@@ -1,20 +1,20 @@
-# this file simulates a program that has been built with thread sanitizer
+# this file simulates a program that has been built with AddressSanitizer
 # options
 
 message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]")
 string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
-# if we are not asked to simulate leak sanitizer don't do it
+
+# if we are not asked to simulate AddressSanitizer don't do it
 if(NOT "$ENV{ASAN_OPTIONS}]" MATCHES "simulate_sanitizer.1")
   return()
 endif()
 
-# clear the log file
+# clear the log files
 file(REMOVE "${LOG_FILE}.2343")
 file(REMOVE "${LOG_FILE}.2344")
 
-# create an error of each type of thread santizer
-# these names come from tsan_report.cc in llvm
+# create an error of each type of LeakSanitizer
 
 file(APPEND "${LOG_FILE}.2343"
 "=================================================================
diff --git a/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
index 02030be..af214c8 100644
--- a/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
@@ -1,20 +1,20 @@
-# this file simulates a program that has been built with thread sanitizer
+# this file simulates a program that has been built with LeakSanitizer
 # options
 
-message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}")
+message("LSAN_OPTIONS = [$ENV{LSAN_OPTIONS}]")
+string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{LSAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
-# if we are not asked to simulate leak sanitizer don't do it
-if(NOT "$ENV{ASAN_OPTIONS}]" MATCHES "simulate_sanitizer.1")
+
+# if we are not asked to simulate LeakSanitizer don't do it
+if(NOT "$ENV{LSAN_OPTIONS}]" MATCHES "simulate_sanitizer.1")
   return()
 endif()
 
-# clear the log file
+# clear the log files
 file(REMOVE "${LOG_FILE}.2343")
 file(REMOVE "${LOG_FILE}.2344")
 
-# create an error of each type of thread santizer
-# these names come from tsan_report.cc in llvm
+# create an error of each type of LeakSanitizer
 
 file(APPEND "${LOG_FILE}.2343"
 "=================================================================
@@ -25,7 +25,7 @@ Direct leak of 4360 byte(s) in 1 object(s) allocated from:
     #1 0x4823b4 in main /home/kitware/msan/memcheck.cxx:12
     #2 0x7fa72bee476c in __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226
 
-SUMMARY: AddressSanitizer: 4436 byte(s) leaked in 2 allocation(s).
+SUMMARY: LeakSanitizer: 4436 byte(s) leaked in 2 allocation(s).
 ")
 file(APPEND "${LOG_FILE}.2342"
 "=================================================================
@@ -43,5 +43,5 @@ Indirect leak of 76 byte(s) in 1 object(s) allocated from:
     #2 0x4823f2 in main /home/kitware/msan/memcheck.cxx:14
     #3 0x7fa72bee476c in __libc_start_main /build/buildd/eglibc-2.15/csu/libc-start.c:226
 
-SUMMARY: AddressSanitizer: 4436 byte(s) leaked in 2 allocation(s).
+SUMMARY: LeakSanitizer: 4436 byte(s) leaked in 2 allocation(s).
 ")

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

Summary of changes:
 Help/release/dev/ctest_memcheck-leak_sanitizer.rst |   19 ++++++++++++
 Help/variable/CTEST_MEMORYCHECK_TYPE.rst           |    2 +-
 Source/CTest/cmCTestMemCheckHandler.cxx            |   31 +++++++++++++++++---
 Source/CTest/cmCTestMemCheckHandler.h              |    1 +
 .../DummyAddressLeakSanitizer-result.txt}          |    0
 .../DummyAddressLeakSanitizer-stderr.txt           |    1 +
 ...ut.txt => DummyAddressLeakSanitizer-stdout.txt} |    0
 Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake   |   27 ++++++++++++-----
 ...itizer.cmake => testAddressLeakSanitizer.cmake} |   10 +++----
 .../ctest_memcheck/testLeakSanitizer.cmake         |   20 ++++++-------
 10 files changed, 84 insertions(+), 27 deletions(-)
 create mode 100644 Help/release/dev/ctest_memcheck-leak_sanitizer.rst
 copy Tests/RunCMake/{ctest_build/BuildFailure-result.txt => ctest_memcheck/DummyAddressLeakSanitizer-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-stderr.txt
 copy Tests/RunCMake/ctest_memcheck/{DummyLeakSanitizer-stdout.txt => DummyAddressLeakSanitizer-stdout.txt} (100%)
 copy Tests/RunCMake/ctest_memcheck/{testLeakSanitizer.cmake => testAddressLeakSanitizer.cmake} (87%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 10 16:47:51 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Jan 2017 16:47:51 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2030-g55f86ce
Message-ID: <20170110214751.72103FA10D@public.kitware.com>

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  55f86ceb1f2e5e925a678e9decf181141bb301dc (commit)
       via  ff1602f864a282a7eece0dce6612e33a6a37b265 (commit)
      from  19e5a8a29816e5f9a61b53a444a127b87c55c12e (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=55f86ceb1f2e5e925a678e9decf181141bb301dc
commit 55f86ceb1f2e5e925a678e9decf181141bb301dc
Merge: 19e5a8a ff1602f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 16:47:50 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 16:47:50 2017 -0500

    Merge topic 'vs15-detect-from-installer' into next
    
    ff1602f8 VS: Port Visual Studio Setup third-party header to older VS versions


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff1602f864a282a7eece0dce6612e33a6a37b265
commit ff1602f864a282a7eece0dce6612e33a6a37b265
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 16:45:12 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 16:47:13 2017 -0500

    VS: Port Visual Studio Setup third-party header to older VS versions

diff --git a/Utilities/cmvssetup/Setup.Configuration.h b/Utilities/cmvssetup/Setup.Configuration.h
index cc01d27..36b8747 100644
--- a/Utilities/cmvssetup/Setup.Configuration.h
+++ b/Utilities/cmvssetup/Setup.Configuration.h
@@ -23,6 +23,16 @@
 
 #if defined(_WIN32) && !defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
 
+#ifndef _Outptr_result_maybenull_
+#define _Outptr_result_maybenull_
+#endif
+#ifndef _Out_writes_to_
+#define _Out_writes_to_(x,y)
+#endif
+#ifndef _Reserved_
+#define _Reserved_
+#endif
+
 // Enumerations
 //
 /// <summary>

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

Summary of changes:
 Utilities/cmvssetup/Setup.Configuration.h |   10 ++++++++++
 1 file changed, 10 insertions(+)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Wed Jan 11 00:01:08 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Wed, 11 Jan 2017 00:01:08 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-958-g3e5fbbd
Message-ID: <20170111050108.E6550FA6BB@public.kitware.com>

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  3e5fbbd6cdc472cdf7823cf81c0e527c79653188 (commit)
      from  914728f8d724e834a402619d05309ad8154ba59d (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=3e5fbbd6cdc472cdf7823cf81c0e527c79653188
commit 3e5fbbd6cdc472cdf7823cf81c0e527c79653188
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Wed Jan 11 00:01:06 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jan 11 00:01:06 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 7a2482a..a5a07dc 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 20170110)
+set(CMake_VERSION_PATCH 20170111)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:25:26 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:25:26 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2032-g0655d61
Message-ID: <20170111142526.E9D41FA737@public.kitware.com>

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  0655d616d6e11b6e490b4cea2f1367caec36c4e2 (commit)
       via  0c59007843491c178b89ec6b4d318d9a478e6b76 (commit)
      from  55f86ceb1f2e5e925a678e9decf181141bb301dc (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=0655d616d6e11b6e490b4cea2f1367caec36c4e2
commit 0655d616d6e11b6e490b4cea2f1367caec36c4e2
Merge: 55f86ce 0c59007
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:25:25 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:25:25 2017 -0500

    Merge topic 'Autogen_Simplify' into next
    
    0c590078 fixup! AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c59007843491c178b89ec6b4d318d9a478e6b76
commit 0c59007843491c178b89ec6b4d318d9a478e6b76
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:24:55 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 11 09:24:55 2017 -0500

    fixup! AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC

diff --git a/Help/manual/cmake-qt.7.rst b/Help/manual/cmake-qt.7.rst
index c348f3f..56d4ca7 100644
--- a/Help/manual/cmake-qt.7.rst
+++ b/Help/manual/cmake-qt.7.rst
@@ -152,11 +152,11 @@ result of linking with the :prop_tgt:`IMPORTED` target:
     Qt5::Widgets
   )
 
-.. _`Qt AUTORCC`:
-
 Source files can be excluded from :prop_tgt:`AUTOUIC` processing by
 enabling :prop_sf:`SKIP_AUTOUIC` or the broader :prop_sf:`SKIP_AUTOGEN`.
 
+.. _`Qt AUTORCC`:
+
 AUTORCC
 ^^^^^^^
 

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

Summary of changes:
 Help/manual/cmake-qt.7.rst |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:25:59 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:25:59 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2035-gcae7d6d
Message-ID: <20170111142559.D43D9FA74D@public.kitware.com>

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  cae7d6db19197200455de775d457d0cbd4bb655d (commit)
       via  7db05f426e2c3a5b4d1a29ae97f5a75692bc03ac (commit)
       via  6eabac26f5c8167481be9c872210a8142ead4b99 (commit)
      from  0655d616d6e11b6e490b4cea2f1367caec36c4e2 (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=cae7d6db19197200455de775d457d0cbd4bb655d
commit cae7d6db19197200455de775d457d0cbd4bb655d
Merge: 0655d61 7db05f4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:25:59 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:25:59 2017 -0500

    Merge topic 'Autogen_Simplify' into next
    
    7db05f42 AUTOGEN: Release notes for SKIP_AUTOX
    6eabac26 AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7db05f426e2c3a5b4d1a29ae97f5a75692bc03ac
commit 7db05f426e2c3a5b4d1a29ae97f5a75692bc03ac
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Mon Jan 2 18:02:53 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 11 09:25:48 2017 -0500

    AUTOGEN: Release notes for SKIP_AUTOX

diff --git a/Help/release/dev/QtAutogen_Skip.rst b/Help/release/dev/QtAutogen_Skip.rst
new file mode 100644
index 0000000..37f795c
--- /dev/null
+++ b/Help/release/dev/QtAutogen_Skip.rst
@@ -0,0 +1,12 @@
+QtAutogen_Skip
+--------------
+
+* The source file properties
+  :prop_sf:`SKIP_AUTOMOC`,
+  :prop_sf:`SKIP_AUTOUIC`,
+  :prop_sf:`SKIP_AUTORCC` and
+  :prop_sf:`SKIP_AUTOGEN`
+  allow to exclude files from
+  :prop_tgt:`AUTOMOC`,
+  :prop_tgt:`AUTOUIC` and
+  :prop_tgt:`AUTORCC` processing.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6eabac26f5c8167481be9c872210a8142ead4b99
commit 6eabac26f5c8167481be9c872210a8142ead4b99
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Mon Jan 2 17:45:17 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 11 09:25:48 2017 -0500

    AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC

diff --git a/Help/manual/cmake-qt.7.rst b/Help/manual/cmake-qt.7.rst
index 80b0f49..56d4ca7 100644
--- a/Help/manual/cmake-qt.7.rst
+++ b/Help/manual/cmake-qt.7.rst
@@ -83,6 +83,9 @@ following targets by setting the :variable:`CMAKE_AUTOMOC` variable.  The
 options to pass to ``moc``. The :variable:`CMAKE_AUTOMOC_MOC_OPTIONS`
 variable may be populated to pre-set the options for all following targets.
 
+Source C++ files can be excluded from :prop_tgt:`AUTOMOC` processing by
+enabling :prop_sf:`SKIP_AUTOMOC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
 .. _`Qt AUTOUIC`:
 
 AUTOUIC
@@ -149,6 +152,9 @@ result of linking with the :prop_tgt:`IMPORTED` target:
     Qt5::Widgets
   )
 
+Source files can be excluded from :prop_tgt:`AUTOUIC` processing by
+enabling :prop_sf:`SKIP_AUTOUIC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
 .. _`Qt AUTORCC`:
 
 AUTORCC
@@ -171,6 +177,9 @@ populated to pre-set the options for all following targets.  The
 ``<name>.qrc`` file to set particular options for the file.  This
 overrides options from the :prop_tgt:`AUTORCC_OPTIONS` target property.
 
+Source files can be excluded from :prop_tgt:`AUTORCC` processing by
+enabling :prop_sf:`SKIP_AUTORCC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
 qtmain.lib on Windows
 =====================
 
diff --git a/Help/prop_tgt/AUTOMOC.rst b/Help/prop_tgt/AUTOMOC.rst
index 30a39b1..b42643f 100644
--- a/Help/prop_tgt/AUTOMOC.rst
+++ b/Help/prop_tgt/AUTOMOC.rst
@@ -47,5 +47,8 @@ See the documentation for this variable for more details.
 The global property :prop_gbl:`AUTOGEN_TARGETS_FOLDER` can be used to group the
 automoc targets together in an IDE, e.g.  in MSVS.
 
+Source C++ files can be excluded from :prop_tgt:`AUTOMOC` processing by
+enabling :prop_sf:`SKIP_AUTOMOC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
 See the :manual:`cmake-qt(7)` manual for more information on using CMake
 with Qt.
diff --git a/Help/prop_tgt/AUTORCC.rst b/Help/prop_tgt/AUTORCC.rst
index 158fdf8..1ad0895 100644
--- a/Help/prop_tgt/AUTORCC.rst
+++ b/Help/prop_tgt/AUTORCC.rst
@@ -24,5 +24,8 @@ generate unspecified unique names for ``rcc``.  Therefore if
 ``Q_INIT_RESOURCE()`` or ``Q_CLEANUP_RESOURCE()`` need to be used the
 ``.qrc`` file name must be unique.
 
+Source files can be excluded from :prop_tgt:`AUTORCC` processing by
+enabling :prop_sf:`SKIP_AUTORCC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
 See the :manual:`cmake-qt(7)` manual for more information on using CMake
 with Qt.
diff --git a/Help/prop_tgt/AUTOUIC.rst b/Help/prop_tgt/AUTOUIC.rst
index 4e60ec3..fbf24c3 100644
--- a/Help/prop_tgt/AUTOUIC.rst
+++ b/Help/prop_tgt/AUTOUIC.rst
@@ -20,5 +20,8 @@ Additional command line options for ``uic`` can be set via the
 The global property :prop_gbl:`AUTOGEN_TARGETS_FOLDER` can be used to group the
 autouic targets together in an IDE, e.g. in MSVS.
 
+Source files can be excluded from :prop_tgt:`AUTOUIC` processing by
+enabling :prop_sf:`SKIP_AUTOUIC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
 See the :manual:`cmake-qt(7)` manual for more information on using CMake
 with Qt.

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:33:03 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:33:03 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2038-g69d0bac
Message-ID: <20170111143303.698D8FA8F3@public.kitware.com>

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  69d0bac3bb25152fa0b3c4b23139b2bddb96eed2 (commit)
       via  6e6253ea88542e9a3c8afc9560f131bc7073ead7 (commit)
       via  3e5fbbd6cdc472cdf7823cf81c0e527c79653188 (commit)
      from  cae7d6db19197200455de775d457d0cbd4bb655d (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=69d0bac3bb25152fa0b3c4b23139b2bddb96eed2
commit 69d0bac3bb25152fa0b3c4b23139b2bddb96eed2
Merge: cae7d6d 6e6253e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:33:02 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:33:02 2017 -0500

    Merge topic 'cmListFileLexer-warning-fix' into next
    
    6e6253ea cmListFileLexer: Fix signature of cmListFileLexer_New
    3e5fbbd6 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e6253ea88542e9a3c8afc9560f131bc7073ead7
commit 6e6253ea88542e9a3c8afc9560f131bc7073ead7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:32:00 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 11 09:32:00 2017 -0500

    cmListFileLexer: Fix signature of cmListFileLexer_New
    
    Add explicit `(void)` instead of an empty argument list, as suggested
    by `-Wstrict-prototypes`.

diff --git a/Source/cmListFileLexer.c b/Source/cmListFileLexer.c
index 31faca1..56559f6 100644
--- a/Source/cmListFileLexer.c
+++ b/Source/cmListFileLexer.c
@@ -2518,7 +2518,7 @@ static void cmListFileLexerDestroy(cmListFileLexer* lexer)
 }
 
 /*--------------------------------------------------------------------------*/
-cmListFileLexer* cmListFileLexer_New()
+cmListFileLexer* cmListFileLexer_New(void)
 {
   cmListFileLexer* lexer = (cmListFileLexer*)malloc(sizeof(cmListFileLexer));
   if (!lexer) {
diff --git a/Source/cmListFileLexer.h b/Source/cmListFileLexer.h
index dfbad5e..c9fb6da 100644
--- a/Source/cmListFileLexer.h
+++ b/Source/cmListFileLexer.h
@@ -46,7 +46,7 @@ typedef struct cmListFileLexer_s cmListFileLexer;
 extern "C" {
 #endif
 
-cmListFileLexer* cmListFileLexer_New();
+cmListFileLexer* cmListFileLexer_New(void);
 int cmListFileLexer_SetFileName(cmListFileLexer*, const char*,
                                 cmListFileLexer_BOM* bom);
 int cmListFileLexer_SetString(cmListFileLexer*, const char*);
diff --git a/Source/cmListFileLexer.in.l b/Source/cmListFileLexer.in.l
index 4b389b9..dd64923 100644
--- a/Source/cmListFileLexer.in.l
+++ b/Source/cmListFileLexer.in.l
@@ -398,7 +398,7 @@ static void cmListFileLexerDestroy(cmListFileLexer* lexer)
 }
 
 /*--------------------------------------------------------------------------*/
-cmListFileLexer* cmListFileLexer_New()
+cmListFileLexer* cmListFileLexer_New(void)
 {
   cmListFileLexer* lexer = (cmListFileLexer*)malloc(sizeof(cmListFileLexer));
   if (!lexer) {

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

Summary of changes:
 Source/CMakeVersion.cmake   |    2 +-
 Source/cmListFileLexer.c    |    2 +-
 Source/cmListFileLexer.h    |    2 +-
 Source/cmListFileLexer.in.l |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:41:59 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:41:59 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2040-g2e8f576
Message-ID: <20170111144159.684B3F998E@public.kitware.com>

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  2e8f576a9d8b320f420aca2aaf0ac51bf1f8a5c3 (commit)
       via  6ae52ce4a16a65338c3e6ef44d4f4891667e07d7 (commit)
      from  69d0bac3bb25152fa0b3c4b23139b2bddb96eed2 (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=2e8f576a9d8b320f420aca2aaf0ac51bf1f8a5c3
commit 2e8f576a9d8b320f420aca2aaf0ac51bf1f8a5c3
Merge: 69d0bac 6ae52ce
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:41:58 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:41:58 2017 -0500

    Merge topic 'vs15-detect-from-installer' into next
    
    6ae52ce4 fixup! VS: Port Visual Studio Setup third-party header to older VS versions


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ae52ce4a16a65338c3e6ef44d4f4891667e07d7
commit 6ae52ce4a16a65338c3e6ef44d4f4891667e07d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:41:48 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 11 09:41:48 2017 -0500

    fixup! VS: Port Visual Studio Setup third-party header to older VS versions

diff --git a/Utilities/cmvssetup/Setup.Configuration.h b/Utilities/cmvssetup/Setup.Configuration.h
index 36b8747..6c9d8f9 100644
--- a/Utilities/cmvssetup/Setup.Configuration.h
+++ b/Utilities/cmvssetup/Setup.Configuration.h
@@ -32,6 +32,9 @@
 #ifndef _Reserved_
 #define _Reserved_
 #endif
+#ifndef MAXUINT
+#define MAXUINT     ((UINT)~((UINT)0))
+#endif
 
 // Enumerations
 //

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

Summary of changes:
 Utilities/cmvssetup/Setup.Configuration.h |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:45:13 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:45:13 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2042-g3f697a7
Message-ID: <20170111144513.0FD0FF9F21@public.kitware.com>

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  3f697a732c4d737fa319020e435f43d973a29901 (commit)
       via  3a97a3713a498c9a89a1733131196f7fcd03552c (commit)
      from  2e8f576a9d8b320f420aca2aaf0ac51bf1f8a5c3 (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=3f697a732c4d737fa319020e435f43d973a29901
commit 3f697a732c4d737fa319020e435f43d973a29901
Merge: 2e8f576 3a97a37
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:45:12 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:45:12 2017 -0500

    Merge topic 'vs15-detect-from-installer' into next
    
    3a97a371 VS: Port Visual Studio Setup third-party header to older VS versions


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a97a3713a498c9a89a1733131196f7fcd03552c
commit 3a97a3713a498c9a89a1733131196f7fcd03552c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 16:45:12 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 11 09:45:05 2017 -0500

    VS: Port Visual Studio Setup third-party header to older VS versions

diff --git a/Utilities/cmvssetup/Setup.Configuration.h b/Utilities/cmvssetup/Setup.Configuration.h
index cc01d27..6c9d8f9 100644
--- a/Utilities/cmvssetup/Setup.Configuration.h
+++ b/Utilities/cmvssetup/Setup.Configuration.h
@@ -23,6 +23,19 @@
 
 #if defined(_WIN32) && !defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
 
+#ifndef _Outptr_result_maybenull_
+#define _Outptr_result_maybenull_
+#endif
+#ifndef _Out_writes_to_
+#define _Out_writes_to_(x,y)
+#endif
+#ifndef _Reserved_
+#define _Reserved_
+#endif
+#ifndef MAXUINT
+#define MAXUINT     ((UINT)~((UINT)0))
+#endif
+
 // Enumerations
 //
 /// <summary>

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:58:13 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:58:13 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-960-g22dfda1
Message-ID: <20170111145813.C5849FA530@public.kitware.com>

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  22dfda11121c2b0c2374a5eb29fd3a2f140ff92c (commit)
       via  ff91b1514be75dee07e8009a60ad39284e8844b4 (commit)
      from  3e5fbbd6cdc472cdf7823cf81c0e527c79653188 (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=22dfda11121c2b0c2374a5eb29fd3a2f140ff92c
commit 22dfda11121c2b0c2374a5eb29fd3a2f140ff92c
Merge: 3e5fbbd ff91b15
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:58:11 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:58:11 2017 -0500

    Merge topic 'FindBoost-find-default'
    
    ff91b151 FindBoost: Search official location of prebuilt binaries on Windows


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

Summary of changes:
 Modules/FindBoost.cmake |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:58:16 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:58:16 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-963-g1406408
Message-ID: <20170111145816.AA98CFA538@public.kitware.com>

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  1406408e61a001728eded5a7f28f3c392ff31c38 (commit)
       via  8deb913d983eee5ad1439ccb98244817d8912602 (commit)
       via  eadd395a1396ed78a3ecea7740f8f4735ab84453 (commit)
      from  22dfda11121c2b0c2374a5eb29fd3a2f140ff92c (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=1406408e61a001728eded5a7f28f3c392ff31c38
commit 1406408e61a001728eded5a7f28f3c392ff31c38
Merge: 22dfda1 8deb913
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:58:14 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:58:14 2017 -0500

    Merge topic 'FindGTest-fixups'
    
    8deb913d FindGTest: add lib search path for MSVC x64 platform
    eadd395a FindGTest: Fix documented GTEST_MSVC_SEARCH default value


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

Summary of changes:
 Modules/FindGTest.cmake |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:58:19 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:58:19 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-965-ga8b5762
Message-ID: <20170111145821.4C3BDFA53F@public.kitware.com>

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  a8b576244f729e543795750eb6c9e188c0e1fe66 (commit)
       via  a9b93501d435bcd30a96e3091255e509fedbb39f (commit)
      from  1406408e61a001728eded5a7f28f3c392ff31c38 (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=a8b576244f729e543795750eb6c9e188c0e1fe66
commit a8b576244f729e543795750eb6c9e188c0e1fe66
Merge: 1406408 a9b9350
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:58:17 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:58:17 2017 -0500

    Merge topic 'FindBoost-1.63'
    
    a9b93501 FindBoost: Add support for 1.63


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

Summary of changes:
 Modules/FindBoost.cmake |   17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:58:24 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:58:24 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-967-g396e937
Message-ID: <20170111145824.BA70FFA537@public.kitware.com>

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  396e9378a820cc5216aecce6bff42f526f4f7c26 (commit)
       via  5ffee691ee0c55d043238960cf1149cbcfb86047 (commit)
      from  a8b576244f729e543795750eb6c9e188c0e1fe66 (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=396e9378a820cc5216aecce6bff42f526f4f7c26
commit 396e9378a820cc5216aecce6bff42f526f4f7c26
Merge: a8b5762 5ffee69
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:58:22 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:58:22 2017 -0500

    Merge topic 'pgsql-yum'
    
    5ffee691 FindPostgreSQL: automatically find installations from yum.postgresql.org


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:58:28 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:58:28 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-969-gff6a034
Message-ID: <20170111145828.072C8FA540@public.kitware.com>

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  ff6a034e0bb7731c97a90afec849d8c80e2a783d (commit)
       via  696339a9d571ff7d37222296164dd738a6a2b042 (commit)
      from  396e9378a820cc5216aecce6bff42f526f4f7c26 (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=ff6a034e0bb7731c97a90afec849d8c80e2a783d
commit ff6a034e0bb7731c97a90afec849d8c80e2a783d
Merge: 396e937 696339a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:58:25 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:58:25 2017 -0500

    Merge topic 'FindOpenSSL-check-both'
    
    696339a9 FindOpenSSL: Check that both CRYPTO and SSL libraries are present


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

Summary of changes:
 Modules/FindOpenSSL.cmake |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:58:31 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:58:31 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-971-g0884c9e
Message-ID: <20170111145831.15CB1FA559@public.kitware.com>

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  0884c9e46a108e8d7b52f6d96242f147ab12d001 (commit)
       via  154def305e7a95d9280573b053170b17539c9f69 (commit)
      from  ff6a034e0bb7731c97a90afec849d8c80e2a783d (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=0884c9e46a108e8d7b52f6d96242f147ab12d001
commit 0884c9e46a108e8d7b52f6d96242f147ab12d001
Merge: ff6a034 154def3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:58:28 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:58:28 2017 -0500

    Merge topic 'SublimeText-no-VERBOSE'
    
    154def30 Sublime: Do not build with verbose output


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

Summary of changes:
 Help/release/dev/SublimeText-no-VERBOSE.rst |    6 ++++++
 Source/cmExtraSublimeTextGenerator.cxx      |   12 +++---------
 2 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 Help/release/dev/SublimeText-no-VERBOSE.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:58:33 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:58:33 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-973-g3474559
Message-ID: <20170111145833.DA347FA562@public.kitware.com>

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  34745595c3b87279b92ea402fd2ccb6351344307 (commit)
       via  3578e86272b16b303edd640f29781dd316a857a4 (commit)
      from  0884c9e46a108e8d7b52f6d96242f147ab12d001 (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=34745595c3b87279b92ea402fd2ccb6351344307
commit 34745595c3b87279b92ea402fd2ccb6351344307
Merge: 0884c9e 3578e86
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:58:31 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:58:31 2017 -0500

    Merge topic 'issue-16513-concrt140-dll'
    
    3578e862 InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0


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

Summary of changes:
 Modules/InstallRequiredSystemLibraries.cmake |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:58:36 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:58:36 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-975-g445ab80
Message-ID: <20170111145836.A292EFA563@public.kitware.com>

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  445ab80c444b1f5d2800784f85601976867df411 (commit)
       via  513ef514e51702bf7775f79119f8e3e39ccbb784 (commit)
      from  34745595c3b87279b92ea402fd2ccb6351344307 (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=445ab80c444b1f5d2800784f85601976867df411
commit 445ab80c444b1f5d2800784f85601976867df411
Merge: 3474559 513ef51
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:58:34 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:58:34 2017 -0500

    Merge topic 'AndroidTestUtilities-fix-cleanup'
    
    513ef514 AndroidTestUtilities: fix cleanup operation


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:58:39 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:58:39 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-977-gd1682a8
Message-ID: <20170111145839.88C1EFA559@public.kitware.com>

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  d1682a8514f9ecbe91f59e651be917afec044907 (commit)
       via  524f5ee186f95a0dc0dc449e437910a72b175893 (commit)
      from  445ab80c444b1f5d2800784f85601976867df411 (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=d1682a8514f9ecbe91f59e651be917afec044907
commit d1682a8514f9ecbe91f59e651be917afec044907
Merge: 445ab80 524f5ee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:58:37 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:58:37 2017 -0500

    Merge topic 'android_clang_asm'
    
    524f5ee1 Android: Set compiler target platform when compiling ASM with Clang


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

Summary of changes:
 .../Platform/{Android-Clang-C.cmake => Android-Clang-ASM.cmake}    |    2 +-
 Modules/Platform/Android-Clang.cmake                               |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
 copy Modules/Platform/{Android-Clang-C.cmake => Android-Clang-ASM.cmake} (51%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:58:42 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:58:42 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1010-g2eb5596
Message-ID: <20170111145842.73740FA53F@public.kitware.com>

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  2eb5596503ab8cf2f5ded140d45aa013c9705436 (commit)
       via  7db05f426e2c3a5b4d1a29ae97f5a75692bc03ac (commit)
       via  6eabac26f5c8167481be9c872210a8142ead4b99 (commit)
       via  cbc07d331d1d5429dc1e0b7c6c7949ff8d9efdf1 (commit)
       via  c17e0a3ad58f06fcb0827910af520405670b3d51 (commit)
       via  53787bf8de2d3981f650e9036bb89cb6ed884a75 (commit)
       via  8dbdd3e726ead25c179e6eb4ffab212a1db3aba8 (commit)
       via  0699760d5c8b644242ddd4ac6d07d8c4c68f2b94 (commit)
       via  a84f0bb726ebcc8e9bf3db0b99e5b6fd8a720045 (commit)
       via  7b766b83952ec4c431a55d2f6e589a5f806834c9 (commit)
       via  2964b8cca4155fa318722f6ef17f0d4d56ee2f29 (commit)
       via  d58b6bf31c18cfedd4a2f15e009b8e5cbdc21b6e (commit)
       via  94c319f93309ff4cddd0280cdcbd48b50492db36 (commit)
       via  966be439e07131c3ff84175c1a9e3b6336908d8e (commit)
       via  de531432887487943dbe4ae5a1bde762d5582e06 (commit)
       via  d8e45536fb3637454cf17a638dcd9fc236e94660 (commit)
       via  d9313a82906ced0ff3c76828e86d9d7a248a5e49 (commit)
       via  32d3540e090c4a24d55b99c49c094a9cb574c9b3 (commit)
       via  e7280a7f1743d73cdab41ed709a9e1d0f99b6342 (commit)
       via  63d3ca4c1cab0c7b9c71d6c051c3b4c053eb7627 (commit)
       via  6ae19bf32e232beb59a0c427d82c0761e8248ab8 (commit)
       via  9986da4f0f2f49c0d7d260f9d21deaa906708376 (commit)
       via  d51cc88e844c78c01c1616e6a2fb102c0682dd00 (commit)
       via  cf1d5a9cdba49a2e9f08879d756ae118b22bfc6a (commit)
       via  f962275987e17cf94da663a919f52b6d0c8f44f4 (commit)
       via  c736c41ad192c89e1c74751a8f401c75955f5f3b (commit)
       via  cbd650c2642e40369eaa53d20dafee6cdccae4af (commit)
       via  0b1527ff3d1781380756ee72a9641b7c5c7c87cc (commit)
       via  2b9d795e63acf723a6abd79f3195ec70476442a5 (commit)
       via  2cfcdf757d032cdea8b980792007a6f9d749e6fb (commit)
       via  2f67aef23d4192fadb222dc79311fb5ffbbc36ce (commit)
       via  794fdf40a1bc85dded519d7c737f73690e3a6e42 (commit)
       via  a1e49bb155132606ed9f590c0b62e68f2e288d0b (commit)
      from  d1682a8514f9ecbe91f59e651be917afec044907 (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=2eb5596503ab8cf2f5ded140d45aa013c9705436
commit 2eb5596503ab8cf2f5ded140d45aa013c9705436
Merge: d1682a8 7db05f4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:58:40 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:58:40 2017 -0500

    Merge topic 'Autogen_Simplify'
    
    7db05f42 AUTOGEN: Release notes for SKIP_AUTOX
    6eabac26 AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC
    cbc07d33 AUTOGEN: Documentation for SKIP_AUTOX source file properties
    c17e0a3a AUTOGEN: Tests: AUTORCC SKIP_AUTORCC and SKIP_AUTOGEN test
    53787bf8 AUTOGEN: Tests: AUTOUIC SKIP_AUTOUIC and SKIP_AUTOGEN test
    8dbdd3e7 AUTOGEN: Tests: AUTOMOC SKIP_AUTOMOC and SKIP_AUTOGEN test
    0699760d AUTOGEN: Generators: Do moc/uic skip test during file list generation
    a84f0bb7 AUTOGEN: Generators: Message upper/lower case unification
    7b766b83 AUTOGEN: Generators: Use single moc/uic skip test method only
    2964b8cc AUTOGEN: Generators: Use AUTOMOC/UIC/RCC instead of AUTOGEN in messages
    d58b6bf3 AUTOGEN: Generators: Moc/UicSkipTest methods
    94c319f9 AUTOGEN: Generators: Use separate header lists for MOC and UIC
    966be439 AUTOGEN: Generators: Be verbose about skipping files
    de531432 AUTOGEN: Generators: Remove unused variable
    d8e45536 AUTOGEN: Initializer: Always remember skipped files
    d9313a82 AUTOGEN: Initializer: Enable SKIP_AUTOGEN on all AUTOGEN generated sources
    ...


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

Summary of changes:
 Help/manual/cmake-properties.7.rst           |    4 +
 Help/manual/cmake-qt.7.rst                   |    9 +
 Help/prop_sf/SKIP_AUTOGEN.rst                |    8 +
 Help/prop_sf/SKIP_AUTOMOC.rst                |    6 +
 Help/prop_sf/SKIP_AUTORCC.rst                |    6 +
 Help/prop_sf/SKIP_AUTOUIC.rst                |    6 +
 Help/prop_tgt/AUTOMOC.rst                    |    3 +
 Help/prop_tgt/AUTORCC.rst                    |    3 +
 Help/prop_tgt/AUTOUIC.rst                    |    3 +
 Help/release/dev/QtAutogen_Skip.rst          |   12 +
 Modules/AutogenInfo.cmake.in                 |    8 +-
 Source/cmQtAutoGeneratorInitializer.cxx      |  102 ++--
 Source/cmQtAutoGenerators.cxx                |  741 ++++++++++++--------------
 Source/cmQtAutoGenerators.h                  |   46 +-
 Tests/QtAutogen/CMakeLists.txt               |   63 +++
 Tests/QtAutogen/skipMoc.cpp                  |   14 +
 Tests/QtAutogen/skipRcc.cpp                  |    9 +
 Tests/QtAutogen/skipSource/qItemA.cpp        |    5 +
 Tests/QtAutogen/skipSource/qItemA.hpp        |   13 +
 Tests/QtAutogen/skipSource/qItemB.cpp        |    5 +
 Tests/QtAutogen/skipSource/qItemB.hpp        |   13 +
 Tests/QtAutogen/skipSource/qItemC.cpp        |    5 +
 Tests/QtAutogen/skipSource/qItemC.hpp        |   13 +
 Tests/QtAutogen/skipSource/skipRccBad1.qrc   |    5 +
 Tests/QtAutogen/skipSource/skipRccBad2.qrc   |    5 +
 Tests/QtAutogen/skipSource/skipRccGood.qrc   |    6 +
 Tests/QtAutogen/skipSource/skipUicGen.cpp    |    7 +
 Tests/QtAutogen/skipSource/skipUicGen.hpp    |    8 +
 Tests/QtAutogen/skipSource/skipUicNoGen1.cpp |    7 +
 Tests/QtAutogen/skipSource/skipUicNoGen1.hpp |    8 +
 Tests/QtAutogen/skipSource/skipUicNoGen2.cpp |    7 +
 Tests/QtAutogen/skipSource/skipUicNoGen2.hpp |    8 +
 Tests/QtAutogen/skipSource/ui_nogen1.h       |    6 +
 Tests/QtAutogen/skipSource/ui_nogen2.h       |    6 +
 Tests/QtAutogen/skipSource/uigen1.ui         |   24 +
 Tests/QtAutogen/skipSource/uigen2.ui         |   24 +
 Tests/QtAutogen/skipUic.cpp                  |   22 +
 37 files changed, 782 insertions(+), 458 deletions(-)
 create mode 100644 Help/prop_sf/SKIP_AUTOGEN.rst
 create mode 100644 Help/prop_sf/SKIP_AUTOMOC.rst
 create mode 100644 Help/prop_sf/SKIP_AUTORCC.rst
 create mode 100644 Help/prop_sf/SKIP_AUTOUIC.rst
 create mode 100644 Help/release/dev/QtAutogen_Skip.rst
 create mode 100644 Tests/QtAutogen/skipMoc.cpp
 create mode 100644 Tests/QtAutogen/skipRcc.cpp
 create mode 100644 Tests/QtAutogen/skipSource/qItemA.cpp
 create mode 100644 Tests/QtAutogen/skipSource/qItemA.hpp
 create mode 100644 Tests/QtAutogen/skipSource/qItemB.cpp
 create mode 100644 Tests/QtAutogen/skipSource/qItemB.hpp
 create mode 100644 Tests/QtAutogen/skipSource/qItemC.cpp
 create mode 100644 Tests/QtAutogen/skipSource/qItemC.hpp
 create mode 100644 Tests/QtAutogen/skipSource/skipRccBad1.qrc
 create mode 100644 Tests/QtAutogen/skipSource/skipRccBad2.qrc
 create mode 100644 Tests/QtAutogen/skipSource/skipRccGood.qrc
 create mode 100644 Tests/QtAutogen/skipSource/skipUicGen.cpp
 create mode 100644 Tests/QtAutogen/skipSource/skipUicGen.hpp
 create mode 100644 Tests/QtAutogen/skipSource/skipUicNoGen1.cpp
 create mode 100644 Tests/QtAutogen/skipSource/skipUicNoGen1.hpp
 create mode 100644 Tests/QtAutogen/skipSource/skipUicNoGen2.cpp
 create mode 100644 Tests/QtAutogen/skipSource/skipUicNoGen2.hpp
 create mode 100644 Tests/QtAutogen/skipSource/ui_nogen1.h
 create mode 100644 Tests/QtAutogen/skipSource/ui_nogen2.h
 create mode 100644 Tests/QtAutogen/skipSource/uigen1.ui
 create mode 100644 Tests/QtAutogen/skipSource/uigen2.ui
 create mode 100644 Tests/QtAutogen/skipUic.cpp


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:58:45 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:58:45 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1012-g039588e
Message-ID: <20170111145845.B8CC7FA558@public.kitware.com>

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  039588e335fbf559f66719aff2a3c8920a078261 (commit)
       via  af77368ed3d81c877fc19a64831aff380cf4646e (commit)
      from  2eb5596503ab8cf2f5ded140d45aa013c9705436 (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=039588e335fbf559f66719aff2a3c8920a078261
commit 039588e335fbf559f66719aff2a3c8920a078261
Merge: 2eb5596 af77368
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:58:43 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:58:43 2017 -0500

    Merge topic 'cpack-rpm-user-binary-spec-file-test'
    
    af77368e CPack/RPM test for using custom binary spec file


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

Summary of changes:
 Tests/RunCMake/CPack/RunCMakeTest.cmake            |    1 +
 .../CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake    |    9 +++
 .../RPM-COMPONENT-stderr.txt                       |    2 +
 .../RPM-MONOLITHIC-stderr.txt                      |    1 +
 .../tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in   |   80 ++++++++++++++++++++
 .../CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake |    9 +++
 6 files changed, 102 insertions(+)
 create mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
 create mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
 create mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
 create mode 100644 Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/test.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:58:48 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:58:48 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1014-g474edf7
Message-ID: <20170111145848.9DB5DFA562@public.kitware.com>

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  474edf75f6234a9ed3b59b7e11c53d57f9bd2f78 (commit)
       via  b1dc4ddbdd651e8bdd30878fa9afc840d97c9114 (commit)
      from  039588e335fbf559f66719aff2a3c8920a078261 (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=474edf75f6234a9ed3b59b7e11c53d57f9bd2f78
commit 474edf75f6234a9ed3b59b7e11c53d57f9bd2f78
Merge: 039588e b1dc4dd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:58:46 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:58:46 2017 -0500

    Merge topic 'BundleUtilities-symlink-structure'
    
    b1dc4ddb BundleUtilities: Maintain symlink structure


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

Summary of changes:
 Modules/BundleUtilities.cmake |   58 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:58:51 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:58:51 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1017-gbc2cc80
Message-ID: <20170111145851.7B57DFA564@public.kitware.com>

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  bc2cc80255c64bc2b2fa4c9dbb54f5cd90150982 (commit)
       via  b7f0b1240f9c251d059fafcde878168f2b9a6664 (commit)
       via  ba8bb32162ae7bc42c4a3a521a4e4b98274d9d8e (commit)
      from  474edf75f6234a9ed3b59b7e11c53d57f9bd2f78 (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=bc2cc80255c64bc2b2fa4c9dbb54f5cd90150982
commit bc2cc80255c64bc2b2fa4c9dbb54f5cd90150982
Merge: 474edf7 b7f0b12
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:58:49 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:58:49 2017 -0500

    Merge topic 'solaris-build-fixes'
    
    b7f0b124 libuv requires _XOPEN_SOURCE 600 on Solaris 11
    ba8bb321 Disable libuv on Solaris 10


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

Summary of changes:
 CMakeLists.txt                   |    3 +++
 Utilities/cmlibuv/CMakeLists.txt |   10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:58:54 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:58:54 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1019-g9a67022
Message-ID: <20170111145854.56501FA564@public.kitware.com>

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  9a670222758bff23645df36a5cb9d98cb1bafa8e (commit)
       via  b8968b4b3984b425497324c302948a197b2badbd (commit)
      from  bc2cc80255c64bc2b2fa4c9dbb54f5cd90150982 (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=9a670222758bff23645df36a5cb9d98cb1bafa8e
commit 9a670222758bff23645df36a5cb9d98cb1bafa8e
Merge: bc2cc80 b8968b4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:58:52 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:58:52 2017 -0500

    Merge topic 'UseSWIG-implicit-depends'
    
    b8968b4b UseSWIG: Automatically scan dependencies of SWIG files for Makefiles


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

Summary of changes:
 Copyright.txt         |    2 ++
 Modules/UseSWIG.cmake |    1 +
 Source/cmDependsC.cxx |    4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 09:58:57 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 09:58:57 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1024-g12d5ccd
Message-ID: <20170111145857.9B86CFA565@public.kitware.com>

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  12d5ccd10a451301bf3cbdefe8fde744bf6c9467 (commit)
       via  e537bd91129fc1616f787b64024f1b08d0f7ae45 (commit)
       via  0a2e588585a951b1f26cfa9094e0709f1d026b1e (commit)
       via  cdacfbd255dcf640be7dd4971a1be616d015b3fd (commit)
       via  cf590c1236e40eaff9fe76ec918fad33df4f6be4 (commit)
      from  9a670222758bff23645df36a5cb9d98cb1bafa8e (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=12d5ccd10a451301bf3cbdefe8fde744bf6c9467
commit 12d5ccd10a451301bf3cbdefe8fde744bf6c9467
Merge: 9a67022 e537bd9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 09:58:55 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 09:58:55 2017 -0500

    Merge topic 'ctest_memcheck-leak_sanitizer'
    
    e537bd91 ctest_memcheck: do not add detect_leaks=1 to ASAN_OPTIONS
    0a2e5885 ctest_memcheck: join *SAN_OPTIONS with :
    cdacfbd2 MEMORYCHECK_SUPPRESSIONS_FILE: add support for sanitizers
    cf590c12 ctest_memcheck: add support for standalone LeakSanitizer


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

Summary of changes:
 Help/release/dev/ctest_memcheck-leak_sanitizer.rst |   19 ++++++++++++
 Help/variable/CTEST_MEMORYCHECK_TYPE.rst           |    2 +-
 Source/CTest/cmCTestMemCheckHandler.cxx            |   31 +++++++++++++++++---
 Source/CTest/cmCTestMemCheckHandler.h              |    1 +
 .../DummyAddressLeakSanitizer-result.txt}          |    0
 .../DummyAddressLeakSanitizer-stderr.txt           |    1 +
 ...ut.txt => DummyAddressLeakSanitizer-stdout.txt} |    0
 Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake   |   27 ++++++++++++-----
 ...itizer.cmake => testAddressLeakSanitizer.cmake} |   10 +++----
 .../ctest_memcheck/testLeakSanitizer.cmake         |   20 ++++++-------
 10 files changed, 84 insertions(+), 27 deletions(-)
 create mode 100644 Help/release/dev/ctest_memcheck-leak_sanitizer.rst
 copy Tests/RunCMake/{ctest_build/BuildFailure-result.txt => ctest_memcheck/DummyAddressLeakSanitizer-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-stderr.txt
 copy Tests/RunCMake/ctest_memcheck/{DummyLeakSanitizer-stdout.txt => DummyAddressLeakSanitizer-stdout.txt} (100%)
 copy Tests/RunCMake/ctest_memcheck/{testLeakSanitizer.cmake => testAddressLeakSanitizer.cmake} (87%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 10:02:39 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 10:02:39 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2058-g016ec96
Message-ID: <20170111150239.375E1FA5D2@public.kitware.com>

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  016ec962653d5f2060ebf05d09ecddc13deb0cab (commit)
       via  12d5ccd10a451301bf3cbdefe8fde744bf6c9467 (commit)
       via  9a670222758bff23645df36a5cb9d98cb1bafa8e (commit)
       via  bc2cc80255c64bc2b2fa4c9dbb54f5cd90150982 (commit)
       via  474edf75f6234a9ed3b59b7e11c53d57f9bd2f78 (commit)
       via  039588e335fbf559f66719aff2a3c8920a078261 (commit)
       via  2eb5596503ab8cf2f5ded140d45aa013c9705436 (commit)
       via  d1682a8514f9ecbe91f59e651be917afec044907 (commit)
       via  445ab80c444b1f5d2800784f85601976867df411 (commit)
       via  34745595c3b87279b92ea402fd2ccb6351344307 (commit)
       via  0884c9e46a108e8d7b52f6d96242f147ab12d001 (commit)
       via  ff6a034e0bb7731c97a90afec849d8c80e2a783d (commit)
       via  396e9378a820cc5216aecce6bff42f526f4f7c26 (commit)
       via  a8b576244f729e543795750eb6c9e188c0e1fe66 (commit)
       via  1406408e61a001728eded5a7f28f3c392ff31c38 (commit)
       via  22dfda11121c2b0c2374a5eb29fd3a2f140ff92c (commit)
      from  3f697a732c4d737fa319020e435f43d973a29901 (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=016ec962653d5f2060ebf05d09ecddc13deb0cab
commit 016ec962653d5f2060ebf05d09ecddc13deb0cab
Merge: 3f697a7 12d5ccd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 10:02:26 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 11 10:02:26 2017 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 10:26:49 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 10:26:49 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2060-g7f3e966
Message-ID: <20170111152649.5B0E3FA74E@public.kitware.com>

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  7f3e96623e6d1bc22e447926926409c2836e7d6a (commit)
       via  5fddbf1382f9eca0354404ad062343da61cfc84a (commit)
      from  016ec962653d5f2060ebf05d09ecddc13deb0cab (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=7f3e96623e6d1bc22e447926926409c2836e7d6a
commit 7f3e96623e6d1bc22e447926926409c2836e7d6a
Merge: 016ec96 5fddbf1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 10:26:48 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 10:26:48 2017 -0500

    Merge topic 'cuda-windows' into next
    
    5fddbf13 fixup! CUDA: Port test cases to Windows with MSVC host compiler


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fddbf1382f9eca0354404ad062343da61cfc84a
commit 5fddbf1382f9eca0354404ad062343da61cfc84a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 10:10:17 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 11 10:25:21 2017 -0500

    fixup! CUDA: Port test cases to Windows with MSVC host compiler

diff --git a/Tests/RunCMake/try_compile/CudaStandardNoDefault.cmake b/Tests/RunCMake/try_compile/CudaStandardNoDefault.cmake
new file mode 100644
index 0000000..ea22152
--- /dev/null
+++ b/Tests/RunCMake/try_compile/CudaStandardNoDefault.cmake
@@ -0,0 +1,9 @@
+enable_language(CUDA)
+try_compile(result ${CMAKE_CURRENT_BINARY_DIR}
+  SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src.cu
+  CUDA_STANDARD 3 # bogus, but not used
+  OUTPUT_VARIABLE out
+  )
+if(NOT result)
+  message(FATAL_ERROR "try_compile failed:\n${out}")
+endif()
diff --git a/Tests/RunCMake/try_compile/RunCMakeTest.cmake b/Tests/RunCMake/try_compile/RunCMakeTest.cmake
index 5452e6d..6a1bc64 100644
--- a/Tests/RunCMake/try_compile/RunCMakeTest.cmake
+++ b/Tests/RunCMake/try_compile/RunCMakeTest.cmake
@@ -36,7 +36,11 @@ elseif(DEFINED CMAKE_CXX_STANDARD_DEFAULT)
   run_cmake(CxxStandardNoDefault)
 endif()
 if(CMake_TEST_CUDA)
-  run_cmake(CudaStandard)
+  if(CMAKE_HOST_WIN32)
+    run_cmake(CudaStandardNoDefault)
+  else()
+    run_cmake(CudaStandard)
+  endif()
 endif()
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
   run_cmake(CStandardGNU)

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

Summary of changes:
 .../{CxxStandardNoDefault.cmake => CudaStandardNoDefault.cmake}  |    6 +++---
 Tests/RunCMake/try_compile/RunCMakeTest.cmake                    |    6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)
 copy Tests/RunCMake/try_compile/{CxxStandardNoDefault.cmake => CudaStandardNoDefault.cmake} (58%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 10:27:29 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 10:27:29 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2063-g374e984
Message-ID: <20170111152729.032CAFA769@public.kitware.com>

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  374e984b7e143008d38b7d148b1700cadbccbb59 (commit)
       via  097ac761334e18758e7f81ec46486ea200317eec (commit)
       via  cdd559eab5df6972ce89dbc6e24b6ab1b6081254 (commit)
      from  7f3e96623e6d1bc22e447926926409c2836e7d6a (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=374e984b7e143008d38b7d148b1700cadbccbb59
commit 374e984b7e143008d38b7d148b1700cadbccbb59
Merge: 7f3e966 097ac76
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 10:27:28 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 10:27:28 2017 -0500

    Merge topic 'cuda-windows' into next
    
    097ac761 CUDA: Enable CudaOnly.SeparateCompilation test runtime calls
    cdd559ea CUDA: Port test cases to Windows with MSVC host compiler


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=097ac761334e18758e7f81ec46486ea200317eec
commit 097ac761334e18758e7f81ec46486ea200317eec
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 15 15:17:08 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 11 10:26:54 2017 -0500

    CUDA: Enable CudaOnly.SeparateCompilation test runtime calls
    
    Uncomment the calls in `main.cpp` (and fix the signatures).

diff --git a/Tests/CudaOnly/SeparateCompilation/main.cu b/Tests/CudaOnly/SeparateCompilation/main.cu
index d4520ae..5c8e150 100644
--- a/Tests/CudaOnly/SeparateCompilation/main.cu
+++ b/Tests/CudaOnly/SeparateCompilation/main.cu
@@ -4,12 +4,12 @@
 #include "file1.h"
 #include "file2.h"
 
-// result_type file4_launch_kernel(int x);
-// result_type file5_launch_kernel(int x);
+int file4_launch_kernel(int x);
+int file5_launch_kernel(int x);
 
 int main(int argc, char **argv)
 {
-  // file4_launch_kernel(42);
-  // file5_launch_kernel(42);
+  file4_launch_kernel(42);
+  file5_launch_kernel(42);
   return 0;
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cdd559eab5df6972ce89dbc6e24b6ab1b6081254
commit cdd559eab5df6972ce89dbc6e24b6ab1b6081254
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 7 11:45:44 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 11 10:26:53 2017 -0500

    CUDA: Port test cases to Windows with MSVC host compiler

diff --git a/Tests/Cuda/Complex/dynamic.cpp b/Tests/Cuda/Complex/dynamic.cpp
index d579f1e..3848ce7 100644
--- a/Tests/Cuda/Complex/dynamic.cpp
+++ b/Tests/Cuda/Complex/dynamic.cpp
@@ -1,5 +1,11 @@
 
-int dynamic_base_func(int x)
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#else
+#define EXPORT
+#endif
+
+EXPORT int dynamic_base_func(int x)
 {
   return x * x;
 }
diff --git a/Tests/Cuda/Complex/dynamic.cu b/Tests/Cuda/Complex/dynamic.cu
index ea52acb..a23dc25 100644
--- a/Tests/Cuda/Complex/dynamic.cu
+++ b/Tests/Cuda/Complex/dynamic.cu
@@ -3,9 +3,15 @@
 #include <cuda.h>
 #include <iostream>
 
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#else
+#define EXPORT
+#endif
+
 int dynamic_base_func(int);
 
-int __host__ cuda_dynamic_host_func(int x)
+EXPORT int __host__ cuda_dynamic_host_func(int x)
 {
   return dynamic_base_func(x);
 }
@@ -16,7 +22,7 @@ void DetermineIfValidCudaDevice()
 {
 }
 
-void cuda_dynamic_lib_func()
+EXPORT void cuda_dynamic_lib_func()
 {
   DetermineIfValidCudaDevice <<<1,1>>> ();
   cudaError_t err = cudaGetLastError();
diff --git a/Tests/Cuda/Complex/main.cpp b/Tests/Cuda/Complex/main.cpp
index 32312d0..5a3f820 100644
--- a/Tests/Cuda/Complex/main.cpp
+++ b/Tests/Cuda/Complex/main.cpp
@@ -3,8 +3,14 @@
 #include "file1.h"
 #include "file2.h"
 
-int call_cuda_seperable_code(int x);
-int mixed_launch_kernel(int x);
+#ifdef _WIN32
+#define IMPORT __declspec(dllimport)
+#else
+#define IMPORT
+#endif
+
+IMPORT int call_cuda_seperable_code(int x);
+IMPORT int mixed_launch_kernel(int x);
 
 int main(int argc, char** argv)
 {
diff --git a/Tests/Cuda/Complex/mixed.cpp b/Tests/Cuda/Complex/mixed.cpp
index 205f091..bd32e51 100644
--- a/Tests/Cuda/Complex/mixed.cpp
+++ b/Tests/Cuda/Complex/mixed.cpp
@@ -1,6 +1,14 @@
 
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#define IMPORT __declspec(dllimport)
+#else
+#define EXPORT
+#define IMPORT
+#endif
+
 int dynamic_base_func(int);
-int cuda_dynamic_host_func(int);
+IMPORT int cuda_dynamic_host_func(int);
 int file3_launch_kernel(int);
 
 int dynamic_final_func(int x)
@@ -8,7 +16,7 @@ int dynamic_final_func(int x)
   return cuda_dynamic_host_func(dynamic_base_func(x));
 }
 
-int call_cuda_seperable_code(int x)
+EXPORT int call_cuda_seperable_code(int x)
 {
   return file3_launch_kernel(x);
 }
diff --git a/Tests/Cuda/Complex/mixed.cu b/Tests/Cuda/Complex/mixed.cu
index 45b412f..7051de0 100644
--- a/Tests/Cuda/Complex/mixed.cu
+++ b/Tests/Cuda/Complex/mixed.cu
@@ -4,10 +4,18 @@
 #include "file1.h"
 #include "file2.h"
 
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#define IMPORT __declspec(dllimport)
+#else
+#define EXPORT
+#define IMPORT
+#endif
+
 result_type __device__ file1_func(int x);
 result_type_dynamic __device__ file2_func(int x);
 
-void __host__ cuda_dynamic_lib_func();
+IMPORT void __host__ cuda_dynamic_lib_func();
 
 static
 __global__
@@ -17,7 +25,7 @@ void mixed_kernel(result_type& r, int x)
   result_type_dynamic rd = file2_func(x);
 }
 
-int mixed_launch_kernel(int x)
+EXPORT int mixed_launch_kernel(int x)
 {
   cuda_dynamic_lib_func();
 
diff --git a/Tests/CudaOnly/EnableStandard/main.cu b/Tests/CudaOnly/EnableStandard/main.cu
index 83e9dfd..f7144e6 100644
--- a/Tests/CudaOnly/EnableStandard/main.cu
+++ b/Tests/CudaOnly/EnableStandard/main.cu
@@ -1,8 +1,14 @@
 
 #include <iostream>
 
+#ifdef _WIN32
+#define IMPORT __declspec(dllimport)
+#else
+#define IMPORT
+#endif
+
 int static_cuda11_func(int);
-int shared_cuda11_func(int);
+IMPORT int shared_cuda11_func(int);
 
 void test_functions()
 {
diff --git a/Tests/CudaOnly/EnableStandard/shared.cu b/Tests/CudaOnly/EnableStandard/shared.cu
index 28555b3..ccdd0b2 100644
--- a/Tests/CudaOnly/EnableStandard/shared.cu
+++ b/Tests/CudaOnly/EnableStandard/shared.cu
@@ -1,9 +1,15 @@
 
 #include <type_traits>
 
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#else
+#define EXPORT
+#endif
+
 using tt = std::true_type;
 using ft = std::false_type;
-int __host__ shared_cuda11_func(int x)
+EXPORT int __host__ shared_cuda11_func(int x)
 {
   return x * x + std::integral_constant<int, 17>::value;
 }
diff --git a/Tests/CudaOnly/WithDefs/CMakeLists.txt b/Tests/CudaOnly/WithDefs/CMakeLists.txt
index c4ca8b9..6c4011c 100644
--- a/Tests/CudaOnly/WithDefs/CMakeLists.txt
+++ b/Tests/CudaOnly/WithDefs/CMakeLists.txt
@@ -4,7 +4,12 @@ project (CudaOnlyWithDefs CUDA)
 
 #verify that we can pass explicit cuda arch flags
 set(CMAKE_CUDA_FLAGS "-gencode arch=compute_30,code=compute_30")
-set(debug_compile_flags --generate-code arch=compute_20,code=sm_20 -Xcompiler=-Werror)
+set(debug_compile_flags --generate-code arch=compute_20,code=sm_20)
+if(CMAKE_CUDA_SIMULATE_ID STREQUAL "MSVC")
+  list(APPEND debug_compile_flags -Xcompiler=-WX)
+else()
+  list(APPEND debug_compile_flags -Xcompiler=-Werror)
+endif()
 set(release_compile_defs DEFREL)
 
 #Goal for this example:
diff --git a/Tests/CudaOnly/WithDefs/main.notcu b/Tests/CudaOnly/WithDefs/main.notcu
index 33a49d2..67bf10c 100644
--- a/Tests/CudaOnly/WithDefs/main.notcu
+++ b/Tests/CudaOnly/WithDefs/main.notcu
@@ -2,12 +2,21 @@
 #include <cuda_runtime.h>
 #include <iostream>
 
+#ifndef PACKED_DEFINE
+#error "PACKED_DEFINE not defined!"
+#endif
+
 static
 __global__
 void DetermineIfValidCudaDevice()
 {
 }
 
+#ifdef _MSC_VER
+#pragma pack(push,1)
+#undef PACKED_DEFINE
+#define PACKED_DEFINE
+#endif
 struct PACKED_DEFINE result_type
 {
   bool valid;
@@ -16,6 +25,9 @@ struct PACKED_DEFINE result_type
 #error missing DEFREL flag
 #endif
 };
+#ifdef _MSC_VER
+#pragma pack(pop)
+#endif
 
 result_type can_launch_kernel()
 {
diff --git a/Tests/RunCMake/try_compile/CudaStandardNoDefault.cmake b/Tests/RunCMake/try_compile/CudaStandardNoDefault.cmake
new file mode 100644
index 0000000..ea22152
--- /dev/null
+++ b/Tests/RunCMake/try_compile/CudaStandardNoDefault.cmake
@@ -0,0 +1,9 @@
+enable_language(CUDA)
+try_compile(result ${CMAKE_CURRENT_BINARY_DIR}
+  SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src.cu
+  CUDA_STANDARD 3 # bogus, but not used
+  OUTPUT_VARIABLE out
+  )
+if(NOT result)
+  message(FATAL_ERROR "try_compile failed:\n${out}")
+endif()
diff --git a/Tests/RunCMake/try_compile/RunCMakeTest.cmake b/Tests/RunCMake/try_compile/RunCMakeTest.cmake
index 5452e6d..6a1bc64 100644
--- a/Tests/RunCMake/try_compile/RunCMakeTest.cmake
+++ b/Tests/RunCMake/try_compile/RunCMakeTest.cmake
@@ -36,7 +36,11 @@ elseif(DEFINED CMAKE_CXX_STANDARD_DEFAULT)
   run_cmake(CxxStandardNoDefault)
 endif()
 if(CMake_TEST_CUDA)
-  run_cmake(CudaStandard)
+  if(CMAKE_HOST_WIN32)
+    run_cmake(CudaStandardNoDefault)
+  else()
+    run_cmake(CudaStandard)
+  endif()
 endif()
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
   run_cmake(CStandardGNU)

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 10:35:50 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 10:35:50 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1029-ge0cc40e
Message-ID: <20170111153550.7552DFA862@public.kitware.com>

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  e0cc40ed58a16f63a26cf25c56f6e8471401fbfe (commit)
       via  e9d3557ccc4b26503aa7d59ec2eaf179c9924a5b (commit)
       via  c046356a5c37f52292f65dfff2afd72cde1c47af (commit)
       via  68d13665e023f6ccb51ba0375cabd27e492db483 (commit)
       via  195ab50f635bb95035b5bf2fda7a3bf692a122f5 (commit)
      from  12d5ccd10a451301bf3cbdefe8fde744bf6c9467 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 10:35:50 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 10:35:50 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2069-gc16ab96
Message-ID: <20170111153550.98754FA866@public.kitware.com>

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  c16ab966d519e8d8cb7bb073cc9b3e8d507b5cca (commit)
       via  e0cc40ed58a16f63a26cf25c56f6e8471401fbfe (commit)
       via  e9d3557ccc4b26503aa7d59ec2eaf179c9924a5b (commit)
       via  c046356a5c37f52292f65dfff2afd72cde1c47af (commit)
       via  68d13665e023f6ccb51ba0375cabd27e492db483 (commit)
       via  195ab50f635bb95035b5bf2fda7a3bf692a122f5 (commit)
      from  374e984b7e143008d38b7d148b1700cadbccbb59 (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=c16ab966d519e8d8cb7bb073cc9b3e8d507b5cca
commit c16ab966d519e8d8cb7bb073cc9b3e8d507b5cca
Merge: 374e984 e0cc40e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 10:35:33 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 11 10:35:33 2017 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 10:35:50 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 10:35:50 -0500 (EST)
Subject: [Cmake-commits] CMake branch, release, updated. v3.7.1-17-ge9d3557
Message-ID: <20170111153550.AE01EFA867@public.kitware.com>

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, release has been updated
       via  e9d3557ccc4b26503aa7d59ec2eaf179c9924a5b (commit)
       via  a9b93501d435bcd30a96e3091255e509fedbb39f (commit)
       via  c046356a5c37f52292f65dfff2afd72cde1c47af (commit)
       via  5ffee691ee0c55d043238960cf1149cbcfb86047 (commit)
       via  68d13665e023f6ccb51ba0375cabd27e492db483 (commit)
       via  33e628ee809cd1d7ec2a8a0290ac0351fa4d499b (commit)
       via  195ab50f635bb95035b5bf2fda7a3bf692a122f5 (commit)
       via  7789dd9a1ae79d6747883739a21cf90c139d1e54 (commit)
      from  12bea47fa4d47b8e887ddbaf4c4fcc312d3052dc (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Modules/FindBoost.cmake      |   17 ++++++++++++++++-
 Modules/FindPostgreSQL.cmake |    7 ++++++-
 Source/cmServerProtocol.cxx  |   10 ++++++++--
 3 files changed, 30 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 10:50:37 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 10:50:37 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2071-g74a0318
Message-ID: <20170111155037.62BCBFA4EE@public.kitware.com>

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  74a03183ffc0982cd948bf76ce84f7891b585d1e (commit)
       via  a7c5d5fb0e8d096dfc9b6e82e93f1e0d6225fe1f (commit)
      from  c16ab966d519e8d8cb7bb073cc9b3e8d507b5cca (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=74a03183ffc0982cd948bf76ce84f7891b585d1e
commit 74a03183ffc0982cd948bf76ce84f7891b585d1e
Merge: c16ab96 a7c5d5f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 10:50:36 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 10:50:36 2017 -0500

    Merge topic 'get_prerequisites_delayload' into next
    
    a7c5d5fb GetPrerequisites: Exclude delay load dependencies on Windows


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7c5d5fb0e8d096dfc9b6e82e93f1e0d6225fe1f
commit a7c5d5fb0e8d096dfc9b6e82e93f1e0d6225fe1f
Author:     Pascal Thomet <pthomet at gmail.com>
AuthorDate: Thu Dec 22 12:28:26 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 11 10:48:36 2017 -0500

    GetPrerequisites: Exclude delay load dependencies on Windows
    
    With some Windows toolchains we use `objdump` which does not mention
    delay load dependencies in its output.  Therefore, to get consistent
    behavior we should always ignore them.
    
    Use the `dumpbin` message "Image has the following delay load
    dependencies" that precedes the delay load dependencies to recognize and
    skip them.  Fortunately, this message is not translated to the current
    locale (at least on "Windows 7 French", "Windows 10 French" and "Windows
    Server 2008 R2 French").
    
    Fixes: #16241

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 72775ce..d0cd5b9 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -810,6 +810,20 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
     OUTPUT_VARIABLE gp_cmd_ov
     ERROR_VARIABLE gp_ev
     )
+
+  if(gp_tool STREQUAL "dumpbin")
+    # Exclude delay load dependencies under windows (they are listed in dumpbin output after the message below)
+    string(FIND "${gp_cmd_ov}" "Image has the following delay load dependencies" gp_delayload_pos)
+    if (${gp_delayload_pos} GREATER -1)
+      string(SUBSTRING "${gp_cmd_ov}" 0 ${gp_delayload_pos} gp_cmd_ov_no_delayload_deps)
+      string(SUBSTRING "${gp_cmd_ov}" ${gp_delayload_pos} -1 gp_cmd_ov_delayload_deps)
+      if (verbose)
+        message(STATUS "GetPrequisites(${target}) : ignoring the following delay load dependencies :\n ${gp_cmd_ov_delayload_deps}")
+      endif()
+      set(gp_cmd_ov ${gp_cmd_ov_no_delayload_deps})
+    endif()
+  endif()
+
   if(NOT gp_rv STREQUAL "0")
     if(gp_tool STREQUAL "dumpbin")
       # dumpbin error messages seem to go to stdout

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 10:53:37 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 10:53:37 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2073-g6a7f9c0
Message-ID: <20170111155337.4483AFA57B@public.kitware.com>

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  6a7f9c025da31eff3cd63dd85c16dc5aad0534fe (commit)
       via  d6877e6c405eb67f0e3e9eae783de02d1d8be659 (commit)
      from  74a03183ffc0982cd948bf76ce84f7891b585d1e (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=6a7f9c025da31eff3cd63dd85c16dc5aad0534fe
commit 6a7f9c025da31eff3cd63dd85c16dc5aad0534fe
Merge: 74a0318 d6877e6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 10:53:36 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 10:53:36 2017 -0500

    Merge topic 'dont-include-CMakeParseArguments' into next
    
    d6877e6c Don't include CMakeParseArguments


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6877e6c405eb67f0e3e9eae783de02d1d8be659
commit d6877e6c405eb67f0e3e9eae783de02d1d8be659
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Tue Dec 20 16:14:16 2016 +0100
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Wed Jan 11 13:14:57 2017 +0100

    Don't include CMakeParseArguments
    
    The cmake_parse_arguments command is builtin with version 3.5.
    The CMakeParseArguments module is empty and exists for backwards
    compatibility with CMake 3.4 and lower.
    
    Remove the includes of CMakeParseArguments from CMake's modules.
    The modules are always used with the current version of CMake.
    
    Leave the includes in the tests, as the tests may be run with an older
    version of CMake.

diff --git a/Modules/CMakeAddFortranSubdirectory.cmake b/Modules/CMakeAddFortranSubdirectory.cmake
index 3b39bce..4649f35 100644
--- a/Modules/CMakeAddFortranSubdirectory.cmake
+++ b/Modules/CMakeAddFortranSubdirectory.cmake
@@ -45,7 +45,6 @@
 set(_MS_MINGW_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR})
 include(CheckLanguage)
 include(ExternalProject)
-include(CMakeParseArguments)
 
 function(_setup_mingw_config_and_build source_dir build_dir)
   # Look for a MinGW gfortran.
diff --git a/Modules/CMakeCompilerIdDetection.cmake b/Modules/CMakeCompilerIdDetection.cmake
index 484e1f0..7ca79bd 100644
--- a/Modules/CMakeCompilerIdDetection.cmake
+++ b/Modules/CMakeCompilerIdDetection.cmake
@@ -11,8 +11,6 @@ function(_readFile file)
   set(_compiler_id_pp_test_${CompilerId} ${_compiler_id_pp_test} PARENT_SCOPE)
 endfunction()
 
-include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
-
 function(compiler_id_detection outvar lang)
 
   if (NOT lang STREQUAL Fortran AND NOT lang STREQUAL CSharp)
diff --git a/Modules/CMakeExpandImportedTargets.cmake b/Modules/CMakeExpandImportedTargets.cmake
index add0c6d..ad065f0 100644
--- a/Modules/CMakeExpandImportedTargets.cmake
+++ b/Modules/CMakeExpandImportedTargets.cmake
@@ -37,9 +37,6 @@
 #       LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}
 #       CONFIGURATION "${CMAKE_TRY_COMPILE_CONFIGURATION}" )
 
-
-include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
-
 function(CMAKE_EXPAND_IMPORTED_TARGETS _RESULT )
 
    set(options )
diff --git a/Modules/CMakePackageConfigHelpers.cmake b/Modules/CMakePackageConfigHelpers.cmake
index 8415641..3210222 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -201,9 +201,6 @@
 #
 #    check_required_components(Foo)
 
-
-include(CMakeParseArguments)
-
 include(WriteBasicConfigVersionFile)
 
 macro(WRITE_BASIC_PACKAGE_VERSION_FILE)
diff --git a/Modules/CMakePrintHelpers.cmake b/Modules/CMakePrintHelpers.cmake
index bf98a42..21c333e 100644
--- a/Modules/CMakePrintHelpers.cmake
+++ b/Modules/CMakePrintHelpers.cmake
@@ -39,8 +39,6 @@
 #
 #   -- CMAKE_C_COMPILER="/usr/bin/gcc" ; CMAKE_MAJOR_VERSION="2" ; DOES_NOT_EXIST=""
 
-include(CMakeParseArguments)
-
 function(CMAKE_PRINT_VARIABLES)
    set(msg "")
    foreach(var ${ARGN})
diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake
index d0d24ba..b3ab055 100644
--- a/Modules/CPackIFW.cmake
+++ b/Modules/CPackIFW.cmake
@@ -630,10 +630,6 @@ if(NOT CPackComponent_CMake_INCLUDED)
     include(CPackComponent)
 endif()
 
-if(NOT __CMAKE_PARSE_ARGUMENTS_INCLUDED)
-    include(CMakeParseArguments)
-endif()
-
 # Resolve full filename for script file
 macro(_cpack_ifw_resolve_script _variable)
   set(_ifw_script_macro ${_variable})
diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index 8451a6a..1203be4 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -65,7 +65,6 @@
 #     Suppress non-error messages that otherwise would have been
 #     printed out by this function.
 
-include(CMakeParseArguments)
 function(ctest_coverage_collect_gcov)
   set(options QUIET GLOB DELETE)
   set(oneValueArgs TARBALL SOURCE BUILD GCOV_COMMAND)
diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index 88bc1c8..78d9df3 100644
--- a/Modules/FeatureSummary.cmake
+++ b/Modules/FeatureSummary.cmake
@@ -26,9 +26,6 @@ Functions
 
 #]=======================================================================]
 
-include("${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake")
-
-
 function(_FS_GET_FEATURE_SUMMARY _property _var _includeQuiet)
 
   set(_type "ANY")
diff --git a/Modules/FindBISON.cmake b/Modules/FindBISON.cmake
index 0ebd465..d684ccd 100644
--- a/Modules/FindBISON.cmake
+++ b/Modules/FindBISON.cmake
@@ -84,8 +84,6 @@
 find_program(BISON_EXECUTABLE NAMES bison win_bison DOC "path to the bison executable")
 mark_as_advanced(BISON_EXECUTABLE)
 
-include(CMakeParseArguments)
-
 if(BISON_EXECUTABLE)
   # the bison commands should be executed with the C locale, otherwise
   # the message (which are parsed) may be translated
diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake
index 214873c..fef7fb4 100644
--- a/Modules/FindFLEX.cmake
+++ b/Modules/FindFLEX.cmake
@@ -107,8 +107,6 @@ find_path(FLEX_INCLUDE_DIR FlexLexer.h
 
 mark_as_advanced(FL_LIBRARY FLEX_INCLUDE_DIR)
 
-include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
-
 set(FLEX_INCLUDE_DIRS ${FLEX_INCLUDE_DIR})
 set(FLEX_LIBRARIES ${FL_LIBRARY})
 
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 1f447f1..e1b22b6 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -165,7 +165,6 @@
 #=============================================================
 
 include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
 
 function(_GTK2_GET_VERSION _OUT_major _OUT_minor _OUT_micro _gtkversion_hdr)
     file(STRINGS ${_gtkversion_hdr} _contents REGEX "#define GTK_M[A-Z]+_VERSION[ \t]+")
diff --git a/Modules/FindGettext.cmake b/Modules/FindGettext.cmake
index 7718468..8035507 100644
--- a/Modules/FindGettext.cmake
+++ b/Modules/FindGettext.cmake
@@ -77,8 +77,6 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gettext
                                   REQUIRED_VARS GETTEXT_MSGMERGE_EXECUTABLE GETTEXT_MSGFMT_EXECUTABLE
                                   VERSION_VAR GETTEXT_VERSION_STRING)
 
-include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
-
 function(_GETTEXT_GET_UNIQUE_TARGET_NAME _name _unique_name)
    set(propertyName "_GETTEXT_UNIQUE_COUNTER_${_name}")
    get_property(currentCounter GLOBAL PROPERTY "${propertyName}")
diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake
index 7b46877..b77925d 100644
--- a/Modules/FindPackageHandleStandardArgs.cmake
+++ b/Modules/FindPackageHandleStandardArgs.cmake
@@ -130,7 +130,6 @@ message.
 #]=======================================================================]
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageMessage.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
 
 # internal helper macro
 macro(_FPHSA_FAILURE_MESSAGE _msg)
diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake
index 6c8813c..09bdf1f 100644
--- a/Modules/FindSquish.cmake
+++ b/Modules/FindSquish.cmake
@@ -119,9 +119,6 @@
 #
 #    This is deprecated. Use SQUISH_V3_ADD_TEST() if you are using Squish 3.x instead.
 
-
-include(CMakeParseArguments)
-
 set(SQUISH_INSTALL_DIR_STRING "Directory containing the bin, doc, and lib directories for Squish; this should be the root of the installation directory.")
 set(SQUISH_SERVER_EXECUTABLE_STRING "The squishserver executable program.")
 set(SQUISH_CLIENT_EXECUTABLE_STRING "The squishclient executable program.")
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index c201714..6d1b4ed 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -184,7 +184,6 @@
 # :prop_tgt:`CXX_VISIBILITY_PRESET <<LANG>_VISIBILITY_PRESET>` and
 # :prop_tgt:`VISIBILITY_INLINES_HIDDEN` instead.
 
-include(CMakeParseArguments)
 include(CheckCXXCompilerFlag)
 
 # TODO: Install this macro separately?
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 6b34c8f..93255ae 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -403,8 +403,6 @@
 #    Sets the directory where the header files will be generated. Same behavior as option
 #    '-d' of javah tool. If not specified, ${CMAKE_CURRENT_BINARY_DIR} is used as output directory.
 
-include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
-
 function (__java_copy_file src dest comment)
     add_custom_command(
         OUTPUT  ${dest}
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 651f9f1..e7512e7 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -231,8 +231,6 @@ endmacro()
 
 
 macro(SWIG_ADD_LIBRARY name)
-
-  include(CMakeParseArguments)
   set(options "")
   set(oneValueArgs LANGUAGE
                    TYPE)
@@ -340,4 +338,3 @@ macro(SWIG_LINK_LIBRARIES name)
     message(SEND_ERROR "Cannot find Swig library \"${name}\".")
   endif()
 endmacro()
-
diff --git a/Modules/WriteBasicConfigVersionFile.cmake b/Modules/WriteBasicConfigVersionFile.cmake
index 20c769e..7c9467a 100644
--- a/Modules/WriteBasicConfigVersionFile.cmake
+++ b/Modules/WriteBasicConfigVersionFile.cmake
@@ -18,8 +18,6 @@
 #
 # Deprecated, see WRITE_BASIC_PACKAGE_VERSION_FILE(), it is identical.
 
-include(CMakeParseArguments)
-
 function(WRITE_BASIC_CONFIG_VERSION_FILE _filename)
 
   set(options )
diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
index a390f4b..ba249e1 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -216,7 +216,6 @@
 #       CompatSupport_DEPRECATED=
 #   )
 
-include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/CMakeCompilerIdDetection.cmake)
 
 function(_load_compiler_variables CompilerId lang)

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

Summary of changes:
 Modules/CMakeAddFortranSubdirectory.cmake   |    1 -
 Modules/CMakeCompilerIdDetection.cmake      |    2 --
 Modules/CMakeExpandImportedTargets.cmake    |    3 ---
 Modules/CMakePackageConfigHelpers.cmake     |    3 ---
 Modules/CMakePrintHelpers.cmake             |    2 --
 Modules/CPackIFW.cmake                      |    4 ----
 Modules/CTestCoverageCollectGCOV.cmake      |    1 -
 Modules/FeatureSummary.cmake                |    3 ---
 Modules/FindBISON.cmake                     |    2 --
 Modules/FindFLEX.cmake                      |    2 --
 Modules/FindGTK2.cmake                      |    1 -
 Modules/FindGettext.cmake                   |    2 --
 Modules/FindPackageHandleStandardArgs.cmake |    1 -
 Modules/FindSquish.cmake                    |    3 ---
 Modules/GenerateExportHeader.cmake          |    1 -
 Modules/UseJava.cmake                       |    2 --
 Modules/UseSWIG.cmake                       |    3 ---
 Modules/WriteBasicConfigVersionFile.cmake   |    2 --
 Modules/WriteCompilerDetectionHeader.cmake  |    1 -
 19 files changed, 39 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 10:58:38 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 10:58:38 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2075-gafd1fd4
Message-ID: <20170111155838.D965BFA64B@public.kitware.com>

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  afd1fd49695b0dad9cca6f00749384568c214a9e (commit)
       via  17a0703d205d26048247e22174a1eda36498d341 (commit)
      from  6a7f9c025da31eff3cd63dd85c16dc5aad0534fe (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=afd1fd49695b0dad9cca6f00749384568c214a9e
commit afd1fd49695b0dad9cca6f00749384568c214a9e
Merge: 6a7f9c0 17a0703
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 10:58:37 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 10:58:37 2017 -0500

    Merge topic 'fix_get_prerequisites' into next
    
    17a0703d GetPrerequisites: Do not fail on files we cannot find


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17a0703d205d26048247e22174a1eda36498d341
commit 17a0703d205d26048247e22174a1eda36498d341
Author:     Martin Koegler <martin.koegler at chello.at>
AuthorDate: Tue Jan 10 23:28:47 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 11 10:57:04 2017 -0500

    GetPrerequisites: Do not fail on files we cannot find
    
    Historically we have always warned and skipped missing files.  Since
    commit v3.4.0-rc1~264^2~1 (GetPrerequisites: Add error checks for
    execute_process() calls, 2015-07-29) we fail instead, but this was not
    an intentional part of that change.  Restore the warn-only behavior so
    that missing system libraries (e.g. during cross-compiling) do not cause
    failure.
    
    Closes: #16523

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 72775ce..d6a78de 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -654,6 +654,8 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
 
   if(NOT EXISTS "${target}")
     message("warning: target '${target}' does not exist...")
+    set(${prerequisites_var} "" PARENT_SCOPE)
+    return()
   endif()
 
   set(gp_cmd_paths ${gp_cmd_paths}

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 11:14:56 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 11:14:56 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2077-gee14e5a
Message-ID: <20170111161456.231D8F9FE7@public.kitware.com>

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  ee14e5aaa12451d93a0cc3787d2f73b2841ec950 (commit)
       via  1ce39a1e73d6a38ec53679113ba643ac6a51781c (commit)
      from  afd1fd49695b0dad9cca6f00749384568c214a9e (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=ee14e5aaa12451d93a0cc3787d2f73b2841ec950
commit ee14e5aaa12451d93a0cc3787d2f73b2841ec950
Merge: afd1fd4 1ce39a1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 11:14:55 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 11:14:55 2017 -0500

    Merge topic 'cuda_compile_features_test_use_widely_supported_feature' into next
    
    1ce39a1e CUDA: ConsumeCompileFeatures use cxx_nullptr for wider compiler support


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ce39a1e73d6a38ec53679113ba643ac6a51781c
commit 1ce39a1e73d6a38ec53679113ba643ac6a51781c
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Wed Jan 11 10:40:38 2017 -0500
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Wed Jan 11 10:40:38 2017 -0500

    CUDA: ConsumeCompileFeatures use cxx_nullptr for wider compiler support
    
    We need to use a C++11 feature that is supported by the widest
    range of compilers, so we chose nullptr instead of constexpr.

diff --git a/Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt b/Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt
index 8361b9e..9fda2d0 100644
--- a/Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt
+++ b/Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt
@@ -11,7 +11,7 @@ project (CudaConsumeCompileFeatures CXX CUDA)
 
 
 add_library(CudaConsumeLib STATIC static.cpp static.cu)
-target_compile_features(CudaConsumeLib PUBLIC cxx_constexpr)
+target_compile_features(CudaConsumeLib PUBLIC cxx_nullptr)
 
 add_executable(CudaConsumeCompileFeatures main.cu)
 target_link_libraries(CudaConsumeCompileFeatures PRIVATE CudaConsumeLib)

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

Summary of changes:
 Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 11:33:57 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 11:33:57 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2079-g5c6d51b
Message-ID: <20170111163357.7FB63FA831@public.kitware.com>

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  5c6d51bdf072a8fb6e683636321e57430c0268ac (commit)
       via  e0ed1de4fb5e9d18c2d00775229496079d6e077a (commit)
      from  ee14e5aaa12451d93a0cc3787d2f73b2841ec950 (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=5c6d51bdf072a8fb6e683636321e57430c0268ac
commit 5c6d51bdf072a8fb6e683636321e57430c0268ac
Merge: ee14e5a e0ed1de
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 11:33:56 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 11:33:56 2017 -0500

    Merge topic 'InstallRequiredSystemLibraries-UCRT-configs' into next
    
    e0ed1de4 InstallRequiredSystemLibraries: Distinguish UCRT install configurations


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0ed1de4fb5e9d18c2d00775229496079d6e077a
commit e0ed1de4fb5e9d18c2d00775229496079d6e077a
Author:     Bjoern Thiel <bjoern.thiel at mpibpc.mpg.de>
AuthorDate: Wed Jan 11 04:49:22 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 11 11:20:47 2017 -0500

    InstallRequiredSystemLibraries: Distinguish UCRT install configurations
    
    Teach the `CMAKE_INSTALL_UCRT_LIBRARIES` feature to honor the
    `CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY` and `CMAKE_INSTALL_DEBUG_LIBRARIES`
    settings.
    
    Closes: #16542

diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index b0446c9..b04f044 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -204,21 +204,27 @@ if(MSVC)
     endif()
 
     if(CMAKE_INSTALL_UCRT_LIBRARIES AND NOT v VERSION_LESS 14)
-      # Find the Windows Universal CRT redistribution directory.
+      # Find the Windows Kits directory.
       get_filename_component(windows_kits_dir
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot10]" ABSOLUTE)
       set(programfilesx86 "ProgramFiles(x86)")
-      find_path(WINDOWS_KITS_REDIST_DIR NAMES ucrt/DLLs/${CMAKE_MSVC_ARCH}/ucrtbase.dll
+      find_path(WINDOWS_KITS_DIR NAMES Redist/ucrt/DLLs/${CMAKE_MSVC_ARCH}/ucrtbase.dll
         PATHS
-        "${windows_kits_dir}/Redist"
-        "$ENV{ProgramFiles}/Windows Kits/10/Redist"
-        "$ENV{${programfilesx86}}/Windows Kits/10/Redist"
+        "${windows_kits_dir}"
+        "$ENV{ProgramFiles}/Windows Kits/10"
+        "$ENV{${programfilesx86}}/Windows Kits/10"
         )
-      mark_as_advanced(WINDOWS_KITS_REDIST_DIR)
+      mark_as_advanced(WINDOWS_KITS_DIR)
 
       # Glob the list of UCRT DLLs.
-      file(GLOB __ucrt_dlls "${WINDOWS_KITS_REDIST_DIR}/ucrt/DLLs/${CMAKE_MSVC_ARCH}/*.dll")
-      list(APPEND __install__libs ${__ucrt_dlls})
+      if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
+        file(GLOB __ucrt_dlls "${WINDOWS_KITS_DIR}/Redist/ucrt/DLLs/${CMAKE_MSVC_ARCH}/*.dll")
+        list(APPEND __install__libs ${__ucrt_dlls})
+      endif()
+      if(CMAKE_INSTALL_DEBUG_LIBRARIES)
+        file(GLOB __ucrt_dlls "${WINDOWS_KITS_DIR}/bin/${CMAKE_MSVC_ARCH}/ucrt/*.dll")
+        list(APPEND __install__libs ${__ucrt_dlls})
+      endif()
     endif()
   endmacro()
 

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

Summary of changes:
 Modules/InstallRequiredSystemLibraries.cmake |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 11:45:18 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 11:45:18 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2081-gef155cf
Message-ID: <20170111164518.9887CF9E8F@public.kitware.com>

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  ef155cf6403be058f878d046045e111a1bff41d8 (commit)
       via  eb728d266e171987616c71a63f3f772eab45ebf3 (commit)
      from  5c6d51bdf072a8fb6e683636321e57430c0268ac (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=ef155cf6403be058f878d046045e111a1bff41d8
commit ef155cf6403be058f878d046045e111a1bff41d8
Merge: 5c6d51b eb728d2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 11:45:17 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 11:45:17 2017 -0500

    Merge topic 'FindJava-jre-hints' into next
    
    eb728d26 FindJava: add hints for jre


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb728d266e171987616c71a63f3f772eab45ebf3
commit eb728d266e171987616c71a63f3f772eab45ebf3
Author:     Rechi Rechi <Rechi at users.noreply.github.com>
AuthorDate: Wed Jan 11 16:31:01 2017 +0100
Commit:     Rechi Rechi <Rechi at users.noreply.github.com>
CommitDate: Wed Jan 11 16:31:01 2017 +0100

    FindJava: add hints for jre

diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index 5c0abb0..4265a97 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -86,6 +86,14 @@ list(APPEND _JAVA_HINTS
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.5;JavaHome]/bin"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\2.0;JavaHome]/bin"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.9;JavaHome]/bin"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.8;JavaHome]/bin"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.7;JavaHome]/bin"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\2.6;JavaHome]/bin"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.5;JavaHome]/bin"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.4;JavaHome]/bin"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.3;JavaHome]/bin"
   )
 # Hard-coded guesses should still go in PATHS. This ensures that the user
 # environment can always override hard guesses.

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 11:48:12 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 11:48:12 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2083-g6ec6ac2
Message-ID: <20170111164812.62846FA3B5@public.kitware.com>

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  6ec6ac205967a40297e8d3b9c0ca9d27863ef8c5 (commit)
       via  3462118c6d700754e243492c3a65ef4ff26923f5 (commit)
      from  ef155cf6403be058f878d046045e111a1bff41d8 (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=6ec6ac205967a40297e8d3b9c0ca9d27863ef8c5
commit 6ec6ac205967a40297e8d3b9c0ca9d27863ef8c5
Merge: ef155cf 3462118
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 11:48:11 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 11:48:11 2017 -0500

    Merge topic 'codeblocks-nmake-makefiles-jom' into next
    
    3462118c Allow CodeBlocks for NMake Makefiles JOM


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3462118c6d700754e243492c3a65ef4ff26923f5
commit 3462118c6d700754e243492c3a65ef4ff26923f5
Author:     Konstantin Podsvirov <konstantin at podsvirov.pro>
AuthorDate: Tue Jan 10 01:23:18 2017 +0300
Commit:     Konstantin Podsvirov <konstantin at podsvirov.pro>
CommitDate: Tue Jan 10 19:26:21 2017 +0300

    Allow CodeBlocks for NMake Makefiles JOM

diff --git a/Help/generator/CodeBlocks.rst b/Help/generator/CodeBlocks.rst
index 01798c7..d03cb0c 100644
--- a/Help/generator/CodeBlocks.rst
+++ b/Help/generator/CodeBlocks.rst
@@ -18,6 +18,9 @@ This "extra" generator may be specified as:
 ``CodeBlocks - NMake Makefiles``
  Generate with :generator:`NMake Makefiles`.
 
+``CodeBlocks - NMake Makefiles JOM``
+ Generate with :generator:`NMake Makefiles JOM`.
+
 ``CodeBlocks - Ninja``
  Generate with :generator:`Ninja`.
 
diff --git a/Help/release/dev/codeblocks-nmake-makefiles-jom.rst b/Help/release/dev/codeblocks-nmake-makefiles-jom.rst
new file mode 100644
index 0000000..f5612f0
--- /dev/null
+++ b/Help/release/dev/codeblocks-nmake-makefiles-jom.rst
@@ -0,0 +1,5 @@
+codeblocks-nmake-makefiles-jom
+------------------------------
+
+* The :generator:`CodeBlocks` now can generate with
+  :generator:`NMake Makefiles JOM`.
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index f544e8a..2dffcaa 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -48,6 +48,7 @@ cmExtraCodeBlocksGenerator::GetFactory()
 #if defined(_WIN32)
     factory.AddSupportedGlobalGenerator("MinGW Makefiles");
     factory.AddSupportedGlobalGenerator("NMake Makefiles");
+    factory.AddSupportedGlobalGenerator("NMake Makefiles JOM");
 // disable until somebody actually tests it:
 // this->AddSupportedGlobalGenerator("MSYS Makefiles");
 #endif
@@ -741,7 +742,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
   }
 
   std::string generator = this->GlobalGenerator->GetName();
-  if (generator == "NMake Makefiles") {
+  if (generator == "NMake Makefiles" || generator == "NMake Makefiles JOM") {
     // For Windows ConvertToOutputPath already adds quotes when required.
     // These need to be escaped, see
     // https://gitlab.kitware.com/cmake/cmake/issues/13952

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

Summary of changes:
 Help/generator/CodeBlocks.rst                       |    3 +++
 Help/release/dev/codeblocks-nmake-makefiles-jom.rst |    5 +++++
 Source/cmExtraCodeBlocksGenerator.cxx               |    3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/codeblocks-nmake-makefiles-jom.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 11:54:44 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 11:54:44 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2085-ge80f026
Message-ID: <20170111165444.CC96EFA5AF@public.kitware.com>

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  e80f026bd36fbfe70b0d88caa81bed429ca81b11 (commit)
       via  0315ab7a31091eda95caac319d42409c24fc6fac (commit)
      from  6ec6ac205967a40297e8d3b9c0ca9d27863ef8c5 (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=e80f026bd36fbfe70b0d88caa81bed429ca81b11
commit e80f026bd36fbfe70b0d88caa81bed429ca81b11
Merge: 6ec6ac2 0315ab7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 11:54:44 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 11:54:44 2017 -0500

    Merge topic 'cmake-install-infix' into next
    
    0315ab7a Add installation infix (empty by default)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0315ab7a31091eda95caac319d42409c24fc6fac
commit 0315ab7a31091eda95caac319d42409c24fc6fac
Author:     Konstantin Podsvirov <konstantin at podsvirov.pro>
AuthorDate: Wed Jan 11 14:10:39 2017 +0300
Commit:     Konstantin Podsvirov <konstantin at podsvirov.pro>
CommitDate: Wed Jan 11 14:10:39 2017 +0300

    Add installation infix (empty by default)

diff --git a/Source/CMakeInstallDestinations.cmake b/Source/CMakeInstallDestinations.cmake
index 023f6c0..28f4e87 100644
--- a/Source/CMakeInstallDestinations.cmake
+++ b/Source/CMakeInstallDestinations.cmake
@@ -25,6 +25,12 @@ set(CMAKE_DOC_DIR_DESC "docs")
 set(CMAKE_MAN_DIR_DESC "man pages")
 set(CMAKE_XDGDATA_DIR_DESC "XDG specific files")
 
+set(CMake_INSTALL_INFIX "" CACHE STRING "")
+set_property(CACHE CMake_INSTALL_INFIX PROPERTY HELPSTRING
+  "Intermediate installation path (empty by default)"
+  )
+mark_as_advanced(CMake_INSTALL_INFIX)
+
 foreach(v
     CMAKE_BIN_DIR
     CMAKE_DATA_DIR
@@ -41,7 +47,7 @@ foreach(v
 
   # Use the default when the user did not set this variable.
   if(NOT ${v})
-    set(${v} "${${v}_DEFAULT}")
+    set(${v} "${CMake_INSTALL_INFIX}${${v}_DEFAULT}")
   endif()
   # Remove leading slash to treat as relative to install prefix.
   string(REGEX REPLACE "^/" "" ${v} "${${v}}")

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 13:26:00 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 13:26:00 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2087-gd3c7c80
Message-ID: <20170111182600.CB846FA67D@public.kitware.com>

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  d3c7c8008643475c656562837bf3c072e57ef799 (commit)
       via  6310f7c3a06cf56ddfda7fd5d2a36decb6802e57 (commit)
      from  e80f026bd36fbfe70b0d88caa81bed429ca81b11 (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=d3c7c8008643475c656562837bf3c072e57ef799
commit d3c7c8008643475c656562837bf3c072e57ef799
Merge: e80f026 6310f7c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 13:25:59 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 13:25:59 2017 -0500

    Merge topic 'add-cpack-ifw-configure-file' into next
    
    6310f7c3 Add cpack_ifw_configure_file command


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6310f7c3a06cf56ddfda7fd5d2a36decb6802e57
commit 6310f7c3a06cf56ddfda7fd5d2a36decb6802e57
Author:     Konstantin Podsvirov <konstantin at podsvirov.pro>
AuthorDate: Tue Dec 13 02:01:14 2016 +0300
Commit:     Konstantin Podsvirov <konstantin at podsvirov.pro>
CommitDate: Wed Jan 11 13:56:45 2017 +0300

    Add cpack_ifw_configure_file command

diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index 015e36e..d4712ba 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -59,6 +59,7 @@ All Modules
    /module/CPackDeb
    /module/CPackDMG
    /module/CPackIFW
+   /module/CPackIFWConfigureFile
    /module/CPackNSIS
    /module/CPackPackageMaker
    /module/CPackProductBuild
diff --git a/Help/module/CPackIFWConfigureFile.rst b/Help/module/CPackIFWConfigureFile.rst
new file mode 100644
index 0000000..e88517c
--- /dev/null
+++ b/Help/module/CPackIFWConfigureFile.rst
@@ -0,0 +1 @@
+.. cmake-module:: ../../Modules/CPackIFWConfigureFile.cmake
diff --git a/Help/release/dev/cpack-ifw-configure-file.rst b/Help/release/dev/cpack-ifw-configure-file.rst
new file mode 100644
index 0000000..c9a1220
--- /dev/null
+++ b/Help/release/dev/cpack-ifw-configure-file.rst
@@ -0,0 +1,9 @@
+cpack-ifw-configure-file
+------------------------
+
+* The :command:`cpack_ifw_configure_file` command was added
+  (in :module:`CPackIFWConfigureFile`) to configure file templates prepared
+  in QtIFW/SDK/Creator style.
+
+* The :module:`CPackIFWConfigureFile` module was added to define
+  :command:`cpack_ifw_configure_file` command.
diff --git a/Modules/CPackIFWConfigureFile.cmake b/Modules/CPackIFWConfigureFile.cmake
new file mode 100644
index 0000000..790574a
--- /dev/null
+++ b/Modules/CPackIFWConfigureFile.cmake
@@ -0,0 +1,65 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#.rst:
+# CPackIFWConfigureFile
+# ---------------------
+#
+# The module defines :command:`configure_file` similar command to
+# configure file templates prepared in QtIFW/SDK/Creator style.
+#
+#
+# Commands
+# ^^^^^^^^
+#
+# The module defines the following commands:
+#
+# .. command:: cpack_ifw_configure_file
+#
+#   Copy a file to another location and modify its contents.
+#
+#   ::
+#
+#     cpack_ifw_configure_file(<input> <output>)
+#
+#   Copies an ``<input>`` file to an ``<output>`` file and substitutes variable
+#   values referenced as ``%{VAR}`` or ``%VAR%`` in the input file content.
+#   Each variable reference will be replaced with the current value of the
+#   variable, or the empty string if the variable is not defined.
+#
+
+# NOTE: This file used to himself packaging via CPack IFW generator and
+# should be compatible with minimal CMake version defined in
+# ../CMakeLists.txt file.
+
+if(NOT DEFINED CPackIFWConfigureFile_CMake_INCLUDED)
+set(CPackIFWConfigureFile_CMake_INCLUDED 1)
+
+macro(cpack_ifw_configure_file INPUT OUTPUT)
+  file(READ "${INPUT}" _tmp)
+  foreach(_tmp_regex "%{([^%}]+)}" "%([^%]+)%")
+    string(REGEX MATCHALL "${_tmp_regex}" _tmp_vars "${_tmp}")
+    while(_tmp_vars)
+      foreach(_tmp_var ${_tmp_vars})
+        string(REGEX REPLACE "${_tmp_regex}" "\\1"
+          _tmp_var_name "${_tmp_var}")
+        if(DEFINED ${_tmp_var_name})
+          set(_tmp_var_value "${${_tmp_var_name}}")
+        elseif(NOT "$ENV{${_tmp_var_name}}" STREQUAL "")
+          set(_tmp_var_value "$ENV{${_tmp_var_name}}")
+        else()
+          set(_tmp_var_value "")
+        endif()
+        string(REPLACE "${_tmp_var}" "${_tmp_var_value}" _tmp "${_tmp}")
+      endforeach()
+      string(REGEX MATCHALL "${_tmp_regex}" _tmp_vars "${_tmp}")
+    endwhile()
+  endforeach()
+  if(IS_ABSOLUTE "${OUTPUT}")
+    file(WRITE "${OUTPUT}" "${_tmp}")
+  else()
+    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT}" "${_tmp}")
+  endif()
+endmacro()
+
+endif() # NOT DEFINED CPackIFWConfigureFile_CMake_INCLUDED

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

Summary of changes:
 Help/manual/cmake-modules.7.rst               |    1 +
 Help/module/CPackIFWConfigureFile.rst         |    1 +
 Help/release/dev/cpack-ifw-configure-file.rst |    9 ++++
 Modules/CPackIFWConfigureFile.cmake           |   65 +++++++++++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100644 Help/module/CPackIFWConfigureFile.rst
 create mode 100644 Help/release/dev/cpack-ifw-configure-file.rst
 create mode 100644 Modules/CPackIFWConfigureFile.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 13:51:57 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 13:51:57 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2089-gaedbd25
Message-ID: <20170111185158.18923FA256@public.kitware.com>

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  aedbd25e061fc348bd2b88862956d972a955059b (commit)
       via  7bad99b0d3fb50853937d99cd68eb340a0975156 (commit)
      from  d3c7c8008643475c656562837bf3c072e57ef799 (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=aedbd25e061fc348bd2b88862956d972a955059b
commit aedbd25e061fc348bd2b88862956d972a955059b
Merge: d3c7c80 7bad99b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 13:51:56 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 13:51:56 2017 -0500

    Merge topic 'cmFileMonitor-skip-empty-names' into next
    
    7bad99b0 cmake-server: Do not try watching subdirectories with empty names


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bad99b0d3fb50853937d99cd68eb340a0975156
commit 7bad99b0d3fb50853937d99cd68eb340a0975156
Author:     Aleix Pol <aleixpol at kde.org>
AuthorDate: Wed Jan 11 19:08:04 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 11 13:48:41 2017 -0500

    cmake-server: Do not try watching subdirectories with empty names
    
    `cmsys::SystemTools::SplitPath` will return empty segments on paths
    where there's duplicaded consequent slashes (e.g.  `/home/dir/my//stuff`).
    This makes the cmFileWatcher choke.  Teach cmFileMonitor to skip these
    empty segments.
    
    Closes: #16531

diff --git a/Source/cmFileMonitor.cxx b/Source/cmFileMonitor.cxx
index ea37683..815de95 100644
--- a/Source/cmFileMonitor.cxx
+++ b/Source/cmFileMonitor.cxx
@@ -331,6 +331,9 @@ void cmFileMonitor::MonitorPaths(const std::vector<std::string>& paths,
           rootSegment)); // Can not be both filename and root part of the path!
 
       const std::string& currentSegment = pathSegments[i];
+      if (currentSegment.empty()) {
+        continue;
+      }
 
       cmIBaseWatcher* nextWatcher = currentWatcher->Find(currentSegment);
       if (!nextWatcher) {

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

Summary of changes:
 Source/cmFileMonitor.cxx |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 14:59:00 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 14:59:00 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2091-ga37e6e2
Message-ID: <20170111195933.37197FA7D1@public.kitware.com>

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  a37e6e27efa5729c6136105f6bd702986050d58c (commit)
       via  4b0c13a87ffb799334669f77978cc4d5e83f950a (commit)
      from  aedbd25e061fc348bd2b88862956d972a955059b (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=a37e6e27efa5729c6136105f6bd702986050d58c
commit a37e6e27efa5729c6136105f6bd702986050d58c
Merge: aedbd25 4b0c13a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 14:57:17 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 14:57:17 2017 -0500

    Merge topic 'launcher-tests' into next
    
    4b0c13a8 Tests: Add additional launcher tests


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b0c13a87ffb799334669f77978cc4d5e83f950a
commit 4b0c13a87ffb799334669f77978cc4d5e83f950a
Author:     Matthew Woehlke <matthew.woehlke at kitware.com>
AuthorDate: Tue Jan 10 13:48:59 2017 -0500
Commit:     Matthew Woehlke <matthew.woehlke at kitware.com>
CommitDate: Tue Jan 10 13:48:59 2017 -0500

    Tests: Add additional launcher tests
    
    Modify the launcher test to also try to build two executables, having
    respectively build and link errors. This is intended to test that
    launchers are used when running compile and link commands, as well as
    custom commands. (In particular, this should catch breakage such as that
    fixed by ce71bd9505a.)

diff --git a/Tests/CTestTestLaunchers/launcher_compiler_test_project/CMakeLists.txt b/Tests/CTestTestLaunchers/launcher_compiler_test_project/CMakeLists.txt
new file mode 100644
index 0000000..7376a40
--- /dev/null
+++ b/Tests/CTestTestLaunchers/launcher_compiler_test_project/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 2.8.12)
+
+project(launcher_compiler_test_project)
+
+include(CTest)
+
+add_executable(build_error build_error.cxx)
diff --git a/Tests/CTestTestLaunchers/launcher_test_project/CTestConfig.cmake b/Tests/CTestTestLaunchers/launcher_compiler_test_project/CTestConfig.cmake
similarity index 100%
copy from Tests/CTestTestLaunchers/launcher_test_project/CTestConfig.cmake
copy to Tests/CTestTestLaunchers/launcher_compiler_test_project/CTestConfig.cmake
diff --git a/Tests/CTestTestLaunchers/launcher_compiler_test_project/build_error.cxx b/Tests/CTestTestLaunchers/launcher_compiler_test_project/build_error.cxx
new file mode 100644
index 0000000..2d51693
--- /dev/null
+++ b/Tests/CTestTestLaunchers/launcher_compiler_test_project/build_error.cxx
@@ -0,0 +1,5 @@
+int main()
+{
+  int = 3;
+  return;
+}
diff --git a/Tests/CTestTestLaunchers/launcher_test_project/CMakeLists.txt b/Tests/CTestTestLaunchers/launcher_custom_command_test_project/CMakeLists.txt
similarity index 89%
rename from Tests/CTestTestLaunchers/launcher_test_project/CMakeLists.txt
rename to Tests/CTestTestLaunchers/launcher_custom_command_test_project/CMakeLists.txt
index 06c5725..b31f587 100644
--- a/Tests/CTestTestLaunchers/launcher_test_project/CMakeLists.txt
+++ b/Tests/CTestTestLaunchers/launcher_custom_command_test_project/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8.12)
 
-project(launcher_test_project)
+project(launcher_custom_command_test_project)
 
 include(CTest)
 
diff --git a/Tests/CTestTestLaunchers/launcher_test_project/CTestConfig.cmake b/Tests/CTestTestLaunchers/launcher_custom_command_test_project/CTestConfig.cmake
similarity index 100%
copy from Tests/CTestTestLaunchers/launcher_test_project/CTestConfig.cmake
copy to Tests/CTestTestLaunchers/launcher_custom_command_test_project/CTestConfig.cmake
diff --git a/Tests/CTestTestLaunchers/launcher_test_project/command.cmake b/Tests/CTestTestLaunchers/launcher_custom_command_test_project/command.cmake
similarity index 100%
rename from Tests/CTestTestLaunchers/launcher_test_project/command.cmake
rename to Tests/CTestTestLaunchers/launcher_custom_command_test_project/command.cmake
diff --git a/Tests/CTestTestLaunchers/launcher_linker_test_project/CMakeLists.txt b/Tests/CTestTestLaunchers/launcher_linker_test_project/CMakeLists.txt
new file mode 100644
index 0000000..38980aa
--- /dev/null
+++ b/Tests/CTestTestLaunchers/launcher_linker_test_project/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 2.8.12)
+
+project(launcher_linker_test_project)
+
+include(CTest)
+
+add_executable(link_error link_error.cxx)
diff --git a/Tests/CTestTestLaunchers/launcher_test_project/CTestConfig.cmake b/Tests/CTestTestLaunchers/launcher_linker_test_project/CTestConfig.cmake
similarity index 100%
rename from Tests/CTestTestLaunchers/launcher_test_project/CTestConfig.cmake
rename to Tests/CTestTestLaunchers/launcher_linker_test_project/CTestConfig.cmake
diff --git a/Tests/CTestTestLaunchers/launcher_linker_test_project/link_error.cxx b/Tests/CTestTestLaunchers/launcher_linker_test_project/link_error.cxx
new file mode 100644
index 0000000..c879be1
--- /dev/null
+++ b/Tests/CTestTestLaunchers/launcher_linker_test_project/link_error.cxx
@@ -0,0 +1,6 @@
+extern int foo();
+
+int main()
+{
+  return foo();
+}
diff --git a/Tests/CTestTestLaunchers/test.cmake.in b/Tests/CTestTestLaunchers/test.cmake.in
index 03a118a..2db1ddd 100644
--- a/Tests/CTestTestLaunchers/test.cmake.in
+++ b/Tests/CTestTestLaunchers/test.cmake.in
@@ -1,39 +1,51 @@
 cmake_minimum_required(VERSION 2.8.12)
 
-# Settings:
-set(CTEST_DASHBOARD_SOURCE              "@CMake_SOURCE_DIR@/Tests/CTestTestLaunchers")
-set(CTEST_DASHBOARD_ROOT                "@CMake_BINARY_DIR@/Tests/CTestTestLaunchers")
-set(CTEST_SITE                          "@SITE@")
-set(CTEST_BUILD_NAME                    "Launchers- at BUILDNAME@-CTestTestLaunchers")
-
-set(CTEST_SOURCE_DIRECTORY              "${CTEST_DASHBOARD_SOURCE}/launcher_test_project")
-set(CTEST_BINARY_DIRECTORY              "${CTEST_DASHBOARD_ROOT}/launcher_test_project-bin")
-set(CTEST_CMAKE_GENERATOR               "@CMAKE_GENERATOR@")
-set(CTEST_CMAKE_GENERATOR_PLATFORM      "@CMAKE_GENERATOR_PLATFORM@")
-set(CTEST_CMAKE_GENERATOR_TOOLSET       "@CMAKE_GENERATOR_TOOLSET@")
-set(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
-set(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
-
-ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
-
-file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
-CMAKE_CXX_FLAGS:STRING=@CMAKE_CXX_FLAGS@
-CMAKE_C_FLAGS:STRING=@CMAKE_C_FLAGS@
-CMAKE_C_COMPILER:STRING=@CMAKE_C_COMPILER@
-CMAKE_CXX_COMPILER:STRING=@CMAKE_CXX_COMPILER@
-CMAKE_C_COMPILER_ARG1:STRING=@CMAKE_C_COMPILER_ARG1@
-CMAKE_CXX_COMPILER_ARG1:STRING=@CMAKE_CXX_COMPILER_ARG1@
-")
-
-set(TEST_SUCCESS FALSE)
-
-ctest_start(Experimental)
-ctest_configure(OPTIONS "-DCTEST_USE_LAUNCHERS=1")
-ctest_build(NUMBER_ERRORS error_count)
-
-if("${error_count}" STREQUAL "1")
-  set(TEST_SUCCESS TRUE)
-endif()
+set(TEST_SUCCESS TRUE)
+
+function(run_test_case NAME WHAT)
+  set(_message "Testing that launchers are used when running ${WHAT}")
+  message(STATUS "${_message}...")
+
+  # Settings:
+  set(CTEST_DASHBOARD_SOURCE              "@CMake_SOURCE_DIR@/Tests/CTestTestLaunchers")
+  set(CTEST_DASHBOARD_ROOT                "@CMake_BINARY_DIR@/Tests/CTestTestLaunchers")
+  set(CTEST_SITE                          "@SITE@")
+  set(CTEST_BUILD_NAME                    "Launchers- at BUILDNAME@-CTestTestLaunchers")
+
+  set(CTEST_SOURCE_DIRECTORY              "${CTEST_DASHBOARD_SOURCE}/${NAME}")
+  set(CTEST_BINARY_DIRECTORY              "${CTEST_DASHBOARD_ROOT}/${NAME}-bin")
+  set(CTEST_CMAKE_GENERATOR               "@CMAKE_GENERATOR@")
+  set(CTEST_CMAKE_GENERATOR_PLATFORM      "@CMAKE_GENERATOR_PLATFORM@")
+  set(CTEST_CMAKE_GENERATOR_TOOLSET       "@CMAKE_GENERATOR_TOOLSET@")
+  set(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
+  set(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
+
+  ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
+
+  file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
+  CMAKE_CXX_FLAGS:STRING=@CMAKE_CXX_FLAGS@
+  CMAKE_C_FLAGS:STRING=@CMAKE_C_FLAGS@
+  CMAKE_C_COMPILER:STRING=@CMAKE_C_COMPILER@
+  CMAKE_CXX_COMPILER:STRING=@CMAKE_CXX_COMPILER@
+  CMAKE_C_COMPILER_ARG1:STRING=@CMAKE_C_COMPILER_ARG1@
+  CMAKE_CXX_COMPILER_ARG1:STRING=@CMAKE_CXX_COMPILER_ARG1@
+  ")
+
+  ctest_start(Experimental)
+  ctest_configure(OPTIONS "-DCTEST_USE_LAUNCHERS=1")
+  ctest_build(NUMBER_ERRORS error_count)
+
+  if("${error_count}" STREQUAL "0")
+    set(TEST_SUCCESS FALSE PARENT_SCOPE)
+    message(STATUS "${_message}... FAIL")
+  else()
+    message(STATUS "${_message}... PASS")
+  endif()
+endfunction()
+
+run_test_case(launcher_compiler_test_project "the compiler")
+run_test_case(launcher_linker_test_project "the linker")
+run_test_case(launcher_custom_command_test_project "a custom command")
 
 if(TEST_SUCCESS)
   message("CTEST_TEST_LAUNCHER_SUCCESS")

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

Summary of changes:
 .../launcher_compiler_test_project/CMakeLists.txt  |    7 ++
 .../CTestConfig.cmake                              |    0
 .../launcher_compiler_test_project/build_error.cxx |    5 ++
 .../CMakeLists.txt                                 |    2 +-
 .../CTestConfig.cmake                              |    0
 .../command.cmake                                  |    0
 .../launcher_linker_test_project/CMakeLists.txt    |    7 ++
 .../CTestConfig.cmake                              |    0
 .../launcher_linker_test_project/link_error.cxx}   |    1 +
 Tests/CTestTestLaunchers/test.cmake.in             |   80 +++++++++++---------
 10 files changed, 67 insertions(+), 35 deletions(-)
 create mode 100644 Tests/CTestTestLaunchers/launcher_compiler_test_project/CMakeLists.txt
 copy Tests/CTestTestLaunchers/{launcher_test_project => launcher_compiler_test_project}/CTestConfig.cmake (100%)
 create mode 100644 Tests/CTestTestLaunchers/launcher_compiler_test_project/build_error.cxx
 rename Tests/CTestTestLaunchers/{launcher_test_project => launcher_custom_command_test_project}/CMakeLists.txt (89%)
 copy Tests/CTestTestLaunchers/{launcher_test_project => launcher_custom_command_test_project}/CTestConfig.cmake (100%)
 rename Tests/CTestTestLaunchers/{launcher_test_project => launcher_custom_command_test_project}/command.cmake (100%)
 create mode 100644 Tests/CTestTestLaunchers/launcher_linker_test_project/CMakeLists.txt
 rename Tests/CTestTestLaunchers/{launcher_test_project => launcher_linker_test_project}/CTestConfig.cmake (100%)
 copy Tests/{Dependency/Case4/bar.c => CTestTestLaunchers/launcher_linker_test_project/link_error.cxx} (98%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 11 15:06:27 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Jan 2017 15:06:27 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2093-g3dd0616
Message-ID: <20170111200801.D5201FA84E@public.kitware.com>

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  3dd0616af3c5928e5c880186d5cfd241506a4369 (commit)
       via  efff7086c66d63c62d9474eca5a3b2d21d725bfe (commit)
      from  a37e6e27efa5729c6136105f6bd702986050d58c (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=3dd0616af3c5928e5c880186d5cfd241506a4369
commit 3dd0616af3c5928e5c880186d5cfd241506a4369
Merge: a37e6e2 efff708
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 15:06:11 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 15:06:11 2017 -0500

    Merge topic 'asan_overriding_user_options' into next
    
    efff7086 ctest_memcheck: Append sanitizers user options at the end to allow overriding


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efff7086c66d63c62d9474eca5a3b2d21d725bfe
commit efff7086c66d63c62d9474eca5a3b2d21d725bfe
Author:     Sylvain Joubert <joubert.sy at gmail.com>
AuthorDate: Wed Jan 11 18:58:19 2017 +0100
Commit:     Sylvain Joubert <joubert.sy at gmail.com>
CommitDate: Wed Jan 11 19:27:45 2017 +0100

    ctest_memcheck: Append sanitizers user options at the end to allow overriding

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 4d23e45..a062e64 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -634,7 +634,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       std::string outputFile =
         envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\"";
       this->MemoryTesterEnvironmentVariable =
-        outputFile + extraOptions + suppressionsOption;
+        outputFile + suppressionsOption + extraOptions;
       break;
     }
     default:

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

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


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Thu Jan 12 00:01:16 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Thu, 12 Jan 2017 00:01:16 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1030-g053adc6
Message-ID: <20170112050117.7BF4EFA4AF@public.kitware.com>

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  053adc60ee80e55f2a8c09fadadc5db6e789412d (commit)
      from  e0cc40ed58a16f63a26cf25c56f6e8471401fbfe (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=053adc60ee80e55f2a8c09fadadc5db6e789412d
commit 053adc60ee80e55f2a8c09fadadc5db6e789412d
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Thu Jan 12 00:01:06 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jan 12 00:01:06 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index a5a07dc..fde01c1 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 20170111)
+set(CMake_VERSION_PATCH 20170112)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:20:26 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:20:26 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1032-gc9a0b14
Message-ID: <20170112152026.46A11FA0EF@public.kitware.com>

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  c9a0b14153b87de34a651b1136971f9404fc362c (commit)
       via  7bad99b0d3fb50853937d99cd68eb340a0975156 (commit)
      from  053adc60ee80e55f2a8c09fadadc5db6e789412d (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=c9a0b14153b87de34a651b1136971f9404fc362c
commit c9a0b14153b87de34a651b1136971f9404fc362c
Merge: 053adc6 7bad99b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:20:21 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 10:20:21 2017 -0500

    Merge topic 'cmFileMonitor-skip-empty-names'
    
    7bad99b0 cmake-server: Do not try watching subdirectories with empty names


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

Summary of changes:
 Source/cmFileMonitor.cxx |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:20:32 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:20:32 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1034-g082456e
Message-ID: <20170112152032.7EFE6FA1A1@public.kitware.com>

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  082456e5a3ded411c6cbbdf9c3d3f6fb39fbc9c5 (commit)
       via  3462118c6d700754e243492c3a65ef4ff26923f5 (commit)
      from  c9a0b14153b87de34a651b1136971f9404fc362c (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=082456e5a3ded411c6cbbdf9c3d3f6fb39fbc9c5
commit 082456e5a3ded411c6cbbdf9c3d3f6fb39fbc9c5
Merge: c9a0b14 3462118
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:20:27 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 10:20:27 2017 -0500

    Merge topic 'codeblocks-nmake-makefiles-jom'
    
    3462118c Allow CodeBlocks for NMake Makefiles JOM


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

Summary of changes:
 Help/generator/CodeBlocks.rst                       |    3 +++
 Help/release/dev/codeblocks-nmake-makefiles-jom.rst |    5 +++++
 Source/cmExtraCodeBlocksGenerator.cxx               |    3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/codeblocks-nmake-makefiles-jom.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:20:36 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:20:36 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1036-g592c8cf
Message-ID: <20170112152037.8008CFA0EF@public.kitware.com>

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  592c8cfd93b8fd2ceb579b09b9b6f4c157adea3b (commit)
       via  6310f7c3a06cf56ddfda7fd5d2a36decb6802e57 (commit)
      from  082456e5a3ded411c6cbbdf9c3d3f6fb39fbc9c5 (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=592c8cfd93b8fd2ceb579b09b9b6f4c157adea3b
commit 592c8cfd93b8fd2ceb579b09b9b6f4c157adea3b
Merge: 082456e 6310f7c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:20:33 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 10:20:33 2017 -0500

    Merge topic 'add-cpack-ifw-configure-file'
    
    6310f7c3 Add cpack_ifw_configure_file command


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

Summary of changes:
 Help/manual/cmake-modules.7.rst               |    1 +
 Help/module/CPackIFWConfigureFile.rst         |    1 +
 Help/release/dev/cpack-ifw-configure-file.rst |    9 ++++
 Modules/CPackIFWConfigureFile.cmake           |   65 +++++++++++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100644 Help/module/CPackIFWConfigureFile.rst
 create mode 100644 Help/release/dev/cpack-ifw-configure-file.rst
 create mode 100644 Modules/CPackIFWConfigureFile.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:20:40 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:20:40 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1038-gec09e91
Message-ID: <20170112152040.C3DAEFA1A1@public.kitware.com>

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  ec09e91a653fb5d2df2d4fe5c3bc76a453ac5e39 (commit)
       via  0315ab7a31091eda95caac319d42409c24fc6fac (commit)
      from  592c8cfd93b8fd2ceb579b09b9b6f4c157adea3b (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=ec09e91a653fb5d2df2d4fe5c3bc76a453ac5e39
commit ec09e91a653fb5d2df2d4fe5c3bc76a453ac5e39
Merge: 592c8cf 0315ab7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:20:38 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 10:20:38 2017 -0500

    Merge topic 'cmake-install-infix'
    
    0315ab7a Add installation infix (empty by default)


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:20:44 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:20:44 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1040-g097b47b
Message-ID: <20170112152044.5A8FCFA21B@public.kitware.com>

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  097b47b972d04c0546f5799dc901f971b471c2b3 (commit)
       via  d6877e6c405eb67f0e3e9eae783de02d1d8be659 (commit)
      from  ec09e91a653fb5d2df2d4fe5c3bc76a453ac5e39 (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=097b47b972d04c0546f5799dc901f971b471c2b3
commit 097b47b972d04c0546f5799dc901f971b471c2b3
Merge: ec09e91 d6877e6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:20:41 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 10:20:41 2017 -0500

    Merge topic 'dont-include-CMakeParseArguments'
    
    d6877e6c Don't include CMakeParseArguments


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

Summary of changes:
 Modules/CMakeAddFortranSubdirectory.cmake   |    1 -
 Modules/CMakeCompilerIdDetection.cmake      |    2 --
 Modules/CMakeExpandImportedTargets.cmake    |    3 ---
 Modules/CMakePackageConfigHelpers.cmake     |    3 ---
 Modules/CMakePrintHelpers.cmake             |    2 --
 Modules/CPackIFW.cmake                      |    4 ----
 Modules/CTestCoverageCollectGCOV.cmake      |    1 -
 Modules/FeatureSummary.cmake                |    3 ---
 Modules/FindBISON.cmake                     |    2 --
 Modules/FindFLEX.cmake                      |    2 --
 Modules/FindGTK2.cmake                      |    1 -
 Modules/FindGettext.cmake                   |    2 --
 Modules/FindPackageHandleStandardArgs.cmake |    1 -
 Modules/FindSquish.cmake                    |    3 ---
 Modules/GenerateExportHeader.cmake          |    1 -
 Modules/UseJava.cmake                       |    2 --
 Modules/UseSWIG.cmake                       |    3 ---
 Modules/WriteBasicConfigVersionFile.cmake   |    2 --
 Modules/WriteCompilerDetectionHeader.cmake  |    1 -
 19 files changed, 39 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:20:47 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:20:47 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1042-ge15106b
Message-ID: <20170112152047.71554F9414@public.kitware.com>

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  e15106b2f1825fb42bb82a47b1ee5e9299212fa6 (commit)
       via  6e6253ea88542e9a3c8afc9560f131bc7073ead7 (commit)
      from  097b47b972d04c0546f5799dc901f971b471c2b3 (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=e15106b2f1825fb42bb82a47b1ee5e9299212fa6
commit e15106b2f1825fb42bb82a47b1ee5e9299212fa6
Merge: 097b47b 6e6253e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:20:45 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 10:20:45 2017 -0500

    Merge topic 'cmListFileLexer-warning-fix'
    
    6e6253ea cmListFileLexer: Fix signature of cmListFileLexer_New


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

Summary of changes:
 Source/cmListFileLexer.c    |    2 +-
 Source/cmListFileLexer.h    |    2 +-
 Source/cmListFileLexer.in.l |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:20:53 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:20:53 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1050-g88a816c
Message-ID: <20170112152106.31C26FA252@public.kitware.com>

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  88a816c6b9b4f5cb11b40410935d47fa61b39858 (commit)
       via  3a97a3713a498c9a89a1733131196f7fcd03552c (commit)
       via  c93e85d87e683e4c20e5f29726889279aea9d921 (commit)
       via  18c8278b622e4cb9b155c5dc4ceac93322bed85f (commit)
       via  d47bda00b2e46b3fd6f9e050f3f21b5337ac244b (commit)
       via  efdfc26e14b5a4d8b52a1021ffe85418cdfc802f (commit)
       via  ad5b702c0914e0912693b9e5a84d9fe4bb53d720 (commit)
       via  def7395f6278c096ab8f4f418cd5db5059c8c314 (commit)
      from  e15106b2f1825fb42bb82a47b1ee5e9299212fa6 (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=88a816c6b9b4f5cb11b40410935d47fa61b39858
commit 88a816c6b9b4f5cb11b40410935d47fa61b39858
Merge: e15106b 3a97a37
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:20:48 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 10:20:48 2017 -0500

    Merge topic 'vs15-detect-from-installer'
    
    3a97a371 VS: Port Visual Studio Setup third-party header to older VS versions
    c93e85d8 VS: Use Visual Studio Installer to locate VS 2017
    18c8278b VS: Add helper class to interact with Visual Studio Installer
    d47bda00 VS: Fix VS 2017 Windows Store toolset selection
    efdfc26e VS: Drop check for VS 15 Express Edition
    ad5b702c VS: Port Visual Studio Setup third-party header to MinGW
    def7395f VS: Add Visual Studio Setup third-party header


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

Summary of changes:
 Source/CMakeLists.txt                          |    2 +
 Source/cmGlobalVisualStudio10Generator.cxx     |   14 -
 Source/cmGlobalVisualStudio15Generator.cxx     |   56 +-
 Source/cmGlobalVisualStudio15Generator.h       |    5 +
 Source/cmVSSetupHelper.cxx                     |  395 ++++++++++
 Source/cmVSSetupHelper.h                       |  154 ++++
 Source/cmake.cxx                               |   30 +-
 Utilities/{cmcurl => cmvssetup}/.gitattributes |    0
 Utilities/cmvssetup/Setup.Configuration.h      |  991 ++++++++++++++++++++++++
 9 files changed, 1603 insertions(+), 44 deletions(-)
 create mode 100644 Source/cmVSSetupHelper.cxx
 create mode 100644 Source/cmVSSetupHelper.h
 copy Utilities/{cmcurl => cmvssetup}/.gitattributes (100%)
 create mode 100644 Utilities/cmvssetup/Setup.Configuration.h


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:21:09 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:21:09 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1052-g2e550e3
Message-ID: <20170112152113.E9C4AFA25A@public.kitware.com>

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  2e550e36d29332adda29f85fbf79e1610286ab9b (commit)
       via  eb728d266e171987616c71a63f3f772eab45ebf3 (commit)
      from  88a816c6b9b4f5cb11b40410935d47fa61b39858 (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=2e550e36d29332adda29f85fbf79e1610286ab9b
commit 2e550e36d29332adda29f85fbf79e1610286ab9b
Merge: 88a816c eb728d2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:21:07 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 10:21:07 2017 -0500

    Merge topic 'FindJava-jre-hints'
    
    eb728d26 FindJava: add hints for jre


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:21:17 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:21:17 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1054-g5e76ded
Message-ID: <20170112152121.4B68AF9414@public.kitware.com>

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  5e76ded22c8900a8aea3dbc76f2401f5d832298e (commit)
       via  1ce39a1e73d6a38ec53679113ba643ac6a51781c (commit)
      from  2e550e36d29332adda29f85fbf79e1610286ab9b (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=5e76ded22c8900a8aea3dbc76f2401f5d832298e
commit 5e76ded22c8900a8aea3dbc76f2401f5d832298e
Merge: 2e550e3 1ce39a1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:21:15 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 10:21:15 2017 -0500

    Merge topic 'cuda_compile_features_test_use_widely_supported_feature'
    
    1ce39a1e CUDA: ConsumeCompileFeatures use cxx_nullptr for wider compiler support


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

Summary of changes:
 Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:21:27 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:21:27 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1056-gb4f7ce5
Message-ID: <20170112152129.1FAE7FA25C@public.kitware.com>

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  b4f7ce5c79bf06292deaad8097da7889eddc2886 (commit)
       via  17a0703d205d26048247e22174a1eda36498d341 (commit)
      from  5e76ded22c8900a8aea3dbc76f2401f5d832298e (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=b4f7ce5c79bf06292deaad8097da7889eddc2886
commit b4f7ce5c79bf06292deaad8097da7889eddc2886
Merge: 5e76ded 17a0703
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:21:24 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 10:21:24 2017 -0500

    Merge topic 'fix_get_prerequisites'
    
    17a0703d GetPrerequisites: Do not fail on files we cannot find


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:21:33 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:21:33 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1058-gbc09abd
Message-ID: <20170112152146.6CA48FA25A@public.kitware.com>

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  bc09abd7d07064ed046cdc8e959b443d69f77596 (commit)
       via  a7c5d5fb0e8d096dfc9b6e82e93f1e0d6225fe1f (commit)
      from  b4f7ce5c79bf06292deaad8097da7889eddc2886 (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=bc09abd7d07064ed046cdc8e959b443d69f77596
commit bc09abd7d07064ed046cdc8e959b443d69f77596
Merge: b4f7ce5 a7c5d5f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:21:30 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 10:21:30 2017 -0500

    Merge topic 'get_prerequisites_delayload'
    
    a7c5d5fb GetPrerequisites: Exclude delay load dependencies on Windows


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:22:00 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:22:00 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1060-ge31986b
Message-ID: <20170112152202.E7127FA25A@public.kitware.com>

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  e31986b90058a46071f7fe4a52788de6b42cb96c (commit)
       via  e0ed1de4fb5e9d18c2d00775229496079d6e077a (commit)
      from  bc09abd7d07064ed046cdc8e959b443d69f77596 (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=e31986b90058a46071f7fe4a52788de6b42cb96c
commit e31986b90058a46071f7fe4a52788de6b42cb96c
Merge: bc09abd e0ed1de
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:21:56 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 10:21:56 2017 -0500

    Merge topic 'InstallRequiredSystemLibraries-UCRT-configs'
    
    e0ed1de4 InstallRequiredSystemLibraries: Distinguish UCRT install configurations


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

Summary of changes:
 Modules/InstallRequiredSystemLibraries.cmake |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:22:06 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:22:06 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1062-g51255a7
Message-ID: <20170112152206.BA30DFA29F@public.kitware.com>

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  51255a7c7ade4b591b38ef6d61ce0f6a6ed96699 (commit)
       via  efff7086c66d63c62d9474eca5a3b2d21d725bfe (commit)
      from  e31986b90058a46071f7fe4a52788de6b42cb96c (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=51255a7c7ade4b591b38ef6d61ce0f6a6ed96699
commit 51255a7c7ade4b591b38ef6d61ce0f6a6ed96699
Merge: e31986b efff708
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:22:04 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 10:22:04 2017 -0500

    Merge topic 'asan_overriding_user_options'
    
    efff7086 ctest_memcheck: Append sanitizers user options at the end to allow overriding


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:22:11 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:22:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1064-g889fe63
Message-ID: <20170112152214.8779EFA2A7@public.kitware.com>

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  889fe63b510b9669e42af31600c2c887abe0bb34 (commit)
       via  4b0c13a87ffb799334669f77978cc4d5e83f950a (commit)
      from  51255a7c7ade4b591b38ef6d61ce0f6a6ed96699 (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=889fe63b510b9669e42af31600c2c887abe0bb34
commit 889fe63b510b9669e42af31600c2c887abe0bb34
Merge: 51255a7 4b0c13a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:22:08 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 10:22:08 2017 -0500

    Merge topic 'launcher-tests'
    
    4b0c13a8 Tests: Add additional launcher tests


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

Summary of changes:
 .../launcher_compiler_test_project/CMakeLists.txt  |    7 ++
 .../CTestConfig.cmake                              |    0
 .../launcher_compiler_test_project/build_error.cxx |    5 ++
 .../CMakeLists.txt                                 |    2 +-
 .../CTestConfig.cmake                              |    0
 .../command.cmake                                  |    0
 .../launcher_linker_test_project/CMakeLists.txt    |    7 ++
 .../CTestConfig.cmake                              |    0
 .../launcher_linker_test_project/link_error.cxx}   |    1 +
 Tests/CTestTestLaunchers/test.cmake.in             |   80 +++++++++++---------
 10 files changed, 67 insertions(+), 35 deletions(-)
 create mode 100644 Tests/CTestTestLaunchers/launcher_compiler_test_project/CMakeLists.txt
 copy Tests/CTestTestLaunchers/{launcher_test_project => launcher_compiler_test_project}/CTestConfig.cmake (100%)
 create mode 100644 Tests/CTestTestLaunchers/launcher_compiler_test_project/build_error.cxx
 rename Tests/CTestTestLaunchers/{launcher_test_project => launcher_custom_command_test_project}/CMakeLists.txt (89%)
 copy Tests/CTestTestLaunchers/{launcher_test_project => launcher_custom_command_test_project}/CTestConfig.cmake (100%)
 rename Tests/CTestTestLaunchers/{launcher_test_project => launcher_custom_command_test_project}/command.cmake (100%)
 create mode 100644 Tests/CTestTestLaunchers/launcher_linker_test_project/CMakeLists.txt
 rename Tests/CTestTestLaunchers/{launcher_test_project => launcher_linker_test_project}/CTestConfig.cmake (100%)
 copy Tests/{Dependency/Case4/bar.c => CTestTestLaunchers/launcher_linker_test_project/link_error.cxx} (98%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:24:11 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:24:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2109-g6800c29
Message-ID: <20170112152412.80EF4FA2EF@public.kitware.com>

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  6800c29b1417421710719a176860e3ae6be99bb9 (commit)
       via  889fe63b510b9669e42af31600c2c887abe0bb34 (commit)
       via  51255a7c7ade4b591b38ef6d61ce0f6a6ed96699 (commit)
       via  e31986b90058a46071f7fe4a52788de6b42cb96c (commit)
       via  bc09abd7d07064ed046cdc8e959b443d69f77596 (commit)
       via  b4f7ce5c79bf06292deaad8097da7889eddc2886 (commit)
       via  5e76ded22c8900a8aea3dbc76f2401f5d832298e (commit)
       via  2e550e36d29332adda29f85fbf79e1610286ab9b (commit)
       via  88a816c6b9b4f5cb11b40410935d47fa61b39858 (commit)
       via  e15106b2f1825fb42bb82a47b1ee5e9299212fa6 (commit)
       via  097b47b972d04c0546f5799dc901f971b471c2b3 (commit)
       via  ec09e91a653fb5d2df2d4fe5c3bc76a453ac5e39 (commit)
       via  592c8cfd93b8fd2ceb579b09b9b6f4c157adea3b (commit)
       via  082456e5a3ded411c6cbbdf9c3d3f6fb39fbc9c5 (commit)
       via  c9a0b14153b87de34a651b1136971f9404fc362c (commit)
       via  053adc60ee80e55f2a8c09fadadc5db6e789412d (commit)
      from  3dd0616af3c5928e5c880186d5cfd241506a4369 (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=6800c29b1417421710719a176860e3ae6be99bb9
commit 6800c29b1417421710719a176860e3ae6be99bb9
Merge: 3dd0616 889fe63
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:24:00 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 10:24:00 2017 -0500

    Merge branch 'master' into next


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:25:38 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:25:38 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1066-g9f3eff6
Message-ID: <20170112152538.85233FA2FD@public.kitware.com>

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  9f3eff6f5675851c81f093d16310d17e3754cd5f (commit)
       via  0051989738db8efe7fa3771e4526542810319e26 (commit)
      from  889fe63b510b9669e42af31600c2c887abe0bb34 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:25:38 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:25:38 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2112-g1730f19
Message-ID: <20170112152538.E5EB2FA2FC@public.kitware.com>

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  1730f191089a5f5399635abd2fb6397809468e64 (commit)
       via  9f3eff6f5675851c81f093d16310d17e3754cd5f (commit)
       via  0051989738db8efe7fa3771e4526542810319e26 (commit)
      from  6800c29b1417421710719a176860e3ae6be99bb9 (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=1730f191089a5f5399635abd2fb6397809468e64
commit 1730f191089a5f5399635abd2fb6397809468e64
Merge: 6800c29 9f3eff6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:25:24 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 10:25:24 2017 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:25:39 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:25:39 -0500 (EST)
Subject: [Cmake-commits] CMake branch, release, updated. v3.7.1-19-g0051989
Message-ID: <20170112152539.BD5E5FA327@public.kitware.com>

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, release has been updated
       via  0051989738db8efe7fa3771e4526542810319e26 (commit)
       via  7bad99b0d3fb50853937d99cd68eb340a0975156 (commit)
      from  e9d3557ccc4b26503aa7d59ec2eaf179c9924a5b (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Source/cmFileMonitor.cxx |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:39:37 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:39:37 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2124-g5a1cd30
Message-ID: <20170112153937.A0727F951E@public.kitware.com>

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  5a1cd30ba35674baad81b42970528fb6e2c83f14 (commit)
       via  f9a810f7b39406e00998c6e74e5a7d7d218d5aba (commit)
       via  5599d858c7881b4331c449ba5c59d255ed50bd11 (commit)
       via  1155170230ebd096df06ebf108908d6c99242d6d (commit)
       via  5365421e84e6133f0e038995e3a8232ec46d6a91 (commit)
       via  522b913f437b04aa10b84cb5807ab43181377d7e (commit)
       via  02582b91ad92969d8fbbd845a5d48b3fbd762966 (commit)
       via  d470cb70077acf2216afe097b5abe379f1828239 (commit)
       via  a2e80cb0853b3b8306069b833ec8c2128a77b072 (commit)
       via  65c1e012ffc17ab77e5aaa84b22241a81de4c2ce (commit)
       via  945dd207b6ca6ca38e3b87247836eb1b3d5f8a77 (commit)
       via  95420cea5e12d21957a50dae20f90c2e83571758 (commit)
      from  1730f191089a5f5399635abd2fb6397809468e64 (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=5a1cd30ba35674baad81b42970528fb6e2c83f14
commit 5a1cd30ba35674baad81b42970528fb6e2c83f14
Merge: 1730f19 f9a810f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:39:36 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 10:39:36 2017 -0500

    Merge topic 'cuda-windows' into next
    
    f9a810f7 CUDA: Enable CudaOnly.SeparateCompilation test runtime calls
    5599d858 CUDA: Port test cases to Windows with MSVC host compiler
    11551702 CUDA: Populate NVIDIA compiler information on Windows
    5365421e CUDA: Detect implicit link information on Windows
    522b913f CUDA: Find MSVC binutils on Windows
    02582b91 CUDA: Populate compiler PDB placeholder during device linking
    d470cb70 CUDA: Use `.obj` object file extension on Windows
    a2e80cb0 CUDA: Detect MSVC architecture id
    65c1e012 CUDA: Detect use of MSVC host compiler
    945dd207 CUDA: Allow platform files to set device linking rules
    95420cea CMakeParseImplicitLinkInfo: Add support for MSVC invoked by CUDA nvcc


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9a810f7b39406e00998c6e74e5a7d7d218d5aba
commit f9a810f7b39406e00998c6e74e5a7d7d218d5aba
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 15 15:17:08 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 10:39:04 2017 -0500

    CUDA: Enable CudaOnly.SeparateCompilation test runtime calls
    
    Uncomment the calls in `main.cpp` (and fix the signatures).

diff --git a/Tests/CudaOnly/SeparateCompilation/main.cu b/Tests/CudaOnly/SeparateCompilation/main.cu
index d4520ae..5c8e150 100644
--- a/Tests/CudaOnly/SeparateCompilation/main.cu
+++ b/Tests/CudaOnly/SeparateCompilation/main.cu
@@ -4,12 +4,12 @@
 #include "file1.h"
 #include "file2.h"
 
-// result_type file4_launch_kernel(int x);
-// result_type file5_launch_kernel(int x);
+int file4_launch_kernel(int x);
+int file5_launch_kernel(int x);
 
 int main(int argc, char **argv)
 {
-  // file4_launch_kernel(42);
-  // file5_launch_kernel(42);
+  file4_launch_kernel(42);
+  file5_launch_kernel(42);
   return 0;
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5599d858c7881b4331c449ba5c59d255ed50bd11
commit 5599d858c7881b4331c449ba5c59d255ed50bd11
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 7 11:45:44 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 10:39:04 2017 -0500

    CUDA: Port test cases to Windows with MSVC host compiler

diff --git a/Tests/Cuda/Complex/dynamic.cpp b/Tests/Cuda/Complex/dynamic.cpp
index d579f1e..3848ce7 100644
--- a/Tests/Cuda/Complex/dynamic.cpp
+++ b/Tests/Cuda/Complex/dynamic.cpp
@@ -1,5 +1,11 @@
 
-int dynamic_base_func(int x)
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#else
+#define EXPORT
+#endif
+
+EXPORT int dynamic_base_func(int x)
 {
   return x * x;
 }
diff --git a/Tests/Cuda/Complex/dynamic.cu b/Tests/Cuda/Complex/dynamic.cu
index ea52acb..a23dc25 100644
--- a/Tests/Cuda/Complex/dynamic.cu
+++ b/Tests/Cuda/Complex/dynamic.cu
@@ -3,9 +3,15 @@
 #include <cuda.h>
 #include <iostream>
 
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#else
+#define EXPORT
+#endif
+
 int dynamic_base_func(int);
 
-int __host__ cuda_dynamic_host_func(int x)
+EXPORT int __host__ cuda_dynamic_host_func(int x)
 {
   return dynamic_base_func(x);
 }
@@ -16,7 +22,7 @@ void DetermineIfValidCudaDevice()
 {
 }
 
-void cuda_dynamic_lib_func()
+EXPORT void cuda_dynamic_lib_func()
 {
   DetermineIfValidCudaDevice <<<1,1>>> ();
   cudaError_t err = cudaGetLastError();
diff --git a/Tests/Cuda/Complex/main.cpp b/Tests/Cuda/Complex/main.cpp
index 32312d0..5a3f820 100644
--- a/Tests/Cuda/Complex/main.cpp
+++ b/Tests/Cuda/Complex/main.cpp
@@ -3,8 +3,14 @@
 #include "file1.h"
 #include "file2.h"
 
-int call_cuda_seperable_code(int x);
-int mixed_launch_kernel(int x);
+#ifdef _WIN32
+#define IMPORT __declspec(dllimport)
+#else
+#define IMPORT
+#endif
+
+IMPORT int call_cuda_seperable_code(int x);
+IMPORT int mixed_launch_kernel(int x);
 
 int main(int argc, char** argv)
 {
diff --git a/Tests/Cuda/Complex/mixed.cpp b/Tests/Cuda/Complex/mixed.cpp
index 205f091..bd32e51 100644
--- a/Tests/Cuda/Complex/mixed.cpp
+++ b/Tests/Cuda/Complex/mixed.cpp
@@ -1,6 +1,14 @@
 
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#define IMPORT __declspec(dllimport)
+#else
+#define EXPORT
+#define IMPORT
+#endif
+
 int dynamic_base_func(int);
-int cuda_dynamic_host_func(int);
+IMPORT int cuda_dynamic_host_func(int);
 int file3_launch_kernel(int);
 
 int dynamic_final_func(int x)
@@ -8,7 +16,7 @@ int dynamic_final_func(int x)
   return cuda_dynamic_host_func(dynamic_base_func(x));
 }
 
-int call_cuda_seperable_code(int x)
+EXPORT int call_cuda_seperable_code(int x)
 {
   return file3_launch_kernel(x);
 }
diff --git a/Tests/Cuda/Complex/mixed.cu b/Tests/Cuda/Complex/mixed.cu
index 45b412f..7051de0 100644
--- a/Tests/Cuda/Complex/mixed.cu
+++ b/Tests/Cuda/Complex/mixed.cu
@@ -4,10 +4,18 @@
 #include "file1.h"
 #include "file2.h"
 
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#define IMPORT __declspec(dllimport)
+#else
+#define EXPORT
+#define IMPORT
+#endif
+
 result_type __device__ file1_func(int x);
 result_type_dynamic __device__ file2_func(int x);
 
-void __host__ cuda_dynamic_lib_func();
+IMPORT void __host__ cuda_dynamic_lib_func();
 
 static
 __global__
@@ -17,7 +25,7 @@ void mixed_kernel(result_type& r, int x)
   result_type_dynamic rd = file2_func(x);
 }
 
-int mixed_launch_kernel(int x)
+EXPORT int mixed_launch_kernel(int x)
 {
   cuda_dynamic_lib_func();
 
diff --git a/Tests/CudaOnly/EnableStandard/main.cu b/Tests/CudaOnly/EnableStandard/main.cu
index 83e9dfd..f7144e6 100644
--- a/Tests/CudaOnly/EnableStandard/main.cu
+++ b/Tests/CudaOnly/EnableStandard/main.cu
@@ -1,8 +1,14 @@
 
 #include <iostream>
 
+#ifdef _WIN32
+#define IMPORT __declspec(dllimport)
+#else
+#define IMPORT
+#endif
+
 int static_cuda11_func(int);
-int shared_cuda11_func(int);
+IMPORT int shared_cuda11_func(int);
 
 void test_functions()
 {
diff --git a/Tests/CudaOnly/EnableStandard/shared.cu b/Tests/CudaOnly/EnableStandard/shared.cu
index 28555b3..ccdd0b2 100644
--- a/Tests/CudaOnly/EnableStandard/shared.cu
+++ b/Tests/CudaOnly/EnableStandard/shared.cu
@@ -1,9 +1,15 @@
 
 #include <type_traits>
 
+#ifdef _WIN32
+#define EXPORT __declspec(dllexport)
+#else
+#define EXPORT
+#endif
+
 using tt = std::true_type;
 using ft = std::false_type;
-int __host__ shared_cuda11_func(int x)
+EXPORT int __host__ shared_cuda11_func(int x)
 {
   return x * x + std::integral_constant<int, 17>::value;
 }
diff --git a/Tests/CudaOnly/WithDefs/CMakeLists.txt b/Tests/CudaOnly/WithDefs/CMakeLists.txt
index c4ca8b9..6c4011c 100644
--- a/Tests/CudaOnly/WithDefs/CMakeLists.txt
+++ b/Tests/CudaOnly/WithDefs/CMakeLists.txt
@@ -4,7 +4,12 @@ project (CudaOnlyWithDefs CUDA)
 
 #verify that we can pass explicit cuda arch flags
 set(CMAKE_CUDA_FLAGS "-gencode arch=compute_30,code=compute_30")
-set(debug_compile_flags --generate-code arch=compute_20,code=sm_20 -Xcompiler=-Werror)
+set(debug_compile_flags --generate-code arch=compute_20,code=sm_20)
+if(CMAKE_CUDA_SIMULATE_ID STREQUAL "MSVC")
+  list(APPEND debug_compile_flags -Xcompiler=-WX)
+else()
+  list(APPEND debug_compile_flags -Xcompiler=-Werror)
+endif()
 set(release_compile_defs DEFREL)
 
 #Goal for this example:
diff --git a/Tests/CudaOnly/WithDefs/main.notcu b/Tests/CudaOnly/WithDefs/main.notcu
index 33a49d2..67bf10c 100644
--- a/Tests/CudaOnly/WithDefs/main.notcu
+++ b/Tests/CudaOnly/WithDefs/main.notcu
@@ -2,12 +2,21 @@
 #include <cuda_runtime.h>
 #include <iostream>
 
+#ifndef PACKED_DEFINE
+#error "PACKED_DEFINE not defined!"
+#endif
+
 static
 __global__
 void DetermineIfValidCudaDevice()
 {
 }
 
+#ifdef _MSC_VER
+#pragma pack(push,1)
+#undef PACKED_DEFINE
+#define PACKED_DEFINE
+#endif
 struct PACKED_DEFINE result_type
 {
   bool valid;
@@ -16,6 +25,9 @@ struct PACKED_DEFINE result_type
 #error missing DEFREL flag
 #endif
 };
+#ifdef _MSC_VER
+#pragma pack(pop)
+#endif
 
 result_type can_launch_kernel()
 {
diff --git a/Tests/RunCMake/try_compile/CudaStandardNoDefault.cmake b/Tests/RunCMake/try_compile/CudaStandardNoDefault.cmake
new file mode 100644
index 0000000..ea22152
--- /dev/null
+++ b/Tests/RunCMake/try_compile/CudaStandardNoDefault.cmake
@@ -0,0 +1,9 @@
+enable_language(CUDA)
+try_compile(result ${CMAKE_CURRENT_BINARY_DIR}
+  SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src.cu
+  CUDA_STANDARD 3 # bogus, but not used
+  OUTPUT_VARIABLE out
+  )
+if(NOT result)
+  message(FATAL_ERROR "try_compile failed:\n${out}")
+endif()
diff --git a/Tests/RunCMake/try_compile/RunCMakeTest.cmake b/Tests/RunCMake/try_compile/RunCMakeTest.cmake
index 5452e6d..6a1bc64 100644
--- a/Tests/RunCMake/try_compile/RunCMakeTest.cmake
+++ b/Tests/RunCMake/try_compile/RunCMakeTest.cmake
@@ -36,7 +36,11 @@ elseif(DEFINED CMAKE_CXX_STANDARD_DEFAULT)
   run_cmake(CxxStandardNoDefault)
 endif()
 if(CMake_TEST_CUDA)
-  run_cmake(CudaStandard)
+  if(CMAKE_HOST_WIN32)
+    run_cmake(CudaStandardNoDefault)
+  else()
+    run_cmake(CudaStandard)
+  endif()
 endif()
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
   run_cmake(CStandardGNU)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1155170230ebd096df06ebf108908d6c99242d6d
commit 1155170230ebd096df06ebf108908d6c99242d6d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 13:10:12 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 10:39:04 2017 -0500

    CUDA: Populate NVIDIA compiler information on Windows
    
    Port Windows-specific compilation and linking rules over from the
    `Platform/Windows-MSVC` module and adapt it for NVIDIA CUDA.  On Windows
    nvcc and its host compiler (MSVC) do not understand or use options like
    `-fPIC` or `-std=`, so condition those out.

diff --git a/Modules/Compiler/NVIDIA-CUDA.cmake b/Modules/Compiler/NVIDIA-CUDA.cmake
index 605d555..ae35132 100644
--- a/Modules/Compiler/NVIDIA-CUDA.cmake
+++ b/Modules/Compiler/NVIDIA-CUDA.cmake
@@ -1,14 +1,15 @@
 set(CMAKE_CUDA_VERBOSE_FLAG "-v")
 
-
-set(CMAKE_CUDA_COMPILE_OPTIONS_PIE -Xcompiler=-fPIE)
-set(CMAKE_CUDA_COMPILE_OPTIONS_PIC -Xcompiler=-fPIC)
-#CMAKE_SHARED_LIBRARY_CUDA_FLAGS is sent to the host linker so we don' need
-#to forward it through nvcc
-set(CMAKE_SHARED_LIBRARY_CUDA_FLAGS -fPIC)
+if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STREQUAL "xMSVC")
+  set(CMAKE_CUDA_COMPILE_OPTIONS_PIE -Xcompiler=-fPIE)
+  set(CMAKE_CUDA_COMPILE_OPTIONS_PIC -Xcompiler=-fPIC)
+  set(CMAKE_CUDA_COMPILE_OPTIONS_VISIBILITY -Xcompiler=-fvisibility=)
+  # CMAKE_SHARED_LIBRARY_CUDA_FLAGS is sent to the host linker so we
+  # don't need to forward it through nvcc.
+  set(CMAKE_SHARED_LIBRARY_CUDA_FLAGS -fPIC)
+endif()
 set(CMAKE_SHARED_LIBRARY_CREATE_CUDA_FLAGS -shared)
 set(CMAKE_INCLUDE_SYSTEM_FLAG_CUDA -isystem=)
-set(CMAKE_CUDA_COMPILE_OPTIONS_VISIBILITY -Xcompiler=-fvisibility=)
 
 string(APPEND CMAKE_CUDA_FLAGS_INIT " ")
 string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -g")
@@ -16,9 +17,12 @@ string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG")
 string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -O3 -DNDEBUG")
 string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
 
-set(CMAKE_CUDA98_STANDARD_COMPILE_OPTION "")
-set(CMAKE_CUDA98_EXTENSION_COMPILE_OPTION "")
-set(CMAKE_CUDA11_STANDARD_COMPILE_OPTION "-std=c++11")
-set(CMAKE_CUDA11_EXTENSION_COMPILE_OPTION "-std=c++11")
-
-set(CMAKE_CUDA_STANDARD_DEFAULT 98)
+if("x${CMAKE_CUDA_SIMULATE_ID}" STREQUAL "xMSVC")
+  set(CMAKE_CUDA_STANDARD_DEFAULT "")
+else()
+  set(CMAKE_CUDA_STANDARD_DEFAULT 98)
+  set(CMAKE_CUDA98_STANDARD_COMPILE_OPTION "")
+  set(CMAKE_CUDA98_EXTENSION_COMPILE_OPTION "")
+  set(CMAKE_CUDA11_STANDARD_COMPILE_OPTION "-std=c++11")
+  set(CMAKE_CUDA11_EXTENSION_COMPILE_OPTION "-std=c++11")
+endif()
diff --git a/Modules/Platform/Windows-NVIDIA-CUDA.cmake b/Modules/Platform/Windows-NVIDIA-CUDA.cmake
new file mode 100644
index 0000000..80ecfbc
--- /dev/null
+++ b/Modules/Platform/Windows-NVIDIA-CUDA.cmake
@@ -0,0 +1,42 @@
+include(Platform/Windows-MSVC)
+
+set(CMAKE_CUDA_COMPILE_PTX_COMPILATION
+  "<CMAKE_CUDA_COMPILER> ${CMAKE_CUDA_HOST_FLAGS} <DEFINES> <INCLUDES> <FLAGS> -x cu -ptx <SOURCE> -o <OBJECT> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
+set(CMAKE_CUDA_COMPILE_SEPARABLE_COMPILATION
+  "<CMAKE_CUDA_COMPILER> ${CMAKE_CUDA_HOST_FLAGS} <DEFINES> <INCLUDES> <FLAGS> -x cu -dc <SOURCE> -o <OBJECT> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
+set(CMAKE_CUDA_COMPILE_WHOLE_COMPILATION
+  "<CMAKE_CUDA_COMPILER> ${CMAKE_CUDA_HOST_FLAGS} <DEFINES> <INCLUDES> <FLAGS> -x cu -c <SOURCE> -o <OBJECT> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
+
+set(__IMPLICT_LINKS )
+foreach(dir ${CMAKE_CUDA_HOST_IMPLICIT_LINK_DIRECTORIES})
+  string(APPEND __IMPLICT_LINKS " -LIBPATH:\"${dir}\"")
+endforeach()
+foreach(lib ${CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES})
+  string(APPEND __IMPLICT_LINKS " \"${lib}\"")
+endforeach()
+set(CMAKE_CUDA_LINK_EXECUTABLE
+   "<CMAKE_CUDA_HOST_LINK_LAUNCHER> <CMAKE_CUDA_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <LINK_LIBRARIES>${__IMPLICT_LINKS}")
+
+set(_CMAKE_VS_LINK_DLL "<CMAKE_COMMAND> -E vs_link_dll --intdir=<OBJECT_DIR> --manifests <MANIFESTS> -- ")
+set(_CMAKE_VS_LINK_EXE "<CMAKE_COMMAND> -E vs_link_exe --intdir=<OBJECT_DIR> --manifests <MANIFESTS> -- ")
+set(CMAKE_CUDA_CREATE_SHARED_LIBRARY
+  "${_CMAKE_VS_LINK_DLL}<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /dll /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} <LINK_FLAGS> <LINK_LIBRARIES>${__IMPLICT_LINKS} ${CMAKE_END_TEMP_FILE}")
+
+set(CMAKE_CUDA_CREATE_SHARED_MODULE ${CMAKE_CUDA_CREATE_SHARED_LIBRARY})
+set(CMAKE_CUDA_CREATE_STATIC_LIBRARY  "<CMAKE_LINKER> /lib ${CMAKE_CL_NOLOGO} <LINK_FLAGS> /out:<TARGET> <OBJECTS> ")
+set(CMAKE_CUDA_LINKER_SUPPORTS_PDB ON)
+set(CMAKE_CUDA_LINK_EXECUTABLE
+  "${_CMAKE_VS_LINK_EXE}<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} <CMAKE_CUDA_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${__IMPLICT_LINKS} ${CMAKE_END_TEMP_FILE}")
+unset(_CMAKE_VS_LINK_EXE)
+unset(_CMAKE_VS_LINK_EXE)
+
+set(CMAKE_CUDA_DEVICE_LINK_LIBRARY
+  "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> <LANGUAGE_COMPILE_FLAGS> -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
+set(CMAKE_CUDA_DEVICE_LINK_EXECUTABLE
+  "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
+
+string(APPEND CMAKE_CUDA_FLAGS_INIT " -Xcompiler=-GR,-EHsc")
+string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -Xcompiler=-MDd,-Zi,-RTC1")
+string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -Xcompiler=-MD")
+string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -Xcompiler=-MD")
+string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -Xcompiler=-MD")

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5365421e84e6133f0e038995e3a8232ec46d6a91
commit 5365421e84e6133f0e038995e3a8232ec46d6a91
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 13:06:49 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 10:39:03 2017 -0500

    CUDA: Detect implicit link information on Windows
    
    The `nvcc -v` output on Windows uses response files, so load the one we
    need to extract the full link line.

diff --git a/Modules/CMakeDetermineCUDACompiler.cmake b/Modules/CMakeDetermineCUDACompiler.cmake
index 22c53d9..bef6d0e 100644
--- a/Modules/CMakeDetermineCUDACompiler.cmake
+++ b/Modules/CMakeDetermineCUDACompiler.cmake
@@ -60,7 +60,7 @@ if(NOT CMAKE_CUDA_COMPILER_ID_RUN)
   set(CMAKE_CXX_COMPILER_ID_TOOL_MATCH_REGEX "\nLd[^\n]*(\n[ \t]+[^\n]*)*\n[ \t]+([^ \t\r\n]+)[^\r\n]*-o[^\r\n]*CompilerIdCUDA/(\\./)?(CompilerIdCUDA.xctest/)?CompilerIdCUDA[ \t\n\\\"]")
   set(CMAKE_CXX_COMPILER_ID_TOOL_MATCH_INDEX 2)
 
-  set(CMAKE_CUDA_COMPILER_ID_FLAGS_ALWAYS "-v")
+  set(CMAKE_CUDA_COMPILER_ID_FLAGS_ALWAYS -v --keep --keep-dir tmp)
   if(CMAKE_CUDA_HOST_COMPILER)
       list(APPEND CMAKE_CUDA_COMPILER_ID_FLAGS_ALWAYS "-ccbin=${CMAKE_CUDA_HOST_COMPILER}")
   endif()
@@ -106,6 +106,14 @@ if(CMAKE_CUDA_COMPILER_ID STREQUAL NVIDIA)
       if("${_nvcc_output_line}" MATCHES "^ *nvlink")
         string(APPEND _nvcc_log "    ignoring nvlink line\n")
       elseif(_nvcc_libraries)
+        if("${_nvcc_output_line}" MATCHES "(@\"?tmp/a\\.exe\\.res\"?)")
+          set(_nvcc_link_res_arg "${CMAKE_MATCH_1}")
+          set(_nvcc_link_res "${CMAKE_PLATFORM_INFO_DIR}/CompilerIdCUDA/tmp/a.exe.res")
+          if(EXISTS "${_nvcc_link_res}")
+            file(READ "${_nvcc_link_res}" _nvcc_link_res_content)
+            string(REPLACE "${_nvcc_link_res_arg}" "${_nvcc_link_res_content}" _nvcc_output_line "${_nvcc_output_line}")
+          endif()
+        endif()
         string(FIND "${_nvcc_output_line}" "${_nvcc_libraries}" _nvcc_libraries_pos)
         if(NOT _nvcc_libraries_pos EQUAL -1)
           set(_nvcc_link_line "${_nvcc_output_line}")
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index eae139d..bb34de5 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -131,6 +131,7 @@ function(CMAKE_DETERMINE_COMPILER_ID_BUILD lang testflags src)
   # Create a clean working directory.
   file(REMOVE_RECURSE ${CMAKE_${lang}_COMPILER_ID_DIR})
   file(MAKE_DIRECTORY ${CMAKE_${lang}_COMPILER_ID_DIR})
+  file(MAKE_DIRECTORY ${CMAKE_${lang}_COMPILER_ID_DIR}/tmp)
   CMAKE_DETERMINE_COMPILER_ID_WRITE("${lang}" "${src}")
 
   # Construct a description of this test case.
diff --git a/Modules/CMakeTestCUDACompiler.cmake b/Modules/CMakeTestCUDACompiler.cmake
index 670b31d..80113cb 100644
--- a/Modules/CMakeTestCUDACompiler.cmake
+++ b/Modules/CMakeTestCUDACompiler.cmake
@@ -58,6 +58,11 @@ else()
   include(${CMAKE_ROOT}/Modules/CMakeDetermineCompilerABI.cmake)
   CMAKE_DETERMINE_COMPILER_ABI(CUDA ${CMAKE_ROOT}/Modules/CMakeCUDACompilerABI.cu)
 
+  if("x${CMAKE_CUDA_SIMULATE_ID}" STREQUAL "xMSVC")
+    set(CMAKE_CUDA_IMPLICIT_LINK_LIBRARIES "${CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES}")
+    set(CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES "${CMAKE_CUDA_HOST_IMPLICIT_LINK_DIRECTORIES}")
+  endif()
+
   # Re-configure to save learned information.
   configure_file(
     ${CMAKE_ROOT}/Modules/CMakeCUDACompiler.cmake.in

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=522b913f437b04aa10b84cb5807ab43181377d7e
commit 522b913f437b04aa10b84cb5807ab43181377d7e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 13:05:20 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 10:39:03 2017 -0500

    CUDA: Find MSVC binutils on Windows
    
    On Windows the host link launcher is just `link.exe`.  Find and use that
    instead of trying to extract the launcher from the `nvcc -v` output.

diff --git a/Modules/CMakeDetermineCUDACompiler.cmake b/Modules/CMakeDetermineCUDACompiler.cmake
index d3024c7..22c53d9 100644
--- a/Modules/CMakeDetermineCUDACompiler.cmake
+++ b/Modules/CMakeDetermineCUDACompiler.cmake
@@ -116,9 +116,13 @@ if(CMAKE_CUDA_COMPILER_ID STREQUAL NVIDIA)
   endif()
 
   if(_nvcc_link_line)
-    #extract the compiler that is being used for linking
-    separate_arguments(_nvcc_link_line_args UNIX_COMMAND "${_nvcc_link_line}")
-    list(GET _nvcc_link_line_args 0 CMAKE_CUDA_HOST_LINK_LAUNCHER)
+    if("x${CMAKE_CUDA_SIMULATE_ID}" STREQUAL "xMSVC")
+      set(CMAKE_CUDA_HOST_LINK_LAUNCHER "${CMAKE_LINKER}")
+    else()
+      #extract the compiler that is being used for linking
+      separate_arguments(_nvcc_link_line_args UNIX_COMMAND "${_nvcc_link_line}")
+      list(GET _nvcc_link_line_args 0 CMAKE_CUDA_HOST_LINK_LAUNCHER)
+    endif()
 
     #prefix the line with cuda-fake-ld so that implicit link info believes it is
     #a link line
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake
index 75a031e..4c0486e 100644
--- a/Modules/CMakeFindBinUtils.cmake
+++ b/Modules/CMakeFindBinUtils.cmake
@@ -25,6 +25,7 @@ if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC"
    OR "x${CMAKE_Fortran_SIMULATE_ID}" STREQUAL "xMSVC"
    OR "x${CMAKE_C_COMPILER_ID}" STREQUAL "xMSVC"
    OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC"
+   OR "x${CMAKE_CUDA_SIMULATE_ID}" STREQUAL "xMSVC"
    OR (CMAKE_GENERATOR MATCHES "Visual Studio"
        AND NOT CMAKE_VS_PLATFORM_NAME STREQUAL "Tegra-Android"))
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02582b91ad92969d8fbbd845a5d48b3fbd762966
commit 02582b91ad92969d8fbbd845a5d48b3fbd762966
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 13:02:11 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 10:39:03 2017 -0500

    CUDA: Populate compiler PDB placeholder during device linking
    
    The device link step runs the host compiler internally so we need to use
    the proper compiler PDB file with MSVC.

diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 480bb34..4bc706c 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -230,6 +230,11 @@ void cmMakefileExecutableTargetGenerator::WriteDeviceExecutableRule(
         this->LocalGenerator->GetCurrentBinaryDirectory(), targetOutputReal),
       output);
 
+    std::string targetFullPathCompilePDB = this->ComputeTargetCompilePDB();
+    std::string targetOutPathCompilePDB =
+      this->LocalGenerator->ConvertToOutputFormat(targetFullPathCompilePDB,
+                                                  cmOutputConverter::SHELL);
+
     vars.Language = linkLanguage.c_str();
     vars.Objects = buildObjs.c_str();
     vars.ObjectDir = objectDir.c_str();
@@ -237,6 +242,7 @@ void cmMakefileExecutableTargetGenerator::WriteDeviceExecutableRule(
     vars.LinkLibraries = linkLibs.c_str();
     vars.Flags = flags.c_str();
     vars.LinkFlags = linkFlags.c_str();
+    vars.TargetCompilePDB = targetOutPathCompilePDB.c_str();
 
     std::string launcher;
 
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index d4ad16d..27b7c21 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -366,12 +366,18 @@ void cmMakefileLibraryTargetGenerator::WriteDeviceLibraryRules(
         this->LocalGenerator->GetCurrentBinaryDirectory(), targetOutputReal),
       output);
 
+    std::string targetFullPathCompilePDB = this->ComputeTargetCompilePDB();
+    std::string targetOutPathCompilePDB =
+      this->LocalGenerator->ConvertToOutputFormat(targetFullPathCompilePDB,
+                                                  cmOutputConverter::SHELL);
+
     vars.Objects = buildObjs.c_str();
     vars.ObjectDir = objectDir.c_str();
     vars.Target = target.c_str();
     vars.LinkLibraries = linkLibs.c_str();
     vars.ObjectsQuoted = buildObjs.c_str();
     vars.LinkFlags = linkFlags.c_str();
+    vars.TargetCompilePDB = targetOutPathCompilePDB.c_str();
 
     // Add language feature flags.
     std::string langFlags;
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 10ee70d..bc8d8ff 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -229,6 +229,7 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkRule(bool useResponseFile)
     vars.SONameFlag = "$SONAME_FLAG";
     vars.TargetSOName = "$SONAME";
     vars.TargetPDB = "$TARGET_PDB";
+    vars.TargetCompilePDB = "$TARGET_COMPILE_PDB";
 
     vars.Flags = "$FLAGS";
     vars.LinkFlags = "$LINK_FLAGS";
@@ -716,6 +717,8 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkStatement()
     this->ConvertToNinjaPath(objPath), cmOutputConverter::SHELL);
   EnsureDirectoryExists(objPath);
 
+  this->SetMsvcTargetPdbVariable(vars);
+
   if (this->GetGlobalGenerator()->IsGCCOnWindows()) {
     // ar.exe can't handle backslashes in rsp files (implicitly used by gcc)
     std::string& linkLibraries = vars["LINK_LIBRARIES"];

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d470cb70077acf2216afe097b5abe379f1828239
commit d470cb70077acf2216afe097b5abe379f1828239
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 13:01:49 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 10:39:02 2017 -0500

    CUDA: Use `.obj` object file extension on Windows

diff --git a/Modules/CMakeCUDAInformation.cmake b/Modules/CMakeCUDAInformation.cmake
index cb0eef5..abc4b66 100644
--- a/Modules/CMakeCUDAInformation.cmake
+++ b/Modules/CMakeCUDAInformation.cmake
@@ -1,7 +1,11 @@
 # Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
 # file Copyright.txt or https://cmake.org/licensing for details.
 
-set(CMAKE_CUDA_OUTPUT_EXTENSION .o)
+if(UNIX)
+  set(CMAKE_CUDA_OUTPUT_EXTENSION .o)
+else()
+  set(CMAKE_CUDA_OUTPUT_EXTENSION .obj)
+endif()
 set(CMAKE_INCLUDE_FLAG_CUDA "-I")
 
 # Load compiler-specific information.
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 069011d..480bb34 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -104,10 +104,12 @@ void cmMakefileExecutableTargetGenerator::WriteDeviceExecutableRule(
 
   // Get the language to use for linking this library.
   std::string linkLanguage = "CUDA";
+  std::string const objExt =
+    this->Makefile->GetSafeDefinition("CMAKE_CUDA_OUTPUT_EXTENSION");
 
   // Get the name of the device object to generate.
   std::string const targetOutputReal =
-    this->GeneratorTarget->ObjectDirectory + "cmake_device_link.o";
+    this->GeneratorTarget->ObjectDirectory + "cmake_device_link" + objExt;
   this->DeviceLinkObject = targetOutputReal;
 
   this->NumberOfProgressActions++;
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 2b0e1b1..d4ad16d 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -281,6 +281,8 @@ void cmMakefileLibraryTargetGenerator::WriteDeviceLibraryRules(
 
   // Get the language to use for linking this library.
   std::string linkLanguage = "CUDA";
+  std::string const objExt =
+    this->Makefile->GetSafeDefinition("CMAKE_CUDA_OUTPUT_EXTENSION");
 
   // Create set of linking flags.
   std::string linkFlags;
@@ -288,7 +290,7 @@ void cmMakefileLibraryTargetGenerator::WriteDeviceLibraryRules(
 
   // Get the name of the device object to generate.
   std::string const targetOutputReal =
-    this->GeneratorTarget->ObjectDirectory + "cmake_device_link.o";
+    this->GeneratorTarget->ObjectDirectory + "cmake_device_link" + objExt;
   this->DeviceLinkObject = targetOutputReal;
 
   this->NumberOfProgressActions++;
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 0db5687..10ee70d 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -602,10 +602,12 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkStatement()
   // First and very important step is to make sure while inside this
   // step our link language is set to CUDA
   std::string cudaLinkLanguage = "CUDA";
+  std::string const objExt =
+    this->Makefile->GetSafeDefinition("CMAKE_CUDA_OUTPUT_EXTENSION");
 
   std::string const cfgName = this->GetConfigName();
-  std::string const targetOutputReal =
-    ConvertToNinjaPath(genTarget.ObjectDirectory + "cmake_device_link.o");
+  std::string const targetOutputReal = ConvertToNinjaPath(
+    genTarget.ObjectDirectory + "cmake_device_link" + objExt);
 
   std::string const targetOutputImplib =
     ConvertToNinjaPath(genTarget.GetFullPath(cfgName,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2e80cb0853b3b8306069b833ec8c2128a77b072
commit a2e80cb0853b3b8306069b833ec8c2128a77b072
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 13:00:43 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 10:39:02 2017 -0500

    CUDA: Detect MSVC architecture id

diff --git a/Modules/CMakeCUDACompiler.cmake.in b/Modules/CMakeCUDACompiler.cmake.in
index 18291b5..1ba42d9 100644
--- a/Modules/CMakeCUDACompiler.cmake.in
+++ b/Modules/CMakeCUDACompiler.cmake.in
@@ -6,6 +6,7 @@ set(CMAKE_CUDA_COMPILER_VERSION "@CMAKE_CUDA_COMPILER_VERSION@")
 set(CMAKE_CUDA_STANDARD_COMPUTED_DEFAULT "@CMAKE_CUDA_STANDARD_COMPUTED_DEFAULT@")
 set(CMAKE_CUDA_SIMULATE_ID "@CMAKE_CUDA_SIMULATE_ID@")
 set(CMAKE_CUDA_SIMULATE_VERSION "@CMAKE_CUDA_SIMULATE_VERSION@")
+ at SET_MSVC_CUDA_ARCHITECTURE_ID@
 
 set(CMAKE_CUDA_COMPILER_ENV_VAR "CUDACXX")
 set(CMAKE_CUDA_HOST_COMPILER_ENV_VAR "CUDAHOSTCXX")
diff --git a/Modules/CMakeDetermineCUDACompiler.cmake b/Modules/CMakeDetermineCUDACompiler.cmake
index e03de7e..d3024c7 100644
--- a/Modules/CMakeDetermineCUDACompiler.cmake
+++ b/Modules/CMakeDetermineCUDACompiler.cmake
@@ -70,6 +70,10 @@ if(NOT CMAKE_CUDA_COMPILER_ID_RUN)
 endif()
 
 include(CMakeFindBinUtils)
+if(MSVC_CUDA_ARCHITECTURE_ID)
+  set(SET_MSVC_CUDA_ARCHITECTURE_ID
+    "set(MSVC_CUDA_ARCHITECTURE_ID ${MSVC_CUDA_ARCHITECTURE_ID})")
+endif()
 
 #if this compiler vendor is matches NVIDIA we can determine
 #what the host compiler is. This only needs to be done if the CMAKE_CUDA_HOST_COMPILER
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index f506500..0e90d35 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -54,6 +54,8 @@ if(NOT MSVC_VERSION)
     set(_compiler_version ${CMAKE_CXX_SIMULATE_VERSION})
   elseif(CMAKE_Fortran_SIMULATE_VERSION)
     set(_compiler_version ${CMAKE_Fortran_SIMULATE_VERSION})
+  elseif(CMAKE_CUDA_SIMULATE_VERSION)
+    set(_compiler_version ${CMAKE_CUDA_SIMULATE_VERSION})
   elseif(CMAKE_C_COMPILER_VERSION)
     set(_compiler_version ${CMAKE_C_COMPILER_VERSION})
   else()
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 23caead..8ad2efe 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -344,7 +344,8 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
 {
   cmMakefile* mf = this->GetMakefile();
   if (mf->GetDefinition("MSVC_C_ARCHITECTURE_ID") ||
-      mf->GetDefinition("MSVC_CXX_ARCHITECTURE_ID")) {
+      mf->GetDefinition("MSVC_CXX_ARCHITECTURE_ID") ||
+      mf->GetDefinition("MSVC_CUDA_ARCHITECTURE_ID")) {
     std::string pdbPath;
     std::string compilePdbPath = this->ComputeTargetCompilePDB();
     if (this->GeneratorTarget->GetType() == cmStateEnums::EXECUTABLE ||

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65c1e012ffc17ab77e5aaa84b22241a81de4c2ce
commit 65c1e012ffc17ab77e5aaa84b22241a81de4c2ce
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 12:58:35 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 10:39:02 2017 -0500

    CUDA: Detect use of MSVC host compiler
    
    Report it in `CMAKE_CUDA_SIMULATE_{ID,VERSION}`.

diff --git a/Modules/CMakeCUDACompiler.cmake.in b/Modules/CMakeCUDACompiler.cmake.in
index 8a6c0bc..18291b5 100644
--- a/Modules/CMakeCUDACompiler.cmake.in
+++ b/Modules/CMakeCUDACompiler.cmake.in
@@ -4,6 +4,8 @@ set(CMAKE_CUDA_HOST_LINK_LAUNCHER "@CMAKE_CUDA_HOST_LINK_LAUNCHER@")
 set(CMAKE_CUDA_COMPILER_ID "@CMAKE_CUDA_COMPILER_ID@")
 set(CMAKE_CUDA_COMPILER_VERSION "@CMAKE_CUDA_COMPILER_VERSION@")
 set(CMAKE_CUDA_STANDARD_COMPUTED_DEFAULT "@CMAKE_CUDA_STANDARD_COMPUTED_DEFAULT@")
+set(CMAKE_CUDA_SIMULATE_ID "@CMAKE_CUDA_SIMULATE_ID@")
+set(CMAKE_CUDA_SIMULATE_VERSION "@CMAKE_CUDA_SIMULATE_VERSION@")
 
 set(CMAKE_CUDA_COMPILER_ENV_VAR "CUDACXX")
 set(CMAKE_CUDA_HOST_COMPILER_ENV_VAR "CUDAHOSTCXX")
diff --git a/Modules/CMakeCUDACompilerId.cu.in b/Modules/CMakeCUDACompilerId.cu.in
index a20f1b1..018bab7 100644
--- a/Modules/CMakeCUDACompilerId.cu.in
+++ b/Modules/CMakeCUDACompilerId.cu.in
@@ -9,6 +9,9 @@
    because some compilers will just produce instructions to fill the
    array rather than assigning a pointer to a static array.  */
 char const* info_compiler = "INFO" ":" "compiler[" COMPILER_ID "]";
+#ifdef SIMULATE_ID
+char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]";
+#endif
 
 @CMAKE_CUDA_COMPILER_ID_PLATFORM_CONTENT@
 @CMAKE_CUDA_COMPILER_ID_ERROR_FOR_TEST@
@@ -35,6 +38,12 @@ int main(int argc, char* argv[])
 #ifdef COMPILER_VERSION_MAJOR
   require += info_version[argc];
 #endif
+#ifdef SIMULATE_ID
+  require += info_simulate[argc];
+#endif
+#ifdef SIMULATE_VERSION_MAJOR
+  require += info_simulate_version[argc];
+#endif
   require += info_language_dialect_default[argc];
   (void)argv;
   return require;
diff --git a/Modules/Compiler/NVIDIA-DetermineCompiler.cmake b/Modules/Compiler/NVIDIA-DetermineCompiler.cmake
index 32ccf8a..cb0beaf 100644
--- a/Modules/Compiler/NVIDIA-DetermineCompiler.cmake
+++ b/Modules/Compiler/NVIDIA-DetermineCompiler.cmake
@@ -4,4 +4,14 @@ set(_compiler_id_pp_test "defined(__NVCC__)")
 set(_compiler_id_version_compute "
 # define @PREFIX at COMPILER_VERSION_MAJOR @MACRO_DEC@(__CUDACC_VER_MAJOR__)
 # define @PREFIX at COMPILER_VERSION_MINOR @MACRO_DEC@(__CUDACC_VER_MINOR__)
-# define @PREFIX at COMPILER_VERSION_PATCH @MACRO_DEC@(__CUDACC_VER_BUILD__)")
+# define @PREFIX at COMPILER_VERSION_PATCH @MACRO_DEC@(__CUDACC_VER_BUILD__)
+# if defined(_MSC_VER)
+   /* _MSC_VER = VVRR */
+#  define @PREFIX at SIMULATE_VERSION_MAJOR @MACRO_DEC@(_MSC_VER / 100)
+#  define @PREFIX at SIMULATE_VERSION_MINOR @MACRO_DEC@(_MSC_VER % 100)
+# endif")
+
+set(_compiler_id_simulate "
+# if defined(_MSC_VER)
+#  define @PREFIX at SIMULATE_ID \"MSVC\"
+# endif")

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=945dd207b6ca6ca38e3b87247836eb1b3d5f8a77
commit 945dd207b6ca6ca38e3b87247836eb1b3d5f8a77
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 13:04:18 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 10:39:02 2017 -0500

    CUDA: Allow platform files to set device linking rules
    
    Condition the default settings on the rule variables not already being
    set.

diff --git a/Modules/CMakeCUDAInformation.cmake b/Modules/CMakeCUDAInformation.cmake
index 202a7a6..cb0eef5 100644
--- a/Modules/CMakeCUDAInformation.cmake
+++ b/Modules/CMakeCUDAInformation.cmake
@@ -177,11 +177,14 @@ if(NOT CMAKE_CUDA_LINK_EXECUTABLE)
 endif()
 
 #These are used when linking relocatable (dc) cuda code
-set(CMAKE_CUDA_DEVICE_LINK_LIBRARY
-      "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> <LANGUAGE_COMPILE_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
-set(CMAKE_CUDA_DEVICE_LINK_EXECUTABLE
-      "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
-
+if(NOT CMAKE_CUDA_DEVICE_LINK_LIBRARY)
+  set(CMAKE_CUDA_DEVICE_LINK_LIBRARY
+    "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> <LANGUAGE_COMPILE_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+endif()
+if(NOT CMAKE_CUDA_DEVICE_LINK_EXECUTABLE)
+  set(CMAKE_CUDA_DEVICE_LINK_EXECUTABLE
+    "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+endif()
 
 mark_as_advanced(
 CMAKE_CUDA_FLAGS

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95420cea5e12d21957a50dae20f90c2e83571758
commit 95420cea5e12d21957a50dae20f90c2e83571758
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 13 11:08:53 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 10:39:01 2017 -0500

    CMakeParseImplicitLinkInfo: Add support for MSVC invoked by CUDA nvcc

diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake b/Modules/CMakeParseImplicitLinkInfo.cmake
index 2031ba5..3469d34 100644
--- a/Modules/CMakeParseImplicitLinkInfo.cmake
+++ b/Modules/CMakeParseImplicitLinkInfo.cmake
@@ -45,6 +45,7 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj
       endif()
       list(GET args 0 cmd)
     endif()
+    set(is_msvc 0)
     if("${cmd}" MATCHES "${linker_regex}")
       string(APPEND log "  link line: [${line}]\n")
       string(REGEX REPLACE ";-([LYz]);" ";-\\1" args "${args}")
@@ -54,6 +55,17 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj
           string(REGEX REPLACE "^-L" "" dir "${arg}")
           list(APPEND implicit_dirs_tmp ${dir})
           string(APPEND log "    arg [${arg}] ==> dir [${dir}]\n")
+        elseif("${arg}" MATCHES "^[-/]LIBPATH:(.+)")
+          # MSVC search path.
+          set(dir "${CMAKE_MATCH_1}")
+          list(APPEND implicit_dirs_tmp ${dir})
+          string(APPEND log "    arg [${arg}] ==> dir [${dir}]\n")
+        elseif(is_msvc AND "${arg}" STREQUAL "-link")
+          string(APPEND log "    arg [${arg}] ==> ignore MSVC cl option\n")
+        elseif(is_msvc AND "${arg}" MATCHES "^(.*\\.[Ll][Ii][Bb])$")
+          set(lib "${CMAKE_MATCH_1}")
+          list(APPEND implicit_libs_tmp ${lib})
+          string(APPEND log "    arg [${arg}] ==> lib [${lib}]\n")
         elseif("${arg}" MATCHES "^-l([^:].*)$")
           # Unix library.
           set(lib "${CMAKE_MATCH_1}")
@@ -82,6 +94,9 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj
           # Link editor option.
           list(APPEND implicit_libs_tmp ${arg})
           string(APPEND log "    arg [${arg}] ==> opt [${arg}]\n")
+        elseif("${arg}" STREQUAL "cl.exe")
+          string(APPEND log "    arg [${arg}] ==> recognize MSVC cl\n")
+          set(is_msvc 1)
         else()
           string(APPEND log "    arg [${arg}] ==> ignore\n")
         endif()
diff --git a/Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in b/Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in
index 1313dbf..d6d2357 100644
--- a/Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in
+++ b/Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in
@@ -518,6 +518,13 @@ set(msys_g77_libs "frtbegin;g2c;mingw32;moldname;mingwex;msvcrt;user32;kernel32;
 set(msys_g77_dirs "C:/some-mingw/lib/gcc/mingw32/3.4.5;C:/some-mingw/lib/gcc;/some-mingw/lib;C:/some-mingw/lib")
 list(APPEND platforms msys_g77)
 
+#-----------------------------------------------------------------------------
+# MSVC from NVIDIA CUDA
+
+set(nvcc_msvc_text [[cuda-fake-ld cl.exe -nologo "tmp/a_dlink.obj" "tmp/CMakeCUDACompilerId.obj" -link -INCREMENTAL:NO   "/LIBPATH:C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v8.0/bin/../lib/x64" cudadevrt.lib  cudart_static.lib -Fe"a.exe"]])
+set(nvcc_msvc_libs "cudadevrt.lib;cudart_static.lib")
+set(nvcc_msvc_dirs "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v8.0/lib/x64")
+list(APPEND platforms nvcc_msvc)
 
 #-----------------------------------------------------------------------------
 # Test parsing for all above examples.

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 10:41:59 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 10:41:59 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1078-g728820f
Message-ID: <20170112154159.EA214F9EBB@public.kitware.com>

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  728820f3ea0faf55ffe1236a44a35e9197fc6291 (commit)
       via  f9a810f7b39406e00998c6e74e5a7d7d218d5aba (commit)
       via  5599d858c7881b4331c449ba5c59d255ed50bd11 (commit)
       via  1155170230ebd096df06ebf108908d6c99242d6d (commit)
       via  5365421e84e6133f0e038995e3a8232ec46d6a91 (commit)
       via  522b913f437b04aa10b84cb5807ab43181377d7e (commit)
       via  02582b91ad92969d8fbbd845a5d48b3fbd762966 (commit)
       via  d470cb70077acf2216afe097b5abe379f1828239 (commit)
       via  a2e80cb0853b3b8306069b833ec8c2128a77b072 (commit)
       via  65c1e012ffc17ab77e5aaa84b22241a81de4c2ce (commit)
       via  945dd207b6ca6ca38e3b87247836eb1b3d5f8a77 (commit)
       via  95420cea5e12d21957a50dae20f90c2e83571758 (commit)
      from  9f3eff6f5675851c81f093d16310d17e3754cd5f (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=728820f3ea0faf55ffe1236a44a35e9197fc6291
commit 728820f3ea0faf55ffe1236a44a35e9197fc6291
Merge: 9f3eff6 f9a810f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 10:41:57 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 10:41:57 2017 -0500

    Merge topic 'cuda-windows'
    
    f9a810f7 CUDA: Enable CudaOnly.SeparateCompilation test runtime calls
    5599d858 CUDA: Port test cases to Windows with MSVC host compiler
    11551702 CUDA: Populate NVIDIA compiler information on Windows
    5365421e CUDA: Detect implicit link information on Windows
    522b913f CUDA: Find MSVC binutils on Windows
    02582b91 CUDA: Populate compiler PDB placeholder during device linking
    d470cb70 CUDA: Use `.obj` object file extension on Windows
    a2e80cb0 CUDA: Detect MSVC architecture id
    65c1e012 CUDA: Detect use of MSVC host compiler
    945dd207 CUDA: Allow platform files to set device linking rules
    95420cea CMakeParseImplicitLinkInfo: Add support for MSVC invoked by CUDA nvcc


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

Summary of changes:
 Modules/CMakeCUDACompiler.cmake.in                 |    3 ++
 Modules/CMakeCUDACompilerId.cu.in                  |    9 +++++
 Modules/CMakeCUDAInformation.cmake                 |   19 ++++++---
 Modules/CMakeDetermineCUDACompiler.cmake           |   24 +++++++++--
 Modules/CMakeDetermineCompilerId.cmake             |    1 +
 Modules/CMakeFindBinUtils.cmake                    |    1 +
 Modules/CMakeParseImplicitLinkInfo.cmake           |   15 +++++++
 Modules/CMakeTestCUDACompiler.cmake                |    5 +++
 Modules/Compiler/NVIDIA-CUDA.cmake                 |   30 ++++++++------
 Modules/Compiler/NVIDIA-DetermineCompiler.cmake    |   12 +++++-
 Modules/Platform/Windows-MSVC.cmake                |    2 +
 Modules/Platform/Windows-NVIDIA-CUDA.cmake         |   42 ++++++++++++++++++++
 Source/cmMakefileExecutableTargetGenerator.cxx     |   10 ++++-
 Source/cmMakefileLibraryTargetGenerator.cxx        |   10 ++++-
 Source/cmNinjaNormalTargetGenerator.cxx            |    9 ++++-
 Source/cmNinjaTargetGenerator.cxx                  |    3 +-
 Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in     |    7 ++++
 Tests/Cuda/Complex/dynamic.cpp                     |    8 +++-
 Tests/Cuda/Complex/dynamic.cu                      |   10 ++++-
 Tests/Cuda/Complex/main.cpp                        |   10 ++++-
 Tests/Cuda/Complex/mixed.cpp                       |   12 +++++-
 Tests/Cuda/Complex/mixed.cu                        |   12 +++++-
 Tests/CudaOnly/EnableStandard/main.cu              |    8 +++-
 Tests/CudaOnly/EnableStandard/shared.cu            |    8 +++-
 Tests/CudaOnly/SeparateCompilation/main.cu         |    8 ++--
 Tests/CudaOnly/WithDefs/CMakeLists.txt             |    7 +++-
 Tests/CudaOnly/WithDefs/main.notcu                 |   12 ++++++
 ...NoDefault.cmake => CudaStandardNoDefault.cmake} |    6 +--
 Tests/RunCMake/try_compile/RunCMakeTest.cmake      |    6 ++-
 29 files changed, 260 insertions(+), 49 deletions(-)
 create mode 100644 Modules/Platform/Windows-NVIDIA-CUDA.cmake
 copy Tests/RunCMake/try_compile/{CxxStandardNoDefault.cmake => CudaStandardNoDefault.cmake} (58%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 11:51:19 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 11:51:19 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2127-g973ae1b
Message-ID: <20170112165119.DC6BEFA659@public.kitware.com>

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  973ae1be388c84b11b3ad57e4971f9be92f03bd8 (commit)
       via  0362c60fe5f4e7e4011f14dc2519ffb1bc6c8ce8 (commit)
       via  577f721fb70bbf6c29c40d5f10d4319370ccb1f8 (commit)
      from  5a1cd30ba35674baad81b42970528fb6e2c83f14 (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=973ae1be388c84b11b3ad57e4971f9be92f03bd8
commit 973ae1be388c84b11b3ad57e4971f9be92f03bd8
Merge: 5a1cd30 0362c60
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 11:51:19 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 11:51:19 2017 -0500

    Merge topic 'vs15-detect-from-installer' into next
    
    0362c60f cmVSSetupHelper: Simplify use of EnumerateAndChooseVSInstance
    577f721f VS: Fix detection of VS 2017 installation with WindowsStore


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0362c60fe5f4e7e4011f14dc2519ffb1bc6c8ce8
commit 0362c60fe5f4e7e4011f14dc2519ffb1bc6c8ce8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 11:29:06 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 11:32:44 2017 -0500

    cmVSSetupHelper: Simplify use of EnumerateAndChooseVSInstance
    
    This method short-circuits when an instance has already been chosen, so
    avoid duplicating this check at call sites.

diff --git a/Source/cmVSSetupHelper.cxx b/Source/cmVSSetupHelper.cxx
index 2091b5c..c2ff664 100644
--- a/Source/cmVSSetupHelper.cxx
+++ b/Source/cmVSSetupHelper.cxx
@@ -73,44 +73,19 @@ cmVSSetupAPIHelper::~cmVSSetupAPIHelper()
 
 bool cmVSSetupAPIHelper::IsVS2017Installed()
 {
-  bool ret = false;
-  if (chosenInstanceInfo.VSInstallLocation.compare(L"") == 0) {
-    ret = EnumerateAndChooseVSInstance();
-  } else {
-    ret = true;
-  }
-
-  return ret;
+  return this->EnumerateAndChooseVSInstance();
 }
 
 bool cmVSSetupAPIHelper::IsWin10SDKInstalled()
 {
-  bool isWin10SDKInstalled = false;
-  if (chosenInstanceInfo.VSInstallLocation.compare(L"") == 0) {
-    if (EnumerateAndChooseVSInstance() &&
-        chosenInstanceInfo.VSInstallLocation.compare(L"") != 0) {
-      isWin10SDKInstalled = chosenInstanceInfo.IsWin10SDKInstalled;
-    }
-  } else {
-    isWin10SDKInstalled = chosenInstanceInfo.IsWin10SDKInstalled;
-  }
-
-  return isWin10SDKInstalled;
+  return (this->EnumerateAndChooseVSInstance() &&
+          chosenInstanceInfo.IsWin10SDKInstalled);
 }
 
 bool cmVSSetupAPIHelper::IsWin81SDKInstalled()
 {
-  bool isWin81SDKInstalled = false;
-  if (chosenInstanceInfo.VSInstallLocation.compare(L"") == 0) {
-    if (EnumerateAndChooseVSInstance() &&
-        chosenInstanceInfo.VSInstallLocation.compare(L"") != 0) {
-      isWin81SDKInstalled = chosenInstanceInfo.IsWin81SDKInstalled;
-    }
-  } else {
-    isWin81SDKInstalled = chosenInstanceInfo.IsWin81SDKInstalled;
-  }
-
-  return isWin81SDKInstalled;
+  return (this->EnumerateAndChooseVSInstance() &&
+          chosenInstanceInfo.IsWin81SDKInstalled);
 }
 
 bool cmVSSetupAPIHelper::CheckInstalledComponent(
@@ -243,18 +218,12 @@ bool cmVSSetupAPIHelper::GetVSInstanceInfo(
 bool cmVSSetupAPIHelper::GetVSInstanceInfo(std::string& vsInstallLocation)
 {
   vsInstallLocation = "";
-  bool isInstalled = false;
-
-  if (chosenInstanceInfo.VSInstallLocation.compare(L"") == 0) {
-    isInstalled = EnumerateAndChooseVSInstance();
-  }
+  bool isInstalled = this->EnumerateAndChooseVSInstance();
 
-  // Enumerate and choose best VS instance
-  if (chosenInstanceInfo.VSInstallLocation.compare(L"") != 0) {
+  if (isInstalled) {
     std::string str(chosenInstanceInfo.VSInstallLocation.begin(),
                     chosenInstanceInfo.VSInstallLocation.end());
     vsInstallLocation = str;
-    isInstalled = true;
   }
 
   return isInstalled;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=577f721fb70bbf6c29c40d5f10d4319370ccb1f8
commit 577f721fb70bbf6c29c40d5f10d4319370ccb1f8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 11:25:14 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 11:29:35 2017 -0500

    VS: Fix detection of VS 2017 installation with WindowsStore
    
    Fix logic in cmVSSetupAPIHelper::IsVS2017Installed to work correctly on
    repeat calls.
    
    Closes: #16549

diff --git a/Source/cmVSSetupHelper.cxx b/Source/cmVSSetupHelper.cxx
index d675a2c..2091b5c 100644
--- a/Source/cmVSSetupHelper.cxx
+++ b/Source/cmVSSetupHelper.cxx
@@ -76,6 +76,8 @@ bool cmVSSetupAPIHelper::IsVS2017Installed()
   bool ret = false;
   if (chosenInstanceInfo.VSInstallLocation.compare(L"") == 0) {
     ret = EnumerateAndChooseVSInstance();
+  } else {
+    ret = true;
   }
 
   return ret;

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

Summary of changes:
 Source/cmVSSetupHelper.cxx |   43 +++++++------------------------------------
 1 file changed, 7 insertions(+), 36 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 15:08:53 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 15:08:53 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2130-g0401481
Message-ID: <20170112200853.3111FFA42F@public.kitware.com>

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  040148125575371543ea890762da9f4467b9529e (commit)
       via  05dbc940b7e19cdccd7ec73ea173719be66244e1 (commit)
       via  728820f3ea0faf55ffe1236a44a35e9197fc6291 (commit)
      from  973ae1be388c84b11b3ad57e4971f9be92f03bd8 (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=040148125575371543ea890762da9f4467b9529e
commit 040148125575371543ea890762da9f4467b9529e
Merge: 973ae1b 05dbc94
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 15:08:51 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 15:08:51 2017 -0500

    Merge topic 'cuda-no-def-file-for-device' into next
    
    05dbc940 CUDA: Don't use module definition `.def` files for device linking
    728820f3 Merge topic 'cuda-windows'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05dbc940b7e19cdccd7ec73ea173719be66244e1
commit 05dbc940b7e19cdccd7ec73ea173719be66244e1
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Thu Jan 12 13:57:27 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 15:07:10 2017 -0500

    CUDA: Don't use module definition `.def` files for device linking
    
    These files are meaningful only to the host linker.

diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 4bc706c..b76ddeb 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -157,15 +157,6 @@ void cmMakefileExecutableTargetGenerator::WriteDeviceExecutableRule(
   this->LocalGenerator->AppendFlags(
     linkFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
 
-  {
-    CM_AUTO_PTR<cmLinkLineComputer> linkLineComputer(
-      this->CreateLinkLineComputer(
-        this->LocalGenerator,
-        this->LocalGenerator->GetStateSnapshot().GetDirectory()));
-
-    this->AddModuleDefinitionFlag(linkLineComputer.get(), linkFlags);
-  }
-
   // Construct a list of files associated with this executable that
   // may need to be cleaned.
   std::vector<std::string> exeCleanFiles;
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index bc8d8ff..b172478 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -663,7 +663,6 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkStatement()
 
   this->addPoolNinjaVariable("JOB_POOL_LINK", &genTarget, vars);
 
-  this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"]);
   vars["LINK_FLAGS"] =
     cmGlobalNinjaGenerator::EncodeLiteral(vars["LINK_FLAGS"]);
 

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

Summary of changes:
 Source/cmMakefileExecutableTargetGenerator.cxx |    9 ---------
 Source/cmNinjaNormalTargetGenerator.cxx        |    1 -
 2 files changed, 10 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 15:11:46 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 15:11:46 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2132-g7508f58
Message-ID: <20170112201147.17D1AF3B0F@public.kitware.com>

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  7508f58de59e532dd011edc3c0281ff60aaad7b8 (commit)
       via  47ffa0ea5d6cf08bd891d889ce67bee8008ebd8c (commit)
      from  040148125575371543ea890762da9f4467b9529e (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=7508f58de59e532dd011edc3c0281ff60aaad7b8
commit 7508f58de59e532dd011edc3c0281ff60aaad7b8
Merge: 0401481 47ffa0e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 15:11:45 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 15:11:45 2017 -0500

    Merge topic 'ninja-no-static-lib-def-file' into next
    
    47ffa0ea Ninja: Do not use module definition `.def` files for static libraries


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47ffa0ea5d6cf08bd891d889ce67bee8008ebd8c
commit 47ffa0ea5d6cf08bd891d889ce67bee8008ebd8c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 15:56:21 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 13:35:48 2017 -0500

    Ninja: Do not use module definition `.def` files for static libraries
    
    A module definition (`.def`) file specifies symbols to export from
    a linked binary.  The librarian tool is not a linker and so should
    not be given a `/DEF:...` flag with the `.def` file.  The other
    generators already do not do this, so fix Ninja to be consistent.
    
    Closes: #16537

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 7e113ab..239582f 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -63,6 +63,13 @@ void cmCommonTargetGenerator::AddFeatureFlags(std::string& flags,
 void cmCommonTargetGenerator::AddModuleDefinitionFlag(
   cmLinkLineComputer* linkLineComputer, std::string& flags)
 {
+  // A module definition file only makes sense on certain target types.
+  if (this->GeneratorTarget->GetType() != cmStateEnums::SHARED_LIBRARY &&
+      this->GeneratorTarget->GetType() != cmStateEnums::MODULE_LIBRARY &&
+      this->GeneratorTarget->GetType() != cmStateEnums::EXECUTABLE) {
+    return;
+  }
+
   if (!this->ModuleDefinitionFile) {
     return;
   }

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

Summary of changes:
 Source/cmCommonTargetGenerator.cxx |    7 +++++++
 1 file changed, 7 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 15:24:31 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 15:24:31 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2134-g927c6bf
Message-ID: <20170112202431.0FBDEFA028@public.kitware.com>

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  927c6bf2a8f640f4a60bf3acc97af8d838a29969 (commit)
       via  e2210140b158c7f8edffe4875722165928566fc0 (commit)
      from  7508f58de59e532dd011edc3c0281ff60aaad7b8 (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=927c6bf2a8f640f4a60bf3acc97af8d838a29969
commit 927c6bf2a8f640f4a60bf3acc97af8d838a29969
Merge: 7508f58 e221014
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 15:24:27 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 15:24:27 2017 -0500

    Merge topic 'source_group-tree' into next
    
    e2210140 source_group: Add options create groups matching directory tree


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2210140b158c7f8edffe4875722165928566fc0
commit e2210140b158c7f8edffe4875722165928566fc0
Author:     Mateusz Janek <stryku2393 at gmail.com>
AuthorDate: Wed Dec 21 15:27:49 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 11 11:08:00 2017 -0500

    source_group: Add options create groups matching directory tree
    
    Add `TREE` and `PREFIX` arguments to enable this behavior.

diff --git a/Help/command/source_group.rst b/Help/command/source_group.rst
index 6e3829c..938ca40 100644
--- a/Help/command/source_group.rst
+++ b/Help/command/source_group.rst
@@ -2,15 +2,27 @@ source_group
 ------------
 
 Define a grouping for source files in IDE project generation.
+There are two different signatures to create source groups.
 
-.. code-block:: cmake
+::
 
   source_group(<name> [FILES <src>...] [REGULAR_EXPRESSION <regex>])
+  source_group(TREE <root> [PREFIX <prefix>] [FILES <src>...])
 
 Defines a group into which sources will be placed in project files.
 This is intended to set up file tabs in Visual Studio.
 The options are:
 
+``TREE``
+ CMake will automatically detect, from ``<src>`` files paths, source groups
+ it needs to create, to keep structure of source groups analogically to the
+ actual files and directories structure in the project. Paths of ``<src>``
+ files will be cut to be relative to ``<root>``.
+
+``PREFIX``
+ Source group and files located directly in ``<root>`` path, will be placed
+ in ``<prefix>`` source groups.
+
 ``FILES``
  Any source file specified explicitly will be placed in group
  ``<name>``.  Relative paths are interpreted with respect to the
@@ -25,11 +37,13 @@ explicitly lists the file with ``FILES`` will be favored, if any.
 If no group explicitly lists the file, the *last* group whose
 regular expression matches the file will be favored.
 
-The ``<name>`` of the group may contain backslashes to specify subgroups:
+The ``<name>`` of the group and ``<prefix>`` argument may contain backslashes
+to specify subgroups:
 
 .. code-block:: cmake
 
   source_group(outer\\inner ...)
+  source_group(TREE <root> PREFIX sources\\inc ...)
 
 For backwards compatibility, the short-hand signature
 
diff --git a/Help/release/dev/source_group-tree.rst b/Help/release/dev/source_group-tree.rst
new file mode 100644
index 0000000..c5fec1d
--- /dev/null
+++ b/Help/release/dev/source_group-tree.rst
@@ -0,0 +1,5 @@
+source_group-tree
+-----------------
+
+* The :command:`source_group` command gained ``TREE`` and ``PREFIX``
+  options to add groups following source tree directory structure.
diff --git a/Source/cmSourceGroupCommand.cxx b/Source/cmSourceGroupCommand.cxx
index 3f20d4e..dac4b82 100644
--- a/Source/cmSourceGroupCommand.cxx
+++ b/Source/cmSourceGroupCommand.cxx
@@ -8,6 +8,99 @@
 #include "cmSourceGroup.h"
 #include "cmSystemTools.h"
 
+namespace {
+const size_t RootIndex = 1;
+const size_t FilesWithoutPrefixKeywordIndex = 2;
+const size_t FilesWithPrefixKeywordIndex = 4;
+const size_t PrefixKeywordIdex = 2;
+
+std::vector<std::string> tokenizePath(const std::string& path)
+{
+  return cmSystemTools::tokenize(path, "\\/");
+}
+
+std::string getFullFilePath(const std::string& currentPath,
+                            const std::string& path)
+{
+  std::string fullPath = path;
+
+  if (!cmSystemTools::FileIsFullPath(path.c_str())) {
+    fullPath = currentPath;
+    fullPath += "/";
+    fullPath += path;
+  }
+
+  return cmSystemTools::CollapseFullPath(fullPath);
+}
+
+std::set<std::string> getSourceGroupFilesPaths(
+  const std::string& currentPath, const std::string& root,
+  const std::vector<std::string>& files)
+{
+  std::set<std::string> ret;
+  const std::string::size_type rootLength = root.length();
+
+  for (size_t i = 0; i < files.size(); ++i) {
+    const std::string fullPath = getFullFilePath(currentPath, files[i]);
+
+    ret.insert(fullPath.substr(rootLength + 1)); // +1 to also omnit last '/'
+  }
+
+  return ret;
+}
+
+cmSourceGroup* addSourceGroup(const std::vector<std::string>& tokenizedPath,
+                              cmMakefile& makefile)
+{
+  cmSourceGroup* sg;
+
+  sg = makefile.GetSourceGroup(tokenizedPath);
+  if (!sg) {
+    makefile.AddSourceGroup(tokenizedPath);
+    sg = makefile.GetSourceGroup(tokenizedPath);
+    if (!sg) {
+      return CM_NULLPTR;
+    }
+  }
+
+  return sg;
+}
+
+bool addFilesToItsSourceGroups(const std::set<std::string>& sgFilesPaths,
+                               const std::string& prefix, cmMakefile& makefile,
+                               std::string& errorMsg)
+{
+  cmSourceGroup* sg;
+
+  for (std::set<std::string>::const_iterator it = std::begin(sgFilesPaths);
+       it != std::end(sgFilesPaths); ++it) {
+
+    std::vector<std::string> tokenizedPath;
+    if (!prefix.empty()) {
+      tokenizedPath = tokenizePath(prefix + '/' + *it);
+    } else {
+      tokenizedPath = tokenizePath(*it);
+    }
+
+    if (tokenizedPath.size() > 1) {
+      tokenizedPath.pop_back();
+
+      sg = addSourceGroup(tokenizedPath, makefile);
+
+      if (!sg) {
+        errorMsg = "Could not create source group for file: " + *it;
+        return false;
+      }
+      const std::string fullPath =
+        getFullFilePath(makefile.GetCurrentSourceDirectory(), *it);
+      sg->AddGroupFile(fullPath);
+    }
+  }
+
+  return true;
+}
+}
+
 class cmExecutionStatus;
 
 // cmSourceGroupCommand
@@ -19,6 +112,17 @@ bool cmSourceGroupCommand::InitialPass(std::vector<std::string> const& args,
     return false;
   }
 
+  if (args[0] == "TREE") {
+    std::string error;
+
+    if (!processTree(args, error)) {
+      this->SetError(error);
+      return false;
+    }
+
+    return true;
+  }
+
   std::string delimiter = "\\";
   if (this->Makefile->GetDefinition("SOURCE_GROUP_DELIMITER")) {
     delimiter = this->Makefile->GetDefinition("SOURCE_GROUP_DELIMITER");
@@ -82,3 +186,64 @@ bool cmSourceGroupCommand::InitialPass(std::vector<std::string> const& args,
 
   return true;
 }
+
+bool cmSourceGroupCommand::checkTreeArgumentsPreconditions(
+  const std::vector<std::string>& args, std::string& errorMsg) const
+{
+  if (args.size() == 1) {
+    errorMsg = "TREE argument given without a root.";
+    return false;
+  }
+
+  if (args.size() < 3) {
+    errorMsg = "Missing FILES arguments.";
+    return false;
+  }
+
+  if (args[FilesWithoutPrefixKeywordIndex] != "FILES" &&
+      args[PrefixKeywordIdex] != "PREFIX") {
+    errorMsg = "Unknown argument \"" + args[2] +
+      "\". Perhaps the FILES keyword is missing.\n";
+    return false;
+  }
+
+  if (args[PrefixKeywordIdex] == "PREFIX" &&
+      (args.size() < 5 || args[FilesWithPrefixKeywordIndex] != "FILES")) {
+    errorMsg = "Missing FILES arguments.";
+    return false;
+  }
+
+  return true;
+}
+
+bool cmSourceGroupCommand::processTree(const std::vector<std::string>& args,
+                                       std::string& errorMsg)
+{
+  if (!checkTreeArgumentsPreconditions(args, errorMsg)) {
+    return false;
+  }
+
+  const std::string root = cmSystemTools::CollapseFullPath(args[RootIndex]);
+  std::string prefix;
+  size_t filesBegin = FilesWithoutPrefixKeywordIndex + 1;
+  if (args[PrefixKeywordIdex] == "PREFIX") {
+    prefix = args[PrefixKeywordIdex + 1];
+    filesBegin = FilesWithPrefixKeywordIndex + 1;
+  }
+
+  const std::vector<std::string> filesVector(args.cbegin() + filesBegin,
+                                             args.cend());
+
+  std::set<std::string> sourceGroupPaths = getSourceGroupFilesPaths(
+    this->Makefile->GetCurrentSourceDirectory(), root, filesVector);
+
+  addFilesToItsSourceGroups(sourceGroupPaths, prefix, *(this->Makefile),
+                            errorMsg);
+
+  if (!errorMsg.empty()) {
+    this->SetError(errorMsg.c_str());
+    return false;
+  }
+
+  return true;
+}
diff --git a/Source/cmSourceGroupCommand.h b/Source/cmSourceGroupCommand.h
index f533be1..5549096 100644
--- a/Source/cmSourceGroupCommand.h
+++ b/Source/cmSourceGroupCommand.h
@@ -36,6 +36,12 @@ public:
    * The name of the command as specified in CMakeList.txt.
    */
   std::string GetName() const CM_OVERRIDE { return "source_group"; }
+
+private:
+  bool processTree(const std::vector<std::string>& args,
+                   std::string& errorMsg);
+  bool checkTreeArgumentsPreconditions(const std::vector<std::string>& args,
+                                       std::string& errorMsg) const;
 };
 
 #endif
diff --git a/Tests/SourceGroups/CMakeLists.txt b/Tests/SourceGroups/CMakeLists.txt
index 6573c82..9289e84 100644
--- a/Tests/SourceGroups/CMakeLists.txt
+++ b/Tests/SourceGroups/CMakeLists.txt
@@ -30,6 +30,17 @@ source_group(Base\\Sub1\\Base FILES bar.c)
 # a group without files, is currently not created
 source_group(EmptyGroup)
 
+set(root ${CMAKE_CURRENT_SOURCE_DIR})
 
-add_executable(SourceGroups main.c bar.c foo.c sub1/foo.c sub1/foobar.c baz.c README.txt)
+set(tree_files_without_prefix ${root}/sub1/tree_bar.c
+                              ${root}/sub1/tree_baz.c
+                              ${root}/sub1/tree_subdir/tree_foobar.c)
 
+set(tree_files_with_prefix ${root}/tree_foo.c)
+
+source_group(TREE ${root} FILES ${tree_files_without_prefix})
+
+source_group(TREE ${root} PREFIX tree_root/subgroup FILES ${tree_files_with_prefix})
+
+add_executable(SourceGroups main.c bar.c foo.c sub1/foo.c sub1/foobar.c baz.c
+                            ${tree_files_with_prefix} ${tree_files_without_prefix} README.txt)
diff --git a/Tests/SourceGroups/main.c b/Tests/SourceGroups/main.c
index f259f98..b88f2f8 100644
--- a/Tests/SourceGroups/main.c
+++ b/Tests/SourceGroups/main.c
@@ -5,10 +5,17 @@ extern int bar(void);
 extern int foobar(void);
 extern int barbar(void);
 extern int baz(void);
+extern int tree_foo(void);
+extern int tree_bar(void);
+extern int tree_foobar(void);
+extern int tree_baz(void);
 
 int main()
 {
   printf("foo: %d bar: %d foobar: %d barbar: %d baz: %d\n", foo(), bar(),
          foobar(), barbar(), baz());
+
+  printf("tree_foo: %d tree_bar: %d tree_foobar: %d tree_baz: %d\n",
+         tree_foo(), tree_bar(), tree_foobar(), tree_baz());
   return 0;
 }
diff --git a/Tests/SourceGroups/sub1/tree_bar.c b/Tests/SourceGroups/sub1/tree_bar.c
new file mode 100644
index 0000000..6b79239
--- /dev/null
+++ b/Tests/SourceGroups/sub1/tree_bar.c
@@ -0,0 +1,4 @@
+int tree_bar(void)
+{
+  return 8;
+}
diff --git a/Tests/SourceGroups/sub1/tree_baz.c b/Tests/SourceGroups/sub1/tree_baz.c
new file mode 100644
index 0000000..27ff5ab
--- /dev/null
+++ b/Tests/SourceGroups/sub1/tree_baz.c
@@ -0,0 +1,4 @@
+int tree_baz(void)
+{
+  return 9;
+}
diff --git a/Tests/SourceGroups/sub1/tree_subdir/tree_foobar.c b/Tests/SourceGroups/sub1/tree_subdir/tree_foobar.c
new file mode 100644
index 0000000..e955e04
--- /dev/null
+++ b/Tests/SourceGroups/sub1/tree_subdir/tree_foobar.c
@@ -0,0 +1,4 @@
+int tree_foobar(void)
+{
+  return 7;
+}
diff --git a/Tests/SourceGroups/tree_foo.c b/Tests/SourceGroups/tree_foo.c
new file mode 100644
index 0000000..d392e41
--- /dev/null
+++ b/Tests/SourceGroups/tree_foo.c
@@ -0,0 +1,4 @@
+int tree_foo(void)
+{
+  return 6;
+}

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

Summary of changes:
 Help/command/source_group.rst                     |   18 ++-
 Help/release/dev/source_group-tree.rst            |    5 +
 Source/cmSourceGroupCommand.cxx                   |  165 +++++++++++++++++++++
 Source/cmSourceGroupCommand.h                     |    6 +
 Tests/SourceGroups/CMakeLists.txt                 |   13 +-
 Tests/SourceGroups/main.c                         |    7 +
 Tests/SourceGroups/sub1/tree_bar.c                |    4 +
 Tests/SourceGroups/sub1/tree_baz.c                |    4 +
 Tests/SourceGroups/sub1/tree_subdir/tree_foobar.c |    4 +
 Tests/SourceGroups/tree_foo.c                     |    4 +
 10 files changed, 227 insertions(+), 3 deletions(-)
 create mode 100644 Help/release/dev/source_group-tree.rst
 create mode 100644 Tests/SourceGroups/sub1/tree_bar.c
 create mode 100644 Tests/SourceGroups/sub1/tree_baz.c
 create mode 100644 Tests/SourceGroups/sub1/tree_subdir/tree_foobar.c
 create mode 100644 Tests/SourceGroups/tree_foo.c


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 15:30:27 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 15:30:27 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2137-gc52c367
Message-ID: <20170112203027.54FDEFA36F@public.kitware.com>

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  c52c3679f3653ad0e34b35f08b9ccf780f3e5473 (commit)
       via  8d1f9e5b850e02d304e4c209e720f06e25837470 (commit)
       via  dc5051f1c1b7604b9c05e04bdccdff222b69efa0 (commit)
      from  927c6bf2a8f640f4a60bf3acc97af8d838a29969 (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=c52c3679f3653ad0e34b35f08b9ccf780f3e5473
commit c52c3679f3653ad0e34b35f08b9ccf780f3e5473
Merge: 927c6bf 8d1f9e5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 15:30:25 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 15:30:25 2017 -0500

    Merge topic 'cuda_propagate_flags_when_dlink_on_executables' into next
    
    8d1f9e5b CUDA: Now pass correct FLAGS when device link cuda executables.
    dc5051f1 CUDA: Test that CUDA flags are used when device linking executables.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d1f9e5b850e02d304e4c209e720f06e25837470
commit 8d1f9e5b850e02d304e4c209e720f06e25837470
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Thu Jan 5 16:31:36 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 15:13:36 2017 -0500

    CUDA: Now pass correct FLAGS when device link cuda executables.
    
    Previously we had a two issues when building cuda executables
    that required separable compilation. The first was that we didn't
    propagate FLAGS causing any -arch / -gencode flags to be dropped, and
    secondly generators such as ninja would use the CXX language flags
    instead of CUDA when the executable was mixed language.

diff --git a/Modules/CMakeCUDACompiler.cmake.in b/Modules/CMakeCUDACompiler.cmake.in
index 1ba42d9..7e8efa7 100644
--- a/Modules/CMakeCUDACompiler.cmake.in
+++ b/Modules/CMakeCUDACompiler.cmake.in
@@ -13,6 +13,8 @@ set(CMAKE_CUDA_HOST_COMPILER_ENV_VAR "CUDAHOSTCXX")
 
 set(CMAKE_CUDA_COMPILER_ID_RUN 1)
 set(CMAKE_CUDA_SOURCE_FILE_EXTENSIONS cu)
+set(CMAKE_CUDA_LINKER_PREFERENCE 10)
+set(CMAKE_CUDA_LINKER_PREFERENCE_PROPAGATES 1)
 
 set(CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES "@CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES@")
 set(CMAKE_CUDA_HOST_IMPLICIT_LINK_DIRECTORIES "@CMAKE_CUDA_HOST_IMPLICIT_LINK_DIRECTORIES@")
diff --git a/Modules/CMakeCUDAInformation.cmake b/Modules/CMakeCUDAInformation.cmake
index abc4b66..13b1789 100644
--- a/Modules/CMakeCUDAInformation.cmake
+++ b/Modules/CMakeCUDAInformation.cmake
@@ -187,7 +187,7 @@ if(NOT CMAKE_CUDA_DEVICE_LINK_LIBRARY)
 endif()
 if(NOT CMAKE_CUDA_DEVICE_LINK_EXECUTABLE)
   set(CMAKE_CUDA_DEVICE_LINK_EXECUTABLE
-    "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+    "<CMAKE_CUDA_COMPILER> <FLAGS> <CMAKE_CUDA_LINK_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
 endif()
 
 mark_as_advanced(
diff --git a/Modules/Platform/Windows-NVIDIA-CUDA.cmake b/Modules/Platform/Windows-NVIDIA-CUDA.cmake
index 80ecfbc..809ee06 100644
--- a/Modules/Platform/Windows-NVIDIA-CUDA.cmake
+++ b/Modules/Platform/Windows-NVIDIA-CUDA.cmake
@@ -33,7 +33,7 @@ unset(_CMAKE_VS_LINK_EXE)
 set(CMAKE_CUDA_DEVICE_LINK_LIBRARY
   "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> <LANGUAGE_COMPILE_FLAGS> -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
 set(CMAKE_CUDA_DEVICE_LINK_EXECUTABLE
-  "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
+  "<CMAKE_CUDA_COMPILER> <FLAGS> <CMAKE_CUDA_LINK_FLAGS> -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
 
 string(APPEND CMAKE_CUDA_FLAGS_INIT " -Xcompiler=-GR,-EHsc")
 string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -Xcompiler=-MDd,-Zi,-RTC1")
diff --git a/Source/cmLinkLineComputer.cxx b/Source/cmLinkLineComputer.cxx
index cf0cf88..e728632 100644
--- a/Source/cmLinkLineComputer.cxx
+++ b/Source/cmLinkLineComputer.cxx
@@ -184,3 +184,9 @@ std::string cmLinkLineComputer::ComputeLinkLibraries(
 
   return fout.str();
 }
+
+std::string cmLinkLineComputer::GetLinkerLanguage(cmGeneratorTarget* target,
+                                                  std::string const& config)
+{
+  return target->GetLinkerLanguage(config);
+}
diff --git a/Source/cmLinkLineComputer.h b/Source/cmLinkLineComputer.h
index bb13717..57a70bc 100644
--- a/Source/cmLinkLineComputer.h
+++ b/Source/cmLinkLineComputer.h
@@ -11,6 +11,7 @@
 #include "cmStateDirectory.h"
 
 class cmComputeLinkInformation;
+class cmGeneratorTarget;
 class cmOutputConverter;
 
 class cmLinkLineComputer
@@ -36,6 +37,9 @@ public:
   virtual std::string ComputeLinkLibraries(cmComputeLinkInformation& cli,
                                            std::string const& stdLibString);
 
+  virtual std::string GetLinkerLanguage(cmGeneratorTarget* target,
+                                        std::string const& config);
+
 protected:
   std::string ComputeLinkLibs(cmComputeLinkInformation& cli);
   std::string ComputeRPath(cmComputeLinkInformation& cli);
diff --git a/Source/cmLinkLineDeviceComputer.cxx b/Source/cmLinkLineDeviceComputer.cxx
index 75e5ef5..6a700ff 100644
--- a/Source/cmLinkLineDeviceComputer.cxx
+++ b/Source/cmLinkLineDeviceComputer.cxx
@@ -59,6 +59,12 @@ std::string cmLinkLineDeviceComputer::ComputeLinkLibraries(
   return fout.str();
 }
 
+std::string cmLinkLineDeviceComputer::GetLinkerLanguage(cmGeneratorTarget*,
+                                                        std::string const&)
+{
+  return "CUDA";
+}
+
 cmNinjaLinkLineDeviceComputer::cmNinjaLinkLineDeviceComputer(
   cmOutputConverter* outputConverter, cmStateDirectory stateDir,
   cmGlobalNinjaGenerator const* gg)
diff --git a/Source/cmLinkLineDeviceComputer.h b/Source/cmLinkLineDeviceComputer.h
index d1079d7..f4bb3eb 100644
--- a/Source/cmLinkLineDeviceComputer.h
+++ b/Source/cmLinkLineDeviceComputer.h
@@ -17,6 +17,9 @@ public:
   std::string ComputeLinkLibraries(cmComputeLinkInformation& cli,
                                    std::string const& stdLibString)
     CM_OVERRIDE;
+
+  std::string GetLinkerLanguage(cmGeneratorTarget* target,
+                                std::string const& config) CM_OVERRIDE;
 };
 
 class cmNinjaLinkLineDeviceComputer : public cmLinkLineDeviceComputer
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index ead1e72..44c390c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -13,6 +13,7 @@
 #include "cmInstallScriptGenerator.h"
 #include "cmInstallTargetGenerator.h"
 #include "cmLinkLineComputer.h"
+#include "cmLinkLineDeviceComputer.h"
 #include "cmMakefile.h"
 #include "cmRulePlaceholderExpander.h"
 #include "cmSourceFile.h"
@@ -979,7 +980,9 @@ void cmLocalGenerator::GetTargetFlags(
         linkFlags += this->Makefile->GetSafeDefinition(build);
         linkFlags += " ";
       }
-      std::string linkLanguage = target->GetLinkerLanguage(buildType);
+
+      const std::string linkLanguage =
+        linkLineComputer->GetLinkerLanguage(target, buildType);
       if (linkLanguage.empty()) {
         cmSystemTools::Error(
           "CMake can not determine linker language for target: ",

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc5051f1c1b7604b9c05e04bdccdff222b69efa0
commit dc5051f1c1b7604b9c05e04bdccdff222b69efa0
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Thu Jan 5 14:21:23 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 15:13:31 2017 -0500

    CUDA: Test that CUDA flags are used when device linking executables.

diff --git a/Tests/Cuda/CMakeLists.txt b/Tests/Cuda/CMakeLists.txt
index 5772fcf..40c9675 100644
--- a/Tests/Cuda/CMakeLists.txt
+++ b/Tests/Cuda/CMakeLists.txt
@@ -2,3 +2,4 @@
 ADD_TEST_MACRO(Cuda.Complex CudaComplex)
 ADD_TEST_MACRO(Cuda.ConsumeCompileFeatures CudaConsumeCompileFeatures)
 ADD_TEST_MACRO(Cuda.ObjectLibrary CudaObjectLibrary)
+ADD_TEST_MACRO(Cuda.ProperLinkFlags ProperLinkFlags)
diff --git a/Tests/Cuda/ProperLinkFlags/CMakeLists.txt b/Tests/Cuda/ProperLinkFlags/CMakeLists.txt
new file mode 100644
index 0000000..a9eb8bd
--- /dev/null
+++ b/Tests/Cuda/ProperLinkFlags/CMakeLists.txt
@@ -0,0 +1,20 @@
+
+cmake_minimum_required(VERSION 3.7)
+project (ProperLinkFlags CUDA CXX)
+
+#Goal for this example:
+#Verify that when we have CXX and CUDA enabled and we link an executable that
+#has CUDA and CXX we use the CUDA link flags when doing the device link
+#step
+
+#Specify a set of valid CUDA flags and an invalid set of CXX flags ( for CUDA )
+#to make sure we don't use the CXX flags when linking CUDA executables
+set(CMAKE_CUDA_FLAGS "-arch=sm_35 --use_fast_math")
+set(CMAKE_CXX_FLAGS "-Wall")
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CUDA_STANDARD 11)
+add_executable(ProperLinkFlags file1.cu main.cxx)
+
+set_target_properties( ProperLinkFlags
+                       PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
diff --git a/Tests/Cuda/ProperLinkFlags/file1.cu b/Tests/Cuda/ProperLinkFlags/file1.cu
new file mode 100644
index 0000000..d93dc9f
--- /dev/null
+++ b/Tests/Cuda/ProperLinkFlags/file1.cu
@@ -0,0 +1,11 @@
+
+#include "file1.h"
+
+result_type __device__ file1_func(int x)
+{
+  __ldg(&x);
+  result_type r;
+  r.input = x;
+  r.sum = x*x;
+  return r;
+}
diff --git a/Tests/Cuda/ProperLinkFlags/file1.h b/Tests/Cuda/ProperLinkFlags/file1.h
new file mode 100644
index 0000000..ff1945c
--- /dev/null
+++ b/Tests/Cuda/ProperLinkFlags/file1.h
@@ -0,0 +1,7 @@
+
+#pragma once
+struct result_type
+{
+  int input;
+  int sum;
+};
diff --git a/Tests/Cuda/ProperLinkFlags/main.cxx b/Tests/Cuda/ProperLinkFlags/main.cxx
new file mode 100644
index 0000000..7c0ee9e
--- /dev/null
+++ b/Tests/Cuda/ProperLinkFlags/main.cxx
@@ -0,0 +1,9 @@
+
+#include <iostream>
+
+#include "file1.h"
+
+int main(int argc, char** argv)
+{
+  return 0;
+}

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

Summary of changes:
 Modules/CMakeCUDACompiler.cmake.in                 |    2 ++
 Modules/CMakeCUDAInformation.cmake                 |    2 +-
 Modules/Platform/Windows-NVIDIA-CUDA.cmake         |    2 +-
 Source/cmLinkLineComputer.cxx                      |    6 ++++++
 Source/cmLinkLineComputer.h                        |    4 ++++
 Source/cmLinkLineDeviceComputer.cxx                |    6 ++++++
 Source/cmLinkLineDeviceComputer.h                  |    3 +++
 Source/cmLocalGenerator.cxx                        |    5 ++++-
 Tests/Cuda/CMakeLists.txt                          |    1 +
 Tests/Cuda/ProperLinkFlags/CMakeLists.txt          |   20 ++++++++++++++++++++
 Tests/Cuda/{Complex => ProperLinkFlags}/file1.cu   |    1 +
 Tests/Cuda/{Complex => ProperLinkFlags}/file1.h    |    0
 .../main.cpp => Cuda/ProperLinkFlags/main.cxx}     |    4 ++++
 13 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 Tests/Cuda/ProperLinkFlags/CMakeLists.txt
 copy Tests/Cuda/{Complex => ProperLinkFlags}/file1.cu (90%)
 copy Tests/Cuda/{Complex => ProperLinkFlags}/file1.h (100%)
 copy Tests/{RunCMake/CompatibleInterface/main.cpp => Cuda/ProperLinkFlags/main.cxx} (54%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 15:32:16 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 15:32:16 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2139-ge568e03
Message-ID: <20170112203216.5ADABFA38F@public.kitware.com>

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  e568e03e024719c1e119fb5e3ee35f491ca1b757 (commit)
       via  4971799360b5ec7c99f94810f2fa5cb9f80dcebf (commit)
      from  c52c3679f3653ad0e34b35f08b9ccf780f3e5473 (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=e568e03e024719c1e119fb5e3ee35f491ca1b757
commit e568e03e024719c1e119fb5e3ee35f491ca1b757
Merge: c52c367 4971799
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 15:32:14 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 15:32:14 2017 -0500

    Merge topic 'usage-cpack-ifw-configure-file' into next
    
    49717993 QtIFW: Improved packaging


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4971799360b5ec7c99f94810f2fa5cb9f80dcebf
commit 4971799360b5ec7c99f94810f2fa5cb9f80dcebf
Author:     Konstantin Podsvirov <konstantin at podsvirov.pro>
AuthorDate: Wed Jan 11 14:06:00 2017 +0300
Commit:     Konstantin Podsvirov <konstantin at podsvirov.pro>
CommitDate: Thu Jan 12 19:29:52 2017 +0300

    QtIFW: Improved packaging
    
    Now cpack_ifw_configure_file command used to configure
    template files of component's scripts.
    
    Now for these template files we can use QtIFW predefined
    variables (like @VAR@) and template variables
    in Qt/IFW/SDK/Creator templates style (like %VAR%).
    
    Now CMake_INSTALL_INFIX advanced variable used to configure
    CMake installation destination when package as part of QtSDK.

diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
index ba858bd..a0aacb4 100644
--- a/CMakeCPack.cmake
+++ b/CMakeCPack.cmake
@@ -54,6 +54,9 @@ if(${CPACK_SYSTEM_NAME} MATCHES Windows)
   endif()
 endif()
 
+# Command for configure IFW script templates
+include(${CMake_SOURCE_DIR}/Modules/CPackIFWConfigureFile.cmake)
+
 # Advanced IFW configuration
 set(_cpifwrc CPACK_IFW_COMPONENT_GROUP_CMAKE_)
 set(_cpifwrcconf _CPACK_IFW_COMPONENT_GROUP_CMAKE)
@@ -85,8 +88,6 @@ _cmifwarg("Package <Default> tag (values: TRUE, FALSE, SCRIPT)"
 _cmifwarg("Package <Version> tag"
   STRING VERSION
   "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
-_cmifwarg("Package <Script> tag"
-  FILEPATH SCRIPT "${CMake_BINARY_DIR}/installscript.qs")
 _cmifwarg("Package <SortingPriority> tag"
   STRING PRIORITY "100")
 _cmifwarg("Package <ForsedInstallation> tag"
@@ -148,33 +149,22 @@ if(CMake_INSTALL_COMPONENTS)
   set(CPACK_COMPONENTS_ALL \"${_CPACK_IFW_COMPONENTS_ALL}\")
   set(CPACK_COMPONENTS_GROUPING IGNORE)
   ")
+  _cmifwarg("Package <Script> template"
+    FILEPATH SCRIPT_TEMPLATE "${CMake_SOURCE_DIR}/Source/QtIFW/CMake.qs.in")
 else()
   if(BUILD_QtDialog AND USE_LGPL)
     set(${_cpifwrc}LICENSES_DEFAULT
       "${${_cpifwrc}LICENSES_DEFAULT};LGPLv${USE_LGPL};${CMake_SOURCE_DIR}/Licenses/LGPLv${USE_LGPL}.txt")
   endif()
+  _cmifwarg("Package <Script> template"
+    FILEPATH SCRIPT_TEMPLATE "${CMake_SOURCE_DIR}/Source/QtIFW/installscript.qs.in")
 endif()
+_cmifwarg("Package <Script> generated"
+  FILEPATH SCRIPT_GENERATED "${CMake_BINARY_DIR}/CMake.qs")
 
 _cmifwarg("Package <Licenses> tag (pairs of <display_name> <file_path>)"
   STRING LICENSES "${${_cpifwrc}LICENSES_DEFAULT}")
 
-# Components scripts configuration
-if(CMake_INSTALL_COMPONENTS)
-  configure_file("${CMake_SOURCE_DIR}/Source/QtIFW/CMake.qs.in"
-    "${CMake_BINARY_DIR}/installscript.qs" @ONLY
-  )
-else()
-  configure_file("${CMake_SOURCE_DIR}/Source/QtIFW/installscript.qs.in"
-    "${CMake_BINARY_DIR}/installscript.qs" @ONLY
-  )
-endif()
-foreach(_script
-  CMake.Documentation.SphinxHTML
-  CMake.DeveloperReference.HTML)
-  configure_file("${CMake_SOURCE_DIR}/Source/QtIFW/${_script}.qs.in"
-    "${CMake_BINARY_DIR}/${_script}.qs" @ONLY)
-endforeach()
-
 if(${CMAKE_SYSTEM_NAME} MATCHES Windows)
   set(_CPACK_IFW_PACKAGE_ICON
       "set(CPACK_IFW_PACKAGE_ICON \"${CMake_SOURCE_DIR}/Source/QtDialog/CMakeSetup.ico\")")
@@ -199,6 +189,23 @@ if(${CMAKE_SYSTEM_NAME} MATCHES Linux)
   set(CPACK_IFW_ADMIN_TARGET_DIRECTORY "@ApplicationsDir@/${CMAKE_PROJECT_NAME}")
 endif()
 
+# Components scripts configuration
+if((EXISTS "${CMake_IFW_ROOT_COMPONENT_SCRIPT_TEMPLATE}")
+  AND (NOT "${CMake_IFW_ROOT_COMPONENT_SCRIPT_GENERATED}" STREQUAL "")
+  AND (NOT "${CMake_IFW_ROOT_COMPONENT_SCRIPT}"))
+  cpack_ifw_configure_file("${CMake_IFW_ROOT_COMPONENT_SCRIPT_TEMPLATE}"
+    "${CMake_IFW_ROOT_COMPONENT_SCRIPT_GENERATED}")
+  _cmifwarg("Package <Script> tag"
+    FILEPATH SCRIPT "${CMake_IFW_ROOT_COMPONENT_SCRIPT_GENERATED}")
+endif()
+foreach(_script
+  CMake.Dialogs.QtGUI
+  CMake.Documentation.SphinxHTML
+  CMake.DeveloperReference.HTML)
+  cpack_ifw_configure_file("${CMake_SOURCE_DIR}/Source/QtIFW/${_script}.qs.in"
+    "${CMake_BINARY_DIR}/${_script}.qs")
+endforeach()
+
 if(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
   # if the CPACK_PACKAGE_FILE_NAME is not defined by the cache
   # default to source package - system, on cygwin system is not
diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in
index 99746b0..ad0c245 100644
--- a/CMakeCPackOptions.cmake.in
+++ b/CMakeCPackOptions.cmake.in
@@ -132,7 +132,7 @@ if(CPACK_GENERATOR MATCHES "IFW")
   set(CPACK_COMPONENT_CMAKE-GUI_GROUP Dialogs)
   set(CPACK_IFW_COMPONENT_CMAKE-GUI_NAME "QtGUI")
   set(CPACK_IFW_COMPONENT_CMAKE-GUI_SCRIPT
-    "@CMake_SOURCE_DIR@/Source/QtIFW/CMake.Dialogs.QtGUI.qs")
+    "@CMake_BINARY_DIR@/CMake.Dialogs.QtGUI.qs")
   set(CPACK_IFW_COMPONENT_CMAKE-GUI_VERSION
     "@CMake_IFW_ROOT_COMPONENT_VERSION@")
   @_CPACK_IFW_COMPONENT_CMAKE-GUI_LICENSES@
diff --git a/Packaging/QtSDK/ToolsCMakeXX.cmake b/Packaging/QtSDK/ToolsCMakeXX.cmake
index e227b73..c5f8f34 100644
--- a/Packaging/QtSDK/ToolsCMakeXX.cmake
+++ b/Packaging/QtSDK/ToolsCMakeXX.cmake
@@ -3,38 +3,29 @@
 
 # CMake version
 include("${CMAKE_CURRENT_LIST_DIR}/../../Source/CMakeVersion.cmake")
-set(CM_VER_XY ${CMake_VERSION_MAJOR}${CMake_VERSION_MINOR})
-set(CM_VER_X_Y ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR})
-set(CM_VER_X_Y_Z ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATH})
 
-# Destiantion
-set(CM_INST_PREF "Tools/CMake/${CM_VER_X_Y}")
-set(CMAKE_BIN_DIR "${CM_INST_PREF}/bin"
-  CACHE STRING "Location under install bin")
-set(CMAKE_DATA_DIR "${CM_INST_PREF}/share/cmake-${CM_VER_X_Y}"
-  CACHE STRING "Location under install data")
-set(CMAKE_DOC_DIR "${CM_INST_PREF}/doc/cmake-${CM_VER_X_Y}"
-  CACHE STRING "Location under install docs")
-set(CMAKE_MAN_DIR "${CM_INST_PREF}/man"
-  CACHE STRING "Location under install man pages")
-set(CMAKE_XDGDATA_DIR "${CM_INST_PREF}/share"
-  CACHE STRING "Location under install XDG specific files")
+# Install destinations
+set(CMake_INSTALL_INFIX "Tools/CMake/${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}/"
+  CACHE STRING "Location under install CMake tools")
 
 # Package
 set(CMake_IFW_ROOT_COMPONENT_NAME
-  "qt.tools.cmake.${CM_VER_XY}"
+  "qt.tools.cmake.${CMake_VERSION_MAJOR}${CMake_VERSION_MINOR}"
   CACHE STRING "QtSDK CMake tools component name")
 set(CMake_IFW_ROOT_COMPONENT_DISPLAY_NAME
-  "CMake ${CM_VER_X_Y}"
+  "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}"
   CACHE STRING "QtSDK CMake tools component display name")
 set(CMake_IFW_ROOT_COMPONENT_DESCRIPTION
-  "CMake Build Tools ${CM_VER_X_Y_Z}"
+  "CMake Build Tools ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATH}"
   CACHE STRING "QtSDK CMake tools component description")
-set(CMake_IFW_ROOT_COMPONENT_SCRIPT
-  "${CMAKE_CURRENT_BINARY_DIR}/qt.tools.cmake.${CM_VER_XY}.qs"
-  CACHE STRING "QtSDK CMake tools component display name")
+set(CMake_IFW_ROOT_COMPONENT_SCRIPT_TEMPLATE
+  "${CMAKE_CURRENT_LIST_DIR}/qt.tools.cmake.xx.qs.in"
+  CACHE FILEPATH "QtSDK CMake tools script template")
+set(CMake_IFW_ROOT_COMPONENT_SCRIPT_GENERATED
+  "${CMAKE_CURRENT_BINARY_DIR}/qt.tools.cmake.${CMake_VERSION_MAJOR}${CMake_VERSION_MINOR}.qs"
+  CACHE FILEPATH "QtSDK CMake tools script generated")
 set(CMake_IFW_ROOT_COMPONENT_PRIORITY
-  "${CM_VER_XY}"
+  "${CMake_VERSION_MAJOR}${CMake_VERSION_MINOR}"
   CACHE STRING "QtSDK CMake tools component sorting priority")
 set(CMake_IFW_ROOT_COMPONENT_DEFAULT ""
   CACHE STRING "QtSDK CMake tools component default")
@@ -52,17 +43,3 @@ set(CPACK_IFW_DOWNLOAD_ALL "TRUE"
   CACHE STRING "All QtSDK components is downloaded")
 set(CPACK_DOWNLOAD_SITE "file:///${CMAKE_CURRENT_BINARY_DIR}/QtSDK/IFW/CMake/repository"
   CACHE STRING "Local repository for testing")
-
-# Script
-set(SDKToolBinary "@SDKToolBinary@")
-set(CM_VER_XY_DIR "@CMAKE${CM_VER_XY}_DIR@")
-configure_file("${CMAKE_CURRENT_LIST_DIR}/qt.tools.cmake.xx.qs.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/qt.tools.cmake.${CM_VER_XY}.qs"
-  @ONLY)
-
-# Unset temporary variables
-unset(CM_VER_XY)
-unset(CM_VER_X_Y)
-unset(CM_VER_X_Y_Z)
-unset(CM_INST_PREF)
-unset(SDKToolBinary)
diff --git a/Packaging/QtSDK/qt.tools.cmake.xx.qs.in b/Packaging/QtSDK/qt.tools.cmake.xx.qs.in
index cb42a71..81ce157 100644
--- a/Packaging/QtSDK/qt.tools.cmake.xx.qs.in
+++ b/Packaging/QtSDK/qt.tools.cmake.xx.qs.in
@@ -9,15 +9,15 @@
 function Component()
 {
     installer.valueChanged.connect( this, Component.prototype.reactOnTargetDirChange );
-    // set the default values to CMAKE at CM_VER_XY@_DIR
+    // set the default values to CMAKE%CMake_VERSION_MAJOR%%CMake_VERSION_MINOR%_BIN_DIR
     Component.prototype.reactOnTargetDirChange("TargetDir", installer.value("TargetDir"));
 }
 
 Component.prototype.reactOnTargetDirChange = function(key, value)
 {
     if (key == "TargetDir") {
-        var path = value + "/@CM_INST_PREF@";
-        installer.setValue("CMAKE at CM_VER_XY@_DIR", path.replace(/\\/g, "/"));
+        var path = value + "/%CMAKE_BIN_DIR%";
+        installer.setValue("CMAKE%CMake_VERSION_MAJOR%%CMake_VERSION_MINOR%_BIN_DIR", path.replace(/\\/g, "/"));
     }
 }
 
@@ -31,13 +31,13 @@ Component.prototype.createOperations = function()
                 return;
 
             var cmId = component.name;
-            installer.setValue("CMAKE at CM_VER_XY@_ID", cmId);
+            installer.setValue("CMAKE%CMake_VERSION_MAJOR%%CMake_VERSION_MINOR%_ID", cmId);
 
             component.addOperation("Execute",
                                    ["{0,2}", "@SDKToolBinary@", "addCMake",
                                     "--id", cmId,
-                                    "--name", "@CMake_IFW_ROOT_COMPONENT_DISPLAY_NAME@",
-                                    "--path", "@CM_VER_XY_DIR@/bin/cmake.exe",
+                                    "--name", "%CMake_IFW_ROOT_COMPONENT_DISPLAY_NAME%",
+                                    "--path", "@CMAKE%CMake_VERSION_MAJOR%%CMake_VERSION_MINOR%_BIN_DIR@/cmake.exe",
                                     "UNDOEXECUTE",
                                     "@SDKToolBinary@", "rmCMake", "--id", cmId]);
 
diff --git a/Source/QtIFW/CMake.DeveloperReference.HTML.qs.in b/Source/QtIFW/CMake.DeveloperReference.HTML.qs.in
index e3d8554..8cc5835 100644
--- a/Source/QtIFW/CMake.DeveloperReference.HTML.qs.in
+++ b/Source/QtIFW/CMake.DeveloperReference.HTML.qs.in
@@ -11,8 +11,8 @@ Component.prototype.createOperations = function()
     if (installer.value("os") === "win") {
 
         component.addOperation("CreateShortcut",
-                               installer.value("TargetDir") + "/@CMAKE_DOC_DIR@/developer-reference/html/index.html",
-                               installer.value("StartMenuDir") + "/CMake Developer Reference.lnk");
+                               "@TargetDir@/%CMAKE_DOC_DIR%/developer-reference/html/index.html",
+                               "@StartMenuDir@/CMake Developer Reference.lnk");
 
     }
 
diff --git a/Source/QtIFW/CMake.Dialogs.QtGUI.qs b/Source/QtIFW/CMake.Dialogs.QtGUI.qs.in
similarity index 65%
rename from Source/QtIFW/CMake.Dialogs.QtGUI.qs
rename to Source/QtIFW/CMake.Dialogs.QtGUI.qs.in
index 219a0a9..71f395a 100644
--- a/Source/QtIFW/CMake.Dialogs.QtGUI.qs
+++ b/Source/QtIFW/CMake.Dialogs.QtGUI.qs.in
@@ -11,8 +11,8 @@ Component.prototype.createOperations = function()
     if (installer.value("os") === "win") {
 
         component.addOperation("CreateShortcut",
-                               installer.value("TargetDir") + "/bin/cmake-gui.exe",
-                               installer.value("StartMenuDir") + "/CMake (cmake-gui).lnk");
+                               "@TargetDir@/%CMAKE_BIN_DIR%/cmake-gui.exe",
+                               "@StartMenuDir@/CMake (cmake-gui).lnk");
 
     }
 
diff --git a/Source/QtIFW/CMake.Documentation.SphinxHTML.qs.in b/Source/QtIFW/CMake.Documentation.SphinxHTML.qs.in
index 5c929e8..54bc14a 100644
--- a/Source/QtIFW/CMake.Documentation.SphinxHTML.qs.in
+++ b/Source/QtIFW/CMake.Documentation.SphinxHTML.qs.in
@@ -11,8 +11,8 @@ Component.prototype.createOperations = function()
     if (installer.value("os") === "win") {
 
         component.addOperation("CreateShortcut",
-                               installer.value("TargetDir") + "/@CMAKE_DOC_DIR@/html/index.html",
-                               installer.value("StartMenuDir") + "/CMake Documentation.lnk");
+                               "@TargetDir@/%CMAKE_DOC_DIR%/html/index.html",
+                               "@StartMenuDir@/CMake Documentation.lnk");
 
     }
 
diff --git a/Source/QtIFW/CMake.qs.in b/Source/QtIFW/CMake.qs.in
index 828cc7c..1f3166e 100644
--- a/Source/QtIFW/CMake.qs.in
+++ b/Source/QtIFW/CMake.qs.in
@@ -1,3 +1,5 @@
+// Component: CMake
+
 function Component()
 {
     // Default constructor
@@ -9,12 +11,12 @@ Component.prototype.createOperations = function()
     if (installer.value("os") === "win") {
 
         component.addOperation("CreateShortcut",
-                               installer.value("TargetDir") + "/@CMAKE_DOC_DIR@/cmake.org.html",
-                               installer.value("StartMenuDir") + "/CMake Web Site.lnk");
+                               "@TargetDir@/%CMAKE_DOC_DIR%/cmake.org.html",
+                               "@StartMenuDir@/CMake Web Site.lnk");
 
         component.addOperation("CreateShortcut",
-                               installer.value("TargetDir") + "/cmake-maintenance.exe",
-                               installer.value("StartMenuDir") + "/CMake Maintenance Tool.lnk");
+                               "@TargetDir@/cmake-maintenance.exe",
+                               "@StartMenuDir@/CMake Maintenance Tool.lnk");
     }
 
     // Call default implementation
diff --git a/Source/QtIFW/installscript.qs.in b/Source/QtIFW/installscript.qs.in
index 39a8795..72d49e8 100644
--- a/Source/QtIFW/installscript.qs.in
+++ b/Source/QtIFW/installscript.qs.in
@@ -1,3 +1,5 @@
+// Component: CMake
+
 function Component()
 {
     // Do not show component selection page
@@ -9,15 +11,15 @@ Component.prototype.createOperations = function()
     // Create shortcut
     if (installer.value("os") === "win") {
 
- at _CPACK_IFW_SHORTCUT_OPTIONAL@
+%_CPACK_IFW_SHORTCUT_OPTIONAL%
 
         component.addOperation("CreateShortcut",
-                               installer.value("TargetDir") + "/@CMAKE_DOC_DIR@/cmake.org.html",
-                               installer.value("StartMenuDir") + "/CMake Web Site.lnk");
+                               "@TargetDir@/%CMAKE_DOC_DIR%/cmake.org.html",
+                               "@StartMenuDir@/CMake Web Site.lnk");
 
         component.addOperation("CreateShortcut",
-                               installer.value("TargetDir") + "/cmake-maintenance.exe",
-                               installer.value("StartMenuDir") + "/CMake Maintenance Tool.lnk");
+                               "@TargetDir@/cmake-maintenance.exe",
+                               "@StartMenuDir@/CMake Maintenance Tool.lnk");
     }
 
     // Call default implementation

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

Summary of changes:
 CMakeCPack.cmake                                   |   45 ++++++++++--------
 CMakeCPackOptions.cmake.in                         |    2 +-
 Packaging/QtSDK/ToolsCMakeXX.cmake                 |   49 ++++++--------------
 Packaging/QtSDK/qt.tools.cmake.xx.qs.in            |   12 ++---
 Source/QtIFW/CMake.DeveloperReference.HTML.qs.in   |    4 +-
 ....Dialogs.QtGUI.qs => CMake.Dialogs.QtGUI.qs.in} |    4 +-
 Source/QtIFW/CMake.Documentation.SphinxHTML.qs.in  |    4 +-
 Source/QtIFW/CMake.qs.in                           |   10 ++--
 Source/QtIFW/installscript.qs.in                   |   12 +++--
 9 files changed, 65 insertions(+), 77 deletions(-)
 rename Source/QtIFW/{CMake.Dialogs.QtGUI.qs => CMake.Dialogs.QtGUI.qs.in} (65%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 15:44:21 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 15:44:21 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2141-g21d0df2
Message-ID: <20170112204421.D0D56F932E@public.kitware.com>

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  21d0df2c519548c8fe752002e37bc2958f99f4b9 (commit)
       via  a10586377232b28be13c2bf90c98d002067eb5fc (commit)
      from  e568e03e024719c1e119fb5e3ee35f491ca1b757 (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=21d0df2c519548c8fe752002e37bc2958f99f4b9
commit 21d0df2c519548c8fe752002e37bc2958f99f4b9
Merge: e568e03 a105863
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 15:44:20 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 15:44:20 2017 -0500

    Merge topic 'fix_repeat_until_fail_duplicated_output' into next
    
    a1058637 CTest: Properly reset output to avoid duplication with --repeat-until-fail


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a10586377232b28be13c2bf90c98d002067eb5fc
commit a10586377232b28be13c2bf90c98d002067eb5fc
Author:     Sylvain Joubert <joubert.sy at gmail.com>
AuthorDate: Thu Jan 12 11:32:58 2017 +0100
Commit:     Sylvain Joubert <joubert.sy at gmail.com>
CommitDate: Thu Jan 12 11:32:58 2017 +0100

    CTest: Properly reset output to avoid duplication with --repeat-until-fail

diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 5c45fe5..ac1644f 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -134,6 +134,7 @@ void cmCTestRunTest::CompressOutput()
 
   size_t rlen = cmsysBase64_Encode(out, strm.total_out, encoded_buffer, 1);
 
+  this->CompressedOutput.clear();
   for (size_t i = 0; i < rlen; i++) {
     this->CompressedOutput += encoded_buffer[i];
   }
@@ -416,6 +417,7 @@ bool cmCTestRunTest::StartTest(size_t total)
                << std::setw(getNumWidth(this->TestHandler->GetMaxIndex()))
                << this->TestProperties->Index << ": "
                << this->TestProperties->Name << std::endl);
+  this->ProcessOutput.clear();
   this->ComputeArguments();
   std::vector<std::string>& args = this->TestProperties->Args;
   this->TestResult.Properties = this->TestProperties;
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-cmake.cmake b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-cmake.cmake
index 4654416..ecb9a64 100644
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-cmake.cmake
+++ b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-cmake.cmake
@@ -12,4 +12,6 @@ add_test(NAME test1
 set_tests_properties(test1 PROPERTIES DEPENDS "initialization")
 
 add_test(hello ${CMAKE_COMMAND} -E echo hello)
+set_tests_properties(hello PROPERTIES FAIL_REGULAR_EXPRESSION "hello.*hello")
+
 add_test(goodbye ${CMAKE_COMMAND} -E echo goodbye)

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

Summary of changes:
 Source/CTest/cmCTestRunTest.cxx                               |    2 ++
 Tests/RunCMake/CTestCommandLine/repeat-until-fail-cmake.cmake |    2 ++
 2 files changed, 4 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 15:46:49 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 15:46:49 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2143-g664858e
Message-ID: <20170112204649.D63BFF9D08@public.kitware.com>

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  664858e81eff9eb60278c3810638ce72a258e088 (commit)
       via  9fe399e3894dccce158b445c9ec4f2253035eaa0 (commit)
      from  21d0df2c519548c8fe752002e37bc2958f99f4b9 (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=664858e81eff9eb60278c3810638ce72a258e088
commit 664858e81eff9eb60278c3810638ce72a258e088
Merge: 21d0df2 9fe399e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 15:46:48 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 15:46:48 2017 -0500

    Merge topic 'clang-3.1-3.3-cpp11' into next
    
    9fe399e3 Features: activate C++11 support for Clang 3.1+


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fe399e3894dccce158b445c9ec4f2253035eaa0
commit 9fe399e3894dccce158b445c9ec4f2253035eaa0
Author:     Giel van Schijndel <Giel.vanSchijndel at tomtom.com>
AuthorDate: Thu Jan 12 14:13:53 2017 +0100
Commit:     Giel van Schijndel <Giel.vanSchijndel at tomtom.com>
CommitDate: Thu Jan 12 17:16:34 2017 +0100

    Features: activate C++11 support for Clang 3.1+

diff --git a/Modules/Compiler/Clang-CXX-FeatureTests.cmake b/Modules/Compiler/Clang-CXX-FeatureTests.cmake
index df2e1a8..cd04190 100644
--- a/Modules/Compiler/Clang-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/Clang-CXX-FeatureTests.cmake
@@ -2,7 +2,7 @@
 # Reference: http://clang.llvm.org/cxx_status.html
 # http://clang.llvm.org/docs/LanguageExtensions.html
 
-set(_cmake_oldestSupported "((__clang_major__ * 100) + __clang_minor__) >= 304")
+set(_cmake_oldestSupported "((__clang_major__ * 100) + __clang_minor__) >= 301")
 
 include("${CMAKE_CURRENT_LIST_DIR}/Clang-CXX-TestableFeatures.cmake")
 
@@ -15,7 +15,6 @@ set(_cmake_feature_test_cxx_digit_separators "${Clang34_CXX14}")
 # http://llvm.org/bugs/show_bug.cgi?id=19674
 set(_cmake_feature_test_cxx_generic_lambdas "${Clang34_CXX14}")
 
-# TODO: Should be supported by Clang 3.1
 set(Clang31_CXX11 "${_cmake_oldestSupported} && __cplusplus >= 201103L")
 set(_cmake_feature_test_cxx_enum_forward_declarations "${Clang31_CXX11}")
 set(_cmake_feature_test_cxx_sizeof_member "${Clang31_CXX11}")
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index d0e2521..8ed3695 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -36,7 +36,7 @@ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
   set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++1z")
 endif()
 
-if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
+if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.1)
   if (NOT CMAKE_CXX_COMPILER_FORCED)
     if (NOT CMAKE_CXX_STANDARD_COMPUTED_DEFAULT)
       message(FATAL_ERROR "CMAKE_CXX_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) version ${CMAKE_CXX_COMPILER_VERSION}")
@@ -50,14 +50,14 @@ endif()
 
 macro(cmake_record_cxx_compile_features)
   set(_result 0)
-  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.1)
     if(_result EQUAL 0 AND CMAKE_CXX17_STANDARD_COMPILE_OPTION)
       _record_compiler_features_cxx(17)
     endif()
     if(_result EQUAL 0 AND CMAKE_CXX14_STANDARD_COMPILE_OPTION)
       _record_compiler_features_cxx(14)
     endif()
-    if (_result EQUAL 0)
+    if (_result EQUAL 0 AND CMAKE_CXX11_STANDARD_COMPILE_OPTION)
       _record_compiler_features_cxx(11)
     endif()
     if (_result EQUAL 0)

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

Summary of changes:
 Modules/Compiler/Clang-CXX-FeatureTests.cmake |    3 +--
 Modules/Compiler/Clang-CXX.cmake              |    6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 15:54:05 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 15:54:05 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2145-g0cd3edc
Message-ID: <20170112205405.55F33FA0BC@public.kitware.com>

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  0cd3edc01a87750ab414acb63bd817f6aa148768 (commit)
       via  4ae2dcb1b965efac7c088cbf97fa66c4d3c41858 (commit)
      from  664858e81eff9eb60278c3810638ce72a258e088 (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=0cd3edc01a87750ab414acb63bd817f6aa148768
commit 0cd3edc01a87750ab414acb63bd817f6aa148768
Merge: 664858e 4ae2dcb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 15:54:04 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 15:54:04 2017 -0500

    Merge topic 'docs-function-exists' into next
    
    4ae2dcb1 CheckFunctionExists: Document suggestion to use CheckSymbolExists instead.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ae2dcb1b965efac7c088cbf97fa66c4d3c41858
commit 4ae2dcb1b965efac7c088cbf97fa66c4d3c41858
Author:     Stephen Sorley <ssorley at monetra.com>
AuthorDate: Thu Jan 12 13:10:25 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 15:52:53 2017 -0500

    CheckFunctionExists: Document suggestion to use CheckSymbolExists instead.
    
    CheckFunctionExists has some severe limitations that are overcome by
    CheckSymbolExists.  Document them and suggest the alternative.

diff --git a/Modules/CheckFunctionExists.cmake b/Modules/CheckFunctionExists.cmake
index 5f049e7..ef08062 100644
--- a/Modules/CheckFunctionExists.cmake
+++ b/Modules/CheckFunctionExists.cmake
@@ -5,18 +5,16 @@
 # CheckFunctionExists
 # -------------------
 #
-# Check if a C function can be linked
+# Check if a C function can be linked::
 #
-# CHECK_FUNCTION_EXISTS(<function> <variable>)
+#   check_function_exists(<function> <variable>)
 #
-# Check that the <function> is provided by libraries on the system and
-# store the result in a <variable>.  This does not verify that any
-# system header file declares the function, only that it can be found at
-# link time (consider using CheckSymbolExists).
-# <variable> will be created as an internal cache variable.
+# Check that the ``<function>`` is provided by libraries on the system and store
+# the result in a ``<variable>``. ``<variable>`` will be created as an internal
+# cache variable.
 #
-# The following variables may be set before calling this macro to modify
-# the way the check is run:
+# The following variables may be set before calling this macro to modify the
+# way the check is run:
 #
 # ::
 #
@@ -25,6 +23,20 @@
 #   CMAKE_REQUIRED_INCLUDES = list of include directories
 #   CMAKE_REQUIRED_LIBRARIES = list of libraries to link
 #   CMAKE_REQUIRED_QUIET = execute quietly without messages
+#
+# .. note::
+#
+#   Prefer using :Module:`CheckSymbolExists` instead of this module,
+#   for the following reasons:
+#
+#   * ``check_function_exists()`` can't detect functions that are inlined
+#     in headers or specified as a macro.
+#
+#   * ``check_function_exists()`` can't detect anything in the 32-bit
+#     versions of the Win32 API, because of a mismatch in calling conventions.
+#
+#   * ``check_function_exists()`` only verifies linking, it does not verify
+#     that the function is declared in system headers.
 
 macro(CHECK_FUNCTION_EXISTS FUNCTION VARIABLE)
   if(NOT DEFINED "${VARIABLE}" OR "x${${VARIABLE}}" STREQUAL "x${VARIABLE}")

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

Summary of changes:
 Modules/CheckFunctionExists.cmake |   30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 12 16:14:12 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Jan 2017 16:14:12 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2147-ga3de35d
Message-ID: <20170112211412.6B7A9F8547@public.kitware.com>

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  a3de35d1b09f4798603aa33ae92f648607952225 (commit)
       via  840933e925b3ed0f83ab688ee93758577b704504 (commit)
      from  0cd3edc01a87750ab414acb63bd817f6aa148768 (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=a3de35d1b09f4798603aa33ae92f648607952225
commit a3de35d1b09f4798603aa33ae92f648607952225
Merge: 0cd3edc 840933e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 16:14:11 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 16:14:11 2017 -0500

    Merge topic 'source_group-tree' into next
    
    840933e9 fixup! source_group: Add options create groups matching directory tree


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=840933e925b3ed0f83ab688ee93758577b704504
commit 840933e925b3ed0f83ab688ee93758577b704504
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 12 16:09:52 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 12 16:09:52 2017 -0500

    fixup! source_group: Add options create groups matching directory tree

diff --git a/Source/cmSourceGroupCommand.cxx b/Source/cmSourceGroupCommand.cxx
index dac4b82..8b11fb1 100644
--- a/Source/cmSourceGroupCommand.cxx
+++ b/Source/cmSourceGroupCommand.cxx
@@ -241,7 +241,7 @@ bool cmSourceGroupCommand::processTree(const std::vector<std::string>& args,
                             errorMsg);
 
   if (!errorMsg.empty()) {
-    this->SetError(errorMsg.c_str());
+    this->SetError(errorMsg);
     return false;
   }
 

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

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


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Fri Jan 13 00:01:08 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Fri, 13 Jan 2017 00:01:08 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1079-g7f5842d
Message-ID: <20170113050109.0BD66FA2D1@public.kitware.com>

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  7f5842d7d943403fca02a5345e9d6f779eb7bf9a (commit)
      from  728820f3ea0faf55ffe1236a44a35e9197fc6291 (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=7f5842d7d943403fca02a5345e9d6f779eb7bf9a
commit 7f5842d7d943403fca02a5345e9d6f779eb7bf9a
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Fri Jan 13 00:01:05 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jan 13 00:01:05 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index fde01c1..5ac4cf1 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 20170112)
+set(CMake_VERSION_PATCH 20170113)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 13 08:47:40 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Jan 2017 08:47:40 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2149-g60a120f
Message-ID: <20170113134740.751E3F990A@public.kitware.com>

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  60a120f1fb48fada4cf3a50413b729b4db9694d3 (commit)
       via  c2dd8d68cb817791ce86488da1539cbdf5167ebb (commit)
      from  a3de35d1b09f4798603aa33ae92f648607952225 (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=60a120f1fb48fada4cf3a50413b729b4db9694d3
commit 60a120f1fb48fada4cf3a50413b729b4db9694d3
Merge: a3de35d c2dd8d6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 13 08:47:39 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 13 08:47:39 2017 -0500

    Merge topic 'source_group-tree' into next
    
    c2dd8d68 fixup! source_group: Add options create groups matching directory tree


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2dd8d68cb817791ce86488da1539cbdf5167ebb
commit c2dd8d68cb817791ce86488da1539cbdf5167ebb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 13 08:47:27 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 13 08:47:27 2017 -0500

    fixup! source_group: Add options create groups matching directory tree

diff --git a/Source/cmSourceGroupCommand.cxx b/Source/cmSourceGroupCommand.cxx
index 8b11fb1..5555199 100644
--- a/Source/cmSourceGroupCommand.cxx
+++ b/Source/cmSourceGroupCommand.cxx
@@ -72,8 +72,8 @@ bool addFilesToItsSourceGroups(const std::set<std::string>& sgFilesPaths,
 {
   cmSourceGroup* sg;
 
-  for (std::set<std::string>::const_iterator it = std::begin(sgFilesPaths);
-       it != std::end(sgFilesPaths); ++it) {
+  for (std::set<std::string>::const_iterator it = sgFilesPaths.begin();
+       it != sgFilesPaths.end(); ++it) {
 
     std::vector<std::string> tokenizedPath;
     if (!prefix.empty()) {
@@ -231,8 +231,8 @@ bool cmSourceGroupCommand::processTree(const std::vector<std::string>& args,
     filesBegin = FilesWithPrefixKeywordIndex + 1;
   }
 
-  const std::vector<std::string> filesVector(args.cbegin() + filesBegin,
-                                             args.cend());
+  const std::vector<std::string> filesVector(args.begin() + filesBegin,
+                                             args.end());
 
   std::set<std::string> sourceGroupPaths = getSourceGroupFilesPaths(
     this->Makefile->GetCurrentSourceDirectory(), root, filesVector);

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

Summary of changes:
 Source/cmSourceGroupCommand.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 13 08:59:40 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Jan 2017 08:59:40 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2153-g14dac31
Message-ID: <20170113135940.5CCF1FA1BF@public.kitware.com>

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  14dac313ccf9212200f48878e3e44f2579523ee3 (commit)
       via  6f5c375741ac1e2174f7213f94aa1587e04fe5c7 (commit)
       via  35413bf2c1b33980afd418030af27f184872af6b (commit)
       via  7f5842d7d943403fca02a5345e9d6f779eb7bf9a (commit)
      from  60a120f1fb48fada4cf3a50413b729b4db9694d3 (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=14dac313ccf9212200f48878e3e44f2579523ee3
commit 14dac313ccf9212200f48878e3e44f2579523ee3
Merge: 60a120f 6f5c375
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 13 08:59:39 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 13 08:59:39 2017 -0500

    Merge topic 'test-release' into next
    
    6f5c3757 Merge branch 'release' into test-release
    35413bf2 CMake 3.7.2
    7f5842d7 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f5c375741ac1e2174f7213f94aa1587e04fe5c7
commit 6f5c375741ac1e2174f7213f94aa1587e04fe5c7
Merge: 7f5842d 35413bf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 13 08:59:25 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 13 08:59:25 2017 -0500

    Merge branch 'release' into test-release


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35413bf2c1b33980afd418030af27f184872af6b
commit 35413bf2c1b33980afd418030af27f184872af6b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 13 08:58:58 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 13 08:58:58 2017 -0500

    CMake 3.7.2

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 3652e1b..0c49ee5 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 1)
+set(CMake_VERSION_PATCH 2)
 #set(CMake_VERSION_RC 0)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 13 09:17:27 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Jan 2017 09:17:27 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2155-g905d58d
Message-ID: <20170113141727.18538F9F25@public.kitware.com>

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  905d58d9927224f4907d42179842ef90d95c625f (commit)
       via  1b63ce865e86596ad7df3cf39df827434c986f22 (commit)
      from  14dac313ccf9212200f48878e3e44f2579523ee3 (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=905d58d9927224f4907d42179842ef90d95c625f
commit 905d58d9927224f4907d42179842ef90d95c625f
Merge: 14dac31 1b63ce8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 13 09:17:26 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 13 09:17:26 2017 -0500

    Merge topic 'fast-local-and-strip-install' into next
    
    1b63ce86 Makefiles: Make fast local and strip install truly fast


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b63ce865e86596ad7df3cf39df827434c986f22
commit 1b63ce865e86596ad7df3cf39df827434c986f22
Author:     Mike Gelfand <mikedld at mikedld.com>
AuthorDate: Fri Jan 13 01:12:57 2017 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 13 09:16:16 2017 -0500

    Makefiles: Make fast local and strip install truly fast
    
    When using a Makefiles generator, `install/local/fast` and
    `install/strip/fast` targets are not at all fast.  They depend on
    `install/local` and `install/strip` targets respectively instead of
    `preinstall/fast` and don't contain any commands instead of repeating
    commands in `install/local` and `install/strip`. The issue was
    introduced by simple typos in commits v2.6.0~2825 (Adding install/local
    global target for Makefile generators, 2006-08-29) and v2.6.0~1743 (add
    install/strip target for makefile generators, 2007-05-18).

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index ba17f81..41a4caf 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1592,8 +1592,8 @@ void cmLocalUnixMakefileGenerator3::WriteLocalAllRules(
 
       // Provide a "/fast" version of the target.
       depends.clear();
-      if ((targetName == "install") || (targetName == "install_local") ||
-          (targetName == "install_strip")) {
+      if ((targetName == "install") || (targetName == "install/local") ||
+          (targetName == "install/strip")) {
         // Provide a fast install target that does not depend on all
         // but has the same command.
         depends.push_back("preinstall/fast");

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

Summary of changes:
 Source/cmLocalUnixMakefileGenerator3.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 13 09:35:00 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Jan 2017 09:35:00 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2175-gfff9c79
Message-ID: <20170113143500.07E23FA56F@public.kitware.com>

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  fff9c79d71279e95d6ccf8535f3c6ecf125847b8 (commit)
       via  bb670d9625e670a0e87ec048e44db39b9d2b336f (commit)
       via  3f86032bdab94e219d053c10b7e55eba9c06e562 (commit)
       via  f24e1d37cef95145927d14d186e1615fca23a75b (commit)
       via  f27c5852b0d1e37fb27bd1da1e7295b5f1fc963d (commit)
       via  d7d2cb48c69e2a9da72a8baf188f02b81ec9c34f (commit)
       via  721997a7a23f0cfa5c9e096cc3768625a51f359d (commit)
       via  9f47d32697686265bc2c5a708d2b53e2337f3f10 (commit)
       via  597124ba8e409edc28cbf8f2a55150d2913a50e3 (commit)
       via  2b400b242101fd8b7a46073412830278aa3cc9ec (commit)
       via  edf0b8a52bd4db8557adaf11d7096f7982c373aa (commit)
       via  06430919f4b903ba256ce158caf223f515faa8a4 (commit)
       via  ca179f2afc6d8ab5e0df3e35255155c21a61b5f6 (commit)
       via  119791ae528aace81f6c209e05798c80d8926b3d (commit)
       via  95e4cfc5947fb5a324f6dad50cff8d71f928aba8 (commit)
       via  6c55755bdd54c2d474e2c8fe4c9d078e10404f26 (commit)
       via  1491ab1c6626ed6a3b67e74b94fd18230e1bb4d4 (commit)
       via  29112c9a695a8dce6486203d0415f17ac41d3a0b (commit)
       via  6d333be14d23b9aaf4452189199134bd674ad395 (commit)
       via  52688bf7453cdb767e231f5fdc7d80ce79ae239d (commit)
      from  905d58d9927224f4907d42179842ef90d95c625f (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=fff9c79d71279e95d6ccf8535f3c6ecf125847b8
commit fff9c79d71279e95d6ccf8535f3c6ecf125847b8
Merge: 905d58d bb670d9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 13 09:34:58 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 13 09:34:58 2017 -0500

    Merge topic 'Autogen_Config' into next
    
    bb670d96 Autogen: Generators: Remove space
    3f86032b Autogen: Generators: Rename requiresMocing method
    f24e1d37 Autogen: Generators: Fix clang-tidy readability-else-after-return
    f27c5852 Autogen: Initializer: Add old settings file to clean files
    d7d2cb48 Autogen: Generators: Save the UIC/RCC settings that were actually used
    721997a7 Autogen: Generators: Dedicated generateAll variables for MOC/UIC/RCC
    9f47d326 Autogen: Generators: Save the MOC settings that were actually used
    597124ba Autogen: Generators: Add function to read makefile definitions config aware
    2b400b24 Autogen: Generators: Move moc/uic/rcc executable test to generate method
    edf0b8a5 Autogen: Generators: Rename GenerateFoo methods to FooGenerate
    06430919 Autogen: Generators: Use FileAbsentOrOlder for UIC tests
    ca179f2a Autogen: Generators: Use FileAbsentOrOlder for MOC tests
    119791ae Autogen: Generators: Introduce FileAbsentOrOlder function
    95e4cfc5 Autogen: Generators: Simplify (and fix) JoinExts function
    6c55755b Autogen: Generators: Make class static method a source static function
    1491ab1c Autogen: Generators: Make class static method a source static function
    ...


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb670d9625e670a0e87ec048e44db39b9d2b336f
commit bb670d9625e670a0e87ec048e44db39b9d2b336f
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Thu Jan 12 23:58:39 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:45 2017 +0100

    Autogen: Generators: Remove space

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 4979997..c84fe4f 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -585,7 +585,6 @@ void cmQtAutoGenerators::Init()
 
   if (this->IncludeProjectDirsBefore) {
     const std::string binDir = "-I" + this->ProjectBinaryDir;
-
     const std::string srcDir = "-I" + this->ProjectSourceDir;
 
     std::list<std::string> sortedMocIncludes;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f86032bdab94e219d053c10b7e55eba9c06e562
commit 3f86032bdab94e219d053c10b7e55eba9c06e562
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Thu Jan 12 23:54:20 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:45 2017 +0100

    Autogen: Generators: Rename requiresMocing method

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 06decf8..4979997 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -683,8 +683,8 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
  * @brief Tests if the C++ content requires moc processing
  * @return True if moc is required
  */
-bool cmQtAutoGenerators::requiresMocing(const std::string& text,
-                                        std::string& macroName)
+bool cmQtAutoGenerators::MocRequired(const std::string& text,
+                                     std::string& macroName)
 {
   // Run a simple check before an expensive regular expression check
   if (strstr(text.c_str(), "Q_OBJECT") != CM_NULLPTR) {
@@ -812,7 +812,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
     cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename);
 
   std::string macroName;
-  const bool requiresMoc = this->requiresMocing(contentsString, macroName);
+  const bool requiresMoc = this->MocRequired(contentsString, macroName);
   bool ownDotMocIncluded = false;
   bool ownMocUnderscoreIncluded = false;
   std::string ownMocUnderscoreFile;
@@ -1053,7 +1053,7 @@ void cmQtAutoGenerators::ParseHeaders(
         this->LogInfo(err.str());
       }
       std::string macroName;
-      if (this->requiresMocing(contents, macroName)) {
+      if (this->MocRequired(contents, macroName)) {
         notIncludedMocs[headerName] = fpathCheckSum.getPart(headerName) +
           "/moc_" +
           cmsys::SystemTools::GetFilenameWithoutLastExtension(headerName) +
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 3720a00..7891eb9 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -39,7 +39,7 @@ private:
   bool RunAutogen(cmMakefile* makefile);
 
   // - Content analysis
-  bool requiresMocing(const std::string& text, std::string& macroName);
+  bool MocRequired(const std::string& text, std::string& macroName);
   bool MocSkipTest(const std::string& absFilename);
   bool UicSkipTest(const std::string& absFilename);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f24e1d37cef95145927d14d186e1615fca23a75b
commit f24e1d37cef95145927d14d186e1615fca23a75b
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Thu Jan 12 23:51:01 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:45 2017 +0100

    Autogen: Generators: Fix clang-tidy readability-else-after-return

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 2a038b9..06decf8 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -918,7 +918,11 @@ bool cmQtAutoGenerators::ParseContentForMoc(
           }
         } else {
           // Mode: Strict
-          if (basename != scannedFileBasename) {
+          if (basename == scannedFileBasename) {
+            // Include self
+            fileToMoc = absFilename;
+            ownDotMocIncluded = true;
+          } else {
             // Don't allow FOO.moc include other than self in strict mode
             std::ostringstream err;
             err << "AutoMoc: Error: " << absFilename << "\n"
@@ -929,10 +933,6 @@ bool cmQtAutoGenerators::ParseContentForMoc(
                 << ".moc\" to run moc on this source file.\n";
             this->LogError(err.str());
             return false;
-          } else {
-            // Include self
-            fileToMoc = absFilename;
-            ownDotMocIncluded = true;
           }
         }
         if (!fileToMoc.empty()) {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f27c5852b0d1e37fb27bd1da1e7295b5f1fc963d
commit f27c5852b0d1e37fb27bd1da1e7295b5f1fc963d
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Thu Jan 12 00:49:58 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:44 2017 +0100

    Autogen: Initializer: Add old settings file to clean files

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 6d4c302..825eba0 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -674,6 +674,14 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
   const std::string qtMajorVersion = GetQtMajorVersion(target);
   std::vector<std::string> autogenOutputFiles;
 
+  // Remove old settings on cleanup
+  {
+    std::string fname = GetAutogenTargetFilesDir(target);
+    fname += "/AutogenOldSettings.cmake";
+    makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES", fname.c_str(),
+                             false);
+  }
+
   // Create autogen target build directory and add it to the clean files
   cmSystemTools::MakeDirectory(autogenBuildDir);
   makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES",

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7d2cb48c69e2a9da72a8baf188f02b81ec9c34f
commit d7d2cb48c69e2a9da72a8baf188f02b81ec9c34f
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 11 23:04:45 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:44 2017 +0100

    Autogen: Generators: Save the UIC/RCC settings that were actually used

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 1d7e910..2a038b9 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -30,6 +30,8 @@
 // -- Static variables
 
 static const char* MocOldSettingsKey = "AM_MOC_OLD_SETTINGS";
+static const char* UicOldSettingsKey = "AM_UIC_OLD_SETTINGS";
+static const char* RccOldSettingsKey = "AM_RCC_OLD_SETTINGS";
 
 // -- Static functions
 
@@ -49,11 +51,11 @@ static std::string GetConfigDefinition(cmMakefile* makefile,
   return makefile->GetSafeDefinition(key);
 }
 
-static std::string MocOldSettingsFile(const std::string& targetDirectory)
+static std::string OldSettingsFile(const std::string& targetDirectory)
 {
   std::string filename(cmSystemTools::CollapseFullPath(targetDirectory));
   cmSystemTools::ConvertToUnixSlashes(filename);
-  filename += "/AutomocOldSettings.cmake";
+  filename += "/AutogenOldSettings.cmake";
   return filename;
 }
 
@@ -138,6 +140,21 @@ static bool ListContains(const std::vector<std::string>& list,
   return (std::find(list.begin(), list.end(), entry) != list.end());
 }
 
+static std::string JoinOptions(const std::map<std::string, std::string>& opts)
+{
+  std::string result;
+  for (std::map<std::string, std::string>::const_iterator it = opts.begin();
+       it != opts.end(); ++it) {
+    if (it != opts.begin()) {
+      result += "%%%";
+    }
+    result += it->first;
+    result += "===";
+    result += it->second;
+  }
+  return result;
+}
+
 static std::string JoinExts(const std::vector<std::string>& lst)
 {
   std::string result;
@@ -242,7 +259,7 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory,
     return false;
   }
   // Read old settings
-  this->ReadOldMocSettingsFile(mf.get(), targetDirectory);
+  this->OldSettingsReadFile(mf.get(), targetDirectory);
   // Init and run
   this->Init();
   if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5") {
@@ -251,7 +268,7 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory,
     }
   }
   // Write latest settings
-  if (!this->WriteOldMocSettingsFile(targetDirectory)) {
+  if (!this->OldSettingsWriteFile(targetDirectory)) {
     return false;
   }
   return true;
@@ -396,7 +413,7 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(
   return true;
 }
 
-std::string cmQtAutoGenerators::MocCurrentSettingsString()
+std::string cmQtAutoGenerators::MocSettingsStringCompose()
 {
   std::string res;
   res += this->MocCompileDefinitionsStr;
@@ -410,42 +427,108 @@ std::string cmQtAutoGenerators::MocCurrentSettingsString()
   return res;
 }
 
-void cmQtAutoGenerators::ReadOldMocSettingsFile(
+std::string cmQtAutoGenerators::UicSettingsStringCompose()
+{
+  std::string res;
+  res += cmJoin(this->UicTargetOptions, "@osep@");
+  res += " ~~~ ";
+  res += JoinOptions(this->UicOptions);
+  res += " ~~~ ";
+  return res;
+}
+
+std::string cmQtAutoGenerators::RccSettingsStringCompose()
+{
+  std::string res;
+  res += JoinOptions(this->RccOptions);
+  res += " ~~~ ";
+  return res;
+}
+
+void cmQtAutoGenerators::OldSettingsReadFile(
   cmMakefile* makefile, const std::string& targetDirectory)
 {
-  // Compose current settings string
-  this->MocSettingsString = this->MocCurrentSettingsString();
-  // Read old settings
-  const std::string filename = MocOldSettingsFile(targetDirectory);
-  if (makefile->ReadListFile(filename.c_str())) {
-    std::string oldSettings = makefile->GetSafeDefinition(MocOldSettingsKey);
-    if (oldSettings != this->MocSettingsString) {
-      // If settings changed everything needs to be re-generated.
+  if (!this->MocExecutable.empty() || !this->UicExecutable.empty() ||
+      !this->RccExecutable.empty()) {
+    // Compose current settings strings
+    this->MocSettingsString = this->MocSettingsStringCompose();
+    this->UicSettingsString = this->UicSettingsStringCompose();
+    this->RccSettingsString = this->RccSettingsStringCompose();
+
+    // Read old settings
+    const std::string filename = OldSettingsFile(targetDirectory);
+    if (makefile->ReadListFile(filename.c_str())) {
+      if (!this->MocExecutable.empty()) {
+        const std::string sol = makefile->GetSafeDefinition(MocOldSettingsKey);
+        if (sol != this->MocSettingsString) {
+          this->GenerateMocAll = true;
+        }
+      }
+      if (!this->UicExecutable.empty()) {
+        const std::string sol = makefile->GetSafeDefinition(UicOldSettingsKey);
+        if (sol != this->UicSettingsString) {
+          this->GenerateUicAll = true;
+        }
+      }
+      if (!this->RccExecutable.empty()) {
+        const std::string sol = makefile->GetSafeDefinition(RccOldSettingsKey);
+        if (sol != this->RccSettingsString) {
+          this->GenerateRccAll = true;
+        }
+      }
+      // In case any setting changed remove the old settings file.
+      // This triggers a full rebuild on the next run if the current
+      // build is aborted before writing the current settings in the end.
+      if (this->GenerateMocAll || this->GenerateUicAll ||
+          this->GenerateRccAll) {
+        cmSystemTools::RemoveFile(filename);
+      }
+    } else {
+      // If the file could not be read re-generate everythiung.
       this->GenerateMocAll = true;
-      // Remove old file in case processing gets aborted before
-      // writing the current settings in the end.
-      cmSystemTools::RemoveFile(filename);
+      this->GenerateUicAll = true;
+      this->GenerateRccAll = true;
     }
-  } else {
-    // If the file could not be read everything needs to be re-generated.
-    this->GenerateMocAll = true;
   }
 }
 
-bool cmQtAutoGenerators::WriteOldMocSettingsFile(
+bool cmQtAutoGenerators::OldSettingsWriteFile(
   const std::string& targetDirectory)
 {
   bool success = true;
-  if (!this->MocExecutable.empty()) {
-    const std::string filename = MocOldSettingsFile(targetDirectory);
+  // Only write if any setting changed
+  if (this->GenerateMocAll || this->GenerateUicAll || this->GenerateRccAll) {
+    const std::string filename = OldSettingsFile(targetDirectory);
     cmsys::ofstream outfile;
     outfile.open(filename.c_str(), std::ios::trunc);
-    if ((success = static_cast<bool>(outfile))) {
-      outfile << "set(" << MocOldSettingsKey << " "
-              << cmOutputConverter::EscapeForCMake(this->MocSettingsString)
-              << ")\n";
+    if (outfile) {
+      if (!this->MocExecutable.empty()) {
+        outfile << "set(" << MocOldSettingsKey << " "
+                << cmOutputConverter::EscapeForCMake(this->MocSettingsString)
+                << ")\n";
+      }
+      if (!this->UicExecutable.empty()) {
+        outfile << "set(" << UicOldSettingsKey << " "
+                << cmOutputConverter::EscapeForCMake(this->UicSettingsString)
+                << ")\n";
+      }
+      if (!this->RccExecutable.empty()) {
+        outfile << "set(" << RccOldSettingsKey << " "
+                << cmOutputConverter::EscapeForCMake(this->RccSettingsString)
+                << ")\n";
+      }
       success = outfile.good();
       outfile.close();
+    } else {
+      success = false;
+      // Remove old settings file to trigger full rebuild on next run
+      cmSystemTools::RemoveFile(filename);
+      {
+        std::ostringstream err;
+        err << "AutoGen: Error: Writing old settings file failed: " << filename
+            << std::endl;
+        this->LogError(err.str());
+      }
     }
   }
   return success;
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 3427be6..3720a00 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -27,10 +27,12 @@ private:
                            const std::string& targetDirectory,
                            const std::string& config);
 
-  std::string MocCurrentSettingsString();
-  void ReadOldMocSettingsFile(cmMakefile* makefile,
-                              const std::string& targetDirectory);
-  bool WriteOldMocSettingsFile(const std::string& targetDirectory);
+  std::string MocSettingsStringCompose();
+  std::string UicSettingsStringCompose();
+  std::string RccSettingsStringCompose();
+  void OldSettingsReadFile(cmMakefile* makefile,
+                           const std::string& targetDirectory);
+  bool OldSettingsWriteFile(const std::string& targetDirectory);
 
   // - Init and run
   void Init();
@@ -138,10 +140,12 @@ private:
   std::vector<std::string> SkipUic;
   std::vector<std::string> UicTargetOptions;
   std::map<std::string, std::string> UicOptions;
+  std::string UicSettingsString;
   // - Rcc
   std::vector<std::string> RccSources;
   std::map<std::string, std::string> RccOptions;
   std::map<std::string, std::vector<std::string> > RccInputs;
+  std::string RccSettingsString;
   // - Utility
   cmFilePathChecksum fpathCheckSum;
   cmsys::RegularExpression RegExpQObject;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=721997a7a23f0cfa5c9e096cc3768625a51f359d
commit 721997a7a23f0cfa5c9e096cc3768625a51f359d
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 11 22:48:01 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:44 2017 +0100

    Autogen: Generators: Dedicated generateAll variables for MOC/UIC/RCC

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index db35fa6..1d7e910 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -197,7 +197,9 @@ cmQtAutoGenerators::cmQtAutoGenerators()
   , RunMocFailed(false)
   , RunUicFailed(false)
   , RunRccFailed(false)
-  , GenerateAll(false)
+  , GenerateMocAll(false)
+  , GenerateUicAll(false)
+  , GenerateRccAll(false)
 {
 
   std::string colorEnv;
@@ -419,14 +421,14 @@ void cmQtAutoGenerators::ReadOldMocSettingsFile(
     std::string oldSettings = makefile->GetSafeDefinition(MocOldSettingsKey);
     if (oldSettings != this->MocSettingsString) {
       // If settings changed everything needs to be re-generated.
-      this->GenerateAll = true;
+      this->GenerateMocAll = true;
       // Remove old file in case processing gets aborted before
       // writing the current settings in the end.
       cmSystemTools::RemoveFile(filename);
     }
   } else {
     // If the file could not be read everything needs to be re-generated.
-    this->GenerateAll = true;
+    this->GenerateMocAll = true;
   }
 }
 
@@ -1119,7 +1121,7 @@ bool cmQtAutoGenerators::MocGenerateFile(const std::string& sourceFile,
     this->AutogenBuildSubDir + subDirPrefix + mocFileName;
   const std::string mocFileAbs = this->CurrentBinaryDir + mocFileRel;
 
-  bool generateMoc = this->GenerateAll;
+  bool generateMoc = this->GenerateMocAll;
   // Test if the source file is newer that the build file
   if (!generateMoc) {
     generateMoc = FileAbsentOrOlder(mocFileAbs, sourceFile);
@@ -1247,7 +1249,7 @@ bool cmQtAutoGenerators::UicGenerateFile(const std::string& realName,
     this->AutogenBuildSubDir + "include/" + uiOutputFile;
   const std::string uicFileAbs = this->CurrentBinaryDir + uicFileRel;
 
-  bool generateUic = this->GenerateAll;
+  bool generateUic = this->GenerateUicAll;
   // Test if the source file is newer that the build file
   if (!generateUic) {
     generateUic = FileAbsentOrOlder(uicFileAbs, uiInputFile);
@@ -1368,7 +1370,7 @@ bool cmQtAutoGenerators::QrcGenerateFile(const std::string& qrcInputFile,
 
   const std::string qrcBuildFile = this->CurrentBinaryDir + qrcOutputFile;
 
-  bool generateQrc = this->GenerateAll;
+  bool generateQrc = this->GenerateRccAll;
   // Test if the resources list file is newer than build file
   if (!generateQrc) {
     generateQrc = FileAbsentOrOlder(qrcBuildFile, qrcInputFile);
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index a26cfbc..3427be6 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -155,7 +155,9 @@ private:
   bool RunMocFailed;
   bool RunUicFailed;
   bool RunRccFailed;
-  bool GenerateAll;
+  bool GenerateMocAll;
+  bool GenerateUicAll;
+  bool GenerateRccAll;
   bool MocRelaxedMode;
 };
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f47d32697686265bc2c5a708d2b53e2337f3f10
commit 9f47d32697686265bc2c5a708d2b53e2337f3f10
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 11 22:34:24 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:44 2017 +0100

    Autogen: Generators: Save the MOC settings that were actually used

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 8d525dc..db35fa6 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -27,6 +27,10 @@
 #include <unistd.h>
 #endif
 
+// -- Static variables
+
+static const char* MocOldSettingsKey = "AM_MOC_OLD_SETTINGS";
+
 // -- Static functions
 
 static std::string GetConfigDefinition(cmMakefile* makefile,
@@ -45,6 +49,14 @@ static std::string GetConfigDefinition(cmMakefile* makefile,
   return makefile->GetSafeDefinition(key);
 }
 
+static std::string MocOldSettingsFile(const std::string& targetDirectory)
+{
+  std::string filename(cmSystemTools::CollapseFullPath(targetDirectory));
+  cmSystemTools::ConvertToUnixSlashes(filename);
+  filename += "/AutomocOldSettings.cmake";
+  return filename;
+}
+
 static std::string FindMatchingHeader(
   const std::string& absPath, const std::string& mocSubDir,
   const std::string& basename,
@@ -227,15 +239,20 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory,
   if (!this->ReadAutogenInfoFile(mf.get(), targetDirectory, config)) {
     return false;
   }
-  this->ReadOldMocDefinitionsFile(mf.get(), targetDirectory);
+  // Read old settings
+  this->ReadOldMocSettingsFile(mf.get(), targetDirectory);
+  // Init and run
   this->Init();
-
   if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5") {
     if (!this->RunAutogen(mf.get())) {
       return false;
     }
   }
-  return this->WriteOldMocDefinitionsFile(targetDirectory);
+  // Write latest settings
+  if (!this->WriteOldMocSettingsFile(targetDirectory)) {
+    return false;
+  }
+  return true;
 }
 
 bool cmQtAutoGenerators::ReadAutogenInfoFile(
@@ -369,9 +386,6 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(
     }
   }
 
-  // - Settings
-  this->CurrentCompileSettingsStr = this->MakeCompileSettingsString(makefile);
-
   // - Flags
   this->IncludeProjectDirsBefore =
     makefile->IsOn("AM_CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE");
@@ -380,58 +394,58 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(
   return true;
 }
 
-std::string cmQtAutoGenerators::MakeCompileSettingsString(cmMakefile* makefile)
+std::string cmQtAutoGenerators::MocCurrentSettingsString()
 {
-  std::string s;
-  s += makefile->GetSafeDefinition("AM_MOC_COMPILE_DEFINITIONS");
-  s += " ~~~ ";
-  s += makefile->GetSafeDefinition("AM_MOC_INCLUDES");
-  s += " ~~~ ";
-  s += makefile->GetSafeDefinition("AM_MOC_OPTIONS");
-  s += " ~~~ ";
-  s += makefile->IsOn("AM_CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE") ? "TRUE"
-                                                                     : "FALSE";
-  s += " ~~~ ";
-
-  return s;
+  std::string res;
+  res += this->MocCompileDefinitionsStr;
+  res += " ~~~ ";
+  res += this->MocIncludesStr;
+  res += " ~~~ ";
+  res += this->MocOptionsStr;
+  res += " ~~~ ";
+  res += this->IncludeProjectDirsBefore ? "TRUE" : "FALSE";
+  res += " ~~~ ";
+  return res;
 }
 
-void cmQtAutoGenerators::ReadOldMocDefinitionsFile(
+void cmQtAutoGenerators::ReadOldMocSettingsFile(
   cmMakefile* makefile, const std::string& targetDirectory)
 {
-  std::string filename(cmSystemTools::CollapseFullPath(targetDirectory));
-  cmSystemTools::ConvertToUnixSlashes(filename);
-  filename += "/AutomocOldMocDefinitions.cmake";
-
+  // Compose current settings string
+  this->MocSettingsString = this->MocCurrentSettingsString();
+  // Read old settings
+  const std::string filename = MocOldSettingsFile(targetDirectory);
   if (makefile->ReadListFile(filename.c_str())) {
-    this->OldCompileSettingsStr =
-      makefile->GetSafeDefinition("AM_OLD_COMPILE_SETTINGS");
+    std::string oldSettings = makefile->GetSafeDefinition(MocOldSettingsKey);
+    if (oldSettings != this->MocSettingsString) {
+      // If settings changed everything needs to be re-generated.
+      this->GenerateAll = true;
+      // Remove old file in case processing gets aborted before
+      // writing the current settings in the end.
+      cmSystemTools::RemoveFile(filename);
+    }
+  } else {
+    // If the file could not be read everything needs to be re-generated.
+    this->GenerateAll = true;
   }
 }
 
-bool cmQtAutoGenerators::WriteOldMocDefinitionsFile(
+bool cmQtAutoGenerators::WriteOldMocSettingsFile(
   const std::string& targetDirectory)
 {
   bool success = true;
-
-  std::string filename(cmSystemTools::CollapseFullPath(targetDirectory));
-  cmSystemTools::ConvertToUnixSlashes(filename);
-  filename += "/AutomocOldMocDefinitions.cmake";
-
-  {
+  if (!this->MocExecutable.empty()) {
+    const std::string filename = MocOldSettingsFile(targetDirectory);
     cmsys::ofstream outfile;
     outfile.open(filename.c_str(), std::ios::trunc);
-    if (outfile) {
-      outfile << "set(AM_OLD_COMPILE_SETTINGS "
-              << cmOutputConverter::EscapeForCMake(
-                   this->CurrentCompileSettingsStr)
+    if ((success = static_cast<bool>(outfile))) {
+      outfile << "set(" << MocOldSettingsKey << " "
+              << cmOutputConverter::EscapeForCMake(this->MocSettingsString)
               << ")\n";
       success = outfile.good();
-    } else {
-      success = false;
+      outfile.close();
     }
   }
-
   return success;
 }
 
@@ -517,11 +531,6 @@ void cmQtAutoGenerators::Init()
 
 bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
 {
-  // If settings changed everything needs to be re-generated.
-  if (this->OldCompileSettingsStr != this->CurrentCompileSettingsStr) {
-    this->GenerateAll = true;
-  }
-
   // the program goes through all .cpp files to see which moc files are
   // included. It is not really interesting how the moc file is named, but
   // what file the moc is created from. Once a moc is included the same moc
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index c2be22c..a26cfbc 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -26,11 +26,11 @@ private:
   bool ReadAutogenInfoFile(cmMakefile* makefile,
                            const std::string& targetDirectory,
                            const std::string& config);
-  void ReadOldMocDefinitionsFile(cmMakefile* makefile,
-                                 const std::string& targetDirectory);
-  bool WriteOldMocDefinitionsFile(const std::string& targetDirectory);
 
-  static std::string MakeCompileSettingsString(cmMakefile* makefile);
+  std::string MocCurrentSettingsString();
+  void ReadOldMocSettingsFile(cmMakefile* makefile,
+                              const std::string& targetDirectory);
+  bool WriteOldMocSettingsFile(const std::string& targetDirectory);
 
   // - Init and run
   void Init();
@@ -133,6 +133,7 @@ private:
   std::list<std::string> MocIncludes;
   std::list<std::string> MocDefinitions;
   std::vector<std::string> MocOptions;
+  std::string MocSettingsString;
   // - Uic
   std::vector<std::string> SkipUic;
   std::vector<std::string> UicTargetOptions;
@@ -141,9 +142,6 @@ private:
   std::vector<std::string> RccSources;
   std::map<std::string, std::string> RccOptions;
   std::map<std::string, std::vector<std::string> > RccInputs;
-  // - Settings
-  std::string CurrentCompileSettingsStr;
-  std::string OldCompileSettingsStr;
   // - Utility
   cmFilePathChecksum fpathCheckSum;
   cmsys::RegularExpression RegExpQObject;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=597124ba8e409edc28cbf8f2a55150d2913a50e3
commit 597124ba8e409edc28cbf8f2a55150d2913a50e3
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 11 20:27:15 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:44 2017 +0100

    Autogen: Generators: Add function to read makefile definitions config aware

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 4f5af3a..8d525dc 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -29,6 +29,22 @@
 
 // -- Static functions
 
+static std::string GetConfigDefinition(cmMakefile* makefile,
+                                       const std::string& key,
+                                       const std::string& config)
+{
+  std::string keyConf = key;
+  if (!config.empty()) {
+    keyConf += "_";
+    keyConf += config;
+  }
+  const char* valueConf = makefile->GetDefinition(keyConf);
+  if (valueConf != CM_NULLPTR) {
+    return valueConf;
+  }
+  return makefile->GetSafeDefinition(key);
+}
+
 static std::string FindMatchingHeader(
   const std::string& absPath, const std::string& mocSubDir,
   const std::string& basename,
@@ -269,55 +285,30 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(
   // - Moc
   cmSystemTools::ExpandListArgument(makefile->GetSafeDefinition("AM_SKIP_MOC"),
                                     this->SkipMoc);
-  {
-    std::string compileDefsPropOrig = "AM_MOC_COMPILE_DEFINITIONS";
-    std::string compileDefsProp = compileDefsPropOrig;
-    if (!config.empty()) {
-      compileDefsProp += "_";
-      compileDefsProp += config;
-    }
-    const char* compileDefs = makefile->GetDefinition(compileDefsProp);
-    this->MocCompileDefinitionsStr = compileDefs
-      ? compileDefs
-      : makefile->GetSafeDefinition(compileDefsPropOrig);
-  }
-  {
-    std::string includesPropOrig = "AM_MOC_INCLUDES";
-    std::string includesProp = includesPropOrig;
-    if (!config.empty()) {
-      includesProp += "_";
-      includesProp += config;
-    }
-    const char* includes = makefile->GetDefinition(includesProp);
-    this->MocIncludesStr =
-      includes ? includes : makefile->GetSafeDefinition(includesPropOrig);
-  }
+  this->MocCompileDefinitionsStr =
+    GetConfigDefinition(makefile, "AM_MOC_COMPILE_DEFINITIONS", config);
+  this->MocIncludesStr =
+    GetConfigDefinition(makefile, "AM_MOC_INCLUDES", config);
   this->MocOptionsStr = makefile->GetSafeDefinition("AM_MOC_OPTIONS");
 
   // - Uic
   cmSystemTools::ExpandListArgument(makefile->GetSafeDefinition("AM_SKIP_UIC"),
                                     this->SkipUic);
+  cmSystemTools::ExpandListArgument(
+    GetConfigDefinition(makefile, "AM_UIC_TARGET_OPTIONS", config),
+    this->UicTargetOptions);
   {
-    const char* uicOptionsFiles =
-      makefile->GetSafeDefinition("AM_UIC_OPTIONS_FILES");
-    std::string uicOptionsPropOrig = "AM_UIC_TARGET_OPTIONS";
-    std::string uicOptionsProp = uicOptionsPropOrig;
-    if (!config.empty()) {
-      uicOptionsProp += "_";
-      uicOptionsProp += config;
-    }
-    const char* uicTargetOptions = makefile->GetSafeDefinition(uicOptionsProp);
-    cmSystemTools::ExpandListArgument(
-      uicTargetOptions ? uicTargetOptions
-                       : makefile->GetSafeDefinition(uicOptionsPropOrig),
-      this->UicTargetOptions);
-    const char* uicOptionsOptions =
-      makefile->GetSafeDefinition("AM_UIC_OPTIONS_OPTIONS");
     std::vector<std::string> uicFilesVec;
-    cmSystemTools::ExpandListArgument(uicOptionsFiles, uicFilesVec);
     std::vector<std::string> uicOptionsVec;
-    cmSystemTools::ExpandListArgument(uicOptionsOptions, uicOptionsVec);
+    cmSystemTools::ExpandListArgument(
+      makefile->GetSafeDefinition("AM_UIC_OPTIONS_FILES"), uicFilesVec);
+    cmSystemTools::ExpandListArgument(
+      makefile->GetSafeDefinition("AM_UIC_OPTIONS_OPTIONS"), uicOptionsVec);
     if (uicFilesVec.size() != uicOptionsVec.size()) {
+      std::ostringstream err;
+      err << "AutoGen: Error: Uic files/options lists size missmatch in: "
+          << filename << std::endl;
+      this->LogError(err.str());
       return false;
     }
     for (std::vector<std::string>::iterator fileIt = uicFilesVec.begin(),
@@ -329,20 +320,20 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(
   }
 
   // - Rcc
+  cmSystemTools::ExpandListArgument(
+    makefile->GetSafeDefinition("AM_RCC_SOURCES"), this->RccSources);
   {
-    std::string rccSources = makefile->GetSafeDefinition("AM_RCC_SOURCES");
-    cmSystemTools::ExpandListArgument(rccSources, this->RccSources);
-  }
-  {
-    const char* rccOptionsFiles =
-      makefile->GetSafeDefinition("AM_RCC_OPTIONS_FILES");
-    const char* rccOptionsOptions =
-      makefile->GetSafeDefinition("AM_RCC_OPTIONS_OPTIONS");
     std::vector<std::string> rccFilesVec;
-    cmSystemTools::ExpandListArgument(rccOptionsFiles, rccFilesVec);
     std::vector<std::string> rccOptionsVec;
-    cmSystemTools::ExpandListArgument(rccOptionsOptions, rccOptionsVec);
+    cmSystemTools::ExpandListArgument(
+      makefile->GetSafeDefinition("AM_RCC_OPTIONS_FILES"), rccFilesVec);
+    cmSystemTools::ExpandListArgument(
+      makefile->GetSafeDefinition("AM_RCC_OPTIONS_OPTIONS"), rccOptionsVec);
     if (rccFilesVec.size() != rccOptionsVec.size()) {
+      std::ostringstream err;
+      err << "AutoGen: Error: RCC files/options lists size missmatch in: "
+          << filename << std::endl;
+      this->LogError(err.str());
       return false;
     }
     for (std::vector<std::string>::iterator fileIt = rccFilesVec.begin(),
@@ -351,10 +342,11 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(
       cmSystemTools::ReplaceString(*optionIt, "@list_sep@", ";");
       this->RccOptions[*fileIt] = *optionIt;
     }
-
-    const char* rccInputs = makefile->GetSafeDefinition("AM_RCC_INPUTS");
+  }
+  {
     std::vector<std::string> rccInputLists;
-    cmSystemTools::ExpandListArgument(rccInputs, rccInputLists);
+    cmSystemTools::ExpandListArgument(
+      makefile->GetSafeDefinition("AM_RCC_INPUTS"), rccInputLists);
 
     // qrc files in the end of the list may have been empty
     if (rccInputLists.size() < this->RccSources.size()) {
@@ -362,19 +354,17 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(
     }
     if (this->RccSources.size() != rccInputLists.size()) {
       std::ostringstream err;
-      err << "AutoGen: RCC sources lists size missmatch in: " << filename;
-      err << std::endl;
+      err << "AutoGen: Error: RCC sources/inputs lists size missmatch in: "
+          << filename << std::endl;
       this->LogError(err.str());
       return false;
     }
-
     for (std::vector<std::string>::iterator fileIt = this->RccSources.begin(),
                                             inputIt = rccInputLists.begin();
          fileIt != this->RccSources.end(); ++fileIt, ++inputIt) {
       cmSystemTools::ReplaceString(*inputIt, "@list_sep@", ";");
       std::vector<std::string> rccInputFiles;
       cmSystemTools::ExpandListArgument(*inputIt, rccInputFiles);
-
       this->RccInputs[*fileIt] = rccInputFiles;
     }
   }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b400b242101fd8b7a46073412830278aa3cc9ec
commit 2b400b242101fd8b7a46073412830278aa3cc9ec
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 11 15:12:41 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:44 2017 +0100

    Autogen: Generators: Move moc/uic/rcc executable test to generate method

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index c088f43..4f5af3a 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -582,20 +582,14 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
                      notIncludedMocs, includedUis);
 
   // Generate files
-  if (!this->MocExecutable.empty()) {
-    if (!this->MocGenerateAll(includedMocs, notIncludedMocs)) {
-      return false;
-    }
+  if (!this->MocGenerateAll(includedMocs, notIncludedMocs)) {
+    return false;
   }
-  if (!this->UicExecutable.empty()) {
-    if (!this->UicGenerateAll(includedUis)) {
-      return false;
-    }
+  if (!this->UicGenerateAll(includedUis)) {
+    return false;
   }
-  if (!this->RccExecutable.empty()) {
-    if (!this->QrcGenerateAll()) {
-      return false;
-    }
+  if (!this->QrcGenerateAll()) {
+    return false;
   }
 
   return true;
@@ -994,6 +988,10 @@ bool cmQtAutoGenerators::MocGenerateAll(
   const std::map<std::string, std::string>& includedMocs,
   const std::map<std::string, std::string>& notIncludedMocs)
 {
+  if (this->MocExecutable.empty()) {
+    return true;
+  }
+
   // look for name collisions
   {
     std::multimap<std::string, std::string> collisions;
@@ -1179,6 +1177,10 @@ bool cmQtAutoGenerators::MocGenerateFile(const std::string& sourceFile,
 bool cmQtAutoGenerators::UicGenerateAll(
   const std::map<std::string, std::vector<std::string> >& includedUis)
 {
+  if (this->UicExecutable.empty()) {
+    return true;
+  }
+
   // single map with input / output names
   std::map<std::string, std::map<std::string, std::string> > uiGenMap;
   std::map<std::string, std::string> testMap;
@@ -1304,6 +1306,10 @@ bool cmQtAutoGenerators::UicGenerateFile(const std::string& realName,
 
 bool cmQtAutoGenerators::QrcGenerateAll()
 {
+  if (this->RccExecutable.empty()) {
+    return true;
+  }
+
   // generate single map with input / output names
   std::map<std::string, std::string> qrcGenMap;
   for (std::vector<std::string>::const_iterator si = this->RccSources.begin();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=edf0b8a52bd4db8557adaf11d7096f7982c373aa
commit edf0b8a52bd4db8557adaf11d7096f7982c373aa
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 11 15:08:24 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:44 2017 +0100

    Autogen: Generators: Rename GenerateFoo methods to FooGenerate

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 645ecc0..c088f43 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -583,17 +583,17 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
 
   // Generate files
   if (!this->MocExecutable.empty()) {
-    if (!this->GenerateMocFiles(includedMocs, notIncludedMocs)) {
+    if (!this->MocGenerateAll(includedMocs, notIncludedMocs)) {
       return false;
     }
   }
   if (!this->UicExecutable.empty()) {
-    if (!this->GenerateUiFiles(includedUis)) {
+    if (!this->UicGenerateAll(includedUis)) {
       return false;
     }
   }
   if (!this->RccExecutable.empty()) {
-    if (!this->GenerateQrcFiles()) {
+    if (!this->QrcGenerateAll()) {
       return false;
     }
   }
@@ -990,7 +990,7 @@ void cmQtAutoGenerators::ParseHeaders(
   }
 }
 
-bool cmQtAutoGenerators::GenerateMocFiles(
+bool cmQtAutoGenerators::MocGenerateAll(
   const std::map<std::string, std::string>& includedMocs,
   const std::map<std::string, std::string>& notIncludedMocs)
 {
@@ -1020,7 +1020,7 @@ bool cmQtAutoGenerators::GenerateMocFiles(
     for (std::map<std::string, std::string>::const_iterator it =
            includedMocs.begin();
          it != includedMocs.end(); ++it) {
-      if (!this->GenerateMoc(it->first, it->second, subDirPrefix)) {
+      if (!this->MocGenerateFile(it->first, it->second, subDirPrefix)) {
         if (this->RunMocFailed) {
           return false;
         }
@@ -1035,7 +1035,7 @@ bool cmQtAutoGenerators::GenerateMocFiles(
     for (std::map<std::string, std::string>::const_iterator it =
            notIncludedMocs.begin();
          it != notIncludedMocs.end(); ++it) {
-      if (this->GenerateMoc(it->first, it->second, subDirPrefix)) {
+      if (this->MocGenerateFile(it->first, it->second, subDirPrefix)) {
         automocCppChanged = true;
       } else {
         if (this->RunMocFailed) {
@@ -1114,9 +1114,9 @@ bool cmQtAutoGenerators::GenerateMocFiles(
 /**
  * @return True if a moc file was created. False may indicate an error.
  */
-bool cmQtAutoGenerators::GenerateMoc(const std::string& sourceFile,
-                                     const std::string& mocFileName,
-                                     const std::string& subDirPrefix)
+bool cmQtAutoGenerators::MocGenerateFile(const std::string& sourceFile,
+                                         const std::string& mocFileName,
+                                         const std::string& subDirPrefix)
 {
   const std::string mocFileRel =
     this->AutogenBuildSubDir + subDirPrefix + mocFileName;
@@ -1176,7 +1176,7 @@ bool cmQtAutoGenerators::GenerateMoc(const std::string& sourceFile,
   return false;
 }
 
-bool cmQtAutoGenerators::GenerateUiFiles(
+bool cmQtAutoGenerators::UicGenerateAll(
   const std::map<std::string, std::vector<std::string> >& includedUis)
 {
   // single map with input / output names
@@ -1224,7 +1224,7 @@ bool cmQtAutoGenerators::GenerateUiFiles(
     for (std::map<std::string, std::string>::const_iterator sit =
            it->second.begin();
          sit != it->second.end(); ++sit) {
-      if (!this->GenerateUi(it->first, sit->first, sit->second)) {
+      if (!this->UicGenerateFile(it->first, sit->first, sit->second)) {
         if (this->RunUicFailed) {
           return false;
         }
@@ -1238,9 +1238,9 @@ bool cmQtAutoGenerators::GenerateUiFiles(
 /**
  * @return True if a uic file was created. False may indicate an error.
  */
-bool cmQtAutoGenerators::GenerateUi(const std::string& realName,
-                                    const std::string& uiInputFile,
-                                    const std::string& uiOutputFile)
+bool cmQtAutoGenerators::UicGenerateFile(const std::string& realName,
+                                         const std::string& uiInputFile,
+                                         const std::string& uiOutputFile)
 {
   const std::string uicFileRel =
     this->AutogenBuildSubDir + "include/" + uiOutputFile;
@@ -1302,7 +1302,7 @@ bool cmQtAutoGenerators::GenerateUi(const std::string& realName,
   return false;
 }
 
-bool cmQtAutoGenerators::GenerateQrcFiles()
+bool cmQtAutoGenerators::QrcGenerateAll()
 {
   // generate single map with input / output names
   std::map<std::string, std::string> qrcGenMap;
@@ -1335,7 +1335,7 @@ bool cmQtAutoGenerators::GenerateQrcFiles()
          qrcGenMap.begin();
        si != qrcGenMap.end(); ++si) {
     bool unique = FileNameIsUnique(si->first, qrcGenMap);
-    if (!this->GenerateQrc(si->first, si->second, unique)) {
+    if (!this->QrcGenerateFile(si->first, si->second, unique)) {
       if (this->RunRccFailed) {
         return false;
       }
@@ -1347,9 +1347,9 @@ bool cmQtAutoGenerators::GenerateQrcFiles()
 /**
  * @return True if a rcc file was created. False may indicate an error.
  */
-bool cmQtAutoGenerators::GenerateQrc(const std::string& qrcInputFile,
-                                     const std::string& qrcOutputFile,
-                                     bool unique_n)
+bool cmQtAutoGenerators::QrcGenerateFile(const std::string& qrcInputFile,
+                                         const std::string& qrcOutputFile,
+                                         bool unique_n)
 {
   std::string symbolName =
     cmsys::SystemTools::GetFilenameWithoutLastExtension(qrcInputFile);
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 3223c6d..c2be22c 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -72,23 +72,24 @@ private:
                           bool relaxed);
 
   // - Moc file generation
-  bool GenerateMocFiles(
+  bool MocGenerateAll(
     const std::map<std::string, std::string>& includedMocs,
     const std::map<std::string, std::string>& notIncludedMocs);
-  bool GenerateMoc(const std::string& sourceFile,
-                   const std::string& mocFileName,
-                   const std::string& subDirPrefix);
+  bool MocGenerateFile(const std::string& sourceFile,
+                       const std::string& mocFileName,
+                       const std::string& subDirPrefix);
 
   // - Uic file generation
-  bool GenerateUiFiles(
+  bool UicGenerateAll(
     const std::map<std::string, std::vector<std::string> >& includedUis);
-  bool GenerateUi(const std::string& realName, const std::string& uiInputFile,
-                  const std::string& uiOutputFile);
+  bool UicGenerateFile(const std::string& realName,
+                       const std::string& uiInputFile,
+                       const std::string& uiOutputFile);
 
   // - Qrc file generation
-  bool GenerateQrcFiles();
-  bool GenerateQrc(const std::string& qrcInputFile,
-                   const std::string& qrcOutputFile, bool unique_n);
+  bool QrcGenerateAll();
+  bool QrcGenerateFile(const std::string& qrcInputFile,
+                       const std::string& qrcOutputFile, bool unique_n);
 
   // - Logging
   void LogErrorNameCollision(

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06430919f4b903ba256ce158caf223f515faa8a4
commit 06430919f4b903ba256ce158caf223f515faa8a4
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 11 14:56:44 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:43 2017 +0100

    Autogen: Generators: Use FileAbsentOrOlder for UIC tests

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index d4997d5..645ecc0 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1246,10 +1246,12 @@ bool cmQtAutoGenerators::GenerateUi(const std::string& realName,
     this->AutogenBuildSubDir + "include/" + uiOutputFile;
   const std::string uicFileAbs = this->CurrentBinaryDir + uicFileRel;
 
-  int sourceNewerThanUi = 0;
-  bool success = cmsys::SystemTools::FileTimeCompare(uiInputFile, uicFileAbs,
-                                                     &sourceNewerThanUi);
-  if (this->GenerateAll || !success || sourceNewerThanUi >= 0) {
+  bool generateUic = this->GenerateAll;
+  // Test if the source file is newer that the build file
+  if (!generateUic) {
+    generateUic = FileAbsentOrOlder(uicFileAbs, uiInputFile);
+  }
+  if (generateUic) {
     // Log
     this->LogBold("Generating UIC header " + uicFileRel);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca179f2afc6d8ab5e0df3e35255155c21a61b5f6
commit ca179f2afc6d8ab5e0df3e35255155c21a61b5f6
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 11 14:53:20 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:43 2017 +0100

    Autogen: Generators: Use FileAbsentOrOlder for MOC tests

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index c766d54..d4997d5 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1121,10 +1121,13 @@ bool cmQtAutoGenerators::GenerateMoc(const std::string& sourceFile,
   const std::string mocFileRel =
     this->AutogenBuildSubDir + subDirPrefix + mocFileName;
   const std::string mocFileAbs = this->CurrentBinaryDir + mocFileRel;
-  int sourceNewerThanMoc = 0;
-  bool success = cmsys::SystemTools::FileTimeCompare(sourceFile, mocFileAbs,
-                                                     &sourceNewerThanMoc);
-  if (this->GenerateAll || !success || sourceNewerThanMoc >= 0) {
+
+  bool generateMoc = this->GenerateAll;
+  // Test if the source file is newer that the build file
+  if (!generateMoc) {
+    generateMoc = FileAbsentOrOlder(mocFileAbs, sourceFile);
+  }
+  if (generateMoc) {
     // Log
     this->LogBold("Generating MOC source " + mocFileRel);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=119791ae528aace81f6c209e05798c80d8926b3d
commit 119791ae528aace81f6c209e05798c80d8926b3d
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 11 14:45:04 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:43 2017 +0100

    Autogen: Generators: Introduce FileAbsentOrOlder function

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index f3fa047..c766d54 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -91,6 +91,19 @@ static std::string ReadAll(const std::string& filename)
   return stream.str();
 }
 
+/**
+ * @brief Tests if buildFile doesn't exist or is older than sourceFile
+ * @return True if buildFile doesn't exist or is older than sourceFile
+ */
+static bool FileAbsentOrOlder(const std::string& buildFile,
+                              const std::string& sourceFile)
+{
+  int result = 0;
+  bool success =
+    cmsys::SystemTools::FileTimeCompare(buildFile, sourceFile, &result);
+  return (!success || (result <= 0));
+}
+
 static bool ListContains(const std::vector<std::string>& list,
                          const std::string& entry)
 {
@@ -1284,22 +1297,6 @@ bool cmQtAutoGenerators::GenerateUi(const std::string& realName,
   return false;
 }
 
-bool cmQtAutoGenerators::InputFilesNewerThanQrc(const std::string& qrcFile,
-                                                const std::string& rccOutput)
-{
-  std::vector<std::string> const& files = this->RccInputs[qrcFile];
-  for (std::vector<std::string>::const_iterator it = files.begin();
-       it != files.end(); ++it) {
-    int inputNewerThanQrc = 0;
-    bool success =
-      cmsys::SystemTools::FileTimeCompare(*it, rccOutput, &inputNewerThanQrc);
-    if (!success || inputNewerThanQrc >= 0) {
-      return true;
-    }
-  }
-  return false;
-}
-
 bool cmQtAutoGenerators::GenerateQrcFiles()
 {
   // generate single map with input / output names
@@ -1361,14 +1358,23 @@ bool cmQtAutoGenerators::GenerateQrc(const std::string& qrcInputFile,
 
   const std::string qrcBuildFile = this->CurrentBinaryDir + qrcOutputFile;
 
-  int sourceNewerThanQrc = 0;
-  bool generateQrc = !cmsys::SystemTools::FileTimeCompare(
-    qrcInputFile, qrcBuildFile, &sourceNewerThanQrc);
-  generateQrc = generateQrc || (sourceNewerThanQrc >= 0);
-  generateQrc =
-    generateQrc || this->InputFilesNewerThanQrc(qrcInputFile, qrcBuildFile);
-
-  if (this->GenerateAll || generateQrc) {
+  bool generateQrc = this->GenerateAll;
+  // Test if the resources list file is newer than build file
+  if (!generateQrc) {
+    generateQrc = FileAbsentOrOlder(qrcBuildFile, qrcInputFile);
+  }
+  // Test if any resource file is newer than the build file
+  if (!generateQrc) {
+    const std::vector<std::string>& files = this->RccInputs[qrcInputFile];
+    for (std::vector<std::string>::const_iterator it = files.begin();
+         it != files.end(); ++it) {
+      if (FileAbsentOrOlder(qrcBuildFile, *it)) {
+        generateQrc = true;
+        break;
+      }
+    }
+  }
+  if (generateQrc) {
     {
       std::string msg = "Generating RCC source ";
       msg += qrcOutputFile;
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index b9d670a..3223c6d 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -86,8 +86,6 @@ private:
                   const std::string& uiOutputFile);
 
   // - Qrc file generation
-  bool InputFilesNewerThanQrc(const std::string& qrcFile,
-                              const std::string& rccOutput);
   bool GenerateQrcFiles();
   bool GenerateQrc(const std::string& qrcInputFile,
                    const std::string& qrcOutputFile, bool unique_n);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95e4cfc5947fb5a324f6dad50cff8d71f928aba8
commit 95e4cfc5947fb5a324f6dad50cff8d71f928aba8
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 11 14:05:41 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:43 2017 +0100

    Autogen: Generators: Simplify (and fix) JoinExts function

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 73afdc1..f3fa047 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -99,20 +99,18 @@ static bool ListContains(const std::vector<std::string>& list,
 
 static std::string JoinExts(const std::vector<std::string>& lst)
 {
-  if (lst.empty()) {
-    return "";
-  }
-
   std::string result;
-  std::string separator = ",";
-  for (std::vector<std::string>::const_iterator it = lst.begin();
-       it != lst.end(); ++it) {
-    if (it != lst.begin()) {
-      result += separator;
+  if (!lst.empty()) {
+    const std::string separator = ",";
+    for (std::vector<std::string>::const_iterator it = lst.begin();
+         it != lst.end(); ++it) {
+      if (it != lst.begin()) {
+        result += separator;
+      }
+      result += '.';
+      result += *it;
     }
-    result += '.' + (*it);
   }
-  result.erase(result.end() - 1);
   return result;
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c55755bdd54c2d474e2c8fe4c9d078e10404f26
commit 6c55755bdd54c2d474e2c8fe4c9d078e10404f26
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 11 13:56:13 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:43 2017 +0100

    Autogen: Generators: Make class static method a source static function

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index ea55064..73afdc1 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -97,6 +97,25 @@ static bool ListContains(const std::vector<std::string>& list,
   return (std::find(list.begin(), list.end(), entry) != list.end());
 }
 
+static std::string JoinExts(const std::vector<std::string>& lst)
+{
+  if (lst.empty()) {
+    return "";
+  }
+
+  std::string result;
+  std::string separator = ",";
+  for (std::vector<std::string>::const_iterator it = lst.begin();
+       it != lst.end(); ++it) {
+    if (it != lst.begin()) {
+      result += separator;
+    }
+    result += '.' + (*it);
+  }
+  result.erase(result.end() - 1);
+  return result;
+}
+
 static void UicMergeOptions(std::vector<std::string>& opts,
                             const std::vector<std::string>& fileOpts,
                             bool isQt5)
@@ -749,7 +768,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
           err << "AutoMoc: Error: " << absFilename << "\n"
               << "The file includes the moc file \"" << currentMoc
               << "\", but could not find header \"" << basename << '{'
-              << this->JoinExts(headerExtensions) << "}\" ";
+              << JoinExts(headerExtensions) << "}\" ";
           if (mocSubDir.empty()) {
             err << "in " << scannedFileAbsPath << "\n";
           } else {
@@ -1509,22 +1528,3 @@ bool cmQtAutoGenerators::MakeParentDirectory(const std::string& filename)
   }
   return success;
 }
-
-std::string cmQtAutoGenerators::JoinExts(const std::vector<std::string>& lst)
-{
-  if (lst.empty()) {
-    return "";
-  }
-
-  std::string result;
-  std::string separator = ",";
-  for (std::vector<std::string>::const_iterator it = lst.begin();
-       it != lst.end(); ++it) {
-    if (it != lst.begin()) {
-      result += separator;
-    }
-    result += '.' + (*it);
-  }
-  result.erase(result.end() - 1);
-  return result;
-}
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index ed17dcd..b9d670a 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -106,7 +106,6 @@ private:
   bool NameCollisionTest(const std::map<std::string, std::string>& genFiles,
                          std::multimap<std::string, std::string>& collisions);
   bool MakeParentDirectory(const std::string& filename);
-  static std::string JoinExts(const std::vector<std::string>& lst);
 
   // - Target names
   std::string OriginTargetName;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1491ab1c6626ed6a3b67e74b94fd18230e1bb4d4
commit 1491ab1c6626ed6a3b67e74b94fd18230e1bb4d4
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 11 13:51:31 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:43 2017 +0100

    Autogen: Generators: Make class static method a source static function

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 57b9450..ea55064 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -97,6 +97,40 @@ static bool ListContains(const std::vector<std::string>& list,
   return (std::find(list.begin(), list.end(), entry) != list.end());
 }
 
+static void UicMergeOptions(std::vector<std::string>& opts,
+                            const std::vector<std::string>& fileOpts,
+                            bool isQt5)
+{
+  static const char* valueOptions[] = { "tr",      "translate",
+                                        "postfix", "generator",
+                                        "include", // Since Qt 5.3
+                                        "g" };
+  std::vector<std::string> extraOpts;
+  for (std::vector<std::string>::const_iterator it = fileOpts.begin();
+       it != fileOpts.end(); ++it) {
+    std::vector<std::string>::iterator existingIt =
+      std::find(opts.begin(), opts.end(), *it);
+    if (existingIt != opts.end()) {
+      const char* o = it->c_str();
+      if (*o == '-') {
+        ++o;
+      }
+      if (isQt5 && *o == '-') {
+        ++o;
+      }
+      if (std::find_if(cmArrayBegin(valueOptions), cmArrayEnd(valueOptions),
+                       cmStrCmp(*it)) != cmArrayEnd(valueOptions)) {
+        assert(existingIt + 1 != opts.end());
+        *(existingIt + 1) = *(it + 1);
+        ++it;
+      }
+    } else {
+      extraOpts.push_back(*it);
+    }
+  }
+  opts.insert(opts.end(), extraOpts.begin(), extraOpts.end());
+}
+
 // -- Class methods
 
 cmQtAutoGenerators::cmQtAutoGenerators()
@@ -1109,40 +1143,6 @@ bool cmQtAutoGenerators::GenerateMoc(const std::string& sourceFile,
   return false;
 }
 
-void cmQtAutoGenerators::MergeUicOptions(
-  std::vector<std::string>& opts, const std::vector<std::string>& fileOpts,
-  bool isQt5)
-{
-  static const char* valueOptions[] = { "tr",      "translate",
-                                        "postfix", "generator",
-                                        "include", // Since Qt 5.3
-                                        "g" };
-  std::vector<std::string> extraOpts;
-  for (std::vector<std::string>::const_iterator it = fileOpts.begin();
-       it != fileOpts.end(); ++it) {
-    std::vector<std::string>::iterator existingIt =
-      std::find(opts.begin(), opts.end(), *it);
-    if (existingIt != opts.end()) {
-      const char* o = it->c_str();
-      if (*o == '-') {
-        ++o;
-      }
-      if (isQt5 && *o == '-') {
-        ++o;
-      }
-      if (std::find_if(cmArrayBegin(valueOptions), cmArrayEnd(valueOptions),
-                       cmStrCmp(*it)) != cmArrayEnd(valueOptions)) {
-        assert(existingIt + 1 != opts.end());
-        *(existingIt + 1) = *(it + 1);
-        ++it;
-      }
-    } else {
-      extraOpts.push_back(*it);
-    }
-  }
-  opts.insert(opts.end(), extraOpts.begin(), extraOpts.end());
-}
-
 bool cmQtAutoGenerators::GenerateUiFiles(
   const std::map<std::string, std::vector<std::string> >& includedUis)
 {
@@ -1235,8 +1235,7 @@ bool cmQtAutoGenerators::GenerateUi(const std::string& realName,
     if (optionIt != this->UicOptions.end()) {
       std::vector<std::string> fileOpts;
       cmSystemTools::ExpandListArgument(optionIt->second, fileOpts);
-      cmQtAutoGenerators::MergeUicOptions(opts, fileOpts,
-                                          this->QtMajorVersion == "5");
+      UicMergeOptions(opts, fileOpts, this->QtMajorVersion == "5");
     }
     command.insert(command.end(), opts.begin(), opts.end());
 
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 18648e6..ed17dcd 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -80,9 +80,6 @@ private:
                    const std::string& subDirPrefix);
 
   // - Uic file generation
-  static void MergeUicOptions(std::vector<std::string>& opts,
-                              const std::vector<std::string>& fileOpts,
-                              bool isQt5);
   bool GenerateUiFiles(
     const std::map<std::string, std::vector<std::string> >& includedUis);
   bool GenerateUi(const std::string& realName, const std::string& uiInputFile,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29112c9a695a8dce6486203d0415f17ac41d3a0b
commit 29112c9a695a8dce6486203d0415f17ac41d3a0b
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 11 13:47:43 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:42 2017 +0100

    Autogen: Generators: Static function upper case rename

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 2c9310e..57b9450 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -55,7 +55,7 @@ static std::string FindMatchingHeader(
   return header;
 }
 
-static std::string extractSubDir(const std::string& absPath,
+static std::string ExtractSubDir(const std::string& absPath,
                                  const std::string& currentMoc)
 {
   std::string subDir;
@@ -699,7 +699,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
         // finding the correct header, so we need to remove the moc_ part
         basename = basename.substr(4);
         const std::string mocSubDir =
-          extractSubDir(scannedFileAbsPath, currentMoc);
+          ExtractSubDir(scannedFileAbsPath, currentMoc);
         const std::string headerToMoc = FindMatchingHeader(
           scannedFileAbsPath, mocSubDir, basename, headerExtensions);
 
@@ -732,7 +732,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
           // Mode: Relaxed
           if (!requiresMoc || basename != scannedFileBasename) {
             const std::string mocSubDir =
-              extractSubDir(scannedFileAbsPath, currentMoc);
+              ExtractSubDir(scannedFileAbsPath, currentMoc);
             const std::string headerToMoc = FindMatchingHeader(
               scannedFileAbsPath, mocSubDir, basename, headerExtensions);
             if (!headerToMoc.empty()) {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d333be14d23b9aaf4452189199134bd674ad395
commit 6d333be14d23b9aaf4452189199134bd674ad395
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 11 13:47:26 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:42 2017 +0100

    Autogen: Generators: Static function upper case rename

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 017fb04..2c9310e 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -29,7 +29,7 @@
 
 // -- Static functions
 
-static std::string findMatchingHeader(
+static std::string FindMatchingHeader(
   const std::string& absPath, const std::string& mocSubDir,
   const std::string& basename,
   const std::vector<std::string>& headerExtensions)
@@ -700,7 +700,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
         basename = basename.substr(4);
         const std::string mocSubDir =
           extractSubDir(scannedFileAbsPath, currentMoc);
-        const std::string headerToMoc = findMatchingHeader(
+        const std::string headerToMoc = FindMatchingHeader(
           scannedFileAbsPath, mocSubDir, basename, headerExtensions);
 
         if (!headerToMoc.empty()) {
@@ -733,7 +733,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
           if (!requiresMoc || basename != scannedFileBasename) {
             const std::string mocSubDir =
               extractSubDir(scannedFileAbsPath, currentMoc);
-            const std::string headerToMoc = findMatchingHeader(
+            const std::string headerToMoc = FindMatchingHeader(
               scannedFileAbsPath, mocSubDir, basename, headerExtensions);
             if (!headerToMoc.empty()) {
               // This is for KDE4 compatibility:

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52688bf7453cdb767e231f5fdc7d80ce79ae239d
commit 52688bf7453cdb767e231f5fdc7d80ce79ae239d
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Jan 11 13:41:14 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Jan 13 00:00:42 2017 +0100

    Autogen: Generators: Sort methods by task

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index f5c33fe..017fb04 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -27,6 +27,8 @@
 #include <unistd.h>
 #endif
 
+// -- Static functions
+
 static std::string findMatchingHeader(
   const std::string& absPath, const std::string& mocSubDir,
   const std::string& basename,
@@ -95,6 +97,8 @@ static bool ListContains(const std::vector<std::string>& list,
   return (std::find(list.begin(), list.end(), entry) != list.end());
 }
 
+// -- Class methods
+
 cmQtAutoGenerators::cmQtAutoGenerators()
   : Verbose(cmsys::SystemTools::HasEnv("VERBOSE"))
   , ColorOutput(true)
@@ -124,40 +128,6 @@ cmQtAutoGenerators::cmQtAutoGenerators()
                                  "[\"<](([^ \">]+/)?ui_[^ \">/]+\\.h)[\">]");
 }
 
-void cmQtAutoGenerators::MergeUicOptions(
-  std::vector<std::string>& opts, const std::vector<std::string>& fileOpts,
-  bool isQt5)
-{
-  static const char* valueOptions[] = { "tr",      "translate",
-                                        "postfix", "generator",
-                                        "include", // Since Qt 5.3
-                                        "g" };
-  std::vector<std::string> extraOpts;
-  for (std::vector<std::string>::const_iterator it = fileOpts.begin();
-       it != fileOpts.end(); ++it) {
-    std::vector<std::string>::iterator existingIt =
-      std::find(opts.begin(), opts.end(), *it);
-    if (existingIt != opts.end()) {
-      const char* o = it->c_str();
-      if (*o == '-') {
-        ++o;
-      }
-      if (isQt5 && *o == '-') {
-        ++o;
-      }
-      if (std::find_if(cmArrayBegin(valueOptions), cmArrayEnd(valueOptions),
-                       cmStrCmp(*it)) != cmArrayEnd(valueOptions)) {
-        assert(existingIt + 1 != opts.end());
-        *(existingIt + 1) = *(it + 1);
-        ++it;
-      }
-    } else {
-      extraOpts.push_back(*it);
-    }
-  }
-  opts.insert(opts.end(), extraOpts.begin(), extraOpts.end());
-}
-
 bool cmQtAutoGenerators::Run(const std::string& targetDirectory,
                              const std::string& config)
 {
@@ -568,6 +538,60 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
 }
 
 /**
+ * @brief Tests if the C++ content requires moc processing
+ * @return True if moc is required
+ */
+bool cmQtAutoGenerators::requiresMocing(const std::string& text,
+                                        std::string& macroName)
+{
+  // Run a simple check before an expensive regular expression check
+  if (strstr(text.c_str(), "Q_OBJECT") != CM_NULLPTR) {
+    if (this->RegExpQObject.find(text)) {
+      macroName = "Q_OBJECT";
+      return true;
+    }
+  }
+  if (strstr(text.c_str(), "Q_GADGET") != CM_NULLPTR) {
+    if (this->RegExpQGadget.find(text)) {
+      macroName = "Q_GADGET";
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * @brief Tests if the file should be ignored for moc scanning
+ * @return True if the file should be ignored
+ */
+bool cmQtAutoGenerators::MocSkipTest(const std::string& absFilename)
+{
+  // Test if moc scanning is enabled
+  if (!this->MocExecutable.empty()) {
+    // Test if the file name is on the skip list
+    if (!ListContains(this->SkipMoc, absFilename)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+/**
+ * @brief Tests if the file name is in the skip list
+ */
+bool cmQtAutoGenerators::UicSkipTest(const std::string& absFilename)
+{
+  // Test if uic scanning is enabled
+  if (!this->UicExecutable.empty()) {
+    // Test if the file name is on the skip list
+    if (!ListContains(this->SkipUic, absFilename)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+/**
  * @return True on success
  */
 bool cmQtAutoGenerators::ParseSourceFile(
@@ -597,25 +621,6 @@ bool cmQtAutoGenerators::ParseSourceFile(
   return success;
 }
 
-bool cmQtAutoGenerators::requiresMocing(const std::string& text,
-                                        std::string& macroName)
-{
-  // Run a simple check before an expensive regular expression check
-  if (strstr(text.c_str(), "Q_OBJECT") != CM_NULLPTR) {
-    if (this->RegExpQObject.find(text)) {
-      macroName = "Q_OBJECT";
-      return true;
-    }
-  }
-  if (strstr(text.c_str(), "Q_GADGET") != CM_NULLPTR) {
-    if (this->RegExpQGadget.find(text)) {
-      macroName = "Q_GADGET";
-      return true;
-    }
-  }
-  return false;
-}
-
 void cmQtAutoGenerators::ParseContentForUic(
   const std::string& absFilename, const std::string& contentsString,
   std::map<std::string, std::vector<std::string> >& includedUis)
@@ -1104,6 +1109,40 @@ bool cmQtAutoGenerators::GenerateMoc(const std::string& sourceFile,
   return false;
 }
 
+void cmQtAutoGenerators::MergeUicOptions(
+  std::vector<std::string>& opts, const std::vector<std::string>& fileOpts,
+  bool isQt5)
+{
+  static const char* valueOptions[] = { "tr",      "translate",
+                                        "postfix", "generator",
+                                        "include", // Since Qt 5.3
+                                        "g" };
+  std::vector<std::string> extraOpts;
+  for (std::vector<std::string>::const_iterator it = fileOpts.begin();
+       it != fileOpts.end(); ++it) {
+    std::vector<std::string>::iterator existingIt =
+      std::find(opts.begin(), opts.end(), *it);
+    if (existingIt != opts.end()) {
+      const char* o = it->c_str();
+      if (*o == '-') {
+        ++o;
+      }
+      if (isQt5 && *o == '-') {
+        ++o;
+      }
+      if (std::find_if(cmArrayBegin(valueOptions), cmArrayEnd(valueOptions),
+                       cmStrCmp(*it)) != cmArrayEnd(valueOptions)) {
+        assert(existingIt + 1 != opts.end());
+        *(existingIt + 1) = *(it + 1);
+        ++it;
+      }
+    } else {
+      extraOpts.push_back(*it);
+    }
+  }
+  opts.insert(opts.end(), extraOpts.begin(), extraOpts.end());
+}
+
 bool cmQtAutoGenerators::GenerateUiFiles(
   const std::map<std::string, std::vector<std::string> >& includedUis)
 {
@@ -1365,67 +1404,6 @@ bool cmQtAutoGenerators::GenerateQrc(const std::string& qrcInputFile,
   return false;
 }
 
-/**
- * @brief Tests if the file should be ignored for moc scanning
- * @return True if the file should be ignored
- */
-bool cmQtAutoGenerators::MocSkipTest(const std::string& absFilename)
-{
-  // Test if moc scanning is enabled
-  if (!this->MocExecutable.empty()) {
-    // Test if the file name is on the skip list
-    if (!ListContains(this->SkipMoc, absFilename)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-/**
- * @brief Tests if the file name is in the skip list
- */
-bool cmQtAutoGenerators::UicSkipTest(const std::string& absFilename)
-{
-  // Test if uic scanning is enabled
-  if (!this->UicExecutable.empty()) {
-    // Test if the file name is on the skip list
-    if (!ListContains(this->SkipUic, absFilename)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-/**
- * @brief Collects name collisions as output/input pairs
- * @return True if there were collisions
- */
-bool cmQtAutoGenerators::NameCollisionTest(
-  const std::map<std::string, std::string>& genFiles,
-  std::multimap<std::string, std::string>& collisions)
-{
-  typedef std::map<std::string, std::string>::const_iterator Iter;
-  typedef std::map<std::string, std::string>::value_type VType;
-  for (Iter ait = genFiles.begin(); ait != genFiles.end(); ++ait) {
-    bool first_match(true);
-    for (Iter bit = (++Iter(ait)); bit != genFiles.end(); ++bit) {
-      if (ait->second == bit->second) {
-        if (first_match) {
-          if (collisions.find(ait->second) != collisions.end()) {
-            // We already know of this collision from before
-            break;
-          }
-          collisions.insert(VType(ait->second, ait->first));
-          first_match = false;
-        }
-        collisions.insert(VType(bit->second, bit->first));
-      }
-    }
-  }
-
-  return !collisions.empty();
-}
-
 void cmQtAutoGenerators::LogErrorNameCollision(
   const std::string& message,
   const std::multimap<std::string, std::string>& collisions)
@@ -1485,6 +1463,36 @@ void cmQtAutoGenerators::LogCommand(const std::vector<std::string>& command)
 }
 
 /**
+ * @brief Collects name collisions as output/input pairs
+ * @return True if there were collisions
+ */
+bool cmQtAutoGenerators::NameCollisionTest(
+  const std::map<std::string, std::string>& genFiles,
+  std::multimap<std::string, std::string>& collisions)
+{
+  typedef std::map<std::string, std::string>::const_iterator Iter;
+  typedef std::map<std::string, std::string>::value_type VType;
+  for (Iter ait = genFiles.begin(); ait != genFiles.end(); ++ait) {
+    bool first_match(true);
+    for (Iter bit = (++Iter(ait)); bit != genFiles.end(); ++bit) {
+      if (ait->second == bit->second) {
+        if (first_match) {
+          if (collisions.find(ait->second) != collisions.end()) {
+            // We already know of this collision from before
+            break;
+          }
+          collisions.insert(VType(ait->second, ait->first));
+          first_match = false;
+        }
+        collisions.insert(VType(bit->second, bit->first));
+      }
+    }
+  }
+
+  return !collisions.empty();
+}
+
+/**
  * @brief Generates the parent directory of the given file on demand
  * @return True on success
  */
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index d0c7066..18648e6 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -22,6 +22,7 @@ public:
   bool Run(const std::string& targetDirectory, const std::string& config);
 
 private:
+  // - Configuration
   bool ReadAutogenInfoFile(cmMakefile* makefile,
                            const std::string& targetDirectory,
                            const std::string& config);
@@ -29,25 +30,16 @@ private:
                                  const std::string& targetDirectory);
   bool WriteOldMocDefinitionsFile(const std::string& targetDirectory);
 
-  std::string MakeCompileSettingsString(cmMakefile* makefile);
+  static std::string MakeCompileSettingsString(cmMakefile* makefile);
 
+  // - Init and run
+  void Init();
   bool RunAutogen(cmMakefile* makefile);
 
-  bool GenerateMocFiles(
-    const std::map<std::string, std::string>& includedMocs,
-    const std::map<std::string, std::string>& notIncludedMocs);
-  bool GenerateMoc(const std::string& sourceFile,
-                   const std::string& mocFileName,
-                   const std::string& subDirPrefix);
-
-  bool GenerateUiFiles(
-    const std::map<std::string, std::vector<std::string> >& includedUis);
-  bool GenerateUi(const std::string& realName, const std::string& uiInputFile,
-                  const std::string& uiOutputFile);
-
-  bool GenerateQrcFiles();
-  bool GenerateQrc(const std::string& qrcInputFile,
-                   const std::string& qrcOutputFile, bool unique_n);
+  // - Content analysis
+  bool requiresMocing(const std::string& text, std::string& macroName);
+  bool MocSkipTest(const std::string& absFilename);
+  bool UicSkipTest(const std::string& absFilename);
 
   bool ParseSourceFile(
     const std::string& absFilename,
@@ -55,6 +47,7 @@ private:
     std::map<std::string, std::string>& includedMocs,
     std::map<std::string, std::vector<std::string> >& includedUis,
     bool relaxed);
+
   void SearchHeadersForSourceFile(
     const std::string& absFilename,
     const std::vector<std::string>& headerExtensions,
@@ -68,8 +61,6 @@ private:
     std::map<std::string, std::string>& notIncludedMocs,
     std::map<std::string, std::vector<std::string> >& includedUis);
 
-  bool requiresMocing(const std::string& text, std::string& macroName);
-
   void ParseContentForUic(
     const std::string& fileName, const std::string& contentsString,
     std::map<std::string, std::vector<std::string> >& includedUis);
@@ -80,18 +71,31 @@ private:
                           std::map<std::string, std::string>& includedMocs,
                           bool relaxed);
 
-  void ParseForUic(
-    const std::string& fileName,
-    std::map<std::string, std::vector<std::string> >& includedUis);
-
-  void Init();
+  // - Moc file generation
+  bool GenerateMocFiles(
+    const std::map<std::string, std::string>& includedMocs,
+    const std::map<std::string, std::string>& notIncludedMocs);
+  bool GenerateMoc(const std::string& sourceFile,
+                   const std::string& mocFileName,
+                   const std::string& subDirPrefix);
 
-  bool MocSkipTest(const std::string& absFilename);
-  bool UicSkipTest(const std::string& absFilename);
+  // - Uic file generation
+  static void MergeUicOptions(std::vector<std::string>& opts,
+                              const std::vector<std::string>& fileOpts,
+                              bool isQt5);
+  bool GenerateUiFiles(
+    const std::map<std::string, std::vector<std::string> >& includedUis);
+  bool GenerateUi(const std::string& realName, const std::string& uiInputFile,
+                  const std::string& uiOutputFile);
 
-  bool NameCollisionTest(const std::map<std::string, std::string>& genFiles,
-                         std::multimap<std::string, std::string>& collisions);
+  // - Qrc file generation
+  bool InputFilesNewerThanQrc(const std::string& qrcFile,
+                              const std::string& rccOutput);
+  bool GenerateQrcFiles();
+  bool GenerateQrc(const std::string& qrcInputFile,
+                   const std::string& qrcOutputFile, bool unique_n);
 
+  // - Logging
   void LogErrorNameCollision(
     const std::string& message,
     const std::multimap<std::string, std::string>& collisions);
@@ -101,16 +105,11 @@ private:
   void LogError(const std::string& message);
   void LogCommand(const std::vector<std::string>& command);
 
+  // - Utility
+  bool NameCollisionTest(const std::map<std::string, std::string>& genFiles,
+                         std::multimap<std::string, std::string>& collisions);
   bool MakeParentDirectory(const std::string& filename);
-
-  std::string JoinExts(const std::vector<std::string>& lst);
-
-  static void MergeUicOptions(std::vector<std::string>& opts,
-                              const std::vector<std::string>& fileOpts,
-                              bool isQt5);
-
-  bool InputFilesNewerThanQrc(const std::string& qrcFile,
-                              const std::string& rccOutput);
+  static std::string JoinExts(const std::vector<std::string>& lst);
 
   // - Target names
   std::string OriginTargetName;

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

Summary of changes:
 Source/cmQtAutoGeneratorInitializer.cxx |    8 +
 Source/cmQtAutoGenerators.cxx           |  699 ++++++++++++++++++-------------
 Source/cmQtAutoGenerators.h             |   84 ++--
 3 files changed, 451 insertions(+), 340 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 13 10:06:39 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Jan 2017 10:06:39 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2179-g971b392
Message-ID: <20170113150639.C5352FA0CD@public.kitware.com>

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  971b392e59105b7c76a98628c3054c54b1a252e2 (commit)
       via  397b854620fc1ab3d8427ebeb5b7e4659c4f9128 (commit)
       via  a7dd8e669289e7b78ebc05b5d337052f32582038 (commit)
       via  6fda6005b306cc4a1e9e9e66d9cd4525fc623f73 (commit)
      from  fff9c79d71279e95d6ccf8535f3c6ecf125847b8 (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=971b392e59105b7c76a98628c3054c54b1a252e2
commit 971b392e59105b7c76a98628c3054c54b1a252e2
Merge: fff9c79 397b854
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 13 10:06:38 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 13 10:06:38 2017 -0500

    Merge topic 'csharp_simple' into next
    
    397b8546 VS: added documentation for C# support
    a7dd8e66 VS: added support for C# (for Visual Studio 2010, 2012, 2013, 2015)
    6fda6005 VS: renamed target property VS_USER_PROPS_CXX to VS_USER_PROPS


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=397b854620fc1ab3d8427ebeb5b7e4659c4f9128
commit 397b854620fc1ab3d8427ebeb5b7e4659c4f9128
Author:     Michael St?rmer <michael.stuermer at schaeffler.com>
AuthorDate: Wed Jan 11 18:25:46 2017 +0100
Commit:     Michael St?rmer <michael.stuermer at schaeffler.com>
CommitDate: Fri Jan 13 09:28:14 2017 +0100

    VS: added documentation for C# support

diff --git a/Help/release/dev/vs-csharp-support.rst b/Help/release/dev/vs-csharp-support.rst
new file mode 100644
index 0000000..26d8574
--- /dev/null
+++ b/Help/release/dev/vs-csharp-support.rst
@@ -0,0 +1,25 @@
+vs-native-csharp-support
+------------------------
+
+* The :ref:`Visual Studio Generators` for VS 2010 and above
+  learned to support the C# language. C# assemblies and
+  programs can be added just like common C++ targets using
+  the :command:`add_library` and :command:`add_executable`
+  commands. Referencing between several C# targets in the same
+  source tree is done by :command:`target_link_libraries` like
+  for C++. Referencing to system or 3rd party assemblies is
+  done by the target properties :prop_tgt:`VS_DOTNET_REFERENCE_<refname>`
+  and :prop_tgt:`VS_DOTNET_REFERENCES`.
+
+* C# as a language can be enabled using :command:`enable_language`
+  or :command:`project` with ``CSharp``. It is not enabled by
+  default.
+
+* Flag variables, target properties and other configuration
+  that specifically targets C# contains ``CSharp`` as a part of
+  their names.
+
+* More finetuning of C# targets can be done using target
+  properties. Specifically the Visual Studio related target
+  properties (``VS_*``) are worth a look (for setting toolset
+  versions, root namespaces, assembly icons, ...).

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7dd8e669289e7b78ebc05b5d337052f32582038
commit a7dd8e669289e7b78ebc05b5d337052f32582038
Author:     Michael St?rmer <michael.stuermer at schaeffler.com>
AuthorDate: Mon Jan 9 16:34:13 2017 +0100
Commit:     Michael St?rmer <michael.stuermer at schaeffler.com>
CommitDate: Fri Jan 13 09:28:13 2017 +0100

    VS: added support for C# (for Visual Studio 2010, 2012, 2013, 2015)

diff --git a/Modules/CMakeTestCSharpCompiler.cmake b/Modules/CMakeTestCSharpCompiler.cmake
index 21b7236..1a8bf32 100644
--- a/Modules/CMakeTestCSharpCompiler.cmake
+++ b/Modules/CMakeTestCSharpCompiler.cmake
@@ -34,10 +34,6 @@ if(NOT CMAKE_CSharp_COMPILER_WORKS)
   # Move result from cache to normal variable.
   set(CMAKE_CSharp_COMPILER_WORKS ${CMAKE_CSharp_COMPILER_WORKS})
   unset(CMAKE_CSharp_COMPILER_WORKS CACHE)
-  if(NOT CMAKE_CSharp_COMPILER_WORKS)
-    message("forcing compiler works to true (will be removed once C# support is integrated)")
-    set(CMAKE_CSharp_COMPILER_WORKS 1)
-  endif()
   set(CSharp_TEST_WAS_RUN 1)
 endif()
 
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index dff6ad6..89380eb 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -130,9 +130,18 @@ void cmVisualStudio10TargetGenerator::WritePlatformConfigTag(
   }
   stream->fill(' ');
   stream->width(indentLevel * 2);
-  (*stream) << "";
-  (*stream) << "<" << tag << " Condition=\"'$(Configuration)|$(Platform)'=='";
-  (*stream) << config << "|" << this->Platform << "'\"";
+  (*stream) << "<" << tag << " Condition=\"";
+  (*stream) << "'$(Configuration)|$(Platform)'=='";
+  (*stream) << config << "|" << this->Platform;
+  (*stream) << "'";
+  // handle special case for 32 bit C# targets
+  if (csproj == this->ProjectType && this->Platform == "Win32") {
+    (*stream) << " Or ";
+    (*stream) << "'$(Configuration)|$(Platform)'=='";
+    (*stream) << config << "|x86";
+    (*stream) << "'";
+  }
+  (*stream) << "\"";
   if (attribute) {
     (*stream) << attribute;
   }
@@ -159,6 +168,14 @@ void cmVisualStudio10TargetGenerator::WriteString(const char* line,
   "$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props"
 #define VS10_CXX_TARGETS "$(VCTargetsPath)\\Microsoft.Cpp.targets"
 
+#define VS10_CSharp_DEFAULT_PROPS                                             \
+  "$(MSBuildExtensionsPath)\\$(MSBuildToolsVersion)\\Microsoft.Common.props"
+// This does not seem to exist by default, it's just provided for consistency
+// in case users want to have default custom props for C# targets
+#define VS10_CSharp_USER_PROPS                                                \
+  "$(UserRootDir)\\Microsoft.CSharp.$(Platform).user.props"
+#define VS10_CSharp_TARGETS "$(MSBuildToolsPath)\\Microsoft.CSharp.targets"
+
 void cmVisualStudio10TargetGenerator::Generate()
 {
   // do not generate external ms projects
@@ -257,7 +274,9 @@ void cmVisualStudio10TargetGenerator::Generate()
     this->WriteString("</PropertyGroup>\n", 1);
   }
 
-  this->WriteProjectConfigurations();
+  if (csproj != this->ProjectType) {
+    this->WriteProjectConfigurations();
+  }
   this->WriteString("<PropertyGroup Label=\"Globals\">\n", 1);
   this->WriteString("<ProjectGUID>", 2);
   (*this->BuildFileStream) << "{" << this->GUID << "}</ProjectGUID>\n";
@@ -271,9 +290,14 @@ void cmVisualStudio10TargetGenerator::Generate()
   const char* vsProjectTypes =
     this->GeneratorTarget->GetProperty("VS_GLOBAL_PROJECT_TYPES");
   if (vsProjectTypes) {
-    this->WriteString("<ProjectTypes>", 2);
-    (*this->BuildFileStream) << cmVS10EscapeXML(vsProjectTypes)
-                             << "</ProjectTypes>\n";
+    std::string tagName = "ProjectTypes";
+    if (csproj == this->ProjectType) {
+      tagName = "ProjectTypeGuids";
+    }
+    this->WriteString("", 2);
+    (*this->BuildFileStream) << "<" << tagName << ">"
+                             << cmVS10EscapeXML(vsProjectTypes) << "</"
+                             << tagName << ">\n";
   }
 
   const char* vsProjectName =
@@ -371,10 +395,59 @@ void cmVisualStudio10TargetGenerator::Generate()
                              << "</" << globalKey << ">\n";
   }
 
+  if (this->Managed) {
+    std::string outputType = "<OutputType>";
+    switch (this->GeneratorTarget->GetType()) {
+      case cmStateEnums::OBJECT_LIBRARY:
+      case cmStateEnums::STATIC_LIBRARY:
+      case cmStateEnums::SHARED_LIBRARY:
+        outputType += "Library";
+        break;
+      case cmStateEnums::MODULE_LIBRARY:
+        outputType += "Module";
+        break;
+      case cmStateEnums::EXECUTABLE:
+        if (this->GeneratorTarget->Target->GetPropertyAsBool(
+              "WIN32_EXECUTABLE")) {
+          outputType += "WinExe";
+        } else {
+          outputType += "Exe";
+        }
+        break;
+      case cmStateEnums::UTILITY:
+      case cmStateEnums::GLOBAL_TARGET:
+        outputType += "Utility";
+        break;
+      case cmStateEnums::UNKNOWN_LIBRARY:
+      case cmStateEnums::INTERFACE_LIBRARY:
+        break;
+    }
+    outputType += "</OutputType>\n";
+    this->WriteString(outputType.c_str(), 2);
+    this->WriteString("<AppDesignerFolder>Properties</AppDesignerFolder>\n",
+                      2);
+  }
+
   this->WriteString("</PropertyGroup>\n", 1);
-  this->WriteString("<Import Project=\"" VS10_CXX_DEFAULT_PROPS "\" />\n", 1);
+
+  switch (this->ProjectType) {
+    case vcxproj:
+      this->WriteString("<Import Project=\"" VS10_CXX_DEFAULT_PROPS "\" />\n",
+                        1);
+      break;
+    case csproj:
+      this->WriteString("<Import Project=\"" VS10_CSharp_DEFAULT_PROPS "\" "
+                        "Condition=\"Exists('" VS10_CSharp_DEFAULT_PROPS "')\""
+                        "/>\n",
+                        1);
+      break;
+  }
+
   this->WriteProjectConfigurationValues();
-  this->WriteString("<Import Project=\"" VS10_CXX_PROPS "\" />\n", 1);
+
+  if (vcxproj == this->ProjectType) {
+    this->WriteString("<Import Project=\"" VS10_CXX_PROPS "\" />\n", 1);
+  }
   this->WriteString("<ImportGroup Label=\"ExtensionSettings\">\n", 1);
   if (this->GlobalGenerator->IsMasmEnabled()) {
     this->WriteString("<Import Project=\"$(VCTargetsPath)\\"
@@ -384,16 +457,26 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("</ImportGroup>\n", 1);
   this->WriteString("<ImportGroup Label=\"PropertySheets\">\n", 1);
   {
-    std::string props = VS10_CXX_USER_PROPS;
+    std::string props;
+    switch (this->ProjectType) {
+      case vcxproj:
+        props = VS10_CXX_USER_PROPS;
+        break;
+      case csproj:
+        props = VS10_CSharp_USER_PROPS;
+        break;
+    }
     if (const char* p = this->GeneratorTarget->GetProperty("VS_USER_PROPS")) {
       props = p;
+    }
+    if (!props.empty()) {
       this->ConvertToWindowsSlash(props);
+      this->WriteString("", 2);
+      (*this->BuildFileStream)
+        << "<Import Project=\"" << cmVS10EscapeXML(props) << "\""
+        << " Condition=\"exists('" << cmVS10EscapeXML(props) << "')\""
+        << " Label=\"LocalAppDataPlatform\" />\n";
     }
-    this->WriteString("", 2);
-    (*this->BuildFileStream)
-      << "<Import Project=\"" << cmVS10EscapeXML(props) << "\""
-      << " Condition=\"exists('" << cmVS10EscapeXML(props) << "')\""
-      << " Label=\"LocalAppDataPlatform\" />\n";
   }
   this->WritePlatformExtensions();
   this->WriteString("</ImportGroup>\n", 1);
@@ -409,7 +492,14 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteWinRTReferences();
   this->WriteProjectReferences();
   this->WriteSDKReferences();
-  this->WriteString("<Import Project=\"" VS10_CXX_TARGETS "\" />\n", 1);
+  switch (this->ProjectType) {
+    case vcxproj:
+      this->WriteString("<Import Project=\"" VS10_CXX_TARGETS "\" />\n", 1);
+      break;
+    case csproj:
+      this->WriteString("<Import Project=\"" VS10_CSharp_TARGETS "\" />\n", 1);
+      break;
+  }
 
   this->WriteTargetSpecificReferences();
   this->WriteString("<ImportGroup Label=\"ExtensionTargets\">\n", 1);
@@ -420,6 +510,17 @@ void cmVisualStudio10TargetGenerator::Generate()
                       2);
   }
   this->WriteString("</ImportGroup>\n", 1);
+  if (csproj == this->ProjectType) {
+    for (std::vector<std::string>::const_iterator i =
+           this->Configurations.begin();
+         i != this->Configurations.end(); ++i) {
+      this->WriteString("<PropertyGroup Condition=\"'$(Configuration)' == '",
+                        1);
+      (*this->BuildFileStream) << *i << "'\">\n";
+      this->WriteEvents(*i);
+      this->WriteString("</PropertyGroup>\n", 1);
+    }
+  }
   this->WriteString("</Project>", 0);
   // The groups are stored in a separate file for VS 10
   this->WriteGroups();
@@ -660,48 +761,55 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
        i != this->Configurations.end(); ++i) {
     this->WritePlatformConfigTag("PropertyGroup", i->c_str(), 1,
                                  " Label=\"Configuration\"", "\n");
-    std::string configType = "<ConfigurationType>";
-    if (const char* vsConfigurationType =
-          this->GeneratorTarget->GetProperty("VS_CONFIGURATION_TYPE")) {
-      configType += cmVS10EscapeXML(vsConfigurationType);
-    } else {
-      switch (this->GeneratorTarget->GetType()) {
-        case cmStateEnums::SHARED_LIBRARY:
-        case cmStateEnums::MODULE_LIBRARY:
-          configType += "DynamicLibrary";
-          break;
-        case cmStateEnums::OBJECT_LIBRARY:
-        case cmStateEnums::STATIC_LIBRARY:
-          configType += "StaticLibrary";
-          break;
-        case cmStateEnums::EXECUTABLE:
-          if (this->NsightTegra &&
-              !this->GeneratorTarget->GetPropertyAsBool("ANDROID_GUI")) {
-            // Android executables are .so too.
+
+    if (csproj != this->ProjectType) {
+      std::string configType = "<ConfigurationType>";
+      if (const char* vsConfigurationType =
+            this->GeneratorTarget->GetProperty("VS_CONFIGURATION_TYPE")) {
+        configType += cmVS10EscapeXML(vsConfigurationType);
+      } else {
+        switch (this->GeneratorTarget->GetType()) {
+          case cmStateEnums::SHARED_LIBRARY:
+          case cmStateEnums::MODULE_LIBRARY:
             configType += "DynamicLibrary";
-          } else {
-            configType += "Application";
-          }
-          break;
-        case cmStateEnums::UTILITY:
-        case cmStateEnums::GLOBAL_TARGET:
-          if (this->NsightTegra) {
-            // Tegra-Android platform does not understand "Utility".
+            break;
+          case cmStateEnums::OBJECT_LIBRARY:
+          case cmStateEnums::STATIC_LIBRARY:
             configType += "StaticLibrary";
-          } else {
-            configType += "Utility";
-          }
-          break;
-        case cmStateEnums::UNKNOWN_LIBRARY:
-        case cmStateEnums::INTERFACE_LIBRARY:
-          break;
+            break;
+          case cmStateEnums::EXECUTABLE:
+            if (this->NsightTegra &&
+                !this->GeneratorTarget->GetPropertyAsBool("ANDROID_GUI")) {
+              // Android executables are .so too.
+              configType += "DynamicLibrary";
+            } else {
+              configType += "Application";
+            }
+            break;
+          case cmStateEnums::UTILITY:
+          case cmStateEnums::GLOBAL_TARGET:
+            if (this->NsightTegra) {
+              // Tegra-Android platform does not understand "Utility".
+              configType += "StaticLibrary";
+            } else {
+              configType += "Utility";
+            }
+            break;
+          case cmStateEnums::UNKNOWN_LIBRARY:
+          case cmStateEnums::INTERFACE_LIBRARY:
+            break;
+        }
       }
+      configType += "</ConfigurationType>\n";
+      this->WriteString(configType.c_str(), 2);
     }
-    configType += "</ConfigurationType>\n";
-    this->WriteString(configType.c_str(), 2);
 
     if (this->MSTools) {
-      this->WriteMSToolConfigurationValues(*i);
+      if (!this->Managed) {
+        this->WriteMSToolConfigurationValues(*i);
+      } else {
+        this->WriteMSToolConfigurationValuesManaged(*i);
+      }
     } else if (this->NsightTegra) {
       this->WriteNsightTegraConfigurationValues(*i);
     }
@@ -760,6 +868,61 @@ void cmVisualStudio10TargetGenerator::WriteMSToolConfigurationValues(
   }
 }
 
+void cmVisualStudio10TargetGenerator::WriteMSToolConfigurationValuesManaged(
+  std::string const& config)
+{
+  cmGlobalVisualStudio10Generator* gg =
+    static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
+
+  Options& o = *(this->ClOptions[config]);
+
+  if (o.IsDebug()) {
+    this->WriteString("<DebugSymbols>true</DebugSymbols>\n", 2);
+    this->WriteString("<DefineDebug>true</DefineDebug>\n", 2);
+  }
+
+  std::string outDir =
+    this->GeneratorTarget->GetDirectory(config.c_str()) + "/";
+  this->ConvertToWindowsSlash(outDir);
+  this->WriteString("<OutputPath>", 2);
+  (*this->BuildFileStream) << cmVS10EscapeXML(outDir) << "</OutputPath>\n";
+
+  if (o.HasFlag("Platform")) {
+    this->WriteString("<PlatformTarget>", 2);
+    (*this->BuildFileStream) << cmVS10EscapeXML(o.GetFlag("Platform"))
+                             << "</PlatformTarget>\n";
+    o.RemoveFlag("Platform");
+  }
+
+  if (const char* toolset = gg->GetPlatformToolset()) {
+    this->WriteString("<PlatformToolset>", 2);
+    (*this->BuildFileStream) << cmVS10EscapeXML(toolset)
+                             << "</PlatformToolset>\n";
+  }
+
+  std::string postfixName = cmSystemTools::UpperCase(config);
+  postfixName += "_POSTFIX";
+  std::string assemblyName =
+    this->GeneratorTarget->GetOutputName(config, false);
+  if (const char* postfix = this->GeneratorTarget->GetProperty(postfixName)) {
+    assemblyName += postfix;
+  }
+  this->WriteString("<AssemblyName>", 2);
+  (*this->BuildFileStream) << cmVS10EscapeXML(assemblyName)
+                           << "</AssemblyName>\n";
+
+  if (cmStateEnums::EXECUTABLE == this->GeneratorTarget->GetType()) {
+    this->WriteString("<StartAction>Program</StartAction>\n", 2);
+    this->WriteString("<StartProgram>", 2);
+    (*this->BuildFileStream) << cmVS10EscapeXML(outDir)
+                             << cmVS10EscapeXML(assemblyName)
+                             << ".exe</StartProgram>\n";
+  }
+
+  o.OutputFlagMap(*this->BuildFileStream, "    ");
+}
+
+//----------------------------------------------------------------------------
 void cmVisualStudio10TargetGenerator::WriteNsightTegraConfigurationValues(
   std::string const&)
 {
@@ -923,6 +1086,10 @@ void cmVisualStudio10TargetGenerator::ConvertToWindowsSlash(std::string& s)
 }
 void cmVisualStudio10TargetGenerator::WriteGroups()
 {
+  if (csproj == this->ProjectType) {
+    return;
+  }
+
   // collect up group information
   std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
   std::vector<cmSourceFile*> classes;
@@ -1181,7 +1348,33 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
   std::string shaderEntryPoint;
   std::string shaderModel;
   std::string shaderAdditionalFlags;
+  std::string sourceLink;
   std::string ext = cmSystemTools::LowerCase(sf->GetExtension());
+  if (csproj == this->ProjectType) {
+    // EVERY extra source file must have a <Link>, otherwise it might not
+    // be visible in Visual Studio at all. The path relative to current
+    // source- or binary-dir is used within the link, if the file is
+    // in none of these paths, it is added with the plain filename without
+    // any path. This means the file will show up at root-level of the csproj
+    // (where CMakeLists.txt etc. are).
+    if (!this->InSourceBuild) {
+      toolHasSettings = true;
+      std::string fullFileName = sf->GetFullPath();
+      std::string srcDir = this->Makefile->GetCurrentSourceDirectory();
+      std::string binDir = this->Makefile->GetCurrentBinaryDirectory();
+      if (fullFileName.find(binDir) != std::string::npos) {
+        sourceLink = "";
+      } else if (fullFileName.find(srcDir) != std::string::npos) {
+        sourceLink = fullFileName.substr(srcDir.length() + 1);
+      } else {
+        // fallback: add plain filename without any path
+        sourceLink = cmsys::SystemTools::GetFilenameName(fullFileName);
+      }
+      if (!sourceLink.empty()) {
+        this->ConvertToWindowsSlash(sourceLink);
+      }
+    }
+  }
   if (ext == "hlsl") {
     tool = "FXCompile";
     // Figure out the type of shader compiler to use.
@@ -1302,6 +1495,10 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
       (*this->BuildFileStream) << cmVS10EscapeXML(shaderAdditionalFlags)
                                << "</AdditionalOptions>\n";
     }
+    if (!sourceLink.empty()) {
+      this->WriteString("<Link>", 3);
+      (*this->BuildFileStream) << cmVS10EscapeXML(sourceLink) << "</Link>\n";
+    }
     this->WriteString("</", 2);
     (*this->BuildFileStream) << tool << ">\n";
   } else {
@@ -1343,6 +1540,12 @@ void cmVisualStudio10TargetGenerator::WriteSource(std::string const& tool,
       this->GlobalGenerator->PathTooLong(this->GeneratorTarget, sf, sourceRel);
     }
   }
+  if (csproj == this->ProjectType && this->InSourceBuild) {
+    std::string srcdir = this->Makefile->GetCurrentSourceDirectory();
+    if (sourceFile.find(srcdir) != std::string::npos) {
+      sourceFile = sourceFile.substr(srcdir.size() + 1);
+    }
+  }
   this->ConvertToWindowsSlash(sourceFile);
   this->WriteString("<", 2);
   (*this->BuildFileStream) << tool << " Include=\""
@@ -1393,6 +1596,8 @@ void cmVisualStudio10TargetGenerator::WriteAllSources()
       tool = "MASM";
     } else if (lang == "RC") {
       tool = "ResourceCompile";
+    } else if (lang == "CSharp") {
+      tool = "Compile";
     }
 
     if (!tool.empty()) {
@@ -1596,6 +1801,37 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
     std::string xamlFileName = fileName.substr(0, fileName.find_last_of("."));
     (*this->BuildFileStream) << xamlFileName << "</DependentUpon>\n";
   }
+  if (csproj == this->ProjectType) {
+    std::string f = source->GetFullPath();
+    typedef std::map<std::string, std::string> CsPropMap;
+    CsPropMap sourceFileTags;
+    // set <Link> tag if necessary
+    if (!this->InSourceBuild) {
+      const std::string stripFromPath =
+        this->Makefile->GetCurrentSourceDirectory();
+      if (f.find(stripFromPath) != std::string::npos) {
+        std::string link = f.substr(stripFromPath.length() + 1);
+        this->ConvertToWindowsSlash(link);
+        sourceFileTags["Link"] = link;
+      }
+    }
+    //
+    // NOTE: in future commits additional props will be added!
+    //
+    // write source file specific tags
+    if (!sourceFileTags.empty()) {
+      hasFlags = true;
+      (*this->BuildFileStream) << firstString;
+      firstString = "";
+      for (CsPropMap::const_iterator i = sourceFileTags.begin();
+           i != sourceFileTags.end(); ++i) {
+        this->WriteString("<", 2);
+        (*this->BuildFileStream)
+          << i->first << ">" << cmVS10EscapeXML(i->second) << "</" << i->first
+          << ">\n";
+      }
+    }
+  }
 
   return hasFlags;
 }
@@ -1606,6 +1842,9 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
   if (ttype > cmStateEnums::GLOBAL_TARGET) {
     return;
   }
+  if (csproj == this->ProjectType) {
+    return;
+  }
 
   this->WriteString("<PropertyGroup>\n", 2);
   this->WriteString("<_ProjectFileVersion>10.0.20506.1"
@@ -1680,6 +1919,9 @@ void cmVisualStudio10TargetGenerator::OutputLinkIncremental(
   if (!this->MSTools) {
     return;
   }
+  if (csproj == this->ProjectType) {
+    return;
+  }
   // static libraries and things greater than modules do not need
   // to set this option
   if (this->GeneratorTarget->GetType() == cmStateEnums::STATIC_LIBRARY ||
@@ -1734,8 +1976,18 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
 
   cmGlobalVisualStudio10Generator* gg =
     static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
-  CM_AUTO_PTR<Options> pOptions(new Options(
-    this->LocalGenerator, Options::Compiler, gg->GetClFlagTable()));
+  CM_AUTO_PTR<Options> pOptions;
+  switch (this->ProjectType) {
+    case vcxproj:
+      pOptions = CM_AUTO_PTR<Options>(new Options(
+        this->LocalGenerator, Options::Compiler, gg->GetClFlagTable()));
+      break;
+    case csproj:
+      pOptions = CM_AUTO_PTR<Options>(new Options(this->LocalGenerator,
+                                                  Options::CSharpCompiler,
+                                                  gg->GetCSharpFlagTable()));
+      break;
+  }
   Options& clOptions = *pOptions;
 
   std::string flags;
@@ -1748,7 +2000,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
     return false;
   }
   if (linkLanguage == "C" || linkLanguage == "CXX" ||
-      linkLanguage == "Fortran") {
+      linkLanguage == "Fortran" || linkLanguage == "CSharp") {
     std::string baseFlagVar = "CMAKE_";
     baseFlagVar += linkLanguage;
     baseFlagVar += "_FLAGS";
@@ -1776,16 +2028,26 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
   std::string defineFlags =
     this->GeneratorTarget->Target->GetMakefile()->GetDefineFlags();
   if (this->MSTools) {
-    clOptions.FixExceptionHandlingDefault();
-    clOptions.AddFlag("PrecompiledHeader", "NotUsing");
-    std::string asmLocation = configName + "/";
-    clOptions.AddFlag("AssemblerListingLocation", asmLocation.c_str());
+    if (vcxproj == this->ProjectType) {
+      clOptions.FixExceptionHandlingDefault();
+      clOptions.AddFlag("PrecompiledHeader", "NotUsing");
+      std::string asmLocation = configName + "/";
+      clOptions.AddFlag("AssemblerListingLocation", asmLocation.c_str());
+    }
   }
   clOptions.Parse(flags.c_str());
   clOptions.Parse(defineFlags.c_str());
   std::vector<std::string> targetDefines;
-  this->GeneratorTarget->GetCompileDefinitions(targetDefines,
-                                               configName.c_str(), "CXX");
+  switch (this->ProjectType) {
+    case vcxproj:
+      this->GeneratorTarget->GetCompileDefinitions(targetDefines,
+                                                   configName.c_str(), "CXX");
+      break;
+    case csproj:
+      this->GeneratorTarget->GetCompileDefinitions(
+        targetDefines, configName.c_str(), "CSharp");
+      break;
+  }
   clOptions.AddDefines(targetDefines);
   if (this->MSTools) {
     clOptions.SetVerboseMakefile(
@@ -1840,6 +2102,9 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
   std::string const& configName, std::vector<std::string> const& includes)
 {
   Options& clOptions = *(this->ClOptions[configName]);
+  if (this->ProjectType == csproj) {
+    return;
+  }
   this->WriteString("<ClCompile>\n", 2);
   clOptions.OutputAdditionalOptions(*this->BuildFileStream, "      ", "");
   clOptions.AppendFlag("AdditionalIncludeDirectories", includes);
@@ -2508,6 +2773,9 @@ void cmVisualStudio10TargetGenerator::WriteLinkOptions(
       this->GeneratorTarget->GetType() > cmStateEnums::MODULE_LIBRARY) {
     return;
   }
+  if (csproj == this->ProjectType) {
+    return;
+  }
   Options& linkOptions = *(this->LinkOptions[config]);
   this->WriteString("<Link>\n", 2);
 
@@ -2575,6 +2843,9 @@ void cmVisualStudio10TargetGenerator::WriteMidlOptions(
   if (!this->MSTools) {
     return;
   }
+  if (csproj == this->ProjectType) {
+    return;
+  }
 
   // This processes *any* of the .idl files specified in the project's file
   // list (and passed as the item metadata %(Filename) expressing the rule
@@ -2636,7 +2907,9 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     //    output midl flags       <Midl></Midl>
     this->WriteMidlOptions(*i, includes);
     // write events
-    this->WriteEvents(*i);
+    if (csproj != this->ProjectType) {
+      this->WriteEvents(*i);
+    }
     //    output link flags       <Link></Link>
     this->WriteLinkOptions(*i);
     //    output lib flags       <Lib></Lib>
@@ -2702,12 +2975,20 @@ void cmVisualStudio10TargetGenerator::WriteEvent(
     script += cmVS10EscapeXML(lg->ConstructScript(ccg));
   }
   comment = cmVS10EscapeComment(comment);
-  this->WriteString("<Message>", 3);
-  (*this->BuildFileStream) << cmVS10EscapeXML(comment) << "</Message>\n";
-  this->WriteString("<Command>", 3);
+  if (csproj != this->ProjectType) {
+    this->WriteString("<Message>", 3);
+    (*this->BuildFileStream) << cmVS10EscapeXML(comment) << "</Message>\n";
+    this->WriteString("<Command>", 3);
+  } else {
+    if (!comment.empty()) {
+      (*this->BuildFileStream) << "echo " << cmVS10EscapeXML(comment) << "\n";
+    }
+  }
   (*this->BuildFileStream) << script;
-  (*this->BuildFileStream) << "</Command>"
-                           << "\n";
+  if (csproj != this->ProjectType) {
+    (*this->BuildFileStream) << "</Command>";
+  }
+  (*this->BuildFileStream) << "\n";
   this->WriteString("</", 2);
   (*this->BuildFileStream) << name << ">\n";
 }
@@ -2732,6 +3013,10 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
           ->TargetIsFortranOnly(dt)) {
       continue;
     }
+    if (csproj == this->ProjectType &&
+        !this->GlobalGenerator->TargetIsCSharpOnly(dt)) {
+      continue;
+    }
     this->WriteString("<ProjectReference Include=\"", 2);
     cmLocalGenerator* lg = dt->GetLocalGenerator();
     std::string name = dt->GetName();
@@ -2748,8 +3033,16 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
     this->ConvertToWindowsSlash(path);
     (*this->BuildFileStream) << cmVS10EscapeXML(path) << "\">\n";
     this->WriteString("<Project>", 3);
-    (*this->BuildFileStream) << this->GlobalGenerator->GetGUID(name.c_str())
-                             << "</Project>\n";
+    if (csproj == this->ProjectType) {
+      (*this->BuildFileStream) << "{";
+    }
+    (*this->BuildFileStream) << this->GlobalGenerator->GetGUID(name.c_str());
+    if (csproj == this->ProjectType) {
+      (*this->BuildFileStream) << "}";
+    }
+    (*this->BuildFileStream) << "</Project>\n";
+    this->WriteString("<Name>", 3);
+    (*this->BuildFileStream) << name << "</Name>\n";
     this->WriteString("</ProjectReference>\n", 2);
   }
   this->WriteString("</ItemGroup>\n", 1);
diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h
index 027761e..45464c0 100644
--- a/Source/cmVisualStudio10TargetGenerator.h
+++ b/Source/cmVisualStudio10TargetGenerator.h
@@ -56,6 +56,7 @@ private:
   void WriteProjectConfigurations();
   void WriteProjectConfigurationValues();
   void WriteMSToolConfigurationValues(std::string const& config);
+  void WriteMSToolConfigurationValuesManaged(std::string const& config);
   void WriteHeaderSource(cmSourceFile const* sf);
   void WriteExtraSource(cmSourceFile const* sf);
   void WriteNsightTegraConfigurationValues(std::string const& config);
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 73eef9a..4945b31 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -325,6 +325,9 @@ if(BUILD_TESTING)
     endif()
   endif()
 
+  if(${CMAKE_GENERATOR} MATCHES "Visual Studio ([^789]|[789][0-9])")
+    ADD_TEST_MACRO(CSharpOnly CSharpOnly)
+  endif()
 
   ADD_TEST_MACRO(COnly COnly)
   ADD_TEST_MACRO(CxxOnly CxxOnly)
diff --git a/Tests/CSharpOnly/CMakeLists.txt b/Tests/CSharpOnly/CMakeLists.txt
new file mode 100644
index 0000000..0e3e39e
--- /dev/null
+++ b/Tests/CSharpOnly/CMakeLists.txt
@@ -0,0 +1,10 @@
+# a simple CSharp only test case
+project (CSharpOnly CSharp)
+
+# C# does not make any difference between STATIC and SHARED libs
+add_library(lib1 STATIC lib1.cs)
+add_library(lib2 SHARED lib2.cs)
+
+add_executable(CSharpOnly csharponly.cs)
+
+target_link_libraries(CSharpOnly lib1 lib2)
diff --git a/Tests/CSharpOnly/csharponly.cs b/Tests/CSharpOnly/csharponly.cs
new file mode 100644
index 0000000..ad4641a
--- /dev/null
+++ b/Tests/CSharpOnly/csharponly.cs
@@ -0,0 +1,15 @@
+namespace CSharpOnly
+{
+    class CSharpOnly
+    {
+        public static void Main(string[] args)
+        {
+            int val = Lib1.getResult();
+
+            Lib2 l = new Lib2();
+            val = l.myVal;
+
+            return;
+        }
+    }
+}
diff --git a/Tests/CSharpOnly/lib1.cs b/Tests/CSharpOnly/lib1.cs
new file mode 100644
index 0000000..7a7ae10
--- /dev/null
+++ b/Tests/CSharpOnly/lib1.cs
@@ -0,0 +1,10 @@
+namespace CSharpOnly
+{
+    public class Lib1
+    {
+        public static int getResult()
+        {
+            return 23;
+        }
+    }
+}
diff --git a/Tests/CSharpOnly/lib2.cs b/Tests/CSharpOnly/lib2.cs
new file mode 100644
index 0000000..b4b38ce
--- /dev/null
+++ b/Tests/CSharpOnly/lib2.cs
@@ -0,0 +1,10 @@
+namespace CSharpOnly
+{
+    public class Lib2
+    {
+        public int myVal = 42;
+
+        public Lib2()
+        {}
+    }
+}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6fda6005b306cc4a1e9e9e66d9cd4525fc623f73
commit 6fda6005b306cc4a1e9e9e66d9cd4525fc623f73
Author:     Michael St?rmer <michael.stuermer at schaeffler.com>
AuthorDate: Mon Jan 9 16:32:22 2017 +0100
Commit:     Michael St?rmer <michael.stuermer at schaeffler.com>
CommitDate: Fri Jan 13 09:27:21 2017 +0100

    VS: renamed target property VS_USER_PROPS_CXX to VS_USER_PROPS

diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index c93ace1..864d1dc 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -291,7 +291,7 @@ Properties on Targets
    /prop_tgt/VS_SCC_PROJECTNAME
    /prop_tgt/VS_SCC_PROVIDER
    /prop_tgt/VS_SDK_REFERENCES
-   /prop_tgt/VS_USER_PROPS_CXX
+   /prop_tgt/VS_USER_PROPS
    /prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION
    /prop_tgt/VS_WINRT_COMPONENT
    /prop_tgt/VS_WINRT_EXTENSIONS
diff --git a/Help/prop_tgt/VS_USER_PROPS_CXX.rst b/Help/prop_tgt/VS_USER_PROPS.rst
similarity index 92%
rename from Help/prop_tgt/VS_USER_PROPS_CXX.rst
rename to Help/prop_tgt/VS_USER_PROPS.rst
index 083ce03..1be222b 100644
--- a/Help/prop_tgt/VS_USER_PROPS_CXX.rst
+++ b/Help/prop_tgt/VS_USER_PROPS.rst
@@ -1,5 +1,5 @@
-VS_USER_PROPS_CXX
------------------
+VS_USER_PROPS
+-------------
 
 Sets the user props file to be included in the visual studio
 C++ project file. The standard path is
diff --git a/Help/release/dev/vs-custom-msbuild-props.rst b/Help/release/dev/vs-custom-msbuild-props.rst
index 15a5b0a..68dae42 100644
--- a/Help/release/dev/vs-custom-msbuild-props.rst
+++ b/Help/release/dev/vs-custom-msbuild-props.rst
@@ -3,7 +3,7 @@ vs-custom-msbuild-props
 
 * The :ref:`Visual Studio Generators` for VS 2010 and above can
   now be fine tuned using custom msbuild .props files.
-  :prop_tgt:`VS_USER_PROPS_CXX` can be
+  :prop_tgt:`VS_USER_PROPS` can be
   used to change the default path of the user .props file from
   ``$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props`` to
   an arbitrary filename.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 49274c0..dff6ad6 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -385,8 +385,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<ImportGroup Label=\"PropertySheets\">\n", 1);
   {
     std::string props = VS10_CXX_USER_PROPS;
-    if (const char* p =
-          this->GeneratorTarget->GetProperty("VS_USER_PROPS_CXX")) {
+    if (const char* p = this->GeneratorTarget->GetProperty("VS_USER_PROPS")) {
       props = p;
       this->ConvertToWindowsSlash(props);
     }
diff --git a/Tests/RunCMake/VS10Project/VsCustomProps.cmake b/Tests/RunCMake/VS10Project/VsCustomProps.cmake
index af52a3e..fbbcfcf 100644
--- a/Tests/RunCMake/VS10Project/VsCustomProps.cmake
+++ b/Tests/RunCMake/VS10Project/VsCustomProps.cmake
@@ -4,4 +4,4 @@ add_library(foo foo.cpp)
 set(props_file "${CMAKE_CURRENT_SOURCE_DIR}/my.props")
 
 set_target_properties(foo PROPERTIES
-    VS_USER_PROPS_CXX "${props_file}")
+    VS_USER_PROPS "${props_file}")

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

Summary of changes:
 Help/manual/cmake-properties.7.rst                 |    2 +-
 .../{VS_USER_PROPS_CXX.rst => VS_USER_PROPS.rst}   |    4 +-
 Help/release/dev/vs-csharp-support.rst             |   25 ++
 Help/release/dev/vs-custom-msbuild-props.rst       |    2 +-
 Modules/CMakeTestCSharpCompiler.cmake              |    4 -
 Source/cmVisualStudio10TargetGenerator.cxx         |  434 ++++++++++++++++----
 Source/cmVisualStudio10TargetGenerator.h           |    1 +
 Tests/CMakeLists.txt                               |    3 +
 Tests/CSharpOnly/CMakeLists.txt                    |   10 +
 Tests/CSharpOnly/csharponly.cs                     |   15 +
 Tests/CSharpOnly/lib1.cs                           |   10 +
 Tests/CSharpOnly/lib2.cs                           |   10 +
 Tests/RunCMake/VS10Project/VsCustomProps.cmake     |    2 +-
 13 files changed, 442 insertions(+), 80 deletions(-)
 rename Help/prop_tgt/{VS_USER_PROPS_CXX.rst => VS_USER_PROPS.rst} (92%)
 create mode 100644 Help/release/dev/vs-csharp-support.rst
 create mode 100644 Tests/CSharpOnly/CMakeLists.txt
 create mode 100644 Tests/CSharpOnly/csharponly.cs
 create mode 100644 Tests/CSharpOnly/lib1.cs
 create mode 100644 Tests/CSharpOnly/lib2.cs


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 13 10:19:22 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Jan 2017 10:19:22 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1081-g63e550e
Message-ID: <20170113151922.B5FDDFA328@public.kitware.com>

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  63e550e54f577b081d1ccd742ed1bbd02622a671 (commit)
       via  35413bf2c1b33980afd418030af27f184872af6b (commit)
      from  7f5842d7d943403fca02a5345e9d6f779eb7bf9a (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 13 10:19:22 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Jan 2017 10:19:22 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2181-g6a935bd
Message-ID: <20170113151922.D5FCEFA338@public.kitware.com>

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  6a935bd4adac8521da3988ff7b1202ed31ee2411 (commit)
       via  63e550e54f577b081d1ccd742ed1bbd02622a671 (commit)
      from  971b392e59105b7c76a98628c3054c54b1a252e2 (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=6a935bd4adac8521da3988ff7b1202ed31ee2411
commit 6a935bd4adac8521da3988ff7b1202ed31ee2411
Merge: 971b392 63e550e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 13 10:19:06 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 13 10:19:06 2017 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 13 10:19:22 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Jan 2017 10:19:22 -0500 (EST)
Subject: [Cmake-commits] CMake branch, release, updated. v3.7.1-20-g35413bf
Message-ID: <20170113151922.E68DBFA351@public.kitware.com>

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, release has been updated
       via  35413bf2c1b33980afd418030af27f184872af6b (commit)
      from  0051989738db8efe7fa3771e4526542810319e26 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 13 14:07:19 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Jan 2017 14:07:19 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.1-1083-g85a8939
Message-ID: <20170113190720.13F5FFA2C0@public.kitware.com>

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  85a8939e2fc7eb2715a9264fd40c009c3a98cb8b (commit)
       via  4ae2dcb1b965efac7c088cbf97fa66c4d3c41858 (commit)
      from  63e550e54f577b081d1ccd742ed1bbd02622a671 (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=85a8939e2fc7eb2715a9264fd40c009c3a98cb8b
commit 85a8939e2fc7eb2715a9264fd40c009c3a98cb8b
Merge: 63e550e 4ae2dcb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 13 14:07:17 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 13 14:07:17 2017 -0500

    Merge topic 'docs-function-exists'
    
    4ae2dcb1 CheckFunctionExists: Document suggestion to use CheckSymbolExists instead.


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

Summary of changes:
 Modules/CheckFunctionExists.cmake |   30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 13 14:07:32 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Jan 2017 14:07:32 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.1-2183-g2650902
Message-ID: <20170113190732.E7D34FA2BF@public.kitware.com>

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  2650902e29becd6442d99ec47b9e8f76ecb3d59f (commit)
       via  85a8939e2fc7eb2715a9264fd40c009c3a98cb8b (commit)
      from  6a935bd4adac8521da3988ff7b1202ed31ee2411 (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=2650902e29becd6442d99ec47b9e8f76ecb3d59f
commit 2650902e29becd6442d99ec47b9e8f76ecb3d59f
Merge: 6a935bd 85a8939
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 13 14:07:25 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 13 14:07:25 2017 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From robert.maynard at kitware.com  Fri Jan 13 14:21:04 2017
From: robert.maynard at kitware.com (Robert Maynard)
Date: Fri, 13 Jan 2017 14:21:04 -0500 (EST)
Subject: [Cmake-commits] CMake annotated tag, v3.7.2, created. v3.7.2
Message-ID: <20170113192105.1568FF9D8B@public.kitware.com>

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 annotated tag, v3.7.2 has been created
        at  833dd96db6829aebc05ed21895ded0ed8981adc9 (tag)
   tagging  35413bf2c1b33980afd418030af27f184872af6b (commit)
  replaces  v3.7.1
 tagged by  Brad King
        on  Fri Jan 13 10:19:44 2017 -0500

- Log -----------------------------------------------------------------
CMake 3.7.2
-----BEGIN PGP SIGNATURE-----

iQJKBAABCAA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlh48BAWHGJyYWQua2lu
Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhK+mD/4h9d3wQlYJdwKW5CejQTedagxH
mdCNyoAEVJTyndo9LcS9VLcXRopJ8623XxSosWB5szPetHSY9fJwqqK6Sz6avVft
S7T2jTX66UB1e1v4bMhHYdTpmAT7Me+S30VTwYspodVmWrvExYYnFyp2gDnfp3WI
23dWOORF8LTry0LNJFd8nLO85nPhgRXqGNafiKG4CKF9pccqDcLQT6isILEEKvXS
mUIM7zoID4Ncg2ZDtLetyGdF5pFWtmR/H9GB8svTZuiDDgWwKEWuLpW38B7ljMIQ
+f1Jc5/RW6LL3MTYpZGQQzBsZSH69Ze7Afth9VMXaioyegJ8rywUuNXNbHfjhWCX
gGs0jeI604BQ6wD1/A1xG6RNGOVmYd4CX5vlRr1zkWVG8JNSpNfoyKgdxVs8tJCt
iYO4QY+eFENfh2NLk3gG3X1tu8yhM7/kE8FTq7ZPVMWUp97HN5Ca5igSPU5JujQW
Ww2Y6jZHakpMHvMONy0v+zrT0HRTYRNQGGOvS22XsB/fS+H+z2r8jrkWfXvggS69
5vd0m7dd9UvxhFIzTisajXZR43gbS8legf/5ot4nWCmOI+I6OAYFfQnGTtdSD+9L
kDaQwYzklBf8+LNeHU0SHxK6VaFhoCAl88Zkw886vxz4Z1lfuz9tJRg0zdfOYmht
VKy76K/VHR4FdERuOw==
=0V1v
-----END PGP SIGNATURE-----

Aleix Pol (1):
      cmake-server: Do not try watching subdirectories with empty names

Brad King (13):
      Merge branch 'cmake-server-pad-arguments' into release
      VS: Add v141 flag table entry for `-Zc:inline-`
      VS: Add v140 flag table entries for `-Zc:inline[-]`
      Merge branch 'vs-Zc-inline' into release
      VS: Fix standalone Windows7.1SDK toolset selection
      Merge branch 'vs-fix-standalone-Windows7.1SDK-toolset' into release
      Merge branch 'FindBoost-vs15' into release
      Merge branch 'mr-reset-error-flag-on-configure' into release
      Merge branch 'cmake-server-do-not-crash-on-interface-lib' into release
      Merge branch 'pgsql-yum' into release
      Merge branch 'FindBoost-1.63' into release
      Merge branch 'cmFileMonitor-skip-empty-names' into release
      CMake 3.7.2

Roger Leigh (1):
      FindBoost: Add support for 1.63

Rolf Eike Beer (1):
      FindPostgreSQL: automatically find installations from yum.postgresql.org

Tobias Hunger (3):
      server-mode: Do not ignore the first cacheArgument on configure
      server-mode: Call ResetErrorOccured before configure
      server-mode: Do not crash when running into INTERFACE_LIBRARY

Vic Luo (1):
      FindBoost: Add support for VS 2017

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


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sat Jan 14 00:01:11 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Sat, 14 Jan 2017 00:01:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1064-gb3d675f
Message-ID: <20170114050112.000CFF9FB9@public.kitware.com>

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  b3d675f1cbd60a41936b517356e657e826434555 (commit)
      from  85a8939e2fc7eb2715a9264fd40c009c3a98cb8b (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=b3d675f1cbd60a41936b517356e657e826434555
commit b3d675f1cbd60a41936b517356e657e826434555
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sat Jan 14 00:01:06 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sat Jan 14 00:01:06 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 5ac4cf1..ddd3249 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 20170113)
+set(CMake_VERSION_PATCH 20170114)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sun Jan 15 00:01:11 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Sun, 15 Jan 2017 00:01:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1065-gbe5b310
Message-ID: <20170115050111.1B782FA21C@public.kitware.com>

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  be5b310cca242dfba9203ae07ed1d76a1b240d48 (commit)
      from  b3d675f1cbd60a41936b517356e657e826434555 (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=be5b310cca242dfba9203ae07ed1d76a1b240d48
commit be5b310cca242dfba9203ae07ed1d76a1b240d48
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sun Jan 15 00:01:05 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun Jan 15 00:01:05 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index ddd3249..da7f3f1 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 20170114)
+set(CMake_VERSION_PATCH 20170115)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Mon Jan 16 00:01:07 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Mon, 16 Jan 2017 00:01:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1066-g7bd1d53
Message-ID: <20170116050107.66A5AFA1F9@public.kitware.com>

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  7bd1d53505045bfa97f573f7b587514012618913 (commit)
      from  be5b310cca242dfba9203ae07ed1d76a1b240d48 (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=7bd1d53505045bfa97f573f7b587514012618913
commit 7bd1d53505045bfa97f573f7b587514012618913
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Mon Jan 16 00:01:04 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jan 16 00:01:04 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index da7f3f1..0c64d70 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 20170115)
+set(CMake_VERSION_PATCH 20170116)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 10:49:19 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 10:49:19 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2165-g6467c32
Message-ID: <20170116154919.B5E26F9234@public.kitware.com>

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  6467c32f052d977cfc7bc93c02c20103954225f7 (commit)
       via  2bba0bfc2c113a1ec94802ecfb8a836a385f919b (commit)
      from  2650902e29becd6442d99ec47b9e8f76ecb3d59f (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=6467c32f052d977cfc7bc93c02c20103954225f7
commit 6467c32f052d977cfc7bc93c02c20103954225f7
Merge: 2650902 2bba0bf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 10:49:18 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 10:49:18 2017 -0500

    Merge topic 'file-GLOB-empty-no-crash' into next
    
    2bba0bfc file: Fix crash on GLOB with no expressions after LIST_DIRECTORIES


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2bba0bfc2c113a1ec94802ecfb8a836a385f919b
commit 2bba0bfc2c113a1ec94802ecfb8a836a385f919b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 10:37:42 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 16 10:47:32 2017 -0500

    file: Fix crash on GLOB with no expressions after LIST_DIRECTORIES
    
    Since commit v3.3.0-rc1~318^2~1 (file: Teach GLOB to list directories
    optionally, 2015-03-17) using `LIST_DIRECTORIES` followed by no
    expression causes a crash.  Fix the logic to avoid the crash.
    
    Fixes: #16565

diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index d10c886..91cecb3 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -788,7 +788,7 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args,
         this->SetError("LIST_DIRECTORIES missing bool value.");
         return false;
       }
-      ++i;
+      continue;
     }
 
     if (recurse && (*i == "FOLLOW_SYMLINKS")) {
diff --git a/Tests/RunCMake/file/GLOB-noexp-LIST_DIRECTORIES.cmake b/Tests/RunCMake/file/GLOB-noexp-LIST_DIRECTORIES.cmake
new file mode 100644
index 0000000..37a9d54
--- /dev/null
+++ b/Tests/RunCMake/file/GLOB-noexp-LIST_DIRECTORIES.cmake
@@ -0,0 +1 @@
+file(GLOB CONTENT_LIST LIST_DIRECTORIES false)
diff --git a/Tests/RunCMake/file/RunCMakeTest.cmake b/Tests/RunCMake/file/RunCMakeTest.cmake
index 48fa757..7497544 100644
--- a/Tests/RunCMake/file/RunCMakeTest.cmake
+++ b/Tests/RunCMake/file/RunCMakeTest.cmake
@@ -31,6 +31,7 @@ run_cmake(GLOB_RECURSE)
 run_cmake(GLOB-error-LIST_DIRECTORIES-not-boolean)
 # test is valid both for GLOB and GLOB_RECURSE
 run_cmake(GLOB-error-LIST_DIRECTORIES-no-arg)
+run_cmake(GLOB-noexp-LIST_DIRECTORIES)
 
 if(NOT WIN32 OR CYGWIN)
   run_cmake(GLOB_RECURSE-cyclic-recursion)

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

Summary of changes:
 Source/cmFileCommand.cxx                              |    2 +-
 Tests/RunCMake/file/GLOB-noexp-LIST_DIRECTORIES.cmake |    1 +
 Tests/RunCMake/file/RunCMakeTest.cmake                |    1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 Tests/RunCMake/file/GLOB-noexp-LIST_DIRECTORIES.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 10:53:10 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 10:53:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2167-g412a4c6
Message-ID: <20170116155310.D9DF2F9AF4@public.kitware.com>

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  412a4c64d8fcc06f69c2bc4ed53813c07111aecd (commit)
       via  b42330be21c0d3046aa0e6fdf046a492bddef520 (commit)
      from  6467c32f052d977cfc7bc93c02c20103954225f7 (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=412a4c64d8fcc06f69c2bc4ed53813c07111aecd
commit 412a4c64d8fcc06f69c2bc4ed53813c07111aecd
Merge: 6467c32 b42330b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 10:53:10 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 10:53:10 2017 -0500

    Merge topic 'source_group-tree' into next
    
    b42330be source_group: Add options create groups matching directory tree


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b42330be21c0d3046aa0e6fdf046a492bddef520
commit b42330be21c0d3046aa0e6fdf046a492bddef520
Author:     Mateusz Janek <stryku2393 at gmail.com>
AuthorDate: Wed Dec 21 15:27:49 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 16 10:52:48 2017 -0500

    source_group: Add options create groups matching directory tree
    
    Add `TREE` and `PREFIX` arguments to enable this behavior.

diff --git a/Help/command/source_group.rst b/Help/command/source_group.rst
index 6e3829c..938ca40 100644
--- a/Help/command/source_group.rst
+++ b/Help/command/source_group.rst
@@ -2,15 +2,27 @@ source_group
 ------------
 
 Define a grouping for source files in IDE project generation.
+There are two different signatures to create source groups.
 
-.. code-block:: cmake
+::
 
   source_group(<name> [FILES <src>...] [REGULAR_EXPRESSION <regex>])
+  source_group(TREE <root> [PREFIX <prefix>] [FILES <src>...])
 
 Defines a group into which sources will be placed in project files.
 This is intended to set up file tabs in Visual Studio.
 The options are:
 
+``TREE``
+ CMake will automatically detect, from ``<src>`` files paths, source groups
+ it needs to create, to keep structure of source groups analogically to the
+ actual files and directories structure in the project. Paths of ``<src>``
+ files will be cut to be relative to ``<root>``.
+
+``PREFIX``
+ Source group and files located directly in ``<root>`` path, will be placed
+ in ``<prefix>`` source groups.
+
 ``FILES``
  Any source file specified explicitly will be placed in group
  ``<name>``.  Relative paths are interpreted with respect to the
@@ -25,11 +37,13 @@ explicitly lists the file with ``FILES`` will be favored, if any.
 If no group explicitly lists the file, the *last* group whose
 regular expression matches the file will be favored.
 
-The ``<name>`` of the group may contain backslashes to specify subgroups:
+The ``<name>`` of the group and ``<prefix>`` argument may contain backslashes
+to specify subgroups:
 
 .. code-block:: cmake
 
   source_group(outer\\inner ...)
+  source_group(TREE <root> PREFIX sources\\inc ...)
 
 For backwards compatibility, the short-hand signature
 
diff --git a/Help/release/dev/source_group-tree.rst b/Help/release/dev/source_group-tree.rst
new file mode 100644
index 0000000..c5fec1d
--- /dev/null
+++ b/Help/release/dev/source_group-tree.rst
@@ -0,0 +1,5 @@
+source_group-tree
+-----------------
+
+* The :command:`source_group` command gained ``TREE`` and ``PREFIX``
+  options to add groups following source tree directory structure.
diff --git a/Source/cmSourceGroupCommand.cxx b/Source/cmSourceGroupCommand.cxx
index 3f20d4e..5555199 100644
--- a/Source/cmSourceGroupCommand.cxx
+++ b/Source/cmSourceGroupCommand.cxx
@@ -8,6 +8,99 @@
 #include "cmSourceGroup.h"
 #include "cmSystemTools.h"
 
+namespace {
+const size_t RootIndex = 1;
+const size_t FilesWithoutPrefixKeywordIndex = 2;
+const size_t FilesWithPrefixKeywordIndex = 4;
+const size_t PrefixKeywordIdex = 2;
+
+std::vector<std::string> tokenizePath(const std::string& path)
+{
+  return cmSystemTools::tokenize(path, "\\/");
+}
+
+std::string getFullFilePath(const std::string& currentPath,
+                            const std::string& path)
+{
+  std::string fullPath = path;
+
+  if (!cmSystemTools::FileIsFullPath(path.c_str())) {
+    fullPath = currentPath;
+    fullPath += "/";
+    fullPath += path;
+  }
+
+  return cmSystemTools::CollapseFullPath(fullPath);
+}
+
+std::set<std::string> getSourceGroupFilesPaths(
+  const std::string& currentPath, const std::string& root,
+  const std::vector<std::string>& files)
+{
+  std::set<std::string> ret;
+  const std::string::size_type rootLength = root.length();
+
+  for (size_t i = 0; i < files.size(); ++i) {
+    const std::string fullPath = getFullFilePath(currentPath, files[i]);
+
+    ret.insert(fullPath.substr(rootLength + 1)); // +1 to also omnit last '/'
+  }
+
+  return ret;
+}
+
+cmSourceGroup* addSourceGroup(const std::vector<std::string>& tokenizedPath,
+                              cmMakefile& makefile)
+{
+  cmSourceGroup* sg;
+
+  sg = makefile.GetSourceGroup(tokenizedPath);
+  if (!sg) {
+    makefile.AddSourceGroup(tokenizedPath);
+    sg = makefile.GetSourceGroup(tokenizedPath);
+    if (!sg) {
+      return CM_NULLPTR;
+    }
+  }
+
+  return sg;
+}
+
+bool addFilesToItsSourceGroups(const std::set<std::string>& sgFilesPaths,
+                               const std::string& prefix, cmMakefile& makefile,
+                               std::string& errorMsg)
+{
+  cmSourceGroup* sg;
+
+  for (std::set<std::string>::const_iterator it = sgFilesPaths.begin();
+       it != sgFilesPaths.end(); ++it) {
+
+    std::vector<std::string> tokenizedPath;
+    if (!prefix.empty()) {
+      tokenizedPath = tokenizePath(prefix + '/' + *it);
+    } else {
+      tokenizedPath = tokenizePath(*it);
+    }
+
+    if (tokenizedPath.size() > 1) {
+      tokenizedPath.pop_back();
+
+      sg = addSourceGroup(tokenizedPath, makefile);
+
+      if (!sg) {
+        errorMsg = "Could not create source group for file: " + *it;
+        return false;
+      }
+      const std::string fullPath =
+        getFullFilePath(makefile.GetCurrentSourceDirectory(), *it);
+      sg->AddGroupFile(fullPath);
+    }
+  }
+
+  return true;
+}
+}
+
 class cmExecutionStatus;
 
 // cmSourceGroupCommand
@@ -19,6 +112,17 @@ bool cmSourceGroupCommand::InitialPass(std::vector<std::string> const& args,
     return false;
   }
 
+  if (args[0] == "TREE") {
+    std::string error;
+
+    if (!processTree(args, error)) {
+      this->SetError(error);
+      return false;
+    }
+
+    return true;
+  }
+
   std::string delimiter = "\\";
   if (this->Makefile->GetDefinition("SOURCE_GROUP_DELIMITER")) {
     delimiter = this->Makefile->GetDefinition("SOURCE_GROUP_DELIMITER");
@@ -82,3 +186,64 @@ bool cmSourceGroupCommand::InitialPass(std::vector<std::string> const& args,
 
   return true;
 }
+
+bool cmSourceGroupCommand::checkTreeArgumentsPreconditions(
+  const std::vector<std::string>& args, std::string& errorMsg) const
+{
+  if (args.size() == 1) {
+    errorMsg = "TREE argument given without a root.";
+    return false;
+  }
+
+  if (args.size() < 3) {
+    errorMsg = "Missing FILES arguments.";
+    return false;
+  }
+
+  if (args[FilesWithoutPrefixKeywordIndex] != "FILES" &&
+      args[PrefixKeywordIdex] != "PREFIX") {
+    errorMsg = "Unknown argument \"" + args[2] +
+      "\". Perhaps the FILES keyword is missing.\n";
+    return false;
+  }
+
+  if (args[PrefixKeywordIdex] == "PREFIX" &&
+      (args.size() < 5 || args[FilesWithPrefixKeywordIndex] != "FILES")) {
+    errorMsg = "Missing FILES arguments.";
+    return false;
+  }
+
+  return true;
+}
+
+bool cmSourceGroupCommand::processTree(const std::vector<std::string>& args,
+                                       std::string& errorMsg)
+{
+  if (!checkTreeArgumentsPreconditions(args, errorMsg)) {
+    return false;
+  }
+
+  const std::string root = cmSystemTools::CollapseFullPath(args[RootIndex]);
+  std::string prefix;
+  size_t filesBegin = FilesWithoutPrefixKeywordIndex + 1;
+  if (args[PrefixKeywordIdex] == "PREFIX") {
+    prefix = args[PrefixKeywordIdex + 1];
+    filesBegin = FilesWithPrefixKeywordIndex + 1;
+  }
+
+  const std::vector<std::string> filesVector(args.begin() + filesBegin,
+                                             args.end());
+
+  std::set<std::string> sourceGroupPaths = getSourceGroupFilesPaths(
+    this->Makefile->GetCurrentSourceDirectory(), root, filesVector);
+
+  addFilesToItsSourceGroups(sourceGroupPaths, prefix, *(this->Makefile),
+                            errorMsg);
+
+  if (!errorMsg.empty()) {
+    this->SetError(errorMsg);
+    return false;
+  }
+
+  return true;
+}
diff --git a/Source/cmSourceGroupCommand.h b/Source/cmSourceGroupCommand.h
index f533be1..5549096 100644
--- a/Source/cmSourceGroupCommand.h
+++ b/Source/cmSourceGroupCommand.h
@@ -36,6 +36,12 @@ public:
    * The name of the command as specified in CMakeList.txt.
    */
   std::string GetName() const CM_OVERRIDE { return "source_group"; }
+
+private:
+  bool processTree(const std::vector<std::string>& args,
+                   std::string& errorMsg);
+  bool checkTreeArgumentsPreconditions(const std::vector<std::string>& args,
+                                       std::string& errorMsg) const;
 };
 
 #endif
diff --git a/Tests/SourceGroups/CMakeLists.txt b/Tests/SourceGroups/CMakeLists.txt
index 6573c82..9289e84 100644
--- a/Tests/SourceGroups/CMakeLists.txt
+++ b/Tests/SourceGroups/CMakeLists.txt
@@ -30,6 +30,17 @@ source_group(Base\\Sub1\\Base FILES bar.c)
 # a group without files, is currently not created
 source_group(EmptyGroup)
 
+set(root ${CMAKE_CURRENT_SOURCE_DIR})
 
-add_executable(SourceGroups main.c bar.c foo.c sub1/foo.c sub1/foobar.c baz.c README.txt)
+set(tree_files_without_prefix ${root}/sub1/tree_bar.c
+                              ${root}/sub1/tree_baz.c
+                              ${root}/sub1/tree_subdir/tree_foobar.c)
 
+set(tree_files_with_prefix ${root}/tree_foo.c)
+
+source_group(TREE ${root} FILES ${tree_files_without_prefix})
+
+source_group(TREE ${root} PREFIX tree_root/subgroup FILES ${tree_files_with_prefix})
+
+add_executable(SourceGroups main.c bar.c foo.c sub1/foo.c sub1/foobar.c baz.c
+                            ${tree_files_with_prefix} ${tree_files_without_prefix} README.txt)
diff --git a/Tests/SourceGroups/main.c b/Tests/SourceGroups/main.c
index f259f98..b88f2f8 100644
--- a/Tests/SourceGroups/main.c
+++ b/Tests/SourceGroups/main.c
@@ -5,10 +5,17 @@ extern int bar(void);
 extern int foobar(void);
 extern int barbar(void);
 extern int baz(void);
+extern int tree_foo(void);
+extern int tree_bar(void);
+extern int tree_foobar(void);
+extern int tree_baz(void);
 
 int main()
 {
   printf("foo: %d bar: %d foobar: %d barbar: %d baz: %d\n", foo(), bar(),
          foobar(), barbar(), baz());
+
+  printf("tree_foo: %d tree_bar: %d tree_foobar: %d tree_baz: %d\n",
+         tree_foo(), tree_bar(), tree_foobar(), tree_baz());
   return 0;
 }
diff --git a/Tests/SourceGroups/sub1/tree_bar.c b/Tests/SourceGroups/sub1/tree_bar.c
new file mode 100644
index 0000000..6b79239
--- /dev/null
+++ b/Tests/SourceGroups/sub1/tree_bar.c
@@ -0,0 +1,4 @@
+int tree_bar(void)
+{
+  return 8;
+}
diff --git a/Tests/SourceGroups/sub1/tree_baz.c b/Tests/SourceGroups/sub1/tree_baz.c
new file mode 100644
index 0000000..27ff5ab
--- /dev/null
+++ b/Tests/SourceGroups/sub1/tree_baz.c
@@ -0,0 +1,4 @@
+int tree_baz(void)
+{
+  return 9;
+}
diff --git a/Tests/SourceGroups/sub1/tree_subdir/tree_foobar.c b/Tests/SourceGroups/sub1/tree_subdir/tree_foobar.c
new file mode 100644
index 0000000..e955e04
--- /dev/null
+++ b/Tests/SourceGroups/sub1/tree_subdir/tree_foobar.c
@@ -0,0 +1,4 @@
+int tree_foobar(void)
+{
+  return 7;
+}
diff --git a/Tests/SourceGroups/tree_foo.c b/Tests/SourceGroups/tree_foo.c
new file mode 100644
index 0000000..d392e41
--- /dev/null
+++ b/Tests/SourceGroups/tree_foo.c
@@ -0,0 +1,4 @@
+int tree_foo(void)
+{
+  return 6;
+}

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:01:02 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:01:02 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1068-g2ad4052
Message-ID: <20170116160102.0C080F9F52@public.kitware.com>

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  2ad405202e811affb9961f96a90d319d49a88b11 (commit)
       via  cda9a904b5ef76d923a072a45c0c15fd1d87d6be (commit)
      from  7bd1d53505045bfa97f573f7b587514012618913 (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=2ad405202e811affb9961f96a90d319d49a88b11
commit 2ad405202e811affb9961f96a90d319d49a88b11
Merge: 7bd1d53 cda9a90
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:00:59 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:00:59 2017 -0500

    Merge topic 'sparc-libatomic'
    
    cda9a904 Explicitly link against libatomic on Linux/sparc for `__atomic_fetch_add_4`


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

Summary of changes:
 Source/CMakeLists.txt |    9 +++++++++
 1 file changed, 9 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:01:05 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:01:05 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1070-g0f3bb10
Message-ID: <20170116160105.1A2FCF9D11@public.kitware.com>

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  0f3bb10dbe253ddeabe1b7006b46d813de61dd01 (commit)
       via  a10586377232b28be13c2bf90c98d002067eb5fc (commit)
      from  2ad405202e811affb9961f96a90d319d49a88b11 (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=0f3bb10dbe253ddeabe1b7006b46d813de61dd01
commit 0f3bb10dbe253ddeabe1b7006b46d813de61dd01
Merge: 2ad4052 a105863
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:01:02 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:01:02 2017 -0500

    Merge topic 'fix_repeat_until_fail_duplicated_output'
    
    a1058637 CTest: Properly reset output to avoid duplication with --repeat-until-fail


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

Summary of changes:
 Source/CTest/cmCTestRunTest.cxx                               |    2 ++
 Tests/RunCMake/CTestCommandLine/repeat-until-fail-cmake.cmake |    2 ++
 2 files changed, 4 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:01:08 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:01:08 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1072-g034e172
Message-ID: <20170116160108.07944F9F70@public.kitware.com>

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  034e1723dbb29082eed3f1df9d0cb846a89b4b91 (commit)
       via  9fe399e3894dccce158b445c9ec4f2253035eaa0 (commit)
      from  0f3bb10dbe253ddeabe1b7006b46d813de61dd01 (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=034e1723dbb29082eed3f1df9d0cb846a89b4b91
commit 034e1723dbb29082eed3f1df9d0cb846a89b4b91
Merge: 0f3bb10 9fe399e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:01:05 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:01:05 2017 -0500

    Merge topic 'clang-3.1-3.3-cpp11'
    
    9fe399e3 Features: activate C++11 support for Clang 3.1+


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

Summary of changes:
 Modules/Compiler/Clang-CXX-FeatureTests.cmake |    3 +--
 Modules/Compiler/Clang-CXX.cmake              |    6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:01:11 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:01:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1074-g4680e46
Message-ID: <20170116160111.25918F9F7B@public.kitware.com>

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  4680e469f6a6f5cd1a0791d200dfe48c0324f38f (commit)
       via  4971799360b5ec7c99f94810f2fa5cb9f80dcebf (commit)
      from  034e1723dbb29082eed3f1df9d0cb846a89b4b91 (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=4680e469f6a6f5cd1a0791d200dfe48c0324f38f
commit 4680e469f6a6f5cd1a0791d200dfe48c0324f38f
Merge: 034e172 4971799
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:01:08 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:01:08 2017 -0500

    Merge topic 'usage-cpack-ifw-configure-file'
    
    49717993 QtIFW: Improved packaging


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

Summary of changes:
 CMakeCPack.cmake                                   |   45 ++++++++++--------
 CMakeCPackOptions.cmake.in                         |    2 +-
 Packaging/QtSDK/ToolsCMakeXX.cmake                 |   49 ++++++--------------
 Packaging/QtSDK/qt.tools.cmake.xx.qs.in            |   12 ++---
 Source/QtIFW/CMake.DeveloperReference.HTML.qs.in   |    4 +-
 ....Dialogs.QtGUI.qs => CMake.Dialogs.QtGUI.qs.in} |    4 +-
 Source/QtIFW/CMake.Documentation.SphinxHTML.qs.in  |    4 +-
 Source/QtIFW/CMake.qs.in                           |   10 ++--
 Source/QtIFW/installscript.qs.in                   |   12 +++--
 9 files changed, 65 insertions(+), 77 deletions(-)
 rename Source/QtIFW/{CMake.Dialogs.QtGUI.qs => CMake.Dialogs.QtGUI.qs.in} (65%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:01:14 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:01:14 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1077-g8a8aff6
Message-ID: <20170116160114.0C8C7F9F84@public.kitware.com>

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  8a8aff612c77e03358601a9c5d8941e518f82d1c (commit)
       via  0362c60fe5f4e7e4011f14dc2519ffb1bc6c8ce8 (commit)
       via  577f721fb70bbf6c29c40d5f10d4319370ccb1f8 (commit)
      from  4680e469f6a6f5cd1a0791d200dfe48c0324f38f (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=8a8aff612c77e03358601a9c5d8941e518f82d1c
commit 8a8aff612c77e03358601a9c5d8941e518f82d1c
Merge: 4680e46 0362c60
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:01:11 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:01:11 2017 -0500

    Merge topic 'vs15-detect-from-installer'
    
    0362c60f cmVSSetupHelper: Simplify use of EnumerateAndChooseVSInstance
    577f721f VS: Fix detection of VS 2017 installation with WindowsStore


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

Summary of changes:
 Source/cmVSSetupHelper.cxx |   43 +++++++------------------------------------
 1 file changed, 7 insertions(+), 36 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:01:16 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:01:16 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1079-g94332a3
Message-ID: <20170116160116.E2172F9F71@public.kitware.com>

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  94332a3ed8398202e4d8f985bcfba31ea0fa71e6 (commit)
       via  47ffa0ea5d6cf08bd891d889ce67bee8008ebd8c (commit)
      from  8a8aff612c77e03358601a9c5d8941e518f82d1c (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=94332a3ed8398202e4d8f985bcfba31ea0fa71e6
commit 94332a3ed8398202e4d8f985bcfba31ea0fa71e6
Merge: 8a8aff6 47ffa0e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:01:14 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:01:14 2017 -0500

    Merge topic 'ninja-no-static-lib-def-file'
    
    47ffa0ea Ninja: Do not use module definition `.def` files for static libraries


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

Summary of changes:
 Source/cmCommonTargetGenerator.cxx |    7 +++++++
 1 file changed, 7 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:01:20 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:01:20 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1082-g743085a
Message-ID: <20170116160120.36185F9F7B@public.kitware.com>

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  743085a5795ae666a56a3eeea59c5467a0b714a8 (commit)
       via  8d1f9e5b850e02d304e4c209e720f06e25837470 (commit)
       via  dc5051f1c1b7604b9c05e04bdccdff222b69efa0 (commit)
      from  94332a3ed8398202e4d8f985bcfba31ea0fa71e6 (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=743085a5795ae666a56a3eeea59c5467a0b714a8
commit 743085a5795ae666a56a3eeea59c5467a0b714a8
Merge: 94332a3 8d1f9e5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:01:17 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:01:17 2017 -0500

    Merge topic 'cuda_propagate_flags_when_dlink_on_executables'
    
    8d1f9e5b CUDA: Now pass correct FLAGS when device link cuda executables.
    dc5051f1 CUDA: Test that CUDA flags are used when device linking executables.


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

Summary of changes:
 Modules/CMakeCUDACompiler.cmake.in                 |    2 ++
 Modules/CMakeCUDAInformation.cmake                 |    2 +-
 Modules/Platform/Windows-NVIDIA-CUDA.cmake         |    2 +-
 Source/cmLinkLineComputer.cxx                      |    6 ++++++
 Source/cmLinkLineComputer.h                        |    4 ++++
 Source/cmLinkLineDeviceComputer.cxx                |    6 ++++++
 Source/cmLinkLineDeviceComputer.h                  |    3 +++
 Source/cmLocalGenerator.cxx                        |    5 ++++-
 Tests/Cuda/CMakeLists.txt                          |    1 +
 Tests/Cuda/ProperLinkFlags/CMakeLists.txt          |   20 ++++++++++++++++++++
 Tests/Cuda/{Complex => ProperLinkFlags}/file1.cu   |    1 +
 Tests/Cuda/{Complex => ProperLinkFlags}/file1.h    |    0
 .../main.cpp => Cuda/ProperLinkFlags/main.cxx}     |    4 ++++
 13 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 Tests/Cuda/ProperLinkFlags/CMakeLists.txt
 copy Tests/Cuda/{Complex => ProperLinkFlags}/file1.cu (90%)
 copy Tests/Cuda/{Complex => ProperLinkFlags}/file1.h (100%)
 copy Tests/{RunCMake/CompatibleInterface/main.cpp => Cuda/ProperLinkFlags/main.cxx} (54%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:01:23 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:01:23 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1084-g4433be6
Message-ID: <20170116160123.09408F9F71@public.kitware.com>

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  4433be6bce6f69d26dee1e2a4213e409bde66a21 (commit)
       via  05dbc940b7e19cdccd7ec73ea173719be66244e1 (commit)
      from  743085a5795ae666a56a3eeea59c5467a0b714a8 (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=4433be6bce6f69d26dee1e2a4213e409bde66a21
commit 4433be6bce6f69d26dee1e2a4213e409bde66a21
Merge: 743085a 05dbc94
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:01:20 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:01:20 2017 -0500

    Merge topic 'cuda-no-def-file-for-device'
    
    05dbc940 CUDA: Don't use module definition `.def` files for device linking


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

Summary of changes:
 Source/cmMakefileExecutableTargetGenerator.cxx |    9 ---------
 Source/cmNinjaNormalTargetGenerator.cxx        |    1 -
 2 files changed, 10 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:01:25 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:01:25 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1086-g9aa2ec7
Message-ID: <20170116160125.C1658F9F66@public.kitware.com>

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  9aa2ec7787968528a6612aeedcf0485700ef8445 (commit)
       via  1b63ce865e86596ad7df3cf39df827434c986f22 (commit)
      from  4433be6bce6f69d26dee1e2a4213e409bde66a21 (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=9aa2ec7787968528a6612aeedcf0485700ef8445
commit 9aa2ec7787968528a6612aeedcf0485700ef8445
Merge: 4433be6 1b63ce8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:01:23 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:01:23 2017 -0500

    Merge topic 'fast-local-and-strip-install'
    
    1b63ce86 Makefiles: Make fast local and strip install truly fast


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

Summary of changes:
 Source/cmLocalUnixMakefileGenerator3.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:01:28 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:01:28 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1106-ga67baf0
Message-ID: <20170116160129.24A98F9F71@public.kitware.com>

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  a67baf0af0f5c94eeab400a163b8b2f6824d7bab (commit)
       via  bb670d9625e670a0e87ec048e44db39b9d2b336f (commit)
       via  3f86032bdab94e219d053c10b7e55eba9c06e562 (commit)
       via  f24e1d37cef95145927d14d186e1615fca23a75b (commit)
       via  f27c5852b0d1e37fb27bd1da1e7295b5f1fc963d (commit)
       via  d7d2cb48c69e2a9da72a8baf188f02b81ec9c34f (commit)
       via  721997a7a23f0cfa5c9e096cc3768625a51f359d (commit)
       via  9f47d32697686265bc2c5a708d2b53e2337f3f10 (commit)
       via  597124ba8e409edc28cbf8f2a55150d2913a50e3 (commit)
       via  2b400b242101fd8b7a46073412830278aa3cc9ec (commit)
       via  edf0b8a52bd4db8557adaf11d7096f7982c373aa (commit)
       via  06430919f4b903ba256ce158caf223f515faa8a4 (commit)
       via  ca179f2afc6d8ab5e0df3e35255155c21a61b5f6 (commit)
       via  119791ae528aace81f6c209e05798c80d8926b3d (commit)
       via  95e4cfc5947fb5a324f6dad50cff8d71f928aba8 (commit)
       via  6c55755bdd54c2d474e2c8fe4c9d078e10404f26 (commit)
       via  1491ab1c6626ed6a3b67e74b94fd18230e1bb4d4 (commit)
       via  29112c9a695a8dce6486203d0415f17ac41d3a0b (commit)
       via  6d333be14d23b9aaf4452189199134bd674ad395 (commit)
       via  52688bf7453cdb767e231f5fdc7d80ce79ae239d (commit)
      from  9aa2ec7787968528a6612aeedcf0485700ef8445 (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=a67baf0af0f5c94eeab400a163b8b2f6824d7bab
commit a67baf0af0f5c94eeab400a163b8b2f6824d7bab
Merge: 9aa2ec7 bb670d9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:01:26 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:01:26 2017 -0500

    Merge topic 'Autogen_Config'
    
    bb670d96 Autogen: Generators: Remove space
    3f86032b Autogen: Generators: Rename requiresMocing method
    f24e1d37 Autogen: Generators: Fix clang-tidy readability-else-after-return
    f27c5852 Autogen: Initializer: Add old settings file to clean files
    d7d2cb48 Autogen: Generators: Save the UIC/RCC settings that were actually used
    721997a7 Autogen: Generators: Dedicated generateAll variables for MOC/UIC/RCC
    9f47d326 Autogen: Generators: Save the MOC settings that were actually used
    597124ba Autogen: Generators: Add function to read makefile definitions config aware
    2b400b24 Autogen: Generators: Move moc/uic/rcc executable test to generate method
    edf0b8a5 Autogen: Generators: Rename GenerateFoo methods to FooGenerate
    06430919 Autogen: Generators: Use FileAbsentOrOlder for UIC tests
    ca179f2a Autogen: Generators: Use FileAbsentOrOlder for MOC tests
    119791ae Autogen: Generators: Introduce FileAbsentOrOlder function
    95e4cfc5 Autogen: Generators: Simplify (and fix) JoinExts function
    6c55755b Autogen: Generators: Make class static method a source static function
    1491ab1c Autogen: Generators: Make class static method a source static function
    ...


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

Summary of changes:
 Source/cmQtAutoGeneratorInitializer.cxx |    8 +
 Source/cmQtAutoGenerators.cxx           |  699 ++++++++++++++++++-------------
 Source/cmQtAutoGenerators.h             |   84 ++--
 3 files changed, 451 insertions(+), 340 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:01:38 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:01:38 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1110-g47d391d
Message-ID: <20170116160138.21ACDF9F71@public.kitware.com>

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  47d391d71d611c5129c6914ad77b34dc4bb79d75 (commit)
       via  397b854620fc1ab3d8427ebeb5b7e4659c4f9128 (commit)
       via  a7dd8e669289e7b78ebc05b5d337052f32582038 (commit)
       via  6fda6005b306cc4a1e9e9e66d9cd4525fc623f73 (commit)
      from  a67baf0af0f5c94eeab400a163b8b2f6824d7bab (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=47d391d71d611c5129c6914ad77b34dc4bb79d75
commit 47d391d71d611c5129c6914ad77b34dc4bb79d75
Merge: a67baf0 397b854
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:01:29 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:01:29 2017 -0500

    Merge topic 'csharp_simple'
    
    397b8546 VS: added documentation for C# support
    a7dd8e66 VS: added support for C# (for Visual Studio 2010, 2012, 2013, 2015)
    6fda6005 VS: renamed target property VS_USER_PROPS_CXX to VS_USER_PROPS


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

Summary of changes:
 Help/manual/cmake-properties.7.rst                 |    2 +-
 .../{VS_USER_PROPS_CXX.rst => VS_USER_PROPS.rst}   |    4 +-
 Help/release/dev/vs-csharp-support.rst             |   25 ++
 Help/release/dev/vs-custom-msbuild-props.rst       |    2 +-
 Modules/CMakeTestCSharpCompiler.cmake              |    4 -
 Source/cmVisualStudio10TargetGenerator.cxx         |  434 ++++++++++++++++----
 Source/cmVisualStudio10TargetGenerator.h           |    1 +
 Tests/CMakeLists.txt                               |    3 +
 Tests/CSharpOnly/CMakeLists.txt                    |   10 +
 Tests/CSharpOnly/csharponly.cs                     |   15 +
 Tests/CSharpOnly/lib1.cs                           |   10 +
 Tests/CSharpOnly/lib2.cs                           |   10 +
 Tests/RunCMake/VS10Project/VsCustomProps.cmake     |    2 +-
 13 files changed, 442 insertions(+), 80 deletions(-)
 rename Help/prop_tgt/{VS_USER_PROPS_CXX.rst => VS_USER_PROPS.rst} (92%)
 create mode 100644 Help/release/dev/vs-csharp-support.rst
 create mode 100644 Tests/CSharpOnly/CMakeLists.txt
 create mode 100644 Tests/CSharpOnly/csharponly.cs
 create mode 100644 Tests/CSharpOnly/lib1.cs
 create mode 100644 Tests/CSharpOnly/lib2.cs


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:01:41 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:01:41 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1112-g35ad12f
Message-ID: <20170116160141.43EC1F9FAE@public.kitware.com>

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  35ad12f99e71515f9cc65b1219160b88095a5f6b (commit)
       via  b42330be21c0d3046aa0e6fdf046a492bddef520 (commit)
      from  47d391d71d611c5129c6914ad77b34dc4bb79d75 (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=35ad12f99e71515f9cc65b1219160b88095a5f6b
commit 35ad12f99e71515f9cc65b1219160b88095a5f6b
Merge: 47d391d b42330b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:01:38 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:01:38 2017 -0500

    Merge topic 'source_group-tree'
    
    b42330be source_group: Add options create groups matching directory tree


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

Summary of changes:
 Help/command/source_group.rst                     |   18 ++-
 Help/release/dev/source_group-tree.rst            |    5 +
 Source/cmSourceGroupCommand.cxx                   |  165 +++++++++++++++++++++
 Source/cmSourceGroupCommand.h                     |    6 +
 Tests/SourceGroups/CMakeLists.txt                 |   13 +-
 Tests/SourceGroups/main.c                         |    7 +
 Tests/SourceGroups/sub1/tree_bar.c                |    4 +
 Tests/SourceGroups/sub1/tree_baz.c                |    4 +
 Tests/SourceGroups/sub1/tree_subdir/tree_foobar.c |    4 +
 Tests/SourceGroups/tree_foo.c                     |    4 +
 10 files changed, 227 insertions(+), 3 deletions(-)
 create mode 100644 Help/release/dev/source_group-tree.rst
 create mode 100644 Tests/SourceGroups/sub1/tree_bar.c
 create mode 100644 Tests/SourceGroups/sub1/tree_baz.c
 create mode 100644 Tests/SourceGroups/sub1/tree_subdir/tree_foobar.c
 create mode 100644 Tests/SourceGroups/tree_foo.c


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:02:08 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:02:08 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2183-g4b20cb2
Message-ID: <20170116160208.8A2EAFA111@public.kitware.com>

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  4b20cb2c133792a8f6435a7bda7e585c3dcd20dc (commit)
       via  35ad12f99e71515f9cc65b1219160b88095a5f6b (commit)
       via  47d391d71d611c5129c6914ad77b34dc4bb79d75 (commit)
       via  a67baf0af0f5c94eeab400a163b8b2f6824d7bab (commit)
       via  9aa2ec7787968528a6612aeedcf0485700ef8445 (commit)
       via  4433be6bce6f69d26dee1e2a4213e409bde66a21 (commit)
       via  743085a5795ae666a56a3eeea59c5467a0b714a8 (commit)
       via  94332a3ed8398202e4d8f985bcfba31ea0fa71e6 (commit)
       via  8a8aff612c77e03358601a9c5d8941e518f82d1c (commit)
       via  4680e469f6a6f5cd1a0791d200dfe48c0324f38f (commit)
       via  034e1723dbb29082eed3f1df9d0cb846a89b4b91 (commit)
       via  0f3bb10dbe253ddeabe1b7006b46d813de61dd01 (commit)
       via  2ad405202e811affb9961f96a90d319d49a88b11 (commit)
       via  7bd1d53505045bfa97f573f7b587514012618913 (commit)
       via  be5b310cca242dfba9203ae07ed1d76a1b240d48 (commit)
       via  b3d675f1cbd60a41936b517356e657e826434555 (commit)
      from  412a4c64d8fcc06f69c2bc4ed53813c07111aecd (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=4b20cb2c133792a8f6435a7bda7e585c3dcd20dc
commit 4b20cb2c133792a8f6435a7bda7e585c3dcd20dc
Merge: 412a4c6 35ad12f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:01:57 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 16 11:01:57 2017 -0500

    Merge branch 'master' into next


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:14:50 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:14:50 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2185-gd302561
Message-ID: <20170116161450.73C96F7586@public.kitware.com>

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  d302561cf4715cf26095fa734bbdd81d66aa2251 (commit)
       via  5201a3065b1c49ee2628d95c860b667e9e2b182e (commit)
      from  4b20cb2c133792a8f6435a7bda7e585c3dcd20dc (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=d302561cf4715cf26095fa734bbdd81d66aa2251
commit d302561cf4715cf26095fa734bbdd81d66aa2251
Merge: 4b20cb2 5201a30
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:14:49 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:14:49 2017 -0500

    Merge topic 'findhdf5-libraries-targets' into next
    
    5201a306 FindHDF5: use the target rather than the path


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5201a3065b1c49ee2628d95c860b667e9e2b182e
commit 5201a3065b1c49ee2628d95c860b667e9e2b182e
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jan 4 15:03:42 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 16 11:13:48 2017 -0500

    FindHDF5: use the target rather than the path
    
    On Windows, the `LOCATION` property gets the path to the `.dll` rather
    than the `.lib` which is unsuitable for linking.

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 16764e0..6e5a25e 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -439,8 +439,8 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
                 set(HDF5_${_lang}_LIBRARY ${_lang_location} CACHE PATH
                     "HDF5 ${_lang} library" )
                 mark_as_advanced(HDF5_${_lang}_LIBRARY)
-                list(APPEND HDF5_LIBRARIES ${HDF5_${_lang}_LIBRARY})
-                set(HDF5_${_lang}_LIBRARIES ${HDF5_${_lang}_LIBRARY})
+                list(APPEND HDF5_LIBRARIES ${HDF5_${_lang}_TARGET}${_suffix})
+                set(HDF5_${_lang}_LIBRARIES ${HDF5_${_lang}_TARGET}${_suffix})
                 set(HDF5_${_lang}_FOUND True)
             endif()
             if(FIND_HL)
@@ -449,8 +449,8 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
                     set(HDF5_${_lang}_HL_LIBRARY ${_lang_hl_location} CACHE PATH
                         "HDF5 ${_lang} HL library" )
                     mark_as_advanced(HDF5_${_lang}_HL_LIBRARY)
-                    list(APPEND HDF5_HL_LIBRARIES ${HDF5_${_lang}_HL_LIBRARY})
-                    set(HDF5_${_lang}_HL_LIBRARIES ${HDF5_${_lang}_HL_LIBRARY})
+                    list(APPEND HDF5_HL_LIBRARIES ${HDF5_${_lang}_TARGET}${_suffix})
+                    set(HDF5_${_lang}_HL_LIBRARIES ${HDF5_${_lang}_TARGET}${_suffix})
                     set(HDF5_HL_FOUND True)
                 endif()
             endif()

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:19:07 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:19:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2187-ge0c88bb
Message-ID: <20170116161907.F1467FA001@public.kitware.com>

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  e0c88bb22dc43180f6e101eccf99d01f6da9ae28 (commit)
       via  7cb0a515267709852e4553f742c10edf10e46474 (commit)
      from  d302561cf4715cf26095fa734bbdd81d66aa2251 (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=e0c88bb22dc43180f6e101eccf99d01f6da9ae28
commit e0c88bb22dc43180f6e101eccf99d01f6da9ae28
Merge: d302561 7cb0a51
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:19:06 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:19:06 2017 -0500

    Merge topic 'lang_lint' into next
    
    7cb0a515 Add properties to run the cpplint style checker with the compiler


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7cb0a515267709852e4553f742c10edf10e46474
commit 7cb0a515267709852e4553f742c10edf10e46474
Author:     Jamie Snape <jamie.snape at kitware.com>
AuthorDate: Fri Jan 13 15:15:50 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 16 11:18:21 2017 -0500

    Add properties to run the cpplint style checker with the compiler
    
    Create a `<LANG>_CPPLINT` target property (initialized by a
    `CMAKE_<LANG>_CPPLINT` variable) to specify a `cpplint` style checker
    command line to be run along with the compiler.

diff --git a/Auxiliary/vim/syntax/cmake.vim b/Auxiliary/vim/syntax/cmake.vim
index fabf9c1..1f19cb7 100644
--- a/Auxiliary/vim/syntax/cmake.vim
+++ b/Auxiliary/vim/syntax/cmake.vim
@@ -32,11 +32,11 @@ syn region cmakeArguments start=/(/ end=/)/
 
 syn case match
 syn keyword cmakeProperty
-            \ ABSTRACT ADDITIONAL_MAKE_CLEAN_FILES ADVANCED ALIASED_TARGET ALLOW_DUPLICATE_CUSTOM_TARGETS ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_API ANDROID_API_MIN ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES ANDROID_GUI ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_DEBUG ARCHIVE_OUTPUT_DIRECTORY_RELEASE ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_DEBUG ARCHIVE_OUTPUT_NAME_RELEASE ATTACHED_FILES ATTACHED_FILES_ON_FAIL AUTOGEN_TARGETS_FOLDER AUTOGEN_TARGET_DEPENDS AUTOMOC AUTOMOC_MOC_OPTIONS AUTOMOC_TARGETS_FOLDER AUTORCC AUTORCC_OPTIONS AUTOUIC AUTOUIC_OPTIONS BINARY_DIR BUILD_WITH_INSTALL_RPATH BUNDLE BUNDLE_EXTENSION CACHE_VARIABLES CLEAN_NO_CUSTOM CMAKE_CONFIGURE_DEPENDS CMAKE_CXX_KNOWN_FEATURES CMAKE_C_KNOWN_FEATURES COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN COMPATIBLE_INTERFACE_STRING COMPILE_DEFINITIONS COMPILE_DEFINITIONS_DEBUG COMPILE_DEFINITIONS_RELEASE COMPILE_FEATURES COMPILE_FLAGS COMPILE_OPTIONS COMPILE_PDB_NAME COMPILE_PDB_NAME_DEBUG COMPILE_PDB_NAME_RELEASE COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG COMPILE_PDB_OUTPUT_DIRECTORY_RELEASE COST CPACK_DESKTOP_SHORTCUTS CPACK_NEVER_OVERWRITE CPACK_PERMANENT CPACK_STARTUP_SHORTCUTS CPACK_START_MENU_SHORTCUTS CPACK_WIX_ACL CROSSCOMPILING_EMULATOR CXX_EXTENSIONS CXX_STANDARD CXX_STANDARD_REQUIRED C_EXTENSIONS C_STANDARD C_STANDARD_REQUIRED DEBUG_CONFIGURATIONS DEBUG_POSTFIX DEFINE_SYMBOL DEFINITIONS DEPENDS DISABLED_FEATURES ECLIPSE_EXTRA_NATURES ENABLED_FEATURES ENABLED_LANGUAGES ENABLE_EXPORTS ENVIRONMENT EXCLUDE_FROM_ALL EXCLUDE_FROM_DEFAULT_BUILD EXCLUDE_FROM_DEFAULT_BUILD_DEBUG EXCLUDE_FROM_DEFAULT_BUILD_RELEASE EXPORT_NAME EXTERNAL_OBJECT EchoString FAIL_REGULAR_EXPRESSION FIND_LIBRARY_USE_LIB64_PATHS FIND_LIBRARY_USE_OPENBSD_VERSIONING FOLDER FRAMEWORK FRAMEWORK_VERSION Fortran_FORMAT Fortran_MODULE_DIRECTORY GENERATED GENERATOR_FILE_NAME GLOBAL_DEPENDS_DEBUG_MODE GLOBAL_DEPENDS_NO_CYCLES GNUtoMS HAS_CXX HEADER_FILE_ONLY HELPSTRING IMPLICIT_DEPENDS_INCLUDE_TRANSFORM IMPORTED IMPORTED_CONFIGURATIONS IMPORTED_IMPLIB IMPORTED_IMPLIB_DEBUG IMPORTED_IMPLIB_RELEASE IMPORTED_LINK_DEPENDENT_LIBRARIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUG IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_LANGUAGES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE IMPORTED_LINK_INTERFACE_LIBRARIES IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_MULTIPLICITY IMPORTED_LINK_INTERFACE_MULTIPLICITY_DEBUG IMPORTED_LINK_INTERFACE_MULTIPLICITY_RELEASE IMPORTED_LOCATION IMPORTED_LOCATION_DEBUG IMPORTED_LOCATION_RELEASE IMPORTED_NO_SONAME IMPORTED_NO_SONAME_DEBUG IMPORTED_NO_SONAME_RELEASE IMPORTED_SONAME IMPORTED_SONAME_DEBUG IMPORTED_SONAME_RELEASE IMPORT_PREFIX IMPORT_SUFFIX INCLUDE_DIRECTORIES INCLUDE_REGULAR_EXPRESSION INSTALL_NAME_DIR INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH INTERFACE_AUTOUIC_OPTIONS INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS INTERFACE_INCLUDE_DIRECTORIES INTERFACE_LINK_LIBRARIES INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SOURCES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES INTERPROCEDURAL_OPTIMIZATION INTERPROCEDURAL_OPTIMIZATION_DEBUG INTERPROCEDURAL_OPTIMIZATION_RELEASE IN_TRY_COMPILE JOB_POOLS JOB_POOL_COMPILE JOB_POOL_LINK KEEP_EXTENSION LABELS LANGUAGE LIBRARY_OUTPUT_DIRECTORY LIBRARY_OUTPUT_DIRECTORY_DEBUG LIBRARY_OUTPUT_DIRECTORY_RELEASE LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_DEBUG LIBRARY_OUTPUT_NAME_RELEASE LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED LINK_DIRECTORIES LINK_FLAGS LINK_FLAGS_DEBUG LINK_FLAGS_RELEASE LINK_INTERFACE_LIBRARIES LINK_INTERFACE_LIBRARIES_DEBUG LINK_INTERFACE_LIBRARIES_RELEASE LINK_INTERFACE_MULTIPLICITY LINK_INTERFACE_MULTIPLICITY_DEBUG LINK_INTERFACE_MULTIPLICITY_RELEASE LINK_LIBRARIES LINK_SEARCH_END_STATIC LINK_SEARCH_START_STATIC LISTFILE_STACK LOCATION LOCATION_DEBUG LOCATION_RELEASE MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_PACKAGE_LOCATION MACOSX_RPATH MACROS MAP_IMPORTED_CONFIG_DEBUG MAP_IMPORTED_CONFIG_RELEASE MEASUREMENT MODIFIED NAME NO_SONAME NO_SYSTEM_FROM_IMPORTED OBJECT_DEPENDS OBJECT_OUTPUTS OSX_ARCHITECTURES OSX_ARCHITECTURES_DEBUG OSX_ARCHITECTURES_RELEASE OUTPUT_NAME OUTPUT_NAME_DEBUG OUTPUT_NAME_RELEASE PACKAGES_FOUND PACKAGES_NOT_FOUND PARENT_DIRECTORY PASS_REGULAR_EXPRESSION PDB_NAME PDB_NAME_DEBUG PDB_NAME_RELEASE PDB_OUTPUT_DIRECTORY PDB_OUTPUT_DIRECTORY_DEBUG PDB_OUTPUT_DIRECTORY_RELEASE POSITION_INDEPENDENT_CODE POST_INSTALL_SCRIPT PREDEFINED_TARGETS_FOLDER PREFIX PRE_INSTALL_SCRIPT PRIVATE_HEADER PROCESSORS PROJECT_LABEL PUBLIC_HEADER REPORT_UNDEFINED_PROPERTIES REQUIRED_FILES RESOURCE RESOURCE_LOCK RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK RULE_MESSAGES RUNTIME_OUTPUT_DIRECTORY RUNTIME_OUTPUT_DIRECTORY_DEBUG RUNTIME_OUTPUT_DIRECTORY_RELEASE RUNTIME_OUTPUT_NAME RUNTIME_OUTPUT_NAME_DEBUG RUNTIME_OUTPUT_NAME_RELEASE RUN_SERIAL SKIP_BUILD_RPATH SKIP_RETURN_CODE SOURCES SOURCE_DIR SOVERSION STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_DEBUG STATIC_LIBRARY_FLAGS_RELEASE STRINGS SUFFIX SYMBOLIC TARGET_ARCHIVES_MAY_BE_SHARED_LIBS TARGET_MESSAGES TARGET_SUPPORTS_SHARED_LIBS TEST_INCLUDE_FILE TIMEOUT TYPE USE_FOLDERS VALUE VARIABLES VERSION VISIBILITY_INLINES_HIDDEN VS_DEPLOYMENT_CONTENT VS_DEPLOYMENT_LOCATION VS_DESKTOP_EXTENSIONS_VERSION VS_DOTNET_REFERENCES VS_DOTNET_TARGET_FRAMEWORK_VERSION VS_GLOBAL_KEYWORD VS_GLOBAL_PROJECT_TYPES VS_GLOBAL_ROOTNAMESPACE VS_IOT_EXTENSIONS_VERSION VS_IOT_STARTUP_TASK VS_KEYWORD VS_MOBILE_EXTENSIONS_VERSION VS_SCC_AUXPATH VS_SCC_LOCALPATH VS_SCC_PROJECTNAME VS_SCC_PROVIDER VS_SHADER_ENTRYPOINT VS_SHADER_FLAGS VS_SHADER_MODEL VS_SHADER_TYPE VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES VS_XAML_TYPE WILL_FAIL WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS WORKING_DIRECTORY WRAP_EXCLUDE XCODE_EXPLICIT_FILE_TYPE XCODE_LAST_KNOWN_FILE_TYPE XCTEST
+            \ ABSTRACT ADDITIONAL_MAKE_CLEAN_FILES ADVANCED ALIASED_TARGET ALLOW_DUPLICATE_CUSTOM_TARGETS ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_API ANDROID_API_MIN ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES ANDROID_GUI ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_DEBUG ARCHIVE_OUTPUT_DIRECTORY_RELEASE ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_DEBUG ARCHIVE_OUTPUT_NAME_RELEASE ATTACHED_FILES ATTACHED_FILES_ON_FAIL AUTOGEN_TARGETS_FOLDER AUTOGEN_TARGET_DEPENDS AUTOMOC AUTOMOC_MOC_OPTIONS AUTOMOC_TARGETS_FOLDER AUTORCC AUTORCC_OPTIONS AUTOUIC AUTOUIC_OPTIONS BINARY_DIR BUILD_WITH_INSTALL_RPATH BUNDLE BUNDLE_EXTENSION CACHE_VARIABLES CLEAN_NO_CUSTOM CMAKE_CONFIGURE_DEPENDS CMAKE_CXX_KNOWN_FEATURES CMAKE_C_KNOWN_FEATURES COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN COMPATIBLE_INTERFACE_STRING COMPILE_DEFINITIONS COMPILE_DEFINITIONS_DEBUG COMPILE_DEFINITIONS_RELEASE COMPILE_FEATURES COMPILE_FLAGS COMPILE_OPTIONS COMPILE_PDB_NAME COMPILE_PDB_NAME_DEBUG COMPILE_PDB_NAME_RELEASE COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG COMPILE_PDB_OUTPUT_DIRECTORY_RELEASE COST CPACK_DESKTOP_SHORTCUTS CPACK_NEVER_OVERWRITE CPACK_PERMANENT CPACK_STARTUP_SHORTCUTS CPACK_START_MENU_SHORTCUTS CPACK_WIX_ACL CROSSCOMPILING_EMULATOR CXX_EXTENSIONS CXX_CPPLINT CXX_STANDARD CXX_STANDARD_REQUIRED C_EXTENSIONS C_CPPLINT C_STANDARD C_STANDARD_REQUIRED DEBUG_CONFIGURATIONS DEBUG_POSTFIX DEFINE_SYMBOL DEFINITIONS DEPENDS DISABLED_FEATURES ECLIPSE_EXTRA_NATURES ENABLED_FEATURES ENABLED_LANGUAGES ENABLE_EXPORTS ENVIRONMENT EXCLUDE_FROM_ALL EXCLUDE_FROM_DEFAULT_BUILD EXCLUDE_FROM_DEFAULT_BUILD_DEBUG EXCLUDE_FROM_DEFAULT_BUILD_RELEASE EXPORT_NAME EXTERNAL_OBJECT EchoString FAIL_REGULAR_EXPRESSION FIND_LIBRARY_USE_LIB64_PATHS FIND_LIBRARY_USE_OPENBSD_VERSIONING FOLDER FRAMEWORK FRAMEWORK_VERSION Fortran_FORMAT Fortran_MODULE_DIRECTORY GENERATED GENERATOR_FILE_NAME GLOBAL_DEPENDS_DEBUG_MODE GLOBAL_DEPENDS_NO_CYCLES GNUtoMS HAS_CXX HEADER_FILE_ONLY HELPSTRING IMPLICIT_DEPENDS_INCLUDE_TRANSFORM IMPORTED IMPORTED_CONFIGURATIONS IMPORTED_IMPLIB IMPORTED_IMPLIB_DEBUG IMPORTED_IMPLIB_RELEASE IMPORTED_LINK_DEPENDENT_LIBRARIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUG IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_LANGUAGES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE IMPORTED_LINK_INTERFACE_LIBRARIES IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_MULTIPLICITY IMPORTED_LINK_INTERFACE_MULTIPLICITY_DEBUG IMPORTED_LINK_INTERFACE_MULTIPLICITY_RELEASE IMPORTED_LOCATION IMPORTED_LOCATION_DEBUG IMPORTED_LOCATION_RELEASE IMPORTED_NO_SONAME IMPORTED_NO_SONAME_DEBUG IMPORTED_NO_SONAME_RELEASE IMPORTED_SONAME IMPORTED_SONAME_DEBUG IMPORTED_SONAME_RELEASE IMPORT_PREFIX IMPORT_SUFFIX INCLUDE_DIRECTORIES INCLUDE_REGULAR_EXPRESSION INSTALL_NAME_DIR INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH INTERFACE_AUTOUIC_OPTIONS INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS INTERFACE_INCLUDE_DIRECTORIES INTERFACE_LINK_LIBRARIES INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SOURCES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES INTERPROCEDURAL_OPTIMIZATION INTERPROCEDURAL_OPTIMIZATION_DEBUG INTERPROCEDURAL_OPTIMIZATION_RELEASE IN_TRY_COMPILE JOB_POOLS JOB_POOL_COMPILE JOB_POOL_LINK KEEP_EXTENSION LABELS LANGUAGE LIBRARY_OUTPUT_DIRECTORY LIBRARY_OUTPUT_DIRECTORY_DEBUG LIBRARY_OUTPUT_DIRECTORY_RELEASE LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_DEBUG LIBRARY_OUTPUT_NAME_RELEASE LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED LINK_DIRECTORIES LINK_FLAGS LINK_FLAGS_DEBUG LINK_FLAGS_RELEASE LINK_INTERFACE_LIBRARIES LINK_INTERFACE_LIBRARIES_DEBUG LINK_INTERFACE_LIBRARIES_RELEASE LINK_INTERFACE_MULTIPLICITY LINK_INTERFACE_MULTIPLICITY_DEBUG LINK_INTERFACE_MULTIPLICITY_RELEASE LINK_LIBRARIES LINK_SEARCH_END_STATIC LINK_SEARCH_START_STATIC LISTFILE_STACK LOCATION LOCATION_DEBUG LOCATION_RELEASE MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_PACKAGE_LOCATION MACOSX_RPATH MACROS MAP_IMPORTED_CONFIG_DEBUG MAP_IMPORTED_CONFIG_RELEASE MEASUREMENT MODIFIED NAME NO_SONAME NO_SYSTEM_FROM_IMPORTED OBJECT_DEPENDS OBJECT_OUTPUTS OSX_ARCHITECTURES OSX_ARCHITECTURES_DEBUG OSX_ARCHITECTURES_RELEASE OUTPUT_NAME OUTPUT_NAME_DEBUG OUTPUT_NAME_RELEASE PACKAGES_FOUND PACKAGES_NOT_FOUND PARENT_DIRECTORY PASS_REGULAR_EXPRESSION PDB_NAME PDB_NAME_DEBUG PDB_NAME_RELEASE PDB_OUTPUT_DIRECTORY PDB_OUTPUT_DIRECTORY_DEBUG PDB_OUTPUT_DIRECTORY_RELEASE POSITION_INDEPENDENT_CODE POST_INSTALL_SCRIPT PREDEFINED_TARGETS_FOLDER PREFIX PRE_INSTALL_SCRIPT PRIVATE_HEADER PROCESSORS PROJECT_LABEL PUBLIC_HEADER REPORT_UNDEFINED_PROPERTIES REQUIRED_FILES RESOURCE RESOURCE_LOCK RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK RULE_MESSAGES RUNTIME_OUTPUT_DIRECTORY RUNTIME_OUTPUT_DIRECTORY_DEBUG RUNTIME_OUTPUT_DIRECTORY_RELEASE RUNTIME_OUTPUT_NAME RUNTIME_OUTPUT_NAME_DEBUG RUNTIME_OUTPUT_NAME_RELEASE RUN_SERIAL SKIP_BUILD_RPATH SKIP_RETURN_CODE SOURCES SOURCE_DIR SOVERSION STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_DEBUG STATIC_LIBRARY_FLAGS_RELEASE STRINGS SUFFIX SYMBOLIC TARGET_ARCHIVES_MAY_BE_SHARED_LIBS TARGET_MESSAGES TARGET_SUPPORTS_SHARED_LIBS TEST_INCLUDE_FILE TIMEOUT TYPE USE_FOLDERS VALUE VARIABLES VERSION VISIBILITY_INLINES_HIDDEN VS_DEPLOYMENT_CONTENT VS_DEPLOYMENT_LOCATION VS_DESKTOP_EXTENSIONS_VERSION VS_DOTNET_REFERENCES VS_DOTNET_TARGET_FRAMEWORK_VERSION VS_GLOBAL_KEYWORD VS_GLOBAL_PROJECT_TYPES VS_GLOBAL_ROOTNAMESPACE VS_IOT_EXTENSIONS_VERSION VS_IOT_STARTUP_TASK VS_KEYWORD VS_MOBILE_EXTENSIONS_VERSION VS_SCC_AUXPATH VS_SCC_LOCALPATH VS_SCC_PROJECTNAME VS_SCC_PROVIDER VS_SHADER_ENTRYPOINT VS_SHADER_FLAGS VS_SHADER_MODEL VS_SHADER_TYPE VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES VS_XAML_TYPE WILL_FAIL WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS WORKING_DIRECTORY WRAP_EXCLUDE XCODE_EXPLICIT_FILE_TYPE XCODE_LAST_KNOWN_FILE_TYPE XCTEST
             \ contained
 
 syn keyword cmakeVariable
-            \ <PROJECT-NAME>_BINARY_DIR <PROJECT-NAME>_SOURCE_DIR <PROJECT-NAME>_VERSION <PROJECT-NAME>_VERSION_MAJOR <PROJECT-NAME>_VERSION_MINOR <PROJECT-NAME>_VERSION_PATCH <PROJECT-NAME>_VERSION_TWEAK APPLE BORLAND BUILD_SHARED_LIBS CMAKE_<CONFIG>_POSTFIX CMAKE_<LANG>_ARCHIVE_APPEND CMAKE_<LANG>_ARCHIVE_CREATE CMAKE_<LANG>_ARCHIVE_FINISH CMAKE_<LANG>_COMPILER CMAKE_<LANG>_COMPILER_ABI CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN CMAKE_<LANG>_COMPILER_ID CMAKE_<LANG>_COMPILER_LAUNCHER CMAKE_<LANG>_COMPILER_LOADED CMAKE_<LANG>_COMPILER_TARGET CMAKE_<LANG>_COMPILER_VERSION CMAKE_<LANG>_COMPILE_OBJECT CMAKE_<LANG>_CREATE_SHARED_LIBRARY CMAKE_<LANG>_CREATE_SHARED_MODULE CMAKE_<LANG>_CREATE_STATIC_LIBRARY CMAKE_<LANG>_FLAGS CMAKE_<LANG>_FLAGS_DEBUG CMAKE_<LANG>_FLAGS_MINSIZEREL CMAKE_<LANG>_FLAGS_RELEASE CMAKE_<LANG>_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_GHS_KERNEL_FLAGS_DEBUG CMAKE_<LANG>_GHS_KERNEL_FLAGS_MINSIZEREL CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELEASE CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_IGNORE_EXTENSIONS CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_LIBRARIES CMAKE_<LANG>_INCLUDE_WHAT_YOU_USE CMAKE_<LANG>_LIBRARY_ARCHITECTURE CMAKE_<LANG>_LINKER_PREFERENCE CMAKE_<LANG>_LINKER_PREFERENCE_PROPAGATES CMAKE_<LANG>_LINK_EXECUTABLE CMAKE_<LANG>_OUTPUT_EXTENSION CMAKE_<LANG>_PLATFORM_ID CMAKE_<LANG>_SIMULATE_ID CMAKE_<LANG>_SIMULATE_VERSION CMAKE_<LANG>_SIZEOF_DATA_PTR CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS CMAKE_<LANG>_VISIBILITY_PRESET CMAKE_ABSOLUTE_DESTINATION_FILES CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS CMAKE_ANDROID_API CMAKE_ANDROID_API_MIN CMAKE_ANDROID_ARCH CMAKE_ANDROID_ASSETS_DIRECTORIES CMAKE_ANDROID_GUI CMAKE_ANDROID_JAR_DEPENDENCIES CMAKE_ANDROID_JAR_DIRECTORIES CMAKE_ANDROID_JAVA_SOURCE_DIR CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES CMAKE_ANDROID_PROCESS_MAX CMAKE_ANDROID_PROGUARD CMAKE_ANDROID_PROGUARD_CONFIG_PATH CMAKE_ANDROID_SECURE_PROPS_PATH CMAKE_ANDROID_SKIP_ANT_STEP CMAKE_ANDROID_STL_TYPE CMAKE_APPBUNDLE_PATH CMAKE_AR CMAKE_ARCHIVE_OUTPUT_DIRECTORY CMAKE_ARCHIVE_OUTPUT_DIRECTORY_<CONFIG> CMAKE_ARGC CMAKE_ARGV0 CMAKE_AUTOMOC CMAKE_AUTOMOC_MOC_OPTIONS CMAKE_AUTOMOC_RELAXED_MODE CMAKE_AUTORCC CMAKE_AUTORCC_OPTIONS CMAKE_AUTOUIC CMAKE_AUTOUIC_OPTIONS CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BINARY_DIR CMAKE_BUILD_TOOL CMAKE_BUILD_TYPE CMAKE_BUILD_WITH_INSTALL_RPATH CMAKE_CACHEFILE_DIR CMAKE_CACHE_MAJOR_VERSION CMAKE_CACHE_MINOR_VERSION CMAKE_CACHE_PATCH_VERSION CMAKE_CFG_INTDIR CMAKE_CL_64 CMAKE_COLOR_MAKEFILE CMAKE_COMMAND CMAKE_COMPILER_2005 CMAKE_COMPILER_IS_GNU<LANG> CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_CONFIGURATION_TYPES CMAKE_CROSSCOMPILING CMAKE_CROSSCOMPILING_EMULATOR CMAKE_CTEST_COMMAND CMAKE_CURRENT_BINARY_DIR CMAKE_CURRENT_LIST_DIR CMAKE_CURRENT_LIST_FILE CMAKE_CURRENT_LIST_LINE CMAKE_CURRENT_SOURCE_DIR CMAKE_CXX_COMPILE_FEATURES CMAKE_CXX_EXTENSIONS CMAKE_CXX_STANDARD CMAKE_CXX_STANDARD_REQUIRED CMAKE_C_COMPILE_FEATURES CMAKE_C_EXTENSIONS CMAKE_C_STANDARD CMAKE_C_STANDARD_REQUIRED CMAKE_DEBUG_POSTFIX CMAKE_DEBUG_TARGET_PROPERTIES CMAKE_DISABLE_FIND_PACKAGE_<PackageName> CMAKE_DL_LIBS CMAKE_EDIT_COMMAND CMAKE_ENABLE_EXPORTS CMAKE_ERROR_DEPRECATED CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_EXECUTABLE_SUFFIX CMAKE_EXE_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS_<CONFIG> CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_NO_PACKAGE_REGISTRY CMAKE_EXTRA_GENERATOR CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES CMAKE_FIND_APPBUNDLE CMAKE_FIND_FRAMEWORK CMAKE_FIND_LIBRARY_PREFIXES CMAKE_FIND_LIBRARY_SUFFIXES CMAKE_FIND_NO_INSTALL_PREFIX CMAKE_FIND_PACKAGE_NAME CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_WARN_NO_MODULE CMAKE_FIND_ROOT_PATH CMAKE_FIND_ROOT_PATH_MODE_INCLUDE CMAKE_FIND_ROOT_PATH_MODE_LIBRARY CMAKE_FIND_ROOT_PATH_MODE_PACKAGE CMAKE_FIND_ROOT_PATH_MODE_PROGRAM CMAKE_FRAMEWORK_PATH CMAKE_Fortran_FORMAT CMAKE_Fortran_MODDIR_DEFAULT CMAKE_Fortran_MODDIR_FLAG CMAKE_Fortran_MODOUT_FLAG CMAKE_Fortran_MODULE_DIRECTORY CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET CMAKE_GNUtoMS CMAKE_HOME_DIRECTORY CMAKE_HOST_APPLE CMAKE_HOST_SYSTEM CMAKE_HOST_SYSTEM_NAME CMAKE_HOST_SYSTEM_PROCESSOR CMAKE_HOST_SYSTEM_VERSION CMAKE_HOST_UNIX CMAKE_HOST_WIN32 CMAKE_IGNORE_PATH CMAKE_IMPORT_LIBRARY_PREFIX CMAKE_IMPORT_LIBRARY_SUFFIX CMAKE_INCLUDE_CURRENT_DIR CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE CMAKE_INCLUDE_DIRECTORIES_BEFORE CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE CMAKE_INCLUDE_PATH CMAKE_INSTALL_DEFAULT_COMPONENT_NAME CMAKE_INSTALL_MESSAGE CMAKE_INSTALL_NAME_DIR CMAKE_INSTALL_PREFIX CMAKE_INSTALL_RPATH CMAKE_INSTALL_RPATH_USE_LINK_PATH CMAKE_INTERNAL_PLATFORM_ABI CMAKE_IOS_INSTALL_COMBINED CMAKE_JOB_POOL_COMPILE CMAKE_JOB_POOL_LINK CMAKE_LIBRARY_ARCHITECTURE CMAKE_LIBRARY_ARCHITECTURE_REGEX CMAKE_LIBRARY_OUTPUT_DIRECTORY CMAKE_LIBRARY_OUTPUT_DIRECTORY_<CONFIG> CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_FLAG CMAKE_LINK_DEF_FILE_FLAG CMAKE_LINK_DEPENDS_NO_SHARED CMAKE_LINK_INTERFACE_LIBRARIES CMAKE_LINK_LIBRARY_FILE_FLAG CMAKE_LINK_LIBRARY_FLAG CMAKE_LINK_LIBRARY_SUFFIX CMAKE_LINK_SEARCH_END_STATIC CMAKE_LINK_SEARCH_START_STATIC CMAKE_MACOSX_BUNDLE CMAKE_MACOSX_RPATH CMAKE_MAJOR_VERSION CMAKE_MAKE_PROGRAM CMAKE_MAP_IMPORTED_CONFIG_<CONFIG> CMAKE_MATCH_COUNT CMAKE_MFC_FLAG CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_MINOR_VERSION CMAKE_MODULE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS_<CONFIG> CMAKE_MODULE_PATH CMAKE_NOT_USING_CONFIG_FLAGS CMAKE_NO_BUILTIN_CHRPATH CMAKE_NO_SYSTEM_FROM_IMPORTED CMAKE_OBJECT_PATH_MAX CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT CMAKE_PARENT_LIST_FILE CMAKE_PATCH_VERSION CMAKE_PDB_OUTPUT_DIRECTORY CMAKE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_POLICY_DEFAULT_CMP<NNNN> CMAKE_POLICY_WARNING_CMP<NNNN> CMAKE_POSITION_INDEPENDENT_CODE CMAKE_PREFIX_PATH CMAKE_PROGRAM_PATH CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE CMAKE_PROJECT_NAME CMAKE_RANLIB CMAKE_ROOT CMAKE_RUNTIME_OUTPUT_DIRECTORY CMAKE_RUNTIME_OUTPUT_DIRECTORY_<CONFIG> CMAKE_SCRIPT_MODE_FILE CMAKE_SHARED_LIBRARY_PREFIX CMAKE_SHARED_LIBRARY_SUFFIX CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS_<CONFIG> CMAKE_SHARED_MODULE_PREFIX CMAKE_SHARED_MODULE_SUFFIX CMAKE_SIZEOF_VOID_P CMAKE_SKIP_BUILD_RPATH CMAKE_SKIP_INSTALL_ALL_DEPENDENCY CMAKE_SKIP_INSTALL_RPATH CMAKE_SKIP_INSTALL_RULES CMAKE_SKIP_RPATH CMAKE_SOURCE_DIR CMAKE_STAGING_PREFIX CMAKE_STANDARD_LIBRARIES CMAKE_STATIC_LIBRARY_PREFIX CMAKE_STATIC_LIBRARY_SUFFIX CMAKE_STATIC_LINKER_FLAGS CMAKE_STATIC_LINKER_FLAGS_<CONFIG> CMAKE_SYSROOT CMAKE_SYSTEM CMAKE_SYSTEM_APPBUNDLE_PATH CMAKE_SYSTEM_FRAMEWORK_PATH CMAKE_SYSTEM_IGNORE_PATH CMAKE_SYSTEM_INCLUDE_PATH CMAKE_SYSTEM_LIBRARY_PATH CMAKE_SYSTEM_NAME CMAKE_SYSTEM_PREFIX_PATH CMAKE_SYSTEM_PROCESSOR CMAKE_SYSTEM_PROGRAM_PATH CMAKE_SYSTEM_VERSION CMAKE_TOOLCHAIN_FILE CMAKE_TRY_COMPILE_CONFIGURATION CMAKE_TWEAK_VERSION CMAKE_USER_MAKE_RULES_OVERRIDE CMAKE_USER_MAKE_RULES_OVERRIDE_<LANG> CMAKE_USE_RELATIVE_PATHS CMAKE_VERBOSE_MAKEFILE CMAKE_VERSION CMAKE_VISIBILITY_INLINES_HIDDEN CMAKE_VS_DEVENV_COMMAND CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD CMAKE_VS_INTEL_Fortran_PROJECT_VERSION CMAKE_VS_MSBUILD_COMMAND CMAKE_VS_MSDEV_COMMAND CMAKE_VS_NsightTegra_VERSION CMAKE_VS_PLATFORM_NAME CMAKE_VS_PLATFORM_TOOLSET CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION CMAKE_WARN_DEPRECATED CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_WIN32_EXECUTABLE CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS CMAKE_XCODE_ATTRIBUTE_<an-attribute> CMAKE_XCODE_PLATFORM_TOOLSET CPACK_ABSOLUTE_DESTINATION_FILES CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CPACK_INCLUDE_TOPLEVEL_DIRECTORY CPACK_INSTALL_SCRIPT CPACK_PACKAGING_INSTALL_PREFIX CPACK_SET_DESTDIR CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CTEST_BINARY_DIRECTORY CTEST_BUILD_COMMAND CTEST_BUILD_NAME CTEST_BZR_COMMAND CTEST_BZR_UPDATE_OPTIONS CTEST_CHANGE_ID CTEST_CHECKOUT_COMMAND CTEST_CONFIGURATION_TYPE CTEST_CONFIGURE_COMMAND CTEST_COVERAGE_COMMAND CTEST_COVERAGE_EXTRA_FLAGS CTEST_CURL_OPTIONS CTEST_CUSTOM_COVERAGE_EXCLUDE CTEST_CUSTOM_ERROR_EXCEPTION CTEST_CUSTOM_ERROR_MATCH CTEST_CUSTOM_ERROR_POST_CONTEXT CTEST_CUSTOM_ERROR_PRE_CONTEXT CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MEMCHECK_IGNORE CTEST_CUSTOM_POST_MEMCHECK CTEST_CUSTOM_POST_TEST CTEST_CUSTOM_PRE_MEMCHECK CTEST_CUSTOM_PRE_TEST CTEST_CUSTOM_TEST_IGNORE CTEST_CUSTOM_WARNING_EXCEPTION CTEST_CUSTOM_WARNING_MATCH CTEST_CVS_CHECKOUT CTEST_CVS_COMMAND CTEST_CVS_UPDATE_OPTIONS CTEST_DROP_LOCATION CTEST_DROP_METHOD CTEST_DROP_SITE CTEST_DROP_SITE_CDASH CTEST_DROP_SITE_PASSWORD CTEST_DROP_SITE_USER CTEST_EXTRA_COVERAGE_GLOB CTEST_GIT_COMMAND CTEST_GIT_UPDATE_CUSTOM CTEST_GIT_UPDATE_OPTIONS CTEST_HG_COMMAND CTEST_HG_UPDATE_OPTIONS CTEST_MEMORYCHECK_COMMAND CTEST_MEMORYCHECK_COMMAND_OPTIONS CTEST_MEMORYCHECK_SANITIZER_OPTIONS CTEST_MEMORYCHECK_SUPPRESSIONS_FILE CTEST_MEMORYCHECK_TYPE CTEST_NIGHTLY_START_TIME CTEST_P4_CLIENT CTEST_P4_COMMAND CTEST_P4_OPTIONS CTEST_P4_UPDATE_OPTIONS CTEST_SCP_COMMAND CTEST_SITE CTEST_SOURCE_DIRECTORY CTEST_SVN_COMMAND CTEST_SVN_OPTIONS CTEST_SVN_UPDATE_OPTIONS CTEST_TEST_LOAD CTEST_TEST_TIMEOUT CTEST_TRIGGER_SITE CTEST_UPDATE_COMMAND CTEST_UPDATE_OPTIONS CTEST_UPDATE_VERSION_ONLY CTEST_USE_LAUNCHERS CYGWIN ENV EXECUTABLE_OUTPUT_PATH GHS-MULTI LIBRARY_OUTPUT_PATH MINGW MSVC MSVC10 MSVC11 MSVC12 MSVC14 MSVC60 MSVC70 MSVC71 MSVC80 MSVC90 MSVC_IDE MSVC_VERSION PROJECT_BINARY_DIR PROJECT_NAME PROJECT_SOURCE_DIR PROJECT_VERSION PROJECT_VERSION_MAJOR PROJECT_VERSION_MINOR PROJECT_VERSION_PATCH PROJECT_VERSION_TWEAK UNIX WIN32 WINCE WINDOWS_PHONE WINDOWS_STORE XCODE_VERSION
+            \ <PROJECT-NAME>_BINARY_DIR <PROJECT-NAME>_SOURCE_DIR <PROJECT-NAME>_VERSION <PROJECT-NAME>_VERSION_MAJOR <PROJECT-NAME>_VERSION_MINOR <PROJECT-NAME>_VERSION_PATCH <PROJECT-NAME>_VERSION_TWEAK APPLE BORLAND BUILD_SHARED_LIBS CMAKE_<CONFIG>_POSTFIX CMAKE_<LANG>_ARCHIVE_APPEND CMAKE_<LANG>_ARCHIVE_CREATE CMAKE_<LANG>_ARCHIVE_FINISH CMAKE_<LANG>_COMPILER CMAKE_<LANG>_COMPILER_ABI CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN CMAKE_<LANG>_COMPILER_ID CMAKE_<LANG>_COMPILER_LAUNCHER CMAKE_<LANG>_COMPILER_LOADED CMAKE_<LANG>_COMPILER_TARGET CMAKE_<LANG>_COMPILER_VERSION CMAKE_<LANG>_COMPILE_OBJECT CMAKE_<LANG>_CREATE_SHARED_LIBRARY CMAKE_<LANG>_CREATE_SHARED_MODULE CMAKE_<LANG>_CREATE_STATIC_LIBRARY CMAKE_<LANG>_FLAGS CMAKE_<LANG>_FLAGS_DEBUG CMAKE_<LANG>_FLAGS_MINSIZEREL CMAKE_<LANG>_FLAGS_RELEASE CMAKE_<LANG>_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_GHS_KERNEL_FLAGS_DEBUG CMAKE_<LANG>_GHS_KERNEL_FLAGS_MINSIZEREL CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELEASE CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_IGNORE_EXTENSIONS CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_LIBRARIES CMAKE_<LANG>_INCLUDE_WHAT_YOU_USE CMAKE_<LANG>_CPPLINT CMAKE_<LANG>_LIBRARY_ARCHITECTURE CMAKE_<LANG>_LINKER_PREFERENCE CMAKE_<LANG>_LINKER_PREFERENCE_PROPAGATES CMAKE_<LANG>_LINK_EXECUTABLE CMAKE_<LANG>_OUTPUT_EXTENSION CMAKE_<LANG>_PLATFORM_ID CMAKE_<LANG>_SIMULATE_ID CMAKE_<LANG>_SIMULATE_VERSION CMAKE_<LANG>_SIZEOF_DATA_PTR CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS CMAKE_<LANG>_VISIBILITY_PRESET CMAKE_ABSOLUTE_DESTINATION_FILES CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS CMAKE_ANDROID_API CMAKE_ANDROID_API_MIN CMAKE_ANDROID_ARCH CMAKE_ANDROID_ASSETS_DIRECTORIES CMAKE_ANDROID_GUI CMAKE_ANDROID_JAR_DEPENDENCIES CMAKE_ANDROID_JAR_DIRECTORIES CMAKE_ANDROID_JAVA_SOURCE_DIR CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES CMAKE_ANDROID_PROCESS_MAX CMAKE_ANDROID_PROGUARD CMAKE_ANDROID_PROGUARD_CONFIG_PATH CMAKE_ANDROID_SECURE_PROPS_PATH CMAKE_ANDROID_SKIP_ANT_STEP CMAKE_ANDROID_STL_TYPE CMAKE_APPBUNDLE_PATH CMAKE_AR CMAKE_ARCHIVE_OUTPUT_DIRECTORY CMAKE_ARCHIVE_OUTPUT_DIRECTORY_<CONFIG> CMAKE_ARGC CMAKE_ARGV0 CMAKE_AUTOMOC CMAKE_AUTOMOC_MOC_OPTIONS CMAKE_AUTOMOC_RELAXED_MODE CMAKE_AUTORCC CMAKE_AUTORCC_OPTIONS CMAKE_AUTOUIC CMAKE_AUTOUIC_OPTIONS CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BINARY_DIR CMAKE_BUILD_TOOL CMAKE_BUILD_TYPE CMAKE_BUILD_WITH_INSTALL_RPATH CMAKE_CACHEFILE_DIR CMAKE_CACHE_MAJOR_VERSION CMAKE_CACHE_MINOR_VERSION CMAKE_CACHE_PATCH_VERSION CMAKE_CFG_INTDIR CMAKE_CL_64 CMAKE_COLOR_MAKEFILE CMAKE_COMMAND CMAKE_COMPILER_2005 CMAKE_COMPILER_IS_GNU<LANG> CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_CONFIGURATION_TYPES CMAKE_CROSSCOMPILING CMAKE_CROSSCOMPILING_EMULATOR CMAKE_CTEST_COMMAND CMAKE_CURRENT_BINARY_DIR CMAKE_CURRENT_LIST_DIR CMAKE_CURRENT_LIST_FILE CMAKE_CURRENT_LIST_LINE CMAKE_CURRENT_SOURCE_DIR CMAKE_CXX_COMPILE_FEATURES CMAKE_CXX_EXTENSIONS CMAKE_CXX_STANDARD CMAKE_CXX_STANDARD_REQUIRED CMAKE_C_COMPILE_FEATURES CMAKE_C_EXTENSIONS CMAKE_C_STANDARD CMAKE_C_STANDARD_REQUIRED CMAKE_DEBUG_POSTFIX CMAKE_DEBUG_TARGET_PROPERTIES CMAKE_DISABLE_FIND_PACKAGE_<PackageName> CMAKE_DL_LIBS CMAKE_EDIT_COMMAND CMAKE_ENABLE_EXPORTS CMAKE_ERROR_DEPRECATED CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_EXECUTABLE_SUFFIX CMAKE_EXE_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS_<CONFIG> CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_NO_PACKAGE_REGISTRY CMAKE_EXTRA_GENERATOR CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES CMAKE_FIND_APPBUNDLE CMAKE_FIND_FRAMEWORK CMAKE_FIND_LIBRARY_PREFIXES CMAKE_FIND_LIBRARY_SUFFIXES CMAKE_FIND_NO_INSTALL_PREFIX CMAKE_FIND_PACKAGE_NAME CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_WARN_NO_MODULE CMAKE_FIND_ROOT_PATH CMAKE_FIND_ROOT_PATH_MODE_INCLUDE CMAKE_FIND_ROOT_PATH_MODE_LIBRARY CMAKE_FIND_ROOT_PATH_MODE_PACKAGE CMAKE_FIND_ROOT_PATH_MODE_PROGRAM CMAKE_FRAMEWORK_PATH CMAKE_Fortran_FORMAT CMAKE_Fortran_MODDIR_DEFAULT CMAKE_Fortran_MODDIR_FLAG CMAKE_Fortran_MODOUT_FLAG CMAKE_Fortran_MODULE_DIRECTORY CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET CMAKE_GNUtoMS CMAKE_HOME_DIRECTORY CMAKE_HOST_APPLE CMAKE_HOST_SYSTEM CMAKE_HOST_SYSTEM_NAME CMAKE_HOST_SYSTEM_PROCESSOR CMAKE_HOST_SYSTEM_VERSION CMAKE_HOST_UNIX CMAKE_HOST_WIN32 CMAKE_IGNORE_PATH CMAKE_IMPORT_LIBRARY_PREFIX CMAKE_IMPORT_LIBRARY_SUFFIX CMAKE_INCLUDE_CURRENT_DIR CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE CMAKE_INCLUDE_DIRECTORIES_BEFORE CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE CMAKE_INCLUDE_PATH CMAKE_INSTALL_DEFAULT_COMPONENT_NAME CMAKE_INSTALL_MESSAGE CMAKE_INSTALL_NAME_DIR CMAKE_INSTALL_PREFIX CMAKE_INSTALL_RPATH CMAKE_INSTALL_RPATH_USE_LINK_PATH CMAKE_INTERNAL_PLATFORM_ABI CMAKE_IOS_INSTALL_COMBINED CMAKE_JOB_POOL_COMPILE CMAKE_JOB_POOL_LINK CMAKE_LIBRARY_ARCHITECTURE CMAKE_LIBRARY_ARCHITECTURE_REGEX CMAKE_LIBRARY_OUTPUT_DIRECTORY CMAKE_LIBRARY_OUTPUT_DIRECTORY_<CONFIG> CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_FLAG CMAKE_LINK_DEF_FILE_FLAG CMAKE_LINK_DEPENDS_NO_SHARED CMAKE_LINK_INTERFACE_LIBRARIES CMAKE_LINK_LIBRARY_FILE_FLAG CMAKE_LINK_LIBRARY_FLAG CMAKE_LINK_LIBRARY_SUFFIX CMAKE_LINK_SEARCH_END_STATIC CMAKE_LINK_SEARCH_START_STATIC CMAKE_MACOSX_BUNDLE CMAKE_MACOSX_RPATH CMAKE_MAJOR_VERSION CMAKE_MAKE_PROGRAM CMAKE_MAP_IMPORTED_CONFIG_<CONFIG> CMAKE_MATCH_COUNT CMAKE_MFC_FLAG CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_MINOR_VERSION CMAKE_MODULE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS_<CONFIG> CMAKE_MODULE_PATH CMAKE_NOT_USING_CONFIG_FLAGS CMAKE_NO_BUILTIN_CHRPATH CMAKE_NO_SYSTEM_FROM_IMPORTED CMAKE_OBJECT_PATH_MAX CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT CMAKE_PARENT_LIST_FILE CMAKE_PATCH_VERSION CMAKE_PDB_OUTPUT_DIRECTORY CMAKE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_POLICY_DEFAULT_CMP<NNNN> CMAKE_POLICY_WARNING_CMP<NNNN> CMAKE_POSITION_INDEPENDENT_CODE CMAKE_PREFIX_PATH CMAKE_PROGRAM_PATH CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE CMAKE_PROJECT_NAME CMAKE_RANLIB CMAKE_ROOT CMAKE_RUNTIME_OUTPUT_DIRECTORY CMAKE_RUNTIME_OUTPUT_DIRECTORY_<CONFIG> CMAKE_SCRIPT_MODE_FILE CMAKE_SHARED_LIBRARY_PREFIX CMAKE_SHARED_LIBRARY_SUFFIX CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS_<CONFIG> CMAKE_SHARED_MODULE_PREFIX CMAKE_SHARED_MODULE_SUFFIX CMAKE_SIZEOF_VOID_P CMAKE_SKIP_BUILD_RPATH CMAKE_SKIP_INSTALL_ALL_DEPENDENCY CMAKE_SKIP_INSTALL_RPATH CMAKE_SKIP_INSTALL_RULES CMAKE_SKIP_RPATH CMAKE_SOURCE_DIR CMAKE_STAGING_PREFIX CMAKE_STANDARD_LIBRARIES CMAKE_STATIC_LIBRARY_PREFIX CMAKE_STATIC_LIBRARY_SUFFIX CMAKE_STATIC_LINKER_FLAGS CMAKE_STATIC_LINKER_FLAGS_<CONFIG> CMAKE_SYSROOT CMAKE_SYSTEM CMAKE_SYSTEM_APPBUNDLE_PATH CMAKE_SYSTEM_FRAMEWORK_PATH CMAKE_SYSTEM_IGNORE_PATH CMAKE_SYSTEM_INCLUDE_PATH CMAKE_SYSTEM_LIBRARY_PATH CMAKE_SYSTEM_NAME CMAKE_SYSTEM_PREFIX_PATH CMAKE_SYSTEM_PROCESSOR CMAKE_SYSTEM_PROGRAM_PATH CMAKE_SYSTEM_VERSION CMAKE_TOOLCHAIN_FILE CMAKE_TRY_COMPILE_CONFIGURATION CMAKE_TWEAK_VERSION CMAKE_USER_MAKE_RULES_OVERRIDE CMAKE_USER_MAKE_RULES_OVERRIDE_<LANG> CMAKE_USE_RELATIVE_PATHS CMAKE_VERBOSE_MAKEFILE CMAKE_VERSION CMAKE_VISIBILITY_INLINES_HIDDEN CMAKE_VS_DEVENV_COMMAND CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD CMAKE_VS_INTEL_Fortran_PROJECT_VERSION CMAKE_VS_MSBUILD_COMMAND CMAKE_VS_MSDEV_COMMAND CMAKE_VS_NsightTegra_VERSION CMAKE_VS_PLATFORM_NAME CMAKE_VS_PLATFORM_TOOLSET CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION CMAKE_WARN_DEPRECATED CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_WIN32_EXECUTABLE CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS CMAKE_XCODE_ATTRIBUTE_<an-attribute> CMAKE_XCODE_PLATFORM_TOOLSET CPACK_ABSOLUTE_DESTINATION_FILES CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CPACK_INCLUDE_TOPLEVEL_DIRECTORY CPACK_INSTALL_SCRIPT CPACK_PACKAGING_INSTALL_PREFIX CPACK_SET_DESTDIR CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CTEST_BINARY_DIRECTORY CTEST_BUILD_COMMAND CTEST_BUILD_NAME CTEST_BZR_COMMAND CTEST_BZR_UPDATE_OPTIONS CTEST_CHANGE_ID CTEST_CHECKOUT_COMMAND CTEST_CONFIGURATION_TYPE CTEST_CONFIGURE_COMMAND CTEST_COVERAGE_COMMAND CTEST_COVERAGE_EXTRA_FLAGS CTEST_CURL_OPTIONS CTEST_CUSTOM_COVERAGE_EXCLUDE CTEST_CUSTOM_ERROR_EXCEPTION CTEST_CUSTOM_ERROR_MATCH CTEST_CUSTOM_ERROR_POST_CONTEXT CTEST_CUSTOM_ERROR_PRE_CONTEXT CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MEMCHECK_IGNORE CTEST_CUSTOM_POST_MEMCHECK CTEST_CUSTOM_POST_TEST CTEST_CUSTOM_PRE_MEMCHECK CTEST_CUSTOM_PRE_TEST CTEST_CUSTOM_TEST_IGNORE CTEST_CUSTOM_WARNING_EXCEPTION CTEST_CUSTOM_WARNING_MATCH CTEST_CVS_CHECKOUT CTEST_CVS_COMMAND CTEST_CVS_UPDATE_OPTIONS CTEST_DROP_LOCATION CTEST_DROP_METHOD CTEST_DROP_SITE CTEST_DROP_SITE_CDASH CTEST_DROP_SITE_PASSWORD CTEST_DROP_SITE_USER CTEST_EXTRA_COVERAGE_GLOB CTEST_GIT_COMMAND CTEST_GIT_UPDATE_CUSTOM CTEST_GIT_UPDATE_OPTIONS CTEST_HG_COMMAND CTEST_HG_UPDATE_OPTIONS CTEST_MEMORYCHECK_COMMAND CTEST_MEMORYCHECK_COMMAND_OPTIONS CTEST_MEMORYCHECK_SANITIZER_OPTIONS CTEST_MEMORYCHECK_SUPPRESSIONS_FILE CTEST_MEMORYCHECK_TYPE CTEST_NIGHTLY_START_TIME CTEST_P4_CLIENT CTEST_P4_COMMAND CTEST_P4_OPTIONS CTEST_P4_UPDATE_OPTIONS CTEST_SCP_COMMAND CTEST_SITE CTEST_SOURCE_DIRECTORY CTEST_SVN_COMMAND CTEST_SVN_OPTIONS CTEST_SVN_UPDATE_OPTIONS CTEST_TEST_LOAD CTEST_TEST_TIMEOUT CTEST_TRIGGER_SITE CTEST_UPDATE_COMMAND CTEST_UPDATE_OPTIONS CTEST_UPDATE_VERSION_ONLY CTEST_USE_LAUNCHERS CYGWIN ENV EXECUTABLE_OUTPUT_PATH GHS-MULTI LIBRARY_OUTPUT_PATH MINGW MSVC MSVC10 MSVC11 MSVC12 MSVC14 MSVC60 MSVC70 MSVC71 MSVC80 MSVC90 MSVC_IDE MSVC_VERSION PROJECT_BINARY_DIR PROJECT_NAME PROJECT_SOURCE_DIR PROJECT_VERSION PROJECT_VERSION_MAJOR PROJECT_VERSION_MINOR PROJECT_VERSION_PATCH PROJECT_VERSION_TWEAK UNIX WIN32 WINCE WINDOWS_PHONE WINDOWS_STORE XCODE_VERSION
             \ contained
 
 syn keyword cmakeModule
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index c93ace1..bef5988 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -211,6 +211,7 @@ Properties on Targets
    /prop_tgt/LABELS
    /prop_tgt/LANG_CLANG_TIDY
    /prop_tgt/LANG_COMPILER_LAUNCHER
+   /prop_tgt/LANG_CPPLINT
    /prop_tgt/LANG_INCLUDE_WHAT_YOU_USE
    /prop_tgt/LANG_VISIBILITY_PRESET
    /prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 99b5eae..95f780a 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -284,6 +284,7 @@ Variables that Control the Build
    /variable/CMAKE_IOS_INSTALL_COMBINED
    /variable/CMAKE_LANG_CLANG_TIDY
    /variable/CMAKE_LANG_COMPILER_LAUNCHER
+   /variable/CMAKE_LANG_CPPLINT
    /variable/CMAKE_LANG_INCLUDE_WHAT_YOU_USE
    /variable/CMAKE_LANG_VISIBILITY_PRESET
    /variable/CMAKE_LIBRARY_OUTPUT_DIRECTORY
diff --git a/Help/prop_tgt/LANG_CPPLINT.rst b/Help/prop_tgt/LANG_CPPLINT.rst
new file mode 100644
index 0000000..14f47d4
--- /dev/null
+++ b/Help/prop_tgt/LANG_CPPLINT.rst
@@ -0,0 +1,13 @@
+<LANG>_CPPLINT
+--------------
+
+This property is supported only when ``<LANG>`` is ``C`` or ``CXX``.
+
+Specify a :ref:`;-list <CMake Language Lists>` containing a command line
+for the ``cpplint`` style checker.  The :ref:`Makefile Generators` and the
+:generator:`Ninja` generator will run ``cpplint`` along with the compiler
+and report any problems.
+
+This property is initialized by the value of the
+:variable:`CMAKE_<LANG>_CPPLINT` variable if it is set when a target is
+created.
diff --git a/Help/release/dev/add-LANG_CPPLINT.rst b/Help/release/dev/add-LANG_CPPLINT.rst
new file mode 100644
index 0000000..a0539cf
--- /dev/null
+++ b/Help/release/dev/add-LANG_CPPLINT.rst
@@ -0,0 +1,8 @@
+add-LANG_CPPLINT
+----------------
+
+* A :prop_tgt:`<LANG>_CPPLINT` target property and supporting
+  :variable:`CMAKE_<LANG>_CPPLINT` variable were introduced to tell
+  the :ref:`Makefile Generators` and the :generator:`Ninja` generator to
+  run the ``cpplint`` style checker along with the compiler for ``C`` and
+  ``CXX`` languages.
diff --git a/Help/variable/CMAKE_LANG_CPPLINT.rst b/Help/variable/CMAKE_LANG_CPPLINT.rst
new file mode 100644
index 0000000..3b6f452
--- /dev/null
+++ b/Help/variable/CMAKE_LANG_CPPLINT.rst
@@ -0,0 +1,6 @@
+CMAKE_<LANG>_CPPLINT
+--------------------
+
+Default value for :prop_tgt:`<LANG>_CPPLINT` target property. This variable
+is used to initialize the property on each target as it is created.  This
+is done only when ``<LANG>`` is ``C`` or ``CXX``.
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 379ae16..866c132 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -631,7 +631,9 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
       const char* iwyu = this->GeneratorTarget->GetProperty(iwyu_prop);
       std::string const tidy_prop = lang + "_CLANG_TIDY";
       const char* tidy = this->GeneratorTarget->GetProperty(tidy_prop);
-      if ((iwyu && *iwyu) || (tidy && *tidy)) {
+      std::string const cpplint_prop = lang + "_CPPLINT";
+      const char* cpplint = this->GeneratorTarget->GetProperty(cpplint_prop);
+      if ((iwyu && *iwyu) || (tidy && *tidy) || (cpplint && *cpplint)) {
         std::string run_iwyu = "$(CMAKE_COMMAND) -E __run_iwyu";
         if (iwyu && *iwyu) {
           run_iwyu += " --iwyu=";
@@ -640,6 +642,12 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
         if (tidy && *tidy) {
           run_iwyu += " --tidy=";
           run_iwyu += this->LocalGenerator->EscapeForShell(tidy);
+        }
+        if (cpplint && *cpplint) {
+          run_iwyu += " --cpplint=";
+          run_iwyu += this->LocalGenerator->EscapeForShell(cpplint);
+        }
+        if ((tidy && *tidy) || (cpplint && *cpplint)) {
           run_iwyu += " --source=";
           run_iwyu += sourceFile;
         }
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 8ad2efe..0b33b19 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -600,7 +600,9 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang)
     const char* iwyu = this->GeneratorTarget->GetProperty(iwyu_prop);
     std::string const tidy_prop = lang + "_CLANG_TIDY";
     const char* tidy = this->GeneratorTarget->GetProperty(tidy_prop);
-    if ((iwyu && *iwyu) || (tidy && *tidy)) {
+    std::string const cpplint_prop = lang + "_CPPLINT";
+    const char* cpplint = this->GeneratorTarget->GetProperty(cpplint_prop);
+    if ((iwyu && *iwyu) || (tidy && *tidy) || (cpplint && *cpplint)) {
       std::string run_iwyu = this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmOutputConverter::SHELL);
       run_iwyu += " -E __run_iwyu";
@@ -611,6 +613,12 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang)
       if (tidy && *tidy) {
         run_iwyu += " --tidy=";
         run_iwyu += this->GetLocalGenerator()->EscapeForShell(tidy);
+      }
+      if (cpplint && *cpplint) {
+        run_iwyu += " --cpplint=";
+        run_iwyu += this->GetLocalGenerator()->EscapeForShell(cpplint);
+      }
+      if ((tidy && *tidy) || (cpplint && *cpplint)) {
         run_iwyu += " --source=$in";
       }
       run_iwyu += " -- ";
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 9261ca8..2852f90 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -255,6 +255,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
     this->SetPropertyDefault("MACOSX_RPATH", CM_NULLPTR);
     this->SetPropertyDefault("C_CLANG_TIDY", CM_NULLPTR);
     this->SetPropertyDefault("C_COMPILER_LAUNCHER", CM_NULLPTR);
+    this->SetPropertyDefault("C_CPPLINT", CM_NULLPTR);
     this->SetPropertyDefault("C_INCLUDE_WHAT_YOU_USE", CM_NULLPTR);
     this->SetPropertyDefault("LINK_WHAT_YOU_USE", CM_NULLPTR);
     this->SetPropertyDefault("C_STANDARD", CM_NULLPTR);
@@ -262,6 +263,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
     this->SetPropertyDefault("C_EXTENSIONS", CM_NULLPTR);
     this->SetPropertyDefault("CXX_CLANG_TIDY", CM_NULLPTR);
     this->SetPropertyDefault("CXX_COMPILER_LAUNCHER", CM_NULLPTR);
+    this->SetPropertyDefault("CXX_CPPLINT", CM_NULLPTR);
     this->SetPropertyDefault("CXX_INCLUDE_WHAT_YOU_USE", CM_NULLPTR);
     this->SetPropertyDefault("CXX_STANDARD", CM_NULLPTR);
     this->SetPropertyDefault("CXX_STANDARD_REQUIRED", CM_NULLPTR);
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 5b12a75..823b38f 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -276,7 +276,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
     if (args[1] == "__run_iwyu") {
       if (args.size() < 3) {
         std::cerr << "__run_iwyu Usage: -E __run_iwyu [--iwyu=/path/iwyu]"
-                     " [--tidy=/path/tidy] -- compile command\n";
+                     " [--cpplint=/path/cpplint] [--tidy=/path/tidy]"
+                     " -- compile command\n";
         return 1;
       }
       bool doing_options = true;
@@ -285,6 +286,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
       std::string tidy;
       std::string sourceFile;
       std::string lwyu;
+      std::string cpplint;
       for (std::string::size_type cc = 2; cc < args.size(); cc++) {
         std::string const& arg = args[cc];
         if (arg == "--") {
@@ -297,6 +299,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
           sourceFile = arg.substr(9);
         } else if (doing_options && cmHasLiteralPrefix(arg, "--lwyu=")) {
           lwyu = arg.substr(7);
+        } else if (doing_options && cmHasLiteralPrefix(arg, "--cpplint=")) {
+          cpplint = arg.substr(10);
         } else if (doing_options) {
           std::cerr << "__run_iwyu given unknown argument: " << arg << "\n";
           return 1;
@@ -304,12 +308,14 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
           orig_cmd.push_back(arg);
         }
       }
-      if (tidy.empty() && iwyu.empty() && lwyu.empty()) {
-        std::cerr << "__run_iwyu missing --tidy= or --iwyu=\n";
+      if (tidy.empty() && iwyu.empty() && lwyu.empty() && cpplint.empty()) {
+        std::cerr << "__run_iwyu missing --cpplint=, --iwyu=, --lwyu=, and/or"
+                     " --tidy=\n";
         return 1;
       }
-      if (!tidy.empty() && sourceFile.empty()) {
-        std::cerr << "__run_iwyu --tidy= requires --source=\n";
+      if ((!cpplint.empty() || !tidy.empty()) && sourceFile.empty()) {
+        std::cerr << "__run_iwyu --cpplint= and/or __run_iwyu --tidy="
+                     " require --source=\n";
         return 1;
       }
       if (orig_cmd.empty() && lwyu.empty()) {
@@ -403,6 +409,32 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
           std::cerr << "Warning: " << stdOut;
         }
       }
+
+      if (!cpplint.empty()) {
+        // Construct the cpplint command line.
+        std::vector<std::string> cpplint_cmd;
+        cmSystemTools::ExpandListArgument(cpplint, cpplint_cmd, true);
+        cpplint_cmd.push_back(sourceFile);
+
+        // Run the cpplint command line.  Capture its output.
+        std::string stdOut;
+        if (!cmSystemTools::RunSingleCommand(cpplint_cmd, &stdOut, &stdOut,
+                                             &ret, CM_NULLPTR,
+                                             cmSystemTools::OUTPUT_NONE)) {
+          std::cerr << "Error running '" << cpplint_cmd[0] << "': " << stdOut
+                    << "\n";
+          return 1;
+        }
+
+        // Output the output from cpplint to stderr
+        std::cerr << stdOut;
+
+        // If cpplint exited with an error do the same.
+        if (ret != 0) {
+          return ret;
+        }
+      }
+
       ret = 0;
       // Now run the real compiler command and return its result value.
       if (lwyu.empty() &&
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d2465c4..d6d4c0c 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -340,8 +340,10 @@ if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
   endif()
   add_executable(pseudo_tidy pseudo_tidy.c)
   add_executable(pseudo_iwyu pseudo_iwyu.c)
+  add_executable(pseudo_cpplint pseudo_cpplint.c)
   add_RunCMake_test(ClangTidy -DPSEUDO_TIDY=$<TARGET_FILE:pseudo_tidy>)
   add_RunCMake_test(IncludeWhatYouUse -DPSEUDO_IWYU=$<TARGET_FILE:pseudo_iwyu>)
+  add_RunCMake_test(Cpplint -DPSEUDO_CPPLINT=$<TARGET_FILE:pseudo_cpplint>)
   add_RunCMake_test(CompilerLauncher)
 endif()
 
diff --git a/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt b/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt
index 0d0d899..35f50b7 100644
--- a/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt
+++ b/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt
@@ -1 +1 @@
-^__run_iwyu missing --tidy= or --iwyu=$
+^__run_iwyu missing --cpplint=, --iwyu=, --lwyu=, and/or --tidy=$
diff --git a/Tests/RunCMake/Cpplint/C-Build-stdout.txt b/Tests/RunCMake/Cpplint/C-Build-stdout.txt
new file mode 100644
index 0000000..3d68d40
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-Build-stdout.txt
@@ -0,0 +1,2 @@
+Done processing .*Tests[/\]RunCMake[/\]Cpplint[/\]main\.c
+Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/C-error-Build-result.txt b/Tests/RunCMake/Cpplint/C-error-Build-result.txt
new file mode 100644
index 0000000..d197c91
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error-Build-result.txt
@@ -0,0 +1 @@
+[^0]
diff --git a/Tests/RunCMake/Cpplint/C-error-Build-stdout.txt b/Tests/RunCMake/Cpplint/C-error-Build-stdout.txt
new file mode 100644
index 0000000..74c6a1e
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error-Build-stdout.txt
@@ -0,0 +1,2 @@
+Tests[/\]RunCMake[/\]Cpplint[/\]main\.c:0:  message  \[category/category\] \[0\]
+Total errors found: 1
diff --git a/Tests/RunCMake/Cpplint/C-error-launch-Build-result.txt b/Tests/RunCMake/Cpplint/C-error-launch-Build-result.txt
new file mode 100644
index 0000000..d197c91
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error-launch-Build-result.txt
@@ -0,0 +1 @@
+[^0]
diff --git a/Tests/RunCMake/Cpplint/C-error-launch-Build-stdout.txt b/Tests/RunCMake/Cpplint/C-error-launch-Build-stdout.txt
new file mode 100644
index 0000000..74c6a1e
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error-launch-Build-stdout.txt
@@ -0,0 +1,2 @@
+Tests[/\]RunCMake[/\]Cpplint[/\]main\.c:0:  message  \[category/category\] \[0\]
+Total errors found: 1
diff --git a/Tests/RunCMake/Cpplint/C-error-launch.cmake b/Tests/RunCMake/Cpplint/C-error-launch.cmake
new file mode 100644
index 0000000..c76e2e2
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error-launch.cmake
@@ -0,0 +1,3 @@
+set(CTEST_USE_LAUNCHERS 1)
+include(CTestUseLaunchers)
+include(C-error.cmake)
diff --git a/Tests/RunCMake/Cpplint/C-error.cmake b/Tests/RunCMake/Cpplint/C-error.cmake
new file mode 100644
index 0000000..29cf7ba
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error.cmake
@@ -0,0 +1,3 @@
+enable_language(C)
+set(CMAKE_C_CPPLINT "${PSEUDO_CPPLINT}" --error)
+add_executable(main main.c)
diff --git a/Tests/RunCMake/Cpplint/C-launch-Build-stdout.txt b/Tests/RunCMake/Cpplint/C-launch-Build-stdout.txt
new file mode 100644
index 0000000..3d68d40
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-launch-Build-stdout.txt
@@ -0,0 +1,2 @@
+Done processing .*Tests[/\]RunCMake[/\]Cpplint[/\]main\.c
+Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/C-launch.cmake b/Tests/RunCMake/Cpplint/C-launch.cmake
new file mode 100644
index 0000000..e66ca20
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-launch.cmake
@@ -0,0 +1,3 @@
+set(CTEST_USE_LAUNCHERS 1)
+include(CTestUseLaunchers)
+include(C.cmake)
diff --git a/Tests/RunCMake/Cpplint/C.cmake b/Tests/RunCMake/Cpplint/C.cmake
new file mode 100644
index 0000000..68e6ff4
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C.cmake
@@ -0,0 +1,3 @@
+enable_language(C)
+set(CMAKE_C_CPPLINT "${PSEUDO_CPPLINT}" --verbose=0 --linelength=80)
+add_executable(main main.c)
diff --git a/Tests/RunCMake/Cpplint/CMakeLists.txt b/Tests/RunCMake/Cpplint/CMakeLists.txt
new file mode 100644
index 0000000..a640c56
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.7)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/Cpplint/CXX-Build-stdout.txt b/Tests/RunCMake/Cpplint/CXX-Build-stdout.txt
new file mode 100644
index 0000000..91f0591
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-Build-stdout.txt
@@ -0,0 +1,2 @@
+Done processing .*Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx
+Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/CXX-error-Build-result.txt b/Tests/RunCMake/Cpplint/CXX-error-Build-result.txt
new file mode 100644
index 0000000..d197c91
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error-Build-result.txt
@@ -0,0 +1 @@
+[^0]
diff --git a/Tests/RunCMake/Cpplint/CXX-error-Build-stdout.txt b/Tests/RunCMake/Cpplint/CXX-error-Build-stdout.txt
new file mode 100644
index 0000000..5e86c54
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error-Build-stdout.txt
@@ -0,0 +1,2 @@
+Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx:0:  message  \[category\/category\] \[0\]
+Total errors found: 1
diff --git a/Tests/RunCMake/Cpplint/CXX-error-launch-Build-result.txt b/Tests/RunCMake/Cpplint/CXX-error-launch-Build-result.txt
new file mode 100644
index 0000000..d197c91
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error-launch-Build-result.txt
@@ -0,0 +1 @@
+[^0]
diff --git a/Tests/RunCMake/Cpplint/CXX-error-launch-Build-stdout.txt b/Tests/RunCMake/Cpplint/CXX-error-launch-Build-stdout.txt
new file mode 100644
index 0000000..5e86c54
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error-launch-Build-stdout.txt
@@ -0,0 +1,2 @@
+Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx:0:  message  \[category\/category\] \[0\]
+Total errors found: 1
diff --git a/Tests/RunCMake/Cpplint/CXX-error-launch.cmake b/Tests/RunCMake/Cpplint/CXX-error-launch.cmake
new file mode 100644
index 0000000..72dcbe9
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error-launch.cmake
@@ -0,0 +1,3 @@
+set(CTEST_USE_LAUNCHERS 1)
+include(CTestUseLaunchers)
+include(CXX-error.cmake)
diff --git a/Tests/RunCMake/Cpplint/CXX-error.cmake b/Tests/RunCMake/Cpplint/CXX-error.cmake
new file mode 100644
index 0000000..ad66ff5
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error.cmake
@@ -0,0 +1,3 @@
+enable_language(CXX)
+set(CMAKE_CXX_CPPLINT "${PSEUDO_CPPLINT}" --error)
+add_executable(main main.cxx)
diff --git a/Tests/RunCMake/Cpplint/CXX-launch-Build-stdout.txt b/Tests/RunCMake/Cpplint/CXX-launch-Build-stdout.txt
new file mode 100644
index 0000000..91f0591
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-launch-Build-stdout.txt
@@ -0,0 +1,2 @@
+Done processing .*Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx
+Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/CXX-launch.cmake b/Tests/RunCMake/Cpplint/CXX-launch.cmake
new file mode 100644
index 0000000..3002c9d
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-launch.cmake
@@ -0,0 +1,3 @@
+set(CTEST_USE_LAUNCHERS 1)
+include(CTestUseLaunchers)
+include(CXX.cmake)
diff --git a/Tests/RunCMake/Cpplint/CXX.cmake b/Tests/RunCMake/Cpplint/CXX.cmake
new file mode 100644
index 0000000..35f05ee
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX.cmake
@@ -0,0 +1,3 @@
+enable_language(CXX)
+set(CMAKE_CXX_CPPLINT "${PSEUDO_CPPLINT}" --verbose=0 --linelength=80)
+add_executable(main main.cxx)
diff --git a/Tests/RunCMake/Cpplint/RunCMakeTest.cmake b/Tests/RunCMake/Cpplint/RunCMakeTest.cmake
new file mode 100644
index 0000000..51bce2c
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/RunCMakeTest.cmake
@@ -0,0 +1,27 @@
+include(RunCMake)
+
+set(RunCMake_TEST_OPTIONS "-DPSEUDO_CPPLINT=${PSEUDO_CPPLINT}")
+
+function(run_cpplint lang)
+  # Use a single build tree for tests without cleaning.
+  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/${lang}-build")
+  set(RunCMake_TEST_NO_CLEAN 1)
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+  run_cmake(${lang})
+
+  set(RunCMake_TEST_OUTPUT_MERGE 1)
+  run_cmake_command(${lang}-Build ${CMAKE_COMMAND} --build .)
+endfunction()
+
+run_cpplint(C)
+run_cpplint(CXX)
+run_cpplint(C-error)
+run_cpplint(CXX-error)
+
+if(NOT RunCMake_GENERATOR STREQUAL "Watcom WMake")
+  run_cpplint(C-launch)
+  run_cpplint(CXX-launch)
+  run_cpplint(C-error-launch)
+  run_cpplint(CXX-error-launch)
+endif()
diff --git a/Tests/RunCMake/Cpplint/main.c b/Tests/RunCMake/Cpplint/main.c
new file mode 100644
index 0000000..8488f4e
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/main.c
@@ -0,0 +1,4 @@
+int main(void)
+{
+  return 0;
+}
diff --git a/Tests/RunCMake/Cpplint/main.cxx b/Tests/RunCMake/Cpplint/main.cxx
new file mode 100644
index 0000000..f8b643a
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/main.cxx
@@ -0,0 +1,4 @@
+int main()
+{
+  return 0;
+}
diff --git a/Tests/RunCMake/pseudo_cpplint.c b/Tests/RunCMake/pseudo_cpplint.c
new file mode 100644
index 0000000..a089ac5
--- /dev/null
+++ b/Tests/RunCMake/pseudo_cpplint.c
@@ -0,0 +1,23 @@
+#include <stdio.h>
+#include <string.h>
+
+int main(int argc, char* argv[])
+{
+  int error = 0;
+  int i;
+  for (i = 1; i < argc; ++i) {
+    if (strcmp(argv[i], "--error") == 0) {
+      error = 1;
+    }
+    if (argv[i][0] != '-') {
+      if (error) {
+        fprintf(stderr, "%s:0:  message  [category/category] [0]\n", argv[i]);
+        fprintf(stdout, "Total errors found: 1\n");
+        return 1;
+      }
+      fprintf(stdout, "Done processing %s\n", argv[i]);
+      fprintf(stdout, "Total errors found: 0\n");
+      return 0;
+    }
+  }
+}

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

Summary of changes:
 Auxiliary/vim/syntax/cmake.vim                     |    4 +-
 Help/manual/cmake-properties.7.rst                 |    1 +
 Help/manual/cmake-variables.7.rst                  |    1 +
 Help/prop_tgt/LANG_CPPLINT.rst                     |   13 ++++++
 Help/release/dev/add-LANG_CPPLINT.rst              |    8 ++++
 Help/variable/CMAKE_LANG_CPPLINT.rst               |    6 +++
 Source/cmMakefileTargetGenerator.cxx               |   10 ++++-
 Source/cmNinjaTargetGenerator.cxx                  |   10 ++++-
 Source/cmTarget.cxx                                |    2 +
 Source/cmcmd.cxx                                   |   42 +++++++++++++++++---
 Tests/RunCMake/CMakeLists.txt                      |    2 +
 .../CommandLine/E___run_iwyu-no-iwyu-stderr.txt    |    2 +-
 Tests/RunCMake/Cpplint/C-Build-stdout.txt          |    2 +
 .../C-error-Build-result.txt}                      |    0
 Tests/RunCMake/Cpplint/C-error-Build-stdout.txt    |    2 +
 .../C-error-launch-Build-result.txt}               |    0
 .../Cpplint/C-error-launch-Build-stdout.txt        |    2 +
 Tests/RunCMake/Cpplint/C-error-launch.cmake        |    3 ++
 Tests/RunCMake/Cpplint/C-error.cmake               |    3 ++
 Tests/RunCMake/Cpplint/C-launch-Build-stdout.txt   |    2 +
 .../RunCMake/{ClangTidy => Cpplint}/C-launch.cmake |    0
 Tests/RunCMake/Cpplint/C.cmake                     |    3 ++
 .../{execute_process => Cpplint}/CMakeLists.txt    |    0
 Tests/RunCMake/Cpplint/CXX-Build-stdout.txt        |    2 +
 .../CXX-error-Build-result.txt}                    |    0
 Tests/RunCMake/Cpplint/CXX-error-Build-stdout.txt  |    2 +
 .../CXX-error-launch-Build-result.txt}             |    0
 .../Cpplint/CXX-error-launch-Build-stdout.txt      |    2 +
 Tests/RunCMake/Cpplint/CXX-error-launch.cmake      |    3 ++
 Tests/RunCMake/Cpplint/CXX-error.cmake             |    3 ++
 Tests/RunCMake/Cpplint/CXX-launch-Build-stdout.txt |    2 +
 .../{ClangTidy => Cpplint}/CXX-launch.cmake        |    0
 Tests/RunCMake/Cpplint/CXX.cmake                   |    3 ++
 Tests/RunCMake/Cpplint/RunCMakeTest.cmake          |   27 +++++++++++++
 .../LinkInterfaceLoop => RunCMake/Cpplint}/main.c  |    0
 Tests/RunCMake/{ClangTidy => Cpplint}/main.cxx     |    0
 Tests/RunCMake/pseudo_cpplint.c                    |   23 +++++++++++
 37 files changed, 175 insertions(+), 10 deletions(-)
 create mode 100644 Help/prop_tgt/LANG_CPPLINT.rst
 create mode 100644 Help/release/dev/add-LANG_CPPLINT.rst
 create mode 100644 Help/variable/CMAKE_LANG_CPPLINT.rst
 create mode 100644 Tests/RunCMake/Cpplint/C-Build-stdout.txt
 copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => Cpplint/C-error-Build-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Cpplint/C-error-Build-stdout.txt
 copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => Cpplint/C-error-launch-Build-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Cpplint/C-error-launch-Build-stdout.txt
 create mode 100644 Tests/RunCMake/Cpplint/C-error-launch.cmake
 create mode 100644 Tests/RunCMake/Cpplint/C-error.cmake
 create mode 100644 Tests/RunCMake/Cpplint/C-launch-Build-stdout.txt
 copy Tests/RunCMake/{ClangTidy => Cpplint}/C-launch.cmake (100%)
 create mode 100644 Tests/RunCMake/Cpplint/C.cmake
 copy Tests/RunCMake/{execute_process => Cpplint}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/Cpplint/CXX-Build-stdout.txt
 copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => Cpplint/CXX-error-Build-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Cpplint/CXX-error-Build-stdout.txt
 copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => Cpplint/CXX-error-launch-Build-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Cpplint/CXX-error-launch-Build-stdout.txt
 create mode 100644 Tests/RunCMake/Cpplint/CXX-error-launch.cmake
 create mode 100644 Tests/RunCMake/Cpplint/CXX-error.cmake
 create mode 100644 Tests/RunCMake/Cpplint/CXX-launch-Build-stdout.txt
 copy Tests/RunCMake/{ClangTidy => Cpplint}/CXX-launch.cmake (100%)
 create mode 100644 Tests/RunCMake/Cpplint/CXX.cmake
 create mode 100644 Tests/RunCMake/Cpplint/RunCMakeTest.cmake
 copy Tests/{CMakeOnly/LinkInterfaceLoop => RunCMake/Cpplint}/main.c (100%)
 copy Tests/RunCMake/{ClangTidy => Cpplint}/main.cxx (100%)
 create mode 100644 Tests/RunCMake/pseudo_cpplint.c


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:24:31 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:24:31 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2189-g53c9f27
Message-ID: <20170116162431.EF77EFA25C@public.kitware.com>

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  53c9f27fb81714007495ea29ed6f7172181278da (commit)
       via  7c8ab7ddc8944152a1344c43acbb8c57fa2d398a (commit)
      from  e0c88bb22dc43180f6e101eccf99d01f6da9ae28 (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=53c9f27fb81714007495ea29ed6f7172181278da
commit 53c9f27fb81714007495ea29ed6f7172181278da
Merge: e0c88bb 7c8ab7d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:24:30 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:24:30 2017 -0500

    Merge topic 'expand_custom_commands' into next
    
    7c8ab7dd add_custom_{command,target}: Add COMMAND_EXPAND_LISTS option


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c8ab7ddc8944152a1344c43acbb8c57fa2d398a
commit 7c8ab7ddc8944152a1344c43acbb8c57fa2d398a
Author:     Ed Branch <brance at mail.utexas.edu>
AuthorDate: Fri Jan 13 20:01:17 2017 -0600
Commit:     Ed Branch <brance at mail.utexas.edu>
CommitDate: Fri Jan 13 20:02:16 2017 -0600

    add_custom_{command,target}: Add COMMAND_EXPAND_LISTS option
    
    This option allows lists generated by generator expressions to be expanded.
    
    Closes: #15935

diff --git a/Help/command/add_custom_command.rst b/Help/command/add_custom_command.rst
index 4ab4298..80e7edf 100644
--- a/Help/command/add_custom_command.rst
+++ b/Help/command/add_custom_command.rst
@@ -21,7 +21,8 @@ The first signature is for adding a custom command to produce an output::
                      [WORKING_DIRECTORY dir]
                      [COMMENT comment]
                      [DEPFILE depfile]
-                     [VERBATIM] [APPEND] [USES_TERMINAL])
+                     [VERBATIM] [APPEND] [USES_TERMINAL]
+                     [COMMAND_EXPAND_LISTS])
 
 This defines a command to generate specified ``OUTPUT`` file(s).
 A target created in the same directory (``CMakeLists.txt`` file)
@@ -122,6 +123,14 @@ The options are:
   Arguments to ``DEPENDS`` may use
   :manual:`generator expressions <cmake-generator-expressions(7)>`.
 
+``COMMAND_EXPAND_LISTS``
+  Lists in ``COMMAND`` arguments will be expanded, including those
+  created with
+  :manual:`generator expressions <cmake-generator-expressions(7)>`,
+  allowing ``COMMAND`` arguments such as
+  ``${CC} "-I$<JOIN:$<TARGET_PROPERTY:foo,INCLUDE_DIRECTORIES>,;-I>" foo.cc``
+  to be properly expanded.
+
 ``IMPLICIT_DEPENDS``
   Request scanning of implicit dependencies of an input file.
   The language given specifies the programming language whose
diff --git a/Help/command/add_custom_target.rst b/Help/command/add_custom_target.rst
index 6980d61..bd61c8b 100644
--- a/Help/command/add_custom_target.rst
+++ b/Help/command/add_custom_target.rst
@@ -12,6 +12,7 @@ Add a target with no output so it will always be built.
                     [WORKING_DIRECTORY dir]
                     [COMMENT comment]
                     [VERBATIM] [USES_TERMINAL]
+                    [COMMAND_EXPAND_LISTS]
                     [SOURCES src1 [src2...]])
 
 Adds a target with the given name that executes the given commands.
@@ -88,6 +89,14 @@ The options are:
   Use the :command:`add_dependencies` command to add dependencies
   on other targets.
 
+``COMMAND_EXPAND_LISTS``
+  Lists in ``COMMAND`` arguments will be expanded, including those
+  created with
+  :manual:`generator expressions <cmake-generator-expressions(7)>`,
+  allowing ``COMMAND`` arguments such as
+  ``${CC} "-I$<JOIN:$<TARGET_PROPERTY:foo,INCLUDE_DIRECTORIES>,;-I>" foo.cc``
+  to be properly expanded.
+
 ``SOURCES``
   Specify additional source files to be included in the custom target.
   Specified source files will be added to IDE project files for
diff --git a/Help/release/dev/expand_custom_commands.rst b/Help/release/dev/expand_custom_commands.rst
new file mode 100644
index 0000000..c8cd897
--- /dev/null
+++ b/Help/release/dev/expand_custom_commands.rst
@@ -0,0 +1,7 @@
+expand_custom_commands
+----------------------
+
+* The commands :command:`add_custom_command` and :command:`add_custom_target`
+  learned the option ``COMMAND_EXPAND_LISTS`` which causes lists in the
+  ``COMMAND`` argument to be expanded, including lists created by generator
+  expressions.
diff --git a/Source/cmAddCustomCommandCommand.cxx b/Source/cmAddCustomCommandCommand.cxx
index 620de31..a100617 100644
--- a/Source/cmAddCustomCommandCommand.cxx
+++ b/Source/cmAddCustomCommandCommand.cxx
@@ -36,6 +36,7 @@ bool cmAddCustomCommandCommand::InitialPass(
   bool verbatim = false;
   bool append = false;
   bool uses_terminal = false;
+  bool command_expand_lists = false;
   std::string implicit_depends_lang;
   cmCustomCommand::ImplicitDependsList implicit_depends;
 
@@ -92,6 +93,8 @@ bool cmAddCustomCommandCommand::InitialPass(
       append = true;
     } else if (copy == "USES_TERMINAL") {
       uses_terminal = true;
+    } else if (copy == "COMMAND_EXPAND_LISTS") {
+      command_expand_lists = true;
     } else if (copy == "TARGET") {
       doing = doing_target;
     } else if (copy == "ARGS") {
@@ -281,12 +284,14 @@ bool cmAddCustomCommandCommand::InitialPass(
     std::vector<std::string> no_depends;
     this->Makefile->AddCustomCommandToTarget(
       target, byproducts, no_depends, commandLines, cctype, comment,
-      working.c_str(), escapeOldStyle, uses_terminal, depfile);
+      working.c_str(), escapeOldStyle, uses_terminal, depfile,
+      command_expand_lists);
   } else if (target.empty()) {
     // Target is empty, use the output.
     this->Makefile->AddCustomCommandToOutput(
       output, byproducts, depends, main_dependency, commandLines, comment,
-      working.c_str(), false, escapeOldStyle, uses_terminal, depfile);
+      working.c_str(), false, escapeOldStyle, uses_terminal,
+      command_expand_lists, depfile);
 
     // Add implicit dependency scanning requests if any were given.
     if (!implicit_depends.empty()) {
diff --git a/Source/cmAddCustomTargetCommand.cxx b/Source/cmAddCustomTargetCommand.cxx
index 56f33b4..0d01493 100644
--- a/Source/cmAddCustomTargetCommand.cxx
+++ b/Source/cmAddCustomTargetCommand.cxx
@@ -47,6 +47,7 @@ bool cmAddCustomTargetCommand::InitialPass(
   std::string working_directory;
   bool verbatim = false;
   bool uses_terminal = false;
+  bool command_expand_lists = false;
   std::string comment_buffer;
   const char* comment = CM_NULLPTR;
   std::vector<std::string> sources;
@@ -90,6 +91,9 @@ bool cmAddCustomTargetCommand::InitialPass(
     } else if (copy == "USES_TERMINAL") {
       doing = doing_nothing;
       uses_terminal = true;
+    } else if (copy == "COMMAND_EXPAND_LISTS") {
+      doing = doing_nothing;
+      command_expand_lists = true;
     } else if (copy == "COMMENT") {
       doing = doing_comment;
     } else if (copy == "COMMAND") {
@@ -221,12 +225,19 @@ bool cmAddCustomTargetCommand::InitialPass(
       "USES_TERMINAL may not be specified without any COMMAND");
     return true;
   }
+  if (commandLines.empty() && command_expand_lists) {
+    this->Makefile->IssueMessage(
+      cmake::FATAL_ERROR,
+      "COMMAND_EXPAND_LISTS may not be specified without any COMMAND");
+    return true;
+  }
 
   // Add the utility target to the makefile.
   bool escapeOldStyle = !verbatim;
   cmTarget* target = this->Makefile->AddUtilityCommand(
     targetName, excludeFromAll, working_directory.c_str(), byproducts, depends,
-    commandLines, escapeOldStyle, comment, uses_terminal);
+    commandLines, escapeOldStyle, comment, uses_terminal,
+    command_expand_lists);
 
   // Add additional user-specified source files to the target.
   target->AddSources(sources);
diff --git a/Source/cmCustomCommand.cxx b/Source/cmCustomCommand.cxx
index 6645b8e..050de17 100644
--- a/Source/cmCustomCommand.cxx
+++ b/Source/cmCustomCommand.cxx
@@ -13,6 +13,7 @@ cmCustomCommand::cmCustomCommand()
   this->EscapeOldStyle = true;
   this->EscapeAllowMakeVars = false;
   this->UsesTerminal = false;
+  this->CommandExpandLists = false;
 }
 
 cmCustomCommand::cmCustomCommand(cmMakefile const* mf,
@@ -32,6 +33,7 @@ cmCustomCommand::cmCustomCommand(cmMakefile const* mf,
   , HaveComment(comment != CM_NULLPTR)
   , EscapeAllowMakeVars(false)
   , EscapeOldStyle(true)
+  , CommandExpandLists(false)
 {
   if (mf) {
     this->Backtrace = mf->GetBacktrace();
@@ -127,6 +129,16 @@ void cmCustomCommand::SetUsesTerminal(bool b)
   this->UsesTerminal = b;
 }
 
+bool cmCustomCommand::GetCommandExpandLists() const
+{
+  return this->CommandExpandLists;
+}
+
+void cmCustomCommand::SetCommandExpandLists(bool b)
+{
+  this->CommandExpandLists = b;
+}
+
 const std::string& cmCustomCommand::GetDepfile() const
 {
   return this->Depfile;
diff --git a/Source/cmCustomCommand.h b/Source/cmCustomCommand.h
index 66f8fa9..73d53ff 100644
--- a/Source/cmCustomCommand.h
+++ b/Source/cmCustomCommand.h
@@ -85,6 +85,10 @@ public:
   bool GetUsesTerminal() const;
   void SetUsesTerminal(bool b);
 
+  /** Set/Get whether lists in command lines should be expanded. */
+  bool GetCommandExpandLists() const;
+  void SetCommandExpandLists(bool b);
+
   /** Set/Get the depfile (used by the Ninja generator) */
   const std::string& GetDepfile() const;
   void SetDepfile(const std::string& depfile);
@@ -103,6 +107,7 @@ private:
   bool EscapeAllowMakeVars;
   bool EscapeOldStyle;
   bool UsesTerminal;
+  bool CommandExpandLists;
 };
 
 #endif
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 8bd3a89..8f4ff4b 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -26,6 +26,24 @@ cmCustomCommandGenerator::cmCustomCommandGenerator(cmCustomCommand const& cc,
   , GE(new cmGeneratorExpression(cc.GetBacktrace()))
   , DependsDone(false)
 {
+  const cmCustomCommandLines& cmdlines = this->CC.GetCommandLines();
+  for (cmCustomCommandLines::const_iterator cmdline = cmdlines.begin();
+       cmdline != cmdlines.end(); ++cmdline) {
+    cmCustomCommandLine argv;
+    for (cmCustomCommandLine::const_iterator clarg = cmdline->begin();
+         clarg != cmdline->end(); ++clarg) {
+      CM_AUTO_PTR<cmCompiledGeneratorExpression> cge = this->GE->Parse(*clarg);
+      std::string parsed_arg = cge->Evaluate(this->LG, this->Config);
+      if (this->CC.GetCommandExpandLists()) {
+        std::vector<std::string> ExpandedArg;
+        cmSystemTools::ExpandListArgument(parsed_arg, ExpandedArg);
+        argv.insert(argv.end(), ExpandedArg.begin(), ExpandedArg.end());
+      } else {
+        argv.push_back(parsed_arg);
+      }
+    }
+    this->CommandLines.push_back(argv);
+  }
 }
 
 cmCustomCommandGenerator::~cmCustomCommandGenerator()
@@ -44,7 +62,7 @@ const char* cmCustomCommandGenerator::GetCrossCompilingEmulator(
   if (!this->LG->GetMakefile()->IsOn("CMAKE_CROSSCOMPILING")) {
     return CM_NULLPTR;
   }
-  std::string const& argv0 = this->CC.GetCommandLines()[c][0];
+  std::string const& argv0 = this->CommandLines[c][0];
   cmGeneratorTarget* target = this->LG->FindGeneratorTargetToUse(argv0);
   if (target && target->GetType() == cmStateEnums::EXECUTABLE &&
       !target->IsImported()) {
@@ -55,7 +73,7 @@ const char* cmCustomCommandGenerator::GetCrossCompilingEmulator(
 
 const char* cmCustomCommandGenerator::GetArgv0Location(unsigned int c) const
 {
-  std::string const& argv0 = this->CC.GetCommandLines()[c][0];
+  std::string const& argv0 = this->CommandLines[c][0];
   cmGeneratorTarget* target = this->LG->FindGeneratorTargetToUse(argv0);
   if (target && target->GetType() == cmStateEnums::EXECUTABLE &&
       (target->IsImported() ||
@@ -75,11 +93,7 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const
     return std::string(location);
   }
 
-  std::string const& argv0 = this->CC.GetCommandLines()[c][0];
-  CM_AUTO_PTR<cmCompiledGeneratorExpression> cge = this->GE->Parse(argv0);
-  std::string exe = cge->Evaluate(this->LG, this->Config);
-
-  return exe;
+  return this->CommandLines[c][0];
 }
 
 std::string escapeForShellOldStyle(const std::string& str)
@@ -114,7 +128,7 @@ void cmCustomCommandGenerator::AppendArguments(unsigned int c,
   if (this->GetCrossCompilingEmulator(c) != CM_NULLPTR) {
     offset = 0;
   }
-  cmCustomCommandLine const& commandLine = this->CC.GetCommandLines()[c];
+  cmCustomCommandLine const& commandLine = this->CommandLines[c];
   for (unsigned int j = offset; j < commandLine.size(); ++j) {
     std::string arg;
     if (const char* location =
@@ -123,7 +137,7 @@ void cmCustomCommandGenerator::AppendArguments(unsigned int c,
       // so transform the latter now.
       arg = location;
     } else {
-      arg = this->GE->Parse(commandLine[j])->Evaluate(this->LG, this->Config);
+      arg = commandLine[j];
     }
     cmd += " ";
     if (this->OldStyle) {
diff --git a/Source/cmCustomCommandGenerator.h b/Source/cmCustomCommandGenerator.h
index 8983c54..286aaf3 100644
--- a/Source/cmCustomCommandGenerator.h
+++ b/Source/cmCustomCommandGenerator.h
@@ -3,6 +3,7 @@
 #ifndef cmCustomCommandGenerator_h
 #define cmCustomCommandGenerator_h
 
+#include "cmCustomCommandLines.h"
 #include <cmConfigure.h> // IWYU pragma: keep
 
 #include <string>
@@ -22,6 +23,7 @@ class cmCustomCommandGenerator
   cmGeneratorExpression* GE;
   mutable bool DependsDone;
   mutable std::vector<std::string> Depends;
+  cmCustomCommandLines CommandLines;
 
   const char* GetCrossCompilingEmulator(unsigned int c) const;
   const char* GetArgv0Location(unsigned int c) const;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index cfc0495..bfe46ae 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -692,7 +692,7 @@ void cmMakefile::AddCustomCommandToTarget(
   const std::vector<std::string>& depends,
   const cmCustomCommandLines& commandLines, cmTarget::CustomCommandType type,
   const char* comment, const char* workingDir, bool escapeOldStyle,
-  bool uses_terminal, const std::string& depfile)
+  bool uses_terminal, const std::string& depfile, bool command_expand_lists)
 {
   // Find the target to which to add the custom command.
   cmTargets::iterator ti = this->Targets.find(target);
@@ -764,6 +764,7 @@ void cmMakefile::AddCustomCommandToTarget(
   cc.SetEscapeOldStyle(escapeOldStyle);
   cc.SetEscapeAllowMakeVars(true);
   cc.SetUsesTerminal(uses_terminal);
+  cc.SetCommandExpandLists(command_expand_lists);
   cc.SetDepfile(depfile);
   switch (type) {
     case cmTarget::PRE_BUILD:
@@ -784,7 +785,7 @@ cmSourceFile* cmMakefile::AddCustomCommandToOutput(
   const std::vector<std::string>& depends, const std::string& main_dependency,
   const cmCustomCommandLines& commandLines, const char* comment,
   const char* workingDir, bool replace, bool escapeOldStyle,
-  bool uses_terminal, const std::string& depfile)
+  bool uses_terminal, bool command_expand_lists, const std::string& depfile)
 {
   // Make sure there is at least one output.
   if (outputs.empty()) {
@@ -878,6 +879,7 @@ cmSourceFile* cmMakefile::AddCustomCommandToOutput(
     cc->SetEscapeOldStyle(escapeOldStyle);
     cc->SetEscapeAllowMakeVars(true);
     cc->SetUsesTerminal(uses_terminal);
+    cc->SetCommandExpandLists(command_expand_lists);
     cc->SetDepfile(depfile);
     file->SetCustomCommand(cc);
     this->UpdateOutputToSourceMap(outputs, file);
@@ -916,14 +918,16 @@ cmSourceFile* cmMakefile::AddCustomCommandToOutput(
   const std::string& output, const std::vector<std::string>& depends,
   const std::string& main_dependency, const cmCustomCommandLines& commandLines,
   const char* comment, const char* workingDir, bool replace,
-  bool escapeOldStyle, bool uses_terminal, const std::string& depfile)
+  bool escapeOldStyle, bool uses_terminal, bool command_expand_lists,
+  const std::string& depfile)
 {
   std::vector<std::string> outputs;
   outputs.push_back(output);
   std::vector<std::string> no_byproducts;
   return this->AddCustomCommandToOutput(
     outputs, no_byproducts, depends, main_dependency, commandLines, comment,
-    workingDir, replace, escapeOldStyle, uses_terminal, depfile);
+    workingDir, replace, escapeOldStyle, uses_terminal, command_expand_lists,
+    depfile);
 }
 
 void cmMakefile::AddCustomCommandOldStyle(
@@ -1018,12 +1022,13 @@ cmTarget* cmMakefile::AddUtilityCommand(
   const std::string& utilityName, bool excludeFromAll,
   const char* workingDirectory, const std::vector<std::string>& depends,
   const cmCustomCommandLines& commandLines, bool escapeOldStyle,
-  const char* comment, bool uses_terminal)
+  const char* comment, bool uses_terminal, bool command_expand_lists)
 {
   std::vector<std::string> no_byproducts;
   return this->AddUtilityCommand(utilityName, excludeFromAll, workingDirectory,
                                  no_byproducts, depends, commandLines,
-                                 escapeOldStyle, comment, uses_terminal);
+                                 escapeOldStyle, comment, uses_terminal,
+                                 command_expand_lists);
 }
 
 cmTarget* cmMakefile::AddUtilityCommand(
@@ -1031,7 +1036,7 @@ cmTarget* cmMakefile::AddUtilityCommand(
   const char* workingDirectory, const std::vector<std::string>& byproducts,
   const std::vector<std::string>& depends,
   const cmCustomCommandLines& commandLines, bool escapeOldStyle,
-  const char* comment, bool uses_terminal)
+  const char* comment, bool uses_terminal, bool command_expand_lists)
 {
   // Create a target instance for this utility.
   cmTarget* target = this->AddNewTarget(cmStateEnums::UTILITY, utilityName);
@@ -1055,7 +1060,8 @@ cmTarget* cmMakefile::AddUtilityCommand(
     bool no_replace = false;
     this->AddCustomCommandToOutput(
       forced, byproducts, depends, no_main_dependency, commandLines, comment,
-      workingDirectory, no_replace, escapeOldStyle, uses_terminal);
+      workingDirectory, no_replace, escapeOldStyle, uses_terminal,
+      command_expand_lists);
     cmSourceFile* sf = target->AddSourceCMP0049(force);
 
     // The output is not actually created so mark it symbolic.
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 3484e5a..9d9e90a 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -125,7 +125,8 @@ public:
     const std::vector<std::string>& depends,
     const cmCustomCommandLines& commandLines, cmTarget::CustomCommandType type,
     const char* comment, const char* workingDir, bool escapeOldStyle = true,
-    bool uses_terminal = false, const std::string& depfile = "");
+    bool uses_terminal = false, const std::string& depfile = "",
+    bool command_expand_lists = false);
   cmSourceFile* AddCustomCommandToOutput(
     const std::vector<std::string>& outputs,
     const std::vector<std::string>& byproducts,
@@ -133,13 +134,15 @@ public:
     const std::string& main_dependency,
     const cmCustomCommandLines& commandLines, const char* comment,
     const char* workingDir, bool replace = false, bool escapeOldStyle = true,
-    bool uses_terminal = false, const std::string& depfile = "");
+    bool uses_terminal = false, bool command_expand_lists = false,
+    const std::string& depfile = "");
   cmSourceFile* AddCustomCommandToOutput(
     const std::string& output, const std::vector<std::string>& depends,
     const std::string& main_dependency,
     const cmCustomCommandLines& commandLines, const char* comment,
     const char* workingDir, bool replace = false, bool escapeOldStyle = true,
-    bool uses_terminal = false, const std::string& depfile = "");
+    bool uses_terminal = false, bool command_expand_lists = false,
+    const std::string& depfile = "");
   void AddCustomCommandOldStyle(const std::string& target,
                                 const std::vector<std::string>& outputs,
                                 const std::vector<std::string>& depends,
@@ -182,13 +185,15 @@ public:
     const std::string& utilityName, bool excludeFromAll,
     const char* workingDirectory, const std::vector<std::string>& depends,
     const cmCustomCommandLines& commandLines, bool escapeOldStyle = true,
-    const char* comment = CM_NULLPTR, bool uses_terminal = false);
+    const char* comment = CM_NULLPTR, bool uses_terminal = false,
+    bool command_expand_lists = false);
   cmTarget* AddUtilityCommand(
     const std::string& utilityName, bool excludeFromAll,
     const char* workingDirectory, const std::vector<std::string>& byproducts,
     const std::vector<std::string>& depends,
     const cmCustomCommandLines& commandLines, bool escapeOldStyle = true,
-    const char* comment = CM_NULLPTR, bool uses_terminal = false);
+    const char* comment = CM_NULLPTR, bool uses_terminal = false,
+    bool command_expand_lists = false);
 
   /**
    * Add a subdirectory to the build.
diff --git a/Tests/CustomCommand/CMakeLists.txt b/Tests/CustomCommand/CMakeLists.txt
index db57e19..e9a9f52 100644
--- a/Tests/CustomCommand/CMakeLists.txt
+++ b/Tests/CustomCommand/CMakeLists.txt
@@ -513,3 +513,24 @@ add_custom_target(UseConsoleTarget ALL
   VERBATIM
   USES_TERMINAL
 )
+
+# Test COMMAND_EXPAND_LISTS
+set(cmp_args "1ARG=COMMAND_EXPAND_LISTS" "2ARG=test" "3ARG=outfile"
+  "4ARG=content")
+set(AARGS "")
+foreach(arg IN LISTS cmp_args)
+  list(APPEND AARGS "-DA${arg}")
+endforeach()
+
+set(gen_file "expand_custom_command.phony")
+add_custom_command(
+  OUTPUT "${gen_file}"
+  COMMAND ${CMAKE_COMMAND} ${AARGS}
+    "-DB$<JOIN:$<TARGET_PROPERTY:command_expand_lists,CMPARGS>,;-DB>"
+    "-P" "${CMAKE_CURRENT_SOURCE_DIR}/compare_options.cmake"
+    COMMAND_EXPAND_LISTS
+  VERBATIM
+)
+set_property(SOURCE "${gen_file}" PROPERTY SYMBOLIC ON)
+add_custom_target(command_expand_lists ALL DEPENDS "${gen_file}")
+set_property(TARGET command_expand_lists PROPERTY CMPARGS "${cmp_args}")
diff --git a/Tests/CustomCommand/compare_options.cmake b/Tests/CustomCommand/compare_options.cmake
new file mode 100644
index 0000000..a32e579
--- /dev/null
+++ b/Tests/CustomCommand/compare_options.cmake
@@ -0,0 +1,14 @@
+set(range 1 2 3 4 5 6 7 8 9 10)
+set(aargs "")
+set(bargs "")
+foreach(n IN LISTS range)
+  set(aval "${A${n}ARG}")
+  set(bval "${B${n}ARG}")
+  if(aval OR bval)
+    list(APPEND aargs "\"${aval}\"")
+    list(APPEND bargs "\"${bval}\"")
+  endif()
+endforeach()
+if(NOT "${aargs}" STREQUAL "${bargs}")
+  message(FATAL_ERROR "COMPARE_OPTIONS: \n\t${aargs} != \n\t${bargs}")
+endif()

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

Summary of changes:
 Help/command/add_custom_command.rst         |   11 ++++++++-
 Help/command/add_custom_target.rst          |    9 ++++++++
 Help/release/dev/expand_custom_commands.rst |    7 ++++++
 Source/cmAddCustomCommandCommand.cxx        |    9 ++++++--
 Source/cmAddCustomTargetCommand.cxx         |   13 ++++++++++-
 Source/cmCustomCommand.cxx                  |   12 ++++++++++
 Source/cmCustomCommand.h                    |    5 +++++
 Source/cmCustomCommandGenerator.cxx         |   32 +++++++++++++++++++--------
 Source/cmCustomCommandGenerator.h           |    2 ++
 Source/cmMakefile.cxx                       |   22 +++++++++++-------
 Source/cmMakefile.h                         |   15 ++++++++-----
 Tests/CustomCommand/CMakeLists.txt          |   21 ++++++++++++++++++
 Tests/CustomCommand/compare_options.cmake   |   14 ++++++++++++
 13 files changed, 146 insertions(+), 26 deletions(-)
 create mode 100644 Help/release/dev/expand_custom_commands.rst
 create mode 100644 Tests/CustomCommand/compare_options.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:26:29 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:26:29 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2191-gbf84865
Message-ID: <20170116162629.33CDFFA2C0@public.kitware.com>

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  bf84865411f11faec1e16d3e202ce69c9ecaf56b (commit)
       via  50f0a478f0af759cf8107f3dd7aa8d811579c4c3 (commit)
      from  53c9f27fb81714007495ea29ed6f7172181278da (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=bf84865411f11faec1e16d3e202ce69c9ecaf56b
commit bf84865411f11faec1e16d3e202ce69c9ecaf56b
Merge: 53c9f27 50f0a47
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:26:28 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:26:28 2017 -0500

    Merge topic 'FindICU-include-dirs' into next
    
    50f0a478 FindICU: Add 'include' to the path suffixes


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50f0a478f0af759cf8107f3dd7aa8d811579c4c3
commit 50f0a478f0af759cf8107f3dd7aa8d811579c4c3
Author:     Florent Castelli <florent.castelli at gmail.com>
AuthorDate: Sat Jan 14 18:05:34 2017 +0100
Commit:     Florent Castelli <florent.castelli at gmail.com>
CommitDate: Sat Jan 14 18:05:34 2017 +0100

    FindICU: Add 'include' to the path suffixes

diff --git a/Modules/FindICU.cmake b/Modules/FindICU.cmake
index 36dd67e..5210f08 100644
--- a/Modules/FindICU.cmake
+++ b/Modules/FindICU.cmake
@@ -126,6 +126,7 @@ function(_ICU_FIND)
   # Generic 64-bit and 32-bit directories
   list(APPEND icu_binary_suffixes "${_bin64}" "bin")
   list(APPEND icu_library_suffixes "${_lib64}" "lib")
+  list(APPEND icu_include_suffixes "include")
 
   # Find all ICU programs
   foreach(program ${icu_programs})

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:27:54 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:27:54 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2193-gdf11625
Message-ID: <20170116162754.B6E6CFA2E8@public.kitware.com>

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  df116254f60064601fd6075a3385e6fce6a104cd (commit)
       via  cdf7e5d8661c5035e42d251d009b5ef49a11af98 (commit)
      from  bf84865411f11faec1e16d3e202ce69c9ecaf56b (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=df116254f60064601fd6075a3385e6fce6a104cd
commit df116254f60064601fd6075a3385e6fce6a104cd
Merge: bf84865 cdf7e5d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:27:54 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:27:54 2017 -0500

    Merge topic 'FindICU-include-dirs' into next
    
    cdf7e5d8 FindICU: Add 'include' to the path suffixes


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cdf7e5d8661c5035e42d251d009b5ef49a11af98
commit cdf7e5d8661c5035e42d251d009b5ef49a11af98
Author:     Florent Castelli <florent.castelli at gmail.com>
AuthorDate: Sat Jan 14 18:05:34 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 16 11:27:02 2017 -0500

    FindICU: Add 'include' to the path suffixes
    
    Without this FindICU doesn't recognise the installation within homebrew.

diff --git a/Modules/FindICU.cmake b/Modules/FindICU.cmake
index 36dd67e..5210f08 100644
--- a/Modules/FindICU.cmake
+++ b/Modules/FindICU.cmake
@@ -126,6 +126,7 @@ function(_ICU_FIND)
   # Generic 64-bit and 32-bit directories
   list(APPEND icu_binary_suffixes "${_bin64}" "bin")
   list(APPEND icu_library_suffixes "${_lib64}" "lib")
+  list(APPEND icu_include_suffixes "include")
 
   # Find all ICU programs
   foreach(program ${icu_programs})

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 11:31:31 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 11:31:31 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2195-gfcfd09c
Message-ID: <20170116163131.B1A9FFA360@public.kitware.com>

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  fcfd09c471c3091dea2955933f22876fec749a9a (commit)
       via  298b5b31caaa613259d0a1c56a299e8e523fd61a (commit)
      from  df116254f60064601fd6075a3385e6fce6a104cd (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=fcfd09c471c3091dea2955933f22876fec749a9a
commit fcfd09c471c3091dea2955933f22876fec749a9a
Merge: df11625 298b5b3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:31:30 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:31:30 2017 -0500

    Merge topic 'fixtureUnusedOrdering' into next
    
    298b5b31 CTest: Ensure setup/cleanup ordering even when fixture not required


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=298b5b31caaa613259d0a1c56a299e8e523fd61a
commit 298b5b31caaa613259d0a1c56a299e8e523fd61a
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Sun Jan 15 13:06:14 2017 +1100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 16 11:29:24 2017 -0500

    CTest: Ensure setup/cleanup ordering even when fixture not required
    
    Closes: #16558

diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 4e63654..6175e50 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -829,23 +829,31 @@ void cmCTestTestHandler::UpdateForFixtures(ListOfTests& tests) const
     addedTests.insert(p.Name);
   }
 
-  // This is a lookup of fixture name to a list of indices into the
-  // final tests array for tests which require that fixture. It is
-  // needed at the end to populate dependencies of the cleanup tests
-  // in our final list of tests.
+  // These are lookups of fixture name to a list of indices into the final
+  // tests array for tests which require that fixture and tests which are
+  // setups for that fixture. They are needed at the end to populate
+  // dependencies of the cleanup tests in our final list of tests.
   std::map<std::string, std::vector<size_t> > fixtureRequirements;
+  std::map<std::string, std::vector<size_t> > setupFixturesAdded;
 
   // Use integer index for iteration because we append to
   // the tests vector as we go
   size_t fixtureTestsAdded = 0;
   std::set<std::string> addedFixtures;
   for (size_t i = 0; i < tests.size(); ++i) {
-    if (tests[i].FixturesRequired.empty()) {
-      continue;
-    }
-    // Must copy the set of fixtures because we may invalidate
+    // There are two things to do for each test:
+    //   1. For every fixture required by this test, record that fixture as
+    //      being required and create dependencies on that fixture's setup
+    //      tests.
+    //   2. Record all setup tests in the final test list so we can later make
+    //      cleanup tests in the test list depend on their associated setup
+    //      tests to enforce correct ordering.
+
+    // 1. Handle fixture requirements
+    //
+    // Must copy the set of fixtures required because we may invalidate
     // the tests array by appending to it
-    const std::set<std::string> fixtures = tests[i].FixturesRequired;
+    std::set<std::string> fixtures = tests[i].FixturesRequired;
     for (std::set<std::string>::const_iterator fixturesIt = fixtures.begin();
          fixturesIt != fixtures.end(); ++fixturesIt) {
 
@@ -908,32 +916,62 @@ void cmCTestTestHandler::UpdateForFixtures(ListOfTests& tests) const
                            this->Quiet);
       }
     }
+
+    // 2. Record all setup fixtures included in the final list of tests
+    for (std::set<std::string>::const_iterator fixturesIt =
+           tests[i].FixturesSetup.begin();
+         fixturesIt != tests[i].FixturesSetup.end(); ++fixturesIt) {
+
+      const std::string& setupFixtureName = *fixturesIt;
+      if (setupFixtureName.empty()) {
+        continue;
+      }
+
+      setupFixturesAdded[setupFixtureName].push_back(i);
+    }
   }
 
   // Now that we have the final list of tests, we can update all cleanup
-  // tests to depend on those tests which require that fixture
+  // tests to depend on those tests which require that fixture and on any
+  // setup tests for that fixture. The latter is required to handle the
+  // pathological case where setup and cleanup tests are in the test set
+  // but no other test has that fixture as a requirement.
   for (ListOfTests::iterator tIt = tests.begin(); tIt != tests.end(); ++tIt) {
     cmCTestTestProperties& p = *tIt;
     const std::set<std::string>& cleanups = p.FixturesCleanup;
     for (std::set<std::string>::const_iterator fIt = cleanups.begin();
          fIt != cleanups.end(); ++fIt) {
       const std::string& fixture = *fIt;
+
+      // This cleanup test could be part of the original test list that was
+      // passed in. It is then possible that no other test requires the
+      // fIt fixture, so we have to check for this.
       std::map<std::string, std::vector<size_t> >::const_iterator cIt =
         fixtureRequirements.find(fixture);
-      if (cIt == fixtureRequirements.end()) {
-        // No test cases require the fixture this cleanup test is for.
-        // This cleanup test must have been part of the original test
-        // list passed in (which is not an error)
-        continue;
+      if (cIt != fixtureRequirements.end()) {
+        const std::vector<size_t>& indices = cIt->second;
+        for (std::vector<size_t>::const_iterator indexIt = indices.begin();
+             indexIt != indices.end(); ++indexIt) {
+          const std::string& reqTestName = tests[*indexIt].Name;
+          if (std::find(p.Depends.begin(), p.Depends.end(), reqTestName) ==
+              p.Depends.end()) {
+            p.Depends.push_back(reqTestName);
+          }
+        }
       }
 
-      const std::vector<size_t>& indices = cIt->second;
-      for (std::vector<size_t>::const_iterator indexIt = indices.begin();
-           indexIt != indices.end(); ++indexIt) {
-        const std::string& reqTestName = tests[*indexIt].Name;
-        if (std::find(p.Depends.begin(), p.Depends.end(), reqTestName) ==
-            p.Depends.end()) {
-          p.Depends.push_back(reqTestName);
+      // Ensure fixture cleanup tests always run after their setup tests, even
+      // if no other test cases require the fixture
+      cIt = setupFixturesAdded.find(fixture);
+      if (cIt != setupFixturesAdded.end()) {
+        const std::vector<size_t>& indices = cIt->second;
+        for (std::vector<size_t>::const_iterator indexIt = indices.begin();
+             indexIt != indices.end(); ++indexIt) {
+          const std::string& setupTestName = tests[*indexIt].Name;
+          if (std::find(p.Depends.begin(), p.Depends.end(), setupTestName) ==
+              p.Depends.end()) {
+            p.Depends.push_back(setupTestName);
+          }
         }
       }
     }
diff --git a/Tests/RunCMake/ctest_fixtures/CMakeLists.txt.in b/Tests/RunCMake/ctest_fixtures/CMakeLists.txt.in
index ba1c77a..ab50fdd 100644
--- a/Tests/RunCMake/ctest_fixtures/CMakeLists.txt.in
+++ b/Tests/RunCMake/ctest_fixtures/CMakeLists.txt.in
@@ -30,6 +30,8 @@ failTest(setupFails)    # 9
 passTest(wontRun)       # 10
 passTest(cyclicSetup)   # 11
 passTest(cyclicCleanup) # 12
+passTest(cleanupUnused) # 13
+passTest(setupUnused)   # 14
 
 # Define fixture dependencies and ordering
 set_tests_properties(setupFoo   PROPERTIES FIXTURES_SETUP    "Foo")
@@ -50,6 +52,9 @@ set_tests_properties(two        PROPERTIES FIXTURES_REQUIRED "Bar")
 set_tests_properties(three      PROPERTIES FIXTURES_REQUIRED "Meta;Bar")
 set_tests_properties(wontRun    PROPERTIES FIXTURES_REQUIRED "Fails")
 
+set_tests_properties(cleanupUnused PROPERTIES FIXTURES_CLEANUP "Unused")
+set_tests_properties(setupUnused   PROPERTIES FIXTURES_SETUP   "Unused")
+
 @CASE_CMAKELISTS_CYCLIC_CODE@
 
 # These are the cases verified by the main cmake build
@@ -62,6 +67,7 @@ set_tests_properties(wontRun    PROPERTIES FIXTURES_REQUIRED "Fails")
 #    wontRun        9, 10
 #    cyclicSetup    -NA- (configure fails)
 #    cyclicCleanup  -NA- (configure fails)
+#    unused         14, 13
 #
 # In the case of asking for just setupFoo, since there are
 # no tests using the Foo fixture, we do NOT expect cleanupFoo
diff --git a/Tests/RunCMake/ctest_fixtures/RunCMakeTest.cmake b/Tests/RunCMake/ctest_fixtures/RunCMakeTest.cmake
index f13289a..673cf57 100644
--- a/Tests/RunCMake/ctest_fixtures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_fixtures/RunCMakeTest.cmake
@@ -17,6 +17,7 @@ run_ctest_test(two      INCLUDE two)
 run_ctest_test(three    INCLUDE three)
 run_ctest_test(setupFoo INCLUDE setupFoo)
 run_ctest_test(wontRun  INCLUDE wontRun)
+run_ctest_test(unused   INCLUDE Unused)
 
 #------------------------------------------------------------
 # CMake configure will fail due to cyclic test dependencies
diff --git a/Tests/RunCMake/ctest_fixtures/unused-stdout.txt b/Tests/RunCMake/ctest_fixtures/unused-stdout.txt
new file mode 100644
index 0000000..b04a621
--- /dev/null
+++ b/Tests/RunCMake/ctest_fixtures/unused-stdout.txt
@@ -0,0 +1,9 @@
+Test project .*/Tests/RunCMake/ctest_fixtures/unused-build
+    Start 14: setupUnused
+1/2 Test #14: setupUnused +\.+ +Passed +[0-9.]+ sec
+    Start 13: cleanupUnused
+2/2 Test #13: cleanupUnused +\.+ +Passed +[0-9.]+ sec
++
+100% tests passed, 0 tests failed out of 2
++
+Total Test time \(real\) = +[0-9.]+ sec$

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

Summary of changes:
 Source/CTest/cmCTestTestHandler.cxx              |   82 ++++++++++++++++------
 Tests/RunCMake/ctest_fixtures/CMakeLists.txt.in  |    6 ++
 Tests/RunCMake/ctest_fixtures/RunCMakeTest.cmake |    1 +
 Tests/RunCMake/ctest_fixtures/unused-stdout.txt  |    9 +++
 4 files changed, 76 insertions(+), 22 deletions(-)
 create mode 100644 Tests/RunCMake/ctest_fixtures/unused-stdout.txt


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 13:38:17 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 13:38:17 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2199-g4ca4583
Message-ID: <20170116183817.9660AFA4AE@public.kitware.com>

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  4ca4583536da2da644e77805a638b52c4bee38d6 (commit)
       via  c25aaec199ba4cf231341864f38287d843555c21 (commit)
       via  7c8abe92cada5c27ec31a8289a53cfcefb85eb08 (commit)
       via  51f53df171a577f879bcceaf823522220932f46c (commit)
      from  fcfd09c471c3091dea2955933f22876fec749a9a (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=4ca4583536da2da644e77805a638b52c4bee38d6
commit 4ca4583536da2da644e77805a638b52c4bee38d6
Merge: fcfd09c c25aaec
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 13:38:16 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 13:38:16 2017 -0500

    Merge topic 'cdash_upload_retry' into next
    
    c25aaec1 ctest_submit: Update documentation for CDash upload retries
    7c8abe92 ctest_submit: improve handling of QUIET option
    51f53df1 ctest_submit: Allow RETRY_COUNT for CDASH_UPLOAD


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c25aaec199ba4cf231341864f38287d843555c21
commit c25aaec199ba4cf231341864f38287d843555c21
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Mon Jan 16 08:41:35 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 16 13:37:10 2017 -0500

    ctest_submit: Update documentation for CDash upload retries

diff --git a/Help/command/ctest_submit.rst b/Help/command/ctest_submit.rst
index 6830b59..a7d9708 100644
--- a/Help/command/ctest_submit.rst
+++ b/Help/command/ctest_submit.rst
@@ -56,10 +56,16 @@ Submit to CDash Upload API
 
 ::
 
-  ctest_submit(CDASH_UPLOAD <file> [CDASH_UPLOAD_TYPE <type>])
+  ctest_submit(CDASH_UPLOAD <file> [CDASH_UPLOAD_TYPE <type>]
+               [RETRY_COUNT <count>]
+               [RETRY_DELAY <delay>]
+               [QUIET])
 
 This second signature is used to upload files to CDash via the CDash
 file upload API. The api first sends a request to upload to CDash along
 with a content hash of the file. If CDash does not already have the file,
 then it is uploaded. Along with the file, a CDash type string is specified
 to tell CDash which handler to use to process the data.
+
+This signature accepts the ``RETRY_COUNT``, ``RETRY_DELAY``, and ``QUIET``
+options as described above.
diff --git a/Help/release/dev/cdash_upload_retry.rst b/Help/release/dev/cdash_upload_retry.rst
new file mode 100644
index 0000000..2ceb42b
--- /dev/null
+++ b/Help/release/dev/cdash_upload_retry.rst
@@ -0,0 +1,5 @@
+cdash-upload-retry
+-----------------------
+
+* The ``CDASH_UPLOAD`` signature of :command:`ctest_submit` was taught to honor
+  the ``RETRY_COUNT``, ``RETRY_DELAY``, and ``QUIET`` options.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c8abe92cada5c27ec31a8289a53cfcefb85eb08
commit 7c8abe92cada5c27ec31a8289a53cfcefb85eb08
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Jan 4 12:54:01 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 16 13:37:09 2017 -0500

    ctest_submit: improve handling of QUIET option
    
    Teach the CDASH_UPLOAD signature of ctest_submit() to more thoroughly
    respect the QUIET option.

diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx
index 0fb4239..ab1412d 100644
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@@ -19,6 +19,7 @@ cmCTestCurl::cmCTestCurl(cmCTest* ctest)
   // default is to verify https
   this->VerifyPeerOff = false;
   this->VerifyHostOff = false;
+  this->Quiet = false;
   this->TimeOutSeconds = 0;
   this->Curl = curl_easy_init();
 }
@@ -159,13 +160,14 @@ bool cmCTestCurl::UploadFile(std::string const& local_file,
 
   if (!responseData.empty()) {
     response = std::string(responseData.begin(), responseData.end());
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Curl response: ["
-                 << response << "]\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+                       "Curl response: [" << response << "]\n", this->Quiet);
   }
   std::string curlDebug;
   if (!debugData.empty()) {
     curlDebug = std::string(debugData.begin(), debugData.end());
-    cmCTestLog(this->CTest, DEBUG, "Curl debug: [" << curlDebug << "]\n");
+    cmCTestOptionalLog(this->CTest, DEBUG,
+                       "Curl debug: [" << curlDebug << "]\n", this->Quiet);
   }
   if (response.empty()) {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "No response from server.\n"
@@ -179,9 +181,10 @@ bool cmCTestCurl::HttpRequest(std::string const& url,
                               std::string const& fields, std::string& response)
 {
   response = "";
-  cmCTestLog(this->CTest, DEBUG, "HttpRequest\n"
-               << "url: " << url << "\n"
-               << "fields " << fields << "\n");
+  cmCTestOptionalLog(this->CTest, DEBUG, "HttpRequest\n"
+                       << "url: " << url << "\n"
+                       << "fields " << fields << "\n",
+                     this->Quiet);
   if (!this->InitCurl()) {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Initialization of curl failed");
     return false;
@@ -204,13 +207,16 @@ bool cmCTestCurl::HttpRequest(std::string const& url,
 
   if (!responseData.empty()) {
     response = std::string(responseData.begin(), responseData.end());
-    cmCTestLog(this->CTest, DEBUG, "Curl response: [" << response << "]\n");
+    cmCTestOptionalLog(this->CTest, DEBUG,
+                       "Curl response: [" << response << "]\n", this->Quiet);
   }
   if (!debugData.empty()) {
     std::string curlDebug = std::string(debugData.begin(), debugData.end());
-    cmCTestLog(this->CTest, DEBUG, "Curl debug: [" << curlDebug << "]\n");
+    cmCTestOptionalLog(this->CTest, DEBUG,
+                       "Curl debug: [" << curlDebug << "]\n", this->Quiet);
   }
-  cmCTestLog(this->CTest, DEBUG, "Curl res: " << res << "\n");
+  cmCTestOptionalLog(this->CTest, DEBUG, "Curl res: " << res << "\n",
+                     this->Quiet);
   return (res == 0);
 }
 
diff --git a/Source/CTest/cmCTestCurl.h b/Source/CTest/cmCTestCurl.h
index 17fbcff..cdce393 100644
--- a/Source/CTest/cmCTestCurl.h
+++ b/Source/CTest/cmCTestCurl.h
@@ -25,6 +25,7 @@ public:
   void SetCurlOptions(std::vector<std::string> const& args);
   void SetUseHttp10On() { this->UseHttp10 = true; }
   void SetTimeOutSeconds(int s) { this->TimeOutSeconds = s; }
+  void SetQuiet(bool b) { this->Quiet = b; }
   std::string Escape(std::string const& source);
 
 protected:
@@ -40,6 +41,7 @@ private:
   bool VerifyHostOff;
   bool VerifyPeerOff;
   bool UseHttp10;
+  bool Quiet;
   int TimeOutSeconds;
 };
 
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index f29f7b3..d8a7dca 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -1007,6 +1007,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     return -1;
   }
   cmCTestCurl curl(this->CTest);
+  curl.SetQuiet(this->Quiet);
   std::string curlopt(this->CTest->GetCTestConfiguration("CurlOptions"));
   std::vector<std::string> args;
   cmSystemTools::ExpandListArgument(curlopt, args);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51f53df171a577f879bcceaf823522220932f46c
commit 51f53df171a577f879bcceaf823522220932f46c
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Jan 4 10:27:37 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 16 13:37:09 2017 -0500

    ctest_submit: Allow RETRY_COUNT for CDASH_UPLOAD
    
    Teach the CDASH_UPLOAD signature of ctest_submit() to honor the
    RETRY_COUNT and RETRY_DELAY options.
    
    Also teach HttpRequest() to honor the default 120 second timeout
    for curl connections.

diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx
index 9a90f54..0fb4239 100644
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@@ -96,6 +96,13 @@ bool cmCTestCurl::InitCurl()
   }
   // enable HTTP ERROR parsing
   curl_easy_setopt(this->Curl, CURLOPT_FAILONERROR, 1);
+
+  // if there is little to no activity for too long stop submitting
+  if (this->TimeOutSeconds) {
+    curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_LIMIT, 1);
+    curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_TIME, this->TimeOutSeconds);
+  }
+
   return true;
 }
 
@@ -110,12 +117,7 @@ bool cmCTestCurl::UploadFile(std::string const& local_file,
   }
   /* enable uploading */
   curl_easy_setopt(this->Curl, CURLOPT_UPLOAD, 1);
-  // if there is little to no activity for too long stop submitting
-  if (this->TimeOutSeconds) {
-    ::curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_LIMIT, 1);
-    ::curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_TIME,
-                       this->TimeOutSeconds);
-  }
+
   /* HTTP PUT please */
   ::curl_easy_setopt(this->Curl, CURLOPT_PUT, 1);
   ::curl_easy_setopt(this->Curl, CURLOPT_VERBOSE, 1);
diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx
index 14b875f..5cf4ddc 100644
--- a/Source/CTest/cmCTestSubmitCommand.cxx
+++ b/Source/CTest/cmCTestSubmitCommand.cxx
@@ -157,6 +157,7 @@ bool cmCTestSubmitCommand::InitialPass(std::vector<std::string> const& args,
 bool cmCTestSubmitCommand::CheckArgumentKeyword(std::string const& arg)
 {
   if (this->CDashUpload) {
+    // Arguments specific to the CDASH_UPLOAD signature.
     if (arg == "CDASH_UPLOAD") {
       this->ArgumentDoing = ArgumentDoingCDashUpload;
       return true;
@@ -167,7 +168,7 @@ bool cmCTestSubmitCommand::CheckArgumentKeyword(std::string const& arg)
       return true;
     }
   } else {
-    // Look for arguments specific to this command.
+    // Arguments that cannot be used with CDASH_UPLOAD.
     if (arg == "PARTS") {
       this->ArgumentDoing = ArgumentDoingParts;
       this->PartsMentioned = true;
@@ -179,21 +180,21 @@ bool cmCTestSubmitCommand::CheckArgumentKeyword(std::string const& arg)
       this->FilesMentioned = true;
       return true;
     }
+  }
+  // Arguments used by both modes.
+  if (arg == "RETRY_COUNT") {
+    this->ArgumentDoing = ArgumentDoingRetryCount;
+    return true;
+  }
 
-    if (arg == "RETRY_COUNT") {
-      this->ArgumentDoing = ArgumentDoingRetryCount;
-      return true;
-    }
-
-    if (arg == "RETRY_DELAY") {
-      this->ArgumentDoing = ArgumentDoingRetryDelay;
-      return true;
-    }
+  if (arg == "RETRY_DELAY") {
+    this->ArgumentDoing = ArgumentDoingRetryDelay;
+    return true;
+  }
 
-    if (arg == "INTERNAL_TEST_CHECKSUM") {
-      this->InternalTest = true;
-      return true;
-    }
+  if (arg == "INTERNAL_TEST_CHECKSUM") {
+    this->InternalTest = true;
+    return true;
   }
 
   // Look for other arguments.
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 79c3663..f29f7b3 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -1022,6 +1022,30 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
                "Only http and https are supported for CDASH_UPLOAD\n");
     return -1;
   }
+  bool internalTest = cmSystemTools::IsOn(this->GetOption("InternalTest"));
+
+  // Get RETRY_COUNT and RETRY_DELAY values if they were set.
+  std::string retryDelayString = this->GetOption("RetryDelay") == CM_NULLPTR
+    ? ""
+    : this->GetOption("RetryDelay");
+  std::string retryCountString = this->GetOption("RetryCount") == CM_NULLPTR
+    ? ""
+    : this->GetOption("RetryCount");
+  unsigned long retryDelay = 0;
+  if (retryDelayString != "") {
+    if (!cmSystemTools::StringToULong(retryDelayString.c_str(), &retryDelay)) {
+      cmCTestLog(this->CTest, WARNING, "Invalid value for 'RETRY_DELAY' : "
+                   << retryDelayString << std::endl);
+    }
+  }
+  unsigned long retryCount = 0;
+  if (retryCountString != "") {
+    if (!cmSystemTools::StringToULong(retryCountString.c_str(), &retryCount)) {
+      cmCTestLog(this->CTest, WARNING, "Invalid value for 'RETRY_DELAY' : "
+                   << retryCountString << std::endl);
+    }
+  }
+
   char md5sum[33];
   md5sum[32] = 0;
   cmSystemTools::ComputeFileMD5(file, md5sum);
@@ -1058,7 +1082,33 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
                                 << "\nfile: " << file << "\n",
                      this->Quiet);
   std::string response;
-  if (!curl.HttpRequest(url, fields, response)) {
+
+  bool requestSucceeded = curl.HttpRequest(url, fields, response);
+  if (!internalTest && !requestSucceeded) {
+    // If request failed, wait and retry.
+    for (unsigned long i = 0; i < retryCount; i++) {
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+                         "   Request failed, waiting " << retryDelay
+                                                       << " seconds...\n",
+                         this->Quiet);
+
+      double stop = cmSystemTools::GetTime() + retryDelay;
+      while (cmSystemTools::GetTime() < stop) {
+        cmSystemTools::Delay(100);
+      }
+
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+                         "   Retry request: Attempt "
+                           << (i + 1) << " of " << retryCount << std::endl,
+                         this->Quiet);
+
+      requestSucceeded = curl.HttpRequest(url, fields, response);
+      if (requestSucceeded) {
+        break;
+      }
+    }
+  }
+  if (!internalTest && !requestSucceeded) {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error in HttpRequest\n"
                  << response);
     return -1;
@@ -1068,30 +1118,32 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
                      this->Quiet);
   Json::Value json;
   Json::Reader reader;
-  if (!reader.parse(response, json)) {
+  if (!internalTest && !reader.parse(response, json)) {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error parsing json string ["
                  << response << "]\n"
                  << reader.getFormattedErrorMessages() << "\n");
     return -1;
   }
-  if (json["status"].asInt() != 0) {
+  if (!internalTest && json["status"].asInt() != 0) {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Bad status returned from CDash: " << json["status"].asInt());
     return -1;
   }
-  if (json["datafilesmd5"].isArray()) {
-    int datares = json["datafilesmd5"][0].asInt();
-    if (datares == 1) {
-      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                         "File already exists on CDash, skip upload " << file
-                                                                      << "\n",
-                         this->Quiet);
-      return 0;
+  if (!internalTest) {
+    if (json["datafilesmd5"].isArray()) {
+      int datares = json["datafilesmd5"][0].asInt();
+      if (datares == 1) {
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+                           "File already exists on CDash, skip upload "
+                             << file << "\n",
+                           this->Quiet);
+        return 0;
+      }
+    } else {
+      cmCTestLog(this->CTest, ERROR_MESSAGE,
+                 "bad datafilesmd5 value in response " << response << "\n");
+      return -1;
     }
-  } else {
-    cmCTestLog(this->CTest, ERROR_MESSAGE,
-               "bad datafilesmd5 value in response " << response << "\n");
-    return -1;
   }
 
   std::string upload_as = cmSystemTools::GetFilenameName(file);
@@ -1100,7 +1152,40 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
        << "md5=" << md5sum << "&"
        << "filename=" << curl.Escape(upload_as) << "&"
        << "buildid=" << json["buildid"].asString();
-  if (!curl.UploadFile(file, url, fstr.str(), response)) {
+
+  bool uploadSucceeded = false;
+  if (!internalTest) {
+    uploadSucceeded = curl.UploadFile(file, url, fstr.str(), response);
+  }
+
+  if (!uploadSucceeded) {
+    // If upload failed, wait and retry.
+    for (unsigned long i = 0; i < retryCount; i++) {
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+                         "   Upload failed, waiting " << retryDelay
+                                                      << " seconds...\n",
+                         this->Quiet);
+
+      double stop = cmSystemTools::GetTime() + retryDelay;
+      while (cmSystemTools::GetTime() < stop) {
+        cmSystemTools::Delay(100);
+      }
+
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+                         "   Retry upload: Attempt "
+                           << (i + 1) << " of " << retryCount << std::endl,
+                         this->Quiet);
+
+      if (!internalTest) {
+        uploadSucceeded = curl.UploadFile(file, url, fstr.str(), response);
+      }
+      if (uploadSucceeded) {
+        break;
+      }
+    }
+  }
+
+  if (!uploadSucceeded) {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error uploading to CDash. "
                  << file << " " << url << " " << fstr.str());
     return -1;
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-result.txt
similarity index 100%
rename from Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadMissingFile-result.txt
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt
new file mode 100644
index 0000000..364ecde
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt
@@ -0,0 +1 @@
+Upload file not found: 'bad-upload'
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
deleted file mode 100644
index 21621d4..0000000
--- a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT/test.cmake:[0-9]+ \(ctest_submit\):
-  ctest_submit called with unknown argument "RETRY_COUNT".
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
deleted file mode 100644
index f726674..0000000
--- a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY/test.cmake:[0-9]+ \(ctest_submit\):
-  ctest_submit called with unknown argument "RETRY_DELAY".
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadRetry-result.txt
similarity index 100%
rename from Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadRetry-result.txt
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt
new file mode 100644
index 0000000..6780c17
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt
@@ -0,0 +1 @@
+error uploading to CDash.
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt b/Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt
new file mode 100644
index 0000000..a5459ac
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt
@@ -0,0 +1,4 @@
+   Upload failed, waiting 1 seconds...
+   Retry upload: Attempt 1 of 2
+   Upload failed, waiting 1 seconds...
+   Retry upload: Attempt 2 of 2
diff --git a/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
index a81bc96..e104f8a 100644
--- a/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
@@ -21,9 +21,9 @@ run_ctest_submit(PARTSCDashUpload PARTS Configure CDASH_UPLOAD)
 run_ctest_submit(PARTSCDashUploadType PARTS Configure CDASH_UPLOAD_TYPE)
 run_ctest_submit(CDashUploadPARTS CDASH_UPLOAD bad-upload PARTS)
 run_ctest_submit(CDashUploadFILES CDASH_UPLOAD bad-upload FILES)
-run_ctest_submit(CDashUploadRETRY_COUNT CDASH_UPLOAD bad-upload RETRY_COUNT)
-run_ctest_submit(CDashUploadRETRY_DELAY CDASH_UPLOAD bad-upload RETRY_DELAY)
 run_ctest_submit(CDashUploadNone CDASH_UPLOAD)
+run_ctest_submit(CDashUploadMissingFile CDASH_UPLOAD bad-upload)
+run_ctest_submit(CDashUploadRetry CDASH_UPLOAD ${CMAKE_CURRENT_LIST_FILE} CDASH_UPLOAD_TYPE foo RETRY_COUNT 2 RETRY_DELAY 1 INTERNAL_TEST_CHECKSUM)
 run_ctest_submit(CDashSubmitQuiet QUIET)
 
 function(run_ctest_CDashUploadFTP)

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

Summary of changes:
 Help/command/ctest_submit.rst                      |    8 +-
 Help/release/dev/cdash_upload_retry.rst            |    5 +
 Source/CTest/cmCTestCurl.cxx                       |   38 ++++---
 Source/CTest/cmCTestCurl.h                         |    2 +
 Source/CTest/cmCTestSubmitCommand.cxx              |   29 ++---
 Source/CTest/cmCTestSubmitHandler.cxx              |  118 +++++++++++++++++---
 ...esult.txt => CDashUploadMissingFile-result.txt} |    0
 .../ctest_submit/CDashUploadMissingFile-stderr.txt |    1 +
 .../ctest_submit/CDashUploadRETRY_COUNT-stderr.txt |    2 -
 .../ctest_submit/CDashUploadRETRY_DELAY-stderr.txt |    2 -
 ...ELAY-result.txt => CDashUploadRetry-result.txt} |    0
 .../ctest_submit/CDashUploadRetry-stderr.txt       |    1 +
 .../ctest_submit/CDashUploadRetry-stdout.txt       |    4 +
 Tests/RunCMake/ctest_submit/RunCMakeTest.cmake     |    4 +-
 14 files changed, 162 insertions(+), 52 deletions(-)
 create mode 100644 Help/release/dev/cdash_upload_retry.rst
 rename Tests/RunCMake/ctest_submit/{CDashUploadRETRY_COUNT-result.txt => CDashUploadMissingFile-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
 rename Tests/RunCMake/ctest_submit/{CDashUploadRETRY_DELAY-result.txt => CDashUploadRetry-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 13:53:31 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 13:53:31 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2201-g2af02e7
Message-ID: <20170116185331.5EF03F901E@public.kitware.com>

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  2af02e78b771682ddfe50f4a0cd7a16fc021ff56 (commit)
       via  f38644527cee6d99b48930bf88e84de15d98007b (commit)
      from  4ca4583536da2da644e77805a638b52c4bee38d6 (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=2af02e78b771682ddfe50f4a0cd7a16fc021ff56
commit 2af02e78b771682ddfe50f4a0cd7a16fc021ff56
Merge: 4ca4583 f386445
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 13:53:30 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 13:53:30 2017 -0500

    Merge topic 'cmCTestBuildHandler-fix-warning' into next
    
    f3864452 cmCTestBuildHandler: Fix warning in FragmentCompare signature


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f38644527cee6d99b48930bf88e84de15d98007b
commit f38644527cee6d99b48930bf88e84de15d98007b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 13:51:23 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 16 13:52:17 2017 -0500

    cmCTestBuildHandler: Fix warning in FragmentCompare signature
    
    ```
    warning: the specified comparator type does not provide a const call
    operator [-Wuser-defined-warnings]
    ```
    
    Reported-by: Sean McBride <sean at rogue-research.com>

diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index 3bf54f0..1868a1ee 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -506,7 +506,7 @@ public:
     : FTC(CM_NULLPTR)
   {
   }
-  bool operator()(std::string const& l, std::string const& r)
+  bool operator()(std::string const& l, std::string const& r) const
   {
     // Order files by modification time.  Use lexicographic order
     // among files with the same time.

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 16 14:12:46 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Jan 2017 14:12:46 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2204-ga191239
Message-ID: <20170116191246.EC77DF9D95@public.kitware.com>

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  a19123906c75f70d8f8289c57bd6e8bf4a24ae8b (commit)
       via  ee77941a1fdf3a617207b00a7f2e9315eaef7b31 (commit)
       via  219c7bdcb16cd1dfe2e72befa4334c5b8147e1d7 (commit)
      from  2af02e78b771682ddfe50f4a0cd7a16fc021ff56 (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=a19123906c75f70d8f8289c57bd6e8bf4a24ae8b
commit a19123906c75f70d8f8289c57bd6e8bf4a24ae8b
Merge: 2af02e7 ee77941
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 14:12:46 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 14:12:46 2017 -0500

    Merge topic 'update-kwsys' into next
    
    ee77941a Merge branch 'upstream-KWSys' into update-kwsys
    219c7bdc KWSys 2017-01-16 (a423d829)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee77941a1fdf3a617207b00a7f2e9315eaef7b31
commit ee77941a1fdf3a617207b00a7f2e9315eaef7b31
Merge: 35ad12f 219c7bd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 14:06:29 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 16 14:06:29 2017 -0500

    Merge branch 'upstream-KWSys' into update-kwsys
    
    * upstream-KWSys:
      KWSys 2017-01-16 (a423d829)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=219c7bdcb16cd1dfe2e72befa4334c5b8147e1d7
commit 219c7bdcb16cd1dfe2e72befa4334c5b8147e1d7
Author:     KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Mon Jan 16 08:53:56 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 16 14:06:28 2017 -0500

    KWSys 2017-01-16 (a423d829)
    
    Code extracted from:
    
        https://gitlab.kitware.com/utils/kwsys.git
    
    at commit a423d82989a4b89fa7d17f3dd5215684e902208e (master).
    
    Upstream Shortlog
    -----------------
    
    Ben Boeckel (1):
          45db0937 SystemTools: use PathExists where appropriate
    
    Brad King (1):
          e08eee61 SystemTools: Fix conversion warning in test case
    
    Eric Berge (1):
          687fcd79 Add -lsocket for libcmsys.a build on SunOS
    
    Gregor Jasny (1):
          0541ce21 SystemTools: Fix off-by-one in GetLineFromStream with size limit

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9eb3b2d..d4fe8a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -818,6 +818,9 @@ IF(KWSYS_C_SRCS OR KWSYS_CXX_SRCS)
         # for symbol lookup using dladdr
         TARGET_LINK_LIBRARIES(${KWSYS_NAMESPACE} ${CMAKE_DL_LIBS})
       ENDIF()
+      IF (CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+        TARGET_LINK_LIBRARIES(${KWSYS_NAMESPACE} socket)
+      ENDIF()
     ENDIF()
   ENDIF()
 
diff --git a/SystemTools.cxx b/SystemTools.cxx
index b018a43..97dd4ae 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -763,7 +763,7 @@ bool SystemTools::MakeDirectory(const char* path)
 
 bool SystemTools::MakeDirectory(const std::string& path)
 {
-  if (SystemTools::FileExists(path)) {
+  if (SystemTools::PathExists(path)) {
     return SystemTools::FileIsDirectory(path);
   }
   if (path.empty()) {
@@ -1280,7 +1280,7 @@ bool SystemTools::PathCygwinToWin32(const char* path, char* win32_path)
 
 bool SystemTools::Touch(const std::string& filename, bool create)
 {
-  if (!SystemTools::FileExists(filename)) {
+  if (!SystemTools::PathExists(filename)) {
     if (create) {
       FILE* file = Fopen(filename, "a+b");
       if (file) {
@@ -4289,7 +4289,7 @@ bool SystemTools::GetLineFromStream(std::istream& is, std::string& line,
     // if we read too much then truncate the buffer
     if (leftToRead > 0) {
       if (static_cast<long>(length) > leftToRead) {
-        buffer[leftToRead - 1] = 0;
+        buffer[leftToRead] = 0;
         leftToRead = 0;
       } else {
         leftToRead -= static_cast<long>(length);
@@ -4389,10 +4389,7 @@ bool SystemTools::SetPermissions(const char* file, mode_t mode,
 bool SystemTools::SetPermissions(const std::string& file, mode_t mode,
                                  bool honor_umask)
 {
-  // TEMPORARY / TODO:  After FileExists calls lstat() instead of
-  // access(), change this call to FileExists instead of
-  // TestFileAccess so that we don't follow symlinks.
-  if (!SystemTools::TestFileAccess(file, TEST_FILE_OK)) {
+  if (!SystemTools::PathExists(file)) {
     return false;
   }
   if (honor_umask) {
diff --git a/testSystemTools.cxx b/testSystemTools.cxx
index b04f2cb..8e1ea25 100644
--- a/testSystemTools.cxx
+++ b/testSystemTools.cxx
@@ -6,11 +6,13 @@
 #pragma warning(disable : 4786)
 #endif
 
+#include KWSYS_HEADER(FStream.hxx)
 #include KWSYS_HEADER(SystemTools.hxx)
 
 // Work-around CMake dependency scanning limitation.  This must
 // duplicate the above list of headers.
 #if 0
+#include "FStream.hxx.in"
 #include "SystemTools.hxx.in"
 #endif
 
@@ -857,6 +859,55 @@ static bool CheckFind()
   return res;
 }
 
+static bool CheckGetLineFromStream()
+{
+  const std::string fileWithFiveCharsOnFirstLine(TEST_SYSTEMTOOLS_SOURCE_DIR
+                                                 "/README.rst");
+
+  kwsys::ifstream file(fileWithFiveCharsOnFirstLine.c_str(), std::ios::in);
+
+  if (!file) {
+    std::cerr << "Problem opening: " << fileWithFiveCharsOnFirstLine
+              << std::endl;
+    return false;
+  }
+
+  std::string line;
+  bool has_newline = false;
+  bool result;
+
+  file.seekg(0, std::ios::beg);
+  result = kwsys::SystemTools::GetLineFromStream(file, line, &has_newline, -1);
+  if (!result || line.size() != 5) {
+    std::cerr << "First line does not have five characters: " << line.size()
+              << std::endl;
+    return false;
+  }
+
+  file.seekg(0, std::ios::beg);
+  result = kwsys::SystemTools::GetLineFromStream(file, line, &has_newline, -1);
+  if (!result || line.size() != 5) {
+    std::cerr << "First line does not have five characters after rewind: "
+              << line.size() << std::endl;
+    return false;
+  }
+
+  bool ret = true;
+
+  for (size_t size = 1; size <= 5; ++size) {
+    file.seekg(0, std::ios::beg);
+    result = kwsys::SystemTools::GetLineFromStream(file, line, &has_newline,
+                                                   static_cast<long>(size));
+    if (!result || line.size() != size) {
+      std::cerr << "Should have read " << size << " characters but got "
+                << line.size() << std::endl;
+      ret = false;
+    }
+  }
+
+  return ret;
+}
+
 //----------------------------------------------------------------------------
 int testSystemTools(int, char* [])
 {
@@ -893,5 +944,7 @@ int testSystemTools(int, char* [])
 
   res &= CheckFind();
 
+  res &= CheckGetLineFromStream();
+
   return res ? 0 : 1;
 }

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

Summary of changes:
 Source/kwsys/CMakeLists.txt      |    3 +++
 Source/kwsys/SystemTools.cxx     |   11 +++-----
 Source/kwsys/testSystemTools.cxx |   53 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Tue Jan 17 00:01:12 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Tue, 17 Jan 2017 00:01:12 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1113-g020cba3
Message-ID: <20170117050112.1C574FA38C@public.kitware.com>

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  020cba316bb3a4d33da5108ab10d2c06b4712427 (commit)
      from  35ad12f99e71515f9cc65b1219160b88095a5f6b (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=020cba316bb3a4d33da5108ab10d2c06b4712427
commit 020cba316bb3a4d33da5108ab10d2c06b4712427
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Tue Jan 17 00:01:04 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jan 17 00:01:04 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 0c64d70..d1054cf 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 20170116)
+set(CMake_VERSION_PATCH 20170117)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 17 08:53:05 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Jan 2017 08:53:05 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2206-gd38b13d
Message-ID: <20170117135305.97EDCFA24D@public.kitware.com>

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  d38b13d289dd67249d3d307562ff2a7a27d5785a (commit)
       via  4934381161c51afb5a3c0cb88f100e147c52759a (commit)
      from  a19123906c75f70d8f8289c57bd6e8bf4a24ae8b (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=d38b13d289dd67249d3d307562ff2a7a27d5785a
commit d38b13d289dd67249d3d307562ff2a7a27d5785a
Merge: a191239 4934381
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 08:53:04 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 17 08:53:04 2017 -0500

    Merge topic 'lang_lint' into next
    
    49343811 Revert "Add properties to run the cpplint style checker with the compiler"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4934381161c51afb5a3c0cb88f100e147c52759a
commit 4934381161c51afb5a3c0cb88f100e147c52759a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 08:52:53 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 17 08:52:53 2017 -0500

    Revert "Add properties to run the cpplint style checker with the compiler"
    
    This reverts commit 7cb0a515267709852e4553f742c10edf10e46474.

diff --git a/Auxiliary/vim/syntax/cmake.vim b/Auxiliary/vim/syntax/cmake.vim
index 1f19cb7..fabf9c1 100644
--- a/Auxiliary/vim/syntax/cmake.vim
+++ b/Auxiliary/vim/syntax/cmake.vim
@@ -32,11 +32,11 @@ syn region cmakeArguments start=/(/ end=/)/
 
 syn case match
 syn keyword cmakeProperty
-            \ ABSTRACT ADDITIONAL_MAKE_CLEAN_FILES ADVANCED ALIASED_TARGET ALLOW_DUPLICATE_CUSTOM_TARGETS ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_API ANDROID_API_MIN ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES ANDROID_GUI ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_DEBUG ARCHIVE_OUTPUT_DIRECTORY_RELEASE ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_DEBUG ARCHIVE_OUTPUT_NAME_RELEASE ATTACHED_FILES ATTACHED_FILES_ON_FAIL AUTOGEN_TARGETS_FOLDER AUTOGEN_TARGET_DEPENDS AUTOMOC AUTOMOC_MOC_OPTIONS AUTOMOC_TARGETS_FOLDER AUTORCC AUTORCC_OPTIONS AUTOUIC AUTOUIC_OPTIONS BINARY_DIR BUILD_WITH_INSTALL_RPATH BUNDLE BUNDLE_EXTENSION CACHE_VARIABLES CLEAN_NO_CUSTOM CMAKE_CONFIGURE_DEPENDS CMAKE_CXX_KNOWN_FEATURES CMAKE_C_KNOWN_FEATURES COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN COMPATIBLE_INTERFACE_STRING COMPILE_DEFINITIONS COMPILE_DEFINITIONS_DEBUG COMPILE_DEFINITIONS_RELEASE COMPILE_FEATURES COMPILE_FLAGS COMPILE_OPTIONS COMPILE_PDB_NAME COMPILE_PDB_NAME_DEBUG COMPILE_PDB_NAME_RELEASE COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG COMPILE_PDB_OUTPUT_DIRECTORY_RELEASE COST CPACK_DESKTOP_SHORTCUTS CPACK_NEVER_OVERWRITE CPACK_PERMANENT CPACK_STARTUP_SHORTCUTS CPACK_START_MENU_SHORTCUTS CPACK_WIX_ACL CROSSCOMPILING_EMULATOR CXX_EXTENSIONS CXX_CPPLINT CXX_STANDARD CXX_STANDARD_REQUIRED C_EXTENSIONS C_CPPLINT C_STANDARD C_STANDARD_REQUIRED DEBUG_CONFIGURATIONS DEBUG_POSTFIX DEFINE_SYMBOL DEFINITIONS DEPENDS DISABLED_FEATURES ECLIPSE_EXTRA_NATURES ENABLED_FEATURES ENABLED_LANGUAGES ENABLE_EXPORTS ENVIRONMENT EXCLUDE_FROM_ALL EXCLUDE_FROM_DEFAULT_BUILD EXCLUDE_FROM_DEFAULT_BUILD_DEBUG EXCLUDE_FROM_DEFAULT_BUILD_RELEASE EXPORT_NAME EXTERNAL_OBJECT EchoString FAIL_REGULAR_EXPRESSION FIND_LIBRARY_USE_LIB64_PATHS FIND_LIBRARY_USE_OPENBSD_VERSIONING FOLDER FRAMEWORK FRAMEWORK_VERSION Fortran_FORMAT Fortran_MODULE_DIRECTORY GENERATED GENERATOR_FILE_NAME GLOBAL_DEPENDS_DEBUG_MODE GLOBAL_DEPENDS_NO_CYCLES GNUtoMS HAS_CXX HEADER_FILE_ONLY HELPSTRING IMPLICIT_DEPENDS_INCLUDE_TRANSFORM IMPORTED IMPORTED_CONFIGURATIONS IMPORTED_IMPLIB IMPORTED_IMPLIB_DEBUG IMPORTED_IMPLIB_RELEASE IMPORTED_LINK_DEPENDENT_LIBRARIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUG IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_LANGUAGES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE IMPORTED_LINK_INTERFACE_LIBRARIES IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_MULTIPLICITY IMPORTED_LINK_INTERFACE_MULTIPLICITY_DEBUG IMPORTED_LINK_INTERFACE_MULTIPLICITY_RELEASE IMPORTED_LOCATION IMPORTED_LOCATION_DEBUG IMPORTED_LOCATION_RELEASE IMPORTED_NO_SONAME IMPORTED_NO_SONAME_DEBUG IMPORTED_NO_SONAME_RELEASE IMPORTED_SONAME IMPORTED_SONAME_DEBUG IMPORTED_SONAME_RELEASE IMPORT_PREFIX IMPORT_SUFFIX INCLUDE_DIRECTORIES INCLUDE_REGULAR_EXPRESSION INSTALL_NAME_DIR INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH INTERFACE_AUTOUIC_OPTIONS INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS INTERFACE_INCLUDE_DIRECTORIES INTERFACE_LINK_LIBRARIES INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SOURCES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES INTERPROCEDURAL_OPTIMIZATION INTERPROCEDURAL_OPTIMIZATION_DEBUG INTERPROCEDURAL_OPTIMIZATION_RELEASE IN_TRY_COMPILE JOB_POOLS JOB_POOL_COMPILE JOB_POOL_LINK KEEP_EXTENSION LABELS LANGUAGE LIBRARY_OUTPUT_DIRECTORY LIBRARY_OUTPUT_DIRECTORY_DEBUG LIBRARY_OUTPUT_DIRECTORY_RELEASE LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_DEBUG LIBRARY_OUTPUT_NAME_RELEASE LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED LINK_DIRECTORIES LINK_FLAGS LINK_FLAGS_DEBUG LINK_FLAGS_RELEASE LINK_INTERFACE_LIBRARIES LINK_INTERFACE_LIBRARIES_DEBUG LINK_INTERFACE_LIBRARIES_RELEASE LINK_INTERFACE_MULTIPLICITY LINK_INTERFACE_MULTIPLICITY_DEBUG LINK_INTERFACE_MULTIPLICITY_RELEASE LINK_LIBRARIES LINK_SEARCH_END_STATIC LINK_SEARCH_START_STATIC LISTFILE_STACK LOCATION LOCATION_DEBUG LOCATION_RELEASE MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_PACKAGE_LOCATION MACOSX_RPATH MACROS MAP_IMPORTED_CONFIG_DEBUG MAP_IMPORTED_CONFIG_RELEASE MEASUREMENT MODIFIED NAME NO_SONAME NO_SYSTEM_FROM_IMPORTED OBJECT_DEPENDS OBJECT_OUTPUTS OSX_ARCHITECTURES OSX_ARCHITECTURES_DEBUG OSX_ARCHITECTURES_RELEASE OUTPUT_NAME OUTPUT_NAME_DEBUG OUTPUT_NAME_RELEASE PACKAGES_FOUND PACKAGES_NOT_FOUND PARENT_DIRECTORY PASS_REGULAR_EXPRESSION PDB_NAME PDB_NAME_DEBUG PDB_NAME_RELEASE PDB_OUTPUT_DIRECTORY PDB_OUTPUT_DIRECTORY_DEBUG PDB_OUTPUT_DIRECTORY_RELEASE POSITION_INDEPENDENT_CODE POST_INSTALL_SCRIPT PREDEFINED_TARGETS_FOLDER PREFIX PRE_INSTALL_SCRIPT PRIVATE_HEADER PROCESSORS PROJECT_LABEL PUBLIC_HEADER REPORT_UNDEFINED_PROPERTIES REQUIRED_FILES RESOURCE RESOURCE_LOCK RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK RULE_MESSAGES RUNTIME_OUTPUT_DIRECTORY RUNTIME_OUTPUT_DIRECTORY_DEBUG RUNTIME_OUTPUT_DIRECTORY_RELEASE RUNTIME_OUTPUT_NAME RUNTIME_OUTPUT_NAME_DEBUG RUNTIME_OUTPUT_NAME_RELEASE RUN_SERIAL SKIP_BUILD_RPATH SKIP_RETURN_CODE SOURCES SOURCE_DIR SOVERSION STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_DEBUG STATIC_LIBRARY_FLAGS_RELEASE STRINGS SUFFIX SYMBOLIC TARGET_ARCHIVES_MAY_BE_SHARED_LIBS TARGET_MESSAGES TARGET_SUPPORTS_SHARED_LIBS TEST_INCLUDE_FILE TIMEOUT TYPE USE_FOLDERS VALUE VARIABLES VERSION VISIBILITY_INLINES_HIDDEN VS_DEPLOYMENT_CONTENT VS_DEPLOYMENT_LOCATION VS_DESKTOP_EXTENSIONS_VERSION VS_DOTNET_REFERENCES VS_DOTNET_TARGET_FRAMEWORK_VERSION VS_GLOBAL_KEYWORD VS_GLOBAL_PROJECT_TYPES VS_GLOBAL_ROOTNAMESPACE VS_IOT_EXTENSIONS_VERSION VS_IOT_STARTUP_TASK VS_KEYWORD VS_MOBILE_EXTENSIONS_VERSION VS_SCC_AUXPATH VS_SCC_LOCALPATH VS_SCC_PROJECTNAME VS_SCC_PROVIDER VS_SHADER_ENTRYPOINT VS_SHADER_FLAGS VS_SHADER_MODEL VS_SHADER_TYPE VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES VS_XAML_TYPE WILL_FAIL WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS WORKING_DIRECTORY WRAP_EXCLUDE XCODE_EXPLICIT_FILE_TYPE XCODE_LAST_KNOWN_FILE_TYPE XCTEST
+            \ ABSTRACT ADDITIONAL_MAKE_CLEAN_FILES ADVANCED ALIASED_TARGET ALLOW_DUPLICATE_CUSTOM_TARGETS ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_API ANDROID_API_MIN ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES ANDROID_GUI ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_DEBUG ARCHIVE_OUTPUT_DIRECTORY_RELEASE ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_DEBUG ARCHIVE_OUTPUT_NAME_RELEASE ATTACHED_FILES ATTACHED_FILES_ON_FAIL AUTOGEN_TARGETS_FOLDER AUTOGEN_TARGET_DEPENDS AUTOMOC AUTOMOC_MOC_OPTIONS AUTOMOC_TARGETS_FOLDER AUTORCC AUTORCC_OPTIONS AUTOUIC AUTOUIC_OPTIONS BINARY_DIR BUILD_WITH_INSTALL_RPATH BUNDLE BUNDLE_EXTENSION CACHE_VARIABLES CLEAN_NO_CUSTOM CMAKE_CONFIGURE_DEPENDS CMAKE_CXX_KNOWN_FEATURES CMAKE_C_KNOWN_FEATURES COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN COMPATIBLE_INTERFACE_STRING COMPILE_DEFINITIONS COMPILE_DEFINITIONS_DEBUG COMPILE_DEFINITIONS_RELEASE COMPILE_FEATURES COMPILE_FLAGS COMPILE_OPTIONS COMPILE_PDB_NAME COMPILE_PDB_NAME_DEBUG COMPILE_PDB_NAME_RELEASE COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG COMPILE_PDB_OUTPUT_DIRECTORY_RELEASE COST CPACK_DESKTOP_SHORTCUTS CPACK_NEVER_OVERWRITE CPACK_PERMANENT CPACK_STARTUP_SHORTCUTS CPACK_START_MENU_SHORTCUTS CPACK_WIX_ACL CROSSCOMPILING_EMULATOR CXX_EXTENSIONS CXX_STANDARD CXX_STANDARD_REQUIRED C_EXTENSIONS C_STANDARD C_STANDARD_REQUIRED DEBUG_CONFIGURATIONS DEBUG_POSTFIX DEFINE_SYMBOL DEFINITIONS DEPENDS DISABLED_FEATURES ECLIPSE_EXTRA_NATURES ENABLED_FEATURES ENABLED_LANGUAGES ENABLE_EXPORTS ENVIRONMENT EXCLUDE_FROM_ALL EXCLUDE_FROM_DEFAULT_BUILD EXCLUDE_FROM_DEFAULT_BUILD_DEBUG EXCLUDE_FROM_DEFAULT_BUILD_RELEASE EXPORT_NAME EXTERNAL_OBJECT EchoString FAIL_REGULAR_EXPRESSION FIND_LIBRARY_USE_LIB64_PATHS FIND_LIBRARY_USE_OPENBSD_VERSIONING FOLDER FRAMEWORK FRAMEWORK_VERSION Fortran_FORMAT Fortran_MODULE_DIRECTORY GENERATED GENERATOR_FILE_NAME GLOBAL_DEPENDS_DEBUG_MODE GLOBAL_DEPENDS_NO_CYCLES GNUtoMS HAS_CXX HEADER_FILE_ONLY HELPSTRING IMPLICIT_DEPENDS_INCLUDE_TRANSFORM IMPORTED IMPORTED_CONFIGURATIONS IMPORTED_IMPLIB IMPORTED_IMPLIB_DEBUG IMPORTED_IMPLIB_RELEASE IMPORTED_LINK_DEPENDENT_LIBRARIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUG IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_LANGUAGES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE IMPORTED_LINK_INTERFACE_LIBRARIES IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_MULTIPLICITY IMPORTED_LINK_INTERFACE_MULTIPLICITY_DEBUG IMPORTED_LINK_INTERFACE_MULTIPLICITY_RELEASE IMPORTED_LOCATION IMPORTED_LOCATION_DEBUG IMPORTED_LOCATION_RELEASE IMPORTED_NO_SONAME IMPORTED_NO_SONAME_DEBUG IMPORTED_NO_SONAME_RELEASE IMPORTED_SONAME IMPORTED_SONAME_DEBUG IMPORTED_SONAME_RELEASE IMPORT_PREFIX IMPORT_SUFFIX INCLUDE_DIRECTORIES INCLUDE_REGULAR_EXPRESSION INSTALL_NAME_DIR INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH INTERFACE_AUTOUIC_OPTIONS INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS INTERFACE_INCLUDE_DIRECTORIES INTERFACE_LINK_LIBRARIES INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SOURCES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES INTERPROCEDURAL_OPTIMIZATION INTERPROCEDURAL_OPTIMIZATION_DEBUG INTERPROCEDURAL_OPTIMIZATION_RELEASE IN_TRY_COMPILE JOB_POOLS JOB_POOL_COMPILE JOB_POOL_LINK KEEP_EXTENSION LABELS LANGUAGE LIBRARY_OUTPUT_DIRECTORY LIBRARY_OUTPUT_DIRECTORY_DEBUG LIBRARY_OUTPUT_DIRECTORY_RELEASE LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_DEBUG LIBRARY_OUTPUT_NAME_RELEASE LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED LINK_DIRECTORIES LINK_FLAGS LINK_FLAGS_DEBUG LINK_FLAGS_RELEASE LINK_INTERFACE_LIBRARIES LINK_INTERFACE_LIBRARIES_DEBUG LINK_INTERFACE_LIBRARIES_RELEASE LINK_INTERFACE_MULTIPLICITY LINK_INTERFACE_MULTIPLICITY_DEBUG LINK_INTERFACE_MULTIPLICITY_RELEASE LINK_LIBRARIES LINK_SEARCH_END_STATIC LINK_SEARCH_START_STATIC LISTFILE_STACK LOCATION LOCATION_DEBUG LOCATION_RELEASE MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_PACKAGE_LOCATION MACOSX_RPATH MACROS MAP_IMPORTED_CONFIG_DEBUG MAP_IMPORTED_CONFIG_RELEASE MEASUREMENT MODIFIED NAME NO_SONAME NO_SYSTEM_FROM_IMPORTED OBJECT_DEPENDS OBJECT_OUTPUTS OSX_ARCHITECTURES OSX_ARCHITECTURES_DEBUG OSX_ARCHITECTURES_RELEASE OUTPUT_NAME OUTPUT_NAME_DEBUG OUTPUT_NAME_RELEASE PACKAGES_FOUND PACKAGES_NOT_FOUND PARENT_DIRECTORY PASS_REGULAR_EXPRESSION PDB_NAME PDB_NAME_DEBUG PDB_NAME_RELEASE PDB_OUTPUT_DIRECTORY PDB_OUTPUT_DIRECTORY_DEBUG PDB_OUTPUT_DIRECTORY_RELEASE POSITION_INDEPENDENT_CODE POST_INSTALL_SCRIPT PREDEFINED_TARGETS_FOLDER PREFIX PRE_INSTALL_SCRIPT PRIVATE_HEADER PROCESSORS PROJECT_LABEL PUBLIC_HEADER REPORT_UNDEFINED_PROPERTIES REQUIRED_FILES RESOURCE RESOURCE_LOCK RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK RULE_MESSAGES RUNTIME_OUTPUT_DIRECTORY RUNTIME_OUTPUT_DIRECTORY_DEBUG RUNTIME_OUTPUT_DIRECTORY_RELEASE RUNTIME_OUTPUT_NAME RUNTIME_OUTPUT_NAME_DEBUG RUNTIME_OUTPUT_NAME_RELEASE RUN_SERIAL SKIP_BUILD_RPATH SKIP_RETURN_CODE SOURCES SOURCE_DIR SOVERSION STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_DEBUG STATIC_LIBRARY_FLAGS_RELEASE STRINGS SUFFIX SYMBOLIC TARGET_ARCHIVES_MAY_BE_SHARED_LIBS TARGET_MESSAGES TARGET_SUPPORTS_SHARED_LIBS TEST_INCLUDE_FILE TIMEOUT TYPE USE_FOLDERS VALUE VARIABLES VERSION VISIBILITY_INLINES_HIDDEN VS_DEPLOYMENT_CONTENT VS_DEPLOYMENT_LOCATION VS_DESKTOP_EXTENSIONS_VERSION VS_DOTNET_REFERENCES VS_DOTNET_TARGET_FRAMEWORK_VERSION VS_GLOBAL_KEYWORD VS_GLOBAL_PROJECT_TYPES VS_GLOBAL_ROOTNAMESPACE VS_IOT_EXTENSIONS_VERSION VS_IOT_STARTUP_TASK VS_KEYWORD VS_MOBILE_EXTENSIONS_VERSION VS_SCC_AUXPATH VS_SCC_LOCALPATH VS_SCC_PROJECTNAME VS_SCC_PROVIDER VS_SHADER_ENTRYPOINT VS_SHADER_FLAGS VS_SHADER_MODEL VS_SHADER_TYPE VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES VS_XAML_TYPE WILL_FAIL WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS WORKING_DIRECTORY WRAP_EXCLUDE XCODE_EXPLICIT_FILE_TYPE XCODE_LAST_KNOWN_FILE_TYPE XCTEST
             \ contained
 
 syn keyword cmakeVariable
-            \ <PROJECT-NAME>_BINARY_DIR <PROJECT-NAME>_SOURCE_DIR <PROJECT-NAME>_VERSION <PROJECT-NAME>_VERSION_MAJOR <PROJECT-NAME>_VERSION_MINOR <PROJECT-NAME>_VERSION_PATCH <PROJECT-NAME>_VERSION_TWEAK APPLE BORLAND BUILD_SHARED_LIBS CMAKE_<CONFIG>_POSTFIX CMAKE_<LANG>_ARCHIVE_APPEND CMAKE_<LANG>_ARCHIVE_CREATE CMAKE_<LANG>_ARCHIVE_FINISH CMAKE_<LANG>_COMPILER CMAKE_<LANG>_COMPILER_ABI CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN CMAKE_<LANG>_COMPILER_ID CMAKE_<LANG>_COMPILER_LAUNCHER CMAKE_<LANG>_COMPILER_LOADED CMAKE_<LANG>_COMPILER_TARGET CMAKE_<LANG>_COMPILER_VERSION CMAKE_<LANG>_COMPILE_OBJECT CMAKE_<LANG>_CREATE_SHARED_LIBRARY CMAKE_<LANG>_CREATE_SHARED_MODULE CMAKE_<LANG>_CREATE_STATIC_LIBRARY CMAKE_<LANG>_FLAGS CMAKE_<LANG>_FLAGS_DEBUG CMAKE_<LANG>_FLAGS_MINSIZEREL CMAKE_<LANG>_FLAGS_RELEASE CMAKE_<LANG>_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_GHS_KERNEL_FLAGS_DEBUG CMAKE_<LANG>_GHS_KERNEL_FLAGS_MINSIZEREL CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELEASE CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_IGNORE_EXTENSIONS CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_LIBRARIES CMAKE_<LANG>_INCLUDE_WHAT_YOU_USE CMAKE_<LANG>_CPPLINT CMAKE_<LANG>_LIBRARY_ARCHITECTURE CMAKE_<LANG>_LINKER_PREFERENCE CMAKE_<LANG>_LINKER_PREFERENCE_PROPAGATES CMAKE_<LANG>_LINK_EXECUTABLE CMAKE_<LANG>_OUTPUT_EXTENSION CMAKE_<LANG>_PLATFORM_ID CMAKE_<LANG>_SIMULATE_ID CMAKE_<LANG>_SIMULATE_VERSION CMAKE_<LANG>_SIZEOF_DATA_PTR CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS CMAKE_<LANG>_VISIBILITY_PRESET CMAKE_ABSOLUTE_DESTINATION_FILES CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS CMAKE_ANDROID_API CMAKE_ANDROID_API_MIN CMAKE_ANDROID_ARCH CMAKE_ANDROID_ASSETS_DIRECTORIES CMAKE_ANDROID_GUI CMAKE_ANDROID_JAR_DEPENDENCIES CMAKE_ANDROID_JAR_DIRECTORIES CMAKE_ANDROID_JAVA_SOURCE_DIR CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES CMAKE_ANDROID_PROCESS_MAX CMAKE_ANDROID_PROGUARD CMAKE_ANDROID_PROGUARD_CONFIG_PATH CMAKE_ANDROID_SECURE_PROPS_PATH CMAKE_ANDROID_SKIP_ANT_STEP CMAKE_ANDROID_STL_TYPE CMAKE_APPBUNDLE_PATH CMAKE_AR CMAKE_ARCHIVE_OUTPUT_DIRECTORY CMAKE_ARCHIVE_OUTPUT_DIRECTORY_<CONFIG> CMAKE_ARGC CMAKE_ARGV0 CMAKE_AUTOMOC CMAKE_AUTOMOC_MOC_OPTIONS CMAKE_AUTOMOC_RELAXED_MODE CMAKE_AUTORCC CMAKE_AUTORCC_OPTIONS CMAKE_AUTOUIC CMAKE_AUTOUIC_OPTIONS CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BINARY_DIR CMAKE_BUILD_TOOL CMAKE_BUILD_TYPE CMAKE_BUILD_WITH_INSTALL_RPATH CMAKE_CACHEFILE_DIR CMAKE_CACHE_MAJOR_VERSION CMAKE_CACHE_MINOR_VERSION CMAKE_CACHE_PATCH_VERSION CMAKE_CFG_INTDIR CMAKE_CL_64 CMAKE_COLOR_MAKEFILE CMAKE_COMMAND CMAKE_COMPILER_2005 CMAKE_COMPILER_IS_GNU<LANG> CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_CONFIGURATION_TYPES CMAKE_CROSSCOMPILING CMAKE_CROSSCOMPILING_EMULATOR CMAKE_CTEST_COMMAND CMAKE_CURRENT_BINARY_DIR CMAKE_CURRENT_LIST_DIR CMAKE_CURRENT_LIST_FILE CMAKE_CURRENT_LIST_LINE CMAKE_CURRENT_SOURCE_DIR CMAKE_CXX_COMPILE_FEATURES CMAKE_CXX_EXTENSIONS CMAKE_CXX_STANDARD CMAKE_CXX_STANDARD_REQUIRED CMAKE_C_COMPILE_FEATURES CMAKE_C_EXTENSIONS CMAKE_C_STANDARD CMAKE_C_STANDARD_REQUIRED CMAKE_DEBUG_POSTFIX CMAKE_DEBUG_TARGET_PROPERTIES CMAKE_DISABLE_FIND_PACKAGE_<PackageName> CMAKE_DL_LIBS CMAKE_EDIT_COMMAND CMAKE_ENABLE_EXPORTS CMAKE_ERROR_DEPRECATED CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_EXECUTABLE_SUFFIX CMAKE_EXE_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS_<CONFIG> CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_NO_PACKAGE_REGISTRY CMAKE_EXTRA_GENERATOR CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES CMAKE_FIND_APPBUNDLE CMAKE_FIND_FRAMEWORK CMAKE_FIND_LIBRARY_PREFIXES CMAKE_FIND_LIBRARY_SUFFIXES CMAKE_FIND_NO_INSTALL_PREFIX CMAKE_FIND_PACKAGE_NAME CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_WARN_NO_MODULE CMAKE_FIND_ROOT_PATH CMAKE_FIND_ROOT_PATH_MODE_INCLUDE CMAKE_FIND_ROOT_PATH_MODE_LIBRARY CMAKE_FIND_ROOT_PATH_MODE_PACKAGE CMAKE_FIND_ROOT_PATH_MODE_PROGRAM CMAKE_FRAMEWORK_PATH CMAKE_Fortran_FORMAT CMAKE_Fortran_MODDIR_DEFAULT CMAKE_Fortran_MODDIR_FLAG CMAKE_Fortran_MODOUT_FLAG CMAKE_Fortran_MODULE_DIRECTORY CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET CMAKE_GNUtoMS CMAKE_HOME_DIRECTORY CMAKE_HOST_APPLE CMAKE_HOST_SYSTEM CMAKE_HOST_SYSTEM_NAME CMAKE_HOST_SYSTEM_PROCESSOR CMAKE_HOST_SYSTEM_VERSION CMAKE_HOST_UNIX CMAKE_HOST_WIN32 CMAKE_IGNORE_PATH CMAKE_IMPORT_LIBRARY_PREFIX CMAKE_IMPORT_LIBRARY_SUFFIX CMAKE_INCLUDE_CURRENT_DIR CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE CMAKE_INCLUDE_DIRECTORIES_BEFORE CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE CMAKE_INCLUDE_PATH CMAKE_INSTALL_DEFAULT_COMPONENT_NAME CMAKE_INSTALL_MESSAGE CMAKE_INSTALL_NAME_DIR CMAKE_INSTALL_PREFIX CMAKE_INSTALL_RPATH CMAKE_INSTALL_RPATH_USE_LINK_PATH CMAKE_INTERNAL_PLATFORM_ABI CMAKE_IOS_INSTALL_COMBINED CMAKE_JOB_POOL_COMPILE CMAKE_JOB_POOL_LINK CMAKE_LIBRARY_ARCHITECTURE CMAKE_LIBRARY_ARCHITECTURE_REGEX CMAKE_LIBRARY_OUTPUT_DIRECTORY CMAKE_LIBRARY_OUTPUT_DIRECTORY_<CONFIG> CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_FLAG CMAKE_LINK_DEF_FILE_FLAG CMAKE_LINK_DEPENDS_NO_SHARED CMAKE_LINK_INTERFACE_LIBRARIES CMAKE_LINK_LIBRARY_FILE_FLAG CMAKE_LINK_LIBRARY_FLAG CMAKE_LINK_LIBRARY_SUFFIX CMAKE_LINK_SEARCH_END_STATIC CMAKE_LINK_SEARCH_START_STATIC CMAKE_MACOSX_BUNDLE CMAKE_MACOSX_RPATH CMAKE_MAJOR_VERSION CMAKE_MAKE_PROGRAM CMAKE_MAP_IMPORTED_CONFIG_<CONFIG> CMAKE_MATCH_COUNT CMAKE_MFC_FLAG CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_MINOR_VERSION CMAKE_MODULE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS_<CONFIG> CMAKE_MODULE_PATH CMAKE_NOT_USING_CONFIG_FLAGS CMAKE_NO_BUILTIN_CHRPATH CMAKE_NO_SYSTEM_FROM_IMPORTED CMAKE_OBJECT_PATH_MAX CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT CMAKE_PARENT_LIST_FILE CMAKE_PATCH_VERSION CMAKE_PDB_OUTPUT_DIRECTORY CMAKE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_POLICY_DEFAULT_CMP<NNNN> CMAKE_POLICY_WARNING_CMP<NNNN> CMAKE_POSITION_INDEPENDENT_CODE CMAKE_PREFIX_PATH CMAKE_PROGRAM_PATH CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE CMAKE_PROJECT_NAME CMAKE_RANLIB CMAKE_ROOT CMAKE_RUNTIME_OUTPUT_DIRECTORY CMAKE_RUNTIME_OUTPUT_DIRECTORY_<CONFIG> CMAKE_SCRIPT_MODE_FILE CMAKE_SHARED_LIBRARY_PREFIX CMAKE_SHARED_LIBRARY_SUFFIX CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS_<CONFIG> CMAKE_SHARED_MODULE_PREFIX CMAKE_SHARED_MODULE_SUFFIX CMAKE_SIZEOF_VOID_P CMAKE_SKIP_BUILD_RPATH CMAKE_SKIP_INSTALL_ALL_DEPENDENCY CMAKE_SKIP_INSTALL_RPATH CMAKE_SKIP_INSTALL_RULES CMAKE_SKIP_RPATH CMAKE_SOURCE_DIR CMAKE_STAGING_PREFIX CMAKE_STANDARD_LIBRARIES CMAKE_STATIC_LIBRARY_PREFIX CMAKE_STATIC_LIBRARY_SUFFIX CMAKE_STATIC_LINKER_FLAGS CMAKE_STATIC_LINKER_FLAGS_<CONFIG> CMAKE_SYSROOT CMAKE_SYSTEM CMAKE_SYSTEM_APPBUNDLE_PATH CMAKE_SYSTEM_FRAMEWORK_PATH CMAKE_SYSTEM_IGNORE_PATH CMAKE_SYSTEM_INCLUDE_PATH CMAKE_SYSTEM_LIBRARY_PATH CMAKE_SYSTEM_NAME CMAKE_SYSTEM_PREFIX_PATH CMAKE_SYSTEM_PROCESSOR CMAKE_SYSTEM_PROGRAM_PATH CMAKE_SYSTEM_VERSION CMAKE_TOOLCHAIN_FILE CMAKE_TRY_COMPILE_CONFIGURATION CMAKE_TWEAK_VERSION CMAKE_USER_MAKE_RULES_OVERRIDE CMAKE_USER_MAKE_RULES_OVERRIDE_<LANG> CMAKE_USE_RELATIVE_PATHS CMAKE_VERBOSE_MAKEFILE CMAKE_VERSION CMAKE_VISIBILITY_INLINES_HIDDEN CMAKE_VS_DEVENV_COMMAND CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD CMAKE_VS_INTEL_Fortran_PROJECT_VERSION CMAKE_VS_MSBUILD_COMMAND CMAKE_VS_MSDEV_COMMAND CMAKE_VS_NsightTegra_VERSION CMAKE_VS_PLATFORM_NAME CMAKE_VS_PLATFORM_TOOLSET CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION CMAKE_WARN_DEPRECATED CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_WIN32_EXECUTABLE CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS CMAKE_XCODE_ATTRIBUTE_<an-attribute> CMAKE_XCODE_PLATFORM_TOOLSET CPACK_ABSOLUTE_DESTINATION_FILES CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CPACK_INCLUDE_TOPLEVEL_DIRECTORY CPACK_INSTALL_SCRIPT CPACK_PACKAGING_INSTALL_PREFIX CPACK_SET_DESTDIR CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CTEST_BINARY_DIRECTORY CTEST_BUILD_COMMAND CTEST_BUILD_NAME CTEST_BZR_COMMAND CTEST_BZR_UPDATE_OPTIONS CTEST_CHANGE_ID CTEST_CHECKOUT_COMMAND CTEST_CONFIGURATION_TYPE CTEST_CONFIGURE_COMMAND CTEST_COVERAGE_COMMAND CTEST_COVERAGE_EXTRA_FLAGS CTEST_CURL_OPTIONS CTEST_CUSTOM_COVERAGE_EXCLUDE CTEST_CUSTOM_ERROR_EXCEPTION CTEST_CUSTOM_ERROR_MATCH CTEST_CUSTOM_ERROR_POST_CONTEXT CTEST_CUSTOM_ERROR_PRE_CONTEXT CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MEMCHECK_IGNORE CTEST_CUSTOM_POST_MEMCHECK CTEST_CUSTOM_POST_TEST CTEST_CUSTOM_PRE_MEMCHECK CTEST_CUSTOM_PRE_TEST CTEST_CUSTOM_TEST_IGNORE CTEST_CUSTOM_WARNING_EXCEPTION CTEST_CUSTOM_WARNING_MATCH CTEST_CVS_CHECKOUT CTEST_CVS_COMMAND CTEST_CVS_UPDATE_OPTIONS CTEST_DROP_LOCATION CTEST_DROP_METHOD CTEST_DROP_SITE CTEST_DROP_SITE_CDASH CTEST_DROP_SITE_PASSWORD CTEST_DROP_SITE_USER CTEST_EXTRA_COVERAGE_GLOB CTEST_GIT_COMMAND CTEST_GIT_UPDATE_CUSTOM CTEST_GIT_UPDATE_OPTIONS CTEST_HG_COMMAND CTEST_HG_UPDATE_OPTIONS CTEST_MEMORYCHECK_COMMAND CTEST_MEMORYCHECK_COMMAND_OPTIONS CTEST_MEMORYCHECK_SANITIZER_OPTIONS CTEST_MEMORYCHECK_SUPPRESSIONS_FILE CTEST_MEMORYCHECK_TYPE CTEST_NIGHTLY_START_TIME CTEST_P4_CLIENT CTEST_P4_COMMAND CTEST_P4_OPTIONS CTEST_P4_UPDATE_OPTIONS CTEST_SCP_COMMAND CTEST_SITE CTEST_SOURCE_DIRECTORY CTEST_SVN_COMMAND CTEST_SVN_OPTIONS CTEST_SVN_UPDATE_OPTIONS CTEST_TEST_LOAD CTEST_TEST_TIMEOUT CTEST_TRIGGER_SITE CTEST_UPDATE_COMMAND CTEST_UPDATE_OPTIONS CTEST_UPDATE_VERSION_ONLY CTEST_USE_LAUNCHERS CYGWIN ENV EXECUTABLE_OUTPUT_PATH GHS-MULTI LIBRARY_OUTPUT_PATH MINGW MSVC MSVC10 MSVC11 MSVC12 MSVC14 MSVC60 MSVC70 MSVC71 MSVC80 MSVC90 MSVC_IDE MSVC_VERSION PROJECT_BINARY_DIR PROJECT_NAME PROJECT_SOURCE_DIR PROJECT_VERSION PROJECT_VERSION_MAJOR PROJECT_VERSION_MINOR PROJECT_VERSION_PATCH PROJECT_VERSION_TWEAK UNIX WIN32 WINCE WINDOWS_PHONE WINDOWS_STORE XCODE_VERSION
+            \ <PROJECT-NAME>_BINARY_DIR <PROJECT-NAME>_SOURCE_DIR <PROJECT-NAME>_VERSION <PROJECT-NAME>_VERSION_MAJOR <PROJECT-NAME>_VERSION_MINOR <PROJECT-NAME>_VERSION_PATCH <PROJECT-NAME>_VERSION_TWEAK APPLE BORLAND BUILD_SHARED_LIBS CMAKE_<CONFIG>_POSTFIX CMAKE_<LANG>_ARCHIVE_APPEND CMAKE_<LANG>_ARCHIVE_CREATE CMAKE_<LANG>_ARCHIVE_FINISH CMAKE_<LANG>_COMPILER CMAKE_<LANG>_COMPILER_ABI CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN CMAKE_<LANG>_COMPILER_ID CMAKE_<LANG>_COMPILER_LAUNCHER CMAKE_<LANG>_COMPILER_LOADED CMAKE_<LANG>_COMPILER_TARGET CMAKE_<LANG>_COMPILER_VERSION CMAKE_<LANG>_COMPILE_OBJECT CMAKE_<LANG>_CREATE_SHARED_LIBRARY CMAKE_<LANG>_CREATE_SHARED_MODULE CMAKE_<LANG>_CREATE_STATIC_LIBRARY CMAKE_<LANG>_FLAGS CMAKE_<LANG>_FLAGS_DEBUG CMAKE_<LANG>_FLAGS_MINSIZEREL CMAKE_<LANG>_FLAGS_RELEASE CMAKE_<LANG>_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_GHS_KERNEL_FLAGS_DEBUG CMAKE_<LANG>_GHS_KERNEL_FLAGS_MINSIZEREL CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELEASE CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_IGNORE_EXTENSIONS CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_LIBRARIES CMAKE_<LANG>_INCLUDE_WHAT_YOU_USE CMAKE_<LANG>_LIBRARY_ARCHITECTURE CMAKE_<LANG>_LINKER_PREFERENCE CMAKE_<LANG>_LINKER_PREFERENCE_PROPAGATES CMAKE_<LANG>_LINK_EXECUTABLE CMAKE_<LANG>_OUTPUT_EXTENSION CMAKE_<LANG>_PLATFORM_ID CMAKE_<LANG>_SIMULATE_ID CMAKE_<LANG>_SIMULATE_VERSION CMAKE_<LANG>_SIZEOF_DATA_PTR CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS CMAKE_<LANG>_VISIBILITY_PRESET CMAKE_ABSOLUTE_DESTINATION_FILES CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS CMAKE_ANDROID_API CMAKE_ANDROID_API_MIN CMAKE_ANDROID_ARCH CMAKE_ANDROID_ASSETS_DIRECTORIES CMAKE_ANDROID_GUI CMAKE_ANDROID_JAR_DEPENDENCIES CMAKE_ANDROID_JAR_DIRECTORIES CMAKE_ANDROID_JAVA_SOURCE_DIR CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES CMAKE_ANDROID_PROCESS_MAX CMAKE_ANDROID_PROGUARD CMAKE_ANDROID_PROGUARD_CONFIG_PATH CMAKE_ANDROID_SECURE_PROPS_PATH CMAKE_ANDROID_SKIP_ANT_STEP CMAKE_ANDROID_STL_TYPE CMAKE_APPBUNDLE_PATH CMAKE_AR CMAKE_ARCHIVE_OUTPUT_DIRECTORY CMAKE_ARCHIVE_OUTPUT_DIRECTORY_<CONFIG> CMAKE_ARGC CMAKE_ARGV0 CMAKE_AUTOMOC CMAKE_AUTOMOC_MOC_OPTIONS CMAKE_AUTOMOC_RELAXED_MODE CMAKE_AUTORCC CMAKE_AUTORCC_OPTIONS CMAKE_AUTOUIC CMAKE_AUTOUIC_OPTIONS CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BINARY_DIR CMAKE_BUILD_TOOL CMAKE_BUILD_TYPE CMAKE_BUILD_WITH_INSTALL_RPATH CMAKE_CACHEFILE_DIR CMAKE_CACHE_MAJOR_VERSION CMAKE_CACHE_MINOR_VERSION CMAKE_CACHE_PATCH_VERSION CMAKE_CFG_INTDIR CMAKE_CL_64 CMAKE_COLOR_MAKEFILE CMAKE_COMMAND CMAKE_COMPILER_2005 CMAKE_COMPILER_IS_GNU<LANG> CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_CONFIGURATION_TYPES CMAKE_CROSSCOMPILING CMAKE_CROSSCOMPILING_EMULATOR CMAKE_CTEST_COMMAND CMAKE_CURRENT_BINARY_DIR CMAKE_CURRENT_LIST_DIR CMAKE_CURRENT_LIST_FILE CMAKE_CURRENT_LIST_LINE CMAKE_CURRENT_SOURCE_DIR CMAKE_CXX_COMPILE_FEATURES CMAKE_CXX_EXTENSIONS CMAKE_CXX_STANDARD CMAKE_CXX_STANDARD_REQUIRED CMAKE_C_COMPILE_FEATURES CMAKE_C_EXTENSIONS CMAKE_C_STANDARD CMAKE_C_STANDARD_REQUIRED CMAKE_DEBUG_POSTFIX CMAKE_DEBUG_TARGET_PROPERTIES CMAKE_DISABLE_FIND_PACKAGE_<PackageName> CMAKE_DL_LIBS CMAKE_EDIT_COMMAND CMAKE_ENABLE_EXPORTS CMAKE_ERROR_DEPRECATED CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_EXECUTABLE_SUFFIX CMAKE_EXE_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS_<CONFIG> CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_NO_PACKAGE_REGISTRY CMAKE_EXTRA_GENERATOR CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES CMAKE_FIND_APPBUNDLE CMAKE_FIND_FRAMEWORK CMAKE_FIND_LIBRARY_PREFIXES CMAKE_FIND_LIBRARY_SUFFIXES CMAKE_FIND_NO_INSTALL_PREFIX CMAKE_FIND_PACKAGE_NAME CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_WARN_NO_MODULE CMAKE_FIND_ROOT_PATH CMAKE_FIND_ROOT_PATH_MODE_INCLUDE CMAKE_FIND_ROOT_PATH_MODE_LIBRARY CMAKE_FIND_ROOT_PATH_MODE_PACKAGE CMAKE_FIND_ROOT_PATH_MODE_PROGRAM CMAKE_FRAMEWORK_PATH CMAKE_Fortran_FORMAT CMAKE_Fortran_MODDIR_DEFAULT CMAKE_Fortran_MODDIR_FLAG CMAKE_Fortran_MODOUT_FLAG CMAKE_Fortran_MODULE_DIRECTORY CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET CMAKE_GNUtoMS CMAKE_HOME_DIRECTORY CMAKE_HOST_APPLE CMAKE_HOST_SYSTEM CMAKE_HOST_SYSTEM_NAME CMAKE_HOST_SYSTEM_PROCESSOR CMAKE_HOST_SYSTEM_VERSION CMAKE_HOST_UNIX CMAKE_HOST_WIN32 CMAKE_IGNORE_PATH CMAKE_IMPORT_LIBRARY_PREFIX CMAKE_IMPORT_LIBRARY_SUFFIX CMAKE_INCLUDE_CURRENT_DIR CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE CMAKE_INCLUDE_DIRECTORIES_BEFORE CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE CMAKE_INCLUDE_PATH CMAKE_INSTALL_DEFAULT_COMPONENT_NAME CMAKE_INSTALL_MESSAGE CMAKE_INSTALL_NAME_DIR CMAKE_INSTALL_PREFIX CMAKE_INSTALL_RPATH CMAKE_INSTALL_RPATH_USE_LINK_PATH CMAKE_INTERNAL_PLATFORM_ABI CMAKE_IOS_INSTALL_COMBINED CMAKE_JOB_POOL_COMPILE CMAKE_JOB_POOL_LINK CMAKE_LIBRARY_ARCHITECTURE CMAKE_LIBRARY_ARCHITECTURE_REGEX CMAKE_LIBRARY_OUTPUT_DIRECTORY CMAKE_LIBRARY_OUTPUT_DIRECTORY_<CONFIG> CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_FLAG CMAKE_LINK_DEF_FILE_FLAG CMAKE_LINK_DEPENDS_NO_SHARED CMAKE_LINK_INTERFACE_LIBRARIES CMAKE_LINK_LIBRARY_FILE_FLAG CMAKE_LINK_LIBRARY_FLAG CMAKE_LINK_LIBRARY_SUFFIX CMAKE_LINK_SEARCH_END_STATIC CMAKE_LINK_SEARCH_START_STATIC CMAKE_MACOSX_BUNDLE CMAKE_MACOSX_RPATH CMAKE_MAJOR_VERSION CMAKE_MAKE_PROGRAM CMAKE_MAP_IMPORTED_CONFIG_<CONFIG> CMAKE_MATCH_COUNT CMAKE_MFC_FLAG CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_MINOR_VERSION CMAKE_MODULE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS_<CONFIG> CMAKE_MODULE_PATH CMAKE_NOT_USING_CONFIG_FLAGS CMAKE_NO_BUILTIN_CHRPATH CMAKE_NO_SYSTEM_FROM_IMPORTED CMAKE_OBJECT_PATH_MAX CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT CMAKE_PARENT_LIST_FILE CMAKE_PATCH_VERSION CMAKE_PDB_OUTPUT_DIRECTORY CMAKE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_POLICY_DEFAULT_CMP<NNNN> CMAKE_POLICY_WARNING_CMP<NNNN> CMAKE_POSITION_INDEPENDENT_CODE CMAKE_PREFIX_PATH CMAKE_PROGRAM_PATH CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE CMAKE_PROJECT_NAME CMAKE_RANLIB CMAKE_ROOT CMAKE_RUNTIME_OUTPUT_DIRECTORY CMAKE_RUNTIME_OUTPUT_DIRECTORY_<CONFIG> CMAKE_SCRIPT_MODE_FILE CMAKE_SHARED_LIBRARY_PREFIX CMAKE_SHARED_LIBRARY_SUFFIX CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS_<CONFIG> CMAKE_SHARED_MODULE_PREFIX CMAKE_SHARED_MODULE_SUFFIX CMAKE_SIZEOF_VOID_P CMAKE_SKIP_BUILD_RPATH CMAKE_SKIP_INSTALL_ALL_DEPENDENCY CMAKE_SKIP_INSTALL_RPATH CMAKE_SKIP_INSTALL_RULES CMAKE_SKIP_RPATH CMAKE_SOURCE_DIR CMAKE_STAGING_PREFIX CMAKE_STANDARD_LIBRARIES CMAKE_STATIC_LIBRARY_PREFIX CMAKE_STATIC_LIBRARY_SUFFIX CMAKE_STATIC_LINKER_FLAGS CMAKE_STATIC_LINKER_FLAGS_<CONFIG> CMAKE_SYSROOT CMAKE_SYSTEM CMAKE_SYSTEM_APPBUNDLE_PATH CMAKE_SYSTEM_FRAMEWORK_PATH CMAKE_SYSTEM_IGNORE_PATH CMAKE_SYSTEM_INCLUDE_PATH CMAKE_SYSTEM_LIBRARY_PATH CMAKE_SYSTEM_NAME CMAKE_SYSTEM_PREFIX_PATH CMAKE_SYSTEM_PROCESSOR CMAKE_SYSTEM_PROGRAM_PATH CMAKE_SYSTEM_VERSION CMAKE_TOOLCHAIN_FILE CMAKE_TRY_COMPILE_CONFIGURATION CMAKE_TWEAK_VERSION CMAKE_USER_MAKE_RULES_OVERRIDE CMAKE_USER_MAKE_RULES_OVERRIDE_<LANG> CMAKE_USE_RELATIVE_PATHS CMAKE_VERBOSE_MAKEFILE CMAKE_VERSION CMAKE_VISIBILITY_INLINES_HIDDEN CMAKE_VS_DEVENV_COMMAND CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD CMAKE_VS_INTEL_Fortran_PROJECT_VERSION CMAKE_VS_MSBUILD_COMMAND CMAKE_VS_MSDEV_COMMAND CMAKE_VS_NsightTegra_VERSION CMAKE_VS_PLATFORM_NAME CMAKE_VS_PLATFORM_TOOLSET CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION CMAKE_WARN_DEPRECATED CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_WIN32_EXECUTABLE CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS CMAKE_XCODE_ATTRIBUTE_<an-attribute> CMAKE_XCODE_PLATFORM_TOOLSET CPACK_ABSOLUTE_DESTINATION_FILES CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CPACK_INCLUDE_TOPLEVEL_DIRECTORY CPACK_INSTALL_SCRIPT CPACK_PACKAGING_INSTALL_PREFIX CPACK_SET_DESTDIR CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CTEST_BINARY_DIRECTORY CTEST_BUILD_COMMAND CTEST_BUILD_NAME CTEST_BZR_COMMAND CTEST_BZR_UPDATE_OPTIONS CTEST_CHANGE_ID CTEST_CHECKOUT_COMMAND CTEST_CONFIGURATION_TYPE CTEST_CONFIGURE_COMMAND CTEST_COVERAGE_COMMAND CTEST_COVERAGE_EXTRA_FLAGS CTEST_CURL_OPTIONS CTEST_CUSTOM_COVERAGE_EXCLUDE CTEST_CUSTOM_ERROR_EXCEPTION CTEST_CUSTOM_ERROR_MATCH CTEST_CUSTOM_ERROR_POST_CONTEXT CTEST_CUSTOM_ERROR_PRE_CONTEXT CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MEMCHECK_IGNORE CTEST_CUSTOM_POST_MEMCHECK CTEST_CUSTOM_POST_TEST CTEST_CUSTOM_PRE_MEMCHECK CTEST_CUSTOM_PRE_TEST CTEST_CUSTOM_TEST_IGNORE CTEST_CUSTOM_WARNING_EXCEPTION CTEST_CUSTOM_WARNING_MATCH CTEST_CVS_CHECKOUT CTEST_CVS_COMMAND CTEST_CVS_UPDATE_OPTIONS CTEST_DROP_LOCATION CTEST_DROP_METHOD CTEST_DROP_SITE CTEST_DROP_SITE_CDASH CTEST_DROP_SITE_PASSWORD CTEST_DROP_SITE_USER CTEST_EXTRA_COVERAGE_GLOB CTEST_GIT_COMMAND CTEST_GIT_UPDATE_CUSTOM CTEST_GIT_UPDATE_OPTIONS CTEST_HG_COMMAND CTEST_HG_UPDATE_OPTIONS CTEST_MEMORYCHECK_COMMAND CTEST_MEMORYCHECK_COMMAND_OPTIONS CTEST_MEMORYCHECK_SANITIZER_OPTIONS CTEST_MEMORYCHECK_SUPPRESSIONS_FILE CTEST_MEMORYCHECK_TYPE CTEST_NIGHTLY_START_TIME CTEST_P4_CLIENT CTEST_P4_COMMAND CTEST_P4_OPTIONS CTEST_P4_UPDATE_OPTIONS CTEST_SCP_COMMAND CTEST_SITE CTEST_SOURCE_DIRECTORY CTEST_SVN_COMMAND CTEST_SVN_OPTIONS CTEST_SVN_UPDATE_OPTIONS CTEST_TEST_LOAD CTEST_TEST_TIMEOUT CTEST_TRIGGER_SITE CTEST_UPDATE_COMMAND CTEST_UPDATE_OPTIONS CTEST_UPDATE_VERSION_ONLY CTEST_USE_LAUNCHERS CYGWIN ENV EXECUTABLE_OUTPUT_PATH GHS-MULTI LIBRARY_OUTPUT_PATH MINGW MSVC MSVC10 MSVC11 MSVC12 MSVC14 MSVC60 MSVC70 MSVC71 MSVC80 MSVC90 MSVC_IDE MSVC_VERSION PROJECT_BINARY_DIR PROJECT_NAME PROJECT_SOURCE_DIR PROJECT_VERSION PROJECT_VERSION_MAJOR PROJECT_VERSION_MINOR PROJECT_VERSION_PATCH PROJECT_VERSION_TWEAK UNIX WIN32 WINCE WINDOWS_PHONE WINDOWS_STORE XCODE_VERSION
             \ contained
 
 syn keyword cmakeModule
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index bef5988..c93ace1 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -211,7 +211,6 @@ Properties on Targets
    /prop_tgt/LABELS
    /prop_tgt/LANG_CLANG_TIDY
    /prop_tgt/LANG_COMPILER_LAUNCHER
-   /prop_tgt/LANG_CPPLINT
    /prop_tgt/LANG_INCLUDE_WHAT_YOU_USE
    /prop_tgt/LANG_VISIBILITY_PRESET
    /prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 95f780a..99b5eae 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -284,7 +284,6 @@ Variables that Control the Build
    /variable/CMAKE_IOS_INSTALL_COMBINED
    /variable/CMAKE_LANG_CLANG_TIDY
    /variable/CMAKE_LANG_COMPILER_LAUNCHER
-   /variable/CMAKE_LANG_CPPLINT
    /variable/CMAKE_LANG_INCLUDE_WHAT_YOU_USE
    /variable/CMAKE_LANG_VISIBILITY_PRESET
    /variable/CMAKE_LIBRARY_OUTPUT_DIRECTORY
diff --git a/Help/prop_tgt/LANG_CPPLINT.rst b/Help/prop_tgt/LANG_CPPLINT.rst
deleted file mode 100644
index 14f47d4..0000000
--- a/Help/prop_tgt/LANG_CPPLINT.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-<LANG>_CPPLINT
---------------
-
-This property is supported only when ``<LANG>`` is ``C`` or ``CXX``.
-
-Specify a :ref:`;-list <CMake Language Lists>` containing a command line
-for the ``cpplint`` style checker.  The :ref:`Makefile Generators` and the
-:generator:`Ninja` generator will run ``cpplint`` along with the compiler
-and report any problems.
-
-This property is initialized by the value of the
-:variable:`CMAKE_<LANG>_CPPLINT` variable if it is set when a target is
-created.
diff --git a/Help/release/dev/add-LANG_CPPLINT.rst b/Help/release/dev/add-LANG_CPPLINT.rst
deleted file mode 100644
index a0539cf..0000000
--- a/Help/release/dev/add-LANG_CPPLINT.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-add-LANG_CPPLINT
-----------------
-
-* A :prop_tgt:`<LANG>_CPPLINT` target property and supporting
-  :variable:`CMAKE_<LANG>_CPPLINT` variable were introduced to tell
-  the :ref:`Makefile Generators` and the :generator:`Ninja` generator to
-  run the ``cpplint`` style checker along with the compiler for ``C`` and
-  ``CXX`` languages.
diff --git a/Help/variable/CMAKE_LANG_CPPLINT.rst b/Help/variable/CMAKE_LANG_CPPLINT.rst
deleted file mode 100644
index 3b6f452..0000000
--- a/Help/variable/CMAKE_LANG_CPPLINT.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-CMAKE_<LANG>_CPPLINT
---------------------
-
-Default value for :prop_tgt:`<LANG>_CPPLINT` target property. This variable
-is used to initialize the property on each target as it is created.  This
-is done only when ``<LANG>`` is ``C`` or ``CXX``.
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 866c132..379ae16 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -631,9 +631,7 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
       const char* iwyu = this->GeneratorTarget->GetProperty(iwyu_prop);
       std::string const tidy_prop = lang + "_CLANG_TIDY";
       const char* tidy = this->GeneratorTarget->GetProperty(tidy_prop);
-      std::string const cpplint_prop = lang + "_CPPLINT";
-      const char* cpplint = this->GeneratorTarget->GetProperty(cpplint_prop);
-      if ((iwyu && *iwyu) || (tidy && *tidy) || (cpplint && *cpplint)) {
+      if ((iwyu && *iwyu) || (tidy && *tidy)) {
         std::string run_iwyu = "$(CMAKE_COMMAND) -E __run_iwyu";
         if (iwyu && *iwyu) {
           run_iwyu += " --iwyu=";
@@ -642,12 +640,6 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
         if (tidy && *tidy) {
           run_iwyu += " --tidy=";
           run_iwyu += this->LocalGenerator->EscapeForShell(tidy);
-        }
-        if (cpplint && *cpplint) {
-          run_iwyu += " --cpplint=";
-          run_iwyu += this->LocalGenerator->EscapeForShell(cpplint);
-        }
-        if ((tidy && *tidy) || (cpplint && *cpplint)) {
           run_iwyu += " --source=";
           run_iwyu += sourceFile;
         }
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 0b33b19..8ad2efe 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -600,9 +600,7 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang)
     const char* iwyu = this->GeneratorTarget->GetProperty(iwyu_prop);
     std::string const tidy_prop = lang + "_CLANG_TIDY";
     const char* tidy = this->GeneratorTarget->GetProperty(tidy_prop);
-    std::string const cpplint_prop = lang + "_CPPLINT";
-    const char* cpplint = this->GeneratorTarget->GetProperty(cpplint_prop);
-    if ((iwyu && *iwyu) || (tidy && *tidy) || (cpplint && *cpplint)) {
+    if ((iwyu && *iwyu) || (tidy && *tidy)) {
       std::string run_iwyu = this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmOutputConverter::SHELL);
       run_iwyu += " -E __run_iwyu";
@@ -613,12 +611,6 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang)
       if (tidy && *tidy) {
         run_iwyu += " --tidy=";
         run_iwyu += this->GetLocalGenerator()->EscapeForShell(tidy);
-      }
-      if (cpplint && *cpplint) {
-        run_iwyu += " --cpplint=";
-        run_iwyu += this->GetLocalGenerator()->EscapeForShell(cpplint);
-      }
-      if ((tidy && *tidy) || (cpplint && *cpplint)) {
         run_iwyu += " --source=$in";
       }
       run_iwyu += " -- ";
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 2852f90..9261ca8 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -255,7 +255,6 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
     this->SetPropertyDefault("MACOSX_RPATH", CM_NULLPTR);
     this->SetPropertyDefault("C_CLANG_TIDY", CM_NULLPTR);
     this->SetPropertyDefault("C_COMPILER_LAUNCHER", CM_NULLPTR);
-    this->SetPropertyDefault("C_CPPLINT", CM_NULLPTR);
     this->SetPropertyDefault("C_INCLUDE_WHAT_YOU_USE", CM_NULLPTR);
     this->SetPropertyDefault("LINK_WHAT_YOU_USE", CM_NULLPTR);
     this->SetPropertyDefault("C_STANDARD", CM_NULLPTR);
@@ -263,7 +262,6 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
     this->SetPropertyDefault("C_EXTENSIONS", CM_NULLPTR);
     this->SetPropertyDefault("CXX_CLANG_TIDY", CM_NULLPTR);
     this->SetPropertyDefault("CXX_COMPILER_LAUNCHER", CM_NULLPTR);
-    this->SetPropertyDefault("CXX_CPPLINT", CM_NULLPTR);
     this->SetPropertyDefault("CXX_INCLUDE_WHAT_YOU_USE", CM_NULLPTR);
     this->SetPropertyDefault("CXX_STANDARD", CM_NULLPTR);
     this->SetPropertyDefault("CXX_STANDARD_REQUIRED", CM_NULLPTR);
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 823b38f..5b12a75 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -276,8 +276,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
     if (args[1] == "__run_iwyu") {
       if (args.size() < 3) {
         std::cerr << "__run_iwyu Usage: -E __run_iwyu [--iwyu=/path/iwyu]"
-                     " [--cpplint=/path/cpplint] [--tidy=/path/tidy]"
-                     " -- compile command\n";
+                     " [--tidy=/path/tidy] -- compile command\n";
         return 1;
       }
       bool doing_options = true;
@@ -286,7 +285,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
       std::string tidy;
       std::string sourceFile;
       std::string lwyu;
-      std::string cpplint;
       for (std::string::size_type cc = 2; cc < args.size(); cc++) {
         std::string const& arg = args[cc];
         if (arg == "--") {
@@ -299,8 +297,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
           sourceFile = arg.substr(9);
         } else if (doing_options && cmHasLiteralPrefix(arg, "--lwyu=")) {
           lwyu = arg.substr(7);
-        } else if (doing_options && cmHasLiteralPrefix(arg, "--cpplint=")) {
-          cpplint = arg.substr(10);
         } else if (doing_options) {
           std::cerr << "__run_iwyu given unknown argument: " << arg << "\n";
           return 1;
@@ -308,14 +304,12 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
           orig_cmd.push_back(arg);
         }
       }
-      if (tidy.empty() && iwyu.empty() && lwyu.empty() && cpplint.empty()) {
-        std::cerr << "__run_iwyu missing --cpplint=, --iwyu=, --lwyu=, and/or"
-                     " --tidy=\n";
+      if (tidy.empty() && iwyu.empty() && lwyu.empty()) {
+        std::cerr << "__run_iwyu missing --tidy= or --iwyu=\n";
         return 1;
       }
-      if ((!cpplint.empty() || !tidy.empty()) && sourceFile.empty()) {
-        std::cerr << "__run_iwyu --cpplint= and/or __run_iwyu --tidy="
-                     " require --source=\n";
+      if (!tidy.empty() && sourceFile.empty()) {
+        std::cerr << "__run_iwyu --tidy= requires --source=\n";
         return 1;
       }
       if (orig_cmd.empty() && lwyu.empty()) {
@@ -409,32 +403,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
           std::cerr << "Warning: " << stdOut;
         }
       }
-
-      if (!cpplint.empty()) {
-        // Construct the cpplint command line.
-        std::vector<std::string> cpplint_cmd;
-        cmSystemTools::ExpandListArgument(cpplint, cpplint_cmd, true);
-        cpplint_cmd.push_back(sourceFile);
-
-        // Run the cpplint command line.  Capture its output.
-        std::string stdOut;
-        if (!cmSystemTools::RunSingleCommand(cpplint_cmd, &stdOut, &stdOut,
-                                             &ret, CM_NULLPTR,
-                                             cmSystemTools::OUTPUT_NONE)) {
-          std::cerr << "Error running '" << cpplint_cmd[0] << "': " << stdOut
-                    << "\n";
-          return 1;
-        }
-
-        // Output the output from cpplint to stderr
-        std::cerr << stdOut;
-
-        // If cpplint exited with an error do the same.
-        if (ret != 0) {
-          return ret;
-        }
-      }
-
       ret = 0;
       // Now run the real compiler command and return its result value.
       if (lwyu.empty() &&
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d6d4c0c..d2465c4 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -340,10 +340,8 @@ if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
   endif()
   add_executable(pseudo_tidy pseudo_tidy.c)
   add_executable(pseudo_iwyu pseudo_iwyu.c)
-  add_executable(pseudo_cpplint pseudo_cpplint.c)
   add_RunCMake_test(ClangTidy -DPSEUDO_TIDY=$<TARGET_FILE:pseudo_tidy>)
   add_RunCMake_test(IncludeWhatYouUse -DPSEUDO_IWYU=$<TARGET_FILE:pseudo_iwyu>)
-  add_RunCMake_test(Cpplint -DPSEUDO_CPPLINT=$<TARGET_FILE:pseudo_cpplint>)
   add_RunCMake_test(CompilerLauncher)
 endif()
 
diff --git a/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt b/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt
index 35f50b7..0d0d899 100644
--- a/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt
+++ b/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt
@@ -1 +1 @@
-^__run_iwyu missing --cpplint=, --iwyu=, --lwyu=, and/or --tidy=$
+^__run_iwyu missing --tidy= or --iwyu=$
diff --git a/Tests/RunCMake/Cpplint/C-Build-stdout.txt b/Tests/RunCMake/Cpplint/C-Build-stdout.txt
deleted file mode 100644
index 3d68d40..0000000
--- a/Tests/RunCMake/Cpplint/C-Build-stdout.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Done processing .*Tests[/\]RunCMake[/\]Cpplint[/\]main\.c
-Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/C-error-Build-result.txt b/Tests/RunCMake/Cpplint/C-error-Build-result.txt
deleted file mode 100644
index d197c91..0000000
--- a/Tests/RunCMake/Cpplint/C-error-Build-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-[^0]
diff --git a/Tests/RunCMake/Cpplint/C-error-Build-stdout.txt b/Tests/RunCMake/Cpplint/C-error-Build-stdout.txt
deleted file mode 100644
index 74c6a1e..0000000
--- a/Tests/RunCMake/Cpplint/C-error-Build-stdout.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Tests[/\]RunCMake[/\]Cpplint[/\]main\.c:0:  message  \[category/category\] \[0\]
-Total errors found: 1
diff --git a/Tests/RunCMake/Cpplint/C-error-launch-Build-result.txt b/Tests/RunCMake/Cpplint/C-error-launch-Build-result.txt
deleted file mode 100644
index d197c91..0000000
--- a/Tests/RunCMake/Cpplint/C-error-launch-Build-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-[^0]
diff --git a/Tests/RunCMake/Cpplint/C-error-launch-Build-stdout.txt b/Tests/RunCMake/Cpplint/C-error-launch-Build-stdout.txt
deleted file mode 100644
index 74c6a1e..0000000
--- a/Tests/RunCMake/Cpplint/C-error-launch-Build-stdout.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Tests[/\]RunCMake[/\]Cpplint[/\]main\.c:0:  message  \[category/category\] \[0\]
-Total errors found: 1
diff --git a/Tests/RunCMake/Cpplint/C-error-launch.cmake b/Tests/RunCMake/Cpplint/C-error-launch.cmake
deleted file mode 100644
index c76e2e2..0000000
--- a/Tests/RunCMake/Cpplint/C-error-launch.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CTEST_USE_LAUNCHERS 1)
-include(CTestUseLaunchers)
-include(C-error.cmake)
diff --git a/Tests/RunCMake/Cpplint/C-error.cmake b/Tests/RunCMake/Cpplint/C-error.cmake
deleted file mode 100644
index 29cf7ba..0000000
--- a/Tests/RunCMake/Cpplint/C-error.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-enable_language(C)
-set(CMAKE_C_CPPLINT "${PSEUDO_CPPLINT}" --error)
-add_executable(main main.c)
diff --git a/Tests/RunCMake/Cpplint/C-launch-Build-stdout.txt b/Tests/RunCMake/Cpplint/C-launch-Build-stdout.txt
deleted file mode 100644
index 3d68d40..0000000
--- a/Tests/RunCMake/Cpplint/C-launch-Build-stdout.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Done processing .*Tests[/\]RunCMake[/\]Cpplint[/\]main\.c
-Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/C-launch.cmake b/Tests/RunCMake/Cpplint/C-launch.cmake
deleted file mode 100644
index e66ca20..0000000
--- a/Tests/RunCMake/Cpplint/C-launch.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CTEST_USE_LAUNCHERS 1)
-include(CTestUseLaunchers)
-include(C.cmake)
diff --git a/Tests/RunCMake/Cpplint/C.cmake b/Tests/RunCMake/Cpplint/C.cmake
deleted file mode 100644
index 68e6ff4..0000000
--- a/Tests/RunCMake/Cpplint/C.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-enable_language(C)
-set(CMAKE_C_CPPLINT "${PSEUDO_CPPLINT}" --verbose=0 --linelength=80)
-add_executable(main main.c)
diff --git a/Tests/RunCMake/Cpplint/CMakeLists.txt b/Tests/RunCMake/Cpplint/CMakeLists.txt
deleted file mode 100644
index a640c56..0000000
--- a/Tests/RunCMake/Cpplint/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-project(${RunCMake_TEST} NONE)
-include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/Cpplint/CXX-Build-stdout.txt b/Tests/RunCMake/Cpplint/CXX-Build-stdout.txt
deleted file mode 100644
index 91f0591..0000000
--- a/Tests/RunCMake/Cpplint/CXX-Build-stdout.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Done processing .*Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx
-Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/CXX-error-Build-result.txt b/Tests/RunCMake/Cpplint/CXX-error-Build-result.txt
deleted file mode 100644
index d197c91..0000000
--- a/Tests/RunCMake/Cpplint/CXX-error-Build-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-[^0]
diff --git a/Tests/RunCMake/Cpplint/CXX-error-Build-stdout.txt b/Tests/RunCMake/Cpplint/CXX-error-Build-stdout.txt
deleted file mode 100644
index 5e86c54..0000000
--- a/Tests/RunCMake/Cpplint/CXX-error-Build-stdout.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx:0:  message  \[category\/category\] \[0\]
-Total errors found: 1
diff --git a/Tests/RunCMake/Cpplint/CXX-error-launch-Build-result.txt b/Tests/RunCMake/Cpplint/CXX-error-launch-Build-result.txt
deleted file mode 100644
index d197c91..0000000
--- a/Tests/RunCMake/Cpplint/CXX-error-launch-Build-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-[^0]
diff --git a/Tests/RunCMake/Cpplint/CXX-error-launch-Build-stdout.txt b/Tests/RunCMake/Cpplint/CXX-error-launch-Build-stdout.txt
deleted file mode 100644
index 5e86c54..0000000
--- a/Tests/RunCMake/Cpplint/CXX-error-launch-Build-stdout.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx:0:  message  \[category\/category\] \[0\]
-Total errors found: 1
diff --git a/Tests/RunCMake/Cpplint/CXX-error-launch.cmake b/Tests/RunCMake/Cpplint/CXX-error-launch.cmake
deleted file mode 100644
index 72dcbe9..0000000
--- a/Tests/RunCMake/Cpplint/CXX-error-launch.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CTEST_USE_LAUNCHERS 1)
-include(CTestUseLaunchers)
-include(CXX-error.cmake)
diff --git a/Tests/RunCMake/Cpplint/CXX-error.cmake b/Tests/RunCMake/Cpplint/CXX-error.cmake
deleted file mode 100644
index ad66ff5..0000000
--- a/Tests/RunCMake/Cpplint/CXX-error.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-enable_language(CXX)
-set(CMAKE_CXX_CPPLINT "${PSEUDO_CPPLINT}" --error)
-add_executable(main main.cxx)
diff --git a/Tests/RunCMake/Cpplint/CXX-launch-Build-stdout.txt b/Tests/RunCMake/Cpplint/CXX-launch-Build-stdout.txt
deleted file mode 100644
index 91f0591..0000000
--- a/Tests/RunCMake/Cpplint/CXX-launch-Build-stdout.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Done processing .*Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx
-Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/CXX-launch.cmake b/Tests/RunCMake/Cpplint/CXX-launch.cmake
deleted file mode 100644
index 3002c9d..0000000
--- a/Tests/RunCMake/Cpplint/CXX-launch.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CTEST_USE_LAUNCHERS 1)
-include(CTestUseLaunchers)
-include(CXX.cmake)
diff --git a/Tests/RunCMake/Cpplint/CXX.cmake b/Tests/RunCMake/Cpplint/CXX.cmake
deleted file mode 100644
index 35f05ee..0000000
--- a/Tests/RunCMake/Cpplint/CXX.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-enable_language(CXX)
-set(CMAKE_CXX_CPPLINT "${PSEUDO_CPPLINT}" --verbose=0 --linelength=80)
-add_executable(main main.cxx)
diff --git a/Tests/RunCMake/Cpplint/RunCMakeTest.cmake b/Tests/RunCMake/Cpplint/RunCMakeTest.cmake
deleted file mode 100644
index 51bce2c..0000000
--- a/Tests/RunCMake/Cpplint/RunCMakeTest.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-include(RunCMake)
-
-set(RunCMake_TEST_OPTIONS "-DPSEUDO_CPPLINT=${PSEUDO_CPPLINT}")
-
-function(run_cpplint lang)
-  # Use a single build tree for tests without cleaning.
-  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/${lang}-build")
-  set(RunCMake_TEST_NO_CLEAN 1)
-  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
-  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
-  run_cmake(${lang})
-
-  set(RunCMake_TEST_OUTPUT_MERGE 1)
-  run_cmake_command(${lang}-Build ${CMAKE_COMMAND} --build .)
-endfunction()
-
-run_cpplint(C)
-run_cpplint(CXX)
-run_cpplint(C-error)
-run_cpplint(CXX-error)
-
-if(NOT RunCMake_GENERATOR STREQUAL "Watcom WMake")
-  run_cpplint(C-launch)
-  run_cpplint(CXX-launch)
-  run_cpplint(C-error-launch)
-  run_cpplint(CXX-error-launch)
-endif()
diff --git a/Tests/RunCMake/Cpplint/main.c b/Tests/RunCMake/Cpplint/main.c
deleted file mode 100644
index 8488f4e..0000000
--- a/Tests/RunCMake/Cpplint/main.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int main(void)
-{
-  return 0;
-}
diff --git a/Tests/RunCMake/Cpplint/main.cxx b/Tests/RunCMake/Cpplint/main.cxx
deleted file mode 100644
index f8b643a..0000000
--- a/Tests/RunCMake/Cpplint/main.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-int main()
-{
-  return 0;
-}
diff --git a/Tests/RunCMake/pseudo_cpplint.c b/Tests/RunCMake/pseudo_cpplint.c
deleted file mode 100644
index a089ac5..0000000
--- a/Tests/RunCMake/pseudo_cpplint.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-int main(int argc, char* argv[])
-{
-  int error = 0;
-  int i;
-  for (i = 1; i < argc; ++i) {
-    if (strcmp(argv[i], "--error") == 0) {
-      error = 1;
-    }
-    if (argv[i][0] != '-') {
-      if (error) {
-        fprintf(stderr, "%s:0:  message  [category/category] [0]\n", argv[i]);
-        fprintf(stdout, "Total errors found: 1\n");
-        return 1;
-      }
-      fprintf(stdout, "Done processing %s\n", argv[i]);
-      fprintf(stdout, "Total errors found: 0\n");
-      return 0;
-    }
-  }
-}

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

Summary of changes:
 Auxiliary/vim/syntax/cmake.vim                     |    4 +-
 Help/manual/cmake-properties.7.rst                 |    1 -
 Help/manual/cmake-variables.7.rst                  |    1 -
 Help/prop_tgt/LANG_CPPLINT.rst                     |   13 ------
 Help/release/dev/add-LANG_CPPLINT.rst              |    8 ----
 Help/variable/CMAKE_LANG_CPPLINT.rst               |    6 ---
 Source/cmMakefileTargetGenerator.cxx               |   10 +----
 Source/cmNinjaTargetGenerator.cxx                  |   10 +----
 Source/cmTarget.cxx                                |    2 -
 Source/cmcmd.cxx                                   |   42 +++-----------------
 Tests/RunCMake/CMakeLists.txt                      |    2 -
 .../CommandLine/E___run_iwyu-no-iwyu-stderr.txt    |    2 +-
 Tests/RunCMake/Cpplint/C-Build-stdout.txt          |    2 -
 Tests/RunCMake/Cpplint/C-error-Build-result.txt    |    1 -
 Tests/RunCMake/Cpplint/C-error-Build-stdout.txt    |    2 -
 .../Cpplint/C-error-launch-Build-result.txt        |    1 -
 .../Cpplint/C-error-launch-Build-stdout.txt        |    2 -
 Tests/RunCMake/Cpplint/C-error-launch.cmake        |    3 --
 Tests/RunCMake/Cpplint/C-error.cmake               |    3 --
 Tests/RunCMake/Cpplint/C-launch-Build-stdout.txt   |    2 -
 Tests/RunCMake/Cpplint/C-launch.cmake              |    3 --
 Tests/RunCMake/Cpplint/C.cmake                     |    3 --
 Tests/RunCMake/Cpplint/CMakeLists.txt              |    3 --
 Tests/RunCMake/Cpplint/CXX-Build-stdout.txt        |    2 -
 Tests/RunCMake/Cpplint/CXX-error-Build-result.txt  |    1 -
 Tests/RunCMake/Cpplint/CXX-error-Build-stdout.txt  |    2 -
 .../Cpplint/CXX-error-launch-Build-result.txt      |    1 -
 .../Cpplint/CXX-error-launch-Build-stdout.txt      |    2 -
 Tests/RunCMake/Cpplint/CXX-error-launch.cmake      |    3 --
 Tests/RunCMake/Cpplint/CXX-error.cmake             |    3 --
 Tests/RunCMake/Cpplint/CXX-launch-Build-stdout.txt |    2 -
 Tests/RunCMake/Cpplint/CXX-launch.cmake            |    3 --
 Tests/RunCMake/Cpplint/CXX.cmake                   |    3 --
 Tests/RunCMake/Cpplint/RunCMakeTest.cmake          |   27 -------------
 Tests/RunCMake/Cpplint/main.c                      |    4 --
 Tests/RunCMake/Cpplint/main.cxx                    |    4 --
 Tests/RunCMake/pseudo_cpplint.c                    |   23 -----------
 37 files changed, 10 insertions(+), 196 deletions(-)
 delete mode 100644 Help/prop_tgt/LANG_CPPLINT.rst
 delete mode 100644 Help/release/dev/add-LANG_CPPLINT.rst
 delete mode 100644 Help/variable/CMAKE_LANG_CPPLINT.rst
 delete mode 100644 Tests/RunCMake/Cpplint/C-Build-stdout.txt
 delete mode 100644 Tests/RunCMake/Cpplint/C-error-Build-result.txt
 delete mode 100644 Tests/RunCMake/Cpplint/C-error-Build-stdout.txt
 delete mode 100644 Tests/RunCMake/Cpplint/C-error-launch-Build-result.txt
 delete mode 100644 Tests/RunCMake/Cpplint/C-error-launch-Build-stdout.txt
 delete mode 100644 Tests/RunCMake/Cpplint/C-error-launch.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/C-error.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/C-launch-Build-stdout.txt
 delete mode 100644 Tests/RunCMake/Cpplint/C-launch.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/C.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/CMakeLists.txt
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-Build-stdout.txt
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-error-Build-result.txt
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-error-Build-stdout.txt
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-error-launch-Build-result.txt
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-error-launch-Build-stdout.txt
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-error-launch.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-error.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-launch-Build-stdout.txt
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-launch.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/CXX.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/RunCMakeTest.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/main.c
 delete mode 100644 Tests/RunCMake/Cpplint/main.cxx
 delete mode 100644 Tests/RunCMake/pseudo_cpplint.c


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 17 09:00:40 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Jan 2017 09:00:40 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2208-g1ac8030
Message-ID: <20170117140040.C7461FA4D9@public.kitware.com>

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  1ac8030d4853e05fb7905f21ee4a3f5ea611369f (commit)
       via  6821858d0eef4898b42cea91be7a736b5658a990 (commit)
      from  d38b13d289dd67249d3d307562ff2a7a27d5785a (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=1ac8030d4853e05fb7905f21ee4a3f5ea611369f
commit 1ac8030d4853e05fb7905f21ee4a3f5ea611369f
Merge: d38b13d 6821858
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 09:00:40 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 17 09:00:40 2017 -0500

    Merge topic 'cdash_upload_retry' into next
    
    6821858d fixup! ctest_submit: Allow RETRY_COUNT for CDASH_UPLOAD


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6821858d0eef4898b42cea91be7a736b5658a990
commit 6821858d0eef4898b42cea91be7a736b5658a990
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 08:59:08 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 17 08:59:08 2017 -0500

    fixup! ctest_submit: Allow RETRY_COUNT for CDASH_UPLOAD

diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index d8a7dca..5e5119d 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -1093,7 +1093,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
                                                        << " seconds...\n",
                          this->Quiet);
 
-      double stop = cmSystemTools::GetTime() + retryDelay;
+      double stop = cmSystemTools::GetTime() + static_cast<double>(retryDelay);
       while (cmSystemTools::GetTime() < stop) {
         cmSystemTools::Delay(100);
       }
@@ -1167,7 +1167,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
                                                       << " seconds...\n",
                          this->Quiet);
 
-      double stop = cmSystemTools::GetTime() + retryDelay;
+      double stop = cmSystemTools::GetTime() + static_cast<double>(retryDelay);
       while (cmSystemTools::GetTime() < stop) {
         cmSystemTools::Delay(100);
       }

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

Summary of changes:
 Source/CTest/cmCTestSubmitHandler.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 17 09:04:53 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Jan 2017 09:04:53 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1115-gaa63ab6
Message-ID: <20170117140453.379D4FA5D0@public.kitware.com>

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  aa63ab6d3e7bf320f17a5364a596355e3ab976e0 (commit)
       via  7c8ab7ddc8944152a1344c43acbb8c57fa2d398a (commit)
      from  020cba316bb3a4d33da5108ab10d2c06b4712427 (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=aa63ab6d3e7bf320f17a5364a596355e3ab976e0
commit aa63ab6d3e7bf320f17a5364a596355e3ab976e0
Merge: 020cba3 7c8ab7d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 09:04:50 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 17 09:04:50 2017 -0500

    Merge topic 'expand_custom_commands'
    
    7c8ab7dd add_custom_{command,target}: Add COMMAND_EXPAND_LISTS option


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

Summary of changes:
 Help/command/add_custom_command.rst         |   11 ++++++++-
 Help/command/add_custom_target.rst          |    9 ++++++++
 Help/release/dev/expand_custom_commands.rst |    7 ++++++
 Source/cmAddCustomCommandCommand.cxx        |    9 ++++++--
 Source/cmAddCustomTargetCommand.cxx         |   13 ++++++++++-
 Source/cmCustomCommand.cxx                  |   12 ++++++++++
 Source/cmCustomCommand.h                    |    5 +++++
 Source/cmCustomCommandGenerator.cxx         |   32 +++++++++++++++++++--------
 Source/cmCustomCommandGenerator.h           |    2 ++
 Source/cmMakefile.cxx                       |   22 +++++++++++-------
 Source/cmMakefile.h                         |   15 ++++++++-----
 Tests/CustomCommand/CMakeLists.txt          |   21 ++++++++++++++++++
 Tests/CustomCommand/compare_options.cmake   |   14 ++++++++++++
 13 files changed, 146 insertions(+), 26 deletions(-)
 create mode 100644 Help/release/dev/expand_custom_commands.rst
 create mode 100644 Tests/CustomCommand/compare_options.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 17 09:04:56 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Jan 2017 09:04:56 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1117-g6512423
Message-ID: <20170117140456.36679FA5D3@public.kitware.com>

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  65124233da4b3e53643c896d38602318fcc549f0 (commit)
       via  2bba0bfc2c113a1ec94802ecfb8a836a385f919b (commit)
      from  aa63ab6d3e7bf320f17a5364a596355e3ab976e0 (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=65124233da4b3e53643c896d38602318fcc549f0
commit 65124233da4b3e53643c896d38602318fcc549f0
Merge: aa63ab6 2bba0bf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 09:04:53 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 17 09:04:53 2017 -0500

    Merge topic 'file-GLOB-empty-no-crash'
    
    2bba0bfc file: Fix crash on GLOB with no expressions after LIST_DIRECTORIES


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

Summary of changes:
 Source/cmFileCommand.cxx                              |    2 +-
 Tests/RunCMake/file/GLOB-noexp-LIST_DIRECTORIES.cmake |    1 +
 Tests/RunCMake/file/RunCMakeTest.cmake                |    1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 Tests/RunCMake/file/GLOB-noexp-LIST_DIRECTORIES.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 17 09:04:59 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Jan 2017 09:04:59 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1119-g6e4eb08
Message-ID: <20170117140459.5A5F8FA5D0@public.kitware.com>

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  6e4eb083d64a0e562e4fb8d2663cd895aa75c500 (commit)
       via  298b5b31caaa613259d0a1c56a299e8e523fd61a (commit)
      from  65124233da4b3e53643c896d38602318fcc549f0 (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=6e4eb083d64a0e562e4fb8d2663cd895aa75c500
commit 6e4eb083d64a0e562e4fb8d2663cd895aa75c500
Merge: 6512423 298b5b3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 09:04:57 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 17 09:04:57 2017 -0500

    Merge topic 'fixtureUnusedOrdering'
    
    298b5b31 CTest: Ensure setup/cleanup ordering even when fixture not required


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

Summary of changes:
 Source/CTest/cmCTestTestHandler.cxx              |   82 ++++++++++++++++------
 Tests/RunCMake/ctest_fixtures/CMakeLists.txt.in  |    6 ++
 Tests/RunCMake/ctest_fixtures/RunCMakeTest.cmake |    1 +
 Tests/RunCMake/ctest_fixtures/unused-stdout.txt  |    9 +++
 4 files changed, 76 insertions(+), 22 deletions(-)
 create mode 100644 Tests/RunCMake/ctest_fixtures/unused-stdout.txt


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 17 09:05:02 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Jan 2017 09:05:02 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1121-gf63096a
Message-ID: <20170117140502.30C5BFA4DF@public.kitware.com>

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  f63096a68c692f1098380cc84e729ab79c67e59b (commit)
       via  5201a3065b1c49ee2628d95c860b667e9e2b182e (commit)
      from  6e4eb083d64a0e562e4fb8d2663cd895aa75c500 (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=f63096a68c692f1098380cc84e729ab79c67e59b
commit f63096a68c692f1098380cc84e729ab79c67e59b
Merge: 6e4eb08 5201a30
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 09:05:00 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 17 09:05:00 2017 -0500

    Merge topic 'findhdf5-libraries-targets'
    
    5201a306 FindHDF5: use the target rather than the path


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 17 09:05:05 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Jan 2017 09:05:05 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1123-g524c564
Message-ID: <20170117140505.0A4D5FA5D3@public.kitware.com>

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  524c56431859cfc8a96a8dad752f131804982166 (commit)
       via  cdf7e5d8661c5035e42d251d009b5ef49a11af98 (commit)
      from  f63096a68c692f1098380cc84e729ab79c67e59b (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=524c56431859cfc8a96a8dad752f131804982166
commit 524c56431859cfc8a96a8dad752f131804982166
Merge: f63096a cdf7e5d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 09:05:02 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 17 09:05:02 2017 -0500

    Merge topic 'FindICU-include-dirs'
    
    cdf7e5d8 FindICU: Add 'include' to the path suffixes


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 17 09:05:07 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Jan 2017 09:05:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1126-gc9e76c3
Message-ID: <20170117140507.E1612FA5D5@public.kitware.com>

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  c9e76c3e04ad2dc4f50297451f2c38fdef7ae6b6 (commit)
       via  ee77941a1fdf3a617207b00a7f2e9315eaef7b31 (commit)
       via  219c7bdcb16cd1dfe2e72befa4334c5b8147e1d7 (commit)
      from  524c56431859cfc8a96a8dad752f131804982166 (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=c9e76c3e04ad2dc4f50297451f2c38fdef7ae6b6
commit c9e76c3e04ad2dc4f50297451f2c38fdef7ae6b6
Merge: 524c564 ee77941
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 09:05:05 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 17 09:05:05 2017 -0500

    Merge topic 'update-kwsys'
    
    ee77941a Merge branch 'upstream-KWSys' into update-kwsys
    219c7bdc KWSys 2017-01-16 (a423d829)


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

Summary of changes:
 Source/kwsys/CMakeLists.txt      |    3 +++
 Source/kwsys/SystemTools.cxx     |   11 +++-----
 Source/kwsys/testSystemTools.cxx |   53 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 17 09:05:11 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Jan 2017 09:05:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1128-gcab8f26
Message-ID: <20170117140511.0C3B6FA5D7@public.kitware.com>

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  cab8f26211051a24ceb0e512660f022c9960f241 (commit)
       via  f38644527cee6d99b48930bf88e84de15d98007b (commit)
      from  c9e76c3e04ad2dc4f50297451f2c38fdef7ae6b6 (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=cab8f26211051a24ceb0e512660f022c9960f241
commit cab8f26211051a24ceb0e512660f022c9960f241
Merge: c9e76c3 f386445
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 09:05:08 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 17 09:05:08 2017 -0500

    Merge topic 'cmCTestBuildHandler-fix-warning'
    
    f3864452 cmCTestBuildHandler: Fix warning in FragmentCompare signature


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 17 09:05:27 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Jan 2017 09:05:27 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2217-gaf15867
Message-ID: <20170117140527.A8070FA5D3@public.kitware.com>

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  af15867d4af1cb9526e136fc67d9fefff6f9e2ea (commit)
       via  cab8f26211051a24ceb0e512660f022c9960f241 (commit)
       via  c9e76c3e04ad2dc4f50297451f2c38fdef7ae6b6 (commit)
       via  524c56431859cfc8a96a8dad752f131804982166 (commit)
       via  f63096a68c692f1098380cc84e729ab79c67e59b (commit)
       via  6e4eb083d64a0e562e4fb8d2663cd895aa75c500 (commit)
       via  65124233da4b3e53643c896d38602318fcc549f0 (commit)
       via  aa63ab6d3e7bf320f17a5364a596355e3ab976e0 (commit)
       via  020cba316bb3a4d33da5108ab10d2c06b4712427 (commit)
      from  1ac8030d4853e05fb7905f21ee4a3f5ea611369f (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=af15867d4af1cb9526e136fc67d9fefff6f9e2ea
commit af15867d4af1cb9526e136fc67d9fefff6f9e2ea
Merge: 1ac8030 cab8f26
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 09:05:19 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 17 09:05:19 2017 -0500

    Merge branch 'master' into next


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 17 09:27:36 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Jan 2017 09:27:36 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2219-g37dff4b
Message-ID: <20170117142736.1D459FA38C@public.kitware.com>

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  37dff4b95a8846939d0294434bc0e0b16e006d09 (commit)
       via  d9f836e9567dbcce85b917300e8de9086aa1f1f7 (commit)
      from  af15867d4af1cb9526e136fc67d9fefff6f9e2ea (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=37dff4b95a8846939d0294434bc0e0b16e006d09
commit 37dff4b95a8846939d0294434bc0e0b16e006d09
Merge: af15867 d9f836e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 09:27:34 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 17 09:27:34 2017 -0500

    Merge topic '16165-manually-added-dependencies' into next
    
    d9f836e9 Add a getter for manually added target dependencies


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9f836e9567dbcce85b917300e8de9086aa1f1f7
commit d9f836e9567dbcce85b917300e8de9086aa1f1f7
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Jun 26 00:12:52 2016 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Mon Jan 16 22:38:24 2017 +0100

    Add a getter for manually added target dependencies
    
    Closes: #16165

diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 864d1dc..5b39bed 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -236,6 +236,7 @@ Properties on Targets
    /prop_tgt/MACOSX_BUNDLE
    /prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST
    /prop_tgt/MACOSX_RPATH
+   /prop_tgt/MANUALLY_ADDED_DEPENDENCIES
    /prop_tgt/MAP_IMPORTED_CONFIG_CONFIG
    /prop_tgt/NAME
    /prop_tgt/NO_SONAME
diff --git a/Help/prop_tgt/MANUALLY_ADDED_DEPENDENCIES.rst b/Help/prop_tgt/MANUALLY_ADDED_DEPENDENCIES.rst
new file mode 100644
index 0000000..c12ea14
--- /dev/null
+++ b/Help/prop_tgt/MANUALLY_ADDED_DEPENDENCIES.rst
@@ -0,0 +1,8 @@
+MANUALLY_ADDED_DEPENDENCIES
+---------------------------
+
+Get manually added dependencies to other top-level targets.
+
+This read-only property can be used to query all dependencies that
+were added for this target with the :command:`add_dependencies`
+command.
diff --git a/Help/release/dev/manually-added-dependencies.rst b/Help/release/dev/manually-added-dependencies.rst
new file mode 100644
index 0000000..6c486da
--- /dev/null
+++ b/Help/release/dev/manually-added-dependencies.rst
@@ -0,0 +1,6 @@
+manually-added-dependencies
+---------------------------
+
+* The target property :prop_tgt:`MANUALLY_ADDED_DEPENDENCIES` has
+  been added.  It is read-only and could be used to retrieve
+  dependencies that have been added with :command:`add_dependencies`.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 9261ca8..d825e5c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -852,6 +852,12 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
         this->Makefile->GetBacktrace())) {
     return;
   }
+  if (prop == "MANUALLY_ADDED_DEPENDENCIES") {
+    std::ostringstream e;
+    e << "MANUALLY_ADDED_DEPENDENCIES property is read-only\n";
+    this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
+    return;
+  }
   if (prop == "NAME") {
     std::ostringstream e;
     e << "NAME property is read-only\n";
@@ -1168,6 +1174,7 @@ const char* cmTarget::GetProperty(const std::string& prop) const
   MAKE_STATIC_PROP(COMPILE_OPTIONS);
   MAKE_STATIC_PROP(COMPILE_DEFINITIONS);
   MAKE_STATIC_PROP(IMPORTED);
+  MAKE_STATIC_PROP(MANUALLY_ADDED_DEPENDENCIES);
   MAKE_STATIC_PROP(NAME);
   MAKE_STATIC_PROP(BINARY_DIR);
   MAKE_STATIC_PROP(SOURCE_DIR);
@@ -1181,6 +1188,7 @@ const char* cmTarget::GetProperty(const std::string& prop) const
     specialProps.insert(propCOMPILE_OPTIONS);
     specialProps.insert(propCOMPILE_DEFINITIONS);
     specialProps.insert(propIMPORTED);
+    specialProps.insert(propMANUALLY_ADDED_DEPENDENCIES);
     specialProps.insert(propNAME);
     specialProps.insert(propBINARY_DIR);
     specialProps.insert(propSOURCE_DIR);
@@ -1236,6 +1244,15 @@ const char* cmTarget::GetProperty(const std::string& prop) const
       output = cmJoin(this->Internal->CompileDefinitionsEntries, ";");
       return output.c_str();
     }
+    if (prop == propMANUALLY_ADDED_DEPENDENCIES) {
+      if (this->Utilities.empty()) {
+        return CM_NULLPTR;
+      }
+
+      static std::string output;
+      output = cmJoin(this->Utilities, ";");
+      return output.c_str();
+    }
     if (prop == propIMPORTED) {
       return this->IsImported() ? "TRUE" : "FALSE";
     }
diff --git a/Tests/RunCMake/add_dependencies/ReadOnlyProperty-result.txt b/Tests/RunCMake/add_dependencies/ReadOnlyProperty-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/add_dependencies/ReadOnlyProperty-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/add_dependencies/ReadOnlyProperty-stderr.txt b/Tests/RunCMake/add_dependencies/ReadOnlyProperty-stderr.txt
new file mode 100644
index 0000000..da30b81
--- /dev/null
+++ b/Tests/RunCMake/add_dependencies/ReadOnlyProperty-stderr.txt
@@ -0,0 +1 @@
+MANUALLY_ADDED_DEPENDENCIES property is read-only
diff --git a/Tests/RunCMake/add_dependencies/ReadOnlyProperty.cmake b/Tests/RunCMake/add_dependencies/ReadOnlyProperty.cmake
new file mode 100644
index 0000000..f0e4069
--- /dev/null
+++ b/Tests/RunCMake/add_dependencies/ReadOnlyProperty.cmake
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.7)
+project(ReadOnlyProperty C)
+
+add_library(a a.c)
+
+set_property(TARGET a PROPERTY MANUALLY_ADDED_DEPENDENCIES DEPENDENCIES foo)
diff --git a/Tests/RunCMake/add_dependencies/RetrieveDependencies.cmake b/Tests/RunCMake/add_dependencies/RetrieveDependencies.cmake
new file mode 100644
index 0000000..45b3974
--- /dev/null
+++ b/Tests/RunCMake/add_dependencies/RetrieveDependencies.cmake
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.7)
+project(RetrieveDependencies C)
+
+add_library(a a.c)
+
+add_library(b c.c)
+target_link_libraries(a b)
+
+add_library(c c.c)
+add_dependencies(a c)
+
+get_property(DEPS_A TARGET a PROPERTY MANUALLY_ADDED_DEPENDENCIES)
+
+if(NOT DEPS_A STREQUAL "c")
+  message(FATAL_ERROR "Expected target c being a dependency of a but got: '${DEPS_A}'")
+endif()
diff --git a/Tests/RunCMake/add_dependencies/RunCMakeTest.cmake b/Tests/RunCMake/add_dependencies/RunCMakeTest.cmake
index 30b7e67..507d43f 100644
--- a/Tests/RunCMake/add_dependencies/RunCMakeTest.cmake
+++ b/Tests/RunCMake/add_dependencies/RunCMakeTest.cmake
@@ -1,3 +1,5 @@
 include(RunCMake)
 
 run_cmake(NoTarget)
+run_cmake(ReadOnlyProperty)
+run_cmake(RetrieveDependencies)
diff --git a/Tests/RunCMake/add_dependencies/a.c b/Tests/RunCMake/add_dependencies/a.c
new file mode 100644
index 0000000..707c1c3
--- /dev/null
+++ b/Tests/RunCMake/add_dependencies/a.c
@@ -0,0 +1,3 @@
+void a()
+{
+}
diff --git a/Tests/RunCMake/add_dependencies/b.c b/Tests/RunCMake/add_dependencies/b.c
new file mode 100644
index 0000000..57b2900
--- /dev/null
+++ b/Tests/RunCMake/add_dependencies/b.c
@@ -0,0 +1,3 @@
+void b()
+{
+}
diff --git a/Tests/RunCMake/add_dependencies/c.c b/Tests/RunCMake/add_dependencies/c.c
new file mode 100644
index 0000000..cbf94ca
--- /dev/null
+++ b/Tests/RunCMake/add_dependencies/c.c
@@ -0,0 +1,3 @@
+void c()
+{
+}

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

Summary of changes:
 Help/manual/cmake-properties.7.rst                    |    1 +
 Help/prop_tgt/MANUALLY_ADDED_DEPENDENCIES.rst         |    8 ++++++++
 Help/release/dev/manually-added-dependencies.rst      |    6 ++++++
 Source/cmTarget.cxx                                   |   17 +++++++++++++++++
 .../ReadOnlyProperty-result.txt}                      |    0
 .../add_dependencies/ReadOnlyProperty-stderr.txt      |    1 +
 .../RunCMake/add_dependencies/ReadOnlyProperty.cmake  |    6 ++++++
 .../add_dependencies/RetrieveDependencies.cmake       |   16 ++++++++++++++++
 Tests/RunCMake/add_dependencies/RunCMakeTest.cmake    |    2 ++
 Tests/RunCMake/add_dependencies/a.c                   |    3 +++
 Tests/RunCMake/add_dependencies/b.c                   |    3 +++
 Tests/RunCMake/add_dependencies/c.c                   |    3 +++
 12 files changed, 66 insertions(+)
 create mode 100644 Help/prop_tgt/MANUALLY_ADDED_DEPENDENCIES.rst
 create mode 100644 Help/release/dev/manually-added-dependencies.rst
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => add_dependencies/ReadOnlyProperty-result.txt} (100%)
 create mode 100644 Tests/RunCMake/add_dependencies/ReadOnlyProperty-stderr.txt
 create mode 100644 Tests/RunCMake/add_dependencies/ReadOnlyProperty.cmake
 create mode 100644 Tests/RunCMake/add_dependencies/RetrieveDependencies.cmake
 create mode 100644 Tests/RunCMake/add_dependencies/a.c
 create mode 100644 Tests/RunCMake/add_dependencies/b.c
 create mode 100644 Tests/RunCMake/add_dependencies/c.c


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 17 09:32:06 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Jan 2017 09:32:06 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2221-g9764f95
Message-ID: <20170117143206.DE89BFA426@public.kitware.com>

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  9764f958cca5dd910ad7b49ccb804afe69d0f30a (commit)
       via  28b332f1f1aceec9b5c2b598f432454d72711246 (commit)
      from  37dff4b95a8846939d0294434bc0e0b16e006d09 (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=9764f958cca5dd910ad7b49ccb804afe69d0f30a
commit 9764f958cca5dd910ad7b49ccb804afe69d0f30a
Merge: 37dff4b 28b332f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 09:32:06 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 17 09:32:06 2017 -0500

    Merge topic 'productbuild_signing' into next
    
    28b332f1 CPackProductBuild: Add options to sign packages


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28b332f1f1aceec9b5c2b598f432454d72711246
commit 28b332f1f1aceec9b5c2b598f432454d72711246
Author:     Roman W?ger <office at wueger.at>
AuthorDate: Sun Jan 15 01:29:34 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 17 09:30:52 2017 -0500

    CPackProductBuild: Add options to sign packages

diff --git a/Help/release/dev/cpack-productbuild-signing.rst b/Help/release/dev/cpack-productbuild-signing.rst
new file mode 100644
index 0000000..0b91b38
--- /dev/null
+++ b/Help/release/dev/cpack-productbuild-signing.rst
@@ -0,0 +1,8 @@
+cpack-productbuild-signing
+--------------------------
+
+* The :module:`CPackProductBuild` module gained options to sign packages.
+  See the variables :variable:`CPACK_PRODUCTBUILD_IDENTITY_NAME`,
+  :variable:`CPACK_PRODUCTBUILD_KEYCHAIN_PATH`,
+  :variable:`CPACK_PKGBUILD_IDENTITY_NAME`, and
+  :variable:`CPACK_PKGBUILD_KEYCHAIN_PATH`.
diff --git a/Modules/CPackProductBuild.cmake b/Modules/CPackProductBuild.cmake
index ea2fa7c..d545d3e 100644
--- a/Modules/CPackProductBuild.cmake
+++ b/Modules/CPackProductBuild.cmake
@@ -20,9 +20,29 @@
 #  the automatically detected command (or specify its location if the
 #  auto-detection fails to find it.)
 #
+# .. variable:: CPACK_PRODUCTBUILD_IDENTITY_NAME
+#
+#  Adds a digital signature to the resulting package.
+#
+#
+# .. variable:: CPACK_PRODUCTBUILD_KEYCHAIN_PATH
+#
+#  Specify a specific keychain to search for the signing identity.
+#
+#
 # .. variable:: CPACK_COMMAND_PKGBUILD
 #
 #  Path to the pkgbuild(1) command used to generate an OS X component package
 #  on OS X.  This variable can be used to override the automatically detected
 #  command (or specify its location if the auto-detection fails to find it.)
 #
+#
+# .. variable:: CPACK_PKGBUILD_IDENTITY_NAME
+#
+#  Adds a digital signature to the resulting package.
+#
+#
+# .. variable:: CPACK_PKGBUILD_KEYCHAIN_PATH
+#
+#  Specify a specific keychain to search for the signing identity.
+#
diff --git a/Source/CPack/cmCPackProductBuildGenerator.cxx b/Source/CPack/cmCPackProductBuildGenerator.cxx
index a46e3a6..35b2ccc 100644
--- a/Source/CPack/cmCPackProductBuildGenerator.cxx
+++ b/Source/CPack/cmCPackProductBuildGenerator.cxx
@@ -75,14 +75,27 @@ int cmCPackProductBuildGenerator::PackageFiles()
 
   std::string version = this->GetOption("CPACK_PACKAGE_VERSION");
   std::string productbuild = this->GetOption("CPACK_COMMAND_PRODUCTBUILD");
+  std::string identityName =
+    this->GetOption("CPACK_PRODUCTBUILD_IDENTITY_NAME");
+  std::string keychainPath =
+    this->GetOption("CPACK_PRODUCTBUILD_KEYCHAIN_PATH");
 
   pkgCmd << productbuild << " --distribution \"" << packageDirFileName
          << "/Contents/distribution.dist\""
          << " --package-path \"" << packageDirFileName << "/Contents/Packages"
          << "\""
          << " --resources \"" << resDir << "\""
-         << " --version \"" << version << "\""
-         << " \"" << packageFileNames[0] << "\"";
+         << " --version \"" << version << "\"";
+
+  if (!identityName.empty()) {
+    pkgCmd << " --sign \"" << identityName << "\"";
+  }
+
+  if (!keychainPath.empty()) {
+    pkgCmd << " --keychain \"" << keychainPath << "\"";
+  }
+
+  pkgCmd << " \"" << packageFileNames[0] << "\"";
 
   // Run ProductBuild
   return RunProductBuild(pkgCmd.str());
@@ -193,13 +206,24 @@ bool cmCPackProductBuildGenerator::GenerateComponentPackage(
 
   std::string version = this->GetOption("CPACK_PACKAGE_VERSION");
   std::string pkgbuild = this->GetOption("CPACK_COMMAND_PKGBUILD");
+  std::string identityName = this->GetOption("CPACK_PKGBUILD_IDENTITY_NAME");
+  std::string keychainPath = this->GetOption("CPACK_PKGBUILD_KEYCHAIN_PATH");
 
   pkgCmd << pkgbuild << " --root \"" << packageDir << "\""
          << " --identifier \"" << pkgId << "\""
          << " --scripts \"" << scriptDir << "\""
          << " --version \"" << version << "\""
-         << " --install-location \"/\""
-         << " \"" << packageFile << "\"";
+         << " --install-location \"/\"";
+
+  if (!identityName.empty()) {
+    pkgCmd << " --sign \"" << identityName << "\"";
+  }
+
+  if (!keychainPath.empty()) {
+    pkgCmd << " --keychain \"" << keychainPath << "\"";
+  }
+
+  pkgCmd << " \"" << packageFile << "\"";
 
   // Run ProductBuild
   return RunProductBuild(pkgCmd.str());

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

Summary of changes:
 Help/release/dev/cpack-productbuild-signing.rst |    8 ++++++
 Modules/CPackProductBuild.cmake                 |   20 ++++++++++++++
 Source/CPack/cmCPackProductBuildGenerator.cxx   |   32 ++++++++++++++++++++---
 3 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 Help/release/dev/cpack-productbuild-signing.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 17 09:36:59 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Jan 2017 09:36:59 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2223-g073b55f
Message-ID: <20170117143659.8CC1BFA472@public.kitware.com>

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  073b55ff67c0057b49b94c9ee3d89f6c79db7664 (commit)
       via  3fc4a2b71a25ba4045a8b80e66ecffba54bd0d54 (commit)
      from  9764f958cca5dd910ad7b49ccb804afe69d0f30a (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=073b55ff67c0057b49b94c9ee3d89f6c79db7664
commit 073b55ff67c0057b49b94c9ee3d89f6c79db7664
Merge: 9764f95 3fc4a2b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 09:36:58 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 17 09:36:58 2017 -0500

    Merge topic 'cpack-ifw-new-installer-options' into next
    
    3fc4a2b7 QtIFW: Added new options to QtIFW cpack generator for modifying wizard style


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fc4a2b71a25ba4045a8b80e66ecffba54bd0d54
commit 3fc4a2b71a25ba4045a8b80e66ecffba54bd0d54
Author:     Alexander Voitenko <game.boostify at gmail.com>
AuthorDate: Tue Jan 17 14:12:02 2017 +0300
Commit:     Alexander Voitenko <game.boostify at gmail.com>
CommitDate: Tue Jan 17 14:12:02 2017 +0300

    QtIFW: Added new options to QtIFW cpack generator for modifying wizard style

diff --git a/Help/release/dev/cpack-ifw-package-options.rst b/Help/release/dev/cpack-ifw-package-options.rst
new file mode 100644
index 0000000..1fec324
--- /dev/null
+++ b/Help/release/dev/cpack-ifw-package-options.rst
@@ -0,0 +1,7 @@
+cpack-ifw-package-options
+-------------------------
+
+* The :module:`CPackIFW` module gained new :variable:`CPACK_IFW_PACKAGE_WATERMARK`, :variable:`CPACK_IFW_PACKAGE_BANNER`,
+  :variable:`CPACK_IFW_PACKAGE_BACKGROUND`, :variable:`CPACK_IFW_PACKAGE_WIZARD_STYLE`, :variable:`CPACK_IFW_PACKAGE_WIZARD_DEFAULT_WIDTH`,
+  :variable:`CPACK_IFW_PACKAGE_WIZARD_DEFAULT_HEIGHT` and :variable:`CPACK_IFW_PACKAGE_TITLE_COLOR`
+  variables to customize a QtIFW installer look.
diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake
index b3ab055..ae595fb 100644
--- a/Modules/CPackIFW.cmake
+++ b/Modules/CPackIFW.cmake
@@ -76,6 +76,34 @@
 #
 #  Filename for a logo is used as QWizard::LogoPixmap.
 #
+# .. variable:: CPACK_IFW_PACKAGE_WATERMARK
+#
+#  Filename for a watermark is used as QWizard::WatermarkPixmap.
+#
+# .. variable:: CPACK_IFW_PACKAGE_BANNER
+#
+#  Filename for a banner is used as QWizard::BannerPixmap.
+#
+# .. variable:: CPACK_IFW_PACKAGE_BACKGROUND
+#
+#  Filename for an image used as QWizard::BackgroundPixmap (only used by MacStyle).
+#
+# .. variable:: CPACK_IFW_PACKAGE_WIZARD_STYLE
+#
+#  Wizard style to be used ("Modern", "Mac", "Aero" or "Classic").
+#
+# .. variable:: CPACK_IFW_PACKAGE_WIZARD_DEFAULT_WIDTH
+#
+#  Default width of the wizard in pixels. Setting a banner image will override this.
+#
+# .. variable:: CPACK_IFW_PACKAGE_WIZARD_DEFAULT_HEIGHT
+#
+#  Default height of the wizard in pixels. Setting a watermark image will override this.
+#
+# .. variable:: CPACK_IFW_PACKAGE_TITLE_COLOR
+#
+#  Color of the titles and subtitles (takes an HTML color code, such as "#88FF33").
+#
 # .. variable:: CPACK_IFW_PACKAGE_START_MENU_DIRECTORY
 #
 #  Name of the default program group for the product in the Windows Start menu.
diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx
index 9ca7750..d8bafee 100644
--- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx
+++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx
@@ -60,6 +60,16 @@ bool cmCPackIFWInstaller::IsVersionEqual(const char* version)
   return Generator ? Generator->IsVersionEqual(version) : false;
 }
 
+void cmCPackIFWInstaller::printSkippedOptionWarning(
+  const std::string& optionName, const std::string& optionValue)
+{
+  cmCPackLogger(
+    cmCPackLog::LOG_WARNING, "Option "
+      << optionName << " is set to \"" << optionValue
+      << "\" but will be skipped because the specified file does not exist."
+      << std::endl);
+}
+
 void cmCPackIFWInstaller::ConfigureFromOptions()
 {
   // Name;
@@ -110,7 +120,7 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
     if (cmSystemTools::FileExists(option)) {
       InstallerApplicationIcon = option;
     } else {
-      // TODO: implement warning
+      printSkippedOptionWarning("CPACK_IFW_PACKAGE_ICON", option);
     }
   }
 
@@ -119,7 +129,7 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
     if (cmSystemTools::FileExists(option)) {
       InstallerWindowIcon = option;
     } else {
-      // TODO: implement warning
+      printSkippedOptionWarning("CPACK_IFW_PACKAGE_WINDOW_ICON", option);
     }
   }
 
@@ -128,10 +138,69 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
     if (cmSystemTools::FileExists(option)) {
       Logo = option;
     } else {
-      // TODO: implement warning
+      printSkippedOptionWarning("CPACK_IFW_PACKAGE_LOGO", option);
+    }
+  }
+
+  // Watermark
+  if (const char* option = GetOption("CPACK_IFW_PACKAGE_WATERMARK")) {
+    if (cmSystemTools::FileExists(option)) {
+      Watermark = option;
+    } else {
+      printSkippedOptionWarning("CPACK_IFW_PACKAGE_WATERMARK", option);
     }
   }
 
+  // Banner
+  if (const char* option = GetOption("CPACK_IFW_PACKAGE_BANNER")) {
+    if (cmSystemTools::FileExists(option)) {
+      Banner = option;
+    } else {
+      printSkippedOptionWarning("CPACK_IFW_PACKAGE_BANNER", option);
+    }
+  }
+
+  // Background
+  if (const char* option = GetOption("CPACK_IFW_PACKAGE_BACKGROUND")) {
+    if (cmSystemTools::FileExists(option)) {
+      Background = option;
+    } else {
+      printSkippedOptionWarning("CPACK_IFW_PACKAGE_BACKGROUND", option);
+    }
+  }
+
+  // WizardStyle
+  if (const char* option = GetOption("CPACK_IFW_PACKAGE_WIZARD_STYLE")) {
+    if (WizardStyle.compare("Modern") == 0 &&
+        WizardStyle.compare("Aero") == 0 && WizardStyle.compare("Mac") == 0 &&
+        WizardStyle.compare("Classic") == 0) {
+      cmCPackLogger(
+        cmCPackLog::LOG_WARNING,
+        "Option CPACK_IFW_PACKAGE_WIZARD_STYLE has unknown value \""
+          << option << "\". Expected values are: Modern, Aero, Mac, Classic."
+          << std::endl);
+    }
+
+    WizardStyle = option;
+  }
+
+  // WizardDefaultWidth
+  if (const char* option =
+        GetOption("CPACK_IFW_PACKAGE_WIZARD_DEFAULT_WIDTH")) {
+    WizardDefaultWidth = option;
+  }
+
+  // WizardDefaultHeight
+  if (const char* option =
+        GetOption("CPACK_IFW_PACKAGE_WIZARD_DEFAULT_HEIGHT")) {
+    WizardDefaultHeight = option;
+  }
+
+  // TitleColor
+  if (const char* option = GetOption("CPACK_IFW_PACKAGE_TITLE_COLOR")) {
+    TitleColor = option;
+  }
+
   // Start menu
   if (const char* optIFW_START_MENU_DIR =
         this->GetOption("CPACK_IFW_PACKAGE_START_MENU_DIRECTORY")) {
@@ -313,6 +382,50 @@ void cmCPackIFWInstaller::GenerateInstallerFile()
     xout.Element("Logo", name);
   }
 
+  // Banner
+  if (!Banner.empty()) {
+    std::string name = cmSystemTools::GetFilenameName(Banner);
+    std::string path = Directory + "/config/" + name;
+    cmsys::SystemTools::CopyFileIfDifferent(Banner.data(), path.data());
+    xout.Element("Banner", name);
+  }
+
+  // Watermark
+  if (!Watermark.empty()) {
+    std::string name = cmSystemTools::GetFilenameName(Watermark);
+    std::string path = Directory + "/config/" + name;
+    cmsys::SystemTools::CopyFileIfDifferent(Watermark.data(), path.data());
+    xout.Element("Watermark", name);
+  }
+
+  // Background
+  if (!Background.empty()) {
+    std::string name = cmSystemTools::GetFilenameName(Background);
+    std::string path = Directory + "/config/" + name;
+    cmsys::SystemTools::CopyFileIfDifferent(Background.data(), path.data());
+    xout.Element("Background", name);
+  }
+
+  // WizardStyle
+  if (!WizardStyle.empty()) {
+    xout.Element("WizardStyle", WizardStyle);
+  }
+
+  // WizardDefaultWidth
+  if (!WizardDefaultWidth.empty()) {
+    xout.Element("WizardDefaultWidth", WizardDefaultWidth);
+  }
+
+  // WizardDefaultHeight
+  if (!WizardDefaultHeight.empty()) {
+    xout.Element("WizardDefaultHeight", WizardDefaultHeight);
+  }
+
+  // TitleColor
+  if (!TitleColor.empty()) {
+    xout.Element("TitleColor", TitleColor);
+  }
+
   // Start menu
   if (!IsVersionLess("2.0")) {
     xout.Element("StartMenuDir", StartMenuDir);
diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.h b/Source/CPack/IFW/cmCPackIFWInstaller.h
index eba9bec..4ec3e70 100644
--- a/Source/CPack/IFW/cmCPackIFWInstaller.h
+++ b/Source/CPack/IFW/cmCPackIFWInstaller.h
@@ -60,6 +60,27 @@ public:
   /// Filename for a logo
   std::string Logo;
 
+  /// Filename for a watermark
+  std::string Watermark;
+
+  /// Filename for a banner
+  std::string Banner;
+
+  /// Filename for a background
+  std::string Background;
+
+  /// Wizard style name
+  std::string WizardStyle;
+
+  /// Wizard width
+  std::string WizardDefaultWidth;
+
+  /// Wizard height
+  std::string WizardDefaultHeight;
+
+  /// Title color
+  std::string TitleColor;
+
   /// Name of the default program group in the Windows Start menu
   std::string StartMenuDir;
 
@@ -110,6 +131,10 @@ public:
 
 protected:
   void WriteGeneratedByToStrim(cmXMLWriter& xout);
+
+private:
+  void printSkippedOptionWarning(const std::string& optionName,
+                                 const std::string& optionValue);
 };
 
 #endif // cmCPackIFWInstaller_h

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

Summary of changes:
 Help/release/dev/cpack-ifw-package-options.rst |    7 ++
 Modules/CPackIFW.cmake                         |   28 ++++++
 Source/CPack/IFW/cmCPackIFWInstaller.cxx       |  119 +++++++++++++++++++++++-
 Source/CPack/IFW/cmCPackIFWInstaller.h         |   25 +++++
 4 files changed, 176 insertions(+), 3 deletions(-)
 create mode 100644 Help/release/dev/cpack-ifw-package-options.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 17 11:48:45 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Jan 2017 11:48:45 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2225-g9d16616
Message-ID: <20170117164845.6E6ACF9DF7@public.kitware.com>

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  9d16616b45a62a9b398cff89d9801a7e9af264b0 (commit)
       via  0ed885f742088b0e68103b87ee36837c37575628 (commit)
      from  073b55ff67c0057b49b94c9ee3d89f6c79db7664 (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=9d16616b45a62a9b398cff89d9801a7e9af264b0
commit 9d16616b45a62a9b398cff89d9801a7e9af264b0
Merge: 073b55f 0ed885f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 11:48:44 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 17 11:48:44 2017 -0500

    Merge topic 'ExternalProject-restore-case-insensitive-hash' into next
    
    0ed885f7 ExternalProject: Restore case-insensitive download hash check


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ed885f742088b0e68103b87ee36837c37575628
commit 0ed885f742088b0e68103b87ee36837c37575628
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 17 11:45:18 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 17 11:45:18 2017 -0500

    ExternalProject: Restore case-insensitive download hash check
    
    Refactoring in commit v3.6.0-rc1~47^2 (ExternalProject: Re-implement
    download logic as a dedicated script, 2016-05-19) accidentally made the
    download hash check case-sensitive.  The hash comparison is done in hex
    strings, so restore case-insensitive comparison since the case of the
    hex digits does not matter.
    
    Fixes: #16568

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index a0f731c..458c114 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -889,7 +889,7 @@ function(_ep_write_downloadfile_script script_filename REMOTE LOCAL timeout no_p
 
   if("${hash}" MATCHES "${_ep_hash_regex}")
     set(ALGO "${CMAKE_MATCH_1}")
-    set(EXPECT_VALUE "${CMAKE_MATCH_2}")
+    string(TOLOWER "${CMAKE_MATCH_2}" EXPECT_VALUE)
   else()
     set(ALGO "")
     set(EXPECT_VALUE "")

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

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


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Wed Jan 18 00:01:10 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Wed, 18 Jan 2017 00:01:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1129-gfe8e00f
Message-ID: <20170118050114.EDCD3FA3B4@public.kitware.com>

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  fe8e00f6b91d7e8614af5a5ffb2ab68775b06e1c (commit)
      from  cab8f26211051a24ceb0e512660f022c9960f241 (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=fe8e00f6b91d7e8614af5a5ffb2ab68775b06e1c
commit fe8e00f6b91d7e8614af5a5ffb2ab68775b06e1c
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Wed Jan 18 00:01:05 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jan 18 00:01:05 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index d1054cf..4a74d4c 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 20170117)
+set(CMake_VERSION_PATCH 20170118)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From ben.boeckel at kitware.com  Wed Jan 18 12:29:53 2017
From: ben.boeckel at kitware.com (Ben Boeckel)
Date: Wed, 18 Jan 2017 12:29:53 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2227-gf38f5c7
Message-ID: <20170118172953.25305FA4E1@public.kitware.com>

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  f38f5c7b2003bd0865d395e07f015d5d8c1580a7 (commit)
       via  7f0a21a51eb483c523a2c8880ce4e0466251ec74 (commit)
      from  9d16616b45a62a9b398cff89d9801a7e9af264b0 (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=f38f5c7b2003bd0865d395e07f015d5d8c1580a7
commit f38f5c7b2003bd0865d395e07f015d5d8c1580a7
Merge: 9d16616 7f0a21a
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jan 18 12:29:52 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 18 12:29:52 2017 -0500

    Merge topic 'case-insensitive-bindir-detection' into next
    
    7f0a21a5 cmSystemTools: use the actual case for root detection


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f0a21a51eb483c523a2c8880ce4e0466251ec74
commit 7f0a21a51eb483c523a2c8880ce4e0466251ec74
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jan 18 10:06:23 2017 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Jan 18 10:08:40 2017 -0500

    cmSystemTools: use the actual case for root detection
    
    On Windows, calling a binary installed with the default `bin` binary
    directory will fail to be detected when called as `BIN\cmake.exe` due to
    the string compare. Get the actual case of the path before checking that
    the path ends with `CMAKE_BIN_DIR`.
    
    Fixes #16574.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 3d8fdf5..e693beb 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1979,7 +1979,8 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
   // Install tree has
   // - "<prefix><CMAKE_BIN_DIR>/cmake"
   // - "<prefix><CMAKE_DATA_DIR>"
-  if (cmHasSuffix(exe_dir, CMAKE_BIN_DIR)) {
+  const std::string actual_case = cmSystemTools::GetActualCaseForPath(exe_dir);
+  if (cmHasSuffix(actual_case, CMAKE_BIN_DIR)) {
     std::string const prefix =
       exe_dir.substr(0, exe_dir.size() - strlen(CMAKE_BIN_DIR));
     cmSystemToolsCMakeRoot = prefix + CMAKE_DATA_DIR;

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

Summary of changes:
 Source/cmSystemTools.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From ben.boeckel at kitware.com  Wed Jan 18 12:30:51 2017
From: ben.boeckel at kitware.com (Ben Boeckel)
Date: Wed, 18 Jan 2017 12:30:51 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2230-gcba760d
Message-ID: <20170118173051.196CEFA4FF@public.kitware.com>

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  cba760da8de27c311918f2d33ff7f27193f6e6af (commit)
       via  8c1cfb945a4fe63caa4f5d9fc33fbe2c3731a3ca (commit)
       via  fe8e00f6b91d7e8614af5a5ffb2ab68775b06e1c (commit)
      from  f38f5c7b2003bd0865d395e07f015d5d8c1580a7 (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=cba760da8de27c311918f2d33ff7f27193f6e6af
commit cba760da8de27c311918f2d33ff7f27193f6e6af
Merge: f38f5c7 8c1cfb9
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jan 18 12:30:50 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 18 12:30:50 2017 -0500

    Merge topic 'add-dl-to-lua-static-linking' into next
    
    8c1cfb94 Add dl library to Lua static library linking
    fe8e00f6 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c1cfb945a4fe63caa4f5d9fc33fbe2c3731a3ca
commit 8c1cfb945a4fe63caa4f5d9fc33fbe2c3731a3ca
Author:     Michael Krasnyk <michael.krasnyk at gmail.com>
AuthorDate: Wed Jan 18 15:22:20 2017 +0100
Commit:     Michael Krasnyk <michael.krasnyk at gmail.com>
CommitDate: Wed Jan 18 18:01:50 2017 +0100

    Add dl library to Lua static library linking

diff --git a/Modules/FindLua.cmake b/Modules/FindLua.cmake
index 5be0428..c777970 100644
--- a/Modules/FindLua.cmake
+++ b/Modules/FindLua.cmake
@@ -172,6 +172,13 @@ if (LUA_LIBRARY)
     if (UNIX AND NOT APPLE AND NOT BEOS)
         find_library(LUA_MATH_LIBRARY m)
         set(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
+
+        # include dl library for statically-linked Lua library
+        get_filename_component(LUA_LIB_EXT ${LUA_LIBRARY} EXT)
+        if(LUA_LIB_EXT STREQUAL CMAKE_STATIC_LIBRARY_SUFFIX)
+          list(APPEND LUA_LIBRARIES ${CMAKE_DL_LIBS})
+        endif()
+
     # For Windows and Mac, don't need to explicitly include the math library
     else ()
         set(LUA_LIBRARIES "${LUA_LIBRARY}")

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

Summary of changes:
 Modules/FindLua.cmake     |    7 +++++++
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Thu Jan 19 00:01:07 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Thu, 19 Jan 2017 00:01:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1130-gf5fae34
Message-ID: <20170119050107.C6D3DFA00D@public.kitware.com>

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  f5fae345e4a0f9f54b69424552f7d85aa85ba907 (commit)
      from  fe8e00f6b91d7e8614af5a5ffb2ab68775b06e1c (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=f5fae345e4a0f9f54b69424552f7d85aa85ba907
commit f5fae345e4a0f9f54b69424552f7d85aa85ba907
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Thu Jan 19 00:01:05 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jan 19 00:01:05 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 4a74d4c..ce72bba 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 20170118)
+set(CMake_VERSION_PATCH 20170119)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From domen.vrankar at gmail.com  Thu Jan 19 17:04:35 2017
From: domen.vrankar at gmail.com (Domen Vrankar)
Date: Thu, 19 Jan 2017 17:04:35 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2233-ge9ae0ad
Message-ID: <20170119220435.30D99FA4AB@public.kitware.com>

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  e9ae0adbfc45c716d5bafdd9fb8d5d41f8a52983 (commit)
       via  a802ddd628292cf772674d2ee02772ec832d0422 (commit)
       via  f5fae345e4a0f9f54b69424552f7d85aa85ba907 (commit)
      from  cba760da8de27c311918f2d33ff7f27193f6e6af (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=e9ae0adbfc45c716d5bafdd9fb8d5d41f8a52983
commit e9ae0adbfc45c716d5bafdd9fb8d5d41f8a52983
Merge: cba760d a802ddd
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Thu Jan 19 17:04:34 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 19 17:04:34 2017 -0500

    Merge topic 'cpack-stgz-minimal-test' into next
    
    a802ddd6 CPack/STGZ: minimalistic packages test
    f5fae345 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a802ddd628292cf772674d2ee02772ec832d0422
commit a802ddd628292cf772674d2ee02772ec832d0422
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Thu Jan 19 23:02:07 2017 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Thu Jan 19 23:02:07 2017 +0100

    CPack/STGZ: minimalistic packages test

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d2465c4..a43e47b 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -345,7 +345,7 @@ if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
   add_RunCMake_test(CompilerLauncher)
 endif()
 
-add_RunCMake_test_group(CPack "DEB;RPM;7Z;TBZ2;TGZ;TXZ;TZ;ZIP")
+add_RunCMake_test_group(CPack "DEB;RPM;7Z;TBZ2;TGZ;TXZ;TZ;ZIP;STGZ")
 # add a test to make sure symbols are exported from a shared library
 # for MSVC compilers CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS property is used
 add_RunCMake_test(AutoExportDll)
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index ebaf792..65399db 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -16,7 +16,7 @@ run_cpack_test(GENERATE_SHLIBS_LDCONFIG "DEB" true "COMPONENT")
 run_cpack_test(INSTALL_SCRIPTS "RPM" false "COMPONENT")
 run_cpack_test(LONG_FILENAMES "DEB" false "MONOLITHIC")
 run_cpack_test_subtests(MAIN_COMPONENT "invalid;found" "RPM" false "COMPONENT")
-run_cpack_test(MINIMAL "RPM;DEB;7Z;TBZ2;TGZ;TXZ;TZ;ZIP" false "MONOLITHIC;COMPONENT")
+run_cpack_test(MINIMAL "RPM;DEB;7Z;TBZ2;TGZ;TXZ;TZ;ZIP;STGZ" false "MONOLITHIC;COMPONENT")
 run_cpack_test_subtests(PACKAGE_CHECKSUM "invalid;MD5;SHA1;SHA224;SHA256;SHA384;SHA512" "TGZ" false "MONOLITHIC")
 run_cpack_test(PARTIALLY_RELOCATABLE_WARNING "RPM" false "COMPONENT")
 run_cpack_test(PER_COMPONENT_FIELDS "RPM;DEB" false "COMPONENT")
diff --git a/Tests/RunCMake/CPack/STGZ/Helpers.cmake b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
new file mode 100644
index 0000000..75036db
--- /dev/null
+++ b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
@@ -0,0 +1,58 @@
+set(ALL_FILES_GLOB "*.sh")
+
+function(getPackageContent FILE RESULT_VAR)
+  get_filename_component(path_ "${FILE}" DIRECTORY)
+  file(REMOVE_RECURSE "${path_}/content")
+  file(MAKE_DIRECTORY "${path_}/content")
+  execute_process(COMMAND ${FILE} --prefix=${path_}/content --include-subdir
+          ERROR_QUIET
+          OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  file(GLOB_RECURSE package_content_ LIST_DIRECTORIES true RELATIVE
+      "${path_}/content" "${path_}/content/*")
+
+  set(${RESULT_VAR} "${package_content_}" PARENT_SCOPE)
+endfunction()
+
+function(getPackageNameGlobexpr NAME COMPONENT VERSION REVISION FILE_NO RESULT_VAR)
+  if(COMPONENT)
+    set(COMPONENT "-${COMPONENT}")
+  endif()
+
+  set(${RESULT_VAR} "${NAME}-${VERSION}-*${COMPONENT}.sh" PARENT_SCOPE)
+endfunction()
+
+function(getPackageContentList FILE RESULT_VAR)
+  getPackageContent("${FILE}" package_content_)
+
+  set(${RESULT_VAR} "${package_content_}" PARENT_SCOPE)
+endfunction()
+
+function(toExpectedContentList FILE_NO CONTENT_VAR)
+  findExpectedFile("${FILE_NO}" "file_")
+
+  get_filename_component(prefix_ "${file_}" NAME)
+  # NAME_WE removes everything after the dot and dot is in version so replace instead
+  string(REPLACE ".sh" "" prefix_ "${prefix_}")
+
+  if(NOT PACKAGING_TYPE STREQUAL "MONOLITHIC")
+    # STGZ packages don't have component dir prefix in subdir
+    string(FIND "${prefix_}" "-" pos_ REVERSE)
+    string(SUBSTRING "${prefix_}" 0 ${pos_} prefix_)
+  endif()
+
+  if(NOT DEFINED TEST_MAIN_INSTALL_PREFIX_PATH)
+    set(TEST_MAIN_INSTALL_PREFIX_PATH "/usr")
+  endif()
+
+  set(filtered_ "${prefix_}")
+  foreach(part_ IN LISTS ${CONTENT_VAR})
+    string(REGEX REPLACE "^${TEST_MAIN_INSTALL_PREFIX_PATH}(/|$)" "" part_ "${part_}")
+
+    if(part_)
+      list(APPEND filtered_ "${prefix_}/${part_}")
+    endif()
+  endforeach()
+
+  set(${CONTENT_VAR} "${filtered_}" PARENT_SCOPE)
+endfunction()
diff --git a/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake b/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake
new file mode 100644
index 0000000..46e7757
--- /dev/null
+++ b/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake
@@ -0,0 +1,6 @@
+function(get_test_prerequirements found_var config_file)
+  if(EXISTS "/bin/sh")
+    file(WRITE "${config_file}" "")
+    set(${found_var} true PARENT_SCOPE)
+  endif()
+endfunction()
diff --git a/Tests/RunCMake/CPack/STGZ/packaging_COMPONENT_default.cmake b/Tests/RunCMake/CPack/STGZ/packaging_COMPONENT_default.cmake
new file mode 100644
index 0000000..81a5035
--- /dev/null
+++ b/Tests/RunCMake/CPack/STGZ/packaging_COMPONENT_default.cmake
@@ -0,0 +1 @@
+set(CPACK_ARCHIVE_COMPONENT_INSTALL "ON")

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

Summary of changes:
 Source/CMakeVersion.cmake                          |    2 +-
 Tests/RunCMake/CMakeLists.txt                      |    2 +-
 Tests/RunCMake/CPack/RunCMakeTest.cmake            |    2 +-
 Tests/RunCMake/CPack/STGZ/Helpers.cmake            |   58 ++++++++++++++++++++
 .../Prerequirements.cmake}                         |    5 +-
 .../{7Z => STGZ}/packaging_COMPONENT_default.cmake |    0
 6 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 Tests/RunCMake/CPack/STGZ/Helpers.cmake
 copy Tests/RunCMake/CPack/{tests/GENERATE_SHLIBS/DEB-Prerequirements.cmake => STGZ/Prerequirements.cmake} (67%)
 copy Tests/RunCMake/CPack/{7Z => STGZ}/packaging_COMPONENT_default.cmake (100%)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Fri Jan 20 00:01:07 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Fri, 20 Jan 2017 00:01:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1131-g45dea92
Message-ID: <20170120050107.D14DBFA4C3@public.kitware.com>

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  45dea920ab4e96f84f43eab906dca3c51bd12c31 (commit)
      from  f5fae345e4a0f9f54b69424552f7d85aa85ba907 (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=45dea920ab4e96f84f43eab906dca3c51bd12c31
commit 45dea920ab4e96f84f43eab906dca3c51bd12c31
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Fri Jan 20 00:01:04 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jan 20 00:01:04 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index ce72bba..7990532 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 20170119)
+set(CMake_VERSION_PATCH 20170120)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 10:31:52 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 10:31:52 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2235-gd374256
Message-ID: <20170120153152.6B74CFA60C@public.kitware.com>

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  d3742568c8597a7e5050e1607ed4e6f91f29bd09 (commit)
       via  4dcd4a5da431df5f9fa225b5d264b3c61572ace3 (commit)
      from  e9ae0adbfc45c716d5bafdd9fb8d5d41f8a52983 (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=d3742568c8597a7e5050e1607ed4e6f91f29bd09
commit d3742568c8597a7e5050e1607ed4e6f91f29bd09
Merge: e9ae0ad 4dcd4a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 10:31:51 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 10:31:51 2017 -0500

    Merge topic 'productbuild_signing' into next
    
    4dcd4a5d Revert "CPackProductBuild: Add options to sign packages"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4dcd4a5da431df5f9fa225b5d264b3c61572ace3
commit 4dcd4a5da431df5f9fa225b5d264b3c61572ace3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 10:31:37 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 10:31:37 2017 -0500

    Revert "CPackProductBuild: Add options to sign packages"
    
    This reverts commit 28b332f1f1aceec9b5c2b598f432454d72711246.

diff --git a/Help/release/dev/cpack-productbuild-signing.rst b/Help/release/dev/cpack-productbuild-signing.rst
deleted file mode 100644
index 0b91b38..0000000
--- a/Help/release/dev/cpack-productbuild-signing.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-cpack-productbuild-signing
---------------------------
-
-* The :module:`CPackProductBuild` module gained options to sign packages.
-  See the variables :variable:`CPACK_PRODUCTBUILD_IDENTITY_NAME`,
-  :variable:`CPACK_PRODUCTBUILD_KEYCHAIN_PATH`,
-  :variable:`CPACK_PKGBUILD_IDENTITY_NAME`, and
-  :variable:`CPACK_PKGBUILD_KEYCHAIN_PATH`.
diff --git a/Modules/CPackProductBuild.cmake b/Modules/CPackProductBuild.cmake
index d545d3e..ea2fa7c 100644
--- a/Modules/CPackProductBuild.cmake
+++ b/Modules/CPackProductBuild.cmake
@@ -20,29 +20,9 @@
 #  the automatically detected command (or specify its location if the
 #  auto-detection fails to find it.)
 #
-# .. variable:: CPACK_PRODUCTBUILD_IDENTITY_NAME
-#
-#  Adds a digital signature to the resulting package.
-#
-#
-# .. variable:: CPACK_PRODUCTBUILD_KEYCHAIN_PATH
-#
-#  Specify a specific keychain to search for the signing identity.
-#
-#
 # .. variable:: CPACK_COMMAND_PKGBUILD
 #
 #  Path to the pkgbuild(1) command used to generate an OS X component package
 #  on OS X.  This variable can be used to override the automatically detected
 #  command (or specify its location if the auto-detection fails to find it.)
 #
-#
-# .. variable:: CPACK_PKGBUILD_IDENTITY_NAME
-#
-#  Adds a digital signature to the resulting package.
-#
-#
-# .. variable:: CPACK_PKGBUILD_KEYCHAIN_PATH
-#
-#  Specify a specific keychain to search for the signing identity.
-#
diff --git a/Source/CPack/cmCPackProductBuildGenerator.cxx b/Source/CPack/cmCPackProductBuildGenerator.cxx
index 35b2ccc..a46e3a6 100644
--- a/Source/CPack/cmCPackProductBuildGenerator.cxx
+++ b/Source/CPack/cmCPackProductBuildGenerator.cxx
@@ -75,27 +75,14 @@ int cmCPackProductBuildGenerator::PackageFiles()
 
   std::string version = this->GetOption("CPACK_PACKAGE_VERSION");
   std::string productbuild = this->GetOption("CPACK_COMMAND_PRODUCTBUILD");
-  std::string identityName =
-    this->GetOption("CPACK_PRODUCTBUILD_IDENTITY_NAME");
-  std::string keychainPath =
-    this->GetOption("CPACK_PRODUCTBUILD_KEYCHAIN_PATH");
 
   pkgCmd << productbuild << " --distribution \"" << packageDirFileName
          << "/Contents/distribution.dist\""
          << " --package-path \"" << packageDirFileName << "/Contents/Packages"
          << "\""
          << " --resources \"" << resDir << "\""
-         << " --version \"" << version << "\"";
-
-  if (!identityName.empty()) {
-    pkgCmd << " --sign \"" << identityName << "\"";
-  }
-
-  if (!keychainPath.empty()) {
-    pkgCmd << " --keychain \"" << keychainPath << "\"";
-  }
-
-  pkgCmd << " \"" << packageFileNames[0] << "\"";
+         << " --version \"" << version << "\""
+         << " \"" << packageFileNames[0] << "\"";
 
   // Run ProductBuild
   return RunProductBuild(pkgCmd.str());
@@ -206,24 +193,13 @@ bool cmCPackProductBuildGenerator::GenerateComponentPackage(
 
   std::string version = this->GetOption("CPACK_PACKAGE_VERSION");
   std::string pkgbuild = this->GetOption("CPACK_COMMAND_PKGBUILD");
-  std::string identityName = this->GetOption("CPACK_PKGBUILD_IDENTITY_NAME");
-  std::string keychainPath = this->GetOption("CPACK_PKGBUILD_KEYCHAIN_PATH");
 
   pkgCmd << pkgbuild << " --root \"" << packageDir << "\""
          << " --identifier \"" << pkgId << "\""
          << " --scripts \"" << scriptDir << "\""
          << " --version \"" << version << "\""
-         << " --install-location \"/\"";
-
-  if (!identityName.empty()) {
-    pkgCmd << " --sign \"" << identityName << "\"";
-  }
-
-  if (!keychainPath.empty()) {
-    pkgCmd << " --keychain \"" << keychainPath << "\"";
-  }
-
-  pkgCmd << " \"" << packageFile << "\"";
+         << " --install-location \"/\""
+         << " \"" << packageFile << "\"";
 
   // Run ProductBuild
   return RunProductBuild(pkgCmd.str());

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

Summary of changes:
 Help/release/dev/cpack-productbuild-signing.rst |    8 ------
 Modules/CPackProductBuild.cmake                 |   20 --------------
 Source/CPack/cmCPackProductBuildGenerator.cxx   |   32 +++--------------------
 3 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 Help/release/dev/cpack-productbuild-signing.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 11:44:45 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 11:44:45 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2237-g956e20e
Message-ID: <20170120164445.952CAF4713@public.kitware.com>

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  956e20ea5b043a207449000020dd0dda62c3bd64 (commit)
       via  e78ff350cf2228579077211aab5ed994183235a3 (commit)
      from  d3742568c8597a7e5050e1607ed4e6f91f29bd09 (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=956e20ea5b043a207449000020dd0dda62c3bd64
commit 956e20ea5b043a207449000020dd0dda62c3bd64
Merge: d374256 e78ff35
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 11:44:38 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 11:44:38 2017 -0500

    Merge topic 'cdash_upload_retry' into next
    
    e78ff350 Revert topic 'cdash_upload_retry'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e78ff350cf2228579077211aab5ed994183235a3
commit e78ff350cf2228579077211aab5ed994183235a3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 11:44:20 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 11:44:20 2017 -0500

    Revert topic 'cdash_upload_retry'

diff --git a/Help/command/ctest_submit.rst b/Help/command/ctest_submit.rst
index a7d9708..6830b59 100644
--- a/Help/command/ctest_submit.rst
+++ b/Help/command/ctest_submit.rst
@@ -56,16 +56,10 @@ Submit to CDash Upload API
 
 ::
 
-  ctest_submit(CDASH_UPLOAD <file> [CDASH_UPLOAD_TYPE <type>]
-               [RETRY_COUNT <count>]
-               [RETRY_DELAY <delay>]
-               [QUIET])
+  ctest_submit(CDASH_UPLOAD <file> [CDASH_UPLOAD_TYPE <type>])
 
 This second signature is used to upload files to CDash via the CDash
 file upload API. The api first sends a request to upload to CDash along
 with a content hash of the file. If CDash does not already have the file,
 then it is uploaded. Along with the file, a CDash type string is specified
 to tell CDash which handler to use to process the data.
-
-This signature accepts the ``RETRY_COUNT``, ``RETRY_DELAY``, and ``QUIET``
-options as described above.
diff --git a/Help/release/dev/cdash_upload_retry.rst b/Help/release/dev/cdash_upload_retry.rst
deleted file mode 100644
index 2ceb42b..0000000
--- a/Help/release/dev/cdash_upload_retry.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-cdash-upload-retry
------------------------
-
-* The ``CDASH_UPLOAD`` signature of :command:`ctest_submit` was taught to honor
-  the ``RETRY_COUNT``, ``RETRY_DELAY``, and ``QUIET`` options.
diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx
index ab1412d..9a90f54 100644
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@@ -19,7 +19,6 @@ cmCTestCurl::cmCTestCurl(cmCTest* ctest)
   // default is to verify https
   this->VerifyPeerOff = false;
   this->VerifyHostOff = false;
-  this->Quiet = false;
   this->TimeOutSeconds = 0;
   this->Curl = curl_easy_init();
 }
@@ -97,13 +96,6 @@ bool cmCTestCurl::InitCurl()
   }
   // enable HTTP ERROR parsing
   curl_easy_setopt(this->Curl, CURLOPT_FAILONERROR, 1);
-
-  // if there is little to no activity for too long stop submitting
-  if (this->TimeOutSeconds) {
-    curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_LIMIT, 1);
-    curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_TIME, this->TimeOutSeconds);
-  }
-
   return true;
 }
 
@@ -118,7 +110,12 @@ bool cmCTestCurl::UploadFile(std::string const& local_file,
   }
   /* enable uploading */
   curl_easy_setopt(this->Curl, CURLOPT_UPLOAD, 1);
-
+  // if there is little to no activity for too long stop submitting
+  if (this->TimeOutSeconds) {
+    ::curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_LIMIT, 1);
+    ::curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_TIME,
+                       this->TimeOutSeconds);
+  }
   /* HTTP PUT please */
   ::curl_easy_setopt(this->Curl, CURLOPT_PUT, 1);
   ::curl_easy_setopt(this->Curl, CURLOPT_VERBOSE, 1);
@@ -160,14 +157,13 @@ bool cmCTestCurl::UploadFile(std::string const& local_file,
 
   if (!responseData.empty()) {
     response = std::string(responseData.begin(), responseData.end());
-    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                       "Curl response: [" << response << "]\n", this->Quiet);
+    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Curl response: ["
+                 << response << "]\n");
   }
   std::string curlDebug;
   if (!debugData.empty()) {
     curlDebug = std::string(debugData.begin(), debugData.end());
-    cmCTestOptionalLog(this->CTest, DEBUG,
-                       "Curl debug: [" << curlDebug << "]\n", this->Quiet);
+    cmCTestLog(this->CTest, DEBUG, "Curl debug: [" << curlDebug << "]\n");
   }
   if (response.empty()) {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "No response from server.\n"
@@ -181,10 +177,9 @@ bool cmCTestCurl::HttpRequest(std::string const& url,
                               std::string const& fields, std::string& response)
 {
   response = "";
-  cmCTestOptionalLog(this->CTest, DEBUG, "HttpRequest\n"
-                       << "url: " << url << "\n"
-                       << "fields " << fields << "\n",
-                     this->Quiet);
+  cmCTestLog(this->CTest, DEBUG, "HttpRequest\n"
+               << "url: " << url << "\n"
+               << "fields " << fields << "\n");
   if (!this->InitCurl()) {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Initialization of curl failed");
     return false;
@@ -207,16 +202,13 @@ bool cmCTestCurl::HttpRequest(std::string const& url,
 
   if (!responseData.empty()) {
     response = std::string(responseData.begin(), responseData.end());
-    cmCTestOptionalLog(this->CTest, DEBUG,
-                       "Curl response: [" << response << "]\n", this->Quiet);
+    cmCTestLog(this->CTest, DEBUG, "Curl response: [" << response << "]\n");
   }
   if (!debugData.empty()) {
     std::string curlDebug = std::string(debugData.begin(), debugData.end());
-    cmCTestOptionalLog(this->CTest, DEBUG,
-                       "Curl debug: [" << curlDebug << "]\n", this->Quiet);
+    cmCTestLog(this->CTest, DEBUG, "Curl debug: [" << curlDebug << "]\n");
   }
-  cmCTestOptionalLog(this->CTest, DEBUG, "Curl res: " << res << "\n",
-                     this->Quiet);
+  cmCTestLog(this->CTest, DEBUG, "Curl res: " << res << "\n");
   return (res == 0);
 }
 
diff --git a/Source/CTest/cmCTestCurl.h b/Source/CTest/cmCTestCurl.h
index cdce393..17fbcff 100644
--- a/Source/CTest/cmCTestCurl.h
+++ b/Source/CTest/cmCTestCurl.h
@@ -25,7 +25,6 @@ public:
   void SetCurlOptions(std::vector<std::string> const& args);
   void SetUseHttp10On() { this->UseHttp10 = true; }
   void SetTimeOutSeconds(int s) { this->TimeOutSeconds = s; }
-  void SetQuiet(bool b) { this->Quiet = b; }
   std::string Escape(std::string const& source);
 
 protected:
@@ -41,7 +40,6 @@ private:
   bool VerifyHostOff;
   bool VerifyPeerOff;
   bool UseHttp10;
-  bool Quiet;
   int TimeOutSeconds;
 };
 
diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx
index 5cf4ddc..14b875f 100644
--- a/Source/CTest/cmCTestSubmitCommand.cxx
+++ b/Source/CTest/cmCTestSubmitCommand.cxx
@@ -157,7 +157,6 @@ bool cmCTestSubmitCommand::InitialPass(std::vector<std::string> const& args,
 bool cmCTestSubmitCommand::CheckArgumentKeyword(std::string const& arg)
 {
   if (this->CDashUpload) {
-    // Arguments specific to the CDASH_UPLOAD signature.
     if (arg == "CDASH_UPLOAD") {
       this->ArgumentDoing = ArgumentDoingCDashUpload;
       return true;
@@ -168,7 +167,7 @@ bool cmCTestSubmitCommand::CheckArgumentKeyword(std::string const& arg)
       return true;
     }
   } else {
-    // Arguments that cannot be used with CDASH_UPLOAD.
+    // Look for arguments specific to this command.
     if (arg == "PARTS") {
       this->ArgumentDoing = ArgumentDoingParts;
       this->PartsMentioned = true;
@@ -180,21 +179,21 @@ bool cmCTestSubmitCommand::CheckArgumentKeyword(std::string const& arg)
       this->FilesMentioned = true;
       return true;
     }
-  }
-  // Arguments used by both modes.
-  if (arg == "RETRY_COUNT") {
-    this->ArgumentDoing = ArgumentDoingRetryCount;
-    return true;
-  }
 
-  if (arg == "RETRY_DELAY") {
-    this->ArgumentDoing = ArgumentDoingRetryDelay;
-    return true;
-  }
+    if (arg == "RETRY_COUNT") {
+      this->ArgumentDoing = ArgumentDoingRetryCount;
+      return true;
+    }
 
-  if (arg == "INTERNAL_TEST_CHECKSUM") {
-    this->InternalTest = true;
-    return true;
+    if (arg == "RETRY_DELAY") {
+      this->ArgumentDoing = ArgumentDoingRetryDelay;
+      return true;
+    }
+
+    if (arg == "INTERNAL_TEST_CHECKSUM") {
+      this->InternalTest = true;
+      return true;
+    }
   }
 
   // Look for other arguments.
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 5e5119d..79c3663 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -1007,7 +1007,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     return -1;
   }
   cmCTestCurl curl(this->CTest);
-  curl.SetQuiet(this->Quiet);
   std::string curlopt(this->CTest->GetCTestConfiguration("CurlOptions"));
   std::vector<std::string> args;
   cmSystemTools::ExpandListArgument(curlopt, args);
@@ -1023,30 +1022,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
                "Only http and https are supported for CDASH_UPLOAD\n");
     return -1;
   }
-  bool internalTest = cmSystemTools::IsOn(this->GetOption("InternalTest"));
-
-  // Get RETRY_COUNT and RETRY_DELAY values if they were set.
-  std::string retryDelayString = this->GetOption("RetryDelay") == CM_NULLPTR
-    ? ""
-    : this->GetOption("RetryDelay");
-  std::string retryCountString = this->GetOption("RetryCount") == CM_NULLPTR
-    ? ""
-    : this->GetOption("RetryCount");
-  unsigned long retryDelay = 0;
-  if (retryDelayString != "") {
-    if (!cmSystemTools::StringToULong(retryDelayString.c_str(), &retryDelay)) {
-      cmCTestLog(this->CTest, WARNING, "Invalid value for 'RETRY_DELAY' : "
-                   << retryDelayString << std::endl);
-    }
-  }
-  unsigned long retryCount = 0;
-  if (retryCountString != "") {
-    if (!cmSystemTools::StringToULong(retryCountString.c_str(), &retryCount)) {
-      cmCTestLog(this->CTest, WARNING, "Invalid value for 'RETRY_DELAY' : "
-                   << retryCountString << std::endl);
-    }
-  }
-
   char md5sum[33];
   md5sum[32] = 0;
   cmSystemTools::ComputeFileMD5(file, md5sum);
@@ -1083,33 +1058,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
                                 << "\nfile: " << file << "\n",
                      this->Quiet);
   std::string response;
-
-  bool requestSucceeded = curl.HttpRequest(url, fields, response);
-  if (!internalTest && !requestSucceeded) {
-    // If request failed, wait and retry.
-    for (unsigned long i = 0; i < retryCount; i++) {
-      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
-                         "   Request failed, waiting " << retryDelay
-                                                       << " seconds...\n",
-                         this->Quiet);
-
-      double stop = cmSystemTools::GetTime() + static_cast<double>(retryDelay);
-      while (cmSystemTools::GetTime() < stop) {
-        cmSystemTools::Delay(100);
-      }
-
-      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
-                         "   Retry request: Attempt "
-                           << (i + 1) << " of " << retryCount << std::endl,
-                         this->Quiet);
-
-      requestSucceeded = curl.HttpRequest(url, fields, response);
-      if (requestSucceeded) {
-        break;
-      }
-    }
-  }
-  if (!internalTest && !requestSucceeded) {
+  if (!curl.HttpRequest(url, fields, response)) {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error in HttpRequest\n"
                  << response);
     return -1;
@@ -1119,32 +1068,30 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
                      this->Quiet);
   Json::Value json;
   Json::Reader reader;
-  if (!internalTest && !reader.parse(response, json)) {
+  if (!reader.parse(response, json)) {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error parsing json string ["
                  << response << "]\n"
                  << reader.getFormattedErrorMessages() << "\n");
     return -1;
   }
-  if (!internalTest && json["status"].asInt() != 0) {
+  if (json["status"].asInt() != 0) {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Bad status returned from CDash: " << json["status"].asInt());
     return -1;
   }
-  if (!internalTest) {
-    if (json["datafilesmd5"].isArray()) {
-      int datares = json["datafilesmd5"][0].asInt();
-      if (datares == 1) {
-        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                           "File already exists on CDash, skip upload "
-                             << file << "\n",
-                           this->Quiet);
-        return 0;
-      }
-    } else {
-      cmCTestLog(this->CTest, ERROR_MESSAGE,
-                 "bad datafilesmd5 value in response " << response << "\n");
-      return -1;
+  if (json["datafilesmd5"].isArray()) {
+    int datares = json["datafilesmd5"][0].asInt();
+    if (datares == 1) {
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+                         "File already exists on CDash, skip upload " << file
+                                                                      << "\n",
+                         this->Quiet);
+      return 0;
     }
+  } else {
+    cmCTestLog(this->CTest, ERROR_MESSAGE,
+               "bad datafilesmd5 value in response " << response << "\n");
+    return -1;
   }
 
   std::string upload_as = cmSystemTools::GetFilenameName(file);
@@ -1153,40 +1100,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
        << "md5=" << md5sum << "&"
        << "filename=" << curl.Escape(upload_as) << "&"
        << "buildid=" << json["buildid"].asString();
-
-  bool uploadSucceeded = false;
-  if (!internalTest) {
-    uploadSucceeded = curl.UploadFile(file, url, fstr.str(), response);
-  }
-
-  if (!uploadSucceeded) {
-    // If upload failed, wait and retry.
-    for (unsigned long i = 0; i < retryCount; i++) {
-      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
-                         "   Upload failed, waiting " << retryDelay
-                                                      << " seconds...\n",
-                         this->Quiet);
-
-      double stop = cmSystemTools::GetTime() + static_cast<double>(retryDelay);
-      while (cmSystemTools::GetTime() < stop) {
-        cmSystemTools::Delay(100);
-      }
-
-      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
-                         "   Retry upload: Attempt "
-                           << (i + 1) << " of " << retryCount << std::endl,
-                         this->Quiet);
-
-      if (!internalTest) {
-        uploadSucceeded = curl.UploadFile(file, url, fstr.str(), response);
-      }
-      if (uploadSucceeded) {
-        break;
-      }
-    }
-  }
-
-  if (!uploadSucceeded) {
+  if (!curl.UploadFile(file, url, fstr.str(), response)) {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error uploading to CDash. "
                  << file << " " << url << " " << fstr.str());
     return -1;
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt
deleted file mode 100644
index 364ecde..0000000
--- a/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-Upload file not found: 'bad-upload'
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-result.txt
similarity index 100%
rename from Tests/RunCMake/ctest_submit/CDashUploadMissingFile-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-result.txt
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
new file mode 100644
index 0000000..21621d4
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT/test.cmake:[0-9]+ \(ctest_submit\):
+  ctest_submit called with unknown argument "RETRY_COUNT".
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRetry-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt
similarity index 100%
rename from Tests/RunCMake/ctest_submit/CDashUploadRetry-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
new file mode 100644
index 0000000..f726674
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY/test.cmake:[0-9]+ \(ctest_submit\):
+  ctest_submit called with unknown argument "RETRY_DELAY".
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt
deleted file mode 100644
index 6780c17..0000000
--- a/Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-error uploading to CDash.
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt b/Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt
deleted file mode 100644
index a5459ac..0000000
--- a/Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-   Upload failed, waiting 1 seconds...
-   Retry upload: Attempt 1 of 2
-   Upload failed, waiting 1 seconds...
-   Retry upload: Attempt 2 of 2
diff --git a/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
index e104f8a..a81bc96 100644
--- a/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
@@ -21,9 +21,9 @@ run_ctest_submit(PARTSCDashUpload PARTS Configure CDASH_UPLOAD)
 run_ctest_submit(PARTSCDashUploadType PARTS Configure CDASH_UPLOAD_TYPE)
 run_ctest_submit(CDashUploadPARTS CDASH_UPLOAD bad-upload PARTS)
 run_ctest_submit(CDashUploadFILES CDASH_UPLOAD bad-upload FILES)
+run_ctest_submit(CDashUploadRETRY_COUNT CDASH_UPLOAD bad-upload RETRY_COUNT)
+run_ctest_submit(CDashUploadRETRY_DELAY CDASH_UPLOAD bad-upload RETRY_DELAY)
 run_ctest_submit(CDashUploadNone CDASH_UPLOAD)
-run_ctest_submit(CDashUploadMissingFile CDASH_UPLOAD bad-upload)
-run_ctest_submit(CDashUploadRetry CDASH_UPLOAD ${CMAKE_CURRENT_LIST_FILE} CDASH_UPLOAD_TYPE foo RETRY_COUNT 2 RETRY_DELAY 1 INTERNAL_TEST_CHECKSUM)
 run_ctest_submit(CDashSubmitQuiet QUIET)
 
 function(run_ctest_CDashUploadFTP)

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

Summary of changes:
 Help/command/ctest_submit.rst                      |    8 +-
 Help/release/dev/cdash_upload_retry.rst            |    5 -
 Source/CTest/cmCTestCurl.cxx                       |   38 +++----
 Source/CTest/cmCTestCurl.h                         |    2 -
 Source/CTest/cmCTestSubmitCommand.cxx              |   29 +++--
 Source/CTest/cmCTestSubmitHandler.cxx              |  118 +++-----------------
 .../ctest_submit/CDashUploadMissingFile-stderr.txt |    1 -
 ...esult.txt => CDashUploadRETRY_COUNT-result.txt} |    0
 .../ctest_submit/CDashUploadRETRY_COUNT-stderr.txt |    2 +
 ...esult.txt => CDashUploadRETRY_DELAY-result.txt} |    0
 .../ctest_submit/CDashUploadRETRY_DELAY-stderr.txt |    2 +
 .../ctest_submit/CDashUploadRetry-stderr.txt       |    1 -
 .../ctest_submit/CDashUploadRetry-stdout.txt       |    4 -
 Tests/RunCMake/ctest_submit/RunCMakeTest.cmake     |    4 +-
 14 files changed, 52 insertions(+), 162 deletions(-)
 delete mode 100644 Help/release/dev/cdash_upload_retry.rst
 delete mode 100644 Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt
 rename Tests/RunCMake/ctest_submit/{CDashUploadMissingFile-result.txt => CDashUploadRETRY_COUNT-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
 rename Tests/RunCMake/ctest_submit/{CDashUploadRetry-result.txt => CDashUploadRETRY_DELAY-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 11:44:56 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 11:44:56 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2241-gd9fc72a
Message-ID: <20170120164458.B8D12F4599@public.kitware.com>

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  d9fc72a88c0b400a34619379c002c34cc9ed7117 (commit)
       via  05ed82b1d2175410e8cf4d7f8b4b7ba0514d2589 (commit)
       via  0ce7643a84eabfc1c1083d2f3ecccfae6d04836a (commit)
       via  5614a5cd1f7f8fe34f6b31c572476a2ddfd6d9ae (commit)
      from  956e20ea5b043a207449000020dd0dda62c3bd64 (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=d9fc72a88c0b400a34619379c002c34cc9ed7117
commit d9fc72a88c0b400a34619379c002c34cc9ed7117
Merge: 956e20e 05ed82b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 11:44:54 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 11:44:54 2017 -0500

    Merge topic 'cdash_upload_retry' into next
    
    05ed82b1 ctest_submit: Update documentation for CDash upload retries
    0ce7643a ctest_submit: improve handling of QUIET option
    5614a5cd ctest_submit: Allow RETRY_COUNT for CDASH_UPLOAD


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05ed82b1d2175410e8cf4d7f8b4b7ba0514d2589
commit 05ed82b1d2175410e8cf4d7f8b4b7ba0514d2589
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Mon Jan 16 08:41:35 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 11:37:27 2017 -0500

    ctest_submit: Update documentation for CDash upload retries

diff --git a/Help/command/ctest_submit.rst b/Help/command/ctest_submit.rst
index 6830b59..a7d9708 100644
--- a/Help/command/ctest_submit.rst
+++ b/Help/command/ctest_submit.rst
@@ -56,10 +56,16 @@ Submit to CDash Upload API
 
 ::
 
-  ctest_submit(CDASH_UPLOAD <file> [CDASH_UPLOAD_TYPE <type>])
+  ctest_submit(CDASH_UPLOAD <file> [CDASH_UPLOAD_TYPE <type>]
+               [RETRY_COUNT <count>]
+               [RETRY_DELAY <delay>]
+               [QUIET])
 
 This second signature is used to upload files to CDash via the CDash
 file upload API. The api first sends a request to upload to CDash along
 with a content hash of the file. If CDash does not already have the file,
 then it is uploaded. Along with the file, a CDash type string is specified
 to tell CDash which handler to use to process the data.
+
+This signature accepts the ``RETRY_COUNT``, ``RETRY_DELAY``, and ``QUIET``
+options as described above.
diff --git a/Help/release/dev/cdash_upload_retry.rst b/Help/release/dev/cdash_upload_retry.rst
new file mode 100644
index 0000000..2ceb42b
--- /dev/null
+++ b/Help/release/dev/cdash_upload_retry.rst
@@ -0,0 +1,5 @@
+cdash-upload-retry
+-----------------------
+
+* The ``CDASH_UPLOAD`` signature of :command:`ctest_submit` was taught to honor
+  the ``RETRY_COUNT``, ``RETRY_DELAY``, and ``QUIET`` options.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ce7643a84eabfc1c1083d2f3ecccfae6d04836a
commit 0ce7643a84eabfc1c1083d2f3ecccfae6d04836a
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Jan 4 12:54:01 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 11:37:27 2017 -0500

    ctest_submit: improve handling of QUIET option
    
    Teach the CDASH_UPLOAD signature of ctest_submit() to more thoroughly
    respect the QUIET option.

diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx
index 0fb4239..ab1412d 100644
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@@ -19,6 +19,7 @@ cmCTestCurl::cmCTestCurl(cmCTest* ctest)
   // default is to verify https
   this->VerifyPeerOff = false;
   this->VerifyHostOff = false;
+  this->Quiet = false;
   this->TimeOutSeconds = 0;
   this->Curl = curl_easy_init();
 }
@@ -159,13 +160,14 @@ bool cmCTestCurl::UploadFile(std::string const& local_file,
 
   if (!responseData.empty()) {
     response = std::string(responseData.begin(), responseData.end());
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Curl response: ["
-                 << response << "]\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+                       "Curl response: [" << response << "]\n", this->Quiet);
   }
   std::string curlDebug;
   if (!debugData.empty()) {
     curlDebug = std::string(debugData.begin(), debugData.end());
-    cmCTestLog(this->CTest, DEBUG, "Curl debug: [" << curlDebug << "]\n");
+    cmCTestOptionalLog(this->CTest, DEBUG,
+                       "Curl debug: [" << curlDebug << "]\n", this->Quiet);
   }
   if (response.empty()) {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "No response from server.\n"
@@ -179,9 +181,10 @@ bool cmCTestCurl::HttpRequest(std::string const& url,
                               std::string const& fields, std::string& response)
 {
   response = "";
-  cmCTestLog(this->CTest, DEBUG, "HttpRequest\n"
-               << "url: " << url << "\n"
-               << "fields " << fields << "\n");
+  cmCTestOptionalLog(this->CTest, DEBUG, "HttpRequest\n"
+                       << "url: " << url << "\n"
+                       << "fields " << fields << "\n",
+                     this->Quiet);
   if (!this->InitCurl()) {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Initialization of curl failed");
     return false;
@@ -204,13 +207,16 @@ bool cmCTestCurl::HttpRequest(std::string const& url,
 
   if (!responseData.empty()) {
     response = std::string(responseData.begin(), responseData.end());
-    cmCTestLog(this->CTest, DEBUG, "Curl response: [" << response << "]\n");
+    cmCTestOptionalLog(this->CTest, DEBUG,
+                       "Curl response: [" << response << "]\n", this->Quiet);
   }
   if (!debugData.empty()) {
     std::string curlDebug = std::string(debugData.begin(), debugData.end());
-    cmCTestLog(this->CTest, DEBUG, "Curl debug: [" << curlDebug << "]\n");
+    cmCTestOptionalLog(this->CTest, DEBUG,
+                       "Curl debug: [" << curlDebug << "]\n", this->Quiet);
   }
-  cmCTestLog(this->CTest, DEBUG, "Curl res: " << res << "\n");
+  cmCTestOptionalLog(this->CTest, DEBUG, "Curl res: " << res << "\n",
+                     this->Quiet);
   return (res == 0);
 }
 
diff --git a/Source/CTest/cmCTestCurl.h b/Source/CTest/cmCTestCurl.h
index 17fbcff..cdce393 100644
--- a/Source/CTest/cmCTestCurl.h
+++ b/Source/CTest/cmCTestCurl.h
@@ -25,6 +25,7 @@ public:
   void SetCurlOptions(std::vector<std::string> const& args);
   void SetUseHttp10On() { this->UseHttp10 = true; }
   void SetTimeOutSeconds(int s) { this->TimeOutSeconds = s; }
+  void SetQuiet(bool b) { this->Quiet = b; }
   std::string Escape(std::string const& source);
 
 protected:
@@ -40,6 +41,7 @@ private:
   bool VerifyHostOff;
   bool VerifyPeerOff;
   bool UseHttp10;
+  bool Quiet;
   int TimeOutSeconds;
 };
 
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 8ded15e..5e5119d 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -1007,6 +1007,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     return -1;
   }
   cmCTestCurl curl(this->CTest);
+  curl.SetQuiet(this->Quiet);
   std::string curlopt(this->CTest->GetCTestConfiguration("CurlOptions"));
   std::vector<std::string> args;
   cmSystemTools::ExpandListArgument(curlopt, args);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5614a5cd1f7f8fe34f6b31c572476a2ddfd6d9ae
commit 5614a5cd1f7f8fe34f6b31c572476a2ddfd6d9ae
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Jan 4 10:27:37 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 11:37:27 2017 -0500

    ctest_submit: Allow RETRY_COUNT for CDASH_UPLOAD
    
    Teach the CDASH_UPLOAD signature of ctest_submit() to honor the
    RETRY_COUNT and RETRY_DELAY options.
    
    Also teach HttpRequest() to honor the default 120 second timeout
    for curl connections.

diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx
index 9a90f54..0fb4239 100644
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@@ -96,6 +96,13 @@ bool cmCTestCurl::InitCurl()
   }
   // enable HTTP ERROR parsing
   curl_easy_setopt(this->Curl, CURLOPT_FAILONERROR, 1);
+
+  // if there is little to no activity for too long stop submitting
+  if (this->TimeOutSeconds) {
+    curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_LIMIT, 1);
+    curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_TIME, this->TimeOutSeconds);
+  }
+
   return true;
 }
 
@@ -110,12 +117,7 @@ bool cmCTestCurl::UploadFile(std::string const& local_file,
   }
   /* enable uploading */
   curl_easy_setopt(this->Curl, CURLOPT_UPLOAD, 1);
-  // if there is little to no activity for too long stop submitting
-  if (this->TimeOutSeconds) {
-    ::curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_LIMIT, 1);
-    ::curl_easy_setopt(this->Curl, CURLOPT_LOW_SPEED_TIME,
-                       this->TimeOutSeconds);
-  }
+
   /* HTTP PUT please */
   ::curl_easy_setopt(this->Curl, CURLOPT_PUT, 1);
   ::curl_easy_setopt(this->Curl, CURLOPT_VERBOSE, 1);
diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx
index 14b875f..5cf4ddc 100644
--- a/Source/CTest/cmCTestSubmitCommand.cxx
+++ b/Source/CTest/cmCTestSubmitCommand.cxx
@@ -157,6 +157,7 @@ bool cmCTestSubmitCommand::InitialPass(std::vector<std::string> const& args,
 bool cmCTestSubmitCommand::CheckArgumentKeyword(std::string const& arg)
 {
   if (this->CDashUpload) {
+    // Arguments specific to the CDASH_UPLOAD signature.
     if (arg == "CDASH_UPLOAD") {
       this->ArgumentDoing = ArgumentDoingCDashUpload;
       return true;
@@ -167,7 +168,7 @@ bool cmCTestSubmitCommand::CheckArgumentKeyword(std::string const& arg)
       return true;
     }
   } else {
-    // Look for arguments specific to this command.
+    // Arguments that cannot be used with CDASH_UPLOAD.
     if (arg == "PARTS") {
       this->ArgumentDoing = ArgumentDoingParts;
       this->PartsMentioned = true;
@@ -179,21 +180,21 @@ bool cmCTestSubmitCommand::CheckArgumentKeyword(std::string const& arg)
       this->FilesMentioned = true;
       return true;
     }
+  }
+  // Arguments used by both modes.
+  if (arg == "RETRY_COUNT") {
+    this->ArgumentDoing = ArgumentDoingRetryCount;
+    return true;
+  }
 
-    if (arg == "RETRY_COUNT") {
-      this->ArgumentDoing = ArgumentDoingRetryCount;
-      return true;
-    }
-
-    if (arg == "RETRY_DELAY") {
-      this->ArgumentDoing = ArgumentDoingRetryDelay;
-      return true;
-    }
+  if (arg == "RETRY_DELAY") {
+    this->ArgumentDoing = ArgumentDoingRetryDelay;
+    return true;
+  }
 
-    if (arg == "INTERNAL_TEST_CHECKSUM") {
-      this->InternalTest = true;
-      return true;
-    }
+  if (arg == "INTERNAL_TEST_CHECKSUM") {
+    this->InternalTest = true;
+    return true;
   }
 
   // Look for other arguments.
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 79c3663..8ded15e 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -1022,6 +1022,30 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
                "Only http and https are supported for CDASH_UPLOAD\n");
     return -1;
   }
+  bool internalTest = cmSystemTools::IsOn(this->GetOption("InternalTest"));
+
+  // Get RETRY_COUNT and RETRY_DELAY values if they were set.
+  std::string retryDelayString = this->GetOption("RetryDelay") == CM_NULLPTR
+    ? ""
+    : this->GetOption("RetryDelay");
+  std::string retryCountString = this->GetOption("RetryCount") == CM_NULLPTR
+    ? ""
+    : this->GetOption("RetryCount");
+  unsigned long retryDelay = 0;
+  if (retryDelayString != "") {
+    if (!cmSystemTools::StringToULong(retryDelayString.c_str(), &retryDelay)) {
+      cmCTestLog(this->CTest, WARNING, "Invalid value for 'RETRY_DELAY' : "
+                   << retryDelayString << std::endl);
+    }
+  }
+  unsigned long retryCount = 0;
+  if (retryCountString != "") {
+    if (!cmSystemTools::StringToULong(retryCountString.c_str(), &retryCount)) {
+      cmCTestLog(this->CTest, WARNING, "Invalid value for 'RETRY_DELAY' : "
+                   << retryCountString << std::endl);
+    }
+  }
+
   char md5sum[33];
   md5sum[32] = 0;
   cmSystemTools::ComputeFileMD5(file, md5sum);
@@ -1058,7 +1082,33 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
                                 << "\nfile: " << file << "\n",
                      this->Quiet);
   std::string response;
-  if (!curl.HttpRequest(url, fields, response)) {
+
+  bool requestSucceeded = curl.HttpRequest(url, fields, response);
+  if (!internalTest && !requestSucceeded) {
+    // If request failed, wait and retry.
+    for (unsigned long i = 0; i < retryCount; i++) {
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+                         "   Request failed, waiting " << retryDelay
+                                                       << " seconds...\n",
+                         this->Quiet);
+
+      double stop = cmSystemTools::GetTime() + static_cast<double>(retryDelay);
+      while (cmSystemTools::GetTime() < stop) {
+        cmSystemTools::Delay(100);
+      }
+
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+                         "   Retry request: Attempt "
+                           << (i + 1) << " of " << retryCount << std::endl,
+                         this->Quiet);
+
+      requestSucceeded = curl.HttpRequest(url, fields, response);
+      if (requestSucceeded) {
+        break;
+      }
+    }
+  }
+  if (!internalTest && !requestSucceeded) {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error in HttpRequest\n"
                  << response);
     return -1;
@@ -1068,30 +1118,32 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
                      this->Quiet);
   Json::Value json;
   Json::Reader reader;
-  if (!reader.parse(response, json)) {
+  if (!internalTest && !reader.parse(response, json)) {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error parsing json string ["
                  << response << "]\n"
                  << reader.getFormattedErrorMessages() << "\n");
     return -1;
   }
-  if (json["status"].asInt() != 0) {
+  if (!internalTest && json["status"].asInt() != 0) {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Bad status returned from CDash: " << json["status"].asInt());
     return -1;
   }
-  if (json["datafilesmd5"].isArray()) {
-    int datares = json["datafilesmd5"][0].asInt();
-    if (datares == 1) {
-      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                         "File already exists on CDash, skip upload " << file
-                                                                      << "\n",
-                         this->Quiet);
-      return 0;
+  if (!internalTest) {
+    if (json["datafilesmd5"].isArray()) {
+      int datares = json["datafilesmd5"][0].asInt();
+      if (datares == 1) {
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+                           "File already exists on CDash, skip upload "
+                             << file << "\n",
+                           this->Quiet);
+        return 0;
+      }
+    } else {
+      cmCTestLog(this->CTest, ERROR_MESSAGE,
+                 "bad datafilesmd5 value in response " << response << "\n");
+      return -1;
     }
-  } else {
-    cmCTestLog(this->CTest, ERROR_MESSAGE,
-               "bad datafilesmd5 value in response " << response << "\n");
-    return -1;
   }
 
   std::string upload_as = cmSystemTools::GetFilenameName(file);
@@ -1100,7 +1152,40 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
        << "md5=" << md5sum << "&"
        << "filename=" << curl.Escape(upload_as) << "&"
        << "buildid=" << json["buildid"].asString();
-  if (!curl.UploadFile(file, url, fstr.str(), response)) {
+
+  bool uploadSucceeded = false;
+  if (!internalTest) {
+    uploadSucceeded = curl.UploadFile(file, url, fstr.str(), response);
+  }
+
+  if (!uploadSucceeded) {
+    // If upload failed, wait and retry.
+    for (unsigned long i = 0; i < retryCount; i++) {
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+                         "   Upload failed, waiting " << retryDelay
+                                                      << " seconds...\n",
+                         this->Quiet);
+
+      double stop = cmSystemTools::GetTime() + static_cast<double>(retryDelay);
+      while (cmSystemTools::GetTime() < stop) {
+        cmSystemTools::Delay(100);
+      }
+
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+                         "   Retry upload: Attempt "
+                           << (i + 1) << " of " << retryCount << std::endl,
+                         this->Quiet);
+
+      if (!internalTest) {
+        uploadSucceeded = curl.UploadFile(file, url, fstr.str(), response);
+      }
+      if (uploadSucceeded) {
+        break;
+      }
+    }
+  }
+
+  if (!uploadSucceeded) {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error uploading to CDash. "
                  << file << " " << url << " " << fstr.str());
     return -1;
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-result.txt
similarity index 100%
rename from Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadMissingFile-result.txt
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt
new file mode 100644
index 0000000..364ecde
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt
@@ -0,0 +1 @@
+Upload file not found: 'bad-upload'
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
deleted file mode 100644
index 21621d4..0000000
--- a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT/test.cmake:[0-9]+ \(ctest_submit\):
-  ctest_submit called with unknown argument "RETRY_COUNT".
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
deleted file mode 100644
index f726674..0000000
--- a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY/test.cmake:[0-9]+ \(ctest_submit\):
-  ctest_submit called with unknown argument "RETRY_DELAY".
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadRetry-result.txt
similarity index 100%
rename from Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadRetry-result.txt
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt
new file mode 100644
index 0000000..6780c17
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt
@@ -0,0 +1 @@
+error uploading to CDash.
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt b/Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt
new file mode 100644
index 0000000..a5459ac
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt
@@ -0,0 +1,4 @@
+   Upload failed, waiting 1 seconds...
+   Retry upload: Attempt 1 of 2
+   Upload failed, waiting 1 seconds...
+   Retry upload: Attempt 2 of 2
diff --git a/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
index a81bc96..e104f8a 100644
--- a/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
@@ -21,9 +21,9 @@ run_ctest_submit(PARTSCDashUpload PARTS Configure CDASH_UPLOAD)
 run_ctest_submit(PARTSCDashUploadType PARTS Configure CDASH_UPLOAD_TYPE)
 run_ctest_submit(CDashUploadPARTS CDASH_UPLOAD bad-upload PARTS)
 run_ctest_submit(CDashUploadFILES CDASH_UPLOAD bad-upload FILES)
-run_ctest_submit(CDashUploadRETRY_COUNT CDASH_UPLOAD bad-upload RETRY_COUNT)
-run_ctest_submit(CDashUploadRETRY_DELAY CDASH_UPLOAD bad-upload RETRY_DELAY)
 run_ctest_submit(CDashUploadNone CDASH_UPLOAD)
+run_ctest_submit(CDashUploadMissingFile CDASH_UPLOAD bad-upload)
+run_ctest_submit(CDashUploadRetry CDASH_UPLOAD ${CMAKE_CURRENT_LIST_FILE} CDASH_UPLOAD_TYPE foo RETRY_COUNT 2 RETRY_DELAY 1 INTERNAL_TEST_CHECKSUM)
 run_ctest_submit(CDashSubmitQuiet QUIET)
 
 function(run_ctest_CDashUploadFTP)

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

Summary of changes:
 Help/command/ctest_submit.rst                      |    8 +-
 Help/release/dev/cdash_upload_retry.rst            |    5 +
 Source/CTest/cmCTestCurl.cxx                       |   38 ++++---
 Source/CTest/cmCTestCurl.h                         |    2 +
 Source/CTest/cmCTestSubmitCommand.cxx              |   29 ++---
 Source/CTest/cmCTestSubmitHandler.cxx              |  118 +++++++++++++++++---
 ...esult.txt => CDashUploadMissingFile-result.txt} |    0
 .../ctest_submit/CDashUploadMissingFile-stderr.txt |    1 +
 .../ctest_submit/CDashUploadRETRY_COUNT-stderr.txt |    2 -
 .../ctest_submit/CDashUploadRETRY_DELAY-stderr.txt |    2 -
 ...ELAY-result.txt => CDashUploadRetry-result.txt} |    0
 .../ctest_submit/CDashUploadRetry-stderr.txt       |    1 +
 .../ctest_submit/CDashUploadRetry-stdout.txt       |    4 +
 Tests/RunCMake/ctest_submit/RunCMakeTest.cmake     |    4 +-
 14 files changed, 162 insertions(+), 52 deletions(-)
 create mode 100644 Help/release/dev/cdash_upload_retry.rst
 rename Tests/RunCMake/ctest_submit/{CDashUploadRETRY_COUNT-result.txt => CDashUploadMissingFile-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
 rename Tests/RunCMake/ctest_submit/{CDashUploadRETRY_DELAY-result.txt => CDashUploadRetry-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 11:51:04 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 11:51:04 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2243-ga2ee4ce
Message-ID: <20170120165104.0ADE1F9A5E@public.kitware.com>

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  a2ee4ce131ae24160c9825aa67f7f38e7eef48ad (commit)
       via  adc04afe34791a90a552fcaefaf30e24b937e1b3 (commit)
      from  d9fc72a88c0b400a34619379c002c34cc9ed7117 (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=a2ee4ce131ae24160c9825aa67f7f38e7eef48ad
commit a2ee4ce131ae24160c9825aa67f7f38e7eef48ad
Merge: d9fc72a adc04af
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 11:51:03 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 11:51:03 2017 -0500

    Merge topic 'add-dl-to-lua-static-linking' into next
    
    adc04afe FindLua: Add dl library to Lua static library linking


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adc04afe34791a90a552fcaefaf30e24b937e1b3
commit adc04afe34791a90a552fcaefaf30e24b937e1b3
Author:     Michael Krasnyk <michael.krasnyk at gmail.com>
AuthorDate: Wed Jan 18 15:22:20 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 11:49:51 2017 -0500

    FindLua: Add dl library to Lua static library linking
    
    If a Lua library is compiled from source as `liblua.a` its link
    dependency on `dl` must be satisfied explicitly.

diff --git a/Modules/FindLua.cmake b/Modules/FindLua.cmake
index 5be0428..c777970 100644
--- a/Modules/FindLua.cmake
+++ b/Modules/FindLua.cmake
@@ -172,6 +172,13 @@ if (LUA_LIBRARY)
     if (UNIX AND NOT APPLE AND NOT BEOS)
         find_library(LUA_MATH_LIBRARY m)
         set(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
+
+        # include dl library for statically-linked Lua library
+        get_filename_component(LUA_LIB_EXT ${LUA_LIBRARY} EXT)
+        if(LUA_LIB_EXT STREQUAL CMAKE_STATIC_LIBRARY_SUFFIX)
+          list(APPEND LUA_LIBRARIES ${CMAKE_DL_LIBS})
+        endif()
+
     # For Windows and Mac, don't need to explicitly include the math library
     else ()
         set(LUA_LIBRARIES "${LUA_LIBRARY}")

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 11:54:30 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 11:54:30 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1135-g22d2401
Message-ID: <20170120165430.E991EF9DBD@public.kitware.com>

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  22d240184cfe5afda325551b68610bf7160afa8b (commit)
       via  05ed82b1d2175410e8cf4d7f8b4b7ba0514d2589 (commit)
       via  0ce7643a84eabfc1c1083d2f3ecccfae6d04836a (commit)
       via  5614a5cd1f7f8fe34f6b31c572476a2ddfd6d9ae (commit)
      from  45dea920ab4e96f84f43eab906dca3c51bd12c31 (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=22d240184cfe5afda325551b68610bf7160afa8b
commit 22d240184cfe5afda325551b68610bf7160afa8b
Merge: 45dea92 05ed82b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 11:54:28 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 11:54:28 2017 -0500

    Merge topic 'cdash_upload_retry'
    
    05ed82b1 ctest_submit: Update documentation for CDash upload retries
    0ce7643a ctest_submit: improve handling of QUIET option
    5614a5cd ctest_submit: Allow RETRY_COUNT for CDASH_UPLOAD


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

Summary of changes:
 Help/command/ctest_submit.rst                      |    8 +-
 Help/release/dev/cdash_upload_retry.rst            |    5 +
 Source/CTest/cmCTestCurl.cxx                       |   38 ++++---
 Source/CTest/cmCTestCurl.h                         |    2 +
 Source/CTest/cmCTestSubmitCommand.cxx              |   29 ++---
 Source/CTest/cmCTestSubmitHandler.cxx              |  118 +++++++++++++++++---
 ...esult.txt => CDashUploadMissingFile-result.txt} |    0
 .../ctest_submit/CDashUploadMissingFile-stderr.txt |    1 +
 .../ctest_submit/CDashUploadRETRY_COUNT-stderr.txt |    2 -
 .../ctest_submit/CDashUploadRETRY_DELAY-stderr.txt |    2 -
 ...ELAY-result.txt => CDashUploadRetry-result.txt} |    0
 .../ctest_submit/CDashUploadRetry-stderr.txt       |    1 +
 .../ctest_submit/CDashUploadRetry-stdout.txt       |    4 +
 Tests/RunCMake/ctest_submit/RunCMakeTest.cmake     |    4 +-
 14 files changed, 162 insertions(+), 52 deletions(-)
 create mode 100644 Help/release/dev/cdash_upload_retry.rst
 rename Tests/RunCMake/ctest_submit/{CDashUploadRETRY_COUNT-result.txt => CDashUploadMissingFile-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
 rename Tests/RunCMake/ctest_submit/{CDashUploadRETRY_DELAY-result.txt => CDashUploadRetry-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 11:54:33 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 11:54:33 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1137-g910ef6d
Message-ID: <20170120165433.8D1BCF9B90@public.kitware.com>

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  910ef6d0a3eab5d483759ee23f10e91f1c4da8c2 (commit)
       via  d9f836e9567dbcce85b917300e8de9086aa1f1f7 (commit)
      from  22d240184cfe5afda325551b68610bf7160afa8b (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=910ef6d0a3eab5d483759ee23f10e91f1c4da8c2
commit 910ef6d0a3eab5d483759ee23f10e91f1c4da8c2
Merge: 22d2401 d9f836e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 11:54:31 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 11:54:31 2017 -0500

    Merge topic '16165-manually-added-dependencies'
    
    d9f836e9 Add a getter for manually added target dependencies


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

Summary of changes:
 Help/manual/cmake-properties.7.rst                    |    1 +
 Help/prop_tgt/MANUALLY_ADDED_DEPENDENCIES.rst         |    8 ++++++++
 Help/release/dev/manually-added-dependencies.rst      |    6 ++++++
 Source/cmTarget.cxx                                   |   17 +++++++++++++++++
 .../ReadOnlyProperty-result.txt}                      |    0
 .../add_dependencies/ReadOnlyProperty-stderr.txt      |    1 +
 .../RunCMake/add_dependencies/ReadOnlyProperty.cmake  |    6 ++++++
 .../add_dependencies/RetrieveDependencies.cmake       |   16 ++++++++++++++++
 Tests/RunCMake/add_dependencies/RunCMakeTest.cmake    |    2 ++
 Tests/RunCMake/add_dependencies/a.c                   |    3 +++
 Tests/RunCMake/add_dependencies/b.c                   |    3 +++
 Tests/RunCMake/add_dependencies/c.c                   |    3 +++
 12 files changed, 66 insertions(+)
 create mode 100644 Help/prop_tgt/MANUALLY_ADDED_DEPENDENCIES.rst
 create mode 100644 Help/release/dev/manually-added-dependencies.rst
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => add_dependencies/ReadOnlyProperty-result.txt} (100%)
 create mode 100644 Tests/RunCMake/add_dependencies/ReadOnlyProperty-stderr.txt
 create mode 100644 Tests/RunCMake/add_dependencies/ReadOnlyProperty.cmake
 create mode 100644 Tests/RunCMake/add_dependencies/RetrieveDependencies.cmake
 create mode 100644 Tests/RunCMake/add_dependencies/a.c
 create mode 100644 Tests/RunCMake/add_dependencies/b.c
 create mode 100644 Tests/RunCMake/add_dependencies/c.c


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 11:54:36 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 11:54:36 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1139-g395f01e
Message-ID: <20170120165436.0E5FBF9DFE@public.kitware.com>

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  395f01ef728b3c41b2cab020aff381814244ebe1 (commit)
       via  3fc4a2b71a25ba4045a8b80e66ecffba54bd0d54 (commit)
      from  910ef6d0a3eab5d483759ee23f10e91f1c4da8c2 (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=395f01ef728b3c41b2cab020aff381814244ebe1
commit 395f01ef728b3c41b2cab020aff381814244ebe1
Merge: 910ef6d 3fc4a2b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 11:54:34 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 11:54:34 2017 -0500

    Merge topic 'cpack-ifw-new-installer-options'
    
    3fc4a2b7 QtIFW: Added new options to QtIFW cpack generator for modifying wizard style


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

Summary of changes:
 Help/release/dev/cpack-ifw-package-options.rst |    7 ++
 Modules/CPackIFW.cmake                         |   28 ++++++
 Source/CPack/IFW/cmCPackIFWInstaller.cxx       |  119 +++++++++++++++++++++++-
 Source/CPack/IFW/cmCPackIFWInstaller.h         |   25 +++++
 4 files changed, 176 insertions(+), 3 deletions(-)
 create mode 100644 Help/release/dev/cpack-ifw-package-options.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 11:54:38 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 11:54:38 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1141-g0f89100
Message-ID: <20170120165438.CD560F9DC0@public.kitware.com>

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  0f891007a902a79acf746479f6bfe19b96899cef (commit)
       via  7f0a21a51eb483c523a2c8880ce4e0466251ec74 (commit)
      from  395f01ef728b3c41b2cab020aff381814244ebe1 (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=0f891007a902a79acf746479f6bfe19b96899cef
commit 0f891007a902a79acf746479f6bfe19b96899cef
Merge: 395f01e 7f0a21a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 11:54:37 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 11:54:37 2017 -0500

    Merge topic 'case-insensitive-bindir-detection'
    
    7f0a21a5 cmSystemTools: use the actual case for root detection


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

Summary of changes:
 Source/cmSystemTools.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 11:54:41 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 11:54:41 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1143-gd9d41d3
Message-ID: <20170120165441.2E929F9E00@public.kitware.com>

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  d9d41d332d91abf0da7aa531b64bdecad5b6e9b9 (commit)
       via  0ed885f742088b0e68103b87ee36837c37575628 (commit)
      from  0f891007a902a79acf746479f6bfe19b96899cef (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=d9d41d332d91abf0da7aa531b64bdecad5b6e9b9
commit d9d41d332d91abf0da7aa531b64bdecad5b6e9b9
Merge: 0f89100 0ed885f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 11:54:39 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 11:54:39 2017 -0500

    Merge topic 'ExternalProject-restore-case-insensitive-hash'
    
    0ed885f7 ExternalProject: Restore case-insensitive download hash check


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 11:54:43 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 11:54:43 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1145-g6b4b8e6
Message-ID: <20170120165443.691F4F9DFE@public.kitware.com>

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  6b4b8e6a600e177d6bbe41848e7de58e7392c81a (commit)
       via  adc04afe34791a90a552fcaefaf30e24b937e1b3 (commit)
      from  d9d41d332d91abf0da7aa531b64bdecad5b6e9b9 (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=6b4b8e6a600e177d6bbe41848e7de58e7392c81a
commit 6b4b8e6a600e177d6bbe41848e7de58e7392c81a
Merge: d9d41d3 adc04af
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 11:54:41 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 11:54:41 2017 -0500

    Merge topic 'add-dl-to-lua-static-linking'
    
    adc04afe FindLua: Add dl library to Lua static library linking


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 11:55:10 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 11:55:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2251-gfa8f3ad
Message-ID: <20170120165510.6FDE4F9DBE@public.kitware.com>

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  fa8f3ada662e9cbf3f92e9b60989dd25d623b23a (commit)
       via  6b4b8e6a600e177d6bbe41848e7de58e7392c81a (commit)
       via  d9d41d332d91abf0da7aa531b64bdecad5b6e9b9 (commit)
       via  0f891007a902a79acf746479f6bfe19b96899cef (commit)
       via  395f01ef728b3c41b2cab020aff381814244ebe1 (commit)
       via  910ef6d0a3eab5d483759ee23f10e91f1c4da8c2 (commit)
       via  22d240184cfe5afda325551b68610bf7160afa8b (commit)
       via  45dea920ab4e96f84f43eab906dca3c51bd12c31 (commit)
      from  a2ee4ce131ae24160c9825aa67f7f38e7eef48ad (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=fa8f3ada662e9cbf3f92e9b60989dd25d623b23a
commit fa8f3ada662e9cbf3f92e9b60989dd25d623b23a
Merge: a2ee4ce 6b4b8e6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 11:55:01 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 11:55:01 2017 -0500

    Merge branch 'master' into next


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 13:28:15 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 13:28:15 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2253-gda9be2c
Message-ID: <20170120182815.EE621FA35B@public.kitware.com>

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  da9be2c4764f2557e4a7b44a11ce6cb8412a100e (commit)
       via  54963f7c1c30622a4d4ca7afb3bd3c2d44257754 (commit)
      from  fa8f3ada662e9cbf3f92e9b60989dd25d623b23a (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=da9be2c4764f2557e4a7b44a11ce6cb8412a100e
commit da9be2c4764f2557e4a7b44a11ce6cb8412a100e
Merge: fa8f3ad 54963f7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 13:28:15 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 13:28:15 2017 -0500

    Merge topic 'qt4-lupdate-cmp0058' into next
    
    54963f7c Qt4: Only change timestamp on generated .pro files if content changes


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54963f7c1c30622a4d4ca7afb3bd3c2d44257754
commit 54963f7c1c30622a4d4ca7afb3bd3c2d44257754
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Jan 17 07:57:09 2017 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 13:27:35 2017 -0500

    Qt4: Only change timestamp on generated .pro files if content changes
    
    In qt4_create_translation() use file(GENERATE ...) instead of
    file(WRITE ...).  This also removes a possible CMP0058 warning
    because file(GENERATE) tells the Ninja generator about the files
    it provides.
    
    Fixes: #16518.

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 0279d1c..0478918 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -439,7 +439,7 @@ macro(QT4_CREATE_TRANSLATION _qm_files)
          get_filename_component(_abs_include "${_pro_include}" ABSOLUTE)
          string(APPEND _pro_includes " \\\n  \"${_abs_include}\"")
        endforeach()
-       file(WRITE ${_ts_pro} "SOURCES =${_pro_srcs}\nINCLUDEPATH =${_pro_includes}\n")
+       file(GENERATE OUTPUT ${_ts_pro} CONTENT "SOURCES =${_pro_srcs}\nINCLUDEPATH =${_pro_includes}\n")
      endif()
      add_custom_command(OUTPUT ${_ts_file}
         COMMAND Qt4::lupdate

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 13:29:03 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 13:29:03 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2255-ge0cee46
Message-ID: <20170120182903.8A119FA3AE@public.kitware.com>

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  e0cee4632ec08a8eb2f73b33b2a702b3add0fc33 (commit)
       via  1c2ac0b8baebcf2496d701ab316f8f5666b470be (commit)
      from  da9be2c4764f2557e4a7b44a11ce6cb8412a100e (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=e0cee4632ec08a8eb2f73b33b2a702b3add0fc33
commit e0cee4632ec08a8eb2f73b33b2a702b3add0fc33
Merge: da9be2c 1c2ac0b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 13:29:03 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 13:29:03 2017 -0500

    Merge topic 'qt4-lupdate-cmp0058' into next
    
    1c2ac0b8 Qt4: Only change timestamp on generated .pro files if content changes


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c2ac0b8baebcf2496d701ab316f8f5666b470be
commit 1c2ac0b8baebcf2496d701ab316f8f5666b470be
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Jan 17 07:57:09 2017 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 13:28:48 2017 -0500

    Qt4: Only change timestamp on generated .pro files if content changes
    
    In qt4_create_translation() use file(GENERATE ...) instead of
    file(WRITE ...).  This also removes a possible CMP0058 warning
    because file(GENERATE) tells the Ninja generator about the files
    it provides.
    
    Fixes: #16518

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 0279d1c..0478918 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -439,7 +439,7 @@ macro(QT4_CREATE_TRANSLATION _qm_files)
          get_filename_component(_abs_include "${_pro_include}" ABSOLUTE)
          string(APPEND _pro_includes " \\\n  \"${_abs_include}\"")
        endforeach()
-       file(WRITE ${_ts_pro} "SOURCES =${_pro_srcs}\nINCLUDEPATH =${_pro_includes}\n")
+       file(GENERATE OUTPUT ${_ts_pro} CONTENT "SOURCES =${_pro_srcs}\nINCLUDEPATH =${_pro_includes}\n")
      endif()
      add_custom_command(OUTPUT ${_ts_file}
         COMMAND Qt4::lupdate

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 13:31:43 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 13:31:43 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2257-g7f6d422
Message-ID: <20170120183143.EFE76FA497@public.kitware.com>

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  7f6d4227d57b9e5deb0aae0e1caee7ff86b7533b (commit)
       via  8f1bce12d2f8ae2eb3771b173b28b8405b059923 (commit)
      from  e0cee4632ec08a8eb2f73b33b2a702b3add0fc33 (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=7f6d4227d57b9e5deb0aae0e1caee7ff86b7533b
commit 7f6d4227d57b9e5deb0aae0e1caee7ff86b7533b
Merge: e0cee46 8f1bce1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 13:31:43 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 13:31:43 2017 -0500

    Merge topic 'qtdialog-trim-new-varname' into next
    
    8f1bce12 cmake-gui: trim spaces from user-created variable names


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f1bce12d2f8ae2eb3771b173b28b8405b059923
commit 8f1bce12d2f8ae2eb3771b173b28b8405b059923
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Jan 17 19:56:21 2017 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 13:31:09 2017 -0500

    cmake-gui: trim spaces from user-created variable names
    
    Fixes: #15955

diff --git a/Source/QtDialog/AddCacheEntry.cxx b/Source/QtDialog/AddCacheEntry.cxx
index daf4bd1..6284ac9 100644
--- a/Source/QtDialog/AddCacheEntry.cxx
+++ b/Source/QtDialog/AddCacheEntry.cxx
@@ -46,7 +46,7 @@ AddCacheEntry::AddCacheEntry(QWidget* p, const QStringList& varNames,
 
 QString AddCacheEntry::name() const
 {
-  return this->Name->text();
+  return this->Name->text().trimmed();
 }
 
 QVariant AddCacheEntry::value() const

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 13:33:47 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 13:33:47 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2259-g52edbfc
Message-ID: <20170120183347.0B27EFA4E2@public.kitware.com>

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  52edbfcac86c6156e95cbdb1947e71216e8b8a40 (commit)
       via  211bd24ab3388d44d018f0e4773f9db80c9eb9e0 (commit)
      from  7f6d4227d57b9e5deb0aae0e1caee7ff86b7533b (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=52edbfcac86c6156e95cbdb1947e71216e8b8a40
commit 52edbfcac86c6156e95cbdb1947e71216e8b8a40
Merge: 7f6d422 211bd24
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 13:33:45 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 13:33:45 2017 -0500

    Merge topic 'lang_lint' into next
    
    211bd24a Add properties to run the cpplint style checker with the compiler


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=211bd24ab3388d44d018f0e4773f9db80c9eb9e0
commit 211bd24ab3388d44d018f0e4773f9db80c9eb9e0
Author:     Jamie Snape <jamie.snape at kitware.com>
AuthorDate: Tue Jan 17 18:26:07 2017 -0500
Commit:     Jamie Snape <jamie.snape at kitware.com>
CommitDate: Tue Jan 17 18:26:07 2017 -0500

    Add properties to run the cpplint style checker with the compiler
    
    Create a `<LANG>_CPPLINT` target property (initialized by a
    `CMAKE_<LANG>_CPPLINT` variable) to specify a `cpplint` style checker
    command line to be run along with the compiler.

diff --git a/Auxiliary/vim/syntax/cmake.vim b/Auxiliary/vim/syntax/cmake.vim
index fabf9c1..1f19cb7 100644
--- a/Auxiliary/vim/syntax/cmake.vim
+++ b/Auxiliary/vim/syntax/cmake.vim
@@ -32,11 +32,11 @@ syn region cmakeArguments start=/(/ end=/)/
 
 syn case match
 syn keyword cmakeProperty
-            \ ABSTRACT ADDITIONAL_MAKE_CLEAN_FILES ADVANCED ALIASED_TARGET ALLOW_DUPLICATE_CUSTOM_TARGETS ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_API ANDROID_API_MIN ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES ANDROID_GUI ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_DEBUG ARCHIVE_OUTPUT_DIRECTORY_RELEASE ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_DEBUG ARCHIVE_OUTPUT_NAME_RELEASE ATTACHED_FILES ATTACHED_FILES_ON_FAIL AUTOGEN_TARGETS_FOLDER AUTOGEN_TARGET_DEPENDS AUTOMOC AUTOMOC_MOC_OPTIONS AUTOMOC_TARGETS_FOLDER AUTORCC AUTORCC_OPTIONS AUTOUIC AUTOUIC_OPTIONS BINARY_DIR BUILD_WITH_INSTALL_RPATH BUNDLE BUNDLE_EXTENSION CACHE_VARIABLES CLEAN_NO_CUSTOM CMAKE_CONFIGURE_DEPENDS CMAKE_CXX_KNOWN_FEATURES CMAKE_C_KNOWN_FEATURES COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN COMPATIBLE_INTERFACE_STRING COMPILE_DEFINITIONS COMPILE_DEFINITIONS_DEBUG COMPILE_DEFINITIONS_RELEASE COMPILE_FEATURES COMPILE_FLAGS COMPILE_OPTIONS COMPILE_PDB_NAME COMPILE_PDB_NAME_DEBUG COMPILE_PDB_NAME_RELEASE COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG COMPILE_PDB_OUTPUT_DIRECTORY_RELEASE COST CPACK_DESKTOP_SHORTCUTS CPACK_NEVER_OVERWRITE CPACK_PERMANENT CPACK_STARTUP_SHORTCUTS CPACK_START_MENU_SHORTCUTS CPACK_WIX_ACL CROSSCOMPILING_EMULATOR CXX_EXTENSIONS CXX_STANDARD CXX_STANDARD_REQUIRED C_EXTENSIONS C_STANDARD C_STANDARD_REQUIRED DEBUG_CONFIGURATIONS DEBUG_POSTFIX DEFINE_SYMBOL DEFINITIONS DEPENDS DISABLED_FEATURES ECLIPSE_EXTRA_NATURES ENABLED_FEATURES ENABLED_LANGUAGES ENABLE_EXPORTS ENVIRONMENT EXCLUDE_FROM_ALL EXCLUDE_FROM_DEFAULT_BUILD EXCLUDE_FROM_DEFAULT_BUILD_DEBUG EXCLUDE_FROM_DEFAULT_BUILD_RELEASE EXPORT_NAME EXTERNAL_OBJECT EchoString FAIL_REGULAR_EXPRESSION FIND_LIBRARY_USE_LIB64_PATHS FIND_LIBRARY_USE_OPENBSD_VERSIONING FOLDER FRAMEWORK FRAMEWORK_VERSION Fortran_FORMAT Fortran_MODULE_DIRECTORY GENERATED GENERATOR_FILE_NAME GLOBAL_DEPENDS_DEBUG_MODE GLOBAL_DEPENDS_NO_CYCLES GNUtoMS HAS_CXX HEADER_FILE_ONLY HELPSTRING IMPLICIT_DEPENDS_INCLUDE_TRANSFORM IMPORTED IMPORTED_CONFIGURATIONS IMPORTED_IMPLIB IMPORTED_IMPLIB_DEBUG IMPORTED_IMPLIB_RELEASE IMPORTED_LINK_DEPENDENT_LIBRARIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUG IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_LANGUAGES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE IMPORTED_LINK_INTERFACE_LIBRARIES IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_MULTIPLICITY IMPORTED_LINK_INTERFACE_MULTIPLICITY_DEBUG IMPORTED_LINK_INTERFACE_MULTIPLICITY_RELEASE IMPORTED_LOCATION IMPORTED_LOCATION_DEBUG IMPORTED_LOCATION_RELEASE IMPORTED_NO_SONAME IMPORTED_NO_SONAME_DEBUG IMPORTED_NO_SONAME_RELEASE IMPORTED_SONAME IMPORTED_SONAME_DEBUG IMPORTED_SONAME_RELEASE IMPORT_PREFIX IMPORT_SUFFIX INCLUDE_DIRECTORIES INCLUDE_REGULAR_EXPRESSION INSTALL_NAME_DIR INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH INTERFACE_AUTOUIC_OPTIONS INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS INTERFACE_INCLUDE_DIRECTORIES INTERFACE_LINK_LIBRARIES INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SOURCES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES INTERPROCEDURAL_OPTIMIZATION INTERPROCEDURAL_OPTIMIZATION_DEBUG INTERPROCEDURAL_OPTIMIZATION_RELEASE IN_TRY_COMPILE JOB_POOLS JOB_POOL_COMPILE JOB_POOL_LINK KEEP_EXTENSION LABELS LANGUAGE LIBRARY_OUTPUT_DIRECTORY LIBRARY_OUTPUT_DIRECTORY_DEBUG LIBRARY_OUTPUT_DIRECTORY_RELEASE LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_DEBUG LIBRARY_OUTPUT_NAME_RELEASE LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED LINK_DIRECTORIES LINK_FLAGS LINK_FLAGS_DEBUG LINK_FLAGS_RELEASE LINK_INTERFACE_LIBRARIES LINK_INTERFACE_LIBRARIES_DEBUG LINK_INTERFACE_LIBRARIES_RELEASE LINK_INTERFACE_MULTIPLICITY LINK_INTERFACE_MULTIPLICITY_DEBUG LINK_INTERFACE_MULTIPLICITY_RELEASE LINK_LIBRARIES LINK_SEARCH_END_STATIC LINK_SEARCH_START_STATIC LISTFILE_STACK LOCATION LOCATION_DEBUG LOCATION_RELEASE MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_PACKAGE_LOCATION MACOSX_RPATH MACROS MAP_IMPORTED_CONFIG_DEBUG MAP_IMPORTED_CONFIG_RELEASE MEASUREMENT MODIFIED NAME NO_SONAME NO_SYSTEM_FROM_IMPORTED OBJECT_DEPENDS OBJECT_OUTPUTS OSX_ARCHITECTURES OSX_ARCHITECTURES_DEBUG OSX_ARCHITECTURES_RELEASE OUTPUT_NAME OUTPUT_NAME_DEBUG OUTPUT_NAME_RELEASE PACKAGES_FOUND PACKAGES_NOT_FOUND PARENT_DIRECTORY PASS_REGULAR_EXPRESSION PDB_NAME PDB_NAME_DEBUG PDB_NAME_RELEASE PDB_OUTPUT_DIRECTORY PDB_OUTPUT_DIRECTORY_DEBUG PDB_OUTPUT_DIRECTORY_RELEASE POSITION_INDEPENDENT_CODE POST_INSTALL_SCRIPT PREDEFINED_TARGETS_FOLDER PREFIX PRE_INSTALL_SCRIPT PRIVATE_HEADER PROCESSORS PROJECT_LABEL PUBLIC_HEADER REPORT_UNDEFINED_PROPERTIES REQUIRED_FILES RESOURCE RESOURCE_LOCK RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK RULE_MESSAGES RUNTIME_OUTPUT_DIRECTORY RUNTIME_OUTPUT_DIRECTORY_DEBUG RUNTIME_OUTPUT_DIRECTORY_RELEASE RUNTIME_OUTPUT_NAME RUNTIME_OUTPUT_NAME_DEBUG RUNTIME_OUTPUT_NAME_RELEASE RUN_SERIAL SKIP_BUILD_RPATH SKIP_RETURN_CODE SOURCES SOURCE_DIR SOVERSION STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_DEBUG STATIC_LIBRARY_FLAGS_RELEASE STRINGS SUFFIX SYMBOLIC TARGET_ARCHIVES_MAY_BE_SHARED_LIBS TARGET_MESSAGES TARGET_SUPPORTS_SHARED_LIBS TEST_INCLUDE_FILE TIMEOUT TYPE USE_FOLDERS VALUE VARIABLES VERSION VISIBILITY_INLINES_HIDDEN VS_DEPLOYMENT_CONTENT VS_DEPLOYMENT_LOCATION VS_DESKTOP_EXTENSIONS_VERSION VS_DOTNET_REFERENCES VS_DOTNET_TARGET_FRAMEWORK_VERSION VS_GLOBAL_KEYWORD VS_GLOBAL_PROJECT_TYPES VS_GLOBAL_ROOTNAMESPACE VS_IOT_EXTENSIONS_VERSION VS_IOT_STARTUP_TASK VS_KEYWORD VS_MOBILE_EXTENSIONS_VERSION VS_SCC_AUXPATH VS_SCC_LOCALPATH VS_SCC_PROJECTNAME VS_SCC_PROVIDER VS_SHADER_ENTRYPOINT VS_SHADER_FLAGS VS_SHADER_MODEL VS_SHADER_TYPE VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES VS_XAML_TYPE WILL_FAIL WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS WORKING_DIRECTORY WRAP_EXCLUDE XCODE_EXPLICIT_FILE_TYPE XCODE_LAST_KNOWN_FILE_TYPE XCTEST
+            \ ABSTRACT ADDITIONAL_MAKE_CLEAN_FILES ADVANCED ALIASED_TARGET ALLOW_DUPLICATE_CUSTOM_TARGETS ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_API ANDROID_API_MIN ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES ANDROID_GUI ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_DEBUG ARCHIVE_OUTPUT_DIRECTORY_RELEASE ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_DEBUG ARCHIVE_OUTPUT_NAME_RELEASE ATTACHED_FILES ATTACHED_FILES_ON_FAIL AUTOGEN_TARGETS_FOLDER AUTOGEN_TARGET_DEPENDS AUTOMOC AUTOMOC_MOC_OPTIONS AUTOMOC_TARGETS_FOLDER AUTORCC AUTORCC_OPTIONS AUTOUIC AUTOUIC_OPTIONS BINARY_DIR BUILD_WITH_INSTALL_RPATH BUNDLE BUNDLE_EXTENSION CACHE_VARIABLES CLEAN_NO_CUSTOM CMAKE_CONFIGURE_DEPENDS CMAKE_CXX_KNOWN_FEATURES CMAKE_C_KNOWN_FEATURES COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN COMPATIBLE_INTERFACE_STRING COMPILE_DEFINITIONS COMPILE_DEFINITIONS_DEBUG COMPILE_DEFINITIONS_RELEASE COMPILE_FEATURES COMPILE_FLAGS COMPILE_OPTIONS COMPILE_PDB_NAME COMPILE_PDB_NAME_DEBUG COMPILE_PDB_NAME_RELEASE COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG COMPILE_PDB_OUTPUT_DIRECTORY_RELEASE COST CPACK_DESKTOP_SHORTCUTS CPACK_NEVER_OVERWRITE CPACK_PERMANENT CPACK_STARTUP_SHORTCUTS CPACK_START_MENU_SHORTCUTS CPACK_WIX_ACL CROSSCOMPILING_EMULATOR CXX_EXTENSIONS CXX_CPPLINT CXX_STANDARD CXX_STANDARD_REQUIRED C_EXTENSIONS C_CPPLINT C_STANDARD C_STANDARD_REQUIRED DEBUG_CONFIGURATIONS DEBUG_POSTFIX DEFINE_SYMBOL DEFINITIONS DEPENDS DISABLED_FEATURES ECLIPSE_EXTRA_NATURES ENABLED_FEATURES ENABLED_LANGUAGES ENABLE_EXPORTS ENVIRONMENT EXCLUDE_FROM_ALL EXCLUDE_FROM_DEFAULT_BUILD EXCLUDE_FROM_DEFAULT_BUILD_DEBUG EXCLUDE_FROM_DEFAULT_BUILD_RELEASE EXPORT_NAME EXTERNAL_OBJECT EchoString FAIL_REGULAR_EXPRESSION FIND_LIBRARY_USE_LIB64_PATHS FIND_LIBRARY_USE_OPENBSD_VERSIONING FOLDER FRAMEWORK FRAMEWORK_VERSION Fortran_FORMAT Fortran_MODULE_DIRECTORY GENERATED GENERATOR_FILE_NAME GLOBAL_DEPENDS_DEBUG_MODE GLOBAL_DEPENDS_NO_CYCLES GNUtoMS HAS_CXX HEADER_FILE_ONLY HELPSTRING IMPLICIT_DEPENDS_INCLUDE_TRANSFORM IMPORTED IMPORTED_CONFIGURATIONS IMPORTED_IMPLIB IMPORTED_IMPLIB_DEBUG IMPORTED_IMPLIB_RELEASE IMPORTED_LINK_DEPENDENT_LIBRARIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUG IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_LANGUAGES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE IMPORTED_LINK_INTERFACE_LIBRARIES IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_MULTIPLICITY IMPORTED_LINK_INTERFACE_MULTIPLICITY_DEBUG IMPORTED_LINK_INTERFACE_MULTIPLICITY_RELEASE IMPORTED_LOCATION IMPORTED_LOCATION_DEBUG IMPORTED_LOCATION_RELEASE IMPORTED_NO_SONAME IMPORTED_NO_SONAME_DEBUG IMPORTED_NO_SONAME_RELEASE IMPORTED_SONAME IMPORTED_SONAME_DEBUG IMPORTED_SONAME_RELEASE IMPORT_PREFIX IMPORT_SUFFIX INCLUDE_DIRECTORIES INCLUDE_REGULAR_EXPRESSION INSTALL_NAME_DIR INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH INTERFACE_AUTOUIC_OPTIONS INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS INTERFACE_INCLUDE_DIRECTORIES INTERFACE_LINK_LIBRARIES INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SOURCES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES INTERPROCEDURAL_OPTIMIZATION INTERPROCEDURAL_OPTIMIZATION_DEBUG INTERPROCEDURAL_OPTIMIZATION_RELEASE IN_TRY_COMPILE JOB_POOLS JOB_POOL_COMPILE JOB_POOL_LINK KEEP_EXTENSION LABELS LANGUAGE LIBRARY_OUTPUT_DIRECTORY LIBRARY_OUTPUT_DIRECTORY_DEBUG LIBRARY_OUTPUT_DIRECTORY_RELEASE LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_DEBUG LIBRARY_OUTPUT_NAME_RELEASE LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED LINK_DIRECTORIES LINK_FLAGS LINK_FLAGS_DEBUG LINK_FLAGS_RELEASE LINK_INTERFACE_LIBRARIES LINK_INTERFACE_LIBRARIES_DEBUG LINK_INTERFACE_LIBRARIES_RELEASE LINK_INTERFACE_MULTIPLICITY LINK_INTERFACE_MULTIPLICITY_DEBUG LINK_INTERFACE_MULTIPLICITY_RELEASE LINK_LIBRARIES LINK_SEARCH_END_STATIC LINK_SEARCH_START_STATIC LISTFILE_STACK LOCATION LOCATION_DEBUG LOCATION_RELEASE MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_PACKAGE_LOCATION MACOSX_RPATH MACROS MAP_IMPORTED_CONFIG_DEBUG MAP_IMPORTED_CONFIG_RELEASE MEASUREMENT MODIFIED NAME NO_SONAME NO_SYSTEM_FROM_IMPORTED OBJECT_DEPENDS OBJECT_OUTPUTS OSX_ARCHITECTURES OSX_ARCHITECTURES_DEBUG OSX_ARCHITECTURES_RELEASE OUTPUT_NAME OUTPUT_NAME_DEBUG OUTPUT_NAME_RELEASE PACKAGES_FOUND PACKAGES_NOT_FOUND PARENT_DIRECTORY PASS_REGULAR_EXPRESSION PDB_NAME PDB_NAME_DEBUG PDB_NAME_RELEASE PDB_OUTPUT_DIRECTORY PDB_OUTPUT_DIRECTORY_DEBUG PDB_OUTPUT_DIRECTORY_RELEASE POSITION_INDEPENDENT_CODE POST_INSTALL_SCRIPT PREDEFINED_TARGETS_FOLDER PREFIX PRE_INSTALL_SCRIPT PRIVATE_HEADER PROCESSORS PROJECT_LABEL PUBLIC_HEADER REPORT_UNDEFINED_PROPERTIES REQUIRED_FILES RESOURCE RESOURCE_LOCK RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK RULE_MESSAGES RUNTIME_OUTPUT_DIRECTORY RUNTIME_OUTPUT_DIRECTORY_DEBUG RUNTIME_OUTPUT_DIRECTORY_RELEASE RUNTIME_OUTPUT_NAME RUNTIME_OUTPUT_NAME_DEBUG RUNTIME_OUTPUT_NAME_RELEASE RUN_SERIAL SKIP_BUILD_RPATH SKIP_RETURN_CODE SOURCES SOURCE_DIR SOVERSION STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_DEBUG STATIC_LIBRARY_FLAGS_RELEASE STRINGS SUFFIX SYMBOLIC TARGET_ARCHIVES_MAY_BE_SHARED_LIBS TARGET_MESSAGES TARGET_SUPPORTS_SHARED_LIBS TEST_INCLUDE_FILE TIMEOUT TYPE USE_FOLDERS VALUE VARIABLES VERSION VISIBILITY_INLINES_HIDDEN VS_DEPLOYMENT_CONTENT VS_DEPLOYMENT_LOCATION VS_DESKTOP_EXTENSIONS_VERSION VS_DOTNET_REFERENCES VS_DOTNET_TARGET_FRAMEWORK_VERSION VS_GLOBAL_KEYWORD VS_GLOBAL_PROJECT_TYPES VS_GLOBAL_ROOTNAMESPACE VS_IOT_EXTENSIONS_VERSION VS_IOT_STARTUP_TASK VS_KEYWORD VS_MOBILE_EXTENSIONS_VERSION VS_SCC_AUXPATH VS_SCC_LOCALPATH VS_SCC_PROJECTNAME VS_SCC_PROVIDER VS_SHADER_ENTRYPOINT VS_SHADER_FLAGS VS_SHADER_MODEL VS_SHADER_TYPE VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES VS_XAML_TYPE WILL_FAIL WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS WORKING_DIRECTORY WRAP_EXCLUDE XCODE_EXPLICIT_FILE_TYPE XCODE_LAST_KNOWN_FILE_TYPE XCTEST
             \ contained
 
 syn keyword cmakeVariable
-            \ <PROJECT-NAME>_BINARY_DIR <PROJECT-NAME>_SOURCE_DIR <PROJECT-NAME>_VERSION <PROJECT-NAME>_VERSION_MAJOR <PROJECT-NAME>_VERSION_MINOR <PROJECT-NAME>_VERSION_PATCH <PROJECT-NAME>_VERSION_TWEAK APPLE BORLAND BUILD_SHARED_LIBS CMAKE_<CONFIG>_POSTFIX CMAKE_<LANG>_ARCHIVE_APPEND CMAKE_<LANG>_ARCHIVE_CREATE CMAKE_<LANG>_ARCHIVE_FINISH CMAKE_<LANG>_COMPILER CMAKE_<LANG>_COMPILER_ABI CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN CMAKE_<LANG>_COMPILER_ID CMAKE_<LANG>_COMPILER_LAUNCHER CMAKE_<LANG>_COMPILER_LOADED CMAKE_<LANG>_COMPILER_TARGET CMAKE_<LANG>_COMPILER_VERSION CMAKE_<LANG>_COMPILE_OBJECT CMAKE_<LANG>_CREATE_SHARED_LIBRARY CMAKE_<LANG>_CREATE_SHARED_MODULE CMAKE_<LANG>_CREATE_STATIC_LIBRARY CMAKE_<LANG>_FLAGS CMAKE_<LANG>_FLAGS_DEBUG CMAKE_<LANG>_FLAGS_MINSIZEREL CMAKE_<LANG>_FLAGS_RELEASE CMAKE_<LANG>_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_GHS_KERNEL_FLAGS_DEBUG CMAKE_<LANG>_GHS_KERNEL_FLAGS_MINSIZEREL CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELEASE CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_IGNORE_EXTENSIONS CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_LIBRARIES CMAKE_<LANG>_INCLUDE_WHAT_YOU_USE CMAKE_<LANG>_LIBRARY_ARCHITECTURE CMAKE_<LANG>_LINKER_PREFERENCE CMAKE_<LANG>_LINKER_PREFERENCE_PROPAGATES CMAKE_<LANG>_LINK_EXECUTABLE CMAKE_<LANG>_OUTPUT_EXTENSION CMAKE_<LANG>_PLATFORM_ID CMAKE_<LANG>_SIMULATE_ID CMAKE_<LANG>_SIMULATE_VERSION CMAKE_<LANG>_SIZEOF_DATA_PTR CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS CMAKE_<LANG>_VISIBILITY_PRESET CMAKE_ABSOLUTE_DESTINATION_FILES CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS CMAKE_ANDROID_API CMAKE_ANDROID_API_MIN CMAKE_ANDROID_ARCH CMAKE_ANDROID_ASSETS_DIRECTORIES CMAKE_ANDROID_GUI CMAKE_ANDROID_JAR_DEPENDENCIES CMAKE_ANDROID_JAR_DIRECTORIES CMAKE_ANDROID_JAVA_SOURCE_DIR CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES CMAKE_ANDROID_PROCESS_MAX CMAKE_ANDROID_PROGUARD CMAKE_ANDROID_PROGUARD_CONFIG_PATH CMAKE_ANDROID_SECURE_PROPS_PATH CMAKE_ANDROID_SKIP_ANT_STEP CMAKE_ANDROID_STL_TYPE CMAKE_APPBUNDLE_PATH CMAKE_AR CMAKE_ARCHIVE_OUTPUT_DIRECTORY CMAKE_ARCHIVE_OUTPUT_DIRECTORY_<CONFIG> CMAKE_ARGC CMAKE_ARGV0 CMAKE_AUTOMOC CMAKE_AUTOMOC_MOC_OPTIONS CMAKE_AUTOMOC_RELAXED_MODE CMAKE_AUTORCC CMAKE_AUTORCC_OPTIONS CMAKE_AUTOUIC CMAKE_AUTOUIC_OPTIONS CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BINARY_DIR CMAKE_BUILD_TOOL CMAKE_BUILD_TYPE CMAKE_BUILD_WITH_INSTALL_RPATH CMAKE_CACHEFILE_DIR CMAKE_CACHE_MAJOR_VERSION CMAKE_CACHE_MINOR_VERSION CMAKE_CACHE_PATCH_VERSION CMAKE_CFG_INTDIR CMAKE_CL_64 CMAKE_COLOR_MAKEFILE CMAKE_COMMAND CMAKE_COMPILER_2005 CMAKE_COMPILER_IS_GNU<LANG> CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_CONFIGURATION_TYPES CMAKE_CROSSCOMPILING CMAKE_CROSSCOMPILING_EMULATOR CMAKE_CTEST_COMMAND CMAKE_CURRENT_BINARY_DIR CMAKE_CURRENT_LIST_DIR CMAKE_CURRENT_LIST_FILE CMAKE_CURRENT_LIST_LINE CMAKE_CURRENT_SOURCE_DIR CMAKE_CXX_COMPILE_FEATURES CMAKE_CXX_EXTENSIONS CMAKE_CXX_STANDARD CMAKE_CXX_STANDARD_REQUIRED CMAKE_C_COMPILE_FEATURES CMAKE_C_EXTENSIONS CMAKE_C_STANDARD CMAKE_C_STANDARD_REQUIRED CMAKE_DEBUG_POSTFIX CMAKE_DEBUG_TARGET_PROPERTIES CMAKE_DISABLE_FIND_PACKAGE_<PackageName> CMAKE_DL_LIBS CMAKE_EDIT_COMMAND CMAKE_ENABLE_EXPORTS CMAKE_ERROR_DEPRECATED CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_EXECUTABLE_SUFFIX CMAKE_EXE_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS_<CONFIG> CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_NO_PACKAGE_REGISTRY CMAKE_EXTRA_GENERATOR CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES CMAKE_FIND_APPBUNDLE CMAKE_FIND_FRAMEWORK CMAKE_FIND_LIBRARY_PREFIXES CMAKE_FIND_LIBRARY_SUFFIXES CMAKE_FIND_NO_INSTALL_PREFIX CMAKE_FIND_PACKAGE_NAME CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_WARN_NO_MODULE CMAKE_FIND_ROOT_PATH CMAKE_FIND_ROOT_PATH_MODE_INCLUDE CMAKE_FIND_ROOT_PATH_MODE_LIBRARY CMAKE_FIND_ROOT_PATH_MODE_PACKAGE CMAKE_FIND_ROOT_PATH_MODE_PROGRAM CMAKE_FRAMEWORK_PATH CMAKE_Fortran_FORMAT CMAKE_Fortran_MODDIR_DEFAULT CMAKE_Fortran_MODDIR_FLAG CMAKE_Fortran_MODOUT_FLAG CMAKE_Fortran_MODULE_DIRECTORY CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET CMAKE_GNUtoMS CMAKE_HOME_DIRECTORY CMAKE_HOST_APPLE CMAKE_HOST_SYSTEM CMAKE_HOST_SYSTEM_NAME CMAKE_HOST_SYSTEM_PROCESSOR CMAKE_HOST_SYSTEM_VERSION CMAKE_HOST_UNIX CMAKE_HOST_WIN32 CMAKE_IGNORE_PATH CMAKE_IMPORT_LIBRARY_PREFIX CMAKE_IMPORT_LIBRARY_SUFFIX CMAKE_INCLUDE_CURRENT_DIR CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE CMAKE_INCLUDE_DIRECTORIES_BEFORE CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE CMAKE_INCLUDE_PATH CMAKE_INSTALL_DEFAULT_COMPONENT_NAME CMAKE_INSTALL_MESSAGE CMAKE_INSTALL_NAME_DIR CMAKE_INSTALL_PREFIX CMAKE_INSTALL_RPATH CMAKE_INSTALL_RPATH_USE_LINK_PATH CMAKE_INTERNAL_PLATFORM_ABI CMAKE_IOS_INSTALL_COMBINED CMAKE_JOB_POOL_COMPILE CMAKE_JOB_POOL_LINK CMAKE_LIBRARY_ARCHITECTURE CMAKE_LIBRARY_ARCHITECTURE_REGEX CMAKE_LIBRARY_OUTPUT_DIRECTORY CMAKE_LIBRARY_OUTPUT_DIRECTORY_<CONFIG> CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_FLAG CMAKE_LINK_DEF_FILE_FLAG CMAKE_LINK_DEPENDS_NO_SHARED CMAKE_LINK_INTERFACE_LIBRARIES CMAKE_LINK_LIBRARY_FILE_FLAG CMAKE_LINK_LIBRARY_FLAG CMAKE_LINK_LIBRARY_SUFFIX CMAKE_LINK_SEARCH_END_STATIC CMAKE_LINK_SEARCH_START_STATIC CMAKE_MACOSX_BUNDLE CMAKE_MACOSX_RPATH CMAKE_MAJOR_VERSION CMAKE_MAKE_PROGRAM CMAKE_MAP_IMPORTED_CONFIG_<CONFIG> CMAKE_MATCH_COUNT CMAKE_MFC_FLAG CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_MINOR_VERSION CMAKE_MODULE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS_<CONFIG> CMAKE_MODULE_PATH CMAKE_NOT_USING_CONFIG_FLAGS CMAKE_NO_BUILTIN_CHRPATH CMAKE_NO_SYSTEM_FROM_IMPORTED CMAKE_OBJECT_PATH_MAX CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT CMAKE_PARENT_LIST_FILE CMAKE_PATCH_VERSION CMAKE_PDB_OUTPUT_DIRECTORY CMAKE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_POLICY_DEFAULT_CMP<NNNN> CMAKE_POLICY_WARNING_CMP<NNNN> CMAKE_POSITION_INDEPENDENT_CODE CMAKE_PREFIX_PATH CMAKE_PROGRAM_PATH CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE CMAKE_PROJECT_NAME CMAKE_RANLIB CMAKE_ROOT CMAKE_RUNTIME_OUTPUT_DIRECTORY CMAKE_RUNTIME_OUTPUT_DIRECTORY_<CONFIG> CMAKE_SCRIPT_MODE_FILE CMAKE_SHARED_LIBRARY_PREFIX CMAKE_SHARED_LIBRARY_SUFFIX CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS_<CONFIG> CMAKE_SHARED_MODULE_PREFIX CMAKE_SHARED_MODULE_SUFFIX CMAKE_SIZEOF_VOID_P CMAKE_SKIP_BUILD_RPATH CMAKE_SKIP_INSTALL_ALL_DEPENDENCY CMAKE_SKIP_INSTALL_RPATH CMAKE_SKIP_INSTALL_RULES CMAKE_SKIP_RPATH CMAKE_SOURCE_DIR CMAKE_STAGING_PREFIX CMAKE_STANDARD_LIBRARIES CMAKE_STATIC_LIBRARY_PREFIX CMAKE_STATIC_LIBRARY_SUFFIX CMAKE_STATIC_LINKER_FLAGS CMAKE_STATIC_LINKER_FLAGS_<CONFIG> CMAKE_SYSROOT CMAKE_SYSTEM CMAKE_SYSTEM_APPBUNDLE_PATH CMAKE_SYSTEM_FRAMEWORK_PATH CMAKE_SYSTEM_IGNORE_PATH CMAKE_SYSTEM_INCLUDE_PATH CMAKE_SYSTEM_LIBRARY_PATH CMAKE_SYSTEM_NAME CMAKE_SYSTEM_PREFIX_PATH CMAKE_SYSTEM_PROCESSOR CMAKE_SYSTEM_PROGRAM_PATH CMAKE_SYSTEM_VERSION CMAKE_TOOLCHAIN_FILE CMAKE_TRY_COMPILE_CONFIGURATION CMAKE_TWEAK_VERSION CMAKE_USER_MAKE_RULES_OVERRIDE CMAKE_USER_MAKE_RULES_OVERRIDE_<LANG> CMAKE_USE_RELATIVE_PATHS CMAKE_VERBOSE_MAKEFILE CMAKE_VERSION CMAKE_VISIBILITY_INLINES_HIDDEN CMAKE_VS_DEVENV_COMMAND CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD CMAKE_VS_INTEL_Fortran_PROJECT_VERSION CMAKE_VS_MSBUILD_COMMAND CMAKE_VS_MSDEV_COMMAND CMAKE_VS_NsightTegra_VERSION CMAKE_VS_PLATFORM_NAME CMAKE_VS_PLATFORM_TOOLSET CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION CMAKE_WARN_DEPRECATED CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_WIN32_EXECUTABLE CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS CMAKE_XCODE_ATTRIBUTE_<an-attribute> CMAKE_XCODE_PLATFORM_TOOLSET CPACK_ABSOLUTE_DESTINATION_FILES CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CPACK_INCLUDE_TOPLEVEL_DIRECTORY CPACK_INSTALL_SCRIPT CPACK_PACKAGING_INSTALL_PREFIX CPACK_SET_DESTDIR CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CTEST_BINARY_DIRECTORY CTEST_BUILD_COMMAND CTEST_BUILD_NAME CTEST_BZR_COMMAND CTEST_BZR_UPDATE_OPTIONS CTEST_CHANGE_ID CTEST_CHECKOUT_COMMAND CTEST_CONFIGURATION_TYPE CTEST_CONFIGURE_COMMAND CTEST_COVERAGE_COMMAND CTEST_COVERAGE_EXTRA_FLAGS CTEST_CURL_OPTIONS CTEST_CUSTOM_COVERAGE_EXCLUDE CTEST_CUSTOM_ERROR_EXCEPTION CTEST_CUSTOM_ERROR_MATCH CTEST_CUSTOM_ERROR_POST_CONTEXT CTEST_CUSTOM_ERROR_PRE_CONTEXT CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MEMCHECK_IGNORE CTEST_CUSTOM_POST_MEMCHECK CTEST_CUSTOM_POST_TEST CTEST_CUSTOM_PRE_MEMCHECK CTEST_CUSTOM_PRE_TEST CTEST_CUSTOM_TEST_IGNORE CTEST_CUSTOM_WARNING_EXCEPTION CTEST_CUSTOM_WARNING_MATCH CTEST_CVS_CHECKOUT CTEST_CVS_COMMAND CTEST_CVS_UPDATE_OPTIONS CTEST_DROP_LOCATION CTEST_DROP_METHOD CTEST_DROP_SITE CTEST_DROP_SITE_CDASH CTEST_DROP_SITE_PASSWORD CTEST_DROP_SITE_USER CTEST_EXTRA_COVERAGE_GLOB CTEST_GIT_COMMAND CTEST_GIT_UPDATE_CUSTOM CTEST_GIT_UPDATE_OPTIONS CTEST_HG_COMMAND CTEST_HG_UPDATE_OPTIONS CTEST_MEMORYCHECK_COMMAND CTEST_MEMORYCHECK_COMMAND_OPTIONS CTEST_MEMORYCHECK_SANITIZER_OPTIONS CTEST_MEMORYCHECK_SUPPRESSIONS_FILE CTEST_MEMORYCHECK_TYPE CTEST_NIGHTLY_START_TIME CTEST_P4_CLIENT CTEST_P4_COMMAND CTEST_P4_OPTIONS CTEST_P4_UPDATE_OPTIONS CTEST_SCP_COMMAND CTEST_SITE CTEST_SOURCE_DIRECTORY CTEST_SVN_COMMAND CTEST_SVN_OPTIONS CTEST_SVN_UPDATE_OPTIONS CTEST_TEST_LOAD CTEST_TEST_TIMEOUT CTEST_TRIGGER_SITE CTEST_UPDATE_COMMAND CTEST_UPDATE_OPTIONS CTEST_UPDATE_VERSION_ONLY CTEST_USE_LAUNCHERS CYGWIN ENV EXECUTABLE_OUTPUT_PATH GHS-MULTI LIBRARY_OUTPUT_PATH MINGW MSVC MSVC10 MSVC11 MSVC12 MSVC14 MSVC60 MSVC70 MSVC71 MSVC80 MSVC90 MSVC_IDE MSVC_VERSION PROJECT_BINARY_DIR PROJECT_NAME PROJECT_SOURCE_DIR PROJECT_VERSION PROJECT_VERSION_MAJOR PROJECT_VERSION_MINOR PROJECT_VERSION_PATCH PROJECT_VERSION_TWEAK UNIX WIN32 WINCE WINDOWS_PHONE WINDOWS_STORE XCODE_VERSION
+            \ <PROJECT-NAME>_BINARY_DIR <PROJECT-NAME>_SOURCE_DIR <PROJECT-NAME>_VERSION <PROJECT-NAME>_VERSION_MAJOR <PROJECT-NAME>_VERSION_MINOR <PROJECT-NAME>_VERSION_PATCH <PROJECT-NAME>_VERSION_TWEAK APPLE BORLAND BUILD_SHARED_LIBS CMAKE_<CONFIG>_POSTFIX CMAKE_<LANG>_ARCHIVE_APPEND CMAKE_<LANG>_ARCHIVE_CREATE CMAKE_<LANG>_ARCHIVE_FINISH CMAKE_<LANG>_COMPILER CMAKE_<LANG>_COMPILER_ABI CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN CMAKE_<LANG>_COMPILER_ID CMAKE_<LANG>_COMPILER_LAUNCHER CMAKE_<LANG>_COMPILER_LOADED CMAKE_<LANG>_COMPILER_TARGET CMAKE_<LANG>_COMPILER_VERSION CMAKE_<LANG>_COMPILE_OBJECT CMAKE_<LANG>_CREATE_SHARED_LIBRARY CMAKE_<LANG>_CREATE_SHARED_MODULE CMAKE_<LANG>_CREATE_STATIC_LIBRARY CMAKE_<LANG>_FLAGS CMAKE_<LANG>_FLAGS_DEBUG CMAKE_<LANG>_FLAGS_MINSIZEREL CMAKE_<LANG>_FLAGS_RELEASE CMAKE_<LANG>_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_GHS_KERNEL_FLAGS_DEBUG CMAKE_<LANG>_GHS_KERNEL_FLAGS_MINSIZEREL CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELEASE CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_IGNORE_EXTENSIONS CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_LIBRARIES CMAKE_<LANG>_INCLUDE_WHAT_YOU_USE CMAKE_<LANG>_CPPLINT CMAKE_<LANG>_LIBRARY_ARCHITECTURE CMAKE_<LANG>_LINKER_PREFERENCE CMAKE_<LANG>_LINKER_PREFERENCE_PROPAGATES CMAKE_<LANG>_LINK_EXECUTABLE CMAKE_<LANG>_OUTPUT_EXTENSION CMAKE_<LANG>_PLATFORM_ID CMAKE_<LANG>_SIMULATE_ID CMAKE_<LANG>_SIMULATE_VERSION CMAKE_<LANG>_SIZEOF_DATA_PTR CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS CMAKE_<LANG>_VISIBILITY_PRESET CMAKE_ABSOLUTE_DESTINATION_FILES CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS CMAKE_ANDROID_API CMAKE_ANDROID_API_MIN CMAKE_ANDROID_ARCH CMAKE_ANDROID_ASSETS_DIRECTORIES CMAKE_ANDROID_GUI CMAKE_ANDROID_JAR_DEPENDENCIES CMAKE_ANDROID_JAR_DIRECTORIES CMAKE_ANDROID_JAVA_SOURCE_DIR CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES CMAKE_ANDROID_PROCESS_MAX CMAKE_ANDROID_PROGUARD CMAKE_ANDROID_PROGUARD_CONFIG_PATH CMAKE_ANDROID_SECURE_PROPS_PATH CMAKE_ANDROID_SKIP_ANT_STEP CMAKE_ANDROID_STL_TYPE CMAKE_APPBUNDLE_PATH CMAKE_AR CMAKE_ARCHIVE_OUTPUT_DIRECTORY CMAKE_ARCHIVE_OUTPUT_DIRECTORY_<CONFIG> CMAKE_ARGC CMAKE_ARGV0 CMAKE_AUTOMOC CMAKE_AUTOMOC_MOC_OPTIONS CMAKE_AUTOMOC_RELAXED_MODE CMAKE_AUTORCC CMAKE_AUTORCC_OPTIONS CMAKE_AUTOUIC CMAKE_AUTOUIC_OPTIONS CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BINARY_DIR CMAKE_BUILD_TOOL CMAKE_BUILD_TYPE CMAKE_BUILD_WITH_INSTALL_RPATH CMAKE_CACHEFILE_DIR CMAKE_CACHE_MAJOR_VERSION CMAKE_CACHE_MINOR_VERSION CMAKE_CACHE_PATCH_VERSION CMAKE_CFG_INTDIR CMAKE_CL_64 CMAKE_COLOR_MAKEFILE CMAKE_COMMAND CMAKE_COMPILER_2005 CMAKE_COMPILER_IS_GNU<LANG> CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_CONFIGURATION_TYPES CMAKE_CROSSCOMPILING CMAKE_CROSSCOMPILING_EMULATOR CMAKE_CTEST_COMMAND CMAKE_CURRENT_BINARY_DIR CMAKE_CURRENT_LIST_DIR CMAKE_CURRENT_LIST_FILE CMAKE_CURRENT_LIST_LINE CMAKE_CURRENT_SOURCE_DIR CMAKE_CXX_COMPILE_FEATURES CMAKE_CXX_EXTENSIONS CMAKE_CXX_STANDARD CMAKE_CXX_STANDARD_REQUIRED CMAKE_C_COMPILE_FEATURES CMAKE_C_EXTENSIONS CMAKE_C_STANDARD CMAKE_C_STANDARD_REQUIRED CMAKE_DEBUG_POSTFIX CMAKE_DEBUG_TARGET_PROPERTIES CMAKE_DISABLE_FIND_PACKAGE_<PackageName> CMAKE_DL_LIBS CMAKE_EDIT_COMMAND CMAKE_ENABLE_EXPORTS CMAKE_ERROR_DEPRECATED CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_EXECUTABLE_SUFFIX CMAKE_EXE_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS_<CONFIG> CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_NO_PACKAGE_REGISTRY CMAKE_EXTRA_GENERATOR CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES CMAKE_FIND_APPBUNDLE CMAKE_FIND_FRAMEWORK CMAKE_FIND_LIBRARY_PREFIXES CMAKE_FIND_LIBRARY_SUFFIXES CMAKE_FIND_NO_INSTALL_PREFIX CMAKE_FIND_PACKAGE_NAME CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_WARN_NO_MODULE CMAKE_FIND_ROOT_PATH CMAKE_FIND_ROOT_PATH_MODE_INCLUDE CMAKE_FIND_ROOT_PATH_MODE_LIBRARY CMAKE_FIND_ROOT_PATH_MODE_PACKAGE CMAKE_FIND_ROOT_PATH_MODE_PROGRAM CMAKE_FRAMEWORK_PATH CMAKE_Fortran_FORMAT CMAKE_Fortran_MODDIR_DEFAULT CMAKE_Fortran_MODDIR_FLAG CMAKE_Fortran_MODOUT_FLAG CMAKE_Fortran_MODULE_DIRECTORY CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET CMAKE_GNUtoMS CMAKE_HOME_DIRECTORY CMAKE_HOST_APPLE CMAKE_HOST_SYSTEM CMAKE_HOST_SYSTEM_NAME CMAKE_HOST_SYSTEM_PROCESSOR CMAKE_HOST_SYSTEM_VERSION CMAKE_HOST_UNIX CMAKE_HOST_WIN32 CMAKE_IGNORE_PATH CMAKE_IMPORT_LIBRARY_PREFIX CMAKE_IMPORT_LIBRARY_SUFFIX CMAKE_INCLUDE_CURRENT_DIR CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE CMAKE_INCLUDE_DIRECTORIES_BEFORE CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE CMAKE_INCLUDE_PATH CMAKE_INSTALL_DEFAULT_COMPONENT_NAME CMAKE_INSTALL_MESSAGE CMAKE_INSTALL_NAME_DIR CMAKE_INSTALL_PREFIX CMAKE_INSTALL_RPATH CMAKE_INSTALL_RPATH_USE_LINK_PATH CMAKE_INTERNAL_PLATFORM_ABI CMAKE_IOS_INSTALL_COMBINED CMAKE_JOB_POOL_COMPILE CMAKE_JOB_POOL_LINK CMAKE_LIBRARY_ARCHITECTURE CMAKE_LIBRARY_ARCHITECTURE_REGEX CMAKE_LIBRARY_OUTPUT_DIRECTORY CMAKE_LIBRARY_OUTPUT_DIRECTORY_<CONFIG> CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_FLAG CMAKE_LINK_DEF_FILE_FLAG CMAKE_LINK_DEPENDS_NO_SHARED CMAKE_LINK_INTERFACE_LIBRARIES CMAKE_LINK_LIBRARY_FILE_FLAG CMAKE_LINK_LIBRARY_FLAG CMAKE_LINK_LIBRARY_SUFFIX CMAKE_LINK_SEARCH_END_STATIC CMAKE_LINK_SEARCH_START_STATIC CMAKE_MACOSX_BUNDLE CMAKE_MACOSX_RPATH CMAKE_MAJOR_VERSION CMAKE_MAKE_PROGRAM CMAKE_MAP_IMPORTED_CONFIG_<CONFIG> CMAKE_MATCH_COUNT CMAKE_MFC_FLAG CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_MINOR_VERSION CMAKE_MODULE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS_<CONFIG> CMAKE_MODULE_PATH CMAKE_NOT_USING_CONFIG_FLAGS CMAKE_NO_BUILTIN_CHRPATH CMAKE_NO_SYSTEM_FROM_IMPORTED CMAKE_OBJECT_PATH_MAX CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT CMAKE_PARENT_LIST_FILE CMAKE_PATCH_VERSION CMAKE_PDB_OUTPUT_DIRECTORY CMAKE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_POLICY_DEFAULT_CMP<NNNN> CMAKE_POLICY_WARNING_CMP<NNNN> CMAKE_POSITION_INDEPENDENT_CODE CMAKE_PREFIX_PATH CMAKE_PROGRAM_PATH CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE CMAKE_PROJECT_NAME CMAKE_RANLIB CMAKE_ROOT CMAKE_RUNTIME_OUTPUT_DIRECTORY CMAKE_RUNTIME_OUTPUT_DIRECTORY_<CONFIG> CMAKE_SCRIPT_MODE_FILE CMAKE_SHARED_LIBRARY_PREFIX CMAKE_SHARED_LIBRARY_SUFFIX CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS_<CONFIG> CMAKE_SHARED_MODULE_PREFIX CMAKE_SHARED_MODULE_SUFFIX CMAKE_SIZEOF_VOID_P CMAKE_SKIP_BUILD_RPATH CMAKE_SKIP_INSTALL_ALL_DEPENDENCY CMAKE_SKIP_INSTALL_RPATH CMAKE_SKIP_INSTALL_RULES CMAKE_SKIP_RPATH CMAKE_SOURCE_DIR CMAKE_STAGING_PREFIX CMAKE_STANDARD_LIBRARIES CMAKE_STATIC_LIBRARY_PREFIX CMAKE_STATIC_LIBRARY_SUFFIX CMAKE_STATIC_LINKER_FLAGS CMAKE_STATIC_LINKER_FLAGS_<CONFIG> CMAKE_SYSROOT CMAKE_SYSTEM CMAKE_SYSTEM_APPBUNDLE_PATH CMAKE_SYSTEM_FRAMEWORK_PATH CMAKE_SYSTEM_IGNORE_PATH CMAKE_SYSTEM_INCLUDE_PATH CMAKE_SYSTEM_LIBRARY_PATH CMAKE_SYSTEM_NAME CMAKE_SYSTEM_PREFIX_PATH CMAKE_SYSTEM_PROCESSOR CMAKE_SYSTEM_PROGRAM_PATH CMAKE_SYSTEM_VERSION CMAKE_TOOLCHAIN_FILE CMAKE_TRY_COMPILE_CONFIGURATION CMAKE_TWEAK_VERSION CMAKE_USER_MAKE_RULES_OVERRIDE CMAKE_USER_MAKE_RULES_OVERRIDE_<LANG> CMAKE_USE_RELATIVE_PATHS CMAKE_VERBOSE_MAKEFILE CMAKE_VERSION CMAKE_VISIBILITY_INLINES_HIDDEN CMAKE_VS_DEVENV_COMMAND CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD CMAKE_VS_INTEL_Fortran_PROJECT_VERSION CMAKE_VS_MSBUILD_COMMAND CMAKE_VS_MSDEV_COMMAND CMAKE_VS_NsightTegra_VERSION CMAKE_VS_PLATFORM_NAME CMAKE_VS_PLATFORM_TOOLSET CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION CMAKE_WARN_DEPRECATED CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_WIN32_EXECUTABLE CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS CMAKE_XCODE_ATTRIBUTE_<an-attribute> CMAKE_XCODE_PLATFORM_TOOLSET CPACK_ABSOLUTE_DESTINATION_FILES CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CPACK_INCLUDE_TOPLEVEL_DIRECTORY CPACK_INSTALL_SCRIPT CPACK_PACKAGING_INSTALL_PREFIX CPACK_SET_DESTDIR CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CTEST_BINARY_DIRECTORY CTEST_BUILD_COMMAND CTEST_BUILD_NAME CTEST_BZR_COMMAND CTEST_BZR_UPDATE_OPTIONS CTEST_CHANGE_ID CTEST_CHECKOUT_COMMAND CTEST_CONFIGURATION_TYPE CTEST_CONFIGURE_COMMAND CTEST_COVERAGE_COMMAND CTEST_COVERAGE_EXTRA_FLAGS CTEST_CURL_OPTIONS CTEST_CUSTOM_COVERAGE_EXCLUDE CTEST_CUSTOM_ERROR_EXCEPTION CTEST_CUSTOM_ERROR_MATCH CTEST_CUSTOM_ERROR_POST_CONTEXT CTEST_CUSTOM_ERROR_PRE_CONTEXT CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MEMCHECK_IGNORE CTEST_CUSTOM_POST_MEMCHECK CTEST_CUSTOM_POST_TEST CTEST_CUSTOM_PRE_MEMCHECK CTEST_CUSTOM_PRE_TEST CTEST_CUSTOM_TEST_IGNORE CTEST_CUSTOM_WARNING_EXCEPTION CTEST_CUSTOM_WARNING_MATCH CTEST_CVS_CHECKOUT CTEST_CVS_COMMAND CTEST_CVS_UPDATE_OPTIONS CTEST_DROP_LOCATION CTEST_DROP_METHOD CTEST_DROP_SITE CTEST_DROP_SITE_CDASH CTEST_DROP_SITE_PASSWORD CTEST_DROP_SITE_USER CTEST_EXTRA_COVERAGE_GLOB CTEST_GIT_COMMAND CTEST_GIT_UPDATE_CUSTOM CTEST_GIT_UPDATE_OPTIONS CTEST_HG_COMMAND CTEST_HG_UPDATE_OPTIONS CTEST_MEMORYCHECK_COMMAND CTEST_MEMORYCHECK_COMMAND_OPTIONS CTEST_MEMORYCHECK_SANITIZER_OPTIONS CTEST_MEMORYCHECK_SUPPRESSIONS_FILE CTEST_MEMORYCHECK_TYPE CTEST_NIGHTLY_START_TIME CTEST_P4_CLIENT CTEST_P4_COMMAND CTEST_P4_OPTIONS CTEST_P4_UPDATE_OPTIONS CTEST_SCP_COMMAND CTEST_SITE CTEST_SOURCE_DIRECTORY CTEST_SVN_COMMAND CTEST_SVN_OPTIONS CTEST_SVN_UPDATE_OPTIONS CTEST_TEST_LOAD CTEST_TEST_TIMEOUT CTEST_TRIGGER_SITE CTEST_UPDATE_COMMAND CTEST_UPDATE_OPTIONS CTEST_UPDATE_VERSION_ONLY CTEST_USE_LAUNCHERS CYGWIN ENV EXECUTABLE_OUTPUT_PATH GHS-MULTI LIBRARY_OUTPUT_PATH MINGW MSVC MSVC10 MSVC11 MSVC12 MSVC14 MSVC60 MSVC70 MSVC71 MSVC80 MSVC90 MSVC_IDE MSVC_VERSION PROJECT_BINARY_DIR PROJECT_NAME PROJECT_SOURCE_DIR PROJECT_VERSION PROJECT_VERSION_MAJOR PROJECT_VERSION_MINOR PROJECT_VERSION_PATCH PROJECT_VERSION_TWEAK UNIX WIN32 WINCE WINDOWS_PHONE WINDOWS_STORE XCODE_VERSION
             \ contained
 
 syn keyword cmakeModule
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 864d1dc..ae443a7 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -211,6 +211,7 @@ Properties on Targets
    /prop_tgt/LABELS
    /prop_tgt/LANG_CLANG_TIDY
    /prop_tgt/LANG_COMPILER_LAUNCHER
+   /prop_tgt/LANG_CPPLINT
    /prop_tgt/LANG_INCLUDE_WHAT_YOU_USE
    /prop_tgt/LANG_VISIBILITY_PRESET
    /prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 99b5eae..95f780a 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -284,6 +284,7 @@ Variables that Control the Build
    /variable/CMAKE_IOS_INSTALL_COMBINED
    /variable/CMAKE_LANG_CLANG_TIDY
    /variable/CMAKE_LANG_COMPILER_LAUNCHER
+   /variable/CMAKE_LANG_CPPLINT
    /variable/CMAKE_LANG_INCLUDE_WHAT_YOU_USE
    /variable/CMAKE_LANG_VISIBILITY_PRESET
    /variable/CMAKE_LIBRARY_OUTPUT_DIRECTORY
diff --git a/Help/prop_tgt/LANG_CPPLINT.rst b/Help/prop_tgt/LANG_CPPLINT.rst
new file mode 100644
index 0000000..14f47d4
--- /dev/null
+++ b/Help/prop_tgt/LANG_CPPLINT.rst
@@ -0,0 +1,13 @@
+<LANG>_CPPLINT
+--------------
+
+This property is supported only when ``<LANG>`` is ``C`` or ``CXX``.
+
+Specify a :ref:`;-list <CMake Language Lists>` containing a command line
+for the ``cpplint`` style checker.  The :ref:`Makefile Generators` and the
+:generator:`Ninja` generator will run ``cpplint`` along with the compiler
+and report any problems.
+
+This property is initialized by the value of the
+:variable:`CMAKE_<LANG>_CPPLINT` variable if it is set when a target is
+created.
diff --git a/Help/release/dev/add-LANG_CPPLINT.rst b/Help/release/dev/add-LANG_CPPLINT.rst
new file mode 100644
index 0000000..a0539cf
--- /dev/null
+++ b/Help/release/dev/add-LANG_CPPLINT.rst
@@ -0,0 +1,8 @@
+add-LANG_CPPLINT
+----------------
+
+* A :prop_tgt:`<LANG>_CPPLINT` target property and supporting
+  :variable:`CMAKE_<LANG>_CPPLINT` variable were introduced to tell
+  the :ref:`Makefile Generators` and the :generator:`Ninja` generator to
+  run the ``cpplint`` style checker along with the compiler for ``C`` and
+  ``CXX`` languages.
diff --git a/Help/variable/CMAKE_LANG_CPPLINT.rst b/Help/variable/CMAKE_LANG_CPPLINT.rst
new file mode 100644
index 0000000..3b6f452
--- /dev/null
+++ b/Help/variable/CMAKE_LANG_CPPLINT.rst
@@ -0,0 +1,6 @@
+CMAKE_<LANG>_CPPLINT
+--------------------
+
+Default value for :prop_tgt:`<LANG>_CPPLINT` target property. This variable
+is used to initialize the property on each target as it is created.  This
+is done only when ``<LANG>`` is ``C`` or ``CXX``.
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 379ae16..866c132 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -631,7 +631,9 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
       const char* iwyu = this->GeneratorTarget->GetProperty(iwyu_prop);
       std::string const tidy_prop = lang + "_CLANG_TIDY";
       const char* tidy = this->GeneratorTarget->GetProperty(tidy_prop);
-      if ((iwyu && *iwyu) || (tidy && *tidy)) {
+      std::string const cpplint_prop = lang + "_CPPLINT";
+      const char* cpplint = this->GeneratorTarget->GetProperty(cpplint_prop);
+      if ((iwyu && *iwyu) || (tidy && *tidy) || (cpplint && *cpplint)) {
         std::string run_iwyu = "$(CMAKE_COMMAND) -E __run_iwyu";
         if (iwyu && *iwyu) {
           run_iwyu += " --iwyu=";
@@ -640,6 +642,12 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
         if (tidy && *tidy) {
           run_iwyu += " --tidy=";
           run_iwyu += this->LocalGenerator->EscapeForShell(tidy);
+        }
+        if (cpplint && *cpplint) {
+          run_iwyu += " --cpplint=";
+          run_iwyu += this->LocalGenerator->EscapeForShell(cpplint);
+        }
+        if ((tidy && *tidy) || (cpplint && *cpplint)) {
           run_iwyu += " --source=";
           run_iwyu += sourceFile;
         }
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 8ad2efe..0b33b19 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -600,7 +600,9 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang)
     const char* iwyu = this->GeneratorTarget->GetProperty(iwyu_prop);
     std::string const tidy_prop = lang + "_CLANG_TIDY";
     const char* tidy = this->GeneratorTarget->GetProperty(tidy_prop);
-    if ((iwyu && *iwyu) || (tidy && *tidy)) {
+    std::string const cpplint_prop = lang + "_CPPLINT";
+    const char* cpplint = this->GeneratorTarget->GetProperty(cpplint_prop);
+    if ((iwyu && *iwyu) || (tidy && *tidy) || (cpplint && *cpplint)) {
       std::string run_iwyu = this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmOutputConverter::SHELL);
       run_iwyu += " -E __run_iwyu";
@@ -611,6 +613,12 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang)
       if (tidy && *tidy) {
         run_iwyu += " --tidy=";
         run_iwyu += this->GetLocalGenerator()->EscapeForShell(tidy);
+      }
+      if (cpplint && *cpplint) {
+        run_iwyu += " --cpplint=";
+        run_iwyu += this->GetLocalGenerator()->EscapeForShell(cpplint);
+      }
+      if ((tidy && *tidy) || (cpplint && *cpplint)) {
         run_iwyu += " --source=$in";
       }
       run_iwyu += " -- ";
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 9261ca8..2852f90 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -255,6 +255,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
     this->SetPropertyDefault("MACOSX_RPATH", CM_NULLPTR);
     this->SetPropertyDefault("C_CLANG_TIDY", CM_NULLPTR);
     this->SetPropertyDefault("C_COMPILER_LAUNCHER", CM_NULLPTR);
+    this->SetPropertyDefault("C_CPPLINT", CM_NULLPTR);
     this->SetPropertyDefault("C_INCLUDE_WHAT_YOU_USE", CM_NULLPTR);
     this->SetPropertyDefault("LINK_WHAT_YOU_USE", CM_NULLPTR);
     this->SetPropertyDefault("C_STANDARD", CM_NULLPTR);
@@ -262,6 +263,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
     this->SetPropertyDefault("C_EXTENSIONS", CM_NULLPTR);
     this->SetPropertyDefault("CXX_CLANG_TIDY", CM_NULLPTR);
     this->SetPropertyDefault("CXX_COMPILER_LAUNCHER", CM_NULLPTR);
+    this->SetPropertyDefault("CXX_CPPLINT", CM_NULLPTR);
     this->SetPropertyDefault("CXX_INCLUDE_WHAT_YOU_USE", CM_NULLPTR);
     this->SetPropertyDefault("CXX_STANDARD", CM_NULLPTR);
     this->SetPropertyDefault("CXX_STANDARD_REQUIRED", CM_NULLPTR);
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 5b12a75..823b38f 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -276,7 +276,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
     if (args[1] == "__run_iwyu") {
       if (args.size() < 3) {
         std::cerr << "__run_iwyu Usage: -E __run_iwyu [--iwyu=/path/iwyu]"
-                     " [--tidy=/path/tidy] -- compile command\n";
+                     " [--cpplint=/path/cpplint] [--tidy=/path/tidy]"
+                     " -- compile command\n";
         return 1;
       }
       bool doing_options = true;
@@ -285,6 +286,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
       std::string tidy;
       std::string sourceFile;
       std::string lwyu;
+      std::string cpplint;
       for (std::string::size_type cc = 2; cc < args.size(); cc++) {
         std::string const& arg = args[cc];
         if (arg == "--") {
@@ -297,6 +299,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
           sourceFile = arg.substr(9);
         } else if (doing_options && cmHasLiteralPrefix(arg, "--lwyu=")) {
           lwyu = arg.substr(7);
+        } else if (doing_options && cmHasLiteralPrefix(arg, "--cpplint=")) {
+          cpplint = arg.substr(10);
         } else if (doing_options) {
           std::cerr << "__run_iwyu given unknown argument: " << arg << "\n";
           return 1;
@@ -304,12 +308,14 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
           orig_cmd.push_back(arg);
         }
       }
-      if (tidy.empty() && iwyu.empty() && lwyu.empty()) {
-        std::cerr << "__run_iwyu missing --tidy= or --iwyu=\n";
+      if (tidy.empty() && iwyu.empty() && lwyu.empty() && cpplint.empty()) {
+        std::cerr << "__run_iwyu missing --cpplint=, --iwyu=, --lwyu=, and/or"
+                     " --tidy=\n";
         return 1;
       }
-      if (!tidy.empty() && sourceFile.empty()) {
-        std::cerr << "__run_iwyu --tidy= requires --source=\n";
+      if ((!cpplint.empty() || !tidy.empty()) && sourceFile.empty()) {
+        std::cerr << "__run_iwyu --cpplint= and/or __run_iwyu --tidy="
+                     " require --source=\n";
         return 1;
       }
       if (orig_cmd.empty() && lwyu.empty()) {
@@ -403,6 +409,32 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
           std::cerr << "Warning: " << stdOut;
         }
       }
+
+      if (!cpplint.empty()) {
+        // Construct the cpplint command line.
+        std::vector<std::string> cpplint_cmd;
+        cmSystemTools::ExpandListArgument(cpplint, cpplint_cmd, true);
+        cpplint_cmd.push_back(sourceFile);
+
+        // Run the cpplint command line.  Capture its output.
+        std::string stdOut;
+        if (!cmSystemTools::RunSingleCommand(cpplint_cmd, &stdOut, &stdOut,
+                                             &ret, CM_NULLPTR,
+                                             cmSystemTools::OUTPUT_NONE)) {
+          std::cerr << "Error running '" << cpplint_cmd[0] << "': " << stdOut
+                    << "\n";
+          return 1;
+        }
+
+        // Output the output from cpplint to stderr
+        std::cerr << stdOut;
+
+        // If cpplint exited with an error do the same.
+        if (ret != 0) {
+          return ret;
+        }
+      }
+
       ret = 0;
       // Now run the real compiler command and return its result value.
       if (lwyu.empty() &&
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d2465c4..d6d4c0c 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -340,8 +340,10 @@ if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
   endif()
   add_executable(pseudo_tidy pseudo_tidy.c)
   add_executable(pseudo_iwyu pseudo_iwyu.c)
+  add_executable(pseudo_cpplint pseudo_cpplint.c)
   add_RunCMake_test(ClangTidy -DPSEUDO_TIDY=$<TARGET_FILE:pseudo_tidy>)
   add_RunCMake_test(IncludeWhatYouUse -DPSEUDO_IWYU=$<TARGET_FILE:pseudo_iwyu>)
+  add_RunCMake_test(Cpplint -DPSEUDO_CPPLINT=$<TARGET_FILE:pseudo_cpplint>)
   add_RunCMake_test(CompilerLauncher)
 endif()
 
diff --git a/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt b/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt
index 0d0d899..35f50b7 100644
--- a/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt
+++ b/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt
@@ -1 +1 @@
-^__run_iwyu missing --tidy= or --iwyu=$
+^__run_iwyu missing --cpplint=, --iwyu=, --lwyu=, and/or --tidy=$
diff --git a/Tests/RunCMake/Cpplint/C-Build-stderr.txt b/Tests/RunCMake/Cpplint/C-Build-stderr.txt
new file mode 100644
index 0000000..3d68d40
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-Build-stderr.txt
@@ -0,0 +1,2 @@
+Done processing .*Tests[/\]RunCMake[/\]Cpplint[/\]main\.c
+Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/C-error-Build-result.txt b/Tests/RunCMake/Cpplint/C-error-Build-result.txt
new file mode 100644
index 0000000..d197c91
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error-Build-result.txt
@@ -0,0 +1 @@
+[^0]
diff --git a/Tests/RunCMake/Cpplint/C-error-Build-stderr.txt b/Tests/RunCMake/Cpplint/C-error-Build-stderr.txt
new file mode 100644
index 0000000..74c6a1e
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error-Build-stderr.txt
@@ -0,0 +1,2 @@
+Tests[/\]RunCMake[/\]Cpplint[/\]main\.c:0:  message  \[category/category\] \[0\]
+Total errors found: 1
diff --git a/Tests/RunCMake/Cpplint/C-error-launch-Build-result.txt b/Tests/RunCMake/Cpplint/C-error-launch-Build-result.txt
new file mode 100644
index 0000000..d197c91
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error-launch-Build-result.txt
@@ -0,0 +1 @@
+[^0]
diff --git a/Tests/RunCMake/Cpplint/C-error-launch-Build-stderr.txt b/Tests/RunCMake/Cpplint/C-error-launch-Build-stderr.txt
new file mode 100644
index 0000000..74c6a1e
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error-launch-Build-stderr.txt
@@ -0,0 +1,2 @@
+Tests[/\]RunCMake[/\]Cpplint[/\]main\.c:0:  message  \[category/category\] \[0\]
+Total errors found: 1
diff --git a/Tests/RunCMake/Cpplint/C-error-launch.cmake b/Tests/RunCMake/Cpplint/C-error-launch.cmake
new file mode 100644
index 0000000..c76e2e2
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error-launch.cmake
@@ -0,0 +1,3 @@
+set(CTEST_USE_LAUNCHERS 1)
+include(CTestUseLaunchers)
+include(C-error.cmake)
diff --git a/Tests/RunCMake/Cpplint/C-error.cmake b/Tests/RunCMake/Cpplint/C-error.cmake
new file mode 100644
index 0000000..29cf7ba
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error.cmake
@@ -0,0 +1,3 @@
+enable_language(C)
+set(CMAKE_C_CPPLINT "${PSEUDO_CPPLINT}" --error)
+add_executable(main main.c)
diff --git a/Tests/RunCMake/Cpplint/C-launch-Build-stderr.txt b/Tests/RunCMake/Cpplint/C-launch-Build-stderr.txt
new file mode 100644
index 0000000..3d68d40
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-launch-Build-stderr.txt
@@ -0,0 +1,2 @@
+Done processing .*Tests[/\]RunCMake[/\]Cpplint[/\]main\.c
+Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/C-launch.cmake b/Tests/RunCMake/Cpplint/C-launch.cmake
new file mode 100644
index 0000000..e66ca20
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-launch.cmake
@@ -0,0 +1,3 @@
+set(CTEST_USE_LAUNCHERS 1)
+include(CTestUseLaunchers)
+include(C.cmake)
diff --git a/Tests/RunCMake/Cpplint/C.cmake b/Tests/RunCMake/Cpplint/C.cmake
new file mode 100644
index 0000000..68e6ff4
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C.cmake
@@ -0,0 +1,3 @@
+enable_language(C)
+set(CMAKE_C_CPPLINT "${PSEUDO_CPPLINT}" --verbose=0 --linelength=80)
+add_executable(main main.c)
diff --git a/Tests/RunCMake/Cpplint/CMakeLists.txt b/Tests/RunCMake/Cpplint/CMakeLists.txt
new file mode 100644
index 0000000..a640c56
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.7)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/Cpplint/CXX-Build-stderr.txt b/Tests/RunCMake/Cpplint/CXX-Build-stderr.txt
new file mode 100644
index 0000000..91f0591
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-Build-stderr.txt
@@ -0,0 +1,2 @@
+Done processing .*Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx
+Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/CXX-error-Build-result.txt b/Tests/RunCMake/Cpplint/CXX-error-Build-result.txt
new file mode 100644
index 0000000..d197c91
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error-Build-result.txt
@@ -0,0 +1 @@
+[^0]
diff --git a/Tests/RunCMake/Cpplint/CXX-error-Build-stderr.txt b/Tests/RunCMake/Cpplint/CXX-error-Build-stderr.txt
new file mode 100644
index 0000000..5e86c54
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error-Build-stderr.txt
@@ -0,0 +1,2 @@
+Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx:0:  message  \[category\/category\] \[0\]
+Total errors found: 1
diff --git a/Tests/RunCMake/Cpplint/CXX-error-launch-Build-result.txt b/Tests/RunCMake/Cpplint/CXX-error-launch-Build-result.txt
new file mode 100644
index 0000000..d197c91
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error-launch-Build-result.txt
@@ -0,0 +1 @@
+[^0]
diff --git a/Tests/RunCMake/Cpplint/CXX-error-launch-Build-stderr.txt b/Tests/RunCMake/Cpplint/CXX-error-launch-Build-stderr.txt
new file mode 100644
index 0000000..5e86c54
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error-launch-Build-stderr.txt
@@ -0,0 +1,2 @@
+Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx:0:  message  \[category\/category\] \[0\]
+Total errors found: 1
diff --git a/Tests/RunCMake/Cpplint/CXX-error-launch.cmake b/Tests/RunCMake/Cpplint/CXX-error-launch.cmake
new file mode 100644
index 0000000..72dcbe9
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error-launch.cmake
@@ -0,0 +1,3 @@
+set(CTEST_USE_LAUNCHERS 1)
+include(CTestUseLaunchers)
+include(CXX-error.cmake)
diff --git a/Tests/RunCMake/Cpplint/CXX-error.cmake b/Tests/RunCMake/Cpplint/CXX-error.cmake
new file mode 100644
index 0000000..ad66ff5
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error.cmake
@@ -0,0 +1,3 @@
+enable_language(CXX)
+set(CMAKE_CXX_CPPLINT "${PSEUDO_CPPLINT}" --error)
+add_executable(main main.cxx)
diff --git a/Tests/RunCMake/Cpplint/CXX-launch-Build-stderr.txt b/Tests/RunCMake/Cpplint/CXX-launch-Build-stderr.txt
new file mode 100644
index 0000000..91f0591
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-launch-Build-stderr.txt
@@ -0,0 +1,2 @@
+Done processing .*Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx
+Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/CXX-launch.cmake b/Tests/RunCMake/Cpplint/CXX-launch.cmake
new file mode 100644
index 0000000..3002c9d
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-launch.cmake
@@ -0,0 +1,3 @@
+set(CTEST_USE_LAUNCHERS 1)
+include(CTestUseLaunchers)
+include(CXX.cmake)
diff --git a/Tests/RunCMake/Cpplint/CXX.cmake b/Tests/RunCMake/Cpplint/CXX.cmake
new file mode 100644
index 0000000..35f05ee
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX.cmake
@@ -0,0 +1,3 @@
+enable_language(CXX)
+set(CMAKE_CXX_CPPLINT "${PSEUDO_CPPLINT}" --verbose=0 --linelength=80)
+add_executable(main main.cxx)
diff --git a/Tests/RunCMake/Cpplint/RunCMakeTest.cmake b/Tests/RunCMake/Cpplint/RunCMakeTest.cmake
new file mode 100644
index 0000000..40875aa
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/RunCMakeTest.cmake
@@ -0,0 +1,25 @@
+include(RunCMake)
+
+set(RunCMake_TEST_OPTIONS "-DPSEUDO_CPPLINT=${PSEUDO_CPPLINT}")
+
+function(run_cpplint lang)
+  # Use a single build tree for tests without cleaning.
+  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/${lang}-build")
+  set(RunCMake_TEST_NO_CLEAN 1)
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+  run_cmake(${lang})
+  run_cmake_command(${lang}-Build ${CMAKE_COMMAND} --build .)
+endfunction()
+
+run_cpplint(C)
+run_cpplint(CXX)
+run_cpplint(C-error)
+run_cpplint(CXX-error)
+
+if(NOT RunCMake_GENERATOR STREQUAL "Watcom WMake")
+  run_cpplint(C-launch)
+  run_cpplint(CXX-launch)
+  run_cpplint(C-error-launch)
+  run_cpplint(CXX-error-launch)
+endif()
diff --git a/Tests/RunCMake/Cpplint/main.c b/Tests/RunCMake/Cpplint/main.c
new file mode 100644
index 0000000..8488f4e
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/main.c
@@ -0,0 +1,4 @@
+int main(void)
+{
+  return 0;
+}
diff --git a/Tests/RunCMake/Cpplint/main.cxx b/Tests/RunCMake/Cpplint/main.cxx
new file mode 100644
index 0000000..f8b643a
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/main.cxx
@@ -0,0 +1,4 @@
+int main()
+{
+  return 0;
+}
diff --git a/Tests/RunCMake/pseudo_cpplint.c b/Tests/RunCMake/pseudo_cpplint.c
new file mode 100644
index 0000000..7c79328
--- /dev/null
+++ b/Tests/RunCMake/pseudo_cpplint.c
@@ -0,0 +1,23 @@
+#include <stdio.h>
+#include <string.h>
+
+int main(int argc, char* argv[])
+{
+  int error = 0;
+  int i;
+  for (i = 1; i < argc; ++i) {
+    if (strcmp(argv[i], "--error") == 0) {
+      error = 1;
+    }
+    if (argv[i][0] != '-') {
+      if (error) {
+        fprintf(stderr, "%s:0:  message  [category/category] [0]\n", argv[i]);
+        fprintf(stdout, "Total errors found: 1\n");
+        return 1;
+      }
+      fprintf(stdout, "Done processing %s\n", argv[i]);
+    }
+  }
+  fprintf(stdout, "Total errors found: 0\n");
+  return 0;
+}

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

Summary of changes:
 Auxiliary/vim/syntax/cmake.vim                     |    4 +-
 Help/manual/cmake-properties.7.rst                 |    1 +
 Help/manual/cmake-variables.7.rst                  |    1 +
 Help/prop_tgt/LANG_CPPLINT.rst                     |   13 ++++++
 Help/release/dev/add-LANG_CPPLINT.rst              |    8 ++++
 Help/variable/CMAKE_LANG_CPPLINT.rst               |    6 +++
 Source/cmMakefileTargetGenerator.cxx               |   10 ++++-
 Source/cmNinjaTargetGenerator.cxx                  |   10 ++++-
 Source/cmTarget.cxx                                |    2 +
 Source/cmcmd.cxx                                   |   42 +++++++++++++++++---
 Tests/RunCMake/CMakeLists.txt                      |    2 +
 .../CommandLine/E___run_iwyu-no-iwyu-stderr.txt    |    2 +-
 Tests/RunCMake/Cpplint/C-Build-stderr.txt          |    2 +
 .../C-error-Build-result.txt}                      |    0
 Tests/RunCMake/Cpplint/C-error-Build-stderr.txt    |    2 +
 .../C-error-launch-Build-result.txt}               |    0
 .../Cpplint/C-error-launch-Build-stderr.txt        |    2 +
 Tests/RunCMake/Cpplint/C-error-launch.cmake        |    3 ++
 Tests/RunCMake/Cpplint/C-error.cmake               |    3 ++
 Tests/RunCMake/Cpplint/C-launch-Build-stderr.txt   |    2 +
 .../RunCMake/{ClangTidy => Cpplint}/C-launch.cmake |    0
 Tests/RunCMake/Cpplint/C.cmake                     |    3 ++
 .../{execute_process => Cpplint}/CMakeLists.txt    |    0
 Tests/RunCMake/Cpplint/CXX-Build-stderr.txt        |    2 +
 .../CXX-error-Build-result.txt}                    |    0
 Tests/RunCMake/Cpplint/CXX-error-Build-stderr.txt  |    2 +
 .../CXX-error-launch-Build-result.txt}             |    0
 .../Cpplint/CXX-error-launch-Build-stderr.txt      |    2 +
 Tests/RunCMake/Cpplint/CXX-error-launch.cmake      |    3 ++
 Tests/RunCMake/Cpplint/CXX-error.cmake             |    3 ++
 Tests/RunCMake/Cpplint/CXX-launch-Build-stderr.txt |    2 +
 .../{ClangTidy => Cpplint}/CXX-launch.cmake        |    0
 Tests/RunCMake/Cpplint/CXX.cmake                   |    3 ++
 Tests/RunCMake/Cpplint/RunCMakeTest.cmake          |   25 ++++++++++++
 .../LinkInterfaceLoop => RunCMake/Cpplint}/main.c  |    0
 Tests/RunCMake/{ClangTidy => Cpplint}/main.cxx     |    0
 Tests/RunCMake/pseudo_cpplint.c                    |   23 +++++++++++
 37 files changed, 173 insertions(+), 10 deletions(-)
 create mode 100644 Help/prop_tgt/LANG_CPPLINT.rst
 create mode 100644 Help/release/dev/add-LANG_CPPLINT.rst
 create mode 100644 Help/variable/CMAKE_LANG_CPPLINT.rst
 create mode 100644 Tests/RunCMake/Cpplint/C-Build-stderr.txt
 copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => Cpplint/C-error-Build-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Cpplint/C-error-Build-stderr.txt
 copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => Cpplint/C-error-launch-Build-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Cpplint/C-error-launch-Build-stderr.txt
 create mode 100644 Tests/RunCMake/Cpplint/C-error-launch.cmake
 create mode 100644 Tests/RunCMake/Cpplint/C-error.cmake
 create mode 100644 Tests/RunCMake/Cpplint/C-launch-Build-stderr.txt
 copy Tests/RunCMake/{ClangTidy => Cpplint}/C-launch.cmake (100%)
 create mode 100644 Tests/RunCMake/Cpplint/C.cmake
 copy Tests/RunCMake/{execute_process => Cpplint}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/Cpplint/CXX-Build-stderr.txt
 copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => Cpplint/CXX-error-Build-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Cpplint/CXX-error-Build-stderr.txt
 copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => Cpplint/CXX-error-launch-Build-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Cpplint/CXX-error-launch-Build-stderr.txt
 create mode 100644 Tests/RunCMake/Cpplint/CXX-error-launch.cmake
 create mode 100644 Tests/RunCMake/Cpplint/CXX-error.cmake
 create mode 100644 Tests/RunCMake/Cpplint/CXX-launch-Build-stderr.txt
 copy Tests/RunCMake/{ClangTidy => Cpplint}/CXX-launch.cmake (100%)
 create mode 100644 Tests/RunCMake/Cpplint/CXX.cmake
 create mode 100644 Tests/RunCMake/Cpplint/RunCMakeTest.cmake
 copy Tests/{CMakeOnly/LinkInterfaceLoop => RunCMake/Cpplint}/main.c (100%)
 copy Tests/RunCMake/{ClangTidy => Cpplint}/main.cxx (100%)
 create mode 100644 Tests/RunCMake/pseudo_cpplint.c


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 13:40:51 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 13:40:51 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2262-gb92afa6
Message-ID: <20170120184051.5351DF25B7@public.kitware.com>

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  b92afa6fb2d19eb8006bd2893f179953644b5439 (commit)
       via  4bfb1249ede1b86dcd53b34ec885f17460edc8f6 (commit)
       via  90cb40832375fa880b792ca9bf5cdd3071912f9d (commit)
      from  52edbfcac86c6156e95cbdb1947e71216e8b8a40 (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=b92afa6fb2d19eb8006bd2893f179953644b5439
commit b92afa6fb2d19eb8006bd2893f179953644b5439
Merge: 52edbfc 4bfb124
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 13:40:50 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 13:40:50 2017 -0500

    Merge topic 'csproj-improvements' into next
    
    4bfb1249 VS: removed usage of relative paths for C# targets in in-source builds
    90cb4083 VS: improve handling of source files with special extensions in .csproj


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4bfb1249ede1b86dcd53b34ec885f17460edc8f6
commit 4bfb1249ede1b86dcd53b34ec885f17460edc8f6
Author:     Michael St?rmer <michael.stuermer at schaeffler.com>
AuthorDate: Wed Jan 18 15:53:40 2017 +0100
Commit:     Michael St?rmer <michael.stuermer at schaeffler.com>
CommitDate: Wed Jan 18 15:53:40 2017 +0100

    VS: removed usage of relative paths for C# targets in in-source builds

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 138ac2b..2e6c19b 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1671,12 +1671,6 @@ void cmVisualStudio10TargetGenerator::WriteSource(std::string const& tool,
       this->GlobalGenerator->PathTooLong(this->GeneratorTarget, sf, sourceRel);
     }
   }
-  if (csproj == this->ProjectType && this->InSourceBuild) {
-    std::string srcdir = this->Makefile->GetCurrentSourceDirectory();
-    if (sourceFile.find(srcdir) != std::string::npos) {
-      sourceFile = sourceFile.substr(srcdir.size() + 1);
-    }
-  }
   this->ConvertToWindowsSlash(sourceFile);
   this->WriteString("<", 2);
   (*this->BuildFileStream) << tool << " Include=\""

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90cb40832375fa880b792ca9bf5cdd3071912f9d
commit 90cb40832375fa880b792ca9bf5cdd3071912f9d
Author:     Michael St?rmer <michael.stuermer at schaeffler.com>
AuthorDate: Tue Jan 17 16:09:38 2017 +0100
Commit:     Michael St?rmer <michael.stuermer at schaeffler.com>
CommitDate: Wed Jan 18 15:51:22 2017 +0100

    VS: improve handling of source files with special extensions in .csproj
    
    Mainly <Link> and <DependentUpon> tags are added to connect generated
    and manually edited files. Special file extensions that are take care
    of are:
    
     - .Designer.cs
     - .xaml.cs
     - .settings
     - .resx
     - .xaml

diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 864d1dc..03178a1 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -362,8 +362,11 @@ Properties on Source Files
    /prop_sf/SKIP_AUTORCC
    /prop_sf/SKIP_AUTOUIC
    /prop_sf/SYMBOLIC
+   /prop_sf/VS_COPY_TO_OUT_DIR
    /prop_sf/VS_DEPLOYMENT_CONTENT
    /prop_sf/VS_DEPLOYMENT_LOCATION
+   /prop_sf/VS_INCLUDE_IN_VSIX
+   /prop_sf/VS_RESOURCE_GENERATOR
    /prop_sf/VS_SHADER_ENTRYPOINT
    /prop_sf/VS_SHADER_FLAGS
    /prop_sf/VS_SHADER_MODEL
diff --git a/Help/prop_sf/VS_COPY_TO_OUT_DIR.rst b/Help/prop_sf/VS_COPY_TO_OUT_DIR.rst
new file mode 100644
index 0000000..16c8d83
--- /dev/null
+++ b/Help/prop_sf/VS_COPY_TO_OUT_DIR.rst
@@ -0,0 +1,6 @@
+VS_COPY_TO_OUT_DIR
+------------------
+
+Sets the ``<CopyToOutputDirectory>`` tag for a source file in a
+Visual Studio project file. Valid values are ``Never``, ``Always``
+and ``PreserveNewest``.
diff --git a/Help/prop_sf/VS_INCLUDE_IN_VSIX.rst b/Help/prop_sf/VS_INCLUDE_IN_VSIX.rst
new file mode 100644
index 0000000..30f471d
--- /dev/null
+++ b/Help/prop_sf/VS_INCLUDE_IN_VSIX.rst
@@ -0,0 +1,6 @@
+VS_INCLUDE_IN_VSIX
+------------------
+
+Boolean property to specify if the file should be included within a VSIX
+extension package. This is needed for development of Visual Studio
+extensions.
diff --git a/Help/prop_sf/VS_RESOURCE_GENERATOR.rst b/Help/prop_sf/VS_RESOURCE_GENERATOR.rst
new file mode 100644
index 0000000..97e5aac
--- /dev/null
+++ b/Help/prop_sf/VS_RESOURCE_GENERATOR.rst
@@ -0,0 +1,8 @@
+VS_RESOURCE_GENERATOR
+---------------------
+
+This property allows to specify the resource generator to be used
+on this file. It defaults to ``PublicResXFileCodeGenerator`` if
+not set.
+
+This property only applies to C# projects.
diff --git a/Help/release/dev/vs-advanced-source-properties.rst b/Help/release/dev/vs-advanced-source-properties.rst
new file mode 100644
index 0000000..dd391e0
--- /dev/null
+++ b/Help/release/dev/vs-advanced-source-properties.rst
@@ -0,0 +1,12 @@
+vs-advanced-source-properties
+-----------------------------
+
+* The :ref:`Visual Studio Generators` for VS 2010 and above
+  learned some more source file properties:
+
+  - :prop_sf:`VS_RESOURCE_GENERATOR` (C# only): allows setting the resource
+    generator
+  - :prop_sf:`VS_COPY_TO_OUT_DIR`: parameter to set if file should be copied
+    to output directory (values: ``Never``, ``Always``, ``PreserveNewest``)
+  - :prop_sf:`VS_INCLUDE_IN_VSIX`: boolean property to include file include
+    Visual Studio extension package
diff --git a/Help/release/dev/vs-csharp-support.rst b/Help/release/dev/vs-csharp-support.rst
index 26d8574..46b235a 100644
--- a/Help/release/dev/vs-csharp-support.rst
+++ b/Help/release/dev/vs-csharp-support.rst
@@ -19,7 +19,16 @@ vs-native-csharp-support
   that specifically targets C# contains ``CSharp`` as a part of
   their names.
 
-* More finetuning of C# targets can be done using target
-  properties. Specifically the Visual Studio related target
+* More finetuning of C# targets can be done using target and source
+  file properties. Specifically the Visual Studio related target
   properties (``VS_*``) are worth a look (for setting toolset
   versions, root namespaces, assembly icons, ...).
+
+* **Auto-"linking"** in .csproj files: In C#/.NET development with
+  Visual Studio there is a number of visual editors used which
+  generate code. Both the generated files and the ones edited
+  with the UI are connected in the ``.csproj`` file using
+  ``<DependentUpon>`` tags. If CMake finds within a C# project
+  any source file with extension ``.Designer.cs`` or ``.xaml.cs``,
+  it checks sibling files with extension ``.xaml``, ``.settings``,
+  ``.resx`` or ``.cs`` and establishes the dependency connection.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 89380eb..138ac2b 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -610,30 +610,91 @@ void cmVisualStudio10TargetGenerator::WriteEmbeddedResourceGroup()
   this->GeneratorTarget->GetResxSources(resxObjs, "");
   if (!resxObjs.empty()) {
     this->WriteString("<ItemGroup>\n", 1);
+    std::string srcDir = this->Makefile->GetCurrentSourceDirectory();
+    this->ConvertToWindowsSlash(srcDir);
     for (std::vector<cmSourceFile const*>::const_iterator oi =
            resxObjs.begin();
          oi != resxObjs.end(); ++oi) {
       std::string obj = (*oi)->GetFullPath();
       this->WriteString("<EmbeddedResource Include=\"", 2);
       this->ConvertToWindowsSlash(obj);
+      bool useRelativePath = false;
+      if (csproj == this->ProjectType && this->InSourceBuild) {
+        // If we do an in-source build and the resource file is in a
+        // subdirectory
+        // of the .csproj file, we have to use relative pathnames, otherwise
+        // visual studio does not show the file in the IDE. Sorry.
+        if (obj.find(srcDir) == 0) {
+          obj = this->ConvertPath(obj, true);
+          this->ConvertToWindowsSlash(obj);
+          useRelativePath = true;
+        }
+      }
       (*this->BuildFileStream) << obj << "\">\n";
 
-      this->WriteString("<DependentUpon>", 3);
-      std::string hFileName = obj.substr(0, obj.find_last_of(".")) + ".h";
-      (*this->BuildFileStream) << hFileName << "</DependentUpon>\n";
-
-      for (std::vector<std::string>::const_iterator i =
-             this->Configurations.begin();
-           i != this->Configurations.end(); ++i) {
-        this->WritePlatformConfigTag("LogicalName", i->c_str(), 3);
-        if (this->GeneratorTarget->GetProperty("VS_GLOBAL_ROOTNAMESPACE") ||
-            // Handle variant of VS_GLOBAL_<variable> for RootNamespace.
-            this->GeneratorTarget->GetProperty("VS_GLOBAL_RootNamespace")) {
-          (*this->BuildFileStream) << "$(RootNamespace).";
+      if (csproj != this->ProjectType) {
+        this->WriteString("<DependentUpon>", 3);
+        std::string hFileName = obj.substr(0, obj.find_last_of(".")) + ".h";
+        (*this->BuildFileStream) << hFileName << "</DependentUpon>\n";
+
+        for (std::vector<std::string>::const_iterator i =
+               this->Configurations.begin();
+             i != this->Configurations.end(); ++i) {
+          this->WritePlatformConfigTag("LogicalName", i->c_str(), 3);
+          if (this->GeneratorTarget->GetProperty("VS_GLOBAL_ROOTNAMESPACE") ||
+              // Handle variant of VS_GLOBAL_<variable> for RootNamespace.
+              this->GeneratorTarget->GetProperty("VS_GLOBAL_RootNamespace")) {
+            (*this->BuildFileStream) << "$(RootNamespace).";
+          }
+          (*this->BuildFileStream) << "%(Filename)";
+          (*this->BuildFileStream) << ".resources";
+          (*this->BuildFileStream) << "</LogicalName>\n";
+        }
+      } else {
+        std::string binDir = this->Makefile->GetCurrentBinaryDirectory();
+        this->ConvertToWindowsSlash(binDir);
+        // If the resource was NOT added using a relative path (which should
+        // be the default), we have to provide a link here
+        if (!useRelativePath) {
+          std::string link;
+          if (obj.find(srcDir) == 0) {
+            link = obj.substr(srcDir.length() + 1);
+          } else if (obj.find(binDir) == 0) {
+            link = obj.substr(binDir.length() + 1);
+          } else {
+            link = cmsys::SystemTools::GetFilenameName(obj);
+          }
+          if (!link.empty()) {
+            this->WriteString("<Link>", 3);
+            (*this->BuildFileStream) << link << "</Link>\n";
+          }
+        }
+        // Determine if this is a generated resource from a .Designer.cs file
+        std::string designerResource =
+          cmSystemTools::GetFilenamePath((*oi)->GetFullPath()) + "/" +
+          cmSystemTools::GetFilenameWithoutLastExtension(
+            (*oi)->GetFullPath()) +
+          ".Designer.cs";
+        if (cmsys::SystemTools::FileExists(designerResource)) {
+          std::string generator = "PublicResXFileCodeGenerator";
+          if (const char* g = (*oi)->GetProperty("VS_RESOURCE_GENERATOR")) {
+            generator = g;
+          }
+          this->WriteString("<Generator>", 3);
+          (*this->BuildFileStream) << cmVS10EscapeXML(generator)
+                                   << "</Generator>\n";
+          if (designerResource.find(srcDir) == 0) {
+            designerResource = designerResource.substr(srcDir.length() + 1);
+          } else if (designerResource.find(binDir) == 0) {
+            designerResource = designerResource.substr(binDir.length() + 1);
+          } else {
+            designerResource =
+              cmsys::SystemTools::GetFilenameName(designerResource);
+          }
+          this->ConvertToWindowsSlash(designerResource);
+          this->WriteString("<LastGenOutput>", 3);
+          (*this->BuildFileStream) << designerResource << "</LastGenOutput>\n";
         }
-        (*this->BuildFileStream) << "%(Filename)";
-        (*this->BuildFileStream) << ".resources";
-        (*this->BuildFileStream) << "</LogicalName>\n";
       }
 
       this->WriteString("</EmbeddedResource>\n", 2);
@@ -661,6 +722,24 @@ void cmVisualStudio10TargetGenerator::WriteXamlFilesGroup()
       }
 
       this->WriteSource(xamlType, *oi, ">\n");
+      if (csproj == this->ProjectType && !this->InSourceBuild) {
+        // add <Link> tag to written XAML source if necessary
+        const std::string srcDir = this->Makefile->GetCurrentSourceDirectory();
+        const std::string binDir = this->Makefile->GetCurrentBinaryDirectory();
+        std::string link;
+        if (obj.find(srcDir) == 0) {
+          link = obj.substr(srcDir.length() + 1);
+        } else if (obj.find(binDir) == 0) {
+          link = obj.substr(binDir.length() + 1);
+        } else {
+          link = cmsys::SystemTools::GetFilenameName(obj);
+        }
+        if (!link.empty()) {
+          this->ConvertToWindowsSlash(link);
+          this->WriteString("<Link>", 3);
+          (*this->BuildFileStream) << link << "</Link>\n";
+        }
+      }
       this->WriteString("<SubType>Designer</SubType>\n", 3);
       this->WriteString("</", 2);
       (*this->BuildFileStream) << xamlType << ">\n";
@@ -1348,7 +1427,12 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
   std::string shaderEntryPoint;
   std::string shaderModel;
   std::string shaderAdditionalFlags;
+  std::string settingsGenerator;
+  std::string settingsLastGenOutput;
   std::string sourceLink;
+  std::string subType;
+  std::string copyToOutDir;
+  std::string includeInVsix;
   std::string ext = cmSystemTools::LowerCase(sf->GetExtension());
   if (csproj == this->ProjectType) {
     // EVERY extra source file must have a <Link>, otherwise it might not
@@ -1405,6 +1489,28 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
     tool = "XML";
   } else if (ext == "natvis") {
     tool = "Natvis";
+  } else if (ext == "settings") {
+    // remove path to current source dir (if files are in current source dir)
+    if (!sourceLink.empty()) {
+      settingsLastGenOutput = sourceLink;
+    } else {
+      settingsLastGenOutput = sf->GetFullPath();
+    }
+    std::size_t pos = settingsLastGenOutput.find(".settings");
+    settingsLastGenOutput.replace(pos, 9, ".Designer.cs");
+    settingsGenerator = "SettingsSingleFileGenerator";
+    toolHasSettings = true;
+  } else if (ext == "vsixmanifest") {
+    subType = "Designer";
+  }
+  if (const char* c = sf->GetProperty("VS_COPY_TO_OUT_DIR")) {
+    copyToOutDir = c;
+    toolHasSettings = true;
+  }
+  if (sf->GetPropertyAsBool("VS_INCLUDE_IN_VSIX")) {
+    includeInVsix = "True";
+    tool = "Content";
+    toolHasSettings = true;
   }
 
   if (this->NsightTegra) {
@@ -1495,10 +1601,35 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
       (*this->BuildFileStream) << cmVS10EscapeXML(shaderAdditionalFlags)
                                << "</AdditionalOptions>\n";
     }
+    if (!settingsGenerator.empty()) {
+      this->WriteString("<Generator>", 3);
+      (*this->BuildFileStream) << cmVS10EscapeXML(settingsGenerator)
+                               << "</Generator>\n";
+    }
+    if (!settingsLastGenOutput.empty()) {
+      this->WriteString("<LastGenOutput>", 3);
+      (*this->BuildFileStream) << cmVS10EscapeXML(settingsLastGenOutput)
+                               << "</LastGenOutput>\n";
+    }
     if (!sourceLink.empty()) {
       this->WriteString("<Link>", 3);
       (*this->BuildFileStream) << cmVS10EscapeXML(sourceLink) << "</Link>\n";
     }
+    if (!subType.empty()) {
+      this->WriteString("<SubType>", 3);
+      (*this->BuildFileStream) << cmVS10EscapeXML(subType) << "</SubType>\n";
+    }
+    if (!copyToOutDir.empty()) {
+      this->WriteString("<CopyToOutputDirectory>", 3);
+      (*this->BuildFileStream) << cmVS10EscapeXML(copyToOutDir)
+                               << "</CopyToOutputDirectory>\n";
+    }
+    if (!includeInVsix.empty()) {
+      this->WriteString("<IncludeInVSIX>", 3);
+      (*this->BuildFileStream) << cmVS10EscapeXML(includeInVsix)
+                               << "</IncludeInVSIX>\n";
+    }
+
     this->WriteString("</", 2);
     (*this->BuildFileStream) << tool << ">\n";
   } else {
@@ -1815,9 +1946,43 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
         sourceFileTags["Link"] = link;
       }
     }
-    //
-    // NOTE: in future commits additional props will be added!
-    //
+    // check if file is a generated .Designer.cs or .xaml.cs file
+    // to add additional necessary tags
+    const std::string fileExtension =
+      cmsys::SystemTools::GetFilenameExtension(f);
+    if (fileExtension == ".Designer.cs" || fileExtension == ".xaml.cs") {
+      f = f.substr(0, f.length() - fileExtension.length());
+      if (sourceFileTags.find("Link") == sourceFileTags.end() &&
+          !this->InSourceBuild) {
+        // add link fallback
+        sourceFileTags["Link"] =
+          cmsys::SystemTools::GetFilenameName(f) + fileExtension;
+      }
+      std::vector<std::string> extensions;
+      extensions.push_back(".resx");
+      extensions.push_back(".settings");
+      extensions.push_back(".xaml");
+      extensions.push_back(".cs");
+      std::string dependencyExtension;
+      for (std::vector<std::string>::iterator i = extensions.begin();
+           i != extensions.end(); ++i) {
+        if (cmsys::SystemTools::FileExists(f + *i)) {
+          dependencyExtension = *i;
+          // There should never be more than one match. Otherwise
+          // one cannot tell on which match the file depends.
+          break;
+        }
+      }
+      if (dependencyExtension == ".resx") {
+        sourceFileTags["DesignTime"] = "True";
+        sourceFileTags["AutoGen"] = "True";
+      } else if (dependencyExtension == ".settings") {
+        sourceFileTags["DesignTimeSharedInput"] = "True";
+        sourceFileTags["AutoGen"] = "True";
+      }
+      sourceFileTags["DependentUpon"] =
+        cmsys::SystemTools::GetFilenameName(f) + dependencyExtension;
+    }
     // write source file specific tags
     if (!sourceFileTags.empty()) {
       hasFlags = true;
@@ -1825,7 +1990,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
       firstString = "";
       for (CsPropMap::const_iterator i = sourceFileTags.begin();
            i != sourceFileTags.end(); ++i) {
-        this->WriteString("<", 2);
+        this->WriteString("<", 3);
         (*this->BuildFileStream)
           << i->first << ">" << cmVS10EscapeXML(i->second) << "</" << i->first
           << ">\n";

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

Summary of changes:
 Help/manual/cmake-properties.7.rst                 |    3 +
 Help/prop_sf/VS_COPY_TO_OUT_DIR.rst                |    6 +
 Help/prop_sf/VS_INCLUDE_IN_VSIX.rst                |    6 +
 Help/prop_sf/VS_RESOURCE_GENERATOR.rst             |    8 +
 Help/release/dev/vs-advanced-source-properties.rst |   12 ++
 Help/release/dev/vs-csharp-support.rst             |   13 +-
 Source/cmVisualStudio10TargetGenerator.cxx         |  209 +++++++++++++++++---
 7 files changed, 230 insertions(+), 27 deletions(-)
 create mode 100644 Help/prop_sf/VS_COPY_TO_OUT_DIR.rst
 create mode 100644 Help/prop_sf/VS_INCLUDE_IN_VSIX.rst
 create mode 100644 Help/prop_sf/VS_RESOURCE_GENERATOR.rst
 create mode 100644 Help/release/dev/vs-advanced-source-properties.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 13:44:18 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 13:44:18 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2264-gde9eee5
Message-ID: <20170120184418.1DB9DF9F39@public.kitware.com>

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  de9eee5f4cc05ef6dc161044d68b7400c60e2772 (commit)
       via  5a2d9200aa246b25dfa66a2c4cafe82f6c6c51fc (commit)
      from  b92afa6fb2d19eb8006bd2893f179953644b5439 (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=de9eee5f4cc05ef6dc161044d68b7400c60e2772
commit de9eee5f4cc05ef6dc161044d68b7400c60e2772
Merge: b92afa6 5a2d920
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 13:44:17 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 13:44:17 2017 -0500

    Merge topic 'sanitizer-options' into next
    
    5a2d9200 ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a2d9200aa246b25dfa66a2c4cafe82f6c6c51fc
commit 5a2d9200aa246b25dfa66a2c4cafe82f6c6c51fc
Author:     Jamie Snape <jamie.snape at kitware.com>
AuthorDate: Thu Jan 19 15:14:43 2017 -0500
Commit:     Jamie Snape <jamie.snape at kitware.com>
CommitDate: Thu Jan 19 15:14:43 2017 -0500

    ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index a062e64..beaef81 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -607,9 +607,13 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       this->MemoryTesterDynamicOptions.push_back("-E");
       this->MemoryTesterDynamicOptions.push_back("env");
       std::string envVar;
-      std::string extraOptions = ":" +
-        this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
+      std::string extraOptions;
       std::string suppressionsOption;
+      if (!this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions")
+             .empty()) {
+        extraOptions = ":" +
+          this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
+      }
       if (!this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile")
              .empty()) {
         suppressionsOption = ":suppressions=" +
@@ -632,7 +636,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
         envVar = "UBSAN_OPTIONS";
       }
       std::string outputFile =
-        envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\"";
+        envVar + "=log_path=" + this->MemoryTesterOutputFile;
       this->MemoryTesterEnvironmentVariable =
         outputFile + suppressionsOption + extraOptions;
       break;

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

Summary of changes:
 Source/CTest/cmCTestMemCheckHandler.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 13:56:24 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 13:56:24 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2266-gb653930
Message-ID: <20170120185624.02622FA4C5@public.kitware.com>

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  b65393034d79702fcb5b97a8ac1bb2abb7065553 (commit)
       via  10c9c73d58b481a212d1ed87ceeb227a7654bc56 (commit)
      from  de9eee5f4cc05ef6dc161044d68b7400c60e2772 (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=b65393034d79702fcb5b97a8ac1bb2abb7065553
commit b65393034d79702fcb5b97a8ac1bb2abb7065553
Merge: de9eee5 10c9c73
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 13:56:22 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 13:56:22 2017 -0500

    Merge topic '16253-xcode-effective-platform-name' into next
    
    10c9c73d Xcode: Control emission of EFFECTIVE_PLATFORM_NAME


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10c9c73d58b481a212d1ed87ceeb227a7654bc56
commit 10c9c73d58b481a212d1ed87ceeb227a7654bc56
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Jan 15 23:23:31 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 13:51:48 2017 -0500

    Xcode: Control emission of EFFECTIVE_PLATFORM_NAME
    
    When building with multiple SDKs within one project Xcode requires
    the usage of ${EFFECTIVE_PLATFORM_NAME} to put temporary and build
    outout into separate directories. For example an iOS device and
    simulator build use two different SDKs (iphoneos and iphonesimulator).
    
    In the past cmake tries to detect embedded toolchains that could
    possibly use simulators and emitted EFFECTIVE_PLATFORM_NAME (EPN)
    at the proper locations. In #16253 Mark noticed that if he
    uses macosx and iphoneos in combination the necessary EPN is not
    emitted. This is because CMake by default assumes macosx SDK which
    does not trigger EPN emission.
    
    The fist naive approach - enabling EPN unconditionally revealed that
    then the EPN leaks into generator expressions like $<TARGET_FILE:xxx>
    which might be a regression and thus is unacceptable.
    
    The next approach was to add an CMake property to enable EPN emission
    unconditionally. This solved the reported problem.
    
    But the EPN leakage also happened for the embedded toolchains already
    without anyone noticing. So the control property was turned into a
    tri-state one:
    
     * No definition: EPN is activated for embedded toolchains like before
     * ON: EPN is always emitted
     * OFF: EPN is never emitted
    
    That approach gives the user the chance to disable EPN for embedded
    toolchains and restores generator expression functionality for those.
    
    Closes: #16253

diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 864d1dc..2ff84dd 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -44,6 +44,7 @@ Properties of Global Scope
    /prop_gbl/TARGET_MESSAGES
    /prop_gbl/TARGET_SUPPORTS_SHARED_LIBS
    /prop_gbl/USE_FOLDERS
+   /prop_gbl/XCODE_EMIT_EFFECTIVE_PLATFORM_NAME
 
 .. _`Directory Properties`:
 
diff --git a/Help/prop_gbl/XCODE_EMIT_EFFECTIVE_PLATFORM_NAME.rst b/Help/prop_gbl/XCODE_EMIT_EFFECTIVE_PLATFORM_NAME.rst
new file mode 100644
index 0000000..9a6086e
--- /dev/null
+++ b/Help/prop_gbl/XCODE_EMIT_EFFECTIVE_PLATFORM_NAME.rst
@@ -0,0 +1,24 @@
+XCODE_EMIT_EFFECTIVE_PLATFORM_NAME
+----------------------------------
+
+Control emission of ``EFFECTIVE_PLATFORM_NAME`` by the Xcode generator.
+
+It is required for building the same target with multiple SDKs. A
+common use case is the parallel use of ``iphoneos`` and
+``iphonesimulator`` SDKs.
+
+Three different states possible that control when the Xcode generator
+emits the ``EFFECTIVE_PLATFORM_NAME`` variable:
+
+- If set to ``ON`` it will always be emitted
+- If set to ``OFF`` it will never be emitted
+- If unset (the default) it will only be emitted when the project was
+  configured for an embedded Xcode SDK like iOS, tvOS, watchOS or any
+  of the simulators.
+
+.. note::
+
+  When this behavior is enable for generated Xcode projects, the
+  ``EFFECTIVE_PLATFORM_NAME`` variable will leak into
+  :manual:`Generator expressions <cmake-generator-expressions(7)>`
+  like ``TARGET_FILE`` and will render those mostly unusable.
diff --git a/Help/release/dev/xcode-effective-platform-name.rst b/Help/release/dev/xcode-effective-platform-name.rst
new file mode 100644
index 0000000..e337ca0
--- /dev/null
+++ b/Help/release/dev/xcode-effective-platform-name.rst
@@ -0,0 +1,8 @@
+xcode-effective-platform-name
+-----------------------------
+
+* The Xcode generator can now control emission of the
+  ``EFFECTIVE_PLATFORM_NAME`` variable through the
+  :prop_gbl:`XCODE_EMIT_EFFECTIVE_PLATFORM_NAME` global property.
+  This is useful when building with multiple SDKs like macosx and
+  iphoneos in parallel.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index b6db0d6..dcf3764 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4419,9 +4419,10 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
 
   // The generator may add the configuration's subdirectory.
   if (!conf.empty()) {
-    bool iosPlatform = this->Makefile->PlatformIsAppleIos();
+    bool useEPN =
+      this->GlobalGenerator->UseEffectivePlatformName(this->Makefile);
     std::string suffix =
-      usesDefaultOutputDir && iosPlatform ? "${EFFECTIVE_PLATFORM_NAME}" : "";
+      usesDefaultOutputDir && useEPN ? "${EFFECTIVE_PLATFORM_NAME}" : "";
     this->LocalGenerator->GetGlobalGenerator()->AppendDirectoryForConfig(
       "/", conf, suffix, out);
   }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 2808051..f118250 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2342,8 +2342,8 @@ void cmGlobalGenerator::AddGlobalTarget_Install(
     singleLine.push_back(cmd);
     if (cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.') {
       std::string cfgArg = "-DBUILD_TYPE=";
-      bool iosPlatform = mf->PlatformIsAppleIos();
-      if (iosPlatform) {
+      bool useEPN = this->UseEffectivePlatformName(mf);
+      if (useEPN) {
         cfgArg += "$(CONFIGURATION)";
         singleLine.push_back(cfgArg);
         cfgArg = "-DEFFECTIVE_PLATFORM_NAME=$(EFFECTIVE_PLATFORM_NAME)";
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 88ef8da..18e3730 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -333,6 +333,10 @@ public:
 
   virtual bool UseFolderProperty() const;
 
+  /** Return whether the generator should use EFFECTIVE_PLATFORM_NAME. This is
+      relevant for mixed macOS and iOS builds. */
+  virtual bool UseEffectivePlatformName(cmMakefile*) const { return false; }
+
   std::string GetSharedLibFlagsForLanguage(std::string const& lang) const;
 
   /** Generate an <output>.rule file path for a given command output.  */
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 96535eb..d448315 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -22,6 +22,7 @@
 #include "cmOutputConverter.h"
 #include "cmSourceFile.h"
 #include "cmSourceGroup.h"
+#include "cmState.h"
 #include "cmStateTypes.h"
 #include "cmSystemTools.h"
 #include "cmTarget.h"
@@ -3544,6 +3545,19 @@ bool cmGlobalXCodeGenerator::IsMultiConfig() const
   return true;
 }
 
+bool cmGlobalXCodeGenerator::UseEffectivePlatformName(cmMakefile* mf) const
+{
+  const char* epnValue =
+    this->GetCMakeInstance()->GetState()->GetGlobalProperty(
+      "XCODE_EMIT_EFFECTIVE_PLATFORM_NAME");
+
+  if (!epnValue) {
+    return mf->PlatformIsAppleIos();
+  }
+
+  return cmSystemTools::IsOn(epnValue);
+}
+
 void cmGlobalXCodeGenerator::ComputeTargetObjectDirectory(
   cmGeneratorTarget* gt) const
 {
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 42c39aa..1aaf9c7 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -86,6 +86,8 @@ public:
       i.e. "Can I build Debug and Release in the same tree?" */
   bool IsMultiConfig() const CM_OVERRIDE;
 
+  bool UseEffectivePlatformName(cmMakefile* mf) const CM_OVERRIDE;
+
   bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf) CM_OVERRIDE;
   void AppendFlag(std::string& flags, std::string const& flag);
 
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index 60912c2..f51a107 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -166,3 +166,24 @@ if(NOT XCODE_VERSION VERSION_LESS 6)
   unset(RunCMake_TEST_NO_CLEAN)
   unset(RunCMake_TEST_OPTIONS)
 endif()
+
+if(NOT XCODE_VERSION VERSION_LESS 5)
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeMultiplatform-build)
+  set(RunCMake_TEST_NO_CLEAN 1)
+
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+  run_cmake(XcodeMultiplatform)
+
+  # build ios before macos
+  run_cmake_command(XcodeMultiplatform-iphonesimulator-build ${CMAKE_COMMAND} --build . -- -sdk iphonesimulator)
+  run_cmake_command(XcodeMultiplatform-iphonesimulator-install ${CMAKE_COMMAND} --build . --target install -- -sdk iphonesimulator DESTDIR=${RunCMake_TEST_BINARY_DIR}/_install_iphonesimulator)
+
+  run_cmake_command(XcodeMultiplatform-macosx-build ${CMAKE_COMMAND} --build . -- -sdk macosx)
+  run_cmake_command(XcodeMultiplatform-macosx-install ${CMAKE_COMMAND} --build . --target install -- -sdk macosx DESTDIR=${RunCMake_TEST_BINARY_DIR}/_install_macosx)
+
+  unset(RunCMake_TEST_BINARY_DIR)
+  unset(RunCMake_TEST_NO_CLEAN)
+  unset(RunCMake_TEST_OPTIONS)
+endif()
diff --git a/Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake b/Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake
new file mode 100644
index 0000000..a1064f4
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.3)
+enable_language(CXX)
+
+set_property(GLOBAL PROPERTY XCODE_EMIT_EFFECTIVE_PLATFORM_NAME ON)
+
+set(CMAKE_XCODE_ATTRIBUTE_SUPPORTED_PLATFORMS "macosx iphonesimulator")
+set(CMAKE_MACOSX_BUNDLE true)
+
+add_library(library STATIC foo.cpp)
+
+add_executable(main main.cpp)
+target_link_libraries(main library)
+
+install(TARGETS library ARCHIVE DESTINATION lib)

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

Summary of changes:
 Help/manual/cmake-properties.7.rst                 |    1 +
 .../XCODE_EMIT_EFFECTIVE_PLATFORM_NAME.rst         |   24 ++++++++++++++++++++
 Help/release/dev/xcode-effective-platform-name.rst |    8 +++++++
 Source/cmGeneratorTarget.cxx                       |    5 ++--
 Source/cmGlobalGenerator.cxx                       |    4 ++--
 Source/cmGlobalGenerator.h                         |    4 ++++
 Source/cmGlobalXCodeGenerator.cxx                  |   14 ++++++++++++
 Source/cmGlobalXCodeGenerator.h                    |    2 ++
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake     |   21 +++++++++++++++++
 .../RunCMake/XcodeProject/XcodeMultiplatform.cmake |   14 ++++++++++++
 10 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100644 Help/prop_gbl/XCODE_EMIT_EFFECTIVE_PLATFORM_NAME.rst
 create mode 100644 Help/release/dev/xcode-effective-platform-name.rst
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 14:18:06 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 14:18:06 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2268-g33fbedf
Message-ID: <20170120191806.52663F95EF@public.kitware.com>

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  33fbedfbf2858051489c4d5d7cbc04f7cfb8d81e (commit)
       via  64aeddeb1274793b8f3ec2a1369398620ebd5ef0 (commit)
      from  b65393034d79702fcb5b97a8ac1bb2abb7065553 (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=33fbedfbf2858051489c4d5d7cbc04f7cfb8d81e
commit 33fbedfbf2858051489c4d5d7cbc04f7cfb8d81e
Merge: b653930 64aedde
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 14:18:05 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 14:18:05 2017 -0500

    Merge topic 'sanitizer-options' into next
    
    64aeddeb Revert "ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64aeddeb1274793b8f3ec2a1369398620ebd5ef0
commit 64aeddeb1274793b8f3ec2a1369398620ebd5ef0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 14:17:46 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 14:17:46 2017 -0500

    Revert "ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty"
    
    This reverts commit 5a2d9200aa246b25dfa66a2c4cafe82f6c6c51fc.

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index beaef81..a062e64 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -607,13 +607,9 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       this->MemoryTesterDynamicOptions.push_back("-E");
       this->MemoryTesterDynamicOptions.push_back("env");
       std::string envVar;
-      std::string extraOptions;
+      std::string extraOptions = ":" +
+        this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
       std::string suppressionsOption;
-      if (!this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions")
-             .empty()) {
-        extraOptions = ":" +
-          this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
-      }
       if (!this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile")
              .empty()) {
         suppressionsOption = ":suppressions=" +
@@ -636,7 +632,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
         envVar = "UBSAN_OPTIONS";
       }
       std::string outputFile =
-        envVar + "=log_path=" + this->MemoryTesterOutputFile;
+        envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\"";
       this->MemoryTesterEnvironmentVariable =
         outputFile + suppressionsOption + extraOptions;
       break;

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

Summary of changes:
 Source/CTest/cmCTestMemCheckHandler.cxx |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake

From domen.vrankar at gmail.com  Fri Jan 20 14:45:09 2017
From: domen.vrankar at gmail.com (Domen Vrankar)
Date: Fri, 20 Jan 2017 14:45:09 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2270-gb278af8
Message-ID: <20170120194509.948B5F6440@public.kitware.com>

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  b278af8e08066537fa4eab38b3001e1c0df9f8d8 (commit)
       via  21de0cc48524e171b19df5f39eaf16543c34c2ae (commit)
      from  33fbedfbf2858051489c4d5d7cbc04f7cfb8d81e (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=b278af8e08066537fa4eab38b3001e1c0df9f8d8
commit b278af8e08066537fa4eab38b3001e1c0df9f8d8
Merge: 33fbedf 21de0cc
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Jan 20 14:45:09 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 14:45:09 2017 -0500

    Merge topic 'cpack-stgz-minimal-test' into next
    
    21de0cc4 fixup! CPack/STGZ: minimalistic packages test


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21de0cc48524e171b19df5f39eaf16543c34c2ae
commit 21de0cc48524e171b19df5f39eaf16543c34c2ae
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Jan 20 20:44:39 2017 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Fri Jan 20 20:44:39 2017 +0100

    fixup! CPack/STGZ: minimalistic packages test

diff --git a/Modules/CPack.STGZ_Header.sh.in b/Modules/CPack.STGZ_Header.sh.in
index dee576f..c615851 100755
--- a/Modules/CPack.STGZ_Header.sh.in
+++ b/Modules/CPack.STGZ_Header.sh.in
@@ -130,7 +130,10 @@ echo ""
 use_new_tail_syntax="-n"
 tail $use_new_tail_syntax +1 "$0" > /dev/null 2> /dev/null || use_new_tail_syntax=""
 
-tail $use_new_tail_syntax +###CPACK_HEADER_LENGTH### "$0" | gunzip | (cd "${toplevel}" && tar xf -) || cpack_echo_exit "Problem unpacking the @CPACK_PACKAGE_FILE_NAME@"
+extractor="pax -r"
+command -v pax > /dev/null 2> /dev/null || extractor="tar xf -"
+
+tail $use_new_tail_syntax +###CPACK_HEADER_LENGTH### "$0" | gunzip | (cd "${toplevel}" && ${extractor}) || cpack_echo_exit "Problem unpacking the @CPACK_PACKAGE_FILE_NAME@"
 
 echo "Unpacking finished successfully"
 
diff --git a/Tests/RunCMake/CPack/STGZ/Helpers.cmake b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
index 75036db..96be71b 100644
--- a/Tests/RunCMake/CPack/STGZ/Helpers.cmake
+++ b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
@@ -5,9 +5,22 @@ function(getPackageContent FILE RESULT_VAR)
   file(REMOVE_RECURSE "${path_}/content")
   file(MAKE_DIRECTORY "${path_}/content")
   execute_process(COMMAND ${FILE} --prefix=${path_}/content --include-subdir
-          ERROR_QUIET
+          RESULT_VARIABLE extract_result_
+          ERROR_VARIABLE extract_error_
           OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+  if(extract_result_)
+    find_program(TAIL_EXECUTABLE tail)
+    find_program(PAX_EXECUTABLE pax)
+    find_program(GTAR_EXECUTABLE gtar)
+    find_program(TAR_EXECUTABLE tar)
+    find_program(GUNZIP_EXECUTABLE gunzip)
+
+    message(FATAL_ERROR "Extracting STGZ archive failed: '${extract_error_}';"
+        "'${TAIL_EXECUTABLE}'; '${PAX_EXECUTABLE}'; '${GTAR_EXECUTABLE}';"
+        "'${TAR_EXECUTABLE}'; '${GUNZIP_EXECUTABLE}'")
+  endif()
+
   file(GLOB_RECURSE package_content_ LIST_DIRECTORIES true RELATIVE
       "${path_}/content" "${path_}/content/*")
 

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

Summary of changes:
 Modules/CPack.STGZ_Header.sh.in         |    5 ++++-
 Tests/RunCMake/CPack/STGZ/Helpers.cmake |   15 ++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 15:50:11 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 15:50:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2273-g1fe432a
Message-ID: <20170120205011.72EE4F9EB3@public.kitware.com>

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  1fe432a4a94ef20f8fad1b516a04541ba00e2610 (commit)
       via  72c29b28286a37cde40e1b231d915f2b1fd249f8 (commit)
       via  28fe71051162e95fe5eb116c11cf36eacc3b1d7d (commit)
      from  b278af8e08066537fa4eab38b3001e1c0df9f8d8 (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=1fe432a4a94ef20f8fad1b516a04541ba00e2610
commit 1fe432a4a94ef20f8fad1b516a04541ba00e2610
Merge: b278af8 72c29b2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 15:50:10 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 15:50:10 2017 -0500

    Merge topic 'sanitizer-options' into next
    
    72c29b28 ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty
    28fe7105 Tests: Use CTEST_MEMORYCHECK_SANITIZER_OPTIONS where appropriate


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72c29b28286a37cde40e1b231d915f2b1fd249f8
commit 72c29b28286a37cde40e1b231d915f2b1fd249f8
Author:     Jamie Snape <jamie.snape at kitware.com>
AuthorDate: Fri Jan 20 15:21:40 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 15:49:15 2017 -0500

    ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index a062e64..beaef81 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -607,9 +607,13 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       this->MemoryTesterDynamicOptions.push_back("-E");
       this->MemoryTesterDynamicOptions.push_back("env");
       std::string envVar;
-      std::string extraOptions = ":" +
-        this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
+      std::string extraOptions;
       std::string suppressionsOption;
+      if (!this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions")
+             .empty()) {
+        extraOptions = ":" +
+          this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
+      }
       if (!this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile")
              .empty()) {
         suppressionsOption = ":suppressions=" +
@@ -632,7 +636,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
         envVar = "UBSAN_OPTIONS";
       }
       std::string outputFile =
-        envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\"";
+        envVar + "=log_path=" + this->MemoryTesterOutputFile;
       this->MemoryTesterEnvironmentVariable =
         outputFile + suppressionsOption + extraOptions;
       break;
diff --git a/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake
index 2a57b11..460d7cb 100644
--- a/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake
@@ -2,7 +2,7 @@
 # options
 
 message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=([^:]*).*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate AddressSanitizer don't do it
diff --git a/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake
index 3082e4b..f14a773 100644
--- a/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake
@@ -2,7 +2,7 @@
 # options
 
 message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=([^:]*).*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate address sanitizer don't do it
diff --git a/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
index af214c8..272130e 100644
--- a/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
@@ -2,7 +2,7 @@
 # options
 
 message("LSAN_OPTIONS = [$ENV{LSAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{LSAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=([^:]*).*" "\\1" LOG_FILE "$ENV{LSAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate LeakSanitizer don't do it
diff --git a/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake
index c87af9a..3fc9335 100644
--- a/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake
@@ -1,8 +1,8 @@
-# this file simulates a program that has been built with thread sanitizer
+# this file simulates a program that has been built with MemorySanitizer
 # options
 
 message("MSAN_OPTIONS = [$ENV{MSAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{MSAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=([^:]*).*" "\\1" LOG_FILE "$ENV{MSAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate address sanitizer don't do it
diff --git a/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake
index d591931..18208e2 100644
--- a/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake
@@ -1,8 +1,8 @@
-# this file simulates a program that has been built with thread sanitizer
+# this file simulates a program that has been built with ThreadSanitizer
 # options
 
 message("TSAN_OPTIONS = [$ENV{TSAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{TSAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=([^:]*).*" "\\1" LOG_FILE "$ENV{TSAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 set(error_types
diff --git a/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake
index 8ef3c0a..3c341a4 100644
--- a/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake
@@ -1,8 +1,8 @@
-# this file simulates a program that has been built with undefined behavior
-# sanitizer options
+# this file simulates a program that has been built with
+# UndefinedBehaviorSanitizer options
 
 message("UBSAN_OPTIONS = [$ENV{UBSAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{UBSAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=([^:]*).*" "\\1" LOG_FILE "$ENV{UBSAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate address sanitizer don't do it

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28fe71051162e95fe5eb116c11cf36eacc3b1d7d
commit 28fe71051162e95fe5eb116c11cf36eacc3b1d7d
Author:     Jamie Snape <jamie.snape at kitware.com>
AuthorDate: Fri Jan 20 15:21:16 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 15:48:27 2017 -0500

    Tests: Use CTEST_MEMORYCHECK_SANITIZER_OPTIONS where appropriate
    
    Previously the ThreadSanitizer and MemorySanitizer tests erroneously
    used `CTEST_MEMORYCHECK_COMMAND_OPTIONS`.

diff --git a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
index 352a381..ab4c5ab 100644
--- a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
@@ -19,7 +19,7 @@ unset(CMAKELISTS_EXTRA_CODE)
 #-----------------------------------------------------------------------------
 # add ThreadSanitizer test
 set(CTEST_EXTRA_CODE
-"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"report_bugs=1 history_size=5 exitcode=55\")
+"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"report_bugs=1:history_size=5:exitcode=55\")
 ")
 set(CMAKELISTS_EXTRA_CODE
 "add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\"
@@ -71,7 +71,7 @@ unset(CTEST_EXTRA_CODE)
 #-----------------------------------------------------------------------------
 # add MemorySanitizer test
 set(CTEST_EXTRA_CODE
-"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"simulate_sanitizer=1:report_bugs=1:history_size=5:exitcode=55\")
+"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1:report_bugs=1:history_size=5:exitcode=55\")
 ")
 set(CMAKELISTS_EXTRA_CODE
 "add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\"

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

Summary of changes:
 Source/CTest/cmCTestMemCheckHandler.cxx                      |   10 +++++++---
 Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake             |    4 ++--
 Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake |    2 +-
 Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake     |    2 +-
 Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake        |    2 +-
 Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake      |    4 ++--
 Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake      |    4 ++--
 .../ctest_memcheck/testUndefinedBehaviorSanitizer.cmake      |    6 +++---
 8 files changed, 19 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 20 16:30:54 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Jan 2017 16:30:54 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2276-gbb234a4
Message-ID: <20170120213054.5C0DFFA4D0@public.kitware.com>

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  bb234a4b50ecca06c00ab4f4cebdd44261f25653 (commit)
       via  1ee0ffab819d632d7570bee23a83807facbb45a2 (commit)
       via  1806e011cb2608c7ef62f345661dd35a899eb81c (commit)
      from  1fe432a4a94ef20f8fad1b516a04541ba00e2610 (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=bb234a4b50ecca06c00ab4f4cebdd44261f25653
commit bb234a4b50ecca06c00ab4f4cebdd44261f25653
Merge: 1fe432a 1ee0ffa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 16:30:53 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 16:30:53 2017 -0500

    Merge topic 'android-include-api' into next
    
    1ee0ffab Android: Pass sysroot include directory explicitly
    1806e011 Android: Fix c++_{static,shared} support include directory order


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ee0ffab819d632d7570bee23a83807facbb45a2
commit 1ee0ffab819d632d7570bee23a83807facbb45a2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 15:45:09 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 15:45:09 2017 -0500

    Android: Pass sysroot include directory explicitly
    
    The NDK's `build/core/definitions.mk` file adds compiler flags:
    
        -isystem $$(call host-path,$$(SYSROOT_INC)/usr/include)
    
    This passes the system include directory explicitly even though it is
    implied by `--sysroot=`.  The explicit flag places the directory
    earlier in the include path than the sysroot-default one would be.
    
    Teach CMake to add this include directory at the end of the standard
    include path for Android.  Otherwise the toolchain's `include-fixed/`
    directory may replace system headers with "fixed" copies that are not
    from the same API version.
    
    Closes: #16536

diff --git a/Modules/Platform/Android-Common.cmake b/Modules/Platform/Android-Common.cmake
index 8755d4f..cf2785a 100644
--- a/Modules/Platform/Android-Common.cmake
+++ b/Modules/Platform/Android-Common.cmake
@@ -149,4 +149,13 @@ macro(__android_compiler_common lang)
   if("x${lang}" STREQUAL "xCXX")
     __android_stl(CXX)
   endif()
+
+  # <ndk>/build/core/definitions.mk appends the sysroot's include directory
+  # explicitly at the end of the command-line include path so that it
+  # precedes the toolchain's builtin include directories.  This is
+  # necessary so that Android API-version-specific headers are preferred
+  # over those in the toolchain's `include-fixed` directory (which cannot
+  # possibly match all versions).
+  list(APPEND CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES "${CMAKE_SYSROOT}/usr/include")
+  list(REMOVE_ITEM CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES "/usr/include")
 endmacro()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1806e011cb2608c7ef62f345661dd35a899eb81c
commit 1806e011cb2608c7ef62f345661dd35a899eb81c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 15:39:27 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 15:39:27 2017 -0500

    Android: Fix c++_{static,shared} support include directory order
    
    The NDK's own build files:
    
        <ndk>/build/tools/build-cxx-stl.sh
        <ndk>/build/cmake/android.toolchain.cmake
    
    for the `c++_static` and `c++_shared` build types add the
    `<ndk>/sources/android/support/include` include directory
    between the two `<ndk>/sources/cxx-stl/llvm-libc++*` directories.
    Re-order our own include directory generation to match.
    
    Issue: #16536

diff --git a/Modules/Platform/Android/ndk-stl-c++.cmake b/Modules/Platform/Android/ndk-stl-c++.cmake
index b27015d..a12411c 100644
--- a/Modules/Platform/Android/ndk-stl-c++.cmake
+++ b/Modules/Platform/Android/ndk-stl-c++.cmake
@@ -6,16 +6,15 @@ macro(__android_stl_cxx lang filename)
   if(EXISTS "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libcxx/include/cstddef")
     # r12 and below
     __android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libcxx/include" 1)
+    __android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/android/support/include" 0)
     __android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++abi/libcxxabi/include" 1)
   else()
     # r13 and above
     __android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/include" 1)
+    __android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/android/support/include" 0)
     __android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++abi/include" 1)
   endif()
 
-  # Add a secondary include directory if it exists.
-  __android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/android/support/include" 0)
-
   # Add the library file.
   __android_stl_lib(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${CMAKE_ANDROID_ARCH_ABI}/${filename}" 1)
 endmacro()

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

Summary of changes:
 Modules/Platform/Android-Common.cmake      |    9 +++++++++
 Modules/Platform/Android/ndk-stl-c++.cmake |    5 ++---
 2 files changed, 11 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sat Jan 21 00:01:08 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Sat, 21 Jan 2017 00:01:08 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1146-gae629a0
Message-ID: <20170121050108.B4B1BF9FF4@public.kitware.com>

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  ae629a0dc9fa775230f4ce0157f13fde99381c9c (commit)
      from  6b4b8e6a600e177d6bbe41848e7de58e7392c81a (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=ae629a0dc9fa775230f4ce0157f13fde99381c9c
commit ae629a0dc9fa775230f4ce0157f13fde99381c9c
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sat Jan 21 00:01:05 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sat Jan 21 00:01:05 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 7990532..8329dec 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 20170120)
+set(CMake_VERSION_PATCH 20170121)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From domen.vrankar at gmail.com  Sat Jan 21 03:36:10 2017
From: domen.vrankar at gmail.com (Domen Vrankar)
Date: Sat, 21 Jan 2017 03:36:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2278-g639429c
Message-ID: <20170121083610.D8048FA63F@public.kitware.com>

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  639429cb85ed679c38223c7be1c4a0dfd3b3de39 (commit)
       via  82eb1702d16723c4f997ded593cbe7cb0ca75999 (commit)
      from  bb234a4b50ecca06c00ab4f4cebdd44261f25653 (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=639429cb85ed679c38223c7be1c4a0dfd3b3de39
commit 639429cb85ed679c38223c7be1c4a0dfd3b3de39
Merge: bb234a4 82eb170
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sat Jan 21 03:36:09 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 21 03:36:09 2017 -0500

    Merge topic 'cpack-stgz-minimal-test' into next
    
    82eb1702 fixup! CPack/STGZ: minimalistic packages test


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82eb1702d16723c4f997ded593cbe7cb0ca75999
commit 82eb1702d16723c4f997ded593cbe7cb0ca75999
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sat Jan 21 09:34:54 2017 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sat Jan 21 09:34:54 2017 +0100

    fixup! CPack/STGZ: minimalistic packages test

diff --git a/Tests/RunCMake/CPack/STGZ/Helpers.cmake b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
index 96be71b..08224d3 100644
--- a/Tests/RunCMake/CPack/STGZ/Helpers.cmake
+++ b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
@@ -10,15 +10,8 @@ function(getPackageContent FILE RESULT_VAR)
           OUTPUT_STRIP_TRAILING_WHITESPACE)
 
   if(extract_result_)
-    find_program(TAIL_EXECUTABLE tail)
-    find_program(PAX_EXECUTABLE pax)
-    find_program(GTAR_EXECUTABLE gtar)
-    find_program(TAR_EXECUTABLE tar)
-    find_program(GUNZIP_EXECUTABLE gunzip)
-
-    message(FATAL_ERROR "Extracting STGZ archive failed: '${extract_error_}';"
-        "'${TAIL_EXECUTABLE}'; '${PAX_EXECUTABLE}'; '${GTAR_EXECUTABLE}';"
-        "'${TAR_EXECUTABLE}'; '${GUNZIP_EXECUTABLE}'")
+    message(FATAL_ERROR "Extracting STGZ archive failed: '${extract_result_}';"
+          " '${extract_error_}'.")
   endif()
 
   file(GLOB_RECURSE package_content_ LIST_DIRECTORIES true RELATIVE
diff --git a/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake b/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake
index 46e7757..3b015ca 100644
--- a/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake
+++ b/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake
@@ -1,6 +1,11 @@
 function(get_test_prerequirements found_var config_file)
   if(EXISTS "/bin/sh")
-    file(WRITE "${config_file}" "")
-    set(${found_var} true PARENT_SCOPE)
+    #gunzip is not part of posix so we should not rely on it being installed
+    find_program(GUNZIP_EXECUTABLE gunzip)
+
+    if(GUNZIP_EXECUTABLE)
+      file(WRITE "${config_file}" "")
+      set(${found_var} true PARENT_SCOPE)
+    endif()
   endif()
 endfunction()

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

Summary of changes:
 Tests/RunCMake/CPack/STGZ/Helpers.cmake         |   11 ++---------
 Tests/RunCMake/CPack/STGZ/Prerequirements.cmake |    9 +++++++--
 2 files changed, 9 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Sat Jan 21 07:36:05 2017
From: brad.king at kitware.com (Brad King)
Date: Sat, 21 Jan 2017 07:36:05 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2280-g0d5d029
Message-ID: <20170121123605.64E4CFA394@public.kitware.com>

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  0d5d02923532b736915bcfbbb9677c4c2c8638a1 (commit)
       via  c66720d15dcf9bc8fd478e2bd3ec6cd0aed9fef4 (commit)
      from  639429cb85ed679c38223c7be1c4a0dfd3b3de39 (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=0d5d02923532b736915bcfbbb9677c4c2c8638a1
commit 0d5d02923532b736915bcfbbb9677c4c2c8638a1
Merge: 639429c c66720d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Jan 21 07:36:02 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 21 07:36:02 2017 -0500

    Merge topic 'lang_lint' into next
    
    c66720d1 Revert "Add properties to run the cpplint style checker with the compiler"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c66720d15dcf9bc8fd478e2bd3ec6cd0aed9fef4
commit c66720d15dcf9bc8fd478e2bd3ec6cd0aed9fef4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Jan 21 07:35:37 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Jan 21 07:35:37 2017 -0500

    Revert "Add properties to run the cpplint style checker with the compiler"
    
    This reverts commit 211bd24ab3388d44d018f0e4773f9db80c9eb9e0.

diff --git a/Auxiliary/vim/syntax/cmake.vim b/Auxiliary/vim/syntax/cmake.vim
index 1f19cb7..fabf9c1 100644
--- a/Auxiliary/vim/syntax/cmake.vim
+++ b/Auxiliary/vim/syntax/cmake.vim
@@ -32,11 +32,11 @@ syn region cmakeArguments start=/(/ end=/)/
 
 syn case match
 syn keyword cmakeProperty
-            \ ABSTRACT ADDITIONAL_MAKE_CLEAN_FILES ADVANCED ALIASED_TARGET ALLOW_DUPLICATE_CUSTOM_TARGETS ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_API ANDROID_API_MIN ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES ANDROID_GUI ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_DEBUG ARCHIVE_OUTPUT_DIRECTORY_RELEASE ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_DEBUG ARCHIVE_OUTPUT_NAME_RELEASE ATTACHED_FILES ATTACHED_FILES_ON_FAIL AUTOGEN_TARGETS_FOLDER AUTOGEN_TARGET_DEPENDS AUTOMOC AUTOMOC_MOC_OPTIONS AUTOMOC_TARGETS_FOLDER AUTORCC AUTORCC_OPTIONS AUTOUIC AUTOUIC_OPTIONS BINARY_DIR BUILD_WITH_INSTALL_RPATH BUNDLE BUNDLE_EXTENSION CACHE_VARIABLES CLEAN_NO_CUSTOM CMAKE_CONFIGURE_DEPENDS CMAKE_CXX_KNOWN_FEATURES CMAKE_C_KNOWN_FEATURES COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN COMPATIBLE_INTERFACE_STRING COMPILE_DEFINITIONS COMPILE_DEFINITIONS_DEBUG COMPILE_DEFINITIONS_RELEASE COMPILE_FEATURES COMPILE_FLAGS COMPILE_OPTIONS COMPILE_PDB_NAME COMPILE_PDB_NAME_DEBUG COMPILE_PDB_NAME_RELEASE COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG COMPILE_PDB_OUTPUT_DIRECTORY_RELEASE COST CPACK_DESKTOP_SHORTCUTS CPACK_NEVER_OVERWRITE CPACK_PERMANENT CPACK_STARTUP_SHORTCUTS CPACK_START_MENU_SHORTCUTS CPACK_WIX_ACL CROSSCOMPILING_EMULATOR CXX_EXTENSIONS CXX_CPPLINT CXX_STANDARD CXX_STANDARD_REQUIRED C_EXTENSIONS C_CPPLINT C_STANDARD C_STANDARD_REQUIRED DEBUG_CONFIGURATIONS DEBUG_POSTFIX DEFINE_SYMBOL DEFINITIONS DEPENDS DISABLED_FEATURES ECLIPSE_EXTRA_NATURES ENABLED_FEATURES ENABLED_LANGUAGES ENABLE_EXPORTS ENVIRONMENT EXCLUDE_FROM_ALL EXCLUDE_FROM_DEFAULT_BUILD EXCLUDE_FROM_DEFAULT_BUILD_DEBUG EXCLUDE_FROM_DEFAULT_BUILD_RELEASE EXPORT_NAME EXTERNAL_OBJECT EchoString FAIL_REGULAR_EXPRESSION FIND_LIBRARY_USE_LIB64_PATHS FIND_LIBRARY_USE_OPENBSD_VERSIONING FOLDER FRAMEWORK FRAMEWORK_VERSION Fortran_FORMAT Fortran_MODULE_DIRECTORY GENERATED GENERATOR_FILE_NAME GLOBAL_DEPENDS_DEBUG_MODE GLOBAL_DEPENDS_NO_CYCLES GNUtoMS HAS_CXX HEADER_FILE_ONLY HELPSTRING IMPLICIT_DEPENDS_INCLUDE_TRANSFORM IMPORTED IMPORTED_CONFIGURATIONS IMPORTED_IMPLIB IMPORTED_IMPLIB_DEBUG IMPORTED_IMPLIB_RELEASE IMPORTED_LINK_DEPENDENT_LIBRARIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUG IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_LANGUAGES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE IMPORTED_LINK_INTERFACE_LIBRARIES IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_MULTIPLICITY IMPORTED_LINK_INTERFACE_MULTIPLICITY_DEBUG IMPORTED_LINK_INTERFACE_MULTIPLICITY_RELEASE IMPORTED_LOCATION IMPORTED_LOCATION_DEBUG IMPORTED_LOCATION_RELEASE IMPORTED_NO_SONAME IMPORTED_NO_SONAME_DEBUG IMPORTED_NO_SONAME_RELEASE IMPORTED_SONAME IMPORTED_SONAME_DEBUG IMPORTED_SONAME_RELEASE IMPORT_PREFIX IMPORT_SUFFIX INCLUDE_DIRECTORIES INCLUDE_REGULAR_EXPRESSION INSTALL_NAME_DIR INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH INTERFACE_AUTOUIC_OPTIONS INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS INTERFACE_INCLUDE_DIRECTORIES INTERFACE_LINK_LIBRARIES INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SOURCES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES INTERPROCEDURAL_OPTIMIZATION INTERPROCEDURAL_OPTIMIZATION_DEBUG INTERPROCEDURAL_OPTIMIZATION_RELEASE IN_TRY_COMPILE JOB_POOLS JOB_POOL_COMPILE JOB_POOL_LINK KEEP_EXTENSION LABELS LANGUAGE LIBRARY_OUTPUT_DIRECTORY LIBRARY_OUTPUT_DIRECTORY_DEBUG LIBRARY_OUTPUT_DIRECTORY_RELEASE LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_DEBUG LIBRARY_OUTPUT_NAME_RELEASE LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED LINK_DIRECTORIES LINK_FLAGS LINK_FLAGS_DEBUG LINK_FLAGS_RELEASE LINK_INTERFACE_LIBRARIES LINK_INTERFACE_LIBRARIES_DEBUG LINK_INTERFACE_LIBRARIES_RELEASE LINK_INTERFACE_MULTIPLICITY LINK_INTERFACE_MULTIPLICITY_DEBUG LINK_INTERFACE_MULTIPLICITY_RELEASE LINK_LIBRARIES LINK_SEARCH_END_STATIC LINK_SEARCH_START_STATIC LISTFILE_STACK LOCATION LOCATION_DEBUG LOCATION_RELEASE MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_PACKAGE_LOCATION MACOSX_RPATH MACROS MAP_IMPORTED_CONFIG_DEBUG MAP_IMPORTED_CONFIG_RELEASE MEASUREMENT MODIFIED NAME NO_SONAME NO_SYSTEM_FROM_IMPORTED OBJECT_DEPENDS OBJECT_OUTPUTS OSX_ARCHITECTURES OSX_ARCHITECTURES_DEBUG OSX_ARCHITECTURES_RELEASE OUTPUT_NAME OUTPUT_NAME_DEBUG OUTPUT_NAME_RELEASE PACKAGES_FOUND PACKAGES_NOT_FOUND PARENT_DIRECTORY PASS_REGULAR_EXPRESSION PDB_NAME PDB_NAME_DEBUG PDB_NAME_RELEASE PDB_OUTPUT_DIRECTORY PDB_OUTPUT_DIRECTORY_DEBUG PDB_OUTPUT_DIRECTORY_RELEASE POSITION_INDEPENDENT_CODE POST_INSTALL_SCRIPT PREDEFINED_TARGETS_FOLDER PREFIX PRE_INSTALL_SCRIPT PRIVATE_HEADER PROCESSORS PROJECT_LABEL PUBLIC_HEADER REPORT_UNDEFINED_PROPERTIES REQUIRED_FILES RESOURCE RESOURCE_LOCK RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK RULE_MESSAGES RUNTIME_OUTPUT_DIRECTORY RUNTIME_OUTPUT_DIRECTORY_DEBUG RUNTIME_OUTPUT_DIRECTORY_RELEASE RUNTIME_OUTPUT_NAME RUNTIME_OUTPUT_NAME_DEBUG RUNTIME_OUTPUT_NAME_RELEASE RUN_SERIAL SKIP_BUILD_RPATH SKIP_RETURN_CODE SOURCES SOURCE_DIR SOVERSION STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_DEBUG STATIC_LIBRARY_FLAGS_RELEASE STRINGS SUFFIX SYMBOLIC TARGET_ARCHIVES_MAY_BE_SHARED_LIBS TARGET_MESSAGES TARGET_SUPPORTS_SHARED_LIBS TEST_INCLUDE_FILE TIMEOUT TYPE USE_FOLDERS VALUE VARIABLES VERSION VISIBILITY_INLINES_HIDDEN VS_DEPLOYMENT_CONTENT VS_DEPLOYMENT_LOCATION VS_DESKTOP_EXTENSIONS_VERSION VS_DOTNET_REFERENCES VS_DOTNET_TARGET_FRAMEWORK_VERSION VS_GLOBAL_KEYWORD VS_GLOBAL_PROJECT_TYPES VS_GLOBAL_ROOTNAMESPACE VS_IOT_EXTENSIONS_VERSION VS_IOT_STARTUP_TASK VS_KEYWORD VS_MOBILE_EXTENSIONS_VERSION VS_SCC_AUXPATH VS_SCC_LOCALPATH VS_SCC_PROJECTNAME VS_SCC_PROVIDER VS_SHADER_ENTRYPOINT VS_SHADER_FLAGS VS_SHADER_MODEL VS_SHADER_TYPE VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES VS_XAML_TYPE WILL_FAIL WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS WORKING_DIRECTORY WRAP_EXCLUDE XCODE_EXPLICIT_FILE_TYPE XCODE_LAST_KNOWN_FILE_TYPE XCTEST
+            \ ABSTRACT ADDITIONAL_MAKE_CLEAN_FILES ADVANCED ALIASED_TARGET ALLOW_DUPLICATE_CUSTOM_TARGETS ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_API ANDROID_API_MIN ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES ANDROID_GUI ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_DEBUG ARCHIVE_OUTPUT_DIRECTORY_RELEASE ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_DEBUG ARCHIVE_OUTPUT_NAME_RELEASE ATTACHED_FILES ATTACHED_FILES_ON_FAIL AUTOGEN_TARGETS_FOLDER AUTOGEN_TARGET_DEPENDS AUTOMOC AUTOMOC_MOC_OPTIONS AUTOMOC_TARGETS_FOLDER AUTORCC AUTORCC_OPTIONS AUTOUIC AUTOUIC_OPTIONS BINARY_DIR BUILD_WITH_INSTALL_RPATH BUNDLE BUNDLE_EXTENSION CACHE_VARIABLES CLEAN_NO_CUSTOM CMAKE_CONFIGURE_DEPENDS CMAKE_CXX_KNOWN_FEATURES CMAKE_C_KNOWN_FEATURES COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN COMPATIBLE_INTERFACE_STRING COMPILE_DEFINITIONS COMPILE_DEFINITIONS_DEBUG COMPILE_DEFINITIONS_RELEASE COMPILE_FEATURES COMPILE_FLAGS COMPILE_OPTIONS COMPILE_PDB_NAME COMPILE_PDB_NAME_DEBUG COMPILE_PDB_NAME_RELEASE COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG COMPILE_PDB_OUTPUT_DIRECTORY_RELEASE COST CPACK_DESKTOP_SHORTCUTS CPACK_NEVER_OVERWRITE CPACK_PERMANENT CPACK_STARTUP_SHORTCUTS CPACK_START_MENU_SHORTCUTS CPACK_WIX_ACL CROSSCOMPILING_EMULATOR CXX_EXTENSIONS CXX_STANDARD CXX_STANDARD_REQUIRED C_EXTENSIONS C_STANDARD C_STANDARD_REQUIRED DEBUG_CONFIGURATIONS DEBUG_POSTFIX DEFINE_SYMBOL DEFINITIONS DEPENDS DISABLED_FEATURES ECLIPSE_EXTRA_NATURES ENABLED_FEATURES ENABLED_LANGUAGES ENABLE_EXPORTS ENVIRONMENT EXCLUDE_FROM_ALL EXCLUDE_FROM_DEFAULT_BUILD EXCLUDE_FROM_DEFAULT_BUILD_DEBUG EXCLUDE_FROM_DEFAULT_BUILD_RELEASE EXPORT_NAME EXTERNAL_OBJECT EchoString FAIL_REGULAR_EXPRESSION FIND_LIBRARY_USE_LIB64_PATHS FIND_LIBRARY_USE_OPENBSD_VERSIONING FOLDER FRAMEWORK FRAMEWORK_VERSION Fortran_FORMAT Fortran_MODULE_DIRECTORY GENERATED GENERATOR_FILE_NAME GLOBAL_DEPENDS_DEBUG_MODE GLOBAL_DEPENDS_NO_CYCLES GNUtoMS HAS_CXX HEADER_FILE_ONLY HELPSTRING IMPLICIT_DEPENDS_INCLUDE_TRANSFORM IMPORTED IMPORTED_CONFIGURATIONS IMPORTED_IMPLIB IMPORTED_IMPLIB_DEBUG IMPORTED_IMPLIB_RELEASE IMPORTED_LINK_DEPENDENT_LIBRARIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUG IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_LANGUAGES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE IMPORTED_LINK_INTERFACE_LIBRARIES IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_MULTIPLICITY IMPORTED_LINK_INTERFACE_MULTIPLICITY_DEBUG IMPORTED_LINK_INTERFACE_MULTIPLICITY_RELEASE IMPORTED_LOCATION IMPORTED_LOCATION_DEBUG IMPORTED_LOCATION_RELEASE IMPORTED_NO_SONAME IMPORTED_NO_SONAME_DEBUG IMPORTED_NO_SONAME_RELEASE IMPORTED_SONAME IMPORTED_SONAME_DEBUG IMPORTED_SONAME_RELEASE IMPORT_PREFIX IMPORT_SUFFIX INCLUDE_DIRECTORIES INCLUDE_REGULAR_EXPRESSION INSTALL_NAME_DIR INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH INTERFACE_AUTOUIC_OPTIONS INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS INTERFACE_INCLUDE_DIRECTORIES INTERFACE_LINK_LIBRARIES INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SOURCES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES INTERPROCEDURAL_OPTIMIZATION INTERPROCEDURAL_OPTIMIZATION_DEBUG INTERPROCEDURAL_OPTIMIZATION_RELEASE IN_TRY_COMPILE JOB_POOLS JOB_POOL_COMPILE JOB_POOL_LINK KEEP_EXTENSION LABELS LANGUAGE LIBRARY_OUTPUT_DIRECTORY LIBRARY_OUTPUT_DIRECTORY_DEBUG LIBRARY_OUTPUT_DIRECTORY_RELEASE LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_DEBUG LIBRARY_OUTPUT_NAME_RELEASE LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED LINK_DIRECTORIES LINK_FLAGS LINK_FLAGS_DEBUG LINK_FLAGS_RELEASE LINK_INTERFACE_LIBRARIES LINK_INTERFACE_LIBRARIES_DEBUG LINK_INTERFACE_LIBRARIES_RELEASE LINK_INTERFACE_MULTIPLICITY LINK_INTERFACE_MULTIPLICITY_DEBUG LINK_INTERFACE_MULTIPLICITY_RELEASE LINK_LIBRARIES LINK_SEARCH_END_STATIC LINK_SEARCH_START_STATIC LISTFILE_STACK LOCATION LOCATION_DEBUG LOCATION_RELEASE MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_PACKAGE_LOCATION MACOSX_RPATH MACROS MAP_IMPORTED_CONFIG_DEBUG MAP_IMPORTED_CONFIG_RELEASE MEASUREMENT MODIFIED NAME NO_SONAME NO_SYSTEM_FROM_IMPORTED OBJECT_DEPENDS OBJECT_OUTPUTS OSX_ARCHITECTURES OSX_ARCHITECTURES_DEBUG OSX_ARCHITECTURES_RELEASE OUTPUT_NAME OUTPUT_NAME_DEBUG OUTPUT_NAME_RELEASE PACKAGES_FOUND PACKAGES_NOT_FOUND PARENT_DIRECTORY PASS_REGULAR_EXPRESSION PDB_NAME PDB_NAME_DEBUG PDB_NAME_RELEASE PDB_OUTPUT_DIRECTORY PDB_OUTPUT_DIRECTORY_DEBUG PDB_OUTPUT_DIRECTORY_RELEASE POSITION_INDEPENDENT_CODE POST_INSTALL_SCRIPT PREDEFINED_TARGETS_FOLDER PREFIX PRE_INSTALL_SCRIPT PRIVATE_HEADER PROCESSORS PROJECT_LABEL PUBLIC_HEADER REPORT_UNDEFINED_PROPERTIES REQUIRED_FILES RESOURCE RESOURCE_LOCK RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK RULE_MESSAGES RUNTIME_OUTPUT_DIRECTORY RUNTIME_OUTPUT_DIRECTORY_DEBUG RUNTIME_OUTPUT_DIRECTORY_RELEASE RUNTIME_OUTPUT_NAME RUNTIME_OUTPUT_NAME_DEBUG RUNTIME_OUTPUT_NAME_RELEASE RUN_SERIAL SKIP_BUILD_RPATH SKIP_RETURN_CODE SOURCES SOURCE_DIR SOVERSION STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_DEBUG STATIC_LIBRARY_FLAGS_RELEASE STRINGS SUFFIX SYMBOLIC TARGET_ARCHIVES_MAY_BE_SHARED_LIBS TARGET_MESSAGES TARGET_SUPPORTS_SHARED_LIBS TEST_INCLUDE_FILE TIMEOUT TYPE USE_FOLDERS VALUE VARIABLES VERSION VISIBILITY_INLINES_HIDDEN VS_DEPLOYMENT_CONTENT VS_DEPLOYMENT_LOCATION VS_DESKTOP_EXTENSIONS_VERSION VS_DOTNET_REFERENCES VS_DOTNET_TARGET_FRAMEWORK_VERSION VS_GLOBAL_KEYWORD VS_GLOBAL_PROJECT_TYPES VS_GLOBAL_ROOTNAMESPACE VS_IOT_EXTENSIONS_VERSION VS_IOT_STARTUP_TASK VS_KEYWORD VS_MOBILE_EXTENSIONS_VERSION VS_SCC_AUXPATH VS_SCC_LOCALPATH VS_SCC_PROJECTNAME VS_SCC_PROVIDER VS_SHADER_ENTRYPOINT VS_SHADER_FLAGS VS_SHADER_MODEL VS_SHADER_TYPE VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES VS_XAML_TYPE WILL_FAIL WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS WORKING_DIRECTORY WRAP_EXCLUDE XCODE_EXPLICIT_FILE_TYPE XCODE_LAST_KNOWN_FILE_TYPE XCTEST
             \ contained
 
 syn keyword cmakeVariable
-            \ <PROJECT-NAME>_BINARY_DIR <PROJECT-NAME>_SOURCE_DIR <PROJECT-NAME>_VERSION <PROJECT-NAME>_VERSION_MAJOR <PROJECT-NAME>_VERSION_MINOR <PROJECT-NAME>_VERSION_PATCH <PROJECT-NAME>_VERSION_TWEAK APPLE BORLAND BUILD_SHARED_LIBS CMAKE_<CONFIG>_POSTFIX CMAKE_<LANG>_ARCHIVE_APPEND CMAKE_<LANG>_ARCHIVE_CREATE CMAKE_<LANG>_ARCHIVE_FINISH CMAKE_<LANG>_COMPILER CMAKE_<LANG>_COMPILER_ABI CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN CMAKE_<LANG>_COMPILER_ID CMAKE_<LANG>_COMPILER_LAUNCHER CMAKE_<LANG>_COMPILER_LOADED CMAKE_<LANG>_COMPILER_TARGET CMAKE_<LANG>_COMPILER_VERSION CMAKE_<LANG>_COMPILE_OBJECT CMAKE_<LANG>_CREATE_SHARED_LIBRARY CMAKE_<LANG>_CREATE_SHARED_MODULE CMAKE_<LANG>_CREATE_STATIC_LIBRARY CMAKE_<LANG>_FLAGS CMAKE_<LANG>_FLAGS_DEBUG CMAKE_<LANG>_FLAGS_MINSIZEREL CMAKE_<LANG>_FLAGS_RELEASE CMAKE_<LANG>_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_GHS_KERNEL_FLAGS_DEBUG CMAKE_<LANG>_GHS_KERNEL_FLAGS_MINSIZEREL CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELEASE CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_IGNORE_EXTENSIONS CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_LIBRARIES CMAKE_<LANG>_INCLUDE_WHAT_YOU_USE CMAKE_<LANG>_CPPLINT CMAKE_<LANG>_LIBRARY_ARCHITECTURE CMAKE_<LANG>_LINKER_PREFERENCE CMAKE_<LANG>_LINKER_PREFERENCE_PROPAGATES CMAKE_<LANG>_LINK_EXECUTABLE CMAKE_<LANG>_OUTPUT_EXTENSION CMAKE_<LANG>_PLATFORM_ID CMAKE_<LANG>_SIMULATE_ID CMAKE_<LANG>_SIMULATE_VERSION CMAKE_<LANG>_SIZEOF_DATA_PTR CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS CMAKE_<LANG>_VISIBILITY_PRESET CMAKE_ABSOLUTE_DESTINATION_FILES CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS CMAKE_ANDROID_API CMAKE_ANDROID_API_MIN CMAKE_ANDROID_ARCH CMAKE_ANDROID_ASSETS_DIRECTORIES CMAKE_ANDROID_GUI CMAKE_ANDROID_JAR_DEPENDENCIES CMAKE_ANDROID_JAR_DIRECTORIES CMAKE_ANDROID_JAVA_SOURCE_DIR CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES CMAKE_ANDROID_PROCESS_MAX CMAKE_ANDROID_PROGUARD CMAKE_ANDROID_PROGUARD_CONFIG_PATH CMAKE_ANDROID_SECURE_PROPS_PATH CMAKE_ANDROID_SKIP_ANT_STEP CMAKE_ANDROID_STL_TYPE CMAKE_APPBUNDLE_PATH CMAKE_AR CMAKE_ARCHIVE_OUTPUT_DIRECTORY CMAKE_ARCHIVE_OUTPUT_DIRECTORY_<CONFIG> CMAKE_ARGC CMAKE_ARGV0 CMAKE_AUTOMOC CMAKE_AUTOMOC_MOC_OPTIONS CMAKE_AUTOMOC_RELAXED_MODE CMAKE_AUTORCC CMAKE_AUTORCC_OPTIONS CMAKE_AUTOUIC CMAKE_AUTOUIC_OPTIONS CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BINARY_DIR CMAKE_BUILD_TOOL CMAKE_BUILD_TYPE CMAKE_BUILD_WITH_INSTALL_RPATH CMAKE_CACHEFILE_DIR CMAKE_CACHE_MAJOR_VERSION CMAKE_CACHE_MINOR_VERSION CMAKE_CACHE_PATCH_VERSION CMAKE_CFG_INTDIR CMAKE_CL_64 CMAKE_COLOR_MAKEFILE CMAKE_COMMAND CMAKE_COMPILER_2005 CMAKE_COMPILER_IS_GNU<LANG> CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_CONFIGURATION_TYPES CMAKE_CROSSCOMPILING CMAKE_CROSSCOMPILING_EMULATOR CMAKE_CTEST_COMMAND CMAKE_CURRENT_BINARY_DIR CMAKE_CURRENT_LIST_DIR CMAKE_CURRENT_LIST_FILE CMAKE_CURRENT_LIST_LINE CMAKE_CURRENT_SOURCE_DIR CMAKE_CXX_COMPILE_FEATURES CMAKE_CXX_EXTENSIONS CMAKE_CXX_STANDARD CMAKE_CXX_STANDARD_REQUIRED CMAKE_C_COMPILE_FEATURES CMAKE_C_EXTENSIONS CMAKE_C_STANDARD CMAKE_C_STANDARD_REQUIRED CMAKE_DEBUG_POSTFIX CMAKE_DEBUG_TARGET_PROPERTIES CMAKE_DISABLE_FIND_PACKAGE_<PackageName> CMAKE_DL_LIBS CMAKE_EDIT_COMMAND CMAKE_ENABLE_EXPORTS CMAKE_ERROR_DEPRECATED CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_EXECUTABLE_SUFFIX CMAKE_EXE_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS_<CONFIG> CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_NO_PACKAGE_REGISTRY CMAKE_EXTRA_GENERATOR CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES CMAKE_FIND_APPBUNDLE CMAKE_FIND_FRAMEWORK CMAKE_FIND_LIBRARY_PREFIXES CMAKE_FIND_LIBRARY_SUFFIXES CMAKE_FIND_NO_INSTALL_PREFIX CMAKE_FIND_PACKAGE_NAME CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_WARN_NO_MODULE CMAKE_FIND_ROOT_PATH CMAKE_FIND_ROOT_PATH_MODE_INCLUDE CMAKE_FIND_ROOT_PATH_MODE_LIBRARY CMAKE_FIND_ROOT_PATH_MODE_PACKAGE CMAKE_FIND_ROOT_PATH_MODE_PROGRAM CMAKE_FRAMEWORK_PATH CMAKE_Fortran_FORMAT CMAKE_Fortran_MODDIR_DEFAULT CMAKE_Fortran_MODDIR_FLAG CMAKE_Fortran_MODOUT_FLAG CMAKE_Fortran_MODULE_DIRECTORY CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET CMAKE_GNUtoMS CMAKE_HOME_DIRECTORY CMAKE_HOST_APPLE CMAKE_HOST_SYSTEM CMAKE_HOST_SYSTEM_NAME CMAKE_HOST_SYSTEM_PROCESSOR CMAKE_HOST_SYSTEM_VERSION CMAKE_HOST_UNIX CMAKE_HOST_WIN32 CMAKE_IGNORE_PATH CMAKE_IMPORT_LIBRARY_PREFIX CMAKE_IMPORT_LIBRARY_SUFFIX CMAKE_INCLUDE_CURRENT_DIR CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE CMAKE_INCLUDE_DIRECTORIES_BEFORE CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE CMAKE_INCLUDE_PATH CMAKE_INSTALL_DEFAULT_COMPONENT_NAME CMAKE_INSTALL_MESSAGE CMAKE_INSTALL_NAME_DIR CMAKE_INSTALL_PREFIX CMAKE_INSTALL_RPATH CMAKE_INSTALL_RPATH_USE_LINK_PATH CMAKE_INTERNAL_PLATFORM_ABI CMAKE_IOS_INSTALL_COMBINED CMAKE_JOB_POOL_COMPILE CMAKE_JOB_POOL_LINK CMAKE_LIBRARY_ARCHITECTURE CMAKE_LIBRARY_ARCHITECTURE_REGEX CMAKE_LIBRARY_OUTPUT_DIRECTORY CMAKE_LIBRARY_OUTPUT_DIRECTORY_<CONFIG> CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_FLAG CMAKE_LINK_DEF_FILE_FLAG CMAKE_LINK_DEPENDS_NO_SHARED CMAKE_LINK_INTERFACE_LIBRARIES CMAKE_LINK_LIBRARY_FILE_FLAG CMAKE_LINK_LIBRARY_FLAG CMAKE_LINK_LIBRARY_SUFFIX CMAKE_LINK_SEARCH_END_STATIC CMAKE_LINK_SEARCH_START_STATIC CMAKE_MACOSX_BUNDLE CMAKE_MACOSX_RPATH CMAKE_MAJOR_VERSION CMAKE_MAKE_PROGRAM CMAKE_MAP_IMPORTED_CONFIG_<CONFIG> CMAKE_MATCH_COUNT CMAKE_MFC_FLAG CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_MINOR_VERSION CMAKE_MODULE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS_<CONFIG> CMAKE_MODULE_PATH CMAKE_NOT_USING_CONFIG_FLAGS CMAKE_NO_BUILTIN_CHRPATH CMAKE_NO_SYSTEM_FROM_IMPORTED CMAKE_OBJECT_PATH_MAX CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT CMAKE_PARENT_LIST_FILE CMAKE_PATCH_VERSION CMAKE_PDB_OUTPUT_DIRECTORY CMAKE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_POLICY_DEFAULT_CMP<NNNN> CMAKE_POLICY_WARNING_CMP<NNNN> CMAKE_POSITION_INDEPENDENT_CODE CMAKE_PREFIX_PATH CMAKE_PROGRAM_PATH CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE CMAKE_PROJECT_NAME CMAKE_RANLIB CMAKE_ROOT CMAKE_RUNTIME_OUTPUT_DIRECTORY CMAKE_RUNTIME_OUTPUT_DIRECTORY_<CONFIG> CMAKE_SCRIPT_MODE_FILE CMAKE_SHARED_LIBRARY_PREFIX CMAKE_SHARED_LIBRARY_SUFFIX CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS_<CONFIG> CMAKE_SHARED_MODULE_PREFIX CMAKE_SHARED_MODULE_SUFFIX CMAKE_SIZEOF_VOID_P CMAKE_SKIP_BUILD_RPATH CMAKE_SKIP_INSTALL_ALL_DEPENDENCY CMAKE_SKIP_INSTALL_RPATH CMAKE_SKIP_INSTALL_RULES CMAKE_SKIP_RPATH CMAKE_SOURCE_DIR CMAKE_STAGING_PREFIX CMAKE_STANDARD_LIBRARIES CMAKE_STATIC_LIBRARY_PREFIX CMAKE_STATIC_LIBRARY_SUFFIX CMAKE_STATIC_LINKER_FLAGS CMAKE_STATIC_LINKER_FLAGS_<CONFIG> CMAKE_SYSROOT CMAKE_SYSTEM CMAKE_SYSTEM_APPBUNDLE_PATH CMAKE_SYSTEM_FRAMEWORK_PATH CMAKE_SYSTEM_IGNORE_PATH CMAKE_SYSTEM_INCLUDE_PATH CMAKE_SYSTEM_LIBRARY_PATH CMAKE_SYSTEM_NAME CMAKE_SYSTEM_PREFIX_PATH CMAKE_SYSTEM_PROCESSOR CMAKE_SYSTEM_PROGRAM_PATH CMAKE_SYSTEM_VERSION CMAKE_TOOLCHAIN_FILE CMAKE_TRY_COMPILE_CONFIGURATION CMAKE_TWEAK_VERSION CMAKE_USER_MAKE_RULES_OVERRIDE CMAKE_USER_MAKE_RULES_OVERRIDE_<LANG> CMAKE_USE_RELATIVE_PATHS CMAKE_VERBOSE_MAKEFILE CMAKE_VERSION CMAKE_VISIBILITY_INLINES_HIDDEN CMAKE_VS_DEVENV_COMMAND CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD CMAKE_VS_INTEL_Fortran_PROJECT_VERSION CMAKE_VS_MSBUILD_COMMAND CMAKE_VS_MSDEV_COMMAND CMAKE_VS_NsightTegra_VERSION CMAKE_VS_PLATFORM_NAME CMAKE_VS_PLATFORM_TOOLSET CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION CMAKE_WARN_DEPRECATED CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_WIN32_EXECUTABLE CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS CMAKE_XCODE_ATTRIBUTE_<an-attribute> CMAKE_XCODE_PLATFORM_TOOLSET CPACK_ABSOLUTE_DESTINATION_FILES CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CPACK_INCLUDE_TOPLEVEL_DIRECTORY CPACK_INSTALL_SCRIPT CPACK_PACKAGING_INSTALL_PREFIX CPACK_SET_DESTDIR CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CTEST_BINARY_DIRECTORY CTEST_BUILD_COMMAND CTEST_BUILD_NAME CTEST_BZR_COMMAND CTEST_BZR_UPDATE_OPTIONS CTEST_CHANGE_ID CTEST_CHECKOUT_COMMAND CTEST_CONFIGURATION_TYPE CTEST_CONFIGURE_COMMAND CTEST_COVERAGE_COMMAND CTEST_COVERAGE_EXTRA_FLAGS CTEST_CURL_OPTIONS CTEST_CUSTOM_COVERAGE_EXCLUDE CTEST_CUSTOM_ERROR_EXCEPTION CTEST_CUSTOM_ERROR_MATCH CTEST_CUSTOM_ERROR_POST_CONTEXT CTEST_CUSTOM_ERROR_PRE_CONTEXT CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MEMCHECK_IGNORE CTEST_CUSTOM_POST_MEMCHECK CTEST_CUSTOM_POST_TEST CTEST_CUSTOM_PRE_MEMCHECK CTEST_CUSTOM_PRE_TEST CTEST_CUSTOM_TEST_IGNORE CTEST_CUSTOM_WARNING_EXCEPTION CTEST_CUSTOM_WARNING_MATCH CTEST_CVS_CHECKOUT CTEST_CVS_COMMAND CTEST_CVS_UPDATE_OPTIONS CTEST_DROP_LOCATION CTEST_DROP_METHOD CTEST_DROP_SITE CTEST_DROP_SITE_CDASH CTEST_DROP_SITE_PASSWORD CTEST_DROP_SITE_USER CTEST_EXTRA_COVERAGE_GLOB CTEST_GIT_COMMAND CTEST_GIT_UPDATE_CUSTOM CTEST_GIT_UPDATE_OPTIONS CTEST_HG_COMMAND CTEST_HG_UPDATE_OPTIONS CTEST_MEMORYCHECK_COMMAND CTEST_MEMORYCHECK_COMMAND_OPTIONS CTEST_MEMORYCHECK_SANITIZER_OPTIONS CTEST_MEMORYCHECK_SUPPRESSIONS_FILE CTEST_MEMORYCHECK_TYPE CTEST_NIGHTLY_START_TIME CTEST_P4_CLIENT CTEST_P4_COMMAND CTEST_P4_OPTIONS CTEST_P4_UPDATE_OPTIONS CTEST_SCP_COMMAND CTEST_SITE CTEST_SOURCE_DIRECTORY CTEST_SVN_COMMAND CTEST_SVN_OPTIONS CTEST_SVN_UPDATE_OPTIONS CTEST_TEST_LOAD CTEST_TEST_TIMEOUT CTEST_TRIGGER_SITE CTEST_UPDATE_COMMAND CTEST_UPDATE_OPTIONS CTEST_UPDATE_VERSION_ONLY CTEST_USE_LAUNCHERS CYGWIN ENV EXECUTABLE_OUTPUT_PATH GHS-MULTI LIBRARY_OUTPUT_PATH MINGW MSVC MSVC10 MSVC11 MSVC12 MSVC14 MSVC60 MSVC70 MSVC71 MSVC80 MSVC90 MSVC_IDE MSVC_VERSION PROJECT_BINARY_DIR PROJECT_NAME PROJECT_SOURCE_DIR PROJECT_VERSION PROJECT_VERSION_MAJOR PROJECT_VERSION_MINOR PROJECT_VERSION_PATCH PROJECT_VERSION_TWEAK UNIX WIN32 WINCE WINDOWS_PHONE WINDOWS_STORE XCODE_VERSION
+            \ <PROJECT-NAME>_BINARY_DIR <PROJECT-NAME>_SOURCE_DIR <PROJECT-NAME>_VERSION <PROJECT-NAME>_VERSION_MAJOR <PROJECT-NAME>_VERSION_MINOR <PROJECT-NAME>_VERSION_PATCH <PROJECT-NAME>_VERSION_TWEAK APPLE BORLAND BUILD_SHARED_LIBS CMAKE_<CONFIG>_POSTFIX CMAKE_<LANG>_ARCHIVE_APPEND CMAKE_<LANG>_ARCHIVE_CREATE CMAKE_<LANG>_ARCHIVE_FINISH CMAKE_<LANG>_COMPILER CMAKE_<LANG>_COMPILER_ABI CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN CMAKE_<LANG>_COMPILER_ID CMAKE_<LANG>_COMPILER_LAUNCHER CMAKE_<LANG>_COMPILER_LOADED CMAKE_<LANG>_COMPILER_TARGET CMAKE_<LANG>_COMPILER_VERSION CMAKE_<LANG>_COMPILE_OBJECT CMAKE_<LANG>_CREATE_SHARED_LIBRARY CMAKE_<LANG>_CREATE_SHARED_MODULE CMAKE_<LANG>_CREATE_STATIC_LIBRARY CMAKE_<LANG>_FLAGS CMAKE_<LANG>_FLAGS_DEBUG CMAKE_<LANG>_FLAGS_MINSIZEREL CMAKE_<LANG>_FLAGS_RELEASE CMAKE_<LANG>_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_GHS_KERNEL_FLAGS_DEBUG CMAKE_<LANG>_GHS_KERNEL_FLAGS_MINSIZEREL CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELEASE CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_IGNORE_EXTENSIONS CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_LIBRARIES CMAKE_<LANG>_INCLUDE_WHAT_YOU_USE CMAKE_<LANG>_LIBRARY_ARCHITECTURE CMAKE_<LANG>_LINKER_PREFERENCE CMAKE_<LANG>_LINKER_PREFERENCE_PROPAGATES CMAKE_<LANG>_LINK_EXECUTABLE CMAKE_<LANG>_OUTPUT_EXTENSION CMAKE_<LANG>_PLATFORM_ID CMAKE_<LANG>_SIMULATE_ID CMAKE_<LANG>_SIMULATE_VERSION CMAKE_<LANG>_SIZEOF_DATA_PTR CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS CMAKE_<LANG>_VISIBILITY_PRESET CMAKE_ABSOLUTE_DESTINATION_FILES CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS CMAKE_ANDROID_API CMAKE_ANDROID_API_MIN CMAKE_ANDROID_ARCH CMAKE_ANDROID_ASSETS_DIRECTORIES CMAKE_ANDROID_GUI CMAKE_ANDROID_JAR_DEPENDENCIES CMAKE_ANDROID_JAR_DIRECTORIES CMAKE_ANDROID_JAVA_SOURCE_DIR CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES CMAKE_ANDROID_PROCESS_MAX CMAKE_ANDROID_PROGUARD CMAKE_ANDROID_PROGUARD_CONFIG_PATH CMAKE_ANDROID_SECURE_PROPS_PATH CMAKE_ANDROID_SKIP_ANT_STEP CMAKE_ANDROID_STL_TYPE CMAKE_APPBUNDLE_PATH CMAKE_AR CMAKE_ARCHIVE_OUTPUT_DIRECTORY CMAKE_ARCHIVE_OUTPUT_DIRECTORY_<CONFIG> CMAKE_ARGC CMAKE_ARGV0 CMAKE_AUTOMOC CMAKE_AUTOMOC_MOC_OPTIONS CMAKE_AUTOMOC_RELAXED_MODE CMAKE_AUTORCC CMAKE_AUTORCC_OPTIONS CMAKE_AUTOUIC CMAKE_AUTOUIC_OPTIONS CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BINARY_DIR CMAKE_BUILD_TOOL CMAKE_BUILD_TYPE CMAKE_BUILD_WITH_INSTALL_RPATH CMAKE_CACHEFILE_DIR CMAKE_CACHE_MAJOR_VERSION CMAKE_CACHE_MINOR_VERSION CMAKE_CACHE_PATCH_VERSION CMAKE_CFG_INTDIR CMAKE_CL_64 CMAKE_COLOR_MAKEFILE CMAKE_COMMAND CMAKE_COMPILER_2005 CMAKE_COMPILER_IS_GNU<LANG> CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_CONFIGURATION_TYPES CMAKE_CROSSCOMPILING CMAKE_CROSSCOMPILING_EMULATOR CMAKE_CTEST_COMMAND CMAKE_CURRENT_BINARY_DIR CMAKE_CURRENT_LIST_DIR CMAKE_CURRENT_LIST_FILE CMAKE_CURRENT_LIST_LINE CMAKE_CURRENT_SOURCE_DIR CMAKE_CXX_COMPILE_FEATURES CMAKE_CXX_EXTENSIONS CMAKE_CXX_STANDARD CMAKE_CXX_STANDARD_REQUIRED CMAKE_C_COMPILE_FEATURES CMAKE_C_EXTENSIONS CMAKE_C_STANDARD CMAKE_C_STANDARD_REQUIRED CMAKE_DEBUG_POSTFIX CMAKE_DEBUG_TARGET_PROPERTIES CMAKE_DISABLE_FIND_PACKAGE_<PackageName> CMAKE_DL_LIBS CMAKE_EDIT_COMMAND CMAKE_ENABLE_EXPORTS CMAKE_ERROR_DEPRECATED CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_EXECUTABLE_SUFFIX CMAKE_EXE_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS_<CONFIG> CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_NO_PACKAGE_REGISTRY CMAKE_EXTRA_GENERATOR CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES CMAKE_FIND_APPBUNDLE CMAKE_FIND_FRAMEWORK CMAKE_FIND_LIBRARY_PREFIXES CMAKE_FIND_LIBRARY_SUFFIXES CMAKE_FIND_NO_INSTALL_PREFIX CMAKE_FIND_PACKAGE_NAME CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_WARN_NO_MODULE CMAKE_FIND_ROOT_PATH CMAKE_FIND_ROOT_PATH_MODE_INCLUDE CMAKE_FIND_ROOT_PATH_MODE_LIBRARY CMAKE_FIND_ROOT_PATH_MODE_PACKAGE CMAKE_FIND_ROOT_PATH_MODE_PROGRAM CMAKE_FRAMEWORK_PATH CMAKE_Fortran_FORMAT CMAKE_Fortran_MODDIR_DEFAULT CMAKE_Fortran_MODDIR_FLAG CMAKE_Fortran_MODOUT_FLAG CMAKE_Fortran_MODULE_DIRECTORY CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET CMAKE_GNUtoMS CMAKE_HOME_DIRECTORY CMAKE_HOST_APPLE CMAKE_HOST_SYSTEM CMAKE_HOST_SYSTEM_NAME CMAKE_HOST_SYSTEM_PROCESSOR CMAKE_HOST_SYSTEM_VERSION CMAKE_HOST_UNIX CMAKE_HOST_WIN32 CMAKE_IGNORE_PATH CMAKE_IMPORT_LIBRARY_PREFIX CMAKE_IMPORT_LIBRARY_SUFFIX CMAKE_INCLUDE_CURRENT_DIR CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE CMAKE_INCLUDE_DIRECTORIES_BEFORE CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE CMAKE_INCLUDE_PATH CMAKE_INSTALL_DEFAULT_COMPONENT_NAME CMAKE_INSTALL_MESSAGE CMAKE_INSTALL_NAME_DIR CMAKE_INSTALL_PREFIX CMAKE_INSTALL_RPATH CMAKE_INSTALL_RPATH_USE_LINK_PATH CMAKE_INTERNAL_PLATFORM_ABI CMAKE_IOS_INSTALL_COMBINED CMAKE_JOB_POOL_COMPILE CMAKE_JOB_POOL_LINK CMAKE_LIBRARY_ARCHITECTURE CMAKE_LIBRARY_ARCHITECTURE_REGEX CMAKE_LIBRARY_OUTPUT_DIRECTORY CMAKE_LIBRARY_OUTPUT_DIRECTORY_<CONFIG> CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_FLAG CMAKE_LINK_DEF_FILE_FLAG CMAKE_LINK_DEPENDS_NO_SHARED CMAKE_LINK_INTERFACE_LIBRARIES CMAKE_LINK_LIBRARY_FILE_FLAG CMAKE_LINK_LIBRARY_FLAG CMAKE_LINK_LIBRARY_SUFFIX CMAKE_LINK_SEARCH_END_STATIC CMAKE_LINK_SEARCH_START_STATIC CMAKE_MACOSX_BUNDLE CMAKE_MACOSX_RPATH CMAKE_MAJOR_VERSION CMAKE_MAKE_PROGRAM CMAKE_MAP_IMPORTED_CONFIG_<CONFIG> CMAKE_MATCH_COUNT CMAKE_MFC_FLAG CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_MINOR_VERSION CMAKE_MODULE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS_<CONFIG> CMAKE_MODULE_PATH CMAKE_NOT_USING_CONFIG_FLAGS CMAKE_NO_BUILTIN_CHRPATH CMAKE_NO_SYSTEM_FROM_IMPORTED CMAKE_OBJECT_PATH_MAX CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT CMAKE_PARENT_LIST_FILE CMAKE_PATCH_VERSION CMAKE_PDB_OUTPUT_DIRECTORY CMAKE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_POLICY_DEFAULT_CMP<NNNN> CMAKE_POLICY_WARNING_CMP<NNNN> CMAKE_POSITION_INDEPENDENT_CODE CMAKE_PREFIX_PATH CMAKE_PROGRAM_PATH CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE CMAKE_PROJECT_NAME CMAKE_RANLIB CMAKE_ROOT CMAKE_RUNTIME_OUTPUT_DIRECTORY CMAKE_RUNTIME_OUTPUT_DIRECTORY_<CONFIG> CMAKE_SCRIPT_MODE_FILE CMAKE_SHARED_LIBRARY_PREFIX CMAKE_SHARED_LIBRARY_SUFFIX CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS_<CONFIG> CMAKE_SHARED_MODULE_PREFIX CMAKE_SHARED_MODULE_SUFFIX CMAKE_SIZEOF_VOID_P CMAKE_SKIP_BUILD_RPATH CMAKE_SKIP_INSTALL_ALL_DEPENDENCY CMAKE_SKIP_INSTALL_RPATH CMAKE_SKIP_INSTALL_RULES CMAKE_SKIP_RPATH CMAKE_SOURCE_DIR CMAKE_STAGING_PREFIX CMAKE_STANDARD_LIBRARIES CMAKE_STATIC_LIBRARY_PREFIX CMAKE_STATIC_LIBRARY_SUFFIX CMAKE_STATIC_LINKER_FLAGS CMAKE_STATIC_LINKER_FLAGS_<CONFIG> CMAKE_SYSROOT CMAKE_SYSTEM CMAKE_SYSTEM_APPBUNDLE_PATH CMAKE_SYSTEM_FRAMEWORK_PATH CMAKE_SYSTEM_IGNORE_PATH CMAKE_SYSTEM_INCLUDE_PATH CMAKE_SYSTEM_LIBRARY_PATH CMAKE_SYSTEM_NAME CMAKE_SYSTEM_PREFIX_PATH CMAKE_SYSTEM_PROCESSOR CMAKE_SYSTEM_PROGRAM_PATH CMAKE_SYSTEM_VERSION CMAKE_TOOLCHAIN_FILE CMAKE_TRY_COMPILE_CONFIGURATION CMAKE_TWEAK_VERSION CMAKE_USER_MAKE_RULES_OVERRIDE CMAKE_USER_MAKE_RULES_OVERRIDE_<LANG> CMAKE_USE_RELATIVE_PATHS CMAKE_VERBOSE_MAKEFILE CMAKE_VERSION CMAKE_VISIBILITY_INLINES_HIDDEN CMAKE_VS_DEVENV_COMMAND CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD CMAKE_VS_INTEL_Fortran_PROJECT_VERSION CMAKE_VS_MSBUILD_COMMAND CMAKE_VS_MSDEV_COMMAND CMAKE_VS_NsightTegra_VERSION CMAKE_VS_PLATFORM_NAME CMAKE_VS_PLATFORM_TOOLSET CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION CMAKE_WARN_DEPRECATED CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_WIN32_EXECUTABLE CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS CMAKE_XCODE_ATTRIBUTE_<an-attribute> CMAKE_XCODE_PLATFORM_TOOLSET CPACK_ABSOLUTE_DESTINATION_FILES CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CPACK_INCLUDE_TOPLEVEL_DIRECTORY CPACK_INSTALL_SCRIPT CPACK_PACKAGING_INSTALL_PREFIX CPACK_SET_DESTDIR CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CTEST_BINARY_DIRECTORY CTEST_BUILD_COMMAND CTEST_BUILD_NAME CTEST_BZR_COMMAND CTEST_BZR_UPDATE_OPTIONS CTEST_CHANGE_ID CTEST_CHECKOUT_COMMAND CTEST_CONFIGURATION_TYPE CTEST_CONFIGURE_COMMAND CTEST_COVERAGE_COMMAND CTEST_COVERAGE_EXTRA_FLAGS CTEST_CURL_OPTIONS CTEST_CUSTOM_COVERAGE_EXCLUDE CTEST_CUSTOM_ERROR_EXCEPTION CTEST_CUSTOM_ERROR_MATCH CTEST_CUSTOM_ERROR_POST_CONTEXT CTEST_CUSTOM_ERROR_PRE_CONTEXT CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MEMCHECK_IGNORE CTEST_CUSTOM_POST_MEMCHECK CTEST_CUSTOM_POST_TEST CTEST_CUSTOM_PRE_MEMCHECK CTEST_CUSTOM_PRE_TEST CTEST_CUSTOM_TEST_IGNORE CTEST_CUSTOM_WARNING_EXCEPTION CTEST_CUSTOM_WARNING_MATCH CTEST_CVS_CHECKOUT CTEST_CVS_COMMAND CTEST_CVS_UPDATE_OPTIONS CTEST_DROP_LOCATION CTEST_DROP_METHOD CTEST_DROP_SITE CTEST_DROP_SITE_CDASH CTEST_DROP_SITE_PASSWORD CTEST_DROP_SITE_USER CTEST_EXTRA_COVERAGE_GLOB CTEST_GIT_COMMAND CTEST_GIT_UPDATE_CUSTOM CTEST_GIT_UPDATE_OPTIONS CTEST_HG_COMMAND CTEST_HG_UPDATE_OPTIONS CTEST_MEMORYCHECK_COMMAND CTEST_MEMORYCHECK_COMMAND_OPTIONS CTEST_MEMORYCHECK_SANITIZER_OPTIONS CTEST_MEMORYCHECK_SUPPRESSIONS_FILE CTEST_MEMORYCHECK_TYPE CTEST_NIGHTLY_START_TIME CTEST_P4_CLIENT CTEST_P4_COMMAND CTEST_P4_OPTIONS CTEST_P4_UPDATE_OPTIONS CTEST_SCP_COMMAND CTEST_SITE CTEST_SOURCE_DIRECTORY CTEST_SVN_COMMAND CTEST_SVN_OPTIONS CTEST_SVN_UPDATE_OPTIONS CTEST_TEST_LOAD CTEST_TEST_TIMEOUT CTEST_TRIGGER_SITE CTEST_UPDATE_COMMAND CTEST_UPDATE_OPTIONS CTEST_UPDATE_VERSION_ONLY CTEST_USE_LAUNCHERS CYGWIN ENV EXECUTABLE_OUTPUT_PATH GHS-MULTI LIBRARY_OUTPUT_PATH MINGW MSVC MSVC10 MSVC11 MSVC12 MSVC14 MSVC60 MSVC70 MSVC71 MSVC80 MSVC90 MSVC_IDE MSVC_VERSION PROJECT_BINARY_DIR PROJECT_NAME PROJECT_SOURCE_DIR PROJECT_VERSION PROJECT_VERSION_MAJOR PROJECT_VERSION_MINOR PROJECT_VERSION_PATCH PROJECT_VERSION_TWEAK UNIX WIN32 WINCE WINDOWS_PHONE WINDOWS_STORE XCODE_VERSION
             \ contained
 
 syn keyword cmakeModule
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index ae443a7..864d1dc 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -211,7 +211,6 @@ Properties on Targets
    /prop_tgt/LABELS
    /prop_tgt/LANG_CLANG_TIDY
    /prop_tgt/LANG_COMPILER_LAUNCHER
-   /prop_tgt/LANG_CPPLINT
    /prop_tgt/LANG_INCLUDE_WHAT_YOU_USE
    /prop_tgt/LANG_VISIBILITY_PRESET
    /prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 95f780a..99b5eae 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -284,7 +284,6 @@ Variables that Control the Build
    /variable/CMAKE_IOS_INSTALL_COMBINED
    /variable/CMAKE_LANG_CLANG_TIDY
    /variable/CMAKE_LANG_COMPILER_LAUNCHER
-   /variable/CMAKE_LANG_CPPLINT
    /variable/CMAKE_LANG_INCLUDE_WHAT_YOU_USE
    /variable/CMAKE_LANG_VISIBILITY_PRESET
    /variable/CMAKE_LIBRARY_OUTPUT_DIRECTORY
diff --git a/Help/prop_tgt/LANG_CPPLINT.rst b/Help/prop_tgt/LANG_CPPLINT.rst
deleted file mode 100644
index 14f47d4..0000000
--- a/Help/prop_tgt/LANG_CPPLINT.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-<LANG>_CPPLINT
---------------
-
-This property is supported only when ``<LANG>`` is ``C`` or ``CXX``.
-
-Specify a :ref:`;-list <CMake Language Lists>` containing a command line
-for the ``cpplint`` style checker.  The :ref:`Makefile Generators` and the
-:generator:`Ninja` generator will run ``cpplint`` along with the compiler
-and report any problems.
-
-This property is initialized by the value of the
-:variable:`CMAKE_<LANG>_CPPLINT` variable if it is set when a target is
-created.
diff --git a/Help/release/dev/add-LANG_CPPLINT.rst b/Help/release/dev/add-LANG_CPPLINT.rst
deleted file mode 100644
index a0539cf..0000000
--- a/Help/release/dev/add-LANG_CPPLINT.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-add-LANG_CPPLINT
-----------------
-
-* A :prop_tgt:`<LANG>_CPPLINT` target property and supporting
-  :variable:`CMAKE_<LANG>_CPPLINT` variable were introduced to tell
-  the :ref:`Makefile Generators` and the :generator:`Ninja` generator to
-  run the ``cpplint`` style checker along with the compiler for ``C`` and
-  ``CXX`` languages.
diff --git a/Help/variable/CMAKE_LANG_CPPLINT.rst b/Help/variable/CMAKE_LANG_CPPLINT.rst
deleted file mode 100644
index 3b6f452..0000000
--- a/Help/variable/CMAKE_LANG_CPPLINT.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-CMAKE_<LANG>_CPPLINT
---------------------
-
-Default value for :prop_tgt:`<LANG>_CPPLINT` target property. This variable
-is used to initialize the property on each target as it is created.  This
-is done only when ``<LANG>`` is ``C`` or ``CXX``.
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 866c132..379ae16 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -631,9 +631,7 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
       const char* iwyu = this->GeneratorTarget->GetProperty(iwyu_prop);
       std::string const tidy_prop = lang + "_CLANG_TIDY";
       const char* tidy = this->GeneratorTarget->GetProperty(tidy_prop);
-      std::string const cpplint_prop = lang + "_CPPLINT";
-      const char* cpplint = this->GeneratorTarget->GetProperty(cpplint_prop);
-      if ((iwyu && *iwyu) || (tidy && *tidy) || (cpplint && *cpplint)) {
+      if ((iwyu && *iwyu) || (tidy && *tidy)) {
         std::string run_iwyu = "$(CMAKE_COMMAND) -E __run_iwyu";
         if (iwyu && *iwyu) {
           run_iwyu += " --iwyu=";
@@ -642,12 +640,6 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
         if (tidy && *tidy) {
           run_iwyu += " --tidy=";
           run_iwyu += this->LocalGenerator->EscapeForShell(tidy);
-        }
-        if (cpplint && *cpplint) {
-          run_iwyu += " --cpplint=";
-          run_iwyu += this->LocalGenerator->EscapeForShell(cpplint);
-        }
-        if ((tidy && *tidy) || (cpplint && *cpplint)) {
           run_iwyu += " --source=";
           run_iwyu += sourceFile;
         }
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 0b33b19..8ad2efe 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -600,9 +600,7 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang)
     const char* iwyu = this->GeneratorTarget->GetProperty(iwyu_prop);
     std::string const tidy_prop = lang + "_CLANG_TIDY";
     const char* tidy = this->GeneratorTarget->GetProperty(tidy_prop);
-    std::string const cpplint_prop = lang + "_CPPLINT";
-    const char* cpplint = this->GeneratorTarget->GetProperty(cpplint_prop);
-    if ((iwyu && *iwyu) || (tidy && *tidy) || (cpplint && *cpplint)) {
+    if ((iwyu && *iwyu) || (tidy && *tidy)) {
       std::string run_iwyu = this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmOutputConverter::SHELL);
       run_iwyu += " -E __run_iwyu";
@@ -613,12 +611,6 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang)
       if (tidy && *tidy) {
         run_iwyu += " --tidy=";
         run_iwyu += this->GetLocalGenerator()->EscapeForShell(tidy);
-      }
-      if (cpplint && *cpplint) {
-        run_iwyu += " --cpplint=";
-        run_iwyu += this->GetLocalGenerator()->EscapeForShell(cpplint);
-      }
-      if ((tidy && *tidy) || (cpplint && *cpplint)) {
         run_iwyu += " --source=$in";
       }
       run_iwyu += " -- ";
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 2852f90..9261ca8 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -255,7 +255,6 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
     this->SetPropertyDefault("MACOSX_RPATH", CM_NULLPTR);
     this->SetPropertyDefault("C_CLANG_TIDY", CM_NULLPTR);
     this->SetPropertyDefault("C_COMPILER_LAUNCHER", CM_NULLPTR);
-    this->SetPropertyDefault("C_CPPLINT", CM_NULLPTR);
     this->SetPropertyDefault("C_INCLUDE_WHAT_YOU_USE", CM_NULLPTR);
     this->SetPropertyDefault("LINK_WHAT_YOU_USE", CM_NULLPTR);
     this->SetPropertyDefault("C_STANDARD", CM_NULLPTR);
@@ -263,7 +262,6 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
     this->SetPropertyDefault("C_EXTENSIONS", CM_NULLPTR);
     this->SetPropertyDefault("CXX_CLANG_TIDY", CM_NULLPTR);
     this->SetPropertyDefault("CXX_COMPILER_LAUNCHER", CM_NULLPTR);
-    this->SetPropertyDefault("CXX_CPPLINT", CM_NULLPTR);
     this->SetPropertyDefault("CXX_INCLUDE_WHAT_YOU_USE", CM_NULLPTR);
     this->SetPropertyDefault("CXX_STANDARD", CM_NULLPTR);
     this->SetPropertyDefault("CXX_STANDARD_REQUIRED", CM_NULLPTR);
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 823b38f..5b12a75 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -276,8 +276,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
     if (args[1] == "__run_iwyu") {
       if (args.size() < 3) {
         std::cerr << "__run_iwyu Usage: -E __run_iwyu [--iwyu=/path/iwyu]"
-                     " [--cpplint=/path/cpplint] [--tidy=/path/tidy]"
-                     " -- compile command\n";
+                     " [--tidy=/path/tidy] -- compile command\n";
         return 1;
       }
       bool doing_options = true;
@@ -286,7 +285,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
       std::string tidy;
       std::string sourceFile;
       std::string lwyu;
-      std::string cpplint;
       for (std::string::size_type cc = 2; cc < args.size(); cc++) {
         std::string const& arg = args[cc];
         if (arg == "--") {
@@ -299,8 +297,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
           sourceFile = arg.substr(9);
         } else if (doing_options && cmHasLiteralPrefix(arg, "--lwyu=")) {
           lwyu = arg.substr(7);
-        } else if (doing_options && cmHasLiteralPrefix(arg, "--cpplint=")) {
-          cpplint = arg.substr(10);
         } else if (doing_options) {
           std::cerr << "__run_iwyu given unknown argument: " << arg << "\n";
           return 1;
@@ -308,14 +304,12 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
           orig_cmd.push_back(arg);
         }
       }
-      if (tidy.empty() && iwyu.empty() && lwyu.empty() && cpplint.empty()) {
-        std::cerr << "__run_iwyu missing --cpplint=, --iwyu=, --lwyu=, and/or"
-                     " --tidy=\n";
+      if (tidy.empty() && iwyu.empty() && lwyu.empty()) {
+        std::cerr << "__run_iwyu missing --tidy= or --iwyu=\n";
         return 1;
       }
-      if ((!cpplint.empty() || !tidy.empty()) && sourceFile.empty()) {
-        std::cerr << "__run_iwyu --cpplint= and/or __run_iwyu --tidy="
-                     " require --source=\n";
+      if (!tidy.empty() && sourceFile.empty()) {
+        std::cerr << "__run_iwyu --tidy= requires --source=\n";
         return 1;
       }
       if (orig_cmd.empty() && lwyu.empty()) {
@@ -409,32 +403,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
           std::cerr << "Warning: " << stdOut;
         }
       }
-
-      if (!cpplint.empty()) {
-        // Construct the cpplint command line.
-        std::vector<std::string> cpplint_cmd;
-        cmSystemTools::ExpandListArgument(cpplint, cpplint_cmd, true);
-        cpplint_cmd.push_back(sourceFile);
-
-        // Run the cpplint command line.  Capture its output.
-        std::string stdOut;
-        if (!cmSystemTools::RunSingleCommand(cpplint_cmd, &stdOut, &stdOut,
-                                             &ret, CM_NULLPTR,
-                                             cmSystemTools::OUTPUT_NONE)) {
-          std::cerr << "Error running '" << cpplint_cmd[0] << "': " << stdOut
-                    << "\n";
-          return 1;
-        }
-
-        // Output the output from cpplint to stderr
-        std::cerr << stdOut;
-
-        // If cpplint exited with an error do the same.
-        if (ret != 0) {
-          return ret;
-        }
-      }
-
       ret = 0;
       // Now run the real compiler command and return its result value.
       if (lwyu.empty() &&
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d6d4c0c..d2465c4 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -340,10 +340,8 @@ if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
   endif()
   add_executable(pseudo_tidy pseudo_tidy.c)
   add_executable(pseudo_iwyu pseudo_iwyu.c)
-  add_executable(pseudo_cpplint pseudo_cpplint.c)
   add_RunCMake_test(ClangTidy -DPSEUDO_TIDY=$<TARGET_FILE:pseudo_tidy>)
   add_RunCMake_test(IncludeWhatYouUse -DPSEUDO_IWYU=$<TARGET_FILE:pseudo_iwyu>)
-  add_RunCMake_test(Cpplint -DPSEUDO_CPPLINT=$<TARGET_FILE:pseudo_cpplint>)
   add_RunCMake_test(CompilerLauncher)
 endif()
 
diff --git a/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt b/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt
index 35f50b7..0d0d899 100644
--- a/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt
+++ b/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt
@@ -1 +1 @@
-^__run_iwyu missing --cpplint=, --iwyu=, --lwyu=, and/or --tidy=$
+^__run_iwyu missing --tidy= or --iwyu=$
diff --git a/Tests/RunCMake/Cpplint/C-Build-stderr.txt b/Tests/RunCMake/Cpplint/C-Build-stderr.txt
deleted file mode 100644
index 3d68d40..0000000
--- a/Tests/RunCMake/Cpplint/C-Build-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Done processing .*Tests[/\]RunCMake[/\]Cpplint[/\]main\.c
-Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/C-error-Build-result.txt b/Tests/RunCMake/Cpplint/C-error-Build-result.txt
deleted file mode 100644
index d197c91..0000000
--- a/Tests/RunCMake/Cpplint/C-error-Build-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-[^0]
diff --git a/Tests/RunCMake/Cpplint/C-error-Build-stderr.txt b/Tests/RunCMake/Cpplint/C-error-Build-stderr.txt
deleted file mode 100644
index 74c6a1e..0000000
--- a/Tests/RunCMake/Cpplint/C-error-Build-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Tests[/\]RunCMake[/\]Cpplint[/\]main\.c:0:  message  \[category/category\] \[0\]
-Total errors found: 1
diff --git a/Tests/RunCMake/Cpplint/C-error-launch-Build-result.txt b/Tests/RunCMake/Cpplint/C-error-launch-Build-result.txt
deleted file mode 100644
index d197c91..0000000
--- a/Tests/RunCMake/Cpplint/C-error-launch-Build-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-[^0]
diff --git a/Tests/RunCMake/Cpplint/C-error-launch-Build-stderr.txt b/Tests/RunCMake/Cpplint/C-error-launch-Build-stderr.txt
deleted file mode 100644
index 74c6a1e..0000000
--- a/Tests/RunCMake/Cpplint/C-error-launch-Build-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Tests[/\]RunCMake[/\]Cpplint[/\]main\.c:0:  message  \[category/category\] \[0\]
-Total errors found: 1
diff --git a/Tests/RunCMake/Cpplint/C-error-launch.cmake b/Tests/RunCMake/Cpplint/C-error-launch.cmake
deleted file mode 100644
index c76e2e2..0000000
--- a/Tests/RunCMake/Cpplint/C-error-launch.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CTEST_USE_LAUNCHERS 1)
-include(CTestUseLaunchers)
-include(C-error.cmake)
diff --git a/Tests/RunCMake/Cpplint/C-error.cmake b/Tests/RunCMake/Cpplint/C-error.cmake
deleted file mode 100644
index 29cf7ba..0000000
--- a/Tests/RunCMake/Cpplint/C-error.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-enable_language(C)
-set(CMAKE_C_CPPLINT "${PSEUDO_CPPLINT}" --error)
-add_executable(main main.c)
diff --git a/Tests/RunCMake/Cpplint/C-launch-Build-stderr.txt b/Tests/RunCMake/Cpplint/C-launch-Build-stderr.txt
deleted file mode 100644
index 3d68d40..0000000
--- a/Tests/RunCMake/Cpplint/C-launch-Build-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Done processing .*Tests[/\]RunCMake[/\]Cpplint[/\]main\.c
-Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/C-launch.cmake b/Tests/RunCMake/Cpplint/C-launch.cmake
deleted file mode 100644
index e66ca20..0000000
--- a/Tests/RunCMake/Cpplint/C-launch.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CTEST_USE_LAUNCHERS 1)
-include(CTestUseLaunchers)
-include(C.cmake)
diff --git a/Tests/RunCMake/Cpplint/C.cmake b/Tests/RunCMake/Cpplint/C.cmake
deleted file mode 100644
index 68e6ff4..0000000
--- a/Tests/RunCMake/Cpplint/C.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-enable_language(C)
-set(CMAKE_C_CPPLINT "${PSEUDO_CPPLINT}" --verbose=0 --linelength=80)
-add_executable(main main.c)
diff --git a/Tests/RunCMake/Cpplint/CMakeLists.txt b/Tests/RunCMake/Cpplint/CMakeLists.txt
deleted file mode 100644
index a640c56..0000000
--- a/Tests/RunCMake/Cpplint/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-project(${RunCMake_TEST} NONE)
-include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/Cpplint/CXX-Build-stderr.txt b/Tests/RunCMake/Cpplint/CXX-Build-stderr.txt
deleted file mode 100644
index 91f0591..0000000
--- a/Tests/RunCMake/Cpplint/CXX-Build-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Done processing .*Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx
-Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/CXX-error-Build-result.txt b/Tests/RunCMake/Cpplint/CXX-error-Build-result.txt
deleted file mode 100644
index d197c91..0000000
--- a/Tests/RunCMake/Cpplint/CXX-error-Build-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-[^0]
diff --git a/Tests/RunCMake/Cpplint/CXX-error-Build-stderr.txt b/Tests/RunCMake/Cpplint/CXX-error-Build-stderr.txt
deleted file mode 100644
index 5e86c54..0000000
--- a/Tests/RunCMake/Cpplint/CXX-error-Build-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx:0:  message  \[category\/category\] \[0\]
-Total errors found: 1
diff --git a/Tests/RunCMake/Cpplint/CXX-error-launch-Build-result.txt b/Tests/RunCMake/Cpplint/CXX-error-launch-Build-result.txt
deleted file mode 100644
index d197c91..0000000
--- a/Tests/RunCMake/Cpplint/CXX-error-launch-Build-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-[^0]
diff --git a/Tests/RunCMake/Cpplint/CXX-error-launch-Build-stderr.txt b/Tests/RunCMake/Cpplint/CXX-error-launch-Build-stderr.txt
deleted file mode 100644
index 5e86c54..0000000
--- a/Tests/RunCMake/Cpplint/CXX-error-launch-Build-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx:0:  message  \[category\/category\] \[0\]
-Total errors found: 1
diff --git a/Tests/RunCMake/Cpplint/CXX-error-launch.cmake b/Tests/RunCMake/Cpplint/CXX-error-launch.cmake
deleted file mode 100644
index 72dcbe9..0000000
--- a/Tests/RunCMake/Cpplint/CXX-error-launch.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CTEST_USE_LAUNCHERS 1)
-include(CTestUseLaunchers)
-include(CXX-error.cmake)
diff --git a/Tests/RunCMake/Cpplint/CXX-error.cmake b/Tests/RunCMake/Cpplint/CXX-error.cmake
deleted file mode 100644
index ad66ff5..0000000
--- a/Tests/RunCMake/Cpplint/CXX-error.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-enable_language(CXX)
-set(CMAKE_CXX_CPPLINT "${PSEUDO_CPPLINT}" --error)
-add_executable(main main.cxx)
diff --git a/Tests/RunCMake/Cpplint/CXX-launch-Build-stderr.txt b/Tests/RunCMake/Cpplint/CXX-launch-Build-stderr.txt
deleted file mode 100644
index 91f0591..0000000
--- a/Tests/RunCMake/Cpplint/CXX-launch-Build-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Done processing .*Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx
-Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/CXX-launch.cmake b/Tests/RunCMake/Cpplint/CXX-launch.cmake
deleted file mode 100644
index 3002c9d..0000000
--- a/Tests/RunCMake/Cpplint/CXX-launch.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CTEST_USE_LAUNCHERS 1)
-include(CTestUseLaunchers)
-include(CXX.cmake)
diff --git a/Tests/RunCMake/Cpplint/CXX.cmake b/Tests/RunCMake/Cpplint/CXX.cmake
deleted file mode 100644
index 35f05ee..0000000
--- a/Tests/RunCMake/Cpplint/CXX.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-enable_language(CXX)
-set(CMAKE_CXX_CPPLINT "${PSEUDO_CPPLINT}" --verbose=0 --linelength=80)
-add_executable(main main.cxx)
diff --git a/Tests/RunCMake/Cpplint/RunCMakeTest.cmake b/Tests/RunCMake/Cpplint/RunCMakeTest.cmake
deleted file mode 100644
index 40875aa..0000000
--- a/Tests/RunCMake/Cpplint/RunCMakeTest.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-include(RunCMake)
-
-set(RunCMake_TEST_OPTIONS "-DPSEUDO_CPPLINT=${PSEUDO_CPPLINT}")
-
-function(run_cpplint lang)
-  # Use a single build tree for tests without cleaning.
-  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/${lang}-build")
-  set(RunCMake_TEST_NO_CLEAN 1)
-  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
-  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
-  run_cmake(${lang})
-  run_cmake_command(${lang}-Build ${CMAKE_COMMAND} --build .)
-endfunction()
-
-run_cpplint(C)
-run_cpplint(CXX)
-run_cpplint(C-error)
-run_cpplint(CXX-error)
-
-if(NOT RunCMake_GENERATOR STREQUAL "Watcom WMake")
-  run_cpplint(C-launch)
-  run_cpplint(CXX-launch)
-  run_cpplint(C-error-launch)
-  run_cpplint(CXX-error-launch)
-endif()
diff --git a/Tests/RunCMake/Cpplint/main.c b/Tests/RunCMake/Cpplint/main.c
deleted file mode 100644
index 8488f4e..0000000
--- a/Tests/RunCMake/Cpplint/main.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int main(void)
-{
-  return 0;
-}
diff --git a/Tests/RunCMake/Cpplint/main.cxx b/Tests/RunCMake/Cpplint/main.cxx
deleted file mode 100644
index f8b643a..0000000
--- a/Tests/RunCMake/Cpplint/main.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-int main()
-{
-  return 0;
-}
diff --git a/Tests/RunCMake/pseudo_cpplint.c b/Tests/RunCMake/pseudo_cpplint.c
deleted file mode 100644
index 7c79328..0000000
--- a/Tests/RunCMake/pseudo_cpplint.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-int main(int argc, char* argv[])
-{
-  int error = 0;
-  int i;
-  for (i = 1; i < argc; ++i) {
-    if (strcmp(argv[i], "--error") == 0) {
-      error = 1;
-    }
-    if (argv[i][0] != '-') {
-      if (error) {
-        fprintf(stderr, "%s:0:  message  [category/category] [0]\n", argv[i]);
-        fprintf(stdout, "Total errors found: 1\n");
-        return 1;
-      }
-      fprintf(stdout, "Done processing %s\n", argv[i]);
-    }
-  }
-  fprintf(stdout, "Total errors found: 0\n");
-  return 0;
-}

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

Summary of changes:
 Auxiliary/vim/syntax/cmake.vim                     |    4 +-
 Help/manual/cmake-properties.7.rst                 |    1 -
 Help/manual/cmake-variables.7.rst                  |    1 -
 Help/prop_tgt/LANG_CPPLINT.rst                     |   13 ------
 Help/release/dev/add-LANG_CPPLINT.rst              |    8 ----
 Help/variable/CMAKE_LANG_CPPLINT.rst               |    6 ---
 Source/cmMakefileTargetGenerator.cxx               |   10 +----
 Source/cmNinjaTargetGenerator.cxx                  |   10 +----
 Source/cmTarget.cxx                                |    2 -
 Source/cmcmd.cxx                                   |   42 +++-----------------
 Tests/RunCMake/CMakeLists.txt                      |    2 -
 .../CommandLine/E___run_iwyu-no-iwyu-stderr.txt    |    2 +-
 Tests/RunCMake/Cpplint/C-Build-stderr.txt          |    2 -
 Tests/RunCMake/Cpplint/C-error-Build-result.txt    |    1 -
 Tests/RunCMake/Cpplint/C-error-Build-stderr.txt    |    2 -
 .../Cpplint/C-error-launch-Build-result.txt        |    1 -
 .../Cpplint/C-error-launch-Build-stderr.txt        |    2 -
 Tests/RunCMake/Cpplint/C-error-launch.cmake        |    3 --
 Tests/RunCMake/Cpplint/C-error.cmake               |    3 --
 Tests/RunCMake/Cpplint/C-launch-Build-stderr.txt   |    2 -
 Tests/RunCMake/Cpplint/C-launch.cmake              |    3 --
 Tests/RunCMake/Cpplint/C.cmake                     |    3 --
 Tests/RunCMake/Cpplint/CMakeLists.txt              |    3 --
 Tests/RunCMake/Cpplint/CXX-Build-stderr.txt        |    2 -
 Tests/RunCMake/Cpplint/CXX-error-Build-result.txt  |    1 -
 Tests/RunCMake/Cpplint/CXX-error-Build-stderr.txt  |    2 -
 .../Cpplint/CXX-error-launch-Build-result.txt      |    1 -
 .../Cpplint/CXX-error-launch-Build-stderr.txt      |    2 -
 Tests/RunCMake/Cpplint/CXX-error-launch.cmake      |    3 --
 Tests/RunCMake/Cpplint/CXX-error.cmake             |    3 --
 Tests/RunCMake/Cpplint/CXX-launch-Build-stderr.txt |    2 -
 Tests/RunCMake/Cpplint/CXX-launch.cmake            |    3 --
 Tests/RunCMake/Cpplint/CXX.cmake                   |    3 --
 Tests/RunCMake/Cpplint/RunCMakeTest.cmake          |   25 ------------
 Tests/RunCMake/Cpplint/main.c                      |    4 --
 Tests/RunCMake/Cpplint/main.cxx                    |    4 --
 Tests/RunCMake/pseudo_cpplint.c                    |   23 -----------
 37 files changed, 10 insertions(+), 194 deletions(-)
 delete mode 100644 Help/prop_tgt/LANG_CPPLINT.rst
 delete mode 100644 Help/release/dev/add-LANG_CPPLINT.rst
 delete mode 100644 Help/variable/CMAKE_LANG_CPPLINT.rst
 delete mode 100644 Tests/RunCMake/Cpplint/C-Build-stderr.txt
 delete mode 100644 Tests/RunCMake/Cpplint/C-error-Build-result.txt
 delete mode 100644 Tests/RunCMake/Cpplint/C-error-Build-stderr.txt
 delete mode 100644 Tests/RunCMake/Cpplint/C-error-launch-Build-result.txt
 delete mode 100644 Tests/RunCMake/Cpplint/C-error-launch-Build-stderr.txt
 delete mode 100644 Tests/RunCMake/Cpplint/C-error-launch.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/C-error.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/C-launch-Build-stderr.txt
 delete mode 100644 Tests/RunCMake/Cpplint/C-launch.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/C.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/CMakeLists.txt
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-Build-stderr.txt
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-error-Build-result.txt
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-error-Build-stderr.txt
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-error-launch-Build-result.txt
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-error-launch-Build-stderr.txt
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-error-launch.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-error.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-launch-Build-stderr.txt
 delete mode 100644 Tests/RunCMake/Cpplint/CXX-launch.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/CXX.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/RunCMakeTest.cmake
 delete mode 100644 Tests/RunCMake/Cpplint/main.c
 delete mode 100644 Tests/RunCMake/Cpplint/main.cxx
 delete mode 100644 Tests/RunCMake/pseudo_cpplint.c


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Sat Jan 21 07:36:59 2017
From: brad.king at kitware.com (Brad King)
Date: Sat, 21 Jan 2017 07:36:59 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2282-gf6bdf63
Message-ID: <20170121123659.48D69FA411@public.kitware.com>

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  f6bdf63b18766c59d8ffca0e0383ad7ee14f0ce9 (commit)
       via  613019294497177018550dc4969e3c2b9b603f1b (commit)
      from  0d5d02923532b736915bcfbbb9677c4c2c8638a1 (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=f6bdf63b18766c59d8ffca0e0383ad7ee14f0ce9
commit f6bdf63b18766c59d8ffca0e0383ad7ee14f0ce9
Merge: 0d5d029 6130192
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Jan 21 07:36:57 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 21 07:36:57 2017 -0500

    Merge topic 'sanitizer-options' into next
    
    61301929 Revert topic 'sanitizer-options'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=613019294497177018550dc4969e3c2b9b603f1b
commit 613019294497177018550dc4969e3c2b9b603f1b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Jan 21 07:36:35 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Jan 21 07:36:35 2017 -0500

    Revert topic 'sanitizer-options'

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index beaef81..a062e64 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -607,13 +607,9 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       this->MemoryTesterDynamicOptions.push_back("-E");
       this->MemoryTesterDynamicOptions.push_back("env");
       std::string envVar;
-      std::string extraOptions;
+      std::string extraOptions = ":" +
+        this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
       std::string suppressionsOption;
-      if (!this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions")
-             .empty()) {
-        extraOptions = ":" +
-          this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
-      }
       if (!this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile")
              .empty()) {
         suppressionsOption = ":suppressions=" +
@@ -636,7 +632,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
         envVar = "UBSAN_OPTIONS";
       }
       std::string outputFile =
-        envVar + "=log_path=" + this->MemoryTesterOutputFile;
+        envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\"";
       this->MemoryTesterEnvironmentVariable =
         outputFile + suppressionsOption + extraOptions;
       break;
diff --git a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
index ab4c5ab..352a381 100644
--- a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
@@ -19,7 +19,7 @@ unset(CMAKELISTS_EXTRA_CODE)
 #-----------------------------------------------------------------------------
 # add ThreadSanitizer test
 set(CTEST_EXTRA_CODE
-"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"report_bugs=1:history_size=5:exitcode=55\")
+"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"report_bugs=1 history_size=5 exitcode=55\")
 ")
 set(CMAKELISTS_EXTRA_CODE
 "add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\"
@@ -71,7 +71,7 @@ unset(CTEST_EXTRA_CODE)
 #-----------------------------------------------------------------------------
 # add MemorySanitizer test
 set(CTEST_EXTRA_CODE
-"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1:report_bugs=1:history_size=5:exitcode=55\")
+"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"simulate_sanitizer=1:report_bugs=1:history_size=5:exitcode=55\")
 ")
 set(CMAKELISTS_EXTRA_CODE
 "add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\"
diff --git a/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake
index 460d7cb..2a57b11 100644
--- a/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake
@@ -2,7 +2,7 @@
 # options
 
 message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=([^:]*).*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate AddressSanitizer don't do it
diff --git a/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake
index f14a773..3082e4b 100644
--- a/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake
@@ -2,7 +2,7 @@
 # options
 
 message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=([^:]*).*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate address sanitizer don't do it
diff --git a/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
index 272130e..af214c8 100644
--- a/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
@@ -2,7 +2,7 @@
 # options
 
 message("LSAN_OPTIONS = [$ENV{LSAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=([^:]*).*" "\\1" LOG_FILE "$ENV{LSAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{LSAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate LeakSanitizer don't do it
diff --git a/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake
index 3fc9335..c87af9a 100644
--- a/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake
@@ -1,8 +1,8 @@
-# this file simulates a program that has been built with MemorySanitizer
+# this file simulates a program that has been built with thread sanitizer
 # options
 
 message("MSAN_OPTIONS = [$ENV{MSAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=([^:]*).*" "\\1" LOG_FILE "$ENV{MSAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{MSAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate address sanitizer don't do it
diff --git a/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake
index 18208e2..d591931 100644
--- a/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake
@@ -1,8 +1,8 @@
-# this file simulates a program that has been built with ThreadSanitizer
+# this file simulates a program that has been built with thread sanitizer
 # options
 
 message("TSAN_OPTIONS = [$ENV{TSAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=([^:]*).*" "\\1" LOG_FILE "$ENV{TSAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{TSAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 set(error_types
diff --git a/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake
index 3c341a4..8ef3c0a 100644
--- a/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake
@@ -1,8 +1,8 @@
-# this file simulates a program that has been built with
-# UndefinedBehaviorSanitizer options
+# this file simulates a program that has been built with undefined behavior
+# sanitizer options
 
 message("UBSAN_OPTIONS = [$ENV{UBSAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=([^:]*).*" "\\1" LOG_FILE "$ENV{UBSAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{UBSAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate address sanitizer don't do it

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

Summary of changes:
 Source/CTest/cmCTestMemCheckHandler.cxx                      |   10 +++-------
 Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake             |    4 ++--
 Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake |    2 +-
 Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake     |    2 +-
 Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake        |    2 +-
 Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake      |    4 ++--
 Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake      |    4 ++--
 .../ctest_memcheck/testUndefinedBehaviorSanitizer.cmake      |    6 +++---
 8 files changed, 15 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sun Jan 22 00:01:10 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Sun, 22 Jan 2017 00:01:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1147-g8ea12a8
Message-ID: <20170122050110.7DA98FA58F@public.kitware.com>

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  8ea12a8b80c4c3153cc602f1d0735b3db8581ae8 (commit)
      from  ae629a0dc9fa775230f4ce0157f13fde99381c9c (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=8ea12a8b80c4c3153cc602f1d0735b3db8581ae8
commit 8ea12a8b80c4c3153cc602f1d0735b3db8581ae8
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sun Jan 22 00:01:07 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun Jan 22 00:01:07 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 8329dec..89ffb82 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 20170121)
+set(CMake_VERSION_PATCH 20170122)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From domen.vrankar at gmail.com  Sun Jan 22 16:09:09 2017
From: domen.vrankar at gmail.com (Domen Vrankar)
Date: Sun, 22 Jan 2017 16:09:09 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2285-g69cd1ce
Message-ID: <20170122210909.483FAFBF@public.kitware.com>

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  69cd1ce190268342cc570569afbba1fc6038822e (commit)
       via  624709c824a2d7a75a36dc23551377bdc2aee648 (commit)
       via  1c93eb683b182b1f0bbdcbd39fc50ad48cc57739 (commit)
      from  f6bdf63b18766c59d8ffca0e0383ad7ee14f0ce9 (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=69cd1ce190268342cc570569afbba1fc6038822e
commit 69cd1ce190268342cc570569afbba1fc6038822e
Merge: f6bdf63 624709c
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun Jan 22 16:09:08 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 22 16:09:08 2017 -0500

    Merge topic 'cpack-stgz-minimal-test' into next
    
    624709c8 CPack/STGZ: minimalistic packages test
    1c93eb68 CPack/STGZ prefer pax for extraction


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=624709c824a2d7a75a36dc23551377bdc2aee648
commit 624709c824a2d7a75a36dc23551377bdc2aee648
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Thu Jan 19 23:02:07 2017 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sun Jan 22 22:07:16 2017 +0100

    CPack/STGZ: minimalistic packages test

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d2465c4..a43e47b 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -345,7 +345,7 @@ if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
   add_RunCMake_test(CompilerLauncher)
 endif()
 
-add_RunCMake_test_group(CPack "DEB;RPM;7Z;TBZ2;TGZ;TXZ;TZ;ZIP")
+add_RunCMake_test_group(CPack "DEB;RPM;7Z;TBZ2;TGZ;TXZ;TZ;ZIP;STGZ")
 # add a test to make sure symbols are exported from a shared library
 # for MSVC compilers CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS property is used
 add_RunCMake_test(AutoExportDll)
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index ebaf792..65399db 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -16,7 +16,7 @@ run_cpack_test(GENERATE_SHLIBS_LDCONFIG "DEB" true "COMPONENT")
 run_cpack_test(INSTALL_SCRIPTS "RPM" false "COMPONENT")
 run_cpack_test(LONG_FILENAMES "DEB" false "MONOLITHIC")
 run_cpack_test_subtests(MAIN_COMPONENT "invalid;found" "RPM" false "COMPONENT")
-run_cpack_test(MINIMAL "RPM;DEB;7Z;TBZ2;TGZ;TXZ;TZ;ZIP" false "MONOLITHIC;COMPONENT")
+run_cpack_test(MINIMAL "RPM;DEB;7Z;TBZ2;TGZ;TXZ;TZ;ZIP;STGZ" false "MONOLITHIC;COMPONENT")
 run_cpack_test_subtests(PACKAGE_CHECKSUM "invalid;MD5;SHA1;SHA224;SHA256;SHA384;SHA512" "TGZ" false "MONOLITHIC")
 run_cpack_test(PARTIALLY_RELOCATABLE_WARNING "RPM" false "COMPONENT")
 run_cpack_test(PER_COMPONENT_FIELDS "RPM;DEB" false "COMPONENT")
diff --git a/Tests/RunCMake/CPack/STGZ/Helpers.cmake b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
new file mode 100644
index 0000000..08224d3
--- /dev/null
+++ b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
@@ -0,0 +1,64 @@
+set(ALL_FILES_GLOB "*.sh")
+
+function(getPackageContent FILE RESULT_VAR)
+  get_filename_component(path_ "${FILE}" DIRECTORY)
+  file(REMOVE_RECURSE "${path_}/content")
+  file(MAKE_DIRECTORY "${path_}/content")
+  execute_process(COMMAND ${FILE} --prefix=${path_}/content --include-subdir
+          RESULT_VARIABLE extract_result_
+          ERROR_VARIABLE extract_error_
+          OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  if(extract_result_)
+    message(FATAL_ERROR "Extracting STGZ archive failed: '${extract_result_}';"
+          " '${extract_error_}'.")
+  endif()
+
+  file(GLOB_RECURSE package_content_ LIST_DIRECTORIES true RELATIVE
+      "${path_}/content" "${path_}/content/*")
+
+  set(${RESULT_VAR} "${package_content_}" PARENT_SCOPE)
+endfunction()
+
+function(getPackageNameGlobexpr NAME COMPONENT VERSION REVISION FILE_NO RESULT_VAR)
+  if(COMPONENT)
+    set(COMPONENT "-${COMPONENT}")
+  endif()
+
+  set(${RESULT_VAR} "${NAME}-${VERSION}-*${COMPONENT}.sh" PARENT_SCOPE)
+endfunction()
+
+function(getPackageContentList FILE RESULT_VAR)
+  getPackageContent("${FILE}" package_content_)
+
+  set(${RESULT_VAR} "${package_content_}" PARENT_SCOPE)
+endfunction()
+
+function(toExpectedContentList FILE_NO CONTENT_VAR)
+  findExpectedFile("${FILE_NO}" "file_")
+
+  get_filename_component(prefix_ "${file_}" NAME)
+  # NAME_WE removes everything after the dot and dot is in version so replace instead
+  string(REPLACE ".sh" "" prefix_ "${prefix_}")
+
+  if(NOT PACKAGING_TYPE STREQUAL "MONOLITHIC")
+    # STGZ packages don't have component dir prefix in subdir
+    string(FIND "${prefix_}" "-" pos_ REVERSE)
+    string(SUBSTRING "${prefix_}" 0 ${pos_} prefix_)
+  endif()
+
+  if(NOT DEFINED TEST_MAIN_INSTALL_PREFIX_PATH)
+    set(TEST_MAIN_INSTALL_PREFIX_PATH "/usr")
+  endif()
+
+  set(filtered_ "${prefix_}")
+  foreach(part_ IN LISTS ${CONTENT_VAR})
+    string(REGEX REPLACE "^${TEST_MAIN_INSTALL_PREFIX_PATH}(/|$)" "" part_ "${part_}")
+
+    if(part_)
+      list(APPEND filtered_ "${prefix_}/${part_}")
+    endif()
+  endforeach()
+
+  set(${CONTENT_VAR} "${filtered_}" PARENT_SCOPE)
+endfunction()
diff --git a/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake b/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake
new file mode 100644
index 0000000..3b015ca
--- /dev/null
+++ b/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake
@@ -0,0 +1,11 @@
+function(get_test_prerequirements found_var config_file)
+  if(EXISTS "/bin/sh")
+    #gunzip is not part of posix so we should not rely on it being installed
+    find_program(GUNZIP_EXECUTABLE gunzip)
+
+    if(GUNZIP_EXECUTABLE)
+      file(WRITE "${config_file}" "")
+      set(${found_var} true PARENT_SCOPE)
+    endif()
+  endif()
+endfunction()
diff --git a/Tests/RunCMake/CPack/STGZ/packaging_COMPONENT_default.cmake b/Tests/RunCMake/CPack/STGZ/packaging_COMPONENT_default.cmake
new file mode 100644
index 0000000..81a5035
--- /dev/null
+++ b/Tests/RunCMake/CPack/STGZ/packaging_COMPONENT_default.cmake
@@ -0,0 +1 @@
+set(CPACK_ARCHIVE_COMPONENT_INSTALL "ON")

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c93eb683b182b1f0bbdcbd39fc50ad48cc57739
commit 1c93eb683b182b1f0bbdcbd39fc50ad48cc57739
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun Jan 22 22:04:42 2017 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sun Jan 22 22:06:59 2017 +0100

    CPack/STGZ prefer pax for extraction
    
    pax is part of POSIX while tar requires
    GNU extensions that are not part of some
    UNIX distros

diff --git a/Modules/CPack.STGZ_Header.sh.in b/Modules/CPack.STGZ_Header.sh.in
index dee576f..c615851 100755
--- a/Modules/CPack.STGZ_Header.sh.in
+++ b/Modules/CPack.STGZ_Header.sh.in
@@ -130,7 +130,10 @@ echo ""
 use_new_tail_syntax="-n"
 tail $use_new_tail_syntax +1 "$0" > /dev/null 2> /dev/null || use_new_tail_syntax=""
 
-tail $use_new_tail_syntax +###CPACK_HEADER_LENGTH### "$0" | gunzip | (cd "${toplevel}" && tar xf -) || cpack_echo_exit "Problem unpacking the @CPACK_PACKAGE_FILE_NAME@"
+extractor="pax -r"
+command -v pax > /dev/null 2> /dev/null || extractor="tar xf -"
+
+tail $use_new_tail_syntax +###CPACK_HEADER_LENGTH### "$0" | gunzip | (cd "${toplevel}" && ${extractor}) || cpack_echo_exit "Problem unpacking the @CPACK_PACKAGE_FILE_NAME@"
 
 echo "Unpacking finished successfully"
 

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

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Mon Jan 23 00:01:07 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Mon, 23 Jan 2017 00:01:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1148-g7b4514f
Message-ID: <20170123050107.060D1FA40F@public.kitware.com>

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  7b4514fb33cf256ef165b2b28ba4affd1930a957 (commit)
      from  8ea12a8b80c4c3153cc602f1d0735b3db8581ae8 (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=7b4514fb33cf256ef165b2b28ba4affd1930a957
commit 7b4514fb33cf256ef165b2b28ba4affd1930a957
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Mon Jan 23 00:01:04 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jan 23 00:01:04 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 89ffb82..cb3ba1c 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 20170122)
+set(CMake_VERSION_PATCH 20170123)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From ben.boeckel at kitware.com  Mon Jan 23 08:49:33 2017
From: ben.boeckel at kitware.com (Ben Boeckel)
Date: Mon, 23 Jan 2017 08:49:33 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2290-gca3a4fe
Message-ID: <20170123134933.4F3C0F9FF7@public.kitware.com>

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  ca3a4fee2db8946a5ba46498959027a5cdf84b9a (commit)
       via  893423e9c9f4563dcd33e6472c8be85ec1aca88c (commit)
       via  7b4514fb33cf256ef165b2b28ba4affd1930a957 (commit)
       via  8ea12a8b80c4c3153cc602f1d0735b3db8581ae8 (commit)
       via  ae629a0dc9fa775230f4ce0157f13fde99381c9c (commit)
      from  69cd1ce190268342cc570569afbba1fc6038822e (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=ca3a4fee2db8946a5ba46498959027a5cdf84b9a
commit ca3a4fee2db8946a5ba46498959027a5cdf84b9a
Merge: 69cd1ce 893423e
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jan 23 08:49:32 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 23 08:49:32 2017 -0500

    Merge topic 'dl-libs-typo' into next
    
    893423e9 CMAKE_DL_LIBS: fix typo
    7b4514fb CMake Nightly Date Stamp
    8ea12a8b CMake Nightly Date Stamp
    ae629a0d CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=893423e9c9f4563dcd33e6472c8be85ec1aca88c
commit 893423e9c9f4563dcd33e6472c8be85ec1aca88c
Author:     Thiago Perrotta <tperrotta at tgr.net.br>
AuthorDate: Fri Jan 20 23:35:27 2017 -0200
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Jan 23 08:48:36 2017 -0500

    CMAKE_DL_LIBS: fix typo

diff --git a/Help/variable/CMAKE_DL_LIBS.rst b/Help/variable/CMAKE_DL_LIBS.rst
index 1fe7641..50d313d 100644
--- a/Help/variable/CMAKE_DL_LIBS.rst
+++ b/Help/variable/CMAKE_DL_LIBS.rst
@@ -1,7 +1,7 @@
 CMAKE_DL_LIBS
 -------------
 
-Name of library containing ``dlopen`` and ``dlcose``.
+Name of library containing ``dlopen`` and ``dlclose``.
 
 The name of the library that has ``dlopen`` and ``dlclose`` in it, usually
 ``-ldl`` on most UNIX machines.

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

Summary of changes:
 Help/variable/CMAKE_DL_LIBS.rst |    2 +-
 Source/CMakeVersion.cmake       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Tue Jan 24 00:01:07 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Tue, 24 Jan 2017 00:01:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1149-g269b1db
Message-ID: <20170124050107.5A29BF9D7A@public.kitware.com>

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  269b1db914698a94cfb53998d8811ab03885418c (commit)
      from  7b4514fb33cf256ef165b2b28ba4affd1930a957 (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=269b1db914698a94cfb53998d8811ab03885418c
commit 269b1db914698a94cfb53998d8811ab03885418c
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Tue Jan 24 00:01:05 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jan 24 00:01:05 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index cb3ba1c..8e6ca1a 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 20170123)
+set(CMake_VERSION_PATCH 20170124)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 24 14:38:09 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Jan 2017 14:38:09 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2292-gdf0c2c01a
Message-ID: <20170124193809.CD6C6F9F7E@public.kitware.com>

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  df0c2c01ada32e63420fcaa4cfdb1e6acd3137d5 (commit)
       via  114ac7d005d262f6fa13a87111303938e66cec3f (commit)
      from  ca3a4fee2db8946a5ba46498959027a5cdf84b9a (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=df0c2c01ada32e63420fcaa4cfdb1e6acd3137d5
commit df0c2c01ada32e63420fcaa4cfdb1e6acd3137d5
Merge: ca3a4fe 114ac7d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 14:38:08 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 14:38:08 2017 -0500

    Merge topic 'dl-libs-typo' into next
    
    114ac7d0 Help: Fix typo in CMAKE_DL_LIBS docs


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=114ac7d005d262f6fa13a87111303938e66cec3f
commit 114ac7d005d262f6fa13a87111303938e66cec3f
Author:     Thiago Perrotta <tperrotta at tgr.net.br>
AuthorDate: Fri Jan 20 23:35:27 2017 -0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 24 14:37:07 2017 -0500

    Help: Fix typo in CMAKE_DL_LIBS docs

diff --git a/Help/variable/CMAKE_DL_LIBS.rst b/Help/variable/CMAKE_DL_LIBS.rst
index 1fe7641..50d313d 100644
--- a/Help/variable/CMAKE_DL_LIBS.rst
+++ b/Help/variable/CMAKE_DL_LIBS.rst
@@ -1,7 +1,7 @@
 CMAKE_DL_LIBS
 -------------
 
-Name of library containing ``dlopen`` and ``dlcose``.
+Name of library containing ``dlopen`` and ``dlclose``.
 
 The name of the library that has ``dlopen`` and ``dlclose`` in it, usually
 ``-ldl`` on most UNIX machines.

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 24 14:45:18 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Jan 2017 14:45:18 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1152-gf6e4602
Message-ID: <20170124194518.53E71F9EF2@public.kitware.com>

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  f6e4602fe7467fe149f3843a3263a986ea1d804d (commit)
       via  4bfb1249ede1b86dcd53b34ec885f17460edc8f6 (commit)
       via  90cb40832375fa880b792ca9bf5cdd3071912f9d (commit)
      from  269b1db914698a94cfb53998d8811ab03885418c (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=f6e4602fe7467fe149f3843a3263a986ea1d804d
commit f6e4602fe7467fe149f3843a3263a986ea1d804d
Merge: 269b1db 4bfb124
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 14:45:15 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 14:45:15 2017 -0500

    Merge topic 'csproj-improvements'
    
    4bfb1249 VS: removed usage of relative paths for C# targets in in-source builds
    90cb4083 VS: improve handling of source files with special extensions in .csproj


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

Summary of changes:
 Help/manual/cmake-properties.7.rst                 |    3 +
 Help/prop_sf/VS_COPY_TO_OUT_DIR.rst                |    6 +
 Help/prop_sf/VS_INCLUDE_IN_VSIX.rst                |    6 +
 Help/prop_sf/VS_RESOURCE_GENERATOR.rst             |    8 +
 Help/release/dev/vs-advanced-source-properties.rst |   12 ++
 Help/release/dev/vs-csharp-support.rst             |   13 +-
 Source/cmVisualStudio10TargetGenerator.cxx         |  209 +++++++++++++++++---
 7 files changed, 230 insertions(+), 27 deletions(-)
 create mode 100644 Help/prop_sf/VS_COPY_TO_OUT_DIR.rst
 create mode 100644 Help/prop_sf/VS_INCLUDE_IN_VSIX.rst
 create mode 100644 Help/prop_sf/VS_RESOURCE_GENERATOR.rst
 create mode 100644 Help/release/dev/vs-advanced-source-properties.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 24 14:45:20 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Jan 2017 14:45:20 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1154-g0e990a0
Message-ID: <20170124194520.C5717F9F88@public.kitware.com>

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  0e990a01f15dfcddebc24ca018d4695209226132 (commit)
       via  1c2ac0b8baebcf2496d701ab316f8f5666b470be (commit)
      from  f6e4602fe7467fe149f3843a3263a986ea1d804d (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=0e990a01f15dfcddebc24ca018d4695209226132
commit 0e990a01f15dfcddebc24ca018d4695209226132
Merge: f6e4602 1c2ac0b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 14:45:19 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 14:45:19 2017 -0500

    Merge topic 'qt4-lupdate-cmp0058'
    
    1c2ac0b8 Qt4: Only change timestamp on generated .pro files if content changes


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 24 14:45:24 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Jan 2017 14:45:24 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1156-g6c99ec5
Message-ID: <20170124194524.3A225F9FE5@public.kitware.com>

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  6c99ec5bfdc9710355e3318cb9884638ea2ce925 (commit)
       via  8f1bce12d2f8ae2eb3771b173b28b8405b059923 (commit)
      from  0e990a01f15dfcddebc24ca018d4695209226132 (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=6c99ec5bfdc9710355e3318cb9884638ea2ce925
commit 6c99ec5bfdc9710355e3318cb9884638ea2ce925
Merge: 0e990a0 8f1bce1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 14:45:22 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 14:45:22 2017 -0500

    Merge topic 'qtdialog-trim-new-varname'
    
    8f1bce12 cmake-gui: trim spaces from user-created variable names


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 24 14:45:26 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Jan 2017 14:45:26 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1158-g6122fc5
Message-ID: <20170124194532.37133F9EF2@public.kitware.com>

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  6122fc54a9275caf3054a12bbc813be2c8036863 (commit)
       via  10c9c73d58b481a212d1ed87ceeb227a7654bc56 (commit)
      from  6c99ec5bfdc9710355e3318cb9884638ea2ce925 (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=6122fc54a9275caf3054a12bbc813be2c8036863
commit 6122fc54a9275caf3054a12bbc813be2c8036863
Merge: 6c99ec5 10c9c73
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 14:45:24 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 14:45:24 2017 -0500

    Merge topic '16253-xcode-effective-platform-name'
    
    10c9c73d Xcode: Control emission of EFFECTIVE_PLATFORM_NAME


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

Summary of changes:
 Help/manual/cmake-properties.7.rst                 |    1 +
 .../XCODE_EMIT_EFFECTIVE_PLATFORM_NAME.rst         |   24 ++++++++++++++++++++
 Help/release/dev/xcode-effective-platform-name.rst |    8 +++++++
 Source/cmGeneratorTarget.cxx                       |    5 ++--
 Source/cmGlobalGenerator.cxx                       |    4 ++--
 Source/cmGlobalGenerator.h                         |    4 ++++
 Source/cmGlobalXCodeGenerator.cxx                  |   14 ++++++++++++
 Source/cmGlobalXCodeGenerator.h                    |    2 ++
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake     |   21 +++++++++++++++++
 .../RunCMake/XcodeProject/XcodeMultiplatform.cmake |   14 ++++++++++++
 10 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100644 Help/prop_gbl/XCODE_EMIT_EFFECTIVE_PLATFORM_NAME.rst
 create mode 100644 Help/release/dev/xcode-effective-platform-name.rst
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeMultiplatform.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 24 14:45:34 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Jan 2017 14:45:34 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1161-g38bb963
Message-ID: <20170124194534.7EDD5F9FE5@public.kitware.com>

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  38bb96386cdc331d6fd080166318ff8272fc19eb (commit)
       via  1ee0ffab819d632d7570bee23a83807facbb45a2 (commit)
       via  1806e011cb2608c7ef62f345661dd35a899eb81c (commit)
      from  6122fc54a9275caf3054a12bbc813be2c8036863 (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=38bb96386cdc331d6fd080166318ff8272fc19eb
commit 38bb96386cdc331d6fd080166318ff8272fc19eb
Merge: 6122fc5 1ee0ffa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 14:45:32 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 14:45:32 2017 -0500

    Merge topic 'android-include-api'
    
    1ee0ffab Android: Pass sysroot include directory explicitly
    1806e011 Android: Fix c++_{static,shared} support include directory order


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

Summary of changes:
 Modules/Platform/Android-Common.cmake      |    9 +++++++++
 Modules/Platform/Android/ndk-stl-c++.cmake |    5 ++---
 2 files changed, 11 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 24 14:45:37 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Jan 2017 14:45:37 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1164-gc59d381
Message-ID: <20170124194537.25CC9F9FFD@public.kitware.com>

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  c59d381065b14076f47246f21ecd730cfdbae7a1 (commit)
       via  624709c824a2d7a75a36dc23551377bdc2aee648 (commit)
       via  1c93eb683b182b1f0bbdcbd39fc50ad48cc57739 (commit)
      from  38bb96386cdc331d6fd080166318ff8272fc19eb (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=c59d381065b14076f47246f21ecd730cfdbae7a1
commit c59d381065b14076f47246f21ecd730cfdbae7a1
Merge: 38bb963 624709c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 14:45:35 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 14:45:35 2017 -0500

    Merge topic 'cpack-stgz-minimal-test'
    
    624709c8 CPack/STGZ: minimalistic packages test
    1c93eb68 CPack/STGZ prefer pax for extraction


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

Summary of changes:
 Modules/CPack.STGZ_Header.sh.in                    |    5 +-
 Tests/RunCMake/CMakeLists.txt                      |    2 +-
 Tests/RunCMake/CPack/RunCMakeTest.cmake            |    2 +-
 Tests/RunCMake/CPack/STGZ/Helpers.cmake            |   64 ++++++++++++++++++++
 Tests/RunCMake/CPack/STGZ/Prerequirements.cmake    |   11 ++++
 .../{7Z => STGZ}/packaging_COMPONENT_default.cmake |    0
 6 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 Tests/RunCMake/CPack/STGZ/Helpers.cmake
 create mode 100644 Tests/RunCMake/CPack/STGZ/Prerequirements.cmake
 copy Tests/RunCMake/CPack/{7Z => STGZ}/packaging_COMPONENT_default.cmake (100%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 24 14:45:39 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Jan 2017 14:45:39 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1166-g3270f76
Message-ID: <20170124194539.68EEBFA001@public.kitware.com>

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  3270f763b28195de83c8b762dba5fb366b714b30 (commit)
       via  114ac7d005d262f6fa13a87111303938e66cec3f (commit)
      from  c59d381065b14076f47246f21ecd730cfdbae7a1 (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=3270f763b28195de83c8b762dba5fb366b714b30
commit 3270f763b28195de83c8b762dba5fb366b714b30
Merge: c59d381 114ac7d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 14:45:37 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 14:45:37 2017 -0500

    Merge topic 'dl-libs-typo'
    
    114ac7d0 Help: Fix typo in CMAKE_DL_LIBS docs


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

Summary of changes:
 Help/variable/CMAKE_DL_LIBS.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 24 14:46:11 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Jan 2017 14:46:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2301-g474151c
Message-ID: <20170124194611.5D49BFA021@public.kitware.com>

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  474151cfc6545eb0938e45fe5885c2ae569098ec (commit)
       via  3270f763b28195de83c8b762dba5fb366b714b30 (commit)
       via  c59d381065b14076f47246f21ecd730cfdbae7a1 (commit)
       via  38bb96386cdc331d6fd080166318ff8272fc19eb (commit)
       via  6122fc54a9275caf3054a12bbc813be2c8036863 (commit)
       via  6c99ec5bfdc9710355e3318cb9884638ea2ce925 (commit)
       via  0e990a01f15dfcddebc24ca018d4695209226132 (commit)
       via  f6e4602fe7467fe149f3843a3263a986ea1d804d (commit)
       via  269b1db914698a94cfb53998d8811ab03885418c (commit)
      from  df0c2c01ada32e63420fcaa4cfdb1e6acd3137d5 (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=474151cfc6545eb0938e45fe5885c2ae569098ec
commit 474151cfc6545eb0938e45fe5885c2ae569098ec
Merge: df0c2c01a 3270f76
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 14:46:01 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 24 14:46:01 2017 -0500

    Merge branch 'master' into next


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 24 15:32:09 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Jan 2017 15:32:09 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2304-gfea7e6f
Message-ID: <20170124203209.36725F9E26@public.kitware.com>

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  fea7e6f3ce3d24510a883e8dd2c92ca38fa34acd (commit)
       via  e116f2a5de330ca4dd413e29db62ed39805b2c06 (commit)
       via  522e1588ec7bfdbc86199cc1991e706ebafc02fd (commit)
      from  474151cfc6545eb0938e45fe5885c2ae569098ec (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=fea7e6f3ce3d24510a883e8dd2c92ca38fa34acd
commit fea7e6f3ce3d24510a883e8dd2c92ca38fa34acd
Merge: 474151c e116f2a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 15:32:08 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 15:32:08 2017 -0500

    Merge topic 'sanitizer-options' into next
    
    e116f2a5 ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty
    522e1588 Tests: Use CTEST_MEMORYCHECK_SANITIZER_OPTIONS where appropriate


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e116f2a5de330ca4dd413e29db62ed39805b2c06
commit e116f2a5de330ca4dd413e29db62ed39805b2c06
Author:     Jamie Snape <jamie.snape at kitware.com>
AuthorDate: Mon Jan 23 10:50:38 2017 -0500
Commit:     Jamie Snape <jamie.snape at kitware.com>
CommitDate: Mon Jan 23 10:50:38 2017 -0500

    ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index a062e64..620e237 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -607,9 +607,13 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       this->MemoryTesterDynamicOptions.push_back("-E");
       this->MemoryTesterDynamicOptions.push_back("env");
       std::string envVar;
-      std::string extraOptions = ":" +
-        this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
+      std::string extraOptions;
       std::string suppressionsOption;
+      if (!this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions")
+             .empty()) {
+        extraOptions = ":" +
+          this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
+      }
       if (!this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile")
              .empty()) {
         suppressionsOption = ":suppressions=" +
@@ -631,8 +635,10 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
                  cmCTestMemCheckHandler::UB_SANITIZER) {
         envVar = "UBSAN_OPTIONS";
       }
+      // Quote log_path with single quotes; see
+      // https://bugs.chromium.org/p/chromium/issues/detail?id=467936
       std::string outputFile =
-        envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\"";
+        envVar + "=log_path='" + this->MemoryTesterOutputFile + "'";
       this->MemoryTesterEnvironmentVariable =
         outputFile + suppressionsOption + extraOptions;
       break;
diff --git a/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake
index 2a57b11..ca36a7c 100644
--- a/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake
@@ -2,7 +2,7 @@
 # options
 
 message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=\'([^\']*)\'.*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate AddressSanitizer don't do it
diff --git a/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake
index 3082e4b..1219666 100644
--- a/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake
@@ -2,7 +2,7 @@
 # options
 
 message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=\'([^\']*)\'.*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate address sanitizer don't do it
diff --git a/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
index af214c8..6d51f83 100644
--- a/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
@@ -2,7 +2,7 @@
 # options
 
 message("LSAN_OPTIONS = [$ENV{LSAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{LSAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=\'([^\']*)\'.*" "\\1" LOG_FILE "$ENV{LSAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate LeakSanitizer don't do it
diff --git a/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake
index c87af9a..3b3ac22 100644
--- a/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake
@@ -1,8 +1,8 @@
-# this file simulates a program that has been built with thread sanitizer
+# this file simulates a program that has been built with MemorySanitizer
 # options
 
 message("MSAN_OPTIONS = [$ENV{MSAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{MSAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=\'([^\']*)\'.*" "\\1" LOG_FILE "$ENV{MSAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate address sanitizer don't do it
diff --git a/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake
index d591931..e7a5c9f 100644
--- a/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake
@@ -1,8 +1,8 @@
-# this file simulates a program that has been built with thread sanitizer
+# this file simulates a program that has been built with ThreadSanitizer
 # options
 
 message("TSAN_OPTIONS = [$ENV{TSAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{TSAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=\'([^\']*)\'.*" "\\1" LOG_FILE "$ENV{TSAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 set(error_types
diff --git a/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake
index 8ef3c0a..ba6122d 100644
--- a/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake
@@ -1,8 +1,8 @@
-# this file simulates a program that has been built with undefined behavior
-# sanitizer options
+# this file simulates a program that has been built with
+# UndefinedBehaviorSanitizer options
 
 message("UBSAN_OPTIONS = [$ENV{UBSAN_OPTIONS}]")
-string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{UBSAN_OPTIONS}")
+string(REGEX REPLACE ".*log_path=\'([^\']*)\'.*" "\\1" LOG_FILE "$ENV{UBSAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
 # if we are not asked to simulate address sanitizer don't do it

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=522e1588ec7bfdbc86199cc1991e706ebafc02fd
commit 522e1588ec7bfdbc86199cc1991e706ebafc02fd
Author:     Jamie Snape <jamie.snape at kitware.com>
AuthorDate: Mon Jan 23 09:13:26 2017 -0500
Commit:     Jamie Snape <jamie.snape at kitware.com>
CommitDate: Mon Jan 23 09:13:26 2017 -0500

    Tests: Use CTEST_MEMORYCHECK_SANITIZER_OPTIONS where appropriate
    
    Previously the ThreadSanitizer and MemorySanitizer tests erroneously
    used `CTEST_MEMORYCHECK_COMMAND_OPTIONS`.

diff --git a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
index 352a381..ab4c5ab 100644
--- a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
@@ -19,7 +19,7 @@ unset(CMAKELISTS_EXTRA_CODE)
 #-----------------------------------------------------------------------------
 # add ThreadSanitizer test
 set(CTEST_EXTRA_CODE
-"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"report_bugs=1 history_size=5 exitcode=55\")
+"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"report_bugs=1:history_size=5:exitcode=55\")
 ")
 set(CMAKELISTS_EXTRA_CODE
 "add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\"
@@ -71,7 +71,7 @@ unset(CTEST_EXTRA_CODE)
 #-----------------------------------------------------------------------------
 # add MemorySanitizer test
 set(CTEST_EXTRA_CODE
-"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"simulate_sanitizer=1:report_bugs=1:history_size=5:exitcode=55\")
+"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1:report_bugs=1:history_size=5:exitcode=55\")
 ")
 set(CMAKELISTS_EXTRA_CODE
 "add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\"

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

Summary of changes:
 Source/CTest/cmCTestMemCheckHandler.cxx                    |   12 +++++++++---
 Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake           |    4 ++--
 .../RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake |    2 +-
 Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake   |    2 +-
 Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake      |    2 +-
 Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake    |    4 ++--
 Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake    |    4 ++--
 .../ctest_memcheck/testUndefinedBehaviorSanitizer.cmake    |    6 +++---
 8 files changed, 21 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 24 15:33:32 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Jan 2017 15:33:32 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2306-g90a3dd6
Message-ID: <20170124203332.E9964F9ED7@public.kitware.com>

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  90a3dd6f7cbb1263ea92537fc780678aa6c01999 (commit)
       via  0618ddf6b1da3a886f12b6ad2b19da49b2f87e28 (commit)
      from  fea7e6f3ce3d24510a883e8dd2c92ca38fa34acd (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=90a3dd6f7cbb1263ea92537fc780678aa6c01999
commit 90a3dd6f7cbb1263ea92537fc780678aa6c01999
Merge: fea7e6f 0618ddf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 15:33:31 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 15:33:31 2017 -0500

    Merge topic 'lang_lint' into next
    
    0618ddf6 Add properties to run the cpplint style checker with the compiler


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0618ddf6b1da3a886f12b6ad2b19da49b2f87e28
commit 0618ddf6b1da3a886f12b6ad2b19da49b2f87e28
Author:     Jamie Snape <jamie.snape at kitware.com>
AuthorDate: Mon Jan 23 14:47:13 2017 -0500
Commit:     Jamie Snape <jamie.snape at kitware.com>
CommitDate: Mon Jan 23 14:47:13 2017 -0500

    Add properties to run the cpplint style checker with the compiler
    
    Create a `<LANG>_CPPLINT` target property (initialized by a
    `CMAKE_<LANG>_CPPLINT` variable) to specify a `cpplint` style checker
    command line to be run along with the compiler.

diff --git a/Auxiliary/vim/syntax/cmake.vim b/Auxiliary/vim/syntax/cmake.vim
index fabf9c1..1f19cb7 100644
--- a/Auxiliary/vim/syntax/cmake.vim
+++ b/Auxiliary/vim/syntax/cmake.vim
@@ -32,11 +32,11 @@ syn region cmakeArguments start=/(/ end=/)/
 
 syn case match
 syn keyword cmakeProperty
-            \ ABSTRACT ADDITIONAL_MAKE_CLEAN_FILES ADVANCED ALIASED_TARGET ALLOW_DUPLICATE_CUSTOM_TARGETS ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_API ANDROID_API_MIN ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES ANDROID_GUI ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_DEBUG ARCHIVE_OUTPUT_DIRECTORY_RELEASE ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_DEBUG ARCHIVE_OUTPUT_NAME_RELEASE ATTACHED_FILES ATTACHED_FILES_ON_FAIL AUTOGEN_TARGETS_FOLDER AUTOGEN_TARGET_DEPENDS AUTOMOC AUTOMOC_MOC_OPTIONS AUTOMOC_TARGETS_FOLDER AUTORCC AUTORCC_OPTIONS AUTOUIC AUTOUIC_OPTIONS BINARY_DIR BUILD_WITH_INSTALL_RPATH BUNDLE BUNDLE_EXTENSION CACHE_VARIABLES CLEAN_NO_CUSTOM CMAKE_CONFIGURE_DEPENDS CMAKE_CXX_KNOWN_FEATURES CMAKE_C_KNOWN_FEATURES COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN COMPATIBLE_INTERFACE_STRING COMPILE_DEFINITIONS COMPILE_DEFINITIONS_DEBUG COMPILE_DEFINITIONS_RELEASE COMPILE_FEATURES COMPILE_FLAGS COMPILE_OPTIONS COMPILE_PDB_NAME COMPILE_PDB_NAME_DEBUG COMPILE_PDB_NAME_RELEASE COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG COMPILE_PDB_OUTPUT_DIRECTORY_RELEASE COST CPACK_DESKTOP_SHORTCUTS CPACK_NEVER_OVERWRITE CPACK_PERMANENT CPACK_STARTUP_SHORTCUTS CPACK_START_MENU_SHORTCUTS CPACK_WIX_ACL CROSSCOMPILING_EMULATOR CXX_EXTENSIONS CXX_STANDARD CXX_STANDARD_REQUIRED C_EXTENSIONS C_STANDARD C_STANDARD_REQUIRED DEBUG_CONFIGURATIONS DEBUG_POSTFIX DEFINE_SYMBOL DEFINITIONS DEPENDS DISABLED_FEATURES ECLIPSE_EXTRA_NATURES ENABLED_FEATURES ENABLED_LANGUAGES ENABLE_EXPORTS ENVIRONMENT EXCLUDE_FROM_ALL EXCLUDE_FROM_DEFAULT_BUILD EXCLUDE_FROM_DEFAULT_BUILD_DEBUG EXCLUDE_FROM_DEFAULT_BUILD_RELEASE EXPORT_NAME EXTERNAL_OBJECT EchoString FAIL_REGULAR_EXPRESSION FIND_LIBRARY_USE_LIB64_PATHS FIND_LIBRARY_USE_OPENBSD_VERSIONING FOLDER FRAMEWORK FRAMEWORK_VERSION Fortran_FORMAT Fortran_MODULE_DIRECTORY GENERATED GENERATOR_FILE_NAME GLOBAL_DEPENDS_DEBUG_MODE GLOBAL_DEPENDS_NO_CYCLES GNUtoMS HAS_CXX HEADER_FILE_ONLY HELPSTRING IMPLICIT_DEPENDS_INCLUDE_TRANSFORM IMPORTED IMPORTED_CONFIGURATIONS IMPORTED_IMPLIB IMPORTED_IMPLIB_DEBUG IMPORTED_IMPLIB_RELEASE IMPORTED_LINK_DEPENDENT_LIBRARIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUG IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_LANGUAGES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE IMPORTED_LINK_INTERFACE_LIBRARIES IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_MULTIPLICITY IMPORTED_LINK_INTERFACE_MULTIPLICITY_DEBUG IMPORTED_LINK_INTERFACE_MULTIPLICITY_RELEASE IMPORTED_LOCATION IMPORTED_LOCATION_DEBUG IMPORTED_LOCATION_RELEASE IMPORTED_NO_SONAME IMPORTED_NO_SONAME_DEBUG IMPORTED_NO_SONAME_RELEASE IMPORTED_SONAME IMPORTED_SONAME_DEBUG IMPORTED_SONAME_RELEASE IMPORT_PREFIX IMPORT_SUFFIX INCLUDE_DIRECTORIES INCLUDE_REGULAR_EXPRESSION INSTALL_NAME_DIR INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH INTERFACE_AUTOUIC_OPTIONS INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS INTERFACE_INCLUDE_DIRECTORIES INTERFACE_LINK_LIBRARIES INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SOURCES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES INTERPROCEDURAL_OPTIMIZATION INTERPROCEDURAL_OPTIMIZATION_DEBUG INTERPROCEDURAL_OPTIMIZATION_RELEASE IN_TRY_COMPILE JOB_POOLS JOB_POOL_COMPILE JOB_POOL_LINK KEEP_EXTENSION LABELS LANGUAGE LIBRARY_OUTPUT_DIRECTORY LIBRARY_OUTPUT_DIRECTORY_DEBUG LIBRARY_OUTPUT_DIRECTORY_RELEASE LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_DEBUG LIBRARY_OUTPUT_NAME_RELEASE LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED LINK_DIRECTORIES LINK_FLAGS LINK_FLAGS_DEBUG LINK_FLAGS_RELEASE LINK_INTERFACE_LIBRARIES LINK_INTERFACE_LIBRARIES_DEBUG LINK_INTERFACE_LIBRARIES_RELEASE LINK_INTERFACE_MULTIPLICITY LINK_INTERFACE_MULTIPLICITY_DEBUG LINK_INTERFACE_MULTIPLICITY_RELEASE LINK_LIBRARIES LINK_SEARCH_END_STATIC LINK_SEARCH_START_STATIC LISTFILE_STACK LOCATION LOCATION_DEBUG LOCATION_RELEASE MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_PACKAGE_LOCATION MACOSX_RPATH MACROS MAP_IMPORTED_CONFIG_DEBUG MAP_IMPORTED_CONFIG_RELEASE MEASUREMENT MODIFIED NAME NO_SONAME NO_SYSTEM_FROM_IMPORTED OBJECT_DEPENDS OBJECT_OUTPUTS OSX_ARCHITECTURES OSX_ARCHITECTURES_DEBUG OSX_ARCHITECTURES_RELEASE OUTPUT_NAME OUTPUT_NAME_DEBUG OUTPUT_NAME_RELEASE PACKAGES_FOUND PACKAGES_NOT_FOUND PARENT_DIRECTORY PASS_REGULAR_EXPRESSION PDB_NAME PDB_NAME_DEBUG PDB_NAME_RELEASE PDB_OUTPUT_DIRECTORY PDB_OUTPUT_DIRECTORY_DEBUG PDB_OUTPUT_DIRECTORY_RELEASE POSITION_INDEPENDENT_CODE POST_INSTALL_SCRIPT PREDEFINED_TARGETS_FOLDER PREFIX PRE_INSTALL_SCRIPT PRIVATE_HEADER PROCESSORS PROJECT_LABEL PUBLIC_HEADER REPORT_UNDEFINED_PROPERTIES REQUIRED_FILES RESOURCE RESOURCE_LOCK RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK RULE_MESSAGES RUNTIME_OUTPUT_DIRECTORY RUNTIME_OUTPUT_DIRECTORY_DEBUG RUNTIME_OUTPUT_DIRECTORY_RELEASE RUNTIME_OUTPUT_NAME RUNTIME_OUTPUT_NAME_DEBUG RUNTIME_OUTPUT_NAME_RELEASE RUN_SERIAL SKIP_BUILD_RPATH SKIP_RETURN_CODE SOURCES SOURCE_DIR SOVERSION STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_DEBUG STATIC_LIBRARY_FLAGS_RELEASE STRINGS SUFFIX SYMBOLIC TARGET_ARCHIVES_MAY_BE_SHARED_LIBS TARGET_MESSAGES TARGET_SUPPORTS_SHARED_LIBS TEST_INCLUDE_FILE TIMEOUT TYPE USE_FOLDERS VALUE VARIABLES VERSION VISIBILITY_INLINES_HIDDEN VS_DEPLOYMENT_CONTENT VS_DEPLOYMENT_LOCATION VS_DESKTOP_EXTENSIONS_VERSION VS_DOTNET_REFERENCES VS_DOTNET_TARGET_FRAMEWORK_VERSION VS_GLOBAL_KEYWORD VS_GLOBAL_PROJECT_TYPES VS_GLOBAL_ROOTNAMESPACE VS_IOT_EXTENSIONS_VERSION VS_IOT_STARTUP_TASK VS_KEYWORD VS_MOBILE_EXTENSIONS_VERSION VS_SCC_AUXPATH VS_SCC_LOCALPATH VS_SCC_PROJECTNAME VS_SCC_PROVIDER VS_SHADER_ENTRYPOINT VS_SHADER_FLAGS VS_SHADER_MODEL VS_SHADER_TYPE VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES VS_XAML_TYPE WILL_FAIL WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS WORKING_DIRECTORY WRAP_EXCLUDE XCODE_EXPLICIT_FILE_TYPE XCODE_LAST_KNOWN_FILE_TYPE XCTEST
+            \ ABSTRACT ADDITIONAL_MAKE_CLEAN_FILES ADVANCED ALIASED_TARGET ALLOW_DUPLICATE_CUSTOM_TARGETS ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_API ANDROID_API_MIN ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES ANDROID_GUI ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_DEBUG ARCHIVE_OUTPUT_DIRECTORY_RELEASE ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_DEBUG ARCHIVE_OUTPUT_NAME_RELEASE ATTACHED_FILES ATTACHED_FILES_ON_FAIL AUTOGEN_TARGETS_FOLDER AUTOGEN_TARGET_DEPENDS AUTOMOC AUTOMOC_MOC_OPTIONS AUTOMOC_TARGETS_FOLDER AUTORCC AUTORCC_OPTIONS AUTOUIC AUTOUIC_OPTIONS BINARY_DIR BUILD_WITH_INSTALL_RPATH BUNDLE BUNDLE_EXTENSION CACHE_VARIABLES CLEAN_NO_CUSTOM CMAKE_CONFIGURE_DEPENDS CMAKE_CXX_KNOWN_FEATURES CMAKE_C_KNOWN_FEATURES COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN COMPATIBLE_INTERFACE_STRING COMPILE_DEFINITIONS COMPILE_DEFINITIONS_DEBUG COMPILE_DEFINITIONS_RELEASE COMPILE_FEATURES COMPILE_FLAGS COMPILE_OPTIONS COMPILE_PDB_NAME COMPILE_PDB_NAME_DEBUG COMPILE_PDB_NAME_RELEASE COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG COMPILE_PDB_OUTPUT_DIRECTORY_RELEASE COST CPACK_DESKTOP_SHORTCUTS CPACK_NEVER_OVERWRITE CPACK_PERMANENT CPACK_STARTUP_SHORTCUTS CPACK_START_MENU_SHORTCUTS CPACK_WIX_ACL CROSSCOMPILING_EMULATOR CXX_EXTENSIONS CXX_CPPLINT CXX_STANDARD CXX_STANDARD_REQUIRED C_EXTENSIONS C_CPPLINT C_STANDARD C_STANDARD_REQUIRED DEBUG_CONFIGURATIONS DEBUG_POSTFIX DEFINE_SYMBOL DEFINITIONS DEPENDS DISABLED_FEATURES ECLIPSE_EXTRA_NATURES ENABLED_FEATURES ENABLED_LANGUAGES ENABLE_EXPORTS ENVIRONMENT EXCLUDE_FROM_ALL EXCLUDE_FROM_DEFAULT_BUILD EXCLUDE_FROM_DEFAULT_BUILD_DEBUG EXCLUDE_FROM_DEFAULT_BUILD_RELEASE EXPORT_NAME EXTERNAL_OBJECT EchoString FAIL_REGULAR_EXPRESSION FIND_LIBRARY_USE_LIB64_PATHS FIND_LIBRARY_USE_OPENBSD_VERSIONING FOLDER FRAMEWORK FRAMEWORK_VERSION Fortran_FORMAT Fortran_MODULE_DIRECTORY GENERATED GENERATOR_FILE_NAME GLOBAL_DEPENDS_DEBUG_MODE GLOBAL_DEPENDS_NO_CYCLES GNUtoMS HAS_CXX HEADER_FILE_ONLY HELPSTRING IMPLICIT_DEPENDS_INCLUDE_TRANSFORM IMPORTED IMPORTED_CONFIGURATIONS IMPORTED_IMPLIB IMPORTED_IMPLIB_DEBUG IMPORTED_IMPLIB_RELEASE IMPORTED_LINK_DEPENDENT_LIBRARIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUG IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_LANGUAGES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE IMPORTED_LINK_INTERFACE_LIBRARIES IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_MULTIPLICITY IMPORTED_LINK_INTERFACE_MULTIPLICITY_DEBUG IMPORTED_LINK_INTERFACE_MULTIPLICITY_RELEASE IMPORTED_LOCATION IMPORTED_LOCATION_DEBUG IMPORTED_LOCATION_RELEASE IMPORTED_NO_SONAME IMPORTED_NO_SONAME_DEBUG IMPORTED_NO_SONAME_RELEASE IMPORTED_SONAME IMPORTED_SONAME_DEBUG IMPORTED_SONAME_RELEASE IMPORT_PREFIX IMPORT_SUFFIX INCLUDE_DIRECTORIES INCLUDE_REGULAR_EXPRESSION INSTALL_NAME_DIR INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH INTERFACE_AUTOUIC_OPTIONS INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS INTERFACE_INCLUDE_DIRECTORIES INTERFACE_LINK_LIBRARIES INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SOURCES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES INTERPROCEDURAL_OPTIMIZATION INTERPROCEDURAL_OPTIMIZATION_DEBUG INTERPROCEDURAL_OPTIMIZATION_RELEASE IN_TRY_COMPILE JOB_POOLS JOB_POOL_COMPILE JOB_POOL_LINK KEEP_EXTENSION LABELS LANGUAGE LIBRARY_OUTPUT_DIRECTORY LIBRARY_OUTPUT_DIRECTORY_DEBUG LIBRARY_OUTPUT_DIRECTORY_RELEASE LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_DEBUG LIBRARY_OUTPUT_NAME_RELEASE LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED LINK_DIRECTORIES LINK_FLAGS LINK_FLAGS_DEBUG LINK_FLAGS_RELEASE LINK_INTERFACE_LIBRARIES LINK_INTERFACE_LIBRARIES_DEBUG LINK_INTERFACE_LIBRARIES_RELEASE LINK_INTERFACE_MULTIPLICITY LINK_INTERFACE_MULTIPLICITY_DEBUG LINK_INTERFACE_MULTIPLICITY_RELEASE LINK_LIBRARIES LINK_SEARCH_END_STATIC LINK_SEARCH_START_STATIC LISTFILE_STACK LOCATION LOCATION_DEBUG LOCATION_RELEASE MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_PACKAGE_LOCATION MACOSX_RPATH MACROS MAP_IMPORTED_CONFIG_DEBUG MAP_IMPORTED_CONFIG_RELEASE MEASUREMENT MODIFIED NAME NO_SONAME NO_SYSTEM_FROM_IMPORTED OBJECT_DEPENDS OBJECT_OUTPUTS OSX_ARCHITECTURES OSX_ARCHITECTURES_DEBUG OSX_ARCHITECTURES_RELEASE OUTPUT_NAME OUTPUT_NAME_DEBUG OUTPUT_NAME_RELEASE PACKAGES_FOUND PACKAGES_NOT_FOUND PARENT_DIRECTORY PASS_REGULAR_EXPRESSION PDB_NAME PDB_NAME_DEBUG PDB_NAME_RELEASE PDB_OUTPUT_DIRECTORY PDB_OUTPUT_DIRECTORY_DEBUG PDB_OUTPUT_DIRECTORY_RELEASE POSITION_INDEPENDENT_CODE POST_INSTALL_SCRIPT PREDEFINED_TARGETS_FOLDER PREFIX PRE_INSTALL_SCRIPT PRIVATE_HEADER PROCESSORS PROJECT_LABEL PUBLIC_HEADER REPORT_UNDEFINED_PROPERTIES REQUIRED_FILES RESOURCE RESOURCE_LOCK RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK RULE_MESSAGES RUNTIME_OUTPUT_DIRECTORY RUNTIME_OUTPUT_DIRECTORY_DEBUG RUNTIME_OUTPUT_DIRECTORY_RELEASE RUNTIME_OUTPUT_NAME RUNTIME_OUTPUT_NAME_DEBUG RUNTIME_OUTPUT_NAME_RELEASE RUN_SERIAL SKIP_BUILD_RPATH SKIP_RETURN_CODE SOURCES SOURCE_DIR SOVERSION STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_DEBUG STATIC_LIBRARY_FLAGS_RELEASE STRINGS SUFFIX SYMBOLIC TARGET_ARCHIVES_MAY_BE_SHARED_LIBS TARGET_MESSAGES TARGET_SUPPORTS_SHARED_LIBS TEST_INCLUDE_FILE TIMEOUT TYPE USE_FOLDERS VALUE VARIABLES VERSION VISIBILITY_INLINES_HIDDEN VS_DEPLOYMENT_CONTENT VS_DEPLOYMENT_LOCATION VS_DESKTOP_EXTENSIONS_VERSION VS_DOTNET_REFERENCES VS_DOTNET_TARGET_FRAMEWORK_VERSION VS_GLOBAL_KEYWORD VS_GLOBAL_PROJECT_TYPES VS_GLOBAL_ROOTNAMESPACE VS_IOT_EXTENSIONS_VERSION VS_IOT_STARTUP_TASK VS_KEYWORD VS_MOBILE_EXTENSIONS_VERSION VS_SCC_AUXPATH VS_SCC_LOCALPATH VS_SCC_PROJECTNAME VS_SCC_PROVIDER VS_SHADER_ENTRYPOINT VS_SHADER_FLAGS VS_SHADER_MODEL VS_SHADER_TYPE VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES VS_XAML_TYPE WILL_FAIL WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS WORKING_DIRECTORY WRAP_EXCLUDE XCODE_EXPLICIT_FILE_TYPE XCODE_LAST_KNOWN_FILE_TYPE XCTEST
             \ contained
 
 syn keyword cmakeVariable
-            \ <PROJECT-NAME>_BINARY_DIR <PROJECT-NAME>_SOURCE_DIR <PROJECT-NAME>_VERSION <PROJECT-NAME>_VERSION_MAJOR <PROJECT-NAME>_VERSION_MINOR <PROJECT-NAME>_VERSION_PATCH <PROJECT-NAME>_VERSION_TWEAK APPLE BORLAND BUILD_SHARED_LIBS CMAKE_<CONFIG>_POSTFIX CMAKE_<LANG>_ARCHIVE_APPEND CMAKE_<LANG>_ARCHIVE_CREATE CMAKE_<LANG>_ARCHIVE_FINISH CMAKE_<LANG>_COMPILER CMAKE_<LANG>_COMPILER_ABI CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN CMAKE_<LANG>_COMPILER_ID CMAKE_<LANG>_COMPILER_LAUNCHER CMAKE_<LANG>_COMPILER_LOADED CMAKE_<LANG>_COMPILER_TARGET CMAKE_<LANG>_COMPILER_VERSION CMAKE_<LANG>_COMPILE_OBJECT CMAKE_<LANG>_CREATE_SHARED_LIBRARY CMAKE_<LANG>_CREATE_SHARED_MODULE CMAKE_<LANG>_CREATE_STATIC_LIBRARY CMAKE_<LANG>_FLAGS CMAKE_<LANG>_FLAGS_DEBUG CMAKE_<LANG>_FLAGS_MINSIZEREL CMAKE_<LANG>_FLAGS_RELEASE CMAKE_<LANG>_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_GHS_KERNEL_FLAGS_DEBUG CMAKE_<LANG>_GHS_KERNEL_FLAGS_MINSIZEREL CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELEASE CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_IGNORE_EXTENSIONS CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_LIBRARIES CMAKE_<LANG>_INCLUDE_WHAT_YOU_USE CMAKE_<LANG>_LIBRARY_ARCHITECTURE CMAKE_<LANG>_LINKER_PREFERENCE CMAKE_<LANG>_LINKER_PREFERENCE_PROPAGATES CMAKE_<LANG>_LINK_EXECUTABLE CMAKE_<LANG>_OUTPUT_EXTENSION CMAKE_<LANG>_PLATFORM_ID CMAKE_<LANG>_SIMULATE_ID CMAKE_<LANG>_SIMULATE_VERSION CMAKE_<LANG>_SIZEOF_DATA_PTR CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS CMAKE_<LANG>_VISIBILITY_PRESET CMAKE_ABSOLUTE_DESTINATION_FILES CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS CMAKE_ANDROID_API CMAKE_ANDROID_API_MIN CMAKE_ANDROID_ARCH CMAKE_ANDROID_ASSETS_DIRECTORIES CMAKE_ANDROID_GUI CMAKE_ANDROID_JAR_DEPENDENCIES CMAKE_ANDROID_JAR_DIRECTORIES CMAKE_ANDROID_JAVA_SOURCE_DIR CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES CMAKE_ANDROID_PROCESS_MAX CMAKE_ANDROID_PROGUARD CMAKE_ANDROID_PROGUARD_CONFIG_PATH CMAKE_ANDROID_SECURE_PROPS_PATH CMAKE_ANDROID_SKIP_ANT_STEP CMAKE_ANDROID_STL_TYPE CMAKE_APPBUNDLE_PATH CMAKE_AR CMAKE_ARCHIVE_OUTPUT_DIRECTORY CMAKE_ARCHIVE_OUTPUT_DIRECTORY_<CONFIG> CMAKE_ARGC CMAKE_ARGV0 CMAKE_AUTOMOC CMAKE_AUTOMOC_MOC_OPTIONS CMAKE_AUTOMOC_RELAXED_MODE CMAKE_AUTORCC CMAKE_AUTORCC_OPTIONS CMAKE_AUTOUIC CMAKE_AUTOUIC_OPTIONS CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BINARY_DIR CMAKE_BUILD_TOOL CMAKE_BUILD_TYPE CMAKE_BUILD_WITH_INSTALL_RPATH CMAKE_CACHEFILE_DIR CMAKE_CACHE_MAJOR_VERSION CMAKE_CACHE_MINOR_VERSION CMAKE_CACHE_PATCH_VERSION CMAKE_CFG_INTDIR CMAKE_CL_64 CMAKE_COLOR_MAKEFILE CMAKE_COMMAND CMAKE_COMPILER_2005 CMAKE_COMPILER_IS_GNU<LANG> CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_CONFIGURATION_TYPES CMAKE_CROSSCOMPILING CMAKE_CROSSCOMPILING_EMULATOR CMAKE_CTEST_COMMAND CMAKE_CURRENT_BINARY_DIR CMAKE_CURRENT_LIST_DIR CMAKE_CURRENT_LIST_FILE CMAKE_CURRENT_LIST_LINE CMAKE_CURRENT_SOURCE_DIR CMAKE_CXX_COMPILE_FEATURES CMAKE_CXX_EXTENSIONS CMAKE_CXX_STANDARD CMAKE_CXX_STANDARD_REQUIRED CMAKE_C_COMPILE_FEATURES CMAKE_C_EXTENSIONS CMAKE_C_STANDARD CMAKE_C_STANDARD_REQUIRED CMAKE_DEBUG_POSTFIX CMAKE_DEBUG_TARGET_PROPERTIES CMAKE_DISABLE_FIND_PACKAGE_<PackageName> CMAKE_DL_LIBS CMAKE_EDIT_COMMAND CMAKE_ENABLE_EXPORTS CMAKE_ERROR_DEPRECATED CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_EXECUTABLE_SUFFIX CMAKE_EXE_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS_<CONFIG> CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_NO_PACKAGE_REGISTRY CMAKE_EXTRA_GENERATOR CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES CMAKE_FIND_APPBUNDLE CMAKE_FIND_FRAMEWORK CMAKE_FIND_LIBRARY_PREFIXES CMAKE_FIND_LIBRARY_SUFFIXES CMAKE_FIND_NO_INSTALL_PREFIX CMAKE_FIND_PACKAGE_NAME CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_WARN_NO_MODULE CMAKE_FIND_ROOT_PATH CMAKE_FIND_ROOT_PATH_MODE_INCLUDE CMAKE_FIND_ROOT_PATH_MODE_LIBRARY CMAKE_FIND_ROOT_PATH_MODE_PACKAGE CMAKE_FIND_ROOT_PATH_MODE_PROGRAM CMAKE_FRAMEWORK_PATH CMAKE_Fortran_FORMAT CMAKE_Fortran_MODDIR_DEFAULT CMAKE_Fortran_MODDIR_FLAG CMAKE_Fortran_MODOUT_FLAG CMAKE_Fortran_MODULE_DIRECTORY CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET CMAKE_GNUtoMS CMAKE_HOME_DIRECTORY CMAKE_HOST_APPLE CMAKE_HOST_SYSTEM CMAKE_HOST_SYSTEM_NAME CMAKE_HOST_SYSTEM_PROCESSOR CMAKE_HOST_SYSTEM_VERSION CMAKE_HOST_UNIX CMAKE_HOST_WIN32 CMAKE_IGNORE_PATH CMAKE_IMPORT_LIBRARY_PREFIX CMAKE_IMPORT_LIBRARY_SUFFIX CMAKE_INCLUDE_CURRENT_DIR CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE CMAKE_INCLUDE_DIRECTORIES_BEFORE CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE CMAKE_INCLUDE_PATH CMAKE_INSTALL_DEFAULT_COMPONENT_NAME CMAKE_INSTALL_MESSAGE CMAKE_INSTALL_NAME_DIR CMAKE_INSTALL_PREFIX CMAKE_INSTALL_RPATH CMAKE_INSTALL_RPATH_USE_LINK_PATH CMAKE_INTERNAL_PLATFORM_ABI CMAKE_IOS_INSTALL_COMBINED CMAKE_JOB_POOL_COMPILE CMAKE_JOB_POOL_LINK CMAKE_LIBRARY_ARCHITECTURE CMAKE_LIBRARY_ARCHITECTURE_REGEX CMAKE_LIBRARY_OUTPUT_DIRECTORY CMAKE_LIBRARY_OUTPUT_DIRECTORY_<CONFIG> CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_FLAG CMAKE_LINK_DEF_FILE_FLAG CMAKE_LINK_DEPENDS_NO_SHARED CMAKE_LINK_INTERFACE_LIBRARIES CMAKE_LINK_LIBRARY_FILE_FLAG CMAKE_LINK_LIBRARY_FLAG CMAKE_LINK_LIBRARY_SUFFIX CMAKE_LINK_SEARCH_END_STATIC CMAKE_LINK_SEARCH_START_STATIC CMAKE_MACOSX_BUNDLE CMAKE_MACOSX_RPATH CMAKE_MAJOR_VERSION CMAKE_MAKE_PROGRAM CMAKE_MAP_IMPORTED_CONFIG_<CONFIG> CMAKE_MATCH_COUNT CMAKE_MFC_FLAG CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_MINOR_VERSION CMAKE_MODULE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS_<CONFIG> CMAKE_MODULE_PATH CMAKE_NOT_USING_CONFIG_FLAGS CMAKE_NO_BUILTIN_CHRPATH CMAKE_NO_SYSTEM_FROM_IMPORTED CMAKE_OBJECT_PATH_MAX CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT CMAKE_PARENT_LIST_FILE CMAKE_PATCH_VERSION CMAKE_PDB_OUTPUT_DIRECTORY CMAKE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_POLICY_DEFAULT_CMP<NNNN> CMAKE_POLICY_WARNING_CMP<NNNN> CMAKE_POSITION_INDEPENDENT_CODE CMAKE_PREFIX_PATH CMAKE_PROGRAM_PATH CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE CMAKE_PROJECT_NAME CMAKE_RANLIB CMAKE_ROOT CMAKE_RUNTIME_OUTPUT_DIRECTORY CMAKE_RUNTIME_OUTPUT_DIRECTORY_<CONFIG> CMAKE_SCRIPT_MODE_FILE CMAKE_SHARED_LIBRARY_PREFIX CMAKE_SHARED_LIBRARY_SUFFIX CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS_<CONFIG> CMAKE_SHARED_MODULE_PREFIX CMAKE_SHARED_MODULE_SUFFIX CMAKE_SIZEOF_VOID_P CMAKE_SKIP_BUILD_RPATH CMAKE_SKIP_INSTALL_ALL_DEPENDENCY CMAKE_SKIP_INSTALL_RPATH CMAKE_SKIP_INSTALL_RULES CMAKE_SKIP_RPATH CMAKE_SOURCE_DIR CMAKE_STAGING_PREFIX CMAKE_STANDARD_LIBRARIES CMAKE_STATIC_LIBRARY_PREFIX CMAKE_STATIC_LIBRARY_SUFFIX CMAKE_STATIC_LINKER_FLAGS CMAKE_STATIC_LINKER_FLAGS_<CONFIG> CMAKE_SYSROOT CMAKE_SYSTEM CMAKE_SYSTEM_APPBUNDLE_PATH CMAKE_SYSTEM_FRAMEWORK_PATH CMAKE_SYSTEM_IGNORE_PATH CMAKE_SYSTEM_INCLUDE_PATH CMAKE_SYSTEM_LIBRARY_PATH CMAKE_SYSTEM_NAME CMAKE_SYSTEM_PREFIX_PATH CMAKE_SYSTEM_PROCESSOR CMAKE_SYSTEM_PROGRAM_PATH CMAKE_SYSTEM_VERSION CMAKE_TOOLCHAIN_FILE CMAKE_TRY_COMPILE_CONFIGURATION CMAKE_TWEAK_VERSION CMAKE_USER_MAKE_RULES_OVERRIDE CMAKE_USER_MAKE_RULES_OVERRIDE_<LANG> CMAKE_USE_RELATIVE_PATHS CMAKE_VERBOSE_MAKEFILE CMAKE_VERSION CMAKE_VISIBILITY_INLINES_HIDDEN CMAKE_VS_DEVENV_COMMAND CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD CMAKE_VS_INTEL_Fortran_PROJECT_VERSION CMAKE_VS_MSBUILD_COMMAND CMAKE_VS_MSDEV_COMMAND CMAKE_VS_NsightTegra_VERSION CMAKE_VS_PLATFORM_NAME CMAKE_VS_PLATFORM_TOOLSET CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION CMAKE_WARN_DEPRECATED CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_WIN32_EXECUTABLE CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS CMAKE_XCODE_ATTRIBUTE_<an-attribute> CMAKE_XCODE_PLATFORM_TOOLSET CPACK_ABSOLUTE_DESTINATION_FILES CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CPACK_INCLUDE_TOPLEVEL_DIRECTORY CPACK_INSTALL_SCRIPT CPACK_PACKAGING_INSTALL_PREFIX CPACK_SET_DESTDIR CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CTEST_BINARY_DIRECTORY CTEST_BUILD_COMMAND CTEST_BUILD_NAME CTEST_BZR_COMMAND CTEST_BZR_UPDATE_OPTIONS CTEST_CHANGE_ID CTEST_CHECKOUT_COMMAND CTEST_CONFIGURATION_TYPE CTEST_CONFIGURE_COMMAND CTEST_COVERAGE_COMMAND CTEST_COVERAGE_EXTRA_FLAGS CTEST_CURL_OPTIONS CTEST_CUSTOM_COVERAGE_EXCLUDE CTEST_CUSTOM_ERROR_EXCEPTION CTEST_CUSTOM_ERROR_MATCH CTEST_CUSTOM_ERROR_POST_CONTEXT CTEST_CUSTOM_ERROR_PRE_CONTEXT CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MEMCHECK_IGNORE CTEST_CUSTOM_POST_MEMCHECK CTEST_CUSTOM_POST_TEST CTEST_CUSTOM_PRE_MEMCHECK CTEST_CUSTOM_PRE_TEST CTEST_CUSTOM_TEST_IGNORE CTEST_CUSTOM_WARNING_EXCEPTION CTEST_CUSTOM_WARNING_MATCH CTEST_CVS_CHECKOUT CTEST_CVS_COMMAND CTEST_CVS_UPDATE_OPTIONS CTEST_DROP_LOCATION CTEST_DROP_METHOD CTEST_DROP_SITE CTEST_DROP_SITE_CDASH CTEST_DROP_SITE_PASSWORD CTEST_DROP_SITE_USER CTEST_EXTRA_COVERAGE_GLOB CTEST_GIT_COMMAND CTEST_GIT_UPDATE_CUSTOM CTEST_GIT_UPDATE_OPTIONS CTEST_HG_COMMAND CTEST_HG_UPDATE_OPTIONS CTEST_MEMORYCHECK_COMMAND CTEST_MEMORYCHECK_COMMAND_OPTIONS CTEST_MEMORYCHECK_SANITIZER_OPTIONS CTEST_MEMORYCHECK_SUPPRESSIONS_FILE CTEST_MEMORYCHECK_TYPE CTEST_NIGHTLY_START_TIME CTEST_P4_CLIENT CTEST_P4_COMMAND CTEST_P4_OPTIONS CTEST_P4_UPDATE_OPTIONS CTEST_SCP_COMMAND CTEST_SITE CTEST_SOURCE_DIRECTORY CTEST_SVN_COMMAND CTEST_SVN_OPTIONS CTEST_SVN_UPDATE_OPTIONS CTEST_TEST_LOAD CTEST_TEST_TIMEOUT CTEST_TRIGGER_SITE CTEST_UPDATE_COMMAND CTEST_UPDATE_OPTIONS CTEST_UPDATE_VERSION_ONLY CTEST_USE_LAUNCHERS CYGWIN ENV EXECUTABLE_OUTPUT_PATH GHS-MULTI LIBRARY_OUTPUT_PATH MINGW MSVC MSVC10 MSVC11 MSVC12 MSVC14 MSVC60 MSVC70 MSVC71 MSVC80 MSVC90 MSVC_IDE MSVC_VERSION PROJECT_BINARY_DIR PROJECT_NAME PROJECT_SOURCE_DIR PROJECT_VERSION PROJECT_VERSION_MAJOR PROJECT_VERSION_MINOR PROJECT_VERSION_PATCH PROJECT_VERSION_TWEAK UNIX WIN32 WINCE WINDOWS_PHONE WINDOWS_STORE XCODE_VERSION
+            \ <PROJECT-NAME>_BINARY_DIR <PROJECT-NAME>_SOURCE_DIR <PROJECT-NAME>_VERSION <PROJECT-NAME>_VERSION_MAJOR <PROJECT-NAME>_VERSION_MINOR <PROJECT-NAME>_VERSION_PATCH <PROJECT-NAME>_VERSION_TWEAK APPLE BORLAND BUILD_SHARED_LIBS CMAKE_<CONFIG>_POSTFIX CMAKE_<LANG>_ARCHIVE_APPEND CMAKE_<LANG>_ARCHIVE_CREATE CMAKE_<LANG>_ARCHIVE_FINISH CMAKE_<LANG>_COMPILER CMAKE_<LANG>_COMPILER_ABI CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN CMAKE_<LANG>_COMPILER_ID CMAKE_<LANG>_COMPILER_LAUNCHER CMAKE_<LANG>_COMPILER_LOADED CMAKE_<LANG>_COMPILER_TARGET CMAKE_<LANG>_COMPILER_VERSION CMAKE_<LANG>_COMPILE_OBJECT CMAKE_<LANG>_CREATE_SHARED_LIBRARY CMAKE_<LANG>_CREATE_SHARED_MODULE CMAKE_<LANG>_CREATE_STATIC_LIBRARY CMAKE_<LANG>_FLAGS CMAKE_<LANG>_FLAGS_DEBUG CMAKE_<LANG>_FLAGS_MINSIZEREL CMAKE_<LANG>_FLAGS_RELEASE CMAKE_<LANG>_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_GHS_KERNEL_FLAGS_DEBUG CMAKE_<LANG>_GHS_KERNEL_FLAGS_MINSIZEREL CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELEASE CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELWITHDEBINFO CMAKE_<LANG>_IGNORE_EXTENSIONS CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES CMAKE_<LANG>_IMPLICIT_LINK_LIBRARIES CMAKE_<LANG>_INCLUDE_WHAT_YOU_USE CMAKE_<LANG>_CPPLINT CMAKE_<LANG>_LIBRARY_ARCHITECTURE CMAKE_<LANG>_LINKER_PREFERENCE CMAKE_<LANG>_LINKER_PREFERENCE_PROPAGATES CMAKE_<LANG>_LINK_EXECUTABLE CMAKE_<LANG>_OUTPUT_EXTENSION CMAKE_<LANG>_PLATFORM_ID CMAKE_<LANG>_SIMULATE_ID CMAKE_<LANG>_SIMULATE_VERSION CMAKE_<LANG>_SIZEOF_DATA_PTR CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS CMAKE_<LANG>_VISIBILITY_PRESET CMAKE_ABSOLUTE_DESTINATION_FILES CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS CMAKE_ANDROID_API CMAKE_ANDROID_API_MIN CMAKE_ANDROID_ARCH CMAKE_ANDROID_ASSETS_DIRECTORIES CMAKE_ANDROID_GUI CMAKE_ANDROID_JAR_DEPENDENCIES CMAKE_ANDROID_JAR_DIRECTORIES CMAKE_ANDROID_JAVA_SOURCE_DIR CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES CMAKE_ANDROID_PROCESS_MAX CMAKE_ANDROID_PROGUARD CMAKE_ANDROID_PROGUARD_CONFIG_PATH CMAKE_ANDROID_SECURE_PROPS_PATH CMAKE_ANDROID_SKIP_ANT_STEP CMAKE_ANDROID_STL_TYPE CMAKE_APPBUNDLE_PATH CMAKE_AR CMAKE_ARCHIVE_OUTPUT_DIRECTORY CMAKE_ARCHIVE_OUTPUT_DIRECTORY_<CONFIG> CMAKE_ARGC CMAKE_ARGV0 CMAKE_AUTOMOC CMAKE_AUTOMOC_MOC_OPTIONS CMAKE_AUTOMOC_RELAXED_MODE CMAKE_AUTORCC CMAKE_AUTORCC_OPTIONS CMAKE_AUTOUIC CMAKE_AUTOUIC_OPTIONS CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BINARY_DIR CMAKE_BUILD_TOOL CMAKE_BUILD_TYPE CMAKE_BUILD_WITH_INSTALL_RPATH CMAKE_CACHEFILE_DIR CMAKE_CACHE_MAJOR_VERSION CMAKE_CACHE_MINOR_VERSION CMAKE_CACHE_PATCH_VERSION CMAKE_CFG_INTDIR CMAKE_CL_64 CMAKE_COLOR_MAKEFILE CMAKE_COMMAND CMAKE_COMPILER_2005 CMAKE_COMPILER_IS_GNU<LANG> CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_CONFIGURATION_TYPES CMAKE_CROSSCOMPILING CMAKE_CROSSCOMPILING_EMULATOR CMAKE_CTEST_COMMAND CMAKE_CURRENT_BINARY_DIR CMAKE_CURRENT_LIST_DIR CMAKE_CURRENT_LIST_FILE CMAKE_CURRENT_LIST_LINE CMAKE_CURRENT_SOURCE_DIR CMAKE_CXX_COMPILE_FEATURES CMAKE_CXX_EXTENSIONS CMAKE_CXX_STANDARD CMAKE_CXX_STANDARD_REQUIRED CMAKE_C_COMPILE_FEATURES CMAKE_C_EXTENSIONS CMAKE_C_STANDARD CMAKE_C_STANDARD_REQUIRED CMAKE_DEBUG_POSTFIX CMAKE_DEBUG_TARGET_PROPERTIES CMAKE_DISABLE_FIND_PACKAGE_<PackageName> CMAKE_DL_LIBS CMAKE_EDIT_COMMAND CMAKE_ENABLE_EXPORTS CMAKE_ERROR_DEPRECATED CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_EXECUTABLE_SUFFIX CMAKE_EXE_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS_<CONFIG> CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_NO_PACKAGE_REGISTRY CMAKE_EXTRA_GENERATOR CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES CMAKE_FIND_APPBUNDLE CMAKE_FIND_FRAMEWORK CMAKE_FIND_LIBRARY_PREFIXES CMAKE_FIND_LIBRARY_SUFFIXES CMAKE_FIND_NO_INSTALL_PREFIX CMAKE_FIND_PACKAGE_NAME CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY CMAKE_FIND_PACKAGE_WARN_NO_MODULE CMAKE_FIND_ROOT_PATH CMAKE_FIND_ROOT_PATH_MODE_INCLUDE CMAKE_FIND_ROOT_PATH_MODE_LIBRARY CMAKE_FIND_ROOT_PATH_MODE_PACKAGE CMAKE_FIND_ROOT_PATH_MODE_PROGRAM CMAKE_FRAMEWORK_PATH CMAKE_Fortran_FORMAT CMAKE_Fortran_MODDIR_DEFAULT CMAKE_Fortran_MODDIR_FLAG CMAKE_Fortran_MODOUT_FLAG CMAKE_Fortran_MODULE_DIRECTORY CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET CMAKE_GNUtoMS CMAKE_HOME_DIRECTORY CMAKE_HOST_APPLE CMAKE_HOST_SYSTEM CMAKE_HOST_SYSTEM_NAME CMAKE_HOST_SYSTEM_PROCESSOR CMAKE_HOST_SYSTEM_VERSION CMAKE_HOST_UNIX CMAKE_HOST_WIN32 CMAKE_IGNORE_PATH CMAKE_IMPORT_LIBRARY_PREFIX CMAKE_IMPORT_LIBRARY_SUFFIX CMAKE_INCLUDE_CURRENT_DIR CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE CMAKE_INCLUDE_DIRECTORIES_BEFORE CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE CMAKE_INCLUDE_PATH CMAKE_INSTALL_DEFAULT_COMPONENT_NAME CMAKE_INSTALL_MESSAGE CMAKE_INSTALL_NAME_DIR CMAKE_INSTALL_PREFIX CMAKE_INSTALL_RPATH CMAKE_INSTALL_RPATH_USE_LINK_PATH CMAKE_INTERNAL_PLATFORM_ABI CMAKE_IOS_INSTALL_COMBINED CMAKE_JOB_POOL_COMPILE CMAKE_JOB_POOL_LINK CMAKE_LIBRARY_ARCHITECTURE CMAKE_LIBRARY_ARCHITECTURE_REGEX CMAKE_LIBRARY_OUTPUT_DIRECTORY CMAKE_LIBRARY_OUTPUT_DIRECTORY_<CONFIG> CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_FLAG CMAKE_LINK_DEF_FILE_FLAG CMAKE_LINK_DEPENDS_NO_SHARED CMAKE_LINK_INTERFACE_LIBRARIES CMAKE_LINK_LIBRARY_FILE_FLAG CMAKE_LINK_LIBRARY_FLAG CMAKE_LINK_LIBRARY_SUFFIX CMAKE_LINK_SEARCH_END_STATIC CMAKE_LINK_SEARCH_START_STATIC CMAKE_MACOSX_BUNDLE CMAKE_MACOSX_RPATH CMAKE_MAJOR_VERSION CMAKE_MAKE_PROGRAM CMAKE_MAP_IMPORTED_CONFIG_<CONFIG> CMAKE_MATCH_COUNT CMAKE_MFC_FLAG CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_MINOR_VERSION CMAKE_MODULE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS_<CONFIG> CMAKE_MODULE_PATH CMAKE_NOT_USING_CONFIG_FLAGS CMAKE_NO_BUILTIN_CHRPATH CMAKE_NO_SYSTEM_FROM_IMPORTED CMAKE_OBJECT_PATH_MAX CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT CMAKE_PARENT_LIST_FILE CMAKE_PATCH_VERSION CMAKE_PDB_OUTPUT_DIRECTORY CMAKE_PDB_OUTPUT_DIRECTORY_<CONFIG> CMAKE_POLICY_DEFAULT_CMP<NNNN> CMAKE_POLICY_WARNING_CMP<NNNN> CMAKE_POSITION_INDEPENDENT_CODE CMAKE_PREFIX_PATH CMAKE_PROGRAM_PATH CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE CMAKE_PROJECT_NAME CMAKE_RANLIB CMAKE_ROOT CMAKE_RUNTIME_OUTPUT_DIRECTORY CMAKE_RUNTIME_OUTPUT_DIRECTORY_<CONFIG> CMAKE_SCRIPT_MODE_FILE CMAKE_SHARED_LIBRARY_PREFIX CMAKE_SHARED_LIBRARY_SUFFIX CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS_<CONFIG> CMAKE_SHARED_MODULE_PREFIX CMAKE_SHARED_MODULE_SUFFIX CMAKE_SIZEOF_VOID_P CMAKE_SKIP_BUILD_RPATH CMAKE_SKIP_INSTALL_ALL_DEPENDENCY CMAKE_SKIP_INSTALL_RPATH CMAKE_SKIP_INSTALL_RULES CMAKE_SKIP_RPATH CMAKE_SOURCE_DIR CMAKE_STAGING_PREFIX CMAKE_STANDARD_LIBRARIES CMAKE_STATIC_LIBRARY_PREFIX CMAKE_STATIC_LIBRARY_SUFFIX CMAKE_STATIC_LINKER_FLAGS CMAKE_STATIC_LINKER_FLAGS_<CONFIG> CMAKE_SYSROOT CMAKE_SYSTEM CMAKE_SYSTEM_APPBUNDLE_PATH CMAKE_SYSTEM_FRAMEWORK_PATH CMAKE_SYSTEM_IGNORE_PATH CMAKE_SYSTEM_INCLUDE_PATH CMAKE_SYSTEM_LIBRARY_PATH CMAKE_SYSTEM_NAME CMAKE_SYSTEM_PREFIX_PATH CMAKE_SYSTEM_PROCESSOR CMAKE_SYSTEM_PROGRAM_PATH CMAKE_SYSTEM_VERSION CMAKE_TOOLCHAIN_FILE CMAKE_TRY_COMPILE_CONFIGURATION CMAKE_TWEAK_VERSION CMAKE_USER_MAKE_RULES_OVERRIDE CMAKE_USER_MAKE_RULES_OVERRIDE_<LANG> CMAKE_USE_RELATIVE_PATHS CMAKE_VERBOSE_MAKEFILE CMAKE_VERSION CMAKE_VISIBILITY_INLINES_HIDDEN CMAKE_VS_DEVENV_COMMAND CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD CMAKE_VS_INTEL_Fortran_PROJECT_VERSION CMAKE_VS_MSBUILD_COMMAND CMAKE_VS_MSDEV_COMMAND CMAKE_VS_NsightTegra_VERSION CMAKE_VS_PLATFORM_NAME CMAKE_VS_PLATFORM_TOOLSET CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION CMAKE_WARN_DEPRECATED CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_WIN32_EXECUTABLE CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS CMAKE_XCODE_ATTRIBUTE_<an-attribute> CMAKE_XCODE_PLATFORM_TOOLSET CPACK_ABSOLUTE_DESTINATION_FILES CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION CPACK_INCLUDE_TOPLEVEL_DIRECTORY CPACK_INSTALL_SCRIPT CPACK_PACKAGING_INSTALL_PREFIX CPACK_SET_DESTDIR CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CTEST_BINARY_DIRECTORY CTEST_BUILD_COMMAND CTEST_BUILD_NAME CTEST_BZR_COMMAND CTEST_BZR_UPDATE_OPTIONS CTEST_CHANGE_ID CTEST_CHECKOUT_COMMAND CTEST_CONFIGURATION_TYPE CTEST_CONFIGURE_COMMAND CTEST_COVERAGE_COMMAND CTEST_COVERAGE_EXTRA_FLAGS CTEST_CURL_OPTIONS CTEST_CUSTOM_COVERAGE_EXCLUDE CTEST_CUSTOM_ERROR_EXCEPTION CTEST_CUSTOM_ERROR_MATCH CTEST_CUSTOM_ERROR_POST_CONTEXT CTEST_CUSTOM_ERROR_PRE_CONTEXT CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE CTEST_CUSTOM_MEMCHECK_IGNORE CTEST_CUSTOM_POST_MEMCHECK CTEST_CUSTOM_POST_TEST CTEST_CUSTOM_PRE_MEMCHECK CTEST_CUSTOM_PRE_TEST CTEST_CUSTOM_TEST_IGNORE CTEST_CUSTOM_WARNING_EXCEPTION CTEST_CUSTOM_WARNING_MATCH CTEST_CVS_CHECKOUT CTEST_CVS_COMMAND CTEST_CVS_UPDATE_OPTIONS CTEST_DROP_LOCATION CTEST_DROP_METHOD CTEST_DROP_SITE CTEST_DROP_SITE_CDASH CTEST_DROP_SITE_PASSWORD CTEST_DROP_SITE_USER CTEST_EXTRA_COVERAGE_GLOB CTEST_GIT_COMMAND CTEST_GIT_UPDATE_CUSTOM CTEST_GIT_UPDATE_OPTIONS CTEST_HG_COMMAND CTEST_HG_UPDATE_OPTIONS CTEST_MEMORYCHECK_COMMAND CTEST_MEMORYCHECK_COMMAND_OPTIONS CTEST_MEMORYCHECK_SANITIZER_OPTIONS CTEST_MEMORYCHECK_SUPPRESSIONS_FILE CTEST_MEMORYCHECK_TYPE CTEST_NIGHTLY_START_TIME CTEST_P4_CLIENT CTEST_P4_COMMAND CTEST_P4_OPTIONS CTEST_P4_UPDATE_OPTIONS CTEST_SCP_COMMAND CTEST_SITE CTEST_SOURCE_DIRECTORY CTEST_SVN_COMMAND CTEST_SVN_OPTIONS CTEST_SVN_UPDATE_OPTIONS CTEST_TEST_LOAD CTEST_TEST_TIMEOUT CTEST_TRIGGER_SITE CTEST_UPDATE_COMMAND CTEST_UPDATE_OPTIONS CTEST_UPDATE_VERSION_ONLY CTEST_USE_LAUNCHERS CYGWIN ENV EXECUTABLE_OUTPUT_PATH GHS-MULTI LIBRARY_OUTPUT_PATH MINGW MSVC MSVC10 MSVC11 MSVC12 MSVC14 MSVC60 MSVC70 MSVC71 MSVC80 MSVC90 MSVC_IDE MSVC_VERSION PROJECT_BINARY_DIR PROJECT_NAME PROJECT_SOURCE_DIR PROJECT_VERSION PROJECT_VERSION_MAJOR PROJECT_VERSION_MINOR PROJECT_VERSION_PATCH PROJECT_VERSION_TWEAK UNIX WIN32 WINCE WINDOWS_PHONE WINDOWS_STORE XCODE_VERSION
             \ contained
 
 syn keyword cmakeModule
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 5b39bed..9274451 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -211,6 +211,7 @@ Properties on Targets
    /prop_tgt/LABELS
    /prop_tgt/LANG_CLANG_TIDY
    /prop_tgt/LANG_COMPILER_LAUNCHER
+   /prop_tgt/LANG_CPPLINT
    /prop_tgt/LANG_INCLUDE_WHAT_YOU_USE
    /prop_tgt/LANG_VISIBILITY_PRESET
    /prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 99b5eae..95f780a 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -284,6 +284,7 @@ Variables that Control the Build
    /variable/CMAKE_IOS_INSTALL_COMBINED
    /variable/CMAKE_LANG_CLANG_TIDY
    /variable/CMAKE_LANG_COMPILER_LAUNCHER
+   /variable/CMAKE_LANG_CPPLINT
    /variable/CMAKE_LANG_INCLUDE_WHAT_YOU_USE
    /variable/CMAKE_LANG_VISIBILITY_PRESET
    /variable/CMAKE_LIBRARY_OUTPUT_DIRECTORY
diff --git a/Help/prop_tgt/LANG_CPPLINT.rst b/Help/prop_tgt/LANG_CPPLINT.rst
new file mode 100644
index 0000000..14f47d4
--- /dev/null
+++ b/Help/prop_tgt/LANG_CPPLINT.rst
@@ -0,0 +1,13 @@
+<LANG>_CPPLINT
+--------------
+
+This property is supported only when ``<LANG>`` is ``C`` or ``CXX``.
+
+Specify a :ref:`;-list <CMake Language Lists>` containing a command line
+for the ``cpplint`` style checker.  The :ref:`Makefile Generators` and the
+:generator:`Ninja` generator will run ``cpplint`` along with the compiler
+and report any problems.
+
+This property is initialized by the value of the
+:variable:`CMAKE_<LANG>_CPPLINT` variable if it is set when a target is
+created.
diff --git a/Help/release/dev/add-LANG_CPPLINT.rst b/Help/release/dev/add-LANG_CPPLINT.rst
new file mode 100644
index 0000000..a0539cf
--- /dev/null
+++ b/Help/release/dev/add-LANG_CPPLINT.rst
@@ -0,0 +1,8 @@
+add-LANG_CPPLINT
+----------------
+
+* A :prop_tgt:`<LANG>_CPPLINT` target property and supporting
+  :variable:`CMAKE_<LANG>_CPPLINT` variable were introduced to tell
+  the :ref:`Makefile Generators` and the :generator:`Ninja` generator to
+  run the ``cpplint`` style checker along with the compiler for ``C`` and
+  ``CXX`` languages.
diff --git a/Help/variable/CMAKE_LANG_CPPLINT.rst b/Help/variable/CMAKE_LANG_CPPLINT.rst
new file mode 100644
index 0000000..3b6f452
--- /dev/null
+++ b/Help/variable/CMAKE_LANG_CPPLINT.rst
@@ -0,0 +1,6 @@
+CMAKE_<LANG>_CPPLINT
+--------------------
+
+Default value for :prop_tgt:`<LANG>_CPPLINT` target property. This variable
+is used to initialize the property on each target as it is created.  This
+is done only when ``<LANG>`` is ``C`` or ``CXX``.
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 379ae16..866c132 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -631,7 +631,9 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
       const char* iwyu = this->GeneratorTarget->GetProperty(iwyu_prop);
       std::string const tidy_prop = lang + "_CLANG_TIDY";
       const char* tidy = this->GeneratorTarget->GetProperty(tidy_prop);
-      if ((iwyu && *iwyu) || (tidy && *tidy)) {
+      std::string const cpplint_prop = lang + "_CPPLINT";
+      const char* cpplint = this->GeneratorTarget->GetProperty(cpplint_prop);
+      if ((iwyu && *iwyu) || (tidy && *tidy) || (cpplint && *cpplint)) {
         std::string run_iwyu = "$(CMAKE_COMMAND) -E __run_iwyu";
         if (iwyu && *iwyu) {
           run_iwyu += " --iwyu=";
@@ -640,6 +642,12 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
         if (tidy && *tidy) {
           run_iwyu += " --tidy=";
           run_iwyu += this->LocalGenerator->EscapeForShell(tidy);
+        }
+        if (cpplint && *cpplint) {
+          run_iwyu += " --cpplint=";
+          run_iwyu += this->LocalGenerator->EscapeForShell(cpplint);
+        }
+        if ((tidy && *tidy) || (cpplint && *cpplint)) {
           run_iwyu += " --source=";
           run_iwyu += sourceFile;
         }
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 8ad2efe..0b33b19 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -600,7 +600,9 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang)
     const char* iwyu = this->GeneratorTarget->GetProperty(iwyu_prop);
     std::string const tidy_prop = lang + "_CLANG_TIDY";
     const char* tidy = this->GeneratorTarget->GetProperty(tidy_prop);
-    if ((iwyu && *iwyu) || (tidy && *tidy)) {
+    std::string const cpplint_prop = lang + "_CPPLINT";
+    const char* cpplint = this->GeneratorTarget->GetProperty(cpplint_prop);
+    if ((iwyu && *iwyu) || (tidy && *tidy) || (cpplint && *cpplint)) {
       std::string run_iwyu = this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmOutputConverter::SHELL);
       run_iwyu += " -E __run_iwyu";
@@ -611,6 +613,12 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang)
       if (tidy && *tidy) {
         run_iwyu += " --tidy=";
         run_iwyu += this->GetLocalGenerator()->EscapeForShell(tidy);
+      }
+      if (cpplint && *cpplint) {
+        run_iwyu += " --cpplint=";
+        run_iwyu += this->GetLocalGenerator()->EscapeForShell(cpplint);
+      }
+      if ((tidy && *tidy) || (cpplint && *cpplint)) {
         run_iwyu += " --source=$in";
       }
       run_iwyu += " -- ";
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index d825e5c..8c62c48 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -255,6 +255,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
     this->SetPropertyDefault("MACOSX_RPATH", CM_NULLPTR);
     this->SetPropertyDefault("C_CLANG_TIDY", CM_NULLPTR);
     this->SetPropertyDefault("C_COMPILER_LAUNCHER", CM_NULLPTR);
+    this->SetPropertyDefault("C_CPPLINT", CM_NULLPTR);
     this->SetPropertyDefault("C_INCLUDE_WHAT_YOU_USE", CM_NULLPTR);
     this->SetPropertyDefault("LINK_WHAT_YOU_USE", CM_NULLPTR);
     this->SetPropertyDefault("C_STANDARD", CM_NULLPTR);
@@ -262,6 +263,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
     this->SetPropertyDefault("C_EXTENSIONS", CM_NULLPTR);
     this->SetPropertyDefault("CXX_CLANG_TIDY", CM_NULLPTR);
     this->SetPropertyDefault("CXX_COMPILER_LAUNCHER", CM_NULLPTR);
+    this->SetPropertyDefault("CXX_CPPLINT", CM_NULLPTR);
     this->SetPropertyDefault("CXX_INCLUDE_WHAT_YOU_USE", CM_NULLPTR);
     this->SetPropertyDefault("CXX_STANDARD", CM_NULLPTR);
     this->SetPropertyDefault("CXX_STANDARD_REQUIRED", CM_NULLPTR);
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 5b12a75..823b38f 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -276,7 +276,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
     if (args[1] == "__run_iwyu") {
       if (args.size() < 3) {
         std::cerr << "__run_iwyu Usage: -E __run_iwyu [--iwyu=/path/iwyu]"
-                     " [--tidy=/path/tidy] -- compile command\n";
+                     " [--cpplint=/path/cpplint] [--tidy=/path/tidy]"
+                     " -- compile command\n";
         return 1;
       }
       bool doing_options = true;
@@ -285,6 +286,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
       std::string tidy;
       std::string sourceFile;
       std::string lwyu;
+      std::string cpplint;
       for (std::string::size_type cc = 2; cc < args.size(); cc++) {
         std::string const& arg = args[cc];
         if (arg == "--") {
@@ -297,6 +299,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
           sourceFile = arg.substr(9);
         } else if (doing_options && cmHasLiteralPrefix(arg, "--lwyu=")) {
           lwyu = arg.substr(7);
+        } else if (doing_options && cmHasLiteralPrefix(arg, "--cpplint=")) {
+          cpplint = arg.substr(10);
         } else if (doing_options) {
           std::cerr << "__run_iwyu given unknown argument: " << arg << "\n";
           return 1;
@@ -304,12 +308,14 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
           orig_cmd.push_back(arg);
         }
       }
-      if (tidy.empty() && iwyu.empty() && lwyu.empty()) {
-        std::cerr << "__run_iwyu missing --tidy= or --iwyu=\n";
+      if (tidy.empty() && iwyu.empty() && lwyu.empty() && cpplint.empty()) {
+        std::cerr << "__run_iwyu missing --cpplint=, --iwyu=, --lwyu=, and/or"
+                     " --tidy=\n";
         return 1;
       }
-      if (!tidy.empty() && sourceFile.empty()) {
-        std::cerr << "__run_iwyu --tidy= requires --source=\n";
+      if ((!cpplint.empty() || !tidy.empty()) && sourceFile.empty()) {
+        std::cerr << "__run_iwyu --cpplint= and/or __run_iwyu --tidy="
+                     " require --source=\n";
         return 1;
       }
       if (orig_cmd.empty() && lwyu.empty()) {
@@ -403,6 +409,32 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
           std::cerr << "Warning: " << stdOut;
         }
       }
+
+      if (!cpplint.empty()) {
+        // Construct the cpplint command line.
+        std::vector<std::string> cpplint_cmd;
+        cmSystemTools::ExpandListArgument(cpplint, cpplint_cmd, true);
+        cpplint_cmd.push_back(sourceFile);
+
+        // Run the cpplint command line.  Capture its output.
+        std::string stdOut;
+        if (!cmSystemTools::RunSingleCommand(cpplint_cmd, &stdOut, &stdOut,
+                                             &ret, CM_NULLPTR,
+                                             cmSystemTools::OUTPUT_NONE)) {
+          std::cerr << "Error running '" << cpplint_cmd[0] << "': " << stdOut
+                    << "\n";
+          return 1;
+        }
+
+        // Output the output from cpplint to stderr
+        std::cerr << stdOut;
+
+        // If cpplint exited with an error do the same.
+        if (ret != 0) {
+          return ret;
+        }
+      }
+
       ret = 0;
       // Now run the real compiler command and return its result value.
       if (lwyu.empty() &&
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d2465c4..d6d4c0c 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -340,8 +340,10 @@ if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
   endif()
   add_executable(pseudo_tidy pseudo_tidy.c)
   add_executable(pseudo_iwyu pseudo_iwyu.c)
+  add_executable(pseudo_cpplint pseudo_cpplint.c)
   add_RunCMake_test(ClangTidy -DPSEUDO_TIDY=$<TARGET_FILE:pseudo_tidy>)
   add_RunCMake_test(IncludeWhatYouUse -DPSEUDO_IWYU=$<TARGET_FILE:pseudo_iwyu>)
+  add_RunCMake_test(Cpplint -DPSEUDO_CPPLINT=$<TARGET_FILE:pseudo_cpplint>)
   add_RunCMake_test(CompilerLauncher)
 endif()
 
diff --git a/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt b/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt
index 0d0d899..35f50b7 100644
--- a/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt
+++ b/Tests/RunCMake/CommandLine/E___run_iwyu-no-iwyu-stderr.txt
@@ -1 +1 @@
-^__run_iwyu missing --tidy= or --iwyu=$
+^__run_iwyu missing --cpplint=, --iwyu=, --lwyu=, and/or --tidy=$
diff --git a/Tests/RunCMake/Cpplint/C-Build-stdout.txt b/Tests/RunCMake/Cpplint/C-Build-stdout.txt
new file mode 100644
index 0000000..6a22b79
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-Build-stdout.txt
@@ -0,0 +1 @@
+Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/C-error-Build-result.txt b/Tests/RunCMake/Cpplint/C-error-Build-result.txt
new file mode 100644
index 0000000..d197c91
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error-Build-result.txt
@@ -0,0 +1 @@
+[^0]
diff --git a/Tests/RunCMake/Cpplint/C-error-Build-stdout.txt b/Tests/RunCMake/Cpplint/C-error-Build-stdout.txt
new file mode 100644
index 0000000..3e7a1e9
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error-Build-stdout.txt
@@ -0,0 +1 @@
+Tests[/\]RunCMake[/\]Cpplint[/\]main\.c:0:  message  \[category/category\] \[0\]
diff --git a/Tests/RunCMake/Cpplint/C-error-launch-Build-result.txt b/Tests/RunCMake/Cpplint/C-error-launch-Build-result.txt
new file mode 100644
index 0000000..d197c91
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error-launch-Build-result.txt
@@ -0,0 +1 @@
+[^0]
diff --git a/Tests/RunCMake/Cpplint/C-error-launch-Build-stdout.txt b/Tests/RunCMake/Cpplint/C-error-launch-Build-stdout.txt
new file mode 100644
index 0000000..3e7a1e9
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error-launch-Build-stdout.txt
@@ -0,0 +1 @@
+Tests[/\]RunCMake[/\]Cpplint[/\]main\.c:0:  message  \[category/category\] \[0\]
diff --git a/Tests/RunCMake/Cpplint/C-error-launch.cmake b/Tests/RunCMake/Cpplint/C-error-launch.cmake
new file mode 100644
index 0000000..c76e2e2
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error-launch.cmake
@@ -0,0 +1,3 @@
+set(CTEST_USE_LAUNCHERS 1)
+include(CTestUseLaunchers)
+include(C-error.cmake)
diff --git a/Tests/RunCMake/Cpplint/C-error.cmake b/Tests/RunCMake/Cpplint/C-error.cmake
new file mode 100644
index 0000000..29cf7ba
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-error.cmake
@@ -0,0 +1,3 @@
+enable_language(C)
+set(CMAKE_C_CPPLINT "${PSEUDO_CPPLINT}" --error)
+add_executable(main main.c)
diff --git a/Tests/RunCMake/Cpplint/C-launch-Build-stdout.txt b/Tests/RunCMake/Cpplint/C-launch-Build-stdout.txt
new file mode 100644
index 0000000..6a22b79
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-launch-Build-stdout.txt
@@ -0,0 +1 @@
+Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/C-launch.cmake b/Tests/RunCMake/Cpplint/C-launch.cmake
new file mode 100644
index 0000000..e66ca20
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C-launch.cmake
@@ -0,0 +1,3 @@
+set(CTEST_USE_LAUNCHERS 1)
+include(CTestUseLaunchers)
+include(C.cmake)
diff --git a/Tests/RunCMake/Cpplint/C.cmake b/Tests/RunCMake/Cpplint/C.cmake
new file mode 100644
index 0000000..68e6ff4
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/C.cmake
@@ -0,0 +1,3 @@
+enable_language(C)
+set(CMAKE_C_CPPLINT "${PSEUDO_CPPLINT}" --verbose=0 --linelength=80)
+add_executable(main main.c)
diff --git a/Tests/RunCMake/Cpplint/CMakeLists.txt b/Tests/RunCMake/Cpplint/CMakeLists.txt
new file mode 100644
index 0000000..a640c56
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.7)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/Cpplint/CXX-Build-stdout.txt b/Tests/RunCMake/Cpplint/CXX-Build-stdout.txt
new file mode 100644
index 0000000..6a22b79
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-Build-stdout.txt
@@ -0,0 +1 @@
+Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/CXX-error-Build-result.txt b/Tests/RunCMake/Cpplint/CXX-error-Build-result.txt
new file mode 100644
index 0000000..d197c91
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error-Build-result.txt
@@ -0,0 +1 @@
+[^0]
diff --git a/Tests/RunCMake/Cpplint/CXX-error-Build-stdout.txt b/Tests/RunCMake/Cpplint/CXX-error-Build-stdout.txt
new file mode 100644
index 0000000..028cd37
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error-Build-stdout.txt
@@ -0,0 +1 @@
+Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx:0:  message  \[category\/category\] \[0\]
diff --git a/Tests/RunCMake/Cpplint/CXX-error-launch-Build-result.txt b/Tests/RunCMake/Cpplint/CXX-error-launch-Build-result.txt
new file mode 100644
index 0000000..d197c91
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error-launch-Build-result.txt
@@ -0,0 +1 @@
+[^0]
diff --git a/Tests/RunCMake/Cpplint/CXX-error-launch-Build-stdout.txt b/Tests/RunCMake/Cpplint/CXX-error-launch-Build-stdout.txt
new file mode 100644
index 0000000..028cd37
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error-launch-Build-stdout.txt
@@ -0,0 +1 @@
+Tests[/\]RunCMake[/\]Cpplint[/\]main\.cxx:0:  message  \[category\/category\] \[0\]
diff --git a/Tests/RunCMake/Cpplint/CXX-error-launch.cmake b/Tests/RunCMake/Cpplint/CXX-error-launch.cmake
new file mode 100644
index 0000000..72dcbe9
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error-launch.cmake
@@ -0,0 +1,3 @@
+set(CTEST_USE_LAUNCHERS 1)
+include(CTestUseLaunchers)
+include(CXX-error.cmake)
diff --git a/Tests/RunCMake/Cpplint/CXX-error.cmake b/Tests/RunCMake/Cpplint/CXX-error.cmake
new file mode 100644
index 0000000..ad66ff5
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-error.cmake
@@ -0,0 +1,3 @@
+enable_language(CXX)
+set(CMAKE_CXX_CPPLINT "${PSEUDO_CPPLINT}" --error)
+add_executable(main main.cxx)
diff --git a/Tests/RunCMake/Cpplint/CXX-launch-Build-stdout.txt b/Tests/RunCMake/Cpplint/CXX-launch-Build-stdout.txt
new file mode 100644
index 0000000..6a22b79
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-launch-Build-stdout.txt
@@ -0,0 +1 @@
+Total errors found: 0
diff --git a/Tests/RunCMake/Cpplint/CXX-launch.cmake b/Tests/RunCMake/Cpplint/CXX-launch.cmake
new file mode 100644
index 0000000..3002c9d
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX-launch.cmake
@@ -0,0 +1,3 @@
+set(CTEST_USE_LAUNCHERS 1)
+include(CTestUseLaunchers)
+include(CXX.cmake)
diff --git a/Tests/RunCMake/Cpplint/CXX.cmake b/Tests/RunCMake/Cpplint/CXX.cmake
new file mode 100644
index 0000000..35f05ee
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/CXX.cmake
@@ -0,0 +1,3 @@
+enable_language(CXX)
+set(CMAKE_CXX_CPPLINT "${PSEUDO_CPPLINT}" --verbose=0 --linelength=80)
+add_executable(main main.cxx)
diff --git a/Tests/RunCMake/Cpplint/RunCMakeTest.cmake b/Tests/RunCMake/Cpplint/RunCMakeTest.cmake
new file mode 100644
index 0000000..5a8471e
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/RunCMakeTest.cmake
@@ -0,0 +1,26 @@
+include(RunCMake)
+
+set(RunCMake_TEST_OPTIONS "-DPSEUDO_CPPLINT=${PSEUDO_CPPLINT}")
+
+function(run_cpplint lang)
+  # Use a single build tree for tests without cleaning.
+  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/${lang}-build")
+  set(RunCMake_TEST_NO_CLEAN 1)
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+  run_cmake(${lang})
+  set(RunCMake_TEST_OUTPUT_MERGE 1)
+  run_cmake_command(${lang}-Build ${CMAKE_COMMAND} --build .)
+endfunction()
+
+run_cpplint(C)
+run_cpplint(CXX)
+run_cpplint(C-error)
+run_cpplint(CXX-error)
+
+if(NOT RunCMake_GENERATOR STREQUAL "Watcom WMake")
+  run_cpplint(C-launch)
+  run_cpplint(CXX-launch)
+  run_cpplint(C-error-launch)
+  run_cpplint(CXX-error-launch)
+endif()
diff --git a/Tests/RunCMake/Cpplint/main.c b/Tests/RunCMake/Cpplint/main.c
new file mode 100644
index 0000000..8488f4e
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/main.c
@@ -0,0 +1,4 @@
+int main(void)
+{
+  return 0;
+}
diff --git a/Tests/RunCMake/Cpplint/main.cxx b/Tests/RunCMake/Cpplint/main.cxx
new file mode 100644
index 0000000..f8b643a
--- /dev/null
+++ b/Tests/RunCMake/Cpplint/main.cxx
@@ -0,0 +1,4 @@
+int main()
+{
+  return 0;
+}
diff --git a/Tests/RunCMake/pseudo_cpplint.c b/Tests/RunCMake/pseudo_cpplint.c
new file mode 100644
index 0000000..8b9ebf4
--- /dev/null
+++ b/Tests/RunCMake/pseudo_cpplint.c
@@ -0,0 +1,21 @@
+#include <stdio.h>
+#include <string.h>
+
+int main(int argc, char* argv[])
+{
+  int error = 0;
+  int i;
+  for (i = 1; i < argc; ++i) {
+    if (strcmp(argv[i], "--error") == 0) {
+      error = 1;
+    }
+    if (argv[i][0] != '-') {
+      if (error) {
+        fprintf(stderr, "%s:0:  message  [category/category] [0]\n", argv[i]);
+      }
+      fprintf(stdout, "Done processing %s\nTotal errors found: %i\n", argv[i],
+              error);
+    }
+  }
+  return error;
+}

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

Summary of changes:
 Auxiliary/vim/syntax/cmake.vim                     |    4 +-
 Help/manual/cmake-properties.7.rst                 |    1 +
 Help/manual/cmake-variables.7.rst                  |    1 +
 Help/prop_tgt/LANG_CPPLINT.rst                     |   13 ++++++
 Help/release/dev/add-LANG_CPPLINT.rst              |    8 ++++
 Help/variable/CMAKE_LANG_CPPLINT.rst               |    6 +++
 Source/cmMakefileTargetGenerator.cxx               |   10 ++++-
 Source/cmNinjaTargetGenerator.cxx                  |   10 ++++-
 Source/cmTarget.cxx                                |    2 +
 Source/cmcmd.cxx                                   |   42 +++++++++++++++++---
 Tests/RunCMake/CMakeLists.txt                      |    2 +
 .../CommandLine/E___run_iwyu-no-iwyu-stderr.txt    |    2 +-
 Tests/RunCMake/Cpplint/C-Build-stdout.txt          |    1 +
 .../C-error-Build-result.txt}                      |    0
 Tests/RunCMake/Cpplint/C-error-Build-stdout.txt    |    1 +
 .../C-error-launch-Build-result.txt}               |    0
 .../Cpplint/C-error-launch-Build-stdout.txt        |    1 +
 Tests/RunCMake/Cpplint/C-error-launch.cmake        |    3 ++
 Tests/RunCMake/Cpplint/C-error.cmake               |    3 ++
 Tests/RunCMake/Cpplint/C-launch-Build-stdout.txt   |    1 +
 .../RunCMake/{ClangTidy => Cpplint}/C-launch.cmake |    0
 Tests/RunCMake/Cpplint/C.cmake                     |    3 ++
 .../{execute_process => Cpplint}/CMakeLists.txt    |    0
 Tests/RunCMake/Cpplint/CXX-Build-stdout.txt        |    1 +
 .../CXX-error-Build-result.txt}                    |    0
 Tests/RunCMake/Cpplint/CXX-error-Build-stdout.txt  |    1 +
 .../CXX-error-launch-Build-result.txt}             |    0
 .../Cpplint/CXX-error-launch-Build-stdout.txt      |    1 +
 Tests/RunCMake/Cpplint/CXX-error-launch.cmake      |    3 ++
 Tests/RunCMake/Cpplint/CXX-error.cmake             |    3 ++
 Tests/RunCMake/Cpplint/CXX-launch-Build-stdout.txt |    1 +
 .../{ClangTidy => Cpplint}/CXX-launch.cmake        |    0
 Tests/RunCMake/Cpplint/CXX.cmake                   |    3 ++
 Tests/RunCMake/Cpplint/RunCMakeTest.cmake          |   26 ++++++++++++
 .../LinkInterfaceLoop => RunCMake/Cpplint}/main.c  |    0
 Tests/RunCMake/{ClangTidy => Cpplint}/main.cxx     |    0
 Tests/RunCMake/pseudo_cpplint.c                    |   21 ++++++++++
 37 files changed, 164 insertions(+), 10 deletions(-)
 create mode 100644 Help/prop_tgt/LANG_CPPLINT.rst
 create mode 100644 Help/release/dev/add-LANG_CPPLINT.rst
 create mode 100644 Help/variable/CMAKE_LANG_CPPLINT.rst
 create mode 100644 Tests/RunCMake/Cpplint/C-Build-stdout.txt
 copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => Cpplint/C-error-Build-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Cpplint/C-error-Build-stdout.txt
 copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => Cpplint/C-error-launch-Build-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Cpplint/C-error-launch-Build-stdout.txt
 create mode 100644 Tests/RunCMake/Cpplint/C-error-launch.cmake
 create mode 100644 Tests/RunCMake/Cpplint/C-error.cmake
 create mode 100644 Tests/RunCMake/Cpplint/C-launch-Build-stdout.txt
 copy Tests/RunCMake/{ClangTidy => Cpplint}/C-launch.cmake (100%)
 create mode 100644 Tests/RunCMake/Cpplint/C.cmake
 copy Tests/RunCMake/{execute_process => Cpplint}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/Cpplint/CXX-Build-stdout.txt
 copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => Cpplint/CXX-error-Build-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Cpplint/CXX-error-Build-stdout.txt
 copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => Cpplint/CXX-error-launch-Build-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Cpplint/CXX-error-launch-Build-stdout.txt
 create mode 100644 Tests/RunCMake/Cpplint/CXX-error-launch.cmake
 create mode 100644 Tests/RunCMake/Cpplint/CXX-error.cmake
 create mode 100644 Tests/RunCMake/Cpplint/CXX-launch-Build-stdout.txt
 copy Tests/RunCMake/{ClangTidy => Cpplint}/CXX-launch.cmake (100%)
 create mode 100644 Tests/RunCMake/Cpplint/CXX.cmake
 create mode 100644 Tests/RunCMake/Cpplint/RunCMakeTest.cmake
 copy Tests/{CMakeOnly/LinkInterfaceLoop => RunCMake/Cpplint}/main.c (100%)
 copy Tests/RunCMake/{ClangTidy => Cpplint}/main.cxx (100%)
 create mode 100644 Tests/RunCMake/pseudo_cpplint.c


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 24 15:42:09 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Jan 2017 15:42:09 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2309-g8ccf48b
Message-ID: <20170124204210.69503F20E7@public.kitware.com>

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  8ccf48b37ada48d940e7a525cab2354ded7f3794 (commit)
       via  e6eaf25c3a74c6d075178e309cb0eea8d894698a (commit)
       via  39bf93c897626130177d57e6813cbe46b35c4972 (commit)
      from  90a3dd6f7cbb1263ea92537fc780678aa6c01999 (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=8ccf48b37ada48d940e7a525cab2354ded7f3794
commit 8ccf48b37ada48d940e7a525cab2354ded7f3794
Merge: 90a3dd6 e6eaf25
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 15:42:08 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 15:42:08 2017 -0500

    Merge topic 'intel-mpi-windows-fix' into next
    
    e6eaf25c FindMPI: Strip quotes from include path and convert to CMake path format
    39bf93c8 FindMPI: Add Intel MPI wrapper names on Windows


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6eaf25c3a74c6d075178e309cb0eea8d894698a
commit e6eaf25c3a74c6d075178e309cb0eea8d894698a
Author:     Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Mon Jan 23 17:21:47 2017 +0100
Commit:     Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Mon Jan 23 17:30:45 2017 +0100

    FindMPI: Strip quotes from include path and convert to CMake path format

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 4613ec4..e91a6a9 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -326,6 +326,8 @@ function (interrogate_mpi_compiler lang try_libs)
         foreach(IPATH ${MPI_ALL_INCLUDE_PATHS})
           string(REGEX REPLACE "^ ?-I" "" IPATH ${IPATH})
           string(REPLACE "//" "/" IPATH ${IPATH})
+          string(REPLACE "\"" "" IPATH ${IPATH})
+          file(TO_CMAKE_PATH "${IPATH}" IPATH)
           list(APPEND MPI_INCLUDE_PATH_WORK ${IPATH})
         endforeach()
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39bf93c897626130177d57e6813cbe46b35c4972
commit 39bf93c897626130177d57e6813cbe46b35c4972
Author:     Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Mon Jan 23 17:19:49 2017 +0100
Commit:     Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Mon Jan 23 17:30:25 2017 +0100

    FindMPI: Add Intel MPI wrapper names on Windows

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 842acef..4613ec4 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -113,9 +113,10 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 #
 
 # Start out with the generic MPI compiler names, as these are most commonly used.
-set(_MPI_C_COMPILER_NAMES                  mpicc    mpcc      mpicc_r mpcc_r)
+set(_MPI_C_COMPILER_NAMES                  mpicc    mpcc      mpicc_r mpcc_r  mpicc.bat)
 set(_MPI_CXX_COMPILER_NAMES                mpicxx   mpiCC     mpcxx   mpCC    mpic++   mpc++
-                                           mpicxx_r mpiCC_r   mpcxx_r mpCC_r  mpic++_r mpc++_r)
+                                           mpicxx_r mpiCC_r   mpcxx_r mpCC_r  mpic++_r mpc++_r
+                                           mpicxx.bat)
 set(_MPI_Fortran_COMPILER_NAMES            mpif95   mpif95_r  mpf95   mpf95_r
                                            mpif90   mpif90_r  mpf90   mpf90_r
                                            mpif77   mpif77_r  mpf77   mpf77_r)
@@ -127,9 +128,9 @@ set(_MPI_GNU_Fortran_COMPILER_NAMES        mpigfortran mpgfortran mpigfortran_r
                                            mpig77 mpig77_r mpg77 mpg77_r)
 
 # Intel MPI compiler names
-set(_MPI_Intel_C_COMPILER_NAMES            mpiicc)
-set(_MPI_Intel_CXX_COMPILER_NAMES          mpiicpc  mpiicxx mpiic++ mpiiCC)
-set(_MPI_Intel_Fortran_COMPILER_NAMES      mpiifort mpiif95 mpiif90 mpiif77)
+set(_MPI_Intel_C_COMPILER_NAMES            mpiicc   mpiicc.bat)
+set(_MPI_Intel_CXX_COMPILER_NAMES          mpiicpc  mpiicxx mpiic++ mpiiCC  mpiicpc.bat)
+set(_MPI_Intel_Fortran_COMPILER_NAMES      mpiifort mpiif95 mpiif90 mpiif77 mpiifort.bat)
 
 # PGI compiler names
 set(_MPI_PGI_C_COMPILER_NAMES              mpipgcc mppgcc)

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

Summary of changes:
 Modules/FindMPI.cmake |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 24 15:44:48 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Jan 2017 15:44:48 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2311-g3688454
Message-ID: <20170124204448.5EED3F9EF2@public.kitware.com>

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  368845459f43438e239663171cb38125915d5080 (commit)
       via  df3353d1f9b4cebc46018fd8fb6c601d038747c1 (commit)
      from  8ccf48b37ada48d940e7a525cab2354ded7f3794 (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=368845459f43438e239663171cb38125915d5080
commit 368845459f43438e239663171cb38125915d5080
Merge: 8ccf48b df3353d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 15:44:47 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 15:44:47 2017 -0500

    Merge topic 'cuda_linker_preference' into next
    
    df3353d1 CUDA: set linker preference between C and C++


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df3353d1f9b4cebc46018fd8fb6c601d038747c1
commit df3353d1f9b4cebc46018fd8fb6c601d038747c1
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Jan 17 15:09:22 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 24 15:43:43 2017 -0500

    CUDA: set linker preference between C and C++

diff --git a/Modules/CMakeCUDACompiler.cmake.in b/Modules/CMakeCUDACompiler.cmake.in
index 7e8efa7..158d12b 100644
--- a/Modules/CMakeCUDACompiler.cmake.in
+++ b/Modules/CMakeCUDACompiler.cmake.in
@@ -13,7 +13,7 @@ set(CMAKE_CUDA_HOST_COMPILER_ENV_VAR "CUDAHOSTCXX")
 
 set(CMAKE_CUDA_COMPILER_ID_RUN 1)
 set(CMAKE_CUDA_SOURCE_FILE_EXTENSIONS cu)
-set(CMAKE_CUDA_LINKER_PREFERENCE 10)
+set(CMAKE_CUDA_LINKER_PREFERENCE 15)
 set(CMAKE_CUDA_LINKER_PREFERENCE_PROPAGATES 1)
 
 set(CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES "@CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES@")

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

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


hooks/post-receive
-- 
CMake

From daniel at pfeifer-mail.de  Tue Jan 24 16:36:48 2017
From: daniel at pfeifer-mail.de (Daniel Pfeifer)
Date: Tue, 24 Jan 2017 16:36:48 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2317-g8708542
Message-ID: <20170124213648.75F73FA46D@public.kitware.com>

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  8708542da2b794a08b11c3ccae91dc927504ae50 (commit)
       via  eb86b4cec14df4a51cca9f178e8e758b97be11b7 (commit)
       via  178c897374718c2b7cfa76f5c016f23658d5d2b2 (commit)
       via  3bb4a798268669ca1364040abb3cfdf4a44c2f92 (commit)
       via  60b68304f25088db12112c47a4599e4fef405429 (commit)
       via  1731b90cd0b8c1c0da2f485a9b43006bb2174150 (commit)
      from  368845459f43438e239663171cb38125915d5080 (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=8708542da2b794a08b11c3ccae91dc927504ae50
commit 8708542da2b794a08b11c3ccae91dc927504ae50
Merge: 3688454 eb86b4c
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Tue Jan 24 16:36:47 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 16:36:47 2017 -0500

    Merge topic 'testdriver-cleanup' into next
    
    eb86b4ce TestDriver: fix/silence clang-tidy warnings
    178c8973 TestDriver: calc NumTests at compile time
    3bb4a798 TestDriver: use for loop
    60b68304 TestDriver: abstract CM_CAST macro
    1731b90c TestDriver: Revise C++ coding style using clang-format


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb86b4cec14df4a51cca9f178e8e758b97be11b7
commit eb86b4cec14df4a51cca9f178e8e758b97be11b7
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Tue Jan 24 22:24:06 2017 +0100
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Tue Jan 24 22:24:06 2017 +0100

    TestDriver: fix/silence clang-tidy warnings

diff --git a/Templates/TestDriver.cxx.in b/Templates/TestDriver.cxx.in
index 7340842..ecf6fa1 100644
--- a/Templates/TestDriver.cxx.in
+++ b/Templates/TestDriver.cxx.in
@@ -1,7 +1,7 @@
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <ctype.h>  /* NOLINT */
+#include <stdio.h>  /* NOLINT */
+#include <stdlib.h> /* NOLINT */
+#include <string.h> /* NOLINT */
 
 #if defined(_MSC_VER)
 #pragma warning(disable : 4996) /* deprecation */
@@ -29,7 +29,7 @@ typedef struct
 
 static functionMapEntry cmakeGeneratedFunctionMapEntries[] = {
   @CMAKE_FUNCTION_TABLE_ENTIRES@
-  { 0, 0 }
+  { NULL, NULL } /* NOLINT */
 };
 
 static const int NumTests =
@@ -37,7 +37,6 @@ static const int NumTests =
 
 /* Allocate and create a lowercased copy of string
    (note that it has to be free'd manually) */
-
 static char* lowercase(const char* string)
 {
   char *new_string, *p;
@@ -46,8 +45,8 @@ static char* lowercase(const char* string)
   stringSize = CM_CAST(size_t, strlen(string) + 1);
   new_string = CM_CAST(char*, malloc(sizeof(char) * stringSize));
 
-  if (!new_string) {
-    return 0;
+  if (new_string == NULL) { /* NOLINT */
+    return NULL;            /* NOLINT */
   }
   strncpy(new_string, string, stringSize);
   for (p = new_string; *p != 0; ++p) {
@@ -87,12 +86,12 @@ int main(int ac, char* av[])
     av++;
   }
   partial_match = 0;
-  arg = 0;
+  arg = NULL; /* NOLINT */
   /* If partial match is requested.  */
   if (testToRun == -1 && ac > 1) {
     partial_match = (strcmp(av[1], "-R") == 0) ? 1 : 0;
   }
-  if (partial_match && ac < 3) {
+  if (partial_match != 0 && ac < 3) {
     printf("-R needs an additional parameter.\n");
     return -1;
   }
@@ -101,20 +100,18 @@ int main(int ac, char* av[])
   }
   for (i = 0; i < NumTests && testToRun == -1; ++i) {
     test_name = lowercase(cmakeGeneratedFunctionMapEntries[i].name);
-    if (partial_match && strstr(test_name, arg) != NULL) {
+    if (partial_match != 0 && strstr(test_name, arg) != NULL) { /* NOLINT */
       testToRun = i;
       ac -= 2;
       av += 2;
-    } else if (!partial_match && strcmp(test_name, arg) == 0) {
+    } else if (partial_match == 0 && strcmp(test_name, arg) == 0) {
       testToRun = i;
       ac--;
       av++;
     }
     free(test_name);
   }
-  if (arg) {
-    free(arg);
-  }
+  free(arg);
   if (testToRun != -1) {
     int result;
 @CMAKE_TESTDRIVER_BEFORE_TESTMAIN@

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=178c897374718c2b7cfa76f5c016f23658d5d2b2
commit 178c897374718c2b7cfa76f5c016f23658d5d2b2
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Tue Jan 24 22:24:06 2017 +0100
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Tue Jan 24 22:24:06 2017 +0100

    TestDriver: calc NumTests at compile time

diff --git a/Templates/TestDriver.cxx.in b/Templates/TestDriver.cxx.in
index 8e54680..7340842 100644
--- a/Templates/TestDriver.cxx.in
+++ b/Templates/TestDriver.cxx.in
@@ -32,6 +32,9 @@ static functionMapEntry cmakeGeneratedFunctionMapEntries[] = {
   { 0, 0 }
 };
 
+static const int NumTests =
+  (sizeof(cmakeGeneratedFunctionMapEntries) / sizeof(functionMapEntry)) - 1;
+
 /* Allocate and create a lowercased copy of string
    (note that it has to be free'd manually) */
 
@@ -55,16 +58,12 @@ static char* lowercase(const char* string)
 
 int main(int ac, char* av[])
 {
-  int i, NumTests, testNum = 0, partial_match;
+  int i, testNum = 0, partial_match;
   char *arg, *test_name;
-  int count;
   int testToRun = -1;
 
   @CMAKE_TESTDRIVER_ARGVC_FUNCTION@
 
-  for (count = 0; cmakeGeneratedFunctionMapEntries[count].name != 0; count++) {
-  }
-  NumTests = count;
   /* If no test name was given */
   /* process command line with user function.  */
   if (ac < 2) {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3bb4a798268669ca1364040abb3cfdf4a44c2f92
commit 3bb4a798268669ca1364040abb3cfdf4a44c2f92
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Tue Jan 24 22:24:06 2017 +0100
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Tue Jan 24 22:24:06 2017 +0100

    TestDriver: use for loop

diff --git a/Templates/TestDriver.cxx.in b/Templates/TestDriver.cxx.in
index 7e17761..8e54680 100644
--- a/Templates/TestDriver.cxx.in
+++ b/Templates/TestDriver.cxx.in
@@ -47,10 +47,8 @@ static char* lowercase(const char* string)
     return 0;
   }
   strncpy(new_string, string, stringSize);
-  p = new_string;
-  while (*p != 0) {
+  for (p = new_string; *p != 0; ++p) {
     *p = CM_CAST(char, tolower(*p));
-    ++p;
   }
   return new_string;
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60b68304f25088db12112c47a4599e4fef405429
commit 60b68304f25088db12112c47a4599e4fef405429
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Tue Jan 24 22:24:06 2017 +0100
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Tue Jan 24 22:24:06 2017 +0100

    TestDriver: abstract CM_CAST macro

diff --git a/Templates/TestDriver.cxx.in b/Templates/TestDriver.cxx.in
index 7d03fd3..7e17761 100644
--- a/Templates/TestDriver.cxx.in
+++ b/Templates/TestDriver.cxx.in
@@ -12,6 +12,12 @@
 /* Forward declare test functions. */
 @CMAKE_FORWARD_DECLARE_TESTS@
 
+#ifdef __cplusplus
+#define CM_CAST(TYPE, EXPR) static_cast<TYPE>(EXPR)
+#else
+#define CM_CAST(TYPE, EXPR) (TYPE)(EXPR)
+#endif
+
 /* Create map.  */
 
 typedef int (*MainFuncPointer)(int, char* []);
@@ -34,13 +40,8 @@ static char* lowercase(const char* string)
   char *new_string, *p;
   size_t stringSize = 0;
 
-#ifdef __cplusplus
-  stringSize = static_cast<size_t>(strlen(string) + 1);
-  new_string = static_cast<char*>(malloc(sizeof(char) * stringSize));
-#else
-  stringSize = (size_t)(strlen(string) + 1);
-  new_string = (char*)(malloc(sizeof(char) * stringSize));
-#endif
+  stringSize = CM_CAST(size_t, strlen(string) + 1);
+  new_string = CM_CAST(char*, malloc(sizeof(char) * stringSize));
 
   if (!new_string) {
     return 0;
@@ -48,12 +49,7 @@ static char* lowercase(const char* string)
   strncpy(new_string, string, stringSize);
   p = new_string;
   while (*p != 0) {
-#ifdef __cplusplus
-    *p = static_cast<char>(tolower(*p));
-#else
-    *p = (char)(tolower(*p));
-#endif
-
+    *p = CM_CAST(char, tolower(*p));
     ++p;
   }
   return new_string;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1731b90cd0b8c1c0da2f485a9b43006bb2174150
commit 1731b90cd0b8c1c0da2f485a9b43006bb2174150
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Tue Jan 24 22:24:06 2017 +0100
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Tue Jan 24 22:24:06 2017 +0100

    TestDriver: Revise C++ coding style using clang-format

diff --git a/Templates/TestDriver.cxx.in b/Templates/TestDriver.cxx.in
index 3e0afa5..7d03fd3 100644
--- a/Templates/TestDriver.cxx.in
+++ b/Templates/TestDriver.cxx.in
@@ -1,21 +1,20 @@
 #include <ctype.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
 #if defined(_MSC_VER)
-# pragma warning(disable:4996) /* deprecation */
+#pragma warning(disable : 4996) /* deprecation */
 #endif
 
 @CMAKE_TESTDRIVER_EXTRA_INCLUDES@
 
-
 /* Forward declare test functions. */
 @CMAKE_FORWARD_DECLARE_TESTS@
 
 /* Create map.  */
 
-typedef int (*MainFuncPointer)(int , char*[]);
+typedef int (*MainFuncPointer)(int, char* []);
 typedef struct
 {
   const char* name;
@@ -24,33 +23,31 @@ typedef struct
 
 static functionMapEntry cmakeGeneratedFunctionMapEntries[] = {
   @CMAKE_FUNCTION_TABLE_ENTIRES@
-  {0,0}
+  { 0, 0 }
 };
 
 /* Allocate and create a lowercased copy of string
    (note that it has to be free'd manually) */
 
-static char* lowercase(const char *string)
+static char* lowercase(const char* string)
 {
   char *new_string, *p;
   size_t stringSize = 0;
 
 #ifdef __cplusplus
   stringSize = static_cast<size_t>(strlen(string) + 1);
-  new_string = static_cast<char *>(malloc(sizeof(char) * stringSize));
+  new_string = static_cast<char*>(malloc(sizeof(char) * stringSize));
 #else
   stringSize = (size_t)(strlen(string) + 1);
-  new_string = (char *)(malloc(sizeof(char) * stringSize));
+  new_string = (char*)(malloc(sizeof(char) * stringSize));
 #endif
 
-  if (!new_string)
-    {
+  if (!new_string) {
     return 0;
-    }
+  }
   strncpy(new_string, string, stringSize);
   p = new_string;
-  while (*p != 0)
-    {
+  while (*p != 0) {
 #ifdef __cplusplus
     *p = static_cast<char>(tolower(*p));
 #else
@@ -58,11 +55,11 @@ static char* lowercase(const char *string)
 #endif
 
     ++p;
-    }
+  }
   return new_string;
 }
 
-int main(int ac, char *av[])
+int main(int ac, char* av[])
 {
   int i, NumTests, testNum = 0, partial_match;
   char *arg, *test_name;
@@ -71,96 +68,79 @@ int main(int ac, char *av[])
 
   @CMAKE_TESTDRIVER_ARGVC_FUNCTION@
 
-  for(count =0; cmakeGeneratedFunctionMapEntries[count].name != 0; count++)
-    {
-    }
+  for (count = 0; cmakeGeneratedFunctionMapEntries[count].name != 0; count++) {
+  }
   NumTests = count;
   /* If no test name was given */
   /* process command line with user function.  */
-  if (ac < 2)
-    {
+  if (ac < 2) {
     /* Ask for a test.  */
     printf("Available tests:\n");
-    for (i =0; i < NumTests; ++i)
-      {
+    for (i = 0; i < NumTests; ++i) {
       printf("%3d. %s\n", i, cmakeGeneratedFunctionMapEntries[i].name);
-      }
+    }
     printf("To run a test, enter the test number: ");
     fflush(stdout);
-    if( scanf("%d", &testNum) != 1 )
-      {
+    if (scanf("%d", &testNum) != 1) {
       printf("Couldn't parse that input as a number\n");
       return -1;
-      }
-    if (testNum >= NumTests)
-      {
+    }
+    if (testNum >= NumTests) {
       printf("%3d is an invalid test number.\n", testNum);
       return -1;
-      }
+    }
     testToRun = testNum;
     ac--;
     av++;
-    }
+  }
   partial_match = 0;
   arg = 0;
   /* If partial match is requested.  */
-  if(testToRun == -1 && ac > 1)
-    {
+  if (testToRun == -1 && ac > 1) {
     partial_match = (strcmp(av[1], "-R") == 0) ? 1 : 0;
-    }
-  if (partial_match && ac < 3)
-    {
+  }
+  if (partial_match && ac < 3) {
     printf("-R needs an additional parameter.\n");
     return -1;
-    }
-  if(testToRun == -1)
-    {
+  }
+  if (testToRun == -1) {
     arg = lowercase(av[1 + partial_match]);
-    }
-  for (i =0; i < NumTests && testToRun == -1; ++i)
-    {
+  }
+  for (i = 0; i < NumTests && testToRun == -1; ++i) {
     test_name = lowercase(cmakeGeneratedFunctionMapEntries[i].name);
-    if (partial_match && strstr(test_name, arg) != NULL)
-      {
+    if (partial_match && strstr(test_name, arg) != NULL) {
       testToRun = i;
-      ac -=2;
+      ac -= 2;
       av += 2;
-      }
-    else if (!partial_match && strcmp(test_name, arg) == 0)
-      {
+    } else if (!partial_match && strcmp(test_name, arg) == 0) {
       testToRun = i;
       ac--;
       av++;
-      }
-    free(test_name);
     }
-  if(arg)
-    {
+    free(test_name);
+  }
+  if (arg) {
     free(arg);
-    }
-  if(testToRun != -1)
-    {
+  }
+  if (testToRun != -1) {
     int result;
 @CMAKE_TESTDRIVER_BEFORE_TESTMAIN@
-    if (testToRun < 0 || testToRun >= NumTests)
-      {
-      printf(
-        "testToRun was modified by TestDriver code to an invalid value: %3d.\n",
-        testNum);
+    if (testToRun < 0 || testToRun >= NumTests) {
+      printf("testToRun was modified by TestDriver code to an invalid value: "
+             "%3d.\n",
+             testNum);
       return -1;
-      }
+    }
     result = (*cmakeGeneratedFunctionMapEntries[testToRun].func)(ac, av);
 @CMAKE_TESTDRIVER_AFTER_TESTMAIN@
     return result;
-    }
-
+  }
 
   /* Nothing was run, display the test names.  */
   printf("Available tests:\n");
-  for (i =0; i < NumTests; ++i)
-    {
+  for (i = 0; i < NumTests; ++i) {
     printf("%3d. %s\n", i, cmakeGeneratedFunctionMapEntries[i].name);
-    }
+  }
   printf("Failed: %s is an invalid test name.\n", av[1]);
 
   return -1;

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

Summary of changes:
 Templates/TestDriver.cxx.in |  146 +++++++++++++++++--------------------------
 1 file changed, 58 insertions(+), 88 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 24 16:37:45 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Jan 2017 16:37:45 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2319-gcfa206c
Message-ID: <20170124213745.A27B7FA476@public.kitware.com>

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  cfa206ce421fe093b95aeb3ff14cce38d0005f28 (commit)
       via  0256ba65a806b9e9aefa03acec4f39cdcf71f2e4 (commit)
      from  8708542da2b794a08b11c3ccae91dc927504ae50 (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=cfa206ce421fe093b95aeb3ff14cce38d0005f28
commit cfa206ce421fe093b95aeb3ff14cce38d0005f28
Merge: 8708542 0256ba6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 16:37:45 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 16:37:45 2017 -0500

    Merge topic 'determine_id_without_user_specified_flags' into next
    
    0256ba65 CMakeDetermineCompilerId: check with and without user-specified flags


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0256ba65a806b9e9aefa03acec4f39cdcf71f2e4
commit 0256ba65a806b9e9aefa03acec4f39cdcf71f2e4
Author:     Michael Maltese <michaeljosephmaltese at gmail.com>
AuthorDate: Mon Jan 23 18:58:18 2017 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 24 16:33:41 2017 -0500

    CMakeDetermineCompilerId: check with and without user-specified flags
    
    Clang may raise an error when passed a `-march=` option that doesn't
    correspond to the current target triple.  CMake cannot pass the target
    triple when determining the compiler id because it doesn't know how yet,
    but it does pass along user-specified flags.  This breaks when those
    user-specified flags include `-march=`.  Fix this use case by also
    trying to find the compiler id without the user-specified flags.
    
    Fixes: #16587

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index bb34de5..ae485bf 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -24,16 +24,21 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
 
   # Try building with no extra flags and then try each set
   # of helper flags.  Stop when the compiler is identified.
-  foreach(flags ${CMAKE_${lang}_COMPILER_ID_TEST_FLAGS_FIRST}
-                ""
-                ${CMAKE_${lang}_COMPILER_ID_TEST_FLAGS})
-    CMAKE_DETERMINE_COMPILER_ID_BUILD("${lang}" "${flags}" "${src}")
-    CMAKE_DETERMINE_COMPILER_ID_MATCH_VENDOR("${lang}" "${COMPILER_${lang}_PRODUCED_OUTPUT}")
-    if(CMAKE_${lang}_COMPILER_ID)
-      break()
-    endif()
-    foreach(file ${COMPILER_${lang}_PRODUCED_FILES})
-      CMAKE_DETERMINE_COMPILER_ID_CHECK("${lang}" "${CMAKE_${lang}_COMPILER_ID_DIR}/${file}" "${src}")
+  foreach(userflags "${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}" "")
+    foreach(testflags ${CMAKE_${lang}_COMPILER_ID_TEST_FLAGS_FIRST}
+                      ""
+                      ${CMAKE_${lang}_COMPILER_ID_TEST_FLAGS})
+      CMAKE_DETERMINE_COMPILER_ID_BUILD("${lang}" "${testflags}" "${userflags}" "${src}")
+      CMAKE_DETERMINE_COMPILER_ID_MATCH_VENDOR("${lang}" "${COMPILER_${lang}_PRODUCED_OUTPUT}")
+      if(CMAKE_${lang}_COMPILER_ID)
+        break()
+      endif()
+      foreach(file ${COMPILER_${lang}_PRODUCED_FILES})
+        CMAKE_DETERMINE_COMPILER_ID_CHECK("${lang}" "${CMAKE_${lang}_COMPILER_ID_DIR}/${file}" "${src}")
+      endforeach()
+      if(CMAKE_${lang}_COMPILER_ID)
+        break()
+      endif()
     endforeach()
     if(CMAKE_${lang}_COMPILER_ID)
       break()
@@ -42,7 +47,9 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
 
   # If the compiler is still unknown, try to query its vendor.
   if(CMAKE_${lang}_COMPILER AND NOT CMAKE_${lang}_COMPILER_ID)
-    CMAKE_DETERMINE_COMPILER_ID_VENDOR(${lang})
+    foreach(userflags "${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}" "")
+      CMAKE_DETERMINE_COMPILER_ID_VENDOR(${lang} "${userflags}")
+    endforeach()
   endif()
 
   if (COMPILER_QNXNTO AND CMAKE_${lang}_COMPILER_ID STREQUAL "GNU")
@@ -66,7 +73,9 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
   endif()
 
   if(CMAKE_GENERATOR STREQUAL "Ninja" AND MSVC_${lang}_ARCHITECTURE_ID)
-    CMAKE_DETERMINE_MSVC_SHOWINCLUDES_PREFIX(${lang})
+    foreach(userflags "${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}" "")
+      CMAKE_DETERMINE_MSVC_SHOWINCLUDES_PREFIX(${lang} "${userflags}")
+    endforeach()
   else()
     set(CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX "")
   endif()
@@ -127,7 +136,7 @@ endfunction()
 #-----------------------------------------------------------------------------
 # Function to build the compiler id source file and look for output
 # files.
-function(CMAKE_DETERMINE_COMPILER_ID_BUILD lang testflags src)
+function(CMAKE_DETERMINE_COMPILER_ID_BUILD lang testflags userflags src)
   # Create a clean working directory.
   file(REMOVE_RECURSE ${CMAKE_${lang}_COMPILER_ID_DIR})
   file(MAKE_DIRECTORY ${CMAKE_${lang}_COMPILER_ID_DIR})
@@ -137,7 +146,7 @@ function(CMAKE_DETERMINE_COMPILER_ID_BUILD lang testflags src)
   # Construct a description of this test case.
   set(COMPILER_DESCRIPTION
     "Compiler: ${CMAKE_${lang}_COMPILER} ${CMAKE_${lang}_COMPILER_ID_ARG1}
-Build flags: ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}
+Build flags: ${userflags}
 Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
 ")
 
@@ -327,7 +336,7 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
     execute_process(
       COMMAND "${CMAKE_${lang}_COMPILER}"
               ${CMAKE_${lang}_COMPILER_ID_ARG1}
-              ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}
+              ${userflags}
               ${testflags}
               ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
               "${src}"
@@ -615,7 +624,7 @@ endfunction()
 #   set(CMAKE_${lang}_COMPILER_ID_VENDOR_REGEX_${vendor} "Some Vendor Output")
 # We try running the compiler with the flag for each vendor and
 # matching its regular expression in the output.
-function(CMAKE_DETERMINE_COMPILER_ID_VENDOR lang)
+function(CMAKE_DETERMINE_COMPILER_ID_VENDOR lang userflags)
 
   if(NOT CMAKE_${lang}_COMPILER_ID_DIR)
     # We get here when this function is called not from within CMAKE_DETERMINE_COMPILER_ID()
@@ -633,7 +642,7 @@ function(CMAKE_DETERMINE_COMPILER_ID_VENDOR lang)
     execute_process(
       COMMAND "${CMAKE_${lang}_COMPILER}"
       ${CMAKE_${lang}_COMPILER_ID_ARG1}
-      ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}
+      ${userflags}
       ${flags}
       WORKING_DIRECTORY ${CMAKE_${lang}_COMPILER_ID_DIR}
       OUTPUT_VARIABLE output ERROR_VARIABLE output
@@ -661,7 +670,7 @@ function(CMAKE_DETERMINE_COMPILER_ID_VENDOR lang)
   endforeach()
 endfunction()
 
-function(CMAKE_DETERMINE_MSVC_SHOWINCLUDES_PREFIX lang)
+function(CMAKE_DETERMINE_MSVC_SHOWINCLUDES_PREFIX lang userflags)
   # Run this MSVC-compatible compiler to detect what the /showIncludes
   # option displays.  We can use a C source even with the C++ compiler
   # because MSVC-compatible compilers handle both and show the same output.
@@ -671,7 +680,7 @@ function(CMAKE_DETERMINE_MSVC_SHOWINCLUDES_PREFIX lang)
   execute_process(
     COMMAND "${CMAKE_${lang}_COMPILER}"
             ${CMAKE_${lang}_COMPILER_ID_ARG1}
-            ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}
+            ${userflags}
             /nologo /showIncludes /c main.c
     WORKING_DIRECTORY ${showdir}
     OUTPUT_VARIABLE out

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

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |   47 +++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 24 16:41:09 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Jan 2017 16:41:09 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2321-g972dd56
Message-ID: <20170124214109.3EC3CF20E7@public.kitware.com>

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  972dd56913054eedfc1f8cf39bf47c7132b973c6 (commit)
       via  e5089c562cdb516bb2a502754788864390c429be (commit)
      from  cfa206ce421fe093b95aeb3ff14cce38d0005f28 (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=972dd56913054eedfc1f8cf39bf47c7132b973c6
commit 972dd56913054eedfc1f8cf39bf47c7132b973c6
Merge: cfa206c e5089c5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 16:41:08 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 16:41:08 2017 -0500

    Merge topic 'cpack-ifw-options' into next
    
    e5089c56 CPackIFW: Add some options


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5089c562cdb516bb2a502754788864390c429be
commit e5089c562cdb516bb2a502754788864390c429be
Author:     Konstantin Podsvirov <konstantin at podsvirov.pro>
AuthorDate: Tue Jan 24 16:51:42 2017 +0300
Commit:     Konstantin Podsvirov <konstantin at podsvirov.pro>
CommitDate: Tue Jan 24 17:03:37 2017 +0300

    CPackIFW: Add some options
    
    The cpack_ifw_configure_component_group command gained options:
    - DEPENDS.
    
    The cpack_ifw_configure_component and
    cpack_ifw_configure_component_group commands gained options:
    - REQUIRES_ADMIN_RIGHTS;
    - UPDATE_TEXT;
    - SORTING_PRIORITY; # New name for PRIORITY
    - DEPENDENCIES; # Alias for DEPENDS
    - AUTO_DEPEND_ON;
    - TRANSLATIONS.
    
    For both commands PRIORITY option now is depreceted. Please
    use SORTING_PRIORITY instead.

diff --git a/Help/release/dev/cpack-ifw-options.rst b/Help/release/dev/cpack-ifw-options.rst
index cbe0f63..9838fd4 100644
--- a/Help/release/dev/cpack-ifw-options.rst
+++ b/Help/release/dev/cpack-ifw-options.rst
@@ -3,5 +3,19 @@ cpack-ifw-options
 
 * The :module:`CPackIFW` module :command:`cpack_ifw_configure_component` and
   :command:`cpack_ifw_configure_component_group` commands gained a new
-  ``DEFAULT``, ``VIRTUAL``, ``FORCED_INSTALLATION``, ``DISPLAY_NAME``,
-  ``DESCRIPTION`` and ``RELEASE_DATE`` options to more specific configuration.
+  ``DEFAULT``, ``VIRTUAL``, ``FORCED_INSTALLATION``, ``REQUIRES_ADMIN_RIGHTS``,
+  ``DISPLAY_NAME``, ``UPDATE_TEXT``, ``DESCRIPTION``, ``RELEASE_DATE``,
+  ``AUTO_DEPEND_ON`` and ``TRANSLATIONS`` options to more specific
+  configuration.
+
+* The :module:`CPackIFW` module :command:`cpack_ifw_configure_component`
+  command gained a new ``DEPENDENCIES`` alias for ``DEPENDS`` option.
+
+* The :module:`CPackIFW` module :command:`cpack_ifw_configure_component_group`
+  command gained a new ``DEPENDS`` option. The ``DEPENDENCIES`` alias also
+  added.
+
+* The :module:`CPackIFW` module :command:`cpack_ifw_configure_component` and
+  :command:`cpack_ifw_configure_component_group` commands ``PRIORITY``
+  option now is deprecated and will be removed in a future version of CMake.
+  Please use new ``SORTING_PRIORITY`` option instead.
diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake
index ae595fb..deb724c 100644
--- a/Modules/CPackIFW.cmake
+++ b/Modules/CPackIFW.cmake
@@ -227,18 +227,21 @@
 #   ::
 #
 #     cpack_ifw_configure_component(<compname> [COMMON] [ESSENTIAL] [VIRTUAL]
-#                         [FORCED_INSTALLATION]
+#                         [FORCED_INSTALLATION] [REQUIRES_ADMIN_RIGHTS]
 #                         [NAME <name>]
 #                         [DISPLAY_NAME <display_name>]
 #                         [DESCRIPTION <description>]
+#                         [UPDATE_TEXT <update_text>]
 #                         [VERSION <version>]
 #                         [RELEASE_DATE <release_date>]
 #                         [SCRIPT <script>]
-#                         [PRIORITY <priority>]
-#                         [DEPENDS <com_id> ...]
+#                         [PRIORITY|SORTING_PRIORITY <sorting_priority>] # Note: PRIORITY is deprecated
+#                         [DEPENDS|DEPENDENCIES <com_id> ...]
+#                         [AUTO_DEPEND_ON <comp_id> ...]
 #                         [LICENSES <display_name> <file_path> ...]
 #                         [DEFAULT <value>]
-#                         [USER_INTERFACES <file_path> <file_path> ...])
+#                         [USER_INTERFACES <file_path> <file_path> ...]
+#                         [TRANSLATIONS <file_path> <file_path> ...])
 #
 #   This command should be called after :command:`cpack_add_component` command.
 #
@@ -260,6 +263,9 @@
 #     It is a equivalent of the ``REQUARED`` option from the
 #     :command:`cpack_add_component` command.
 #
+#   ``REQUIRES_ADMIN_RIGHTS``
+#     set it if the component needs to be installed with elevated permissions.
+#
 #   ``NAME``
 #     is used to create domain-like identification for this component.
 #     By default used origin component name.
@@ -272,6 +278,10 @@
 #     set to rewrite original description configured by
 #     :command:`cpack_add_component` command.
 #
+#   ``UPDATE_TEXT``
+#     will be added to the component description if this is an update to
+#     the component.
+#
 #   ``VERSION``
 #     is version of component.
 #     By default used :variable:`CPACK_PACKAGE_VERSION`.
@@ -283,11 +293,18 @@
 #     is a relative or absolute path to operations script
 #     for this component.
 #
-#   ``PRIORITY``
+#   ``PRIORITY`` | ``SORTING_PRIORITY``
 #     is priority of the component in the tree.
+#     The ``PRIORITY`` option is deprecated and will be removed in a future
+#     version of CMake. Please use ``SORTING_PRIORITY`` option instead.
+#
+#   ``DEPENDS`` | ``DEPENDENCIES``
+#     list of dependency component or component group identifiers in
+#     QtIFW_ style.
 #
-#   ``DEPENDS``
-#     list of dependency component identifiers in QtIFW_ style.
+#   ``AUTO_DEPEND_ON``
+#     list of identifiers of component or component group in QtIFW_ style
+#     that this component has an automatic dependency on.
 #
 #   ``LICENSES``
 #     pair of <display_name> and <file_path> of license text for this
@@ -300,7 +317,10 @@
 #     as a value of the ``SCRIPT`` option).
 #
 #   ``USER_INTERFACES``
-#     a list of <file_path> representing pages to load
+#     is a list of <file_path> ('.ui' files) representing pages to load.
+#
+#   ``TRANSLATIONS``
+#     is a list of <file_path> ('.qm' files) representing translations to load.
 #
 #
 # .. command:: cpack_ifw_configure_component_group
@@ -310,17 +330,21 @@
 #   ::
 #
 #     cpack_ifw_configure_component_group(<groupname> [VIRTUAL]
-#                         [FORCED_INSTALLATION]
+#                         [FORCED_INSTALLATION] [REQUIRES_ADMIN_RIGHTS]
 #                         [NAME <name>]
 #                         [DISPLAY_NAME <display_name>]
 #                         [DESCRIPTION <description>]
+#                         [UPDATE_TEXT <update_text>]
 #                         [VERSION <version>]
 #                         [RELEASE_DATE <release_date>]
 #                         [SCRIPT <script>]
-#                         [PRIORITY <priority>]
+#                         [PRIORITY|SORTING_PRIORITY <sorting_priority>] # Note: PRIORITY is deprecated
+#                         [DEPENDS|DEPENDENCIES <com_id> ...]
+#                         [AUTO_DEPEND_ON <comp_id> ...]
 #                         [LICENSES <display_name> <file_path> ...]
 #                         [DEFAULT <value>]
-#                         [USER_INTERFACES <file_path> <file_path> ...])
+#                         [USER_INTERFACES <file_path> <file_path> ...]
+#                         [TRANSLATIONS <file_path> <file_path> ...])
 #
 #   This command should be called after :command:`cpack_add_component_group`
 #   command.
@@ -332,6 +356,10 @@
 #   ``FORCED_INSTALLATION``
 #     if set, then the group must always be installed.
 #
+#   ``REQUIRES_ADMIN_RIGHTS``
+#     set it if the component group needs to be installed with elevated
+#     permissions.
+#
 #   ``NAME``
 #     is used to create domain-like identification for this component group.
 #     By default used origin component group name.
@@ -344,6 +372,10 @@
 #     set to rewrite original description configured by
 #     :command:`cpack_add_component_group` command.
 #
+#   ``UPDATE_TEXT``
+#     will be added to the component group description if this is an update to
+#     the component group.
+#
 #   ``VERSION``
 #     is version of component group.
 #     By default used :variable:`CPACK_PACKAGE_VERSION`.
@@ -355,8 +387,18 @@
 #     is a relative or absolute path to operations script
 #     for this component group.
 #
-#   ``PRIORITY``
+#   ``PRIORITY`` | ``SORTING_PRIORITY``
 #     is priority of the component group in the tree.
+#     The ``PRIORITY`` option is deprecated and will be removed in a future
+#     version of CMake. Please use ``SORTING_PRIORITY`` option instead.
+#
+#   ``DEPENDS`` | ``DEPENDENCIES``
+#     list of dependency component or component group identifiers in
+#     QtIFW_ style.
+#
+#   ``AUTO_DEPEND_ON``
+#     list of identifiers of component or component group in QtIFW_ style
+#     that this component group has an automatic dependency on.
 #
 #   ``LICENSES``
 #     pair of <display_name> and <file_path> of license text for this
@@ -370,7 +412,10 @@
 #     the script as a value of the ``SCRIPT`` option).
 #
 #   ``USER_INTERFACES``
-#     a list of <file_path> representing pages to load
+#     is a list of <file_path> ('.ui' files) representing pages to load.
+#
+#   ``TRANSLATIONS``
+#     is a list of <file_path> ('.qm' files) representing translations to load.
 #
 #
 # .. command:: cpack_ifw_add_repository
@@ -711,14 +756,15 @@ macro(cpack_ifw_configure_component compname)
 
   string(TOUPPER ${compname} _CPACK_IFWCOMP_UNAME)
 
-  set(_IFW_OPT COMMON ESSENTIAL VIRTUAL FORCED_INSTALLATION)
-  set(_IFW_ARGS NAME DISPLAY_NAME DESCRIPTION VERSION RELEASE_DATE SCRIPT PRIORITY DEFAULT)
-  set(_IFW_MULTI_ARGS DEPENDS LICENSES USER_INTERFACES)
+  set(_IFW_OPT COMMON ESSENTIAL VIRTUAL FORCED_INSTALLATION REQUIRES_ADMIN_RIGHTS)
+  set(_IFW_ARGS NAME DISPLAY_NAME DESCRIPTION VERSION RELEASE_DATE SCRIPT PRIORITY SORTING_PRIORITY UPDATE_TEXT DEFAULT)
+  set(_IFW_MULTI_ARGS DEPENDS DEPENDENCIES AUTO_DEPEND_ON LICENSES USER_INTERFACES TRANSLATIONS)
   cmake_parse_arguments(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME} "${_IFW_OPT}" "${_IFW_ARGS}" "${_IFW_MULTI_ARGS}" ${ARGN})
 
   _cpack_ifw_resolve_script(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_SCRIPT)
   _cpack_ifw_resolve_lisenses(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_LICENSES)
   _cpack_ifw_resolve_file_list(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_USER_INTERFACES)
+  _cpack_ifw_resolve_file_list(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_TRANSLATIONS)
 
   set(_CPACK_IFWCOMP_STR "\n# Configuration for IFW component \"${compname}\"\n")
 
@@ -751,14 +797,15 @@ macro(cpack_ifw_configure_component_group grpname)
 
   string(TOUPPER ${grpname} _CPACK_IFWGRP_UNAME)
 
-  set(_IFW_OPT VIRTUAL FORCED_INSTALLATION)
-  set(_IFW_ARGS NAME DISPLAY_NAME DESCRIPTION VERSION RELEASE_DATE SCRIPT PRIORITY DEFAULT)
-  set(_IFW_MULTI_ARGS LICENSES USER_INTERFACES)
+  set(_IFW_OPT VIRTUAL FORCED_INSTALLATION REQUIRES_ADMIN_RIGHTS)
+  set(_IFW_ARGS NAME DISPLAY_NAME DESCRIPTION VERSION RELEASE_DATE SCRIPT PRIORITY SORTING_PRIORITY UPDATE_TEXT DEFAULT)
+  set(_IFW_MULTI_ARGS DEPENDS DEPENDENCIES AUTO_DEPEND_ON LICENSES USER_INTERFACES TRANSLATIONS)
   cmake_parse_arguments(CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME} "${_IFW_OPT}" "${_IFW_ARGS}" "${_IFW_MULTI_ARGS}" ${ARGN})
 
   _cpack_ifw_resolve_script(CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME}_SCRIPT)
   _cpack_ifw_resolve_lisenses(CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME}_LICENSES)
   _cpack_ifw_resolve_file_list(CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME}_USER_INTERFACES)
+  _cpack_ifw_resolve_file_list(CPACK_IFW_COMPONENT_GROUP_${_CPACK_IFWGRP_UNAME}_TRANSLATIONS)
 
   set(_CPACK_IFWGRP_STR "\n# Configuration for IFW component group \"${grpname}\"\n")
 
diff --git a/Source/CPack/IFW/cmCPackIFWPackage.cxx b/Source/CPack/IFW/cmCPackIFWPackage.cxx
index c868a14..e23b1b9 100644
--- a/Source/CPack/IFW/cmCPackIFWPackage.cxx
+++ b/Source/CPack/IFW/cmCPackIFWPackage.cxx
@@ -62,6 +62,13 @@ cmCPackIFWPackage::DependenceStruct::DependenceStruct(
   } else if ((pos = dependence.find('>')) != std::string::npos) {
     Compare.Type = CompareGreater;
     Compare.Value = dependence.substr(pos + 1);
+  } else if ((pos = dependence.find('-')) != std::string::npos) {
+    Compare.Type = CompareNone;
+    Compare.Value = dependence.substr(pos + 1);
+  }
+  size_t dashPos = dependence.find('-');
+  if (dashPos != std::string::npos) {
+    pos = dashPos;
   }
   Name = pos == std::string::npos ? dependence : dependence.substr(0, pos);
 }
@@ -74,6 +81,10 @@ std::string cmCPackIFWPackage::DependenceStruct::NameWithCompare() const
 
   std::string result = Name;
 
+  if (Compare.Type != CompareNone || !Compare.Value.empty()) {
+    result += "-";
+  }
+
   if (Compare.Type == CompareLessOrEqual) {
     result += "<=";
   } else if (Compare.Type == CompareGreaterOrEqual) {
@@ -154,11 +165,14 @@ void cmCPackIFWPackage::DefaultConfiguration()
   Script = "";
   Licenses.clear();
   UserInterfaces.clear();
+  Translations.clear();
   SortingPriority = "";
+  UpdateText = "";
   Default = "";
   Essential = "";
   Virtual = "";
   ForcedInstallation = "";
+  RequiresAdminRights = "";
 }
 
 // Defaul configuration (all in one package)
@@ -245,24 +259,6 @@ int cmCPackIFWPackage::ConfigureFromComponent(cmCPackComponent* component)
     }
   }
 
-  // QtIFW dependencies
-  if (const char* option = this->GetOption(prefix + "DEPENDS")) {
-    std::vector<std::string> deps;
-    cmSystemTools::ExpandListArgument(option, deps);
-    for (std::vector<std::string>::iterator dit = deps.begin();
-         dit != deps.end(); ++dit) {
-      DependenceStruct dep(*dit);
-      if (!Generator->Packages.count(dep.Name)) {
-        bool hasDep = Generator->DependentPackages.count(dep.Name) > 0;
-        DependenceStruct& depRef = Generator->DependentPackages[dep.Name];
-        if (!hasDep) {
-          depRef = dep;
-        }
-        AlienDependencies.insert(&depRef);
-      }
-    }
-  }
-
   // Licenses
   if (const char* option = this->GetOption(prefix + "LICENSES")) {
     Licenses.clear();
@@ -280,6 +276,11 @@ int cmCPackIFWPackage::ConfigureFromComponent(cmCPackComponent* component)
   // Priority
   if (const char* option = this->GetOption(prefix + "PRIORITY")) {
     SortingPriority = option;
+    cmCPackLogger(
+      cmCPackLog::LOG_WARNING, "The \"PRIORITY\" option is set "
+        << "for component \"" << component->Name << "\", but there option is "
+        << "deprecated. Please use \"SORTING_PRIORITY\" option instead."
+        << std::endl);
   }
 
   // Default
@@ -352,6 +353,12 @@ int cmCPackIFWPackage::ConfigureFromGroup(cmCPackComponentGroup* group)
   // Priority
   if (const char* option = this->GetOption(prefix + "PRIORITY")) {
     SortingPriority = option;
+    cmCPackLogger(
+      cmCPackLog::LOG_WARNING, "The \"PRIORITY\" option is set "
+        << "for component group \"" << group->Name
+        << "\", but there option is "
+        << "deprecated. Please use \"SORTING_PRIORITY\" option instead."
+        << std::endl);
   }
 
   return ConfigureFromPrefix(prefix);
@@ -420,6 +427,79 @@ int cmCPackIFWPackage::ConfigureFromPrefix(const std::string& prefix)
     ReleaseDate = value;
   }
 
+  // Sorting priority
+  option = prefix + "SORTING_PRIORITY";
+  if (IsSetToEmpty(option)) {
+    SortingPriority.clear();
+  } else if (const char* value = GetOption(option)) {
+    SortingPriority = value;
+  }
+
+  // Update text
+  option = prefix + "UPDATE_TEXT";
+  if (IsSetToEmpty(option)) {
+    UpdateText.clear();
+  } else if (const char* value = GetOption(option)) {
+    UpdateText = value;
+  }
+
+  // Translations
+  option = prefix + "TRANSLATIONS";
+  if (IsSetToEmpty(option)) {
+    Translations.clear();
+  } else if (const char* value = this->GetOption(option)) {
+    Translations.clear();
+    cmSystemTools::ExpandListArgument(value, Translations);
+  }
+
+  // QtIFW dependencies
+  std::vector<std::string> deps;
+  option = prefix + "DEPENDS";
+  if (const char* value = this->GetOption(option)) {
+    cmSystemTools::ExpandListArgument(value, deps);
+  }
+  option = prefix + "DEPENDENCIES";
+  if (const char* value = this->GetOption(option)) {
+    cmSystemTools::ExpandListArgument(value, deps);
+  }
+  for (std::vector<std::string>::iterator dit = deps.begin();
+       dit != deps.end(); ++dit) {
+    DependenceStruct dep(*dit);
+    if (Generator->Packages.count(dep.Name)) {
+      cmCPackIFWPackage& depPkg = Generator->Packages[dep.Name];
+      dep.Name = depPkg.Name;
+    }
+    bool hasDep = Generator->DependentPackages.count(dep.Name) > 0;
+    DependenceStruct& depRef = Generator->DependentPackages[dep.Name];
+    if (!hasDep) {
+      depRef = dep;
+    }
+    AlienDependencies.insert(&depRef);
+  }
+
+  // Automatic dependency on
+  option = prefix + "AUTO_DEPEND_ON";
+  if (IsSetToEmpty(option)) {
+    AlienAutoDependOn.clear();
+  } else if (const char* value = this->GetOption(option)) {
+    std::vector<std::string> depsOn;
+    cmSystemTools::ExpandListArgument(value, depsOn);
+    for (std::vector<std::string>::iterator dit = depsOn.begin();
+         dit != depsOn.end(); ++dit) {
+      DependenceStruct dep(*dit);
+      if (Generator->Packages.count(dep.Name)) {
+        cmCPackIFWPackage& depPkg = Generator->Packages[dep.Name];
+        dep.Name = depPkg.Name;
+      }
+      bool hasDep = Generator->DependentPackages.count(dep.Name) > 0;
+      DependenceStruct& depRef = Generator->DependentPackages[dep.Name];
+      if (!hasDep) {
+        depRef = dep;
+      }
+      AlienAutoDependOn.insert(&depRef);
+    }
+  }
+
   // Visibility
   option = prefix + "VIRTUAL";
   if (IsSetToEmpty(option)) {
@@ -455,6 +535,16 @@ int cmCPackIFWPackage::ConfigureFromPrefix(const std::string& prefix)
     ForcedInstallation = "false";
   }
 
+  // Requires admin rights
+  option = prefix + "REQUIRES_ADMIN_RIGHTS";
+  if (IsSetToEmpty(option)) {
+    RequiresAdminRights.clear();
+  } else if (IsOn(option)) {
+    RequiresAdminRights = "true";
+  } else if (IsSetToOff(option)) {
+    RequiresAdminRights = "false";
+  }
+
   return 1;
 }
 
@@ -481,6 +571,12 @@ void cmCPackIFWPackage::GeneratePackageFile()
 
   xout.Element("DisplayName", DisplayName);
   xout.Element("Description", Description);
+
+  // Update text
+  if (!UpdateText.empty()) {
+    xout.Element("UpdateText", UpdateText);
+  }
+
   xout.Element("Name", Name);
   xout.Element("Version", Version);
 
@@ -515,6 +611,23 @@ void cmCPackIFWPackage::GeneratePackageFile()
     xout.EndElement();
   }
 
+  // Translations (copy to meta dir)
+  std::vector<std::string> translations = Translations;
+  for (size_t i = 0; i < translations.size(); i++) {
+    std::string name = cmSystemTools::GetFilenameName(translations[i]);
+    std::string path = Directory + "/meta/" + name;
+    cmsys::SystemTools::CopyFileIfDifferent(translations[i].data(),
+                                            path.data());
+    translations[i] = name;
+  }
+  if (!translations.empty()) {
+    xout.StartElement("Translations");
+    for (size_t i = 0; i < translations.size(); i++) {
+      xout.Element("Translation", translations[i]);
+    }
+    xout.EndElement();
+  }
+
   // Dependencies
   std::set<DependenceStruct> compDepSet;
   for (std::set<DependenceStruct*>::iterator ait = AlienDependencies.begin();
@@ -538,6 +651,25 @@ void cmCPackIFWPackage::GeneratePackageFile()
     xout.Element("Dependencies", dependencies.str());
   }
 
+  // Automatic dependency on
+  std::set<DependenceStruct> compAutoDepSet;
+  for (std::set<DependenceStruct*>::iterator ait = AlienAutoDependOn.begin();
+       ait != AlienAutoDependOn.end(); ++ait) {
+    compAutoDepSet.insert(*(*ait));
+  }
+  // Write automatic dependency on
+  if (!compAutoDepSet.empty()) {
+    std::ostringstream dependencies;
+    std::set<DependenceStruct>::iterator it = compAutoDepSet.begin();
+    dependencies << it->NameWithCompare();
+    ++it;
+    while (it != compAutoDepSet.end()) {
+      dependencies << "," << it->NameWithCompare();
+      ++it;
+    }
+    xout.Element("AutoDependOn", dependencies.str());
+  }
+
   // Licenses (copy to meta dir)
   std::vector<std::string> licenses = Licenses;
   for (size_t i = 1; i < licenses.size(); i += 2) {
@@ -561,6 +693,10 @@ void cmCPackIFWPackage::GeneratePackageFile()
     xout.Element("ForcedInstallation", ForcedInstallation);
   }
 
+  if (!RequiresAdminRights.empty()) {
+    xout.Element("RequiresAdminRights", RequiresAdminRights);
+  }
+
   if (!Virtual.empty()) {
     xout.Element("Virtual", Virtual);
   } else if (!Default.empty()) {
diff --git a/Source/CPack/IFW/cmCPackIFWPackage.h b/Source/CPack/IFW/cmCPackIFWPackage.h
index 76ed540..bd1d6c5 100644
--- a/Source/CPack/IFW/cmCPackIFWPackage.h
+++ b/Source/CPack/IFW/cmCPackIFWPackage.h
@@ -92,9 +92,15 @@ public:
   /// List of pages to load
   std::vector<std::string> UserInterfaces;
 
+  /// List of translation files to load
+  std::vector<std::string> Translations;
+
   /// Priority of the component in the tree
   std::string SortingPriority;
 
+  /// Description added to the component description
+  std::string UpdateText;
+
   /// Set to true to preselect the component in the installer
   std::string Default;
 
@@ -107,6 +113,9 @@ public:
   /// Determines that the package must always be installed
   std::string ForcedInstallation;
 
+  /// Package needs to be installed with elevated permissions
+  std::string RequiresAdminRights;
+
 public:
   // Internal implementation
 
@@ -139,6 +148,8 @@ public:
   std::set<cmCPackIFWPackage*> Dependencies;
   // Collection of unresolved dependencies
   std::set<DependenceStruct*> AlienDependencies;
+  // Collection of unresolved automatic dependency on
+  std::set<DependenceStruct*> AlienAutoDependOn;
   // Patch to package directory
   std::string Directory;
 

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

Summary of changes:
 Help/release/dev/cpack-ifw-options.rst |   18 +++-
 Modules/CPackIFW.cmake                 |   85 ++++++++++++----
 Source/CPack/IFW/cmCPackIFWPackage.cxx |  172 ++++++++++++++++++++++++++++----
 Source/CPack/IFW/cmCPackIFWPackage.h   |   11 ++
 4 files changed, 247 insertions(+), 39 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 24 16:48:24 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Jan 2017 16:48:24 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2323-gf9f1d9f
Message-ID: <20170124214824.D63C8F636B@public.kitware.com>

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  f9f1d9f2333ca6f76b816c303187abd2ae976e93 (commit)
       via  842491d93681faa0d874bbaf0d31ace78df0ac1f (commit)
      from  972dd56913054eedfc1f8cf39bf47c7132b973c6 (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=f9f1d9f2333ca6f76b816c303187abd2ae976e93
commit f9f1d9f2333ca6f76b816c303187abd2ae976e93
Merge: 972dd56 842491d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 16:48:24 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 16:48:24 2017 -0500

    Merge topic 'determine_id_without_user_specified_flags' into next
    
    842491d9 Revert "CMakeDetermineCompilerId: check with and without user-specified flags"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=842491d93681faa0d874bbaf0d31ace78df0ac1f
commit 842491d93681faa0d874bbaf0d31ace78df0ac1f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 16:48:07 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 24 16:48:07 2017 -0500

    Revert "CMakeDetermineCompilerId: check with and without user-specified flags"
    
    This reverts commit 0256ba65a806b9e9aefa03acec4f39cdcf71f2e4.

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index ae485bf..bb34de5 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -24,21 +24,16 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
 
   # Try building with no extra flags and then try each set
   # of helper flags.  Stop when the compiler is identified.
-  foreach(userflags "${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}" "")
-    foreach(testflags ${CMAKE_${lang}_COMPILER_ID_TEST_FLAGS_FIRST}
-                      ""
-                      ${CMAKE_${lang}_COMPILER_ID_TEST_FLAGS})
-      CMAKE_DETERMINE_COMPILER_ID_BUILD("${lang}" "${testflags}" "${userflags}" "${src}")
-      CMAKE_DETERMINE_COMPILER_ID_MATCH_VENDOR("${lang}" "${COMPILER_${lang}_PRODUCED_OUTPUT}")
-      if(CMAKE_${lang}_COMPILER_ID)
-        break()
-      endif()
-      foreach(file ${COMPILER_${lang}_PRODUCED_FILES})
-        CMAKE_DETERMINE_COMPILER_ID_CHECK("${lang}" "${CMAKE_${lang}_COMPILER_ID_DIR}/${file}" "${src}")
-      endforeach()
-      if(CMAKE_${lang}_COMPILER_ID)
-        break()
-      endif()
+  foreach(flags ${CMAKE_${lang}_COMPILER_ID_TEST_FLAGS_FIRST}
+                ""
+                ${CMAKE_${lang}_COMPILER_ID_TEST_FLAGS})
+    CMAKE_DETERMINE_COMPILER_ID_BUILD("${lang}" "${flags}" "${src}")
+    CMAKE_DETERMINE_COMPILER_ID_MATCH_VENDOR("${lang}" "${COMPILER_${lang}_PRODUCED_OUTPUT}")
+    if(CMAKE_${lang}_COMPILER_ID)
+      break()
+    endif()
+    foreach(file ${COMPILER_${lang}_PRODUCED_FILES})
+      CMAKE_DETERMINE_COMPILER_ID_CHECK("${lang}" "${CMAKE_${lang}_COMPILER_ID_DIR}/${file}" "${src}")
     endforeach()
     if(CMAKE_${lang}_COMPILER_ID)
       break()
@@ -47,9 +42,7 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
 
   # If the compiler is still unknown, try to query its vendor.
   if(CMAKE_${lang}_COMPILER AND NOT CMAKE_${lang}_COMPILER_ID)
-    foreach(userflags "${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}" "")
-      CMAKE_DETERMINE_COMPILER_ID_VENDOR(${lang} "${userflags}")
-    endforeach()
+    CMAKE_DETERMINE_COMPILER_ID_VENDOR(${lang})
   endif()
 
   if (COMPILER_QNXNTO AND CMAKE_${lang}_COMPILER_ID STREQUAL "GNU")
@@ -73,9 +66,7 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
   endif()
 
   if(CMAKE_GENERATOR STREQUAL "Ninja" AND MSVC_${lang}_ARCHITECTURE_ID)
-    foreach(userflags "${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}" "")
-      CMAKE_DETERMINE_MSVC_SHOWINCLUDES_PREFIX(${lang} "${userflags}")
-    endforeach()
+    CMAKE_DETERMINE_MSVC_SHOWINCLUDES_PREFIX(${lang})
   else()
     set(CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX "")
   endif()
@@ -136,7 +127,7 @@ endfunction()
 #-----------------------------------------------------------------------------
 # Function to build the compiler id source file and look for output
 # files.
-function(CMAKE_DETERMINE_COMPILER_ID_BUILD lang testflags userflags src)
+function(CMAKE_DETERMINE_COMPILER_ID_BUILD lang testflags src)
   # Create a clean working directory.
   file(REMOVE_RECURSE ${CMAKE_${lang}_COMPILER_ID_DIR})
   file(MAKE_DIRECTORY ${CMAKE_${lang}_COMPILER_ID_DIR})
@@ -146,7 +137,7 @@ function(CMAKE_DETERMINE_COMPILER_ID_BUILD lang testflags userflags src)
   # Construct a description of this test case.
   set(COMPILER_DESCRIPTION
     "Compiler: ${CMAKE_${lang}_COMPILER} ${CMAKE_${lang}_COMPILER_ID_ARG1}
-Build flags: ${userflags}
+Build flags: ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}
 Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
 ")
 
@@ -336,7 +327,7 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
     execute_process(
       COMMAND "${CMAKE_${lang}_COMPILER}"
               ${CMAKE_${lang}_COMPILER_ID_ARG1}
-              ${userflags}
+              ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}
               ${testflags}
               ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
               "${src}"
@@ -624,7 +615,7 @@ endfunction()
 #   set(CMAKE_${lang}_COMPILER_ID_VENDOR_REGEX_${vendor} "Some Vendor Output")
 # We try running the compiler with the flag for each vendor and
 # matching its regular expression in the output.
-function(CMAKE_DETERMINE_COMPILER_ID_VENDOR lang userflags)
+function(CMAKE_DETERMINE_COMPILER_ID_VENDOR lang)
 
   if(NOT CMAKE_${lang}_COMPILER_ID_DIR)
     # We get here when this function is called not from within CMAKE_DETERMINE_COMPILER_ID()
@@ -642,7 +633,7 @@ function(CMAKE_DETERMINE_COMPILER_ID_VENDOR lang userflags)
     execute_process(
       COMMAND "${CMAKE_${lang}_COMPILER}"
       ${CMAKE_${lang}_COMPILER_ID_ARG1}
-      ${userflags}
+      ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}
       ${flags}
       WORKING_DIRECTORY ${CMAKE_${lang}_COMPILER_ID_DIR}
       OUTPUT_VARIABLE output ERROR_VARIABLE output
@@ -670,7 +661,7 @@ function(CMAKE_DETERMINE_COMPILER_ID_VENDOR lang userflags)
   endforeach()
 endfunction()
 
-function(CMAKE_DETERMINE_MSVC_SHOWINCLUDES_PREFIX lang userflags)
+function(CMAKE_DETERMINE_MSVC_SHOWINCLUDES_PREFIX lang)
   # Run this MSVC-compatible compiler to detect what the /showIncludes
   # option displays.  We can use a C source even with the C++ compiler
   # because MSVC-compatible compilers handle both and show the same output.
@@ -680,7 +671,7 @@ function(CMAKE_DETERMINE_MSVC_SHOWINCLUDES_PREFIX lang userflags)
   execute_process(
     COMMAND "${CMAKE_${lang}_COMPILER}"
             ${CMAKE_${lang}_COMPILER_ID_ARG1}
-            ${userflags}
+            ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}
             /nologo /showIncludes /c main.c
     WORKING_DIRECTORY ${showdir}
     OUTPUT_VARIABLE out

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

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |   47 +++++++++++++-------------------
 1 file changed, 19 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Wed Jan 25 00:01:07 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Wed, 25 Jan 2017 00:01:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1167-ga007f15
Message-ID: <20170125050107.F39CCFA3AA@public.kitware.com>

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  a007f15344007a6261209a409c6988b0e4c4b7e0 (commit)
      from  3270f763b28195de83c8b762dba5fb366b714b30 (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=a007f15344007a6261209a409c6988b0e4c4b7e0
commit a007f15344007a6261209a409c6988b0e4c4b7e0
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Wed Jan 25 00:01:05 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jan 25 00:01:05 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 8e6ca1a..7624680 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 20170124)
+set(CMake_VERSION_PATCH 20170125)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 25 08:41:17 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Jan 2017 08:41:17 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1169-g9006ec1
Message-ID: <20170125134117.68F26F2672@public.kitware.com>

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  9006ec1d9b7d738f690c32d673443b8851887f16 (commit)
       via  df3353d1f9b4cebc46018fd8fb6c601d038747c1 (commit)
      from  a007f15344007a6261209a409c6988b0e4c4b7e0 (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=9006ec1d9b7d738f690c32d673443b8851887f16
commit 9006ec1d9b7d738f690c32d673443b8851887f16
Merge: a007f15 df3353d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 25 08:41:15 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 08:41:15 2017 -0500

    Merge topic 'cuda_linker_preference'
    
    df3353d1 CUDA: set linker preference between C and C++


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 25 08:41:20 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Jan 2017 08:41:20 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1171-g4f37987
Message-ID: <20170125134121.11021F4713@public.kitware.com>

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  4f37987e3fd72b957d45e741e6ee70ccf42b167d (commit)
       via  0618ddf6b1da3a886f12b6ad2b19da49b2f87e28 (commit)
      from  9006ec1d9b7d738f690c32d673443b8851887f16 (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=4f37987e3fd72b957d45e741e6ee70ccf42b167d
commit 4f37987e3fd72b957d45e741e6ee70ccf42b167d
Merge: 9006ec1 0618ddf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 25 08:41:18 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 08:41:18 2017 -0500

    Merge topic 'lang_lint'
    
    0618ddf6 Add properties to run the cpplint style checker with the compiler


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

Summary of changes:
 Auxiliary/vim/syntax/cmake.vim                     |    4 +-
 Help/manual/cmake-properties.7.rst                 |    1 +
 Help/manual/cmake-variables.7.rst                  |    1 +
 Help/prop_tgt/LANG_CPPLINT.rst                     |   13 ++++++
 Help/release/dev/add-LANG_CPPLINT.rst              |    8 ++++
 Help/variable/CMAKE_LANG_CPPLINT.rst               |    6 +++
 Source/cmMakefileTargetGenerator.cxx               |   10 ++++-
 Source/cmNinjaTargetGenerator.cxx                  |   10 ++++-
 Source/cmTarget.cxx                                |    2 +
 Source/cmcmd.cxx                                   |   42 +++++++++++++++++---
 Tests/RunCMake/CMakeLists.txt                      |    2 +
 .../CommandLine/E___run_iwyu-no-iwyu-stderr.txt    |    2 +-
 Tests/RunCMake/Cpplint/C-Build-stdout.txt          |    1 +
 .../C-error-Build-result.txt}                      |    0
 Tests/RunCMake/Cpplint/C-error-Build-stdout.txt    |    1 +
 .../C-error-launch-Build-result.txt}               |    0
 .../Cpplint/C-error-launch-Build-stdout.txt        |    1 +
 Tests/RunCMake/Cpplint/C-error-launch.cmake        |    3 ++
 Tests/RunCMake/Cpplint/C-error.cmake               |    3 ++
 Tests/RunCMake/Cpplint/C-launch-Build-stdout.txt   |    1 +
 .../RunCMake/{ClangTidy => Cpplint}/C-launch.cmake |    0
 Tests/RunCMake/Cpplint/C.cmake                     |    3 ++
 .../{execute_process => Cpplint}/CMakeLists.txt    |    0
 Tests/RunCMake/Cpplint/CXX-Build-stdout.txt        |    1 +
 .../CXX-error-Build-result.txt}                    |    0
 Tests/RunCMake/Cpplint/CXX-error-Build-stdout.txt  |    1 +
 .../CXX-error-launch-Build-result.txt}             |    0
 .../Cpplint/CXX-error-launch-Build-stdout.txt      |    1 +
 Tests/RunCMake/Cpplint/CXX-error-launch.cmake      |    3 ++
 Tests/RunCMake/Cpplint/CXX-error.cmake             |    3 ++
 Tests/RunCMake/Cpplint/CXX-launch-Build-stdout.txt |    1 +
 .../{ClangTidy => Cpplint}/CXX-launch.cmake        |    0
 Tests/RunCMake/Cpplint/CXX.cmake                   |    3 ++
 Tests/RunCMake/Cpplint/RunCMakeTest.cmake          |   26 ++++++++++++
 .../LinkInterfaceLoop => RunCMake/Cpplint}/main.c  |    0
 Tests/RunCMake/{ClangTidy => Cpplint}/main.cxx     |    0
 Tests/RunCMake/pseudo_cpplint.c                    |   21 ++++++++++
 37 files changed, 164 insertions(+), 10 deletions(-)
 create mode 100644 Help/prop_tgt/LANG_CPPLINT.rst
 create mode 100644 Help/release/dev/add-LANG_CPPLINT.rst
 create mode 100644 Help/variable/CMAKE_LANG_CPPLINT.rst
 create mode 100644 Tests/RunCMake/Cpplint/C-Build-stdout.txt
 copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => Cpplint/C-error-Build-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Cpplint/C-error-Build-stdout.txt
 copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => Cpplint/C-error-launch-Build-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Cpplint/C-error-launch-Build-stdout.txt
 create mode 100644 Tests/RunCMake/Cpplint/C-error-launch.cmake
 create mode 100644 Tests/RunCMake/Cpplint/C-error.cmake
 create mode 100644 Tests/RunCMake/Cpplint/C-launch-Build-stdout.txt
 copy Tests/RunCMake/{ClangTidy => Cpplint}/C-launch.cmake (100%)
 create mode 100644 Tests/RunCMake/Cpplint/C.cmake
 copy Tests/RunCMake/{execute_process => Cpplint}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/Cpplint/CXX-Build-stdout.txt
 copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => Cpplint/CXX-error-Build-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Cpplint/CXX-error-Build-stdout.txt
 copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => Cpplint/CXX-error-launch-Build-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Cpplint/CXX-error-launch-Build-stdout.txt
 create mode 100644 Tests/RunCMake/Cpplint/CXX-error-launch.cmake
 create mode 100644 Tests/RunCMake/Cpplint/CXX-error.cmake
 create mode 100644 Tests/RunCMake/Cpplint/CXX-launch-Build-stdout.txt
 copy Tests/RunCMake/{ClangTidy => Cpplint}/CXX-launch.cmake (100%)
 create mode 100644 Tests/RunCMake/Cpplint/CXX.cmake
 create mode 100644 Tests/RunCMake/Cpplint/RunCMakeTest.cmake
 copy Tests/{CMakeOnly/LinkInterfaceLoop => RunCMake/Cpplint}/main.c (100%)
 copy Tests/RunCMake/{ClangTidy => Cpplint}/main.cxx (100%)
 create mode 100644 Tests/RunCMake/pseudo_cpplint.c


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 25 08:41:23 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Jan 2017 08:41:23 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1174-g54790e7
Message-ID: <20170125134123.BD7F6F35DA@public.kitware.com>

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  54790e77d7401cc50fd6dce584aa00985aa94ac5 (commit)
       via  e116f2a5de330ca4dd413e29db62ed39805b2c06 (commit)
       via  522e1588ec7bfdbc86199cc1991e706ebafc02fd (commit)
      from  4f37987e3fd72b957d45e741e6ee70ccf42b167d (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=54790e77d7401cc50fd6dce584aa00985aa94ac5
commit 54790e77d7401cc50fd6dce584aa00985aa94ac5
Merge: 4f37987 e116f2a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 25 08:41:21 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 08:41:21 2017 -0500

    Merge topic 'sanitizer-options'
    
    e116f2a5 ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty
    522e1588 Tests: Use CTEST_MEMORYCHECK_SANITIZER_OPTIONS where appropriate


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

Summary of changes:
 Source/CTest/cmCTestMemCheckHandler.cxx                    |   12 +++++++++---
 Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake           |    4 ++--
 .../RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake |    2 +-
 Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake   |    2 +-
 Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake      |    2 +-
 Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake    |    4 ++--
 Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake    |    4 ++--
 .../ctest_memcheck/testUndefinedBehaviorSanitizer.cmake    |    6 +++---
 8 files changed, 21 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 25 08:41:26 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Jan 2017 08:41:26 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1176-gc0ca687
Message-ID: <20170125134126.22276F39DE@public.kitware.com>

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  c0ca687a1b8c27f767dd32ad7660a3fde84bbc82 (commit)
       via  e5089c562cdb516bb2a502754788864390c429be (commit)
      from  54790e77d7401cc50fd6dce584aa00985aa94ac5 (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=c0ca687a1b8c27f767dd32ad7660a3fde84bbc82
commit c0ca687a1b8c27f767dd32ad7660a3fde84bbc82
Merge: 54790e7 e5089c5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 25 08:41:24 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 08:41:24 2017 -0500

    Merge topic 'cpack-ifw-options'
    
    e5089c56 CPackIFW: Add some options


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

Summary of changes:
 Help/release/dev/cpack-ifw-options.rst |   18 +++-
 Modules/CPackIFW.cmake                 |   85 ++++++++++++----
 Source/CPack/IFW/cmCPackIFWPackage.cxx |  172 ++++++++++++++++++++++++++++----
 Source/CPack/IFW/cmCPackIFWPackage.h   |   11 ++
 4 files changed, 247 insertions(+), 39 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 25 08:41:28 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Jan 2017 08:41:28 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1179-gb4efd34
Message-ID: <20170125134128.924E6F4599@public.kitware.com>

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  b4efd34d798317930d2e9af907fb3123999c450b (commit)
       via  e6eaf25c3a74c6d075178e309cb0eea8d894698a (commit)
       via  39bf93c897626130177d57e6813cbe46b35c4972 (commit)
      from  c0ca687a1b8c27f767dd32ad7660a3fde84bbc82 (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=b4efd34d798317930d2e9af907fb3123999c450b
commit b4efd34d798317930d2e9af907fb3123999c450b
Merge: c0ca687 e6eaf25
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 25 08:41:26 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 08:41:26 2017 -0500

    Merge topic 'intel-mpi-windows-fix'
    
    e6eaf25c FindMPI: Strip quotes from include path and convert to CMake path format
    39bf93c8 FindMPI: Add Intel MPI wrapper names on Windows


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

Summary of changes:
 Modules/FindMPI.cmake |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 25 08:41:30 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Jan 2017 08:41:30 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1185-g014365e
Message-ID: <20170125134130.D2E3CF2672@public.kitware.com>

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  014365ea97848654cc9493225399528f8b7b15b7 (commit)
       via  eb86b4cec14df4a51cca9f178e8e758b97be11b7 (commit)
       via  178c897374718c2b7cfa76f5c016f23658d5d2b2 (commit)
       via  3bb4a798268669ca1364040abb3cfdf4a44c2f92 (commit)
       via  60b68304f25088db12112c47a4599e4fef405429 (commit)
       via  1731b90cd0b8c1c0da2f485a9b43006bb2174150 (commit)
      from  b4efd34d798317930d2e9af907fb3123999c450b (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=014365ea97848654cc9493225399528f8b7b15b7
commit 014365ea97848654cc9493225399528f8b7b15b7
Merge: b4efd34 eb86b4c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 25 08:41:29 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 08:41:29 2017 -0500

    Merge topic 'testdriver-cleanup'
    
    eb86b4ce TestDriver: fix/silence clang-tidy warnings
    178c8973 TestDriver: calc NumTests at compile time
    3bb4a798 TestDriver: use for loop
    60b68304 TestDriver: abstract CM_CAST macro
    1731b90c TestDriver: Revise C++ coding style using clang-format


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

Summary of changes:
 Templates/TestDriver.cxx.in |  146 +++++++++++++++++--------------------------
 1 file changed, 58 insertions(+), 88 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 25 08:42:01 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Jan 2017 08:42:01 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2331-g3fcca61
Message-ID: <20170125134201.CCD67F38A4@public.kitware.com>

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  3fcca6156371952688785ac354d0d4f6276400ed (commit)
       via  014365ea97848654cc9493225399528f8b7b15b7 (commit)
       via  b4efd34d798317930d2e9af907fb3123999c450b (commit)
       via  c0ca687a1b8c27f767dd32ad7660a3fde84bbc82 (commit)
       via  54790e77d7401cc50fd6dce584aa00985aa94ac5 (commit)
       via  4f37987e3fd72b957d45e741e6ee70ccf42b167d (commit)
       via  9006ec1d9b7d738f690c32d673443b8851887f16 (commit)
       via  a007f15344007a6261209a409c6988b0e4c4b7e0 (commit)
      from  f9f1d9f2333ca6f76b816c303187abd2ae976e93 (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=3fcca6156371952688785ac354d0d4f6276400ed
commit 3fcca6156371952688785ac354d0d4f6276400ed
Merge: f9f1d9f 014365e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 25 08:41:37 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 25 08:41:37 2017 -0500

    Merge branch 'master' into next


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 25 09:01:12 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Jan 2017 09:01:12 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2333-g7b9ff03
Message-ID: <20170125140112.6711BFA4C2@public.kitware.com>

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  7b9ff037836da0342d173be8d74ecc44e31640db (commit)
       via  796dea67a68be432f98e2fef50059c93106557a2 (commit)
      from  3fcca6156371952688785ac354d0d4f6276400ed (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=7b9ff037836da0342d173be8d74ecc44e31640db
commit 7b9ff037836da0342d173be8d74ecc44e31640db
Merge: 3fcca61 796dea6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 25 09:01:11 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 09:01:11 2017 -0500

    Merge topic 'pkg-config-recheck' into next
    
    796dea67 FindPkgConfig: Recheck pkg-config on parameter change.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=796dea67a68be432f98e2fef50059c93106557a2
commit 796dea67a68be432f98e2fef50059c93106557a2
Author:     Matthew Hanna <mhanna21 at bloomberg.net>
AuthorDate: Tue Jan 17 16:15:18 2017 -0500
Commit:     Matthew Hanna <mhanna21 at bloomberg.net>
CommitDate: Tue Jan 24 22:02:14 2017 -0500

    FindPkgConfig: Recheck pkg-config on parameter change.
    
    Currently, once pkg_check_modules succeeds, it will never call
    _pkg_check_modules_internal again.  That means that if the parameters
    to pkg_check_modules are changed, cmake will be called to reconfigure,
    but nothing will change.  This change is to store the full string of
    arguments to pkg_check_modules and override the FOUND optimization so
    that the arguments are reevaluated when modified.

diff --git a/Help/release/dev/pkg-config-recheck.rst b/Help/release/dev/pkg-config-recheck.rst
new file mode 100644
index 0000000..950c3c8
--- /dev/null
+++ b/Help/release/dev/pkg-config-recheck.rst
@@ -0,0 +1,7 @@
+pkg-config-recheck
+------------------
+
+* Calls to the :module:`FindPkgConfig` module :command:`pkg_check_modules`
+  command following a successful call learned to re-evaluate the cached values
+  for a given prefix after changes to the parameters to the command for that
+  prefix.
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 8b7131b..1958f4b 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -585,10 +585,13 @@ endmacro()
 macro(pkg_check_modules _prefix _module0)
   _pkgconfig_parse_options(_pkg_modules _pkg_is_required _pkg_is_silent _no_cmake_path _no_cmake_environment_path _imp_target "${_module0}" ${ARGN})
   # check cached value
-  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
+  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND OR NOT "${__pkg_config_arguments_${_prefix}}" STREQUAL "${_module0};${ARGN}")
     _pkg_check_modules_internal("${_pkg_is_required}" "${_pkg_is_silent}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} "${_prefix}" ${_pkg_modules})
 
     _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
+    if (${_prefix}_FOUND)
+      _pkgconfig_set(__pkg_config_arguments_${_prefix} "${_module0};${ARGN}")
+    endif()
   elseif (${_prefix}_FOUND AND ${_imp_target})
     _pkg_create_imp_target("${_prefix}" _no_cmake_path _no_cmake_environment_path)
   endif()

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

Summary of changes:
 Help/release/dev/pkg-config-recheck.rst |    7 +++++++
 Modules/FindPkgConfig.cmake             |    5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/pkg-config-recheck.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 25 09:13:35 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Jan 2017 09:13:35 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2336-gb022eb9
Message-ID: <20170125141335.787EDF9503@public.kitware.com>

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  b022eb947f75b36ddaf3ec4aeffac56025e19ed0 (commit)
       via  4bc2c16b5d01a66c00100171ad083e9ab5a6506c (commit)
       via  9702b3eefd2baccd24eea9779e17da8fc143fa4c (commit)
      from  7b9ff037836da0342d173be8d74ecc44e31640db (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=b022eb947f75b36ddaf3ec4aeffac56025e19ed0
commit b022eb947f75b36ddaf3ec4aeffac56025e19ed0
Merge: 7b9ff03 4bc2c16
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 25 09:13:34 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 09:13:34 2017 -0500

    Merge topic 'FindGTK2_RunTwice' into next
    
    4bc2c16b FindGTK2: Add unit test to check variables when run twice
    9702b3ee FindGTK2: Fix GTK2_LIBRARIES and GTK2_TARGETS when called twice


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4bc2c16b5d01a66c00100171ad083e9ab5a6506c
commit 4bc2c16b5d01a66c00100171ad083e9ab5a6506c
Author:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
AuthorDate: Wed Jan 25 10:19:00 2017 +0100
Commit:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
CommitDate: Wed Jan 25 10:20:35 2017 +0100

    FindGTK2: Add unit test to check variables when run twice

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index a43e47b..6145615 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -255,6 +255,11 @@ if(PKG_CONFIG_FOUND)
   add_RunCMake_test(FindPkgConfig)
 endif()
 
+find_package(GTK2 QUIET)
+if (GTK2_FOUND)
+  add_RunCMake_test(FindGTK2)
+endif()
+
 if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
   add_RunCMake_test(include_external_msproject)
   if("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([789]|10)" AND NOT CMAKE_VS_DEVENV_COMMAND)
diff --git a/Tests/RunCMake/FindGTK2/CMakeLists.txt b/Tests/RunCMake/FindGTK2/CMakeLists.txt
new file mode 100644
index 0000000..93ee9df
--- /dev/null
+++ b/Tests/RunCMake/FindGTK2/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.5)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/FindGTK2/FindGTK2RunTwice.cmake b/Tests/RunCMake/FindGTK2/FindGTK2RunTwice.cmake
new file mode 100644
index 0000000..e0585ee
--- /dev/null
+++ b/Tests/RunCMake/FindGTK2/FindGTK2RunTwice.cmake
@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 3.7)
+project(testFindGTK2 C)
+
+# First call
+find_package(GTK2 REQUIRED)
+
+# Backup variables
+set(GTK2_LIBRARIES_BAK ${GTK2_LIBRARIES})
+set(GTK2_TARGETS_BAK ${GTK2_TARGETS})
+
+# Second call
+find_package(GTK2 REQUIRED)
+
+# Check variables
+if(NOT "${GTK2_LIBRARIES_BAK}" STREQUAL "${GTK2_LIBRARIES}")
+  message(SEND_ERROR "GTK2_LIBRARIES is different:\nbefore: ${GTK2_LIBRARIES_BAK}\nafter:  ${GTK2_LIBRARIES}")
+endif()
+
+if(NOT "${GTK2_TARGETS_BAK}" STREQUAL "${GTK2_TARGETS}")
+  message(SEND_ERROR "GTK2_TARGETS is different:\nbefore: ${GTK2_TARGETS_BAK}\nafter:  ${GTK2_TARGETS}")
+endif()
diff --git a/Tests/RunCMake/FindGTK2/RunCMakeTest.cmake b/Tests/RunCMake/FindGTK2/RunCMakeTest.cmake
new file mode 100644
index 0000000..66364ca
--- /dev/null
+++ b/Tests/RunCMake/FindGTK2/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(FindGTK2RunTwice)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9702b3eefd2baccd24eea9779e17da8fc143fa4c
commit 9702b3eefd2baccd24eea9779e17da8fc143fa4c
Author:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
AuthorDate: Wed Jan 25 10:05:28 2017 +0100
Commit:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
CommitDate: Wed Jan 25 10:20:30 2017 +0100

    FindGTK2: Fix GTK2_LIBRARIES and GTK2_TARGETS when called twice
    
    Closes: #16582

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index e1b22b6..6747be5 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -529,52 +529,54 @@ function(_GTK2_ADD_TARGET _var)
 
     cmake_parse_arguments(_${_var} "" "" "GTK2_DEPENDS;GTK2_OPTIONAL_DEPENDS;OPTIONAL_INCLUDES" ${ARGN})
 
-    if(GTK2_${_var}_FOUND AND NOT TARGET GTK2::${_basename})
-        # Do not create the target if dependencies are missing
-        foreach(_dep ${_${_var}_GTK2_DEPENDS})
-            if(NOT TARGET GTK2::${_dep})
-                return()
-            endif()
-        endforeach()
+    if(GTK2_${_var}_FOUND)
+        if(NOT TARGET GTK2::${_basename})
+            # Do not create the target if dependencies are missing
+            foreach(_dep ${_${_var}_GTK2_DEPENDS})
+                if(NOT TARGET GTK2::${_dep})
+                    return()
+                endif()
+            endforeach()
 
-        add_library(GTK2::${_basename} UNKNOWN IMPORTED)
+            add_library(GTK2::${_basename} UNKNOWN IMPORTED)
 
-        set(GTK2_TARGETS ${GTK2_TARGETS} GTK2::${_basename})
-        set(GTK2_TARGETS ${GTK2_TARGETS} PARENT_SCOPE)
+            if(GTK2_${_var}_LIBRARY_RELEASE)
+                set_property(TARGET GTK2::${_basename} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+                set_property(TARGET GTK2::${_basename}        PROPERTY IMPORTED_LOCATION_RELEASE "${GTK2_${_var}_LIBRARY_RELEASE}" )
+            endif()
 
-        if(GTK2_${_var}_LIBRARY_RELEASE)
-            set_property(TARGET GTK2::${_basename} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-            set_property(TARGET GTK2::${_basename}        PROPERTY IMPORTED_LOCATION_RELEASE "${GTK2_${_var}_LIBRARY_RELEASE}" )
-        endif()
+            if(GTK2_${_var}_LIBRARY_DEBUG)
+                set_property(TARGET GTK2::${_basename} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+                set_property(TARGET GTK2::${_basename}        PROPERTY IMPORTED_LOCATION_DEBUG "${GTK2_${_var}_LIBRARY_DEBUG}" )
+            endif()
 
-        if(GTK2_${_var}_LIBRARY_DEBUG)
-            set_property(TARGET GTK2::${_basename} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-            set_property(TARGET GTK2::${_basename}        PROPERTY IMPORTED_LOCATION_DEBUG "${GTK2_${_var}_LIBRARY_DEBUG}" )
-        endif()
+            if(GTK2_${_var}_INCLUDE_DIR)
+                set_property(TARGET GTK2::${_basename} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${GTK2_${_var}_INCLUDE_DIR}")
+            endif()
 
-        if(GTK2_${_var}_INCLUDE_DIR)
-            set_property(TARGET GTK2::${_basename} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${GTK2_${_var}_INCLUDE_DIR}")
-        endif()
+            if(GTK2_${_var}CONFIG_INCLUDE_DIR AND NOT "x${GTK2_${_var}CONFIG_INCLUDE_DIR}" STREQUAL "x${GTK2_${_var}_INCLUDE_DIR}")
+                set_property(TARGET GTK2::${_basename} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${GTK2_${_var}CONFIG_INCLUDE_DIR}")
+            endif()
 
-        if(GTK2_${_var}CONFIG_INCLUDE_DIR AND NOT "x${GTK2_${_var}CONFIG_INCLUDE_DIR}" STREQUAL "x${GTK2_${_var}_INCLUDE_DIR}")
-            set_property(TARGET GTK2::${_basename} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${GTK2_${_var}CONFIG_INCLUDE_DIR}")
-        endif()
+            if(GTK2_DEFINITIONS)
+                set_property(TARGET GTK2::${_basename} PROPERTY INTERFACE_COMPILE_DEFINITIONS "${GTK2_DEFINITIONS}")
+            endif()
 
-        if(GTK2_DEFINITIONS)
-            set_property(TARGET GTK2::${_basename} PROPERTY INTERFACE_COMPILE_DEFINITIONS "${GTK2_DEFINITIONS}")
-        endif()
+            if(_${_var}_GTK2_DEPENDS)
+                _GTK2_ADD_TARGET_DEPENDS(${_var} ${_${_var}_GTK2_DEPENDS} ${_${_var}_GTK2_OPTIONAL_DEPENDS})
+            endif()
 
-        if(_${_var}_GTK2_DEPENDS)
-            _GTK2_ADD_TARGET_DEPENDS(${_var} ${_${_var}_GTK2_DEPENDS} ${_${_var}_GTK2_OPTIONAL_DEPENDS})
+            if(_${_var}_OPTIONAL_INCLUDES)
+                foreach(_D ${_${_var}_OPTIONAL_INCLUDES})
+                    if(_D)
+                        _GTK2_ADD_TARGET_INCLUDE_DIRS(${_var} ${_D})
+                    endif()
+                endforeach()
+            endif()
         endif()
 
-        if(_${_var}_OPTIONAL_INCLUDES)
-            foreach(_D ${_${_var}_OPTIONAL_INCLUDES})
-                if(_D)
-                    _GTK2_ADD_TARGET_INCLUDE_DIRS(${_var} ${_D})
-                endif()
-            endforeach()
-        endif()
+        set(GTK2_TARGETS ${GTK2_TARGETS} GTK2::${_basename})
+        set(GTK2_TARGETS ${GTK2_TARGETS} PARENT_SCOPE)
 
         if(GTK2_USE_IMPORTED_TARGETS)
             set(GTK2_${_var}_LIBRARY GTK2::${_basename} PARENT_SCOPE)
@@ -735,9 +737,7 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
             if(APPLE)
                 _GTK2_FIND_LIBRARY    (GDK gdk-quartz false true)
             endif()
-            if(NOT GTK2_GDK_FOUND)
-                _GTK2_FIND_LIBRARY    (GDK gdk-x11 false true)
-            endif()
+            _GTK2_FIND_LIBRARY    (GDK gdk-x11 false true)
         else()
             _GTK2_FIND_LIBRARY    (GDK gdk-win32 false true)
         endif()
@@ -749,9 +749,7 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
             if(APPLE)
                 _GTK2_FIND_LIBRARY    (GTK gtk-quartz false true)
             endif()
-            if(NOT GTK2_GTK_FOUND)
-                _GTK2_FIND_LIBRARY    (GTK gtk-x11 false true)
-            endif()
+            _GTK2_FIND_LIBRARY    (GTK gtk-x11 false true)
         else()
             _GTK2_FIND_LIBRARY    (GTK gtk-win32 false true)
         endif()

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

Summary of changes:
 Modules/FindGTK2.cmake                             |   82 ++++++++++----------
 Tests/RunCMake/CMakeLists.txt                      |    5 ++
 .../{ClangTidy => FindGTK2}/CMakeLists.txt         |    0
 Tests/RunCMake/FindGTK2/FindGTK2RunTwice.cmake     |   21 +++++
 Tests/RunCMake/FindGTK2/RunCMakeTest.cmake         |    3 +
 5 files changed, 69 insertions(+), 42 deletions(-)
 copy Tests/RunCMake/{ClangTidy => FindGTK2}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/FindGTK2/FindGTK2RunTwice.cmake
 create mode 100644 Tests/RunCMake/FindGTK2/RunCMakeTest.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 25 10:32:30 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Jan 2017 10:32:30 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2338-g203112a
Message-ID: <20170125153230.7CFECFA510@public.kitware.com>

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  203112a512053157b7931ba0d92573e1a1bf86ba (commit)
       via  c1f3086de70793ee5552986347291d814b796232 (commit)
      from  b022eb947f75b36ddaf3ec4aeffac56025e19ed0 (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=203112a512053157b7931ba0d92573e1a1bf86ba
commit 203112a512053157b7931ba0d92573e1a1bf86ba
Merge: b022eb9 c1f3086
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 25 10:32:29 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 10:32:29 2017 -0500

    Merge topic 'FindCUDA-select-flags-auto-msvc' into next
    
    c1f3086d FindCUDA: Enable CUDA_SELECT_NVCC_ARCH_FLAGS Auto for MSVC


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1f3086de70793ee5552986347291d814b796232
commit c1f3086de70793ee5552986347291d814b796232
Author:     Bjoern Thiel <bjoern.thiel at mpibpc.mpg.de>
AuthorDate: Wed Jan 25 09:45:18 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 25 10:31:27 2017 -0500

    FindCUDA: Enable CUDA_SELECT_NVCC_ARCH_FLAGS Auto for MSVC
    
    Fixes: #16525

diff --git a/Modules/FindCUDA/select_compute_arch.cmake b/Modules/FindCUDA/select_compute_arch.cmake
index 5ce71a9..19fc14f 100644
--- a/Modules/FindCUDA/select_compute_arch.cmake
+++ b/Modules/FindCUDA/select_compute_arch.cmake
@@ -44,9 +44,10 @@ endif ()
 #
 function(CUDA_DETECT_INSTALLED_GPUS OUT_VARIABLE)
   if(NOT CUDA_GPU_DETECT_OUTPUT)
-    set(cufile ${PROJECT_BINARY_DIR}/detect_cuda_archs.cu)
+    set(file ${PROJECT_BINARY_DIR}/detect_cuda_compute_capabilities.cpp)
 
-    file(WRITE ${cufile} ""
+    file(WRITE ${file} ""
+      "#include <cuda_runtime.h>\n"
       "#include <cstdio>\n"
       "int main()\n"
       "{\n"
@@ -62,14 +63,15 @@ function(CUDA_DETECT_INSTALLED_GPUS OUT_VARIABLE)
       "  return 0;\n"
       "}\n")
 
-    execute_process(COMMAND "${CUDA_NVCC_EXECUTABLE}" "--run" "${cufile}"
-                    WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/CMakeFiles/"
-                    RESULT_VARIABLE nvcc_res OUTPUT_VARIABLE nvcc_out
-                    ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    try_run(run_result compile_result ${PROJECT_BINARY_DIR} ${file}
+            CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${CUDA_INCLUDE_DIRS}"
+            LINK_LIBRARIES ${CUDA_LIBRARIES}
+            RUN_OUTPUT_VARIABLE compute_capabilities)
 
-    if(nvcc_res EQUAL 0)
-      string(REPLACE "2.1" "2.1(2.0)" nvcc_out "${nvcc_out}")
-      set(CUDA_GPU_DETECT_OUTPUT ${nvcc_out} CACHE INTERNAL "Returned GPU architetures from detect_gpus tool" FORCE)
+    if(run_result EQUAL 0)
+      string(REPLACE "2.1" "2.1(2.0)" compute_capabilities "${compute_capabilities}")
+      set(CUDA_GPU_DETECT_OUTPUT ${compute_capabilities}
+        CACHE INTERNAL "Returned GPU architetures from detect_gpus tool" FORCE)
     endif()
   endif()
 

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

Summary of changes:
 Modules/FindCUDA/select_compute_arch.cmake |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 25 13:40:48 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Jan 2017 13:40:48 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2340-gffd0a35
Message-ID: <20170125184048.35782FA078@public.kitware.com>

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  ffd0a359ca89ce397cd2603166b3370cbcfb25ff (commit)
       via  fc0d4d17232df6f2f2e7a130f25398db37ac4dcb (commit)
      from  203112a512053157b7931ba0d92573e1a1bf86ba (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=ffd0a359ca89ce397cd2603166b3370cbcfb25ff
commit ffd0a359ca89ce397cd2603166b3370cbcfb25ff
Merge: 203112a fc0d4d1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 25 13:40:46 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 13:40:46 2017 -0500

    Merge topic 'topic-reproducible-build' into next
    
    fc0d4d17 cmTimestamp: Support SOURCE_DATE_EPOCH to override current time


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc0d4d17232df6f2f2e7a130f25398db37ac4dcb
commit fc0d4d17232df6f2f2e7a130f25398db37ac4dcb
Author:     Bernhard M. Wiedemann <bwiedemann at suse.de>
AuthorDate: Wed Jan 25 07:15:40 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 25 13:39:02 2017 -0500

    cmTimestamp: Support SOURCE_DATE_EPOCH to override current time
    
    See https://reproducible-builds.org/ for why this is good and
    https://reproducible-builds.org/specs/source-date-epoch/ for the
    definition of this variable.

diff --git a/Help/command/string.rst b/Help/command/string.rst
index 77538f6..2c7847a 100644
--- a/Help/command/string.rst
+++ b/Help/command/string.rst
@@ -329,6 +329,12 @@ If no explicit ``<format string>`` is given it will default to:
 
 Write a string which can be used as an identifier in C.
 
+.. note::
+
+  If the ``SOURCE_DATE_EPOCH`` environment variable is set,
+  its value will be used instead of the current time.
+  See https://reproducible-builds.org/specs/source-date-epoch/ for details.
+
 UUID
 """"
 
diff --git a/Help/release/dev/SOURCE_DATE_EPOCH.rst b/Help/release/dev/SOURCE_DATE_EPOCH.rst
new file mode 100644
index 0000000..576e1da
--- /dev/null
+++ b/Help/release/dev/SOURCE_DATE_EPOCH.rst
@@ -0,0 +1,5 @@
+SOURCE_DATE_EPOCH
+-----------------
+
+* The :command:`string(TIMESTAMP)` will now honor the ``SOURCE_DATE_EPOCH``
+  environment variable and use its value instead of the current time.
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index 4a97114..b61b15d 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -12,6 +12,16 @@ std::string cmTimestamp::CurrentTime(const std::string& formatString,
                                      bool utcFlag)
 {
   time_t currentTimeT = time(CM_NULLPTR);
+  std::string source_date_epoch;
+  cmSystemTools::GetEnv("SOURCE_DATE_EPOCH", source_date_epoch);
+  if (!source_date_epoch.empty()) {
+    std::istringstream iss(source_date_epoch);
+    iss >> currentTimeT;
+    if (iss.fail() || !iss.eof()) {
+      cmSystemTools::Error("Error parsing SOURCE_DATE_EPOCH as int");
+      exit(27);
+    }
+  }
   if (currentTimeT == time_t(-1)) {
     return std::string();
   }
diff --git a/Tests/RunCMake/string/RunCMakeTest.cmake b/Tests/RunCMake/string/RunCMakeTest.cmake
index 8067d9d..38a77b0 100644
--- a/Tests/RunCMake/string/RunCMakeTest.cmake
+++ b/Tests/RunCMake/string/RunCMakeTest.cmake
@@ -6,6 +6,11 @@ run_cmake(AppendNoArgs)
 run_cmake(Concat)
 run_cmake(ConcatNoArgs)
 
+run_cmake(Timestamp)
+run_cmake(TimestampEmpty)
+run_cmake(TimestampInvalid)
+run_cmake(TimestampInvalid2)
+
 run_cmake(Uuid)
 run_cmake(UuidMissingNamespace)
 run_cmake(UuidMissingNamespaceValue)
diff --git a/Tests/RunCMake/string/Timestamp-result.txt b/Tests/RunCMake/string/Timestamp-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/string/Timestamp-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/string/Timestamp-stderr.txt b/Tests/RunCMake/string/Timestamp-stderr.txt
new file mode 100644
index 0000000..10952b2
--- /dev/null
+++ b/Tests/RunCMake/string/Timestamp-stderr.txt
@@ -0,0 +1 @@
+RESULT=2005-08-07 23:19:49
diff --git a/Tests/RunCMake/string/Timestamp.cmake b/Tests/RunCMake/string/Timestamp.cmake
new file mode 100644
index 0000000..b698627
--- /dev/null
+++ b/Tests/RunCMake/string/Timestamp.cmake
@@ -0,0 +1,3 @@
+set(ENV{SOURCE_DATE_EPOCH} "1123456789")
+string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
+message("RESULT=${RESULT}")
diff --git a/Tests/RunCMake/string/TimestampEmpty-result.txt b/Tests/RunCMake/string/TimestampEmpty-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampEmpty-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/string/TimestampEmpty-stderr.txt b/Tests/RunCMake/string/TimestampEmpty-stderr.txt
new file mode 100644
index 0000000..35cbd3c
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampEmpty-stderr.txt
@@ -0,0 +1 @@
+RESULT=2
diff --git a/Tests/RunCMake/string/TimestampEmpty.cmake b/Tests/RunCMake/string/TimestampEmpty.cmake
new file mode 100644
index 0000000..21b770f
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampEmpty.cmake
@@ -0,0 +1,3 @@
+set(ENV{SOURCE_DATE_EPOCH} "")
+string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
+message("RESULT=${RESULT}")
diff --git a/Tests/RunCMake/string/TimestampInvalid-result.txt b/Tests/RunCMake/string/TimestampInvalid-result.txt
new file mode 100644
index 0000000..f64f5d8
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid-result.txt
@@ -0,0 +1 @@
+27
diff --git a/Tests/RunCMake/string/TimestampInvalid-stderr.txt b/Tests/RunCMake/string/TimestampInvalid-stderr.txt
new file mode 100644
index 0000000..f7195c2
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid-stderr.txt
@@ -0,0 +1 @@
+CMake Error: Error parsing SOURCE_DATE_EPOCH as int
diff --git a/Tests/RunCMake/string/TimestampInvalid.cmake b/Tests/RunCMake/string/TimestampInvalid.cmake
new file mode 100644
index 0000000..ab36270
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid.cmake
@@ -0,0 +1,3 @@
+set(ENV{SOURCE_DATE_EPOCH} "invalid-integer")
+string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
+message("RESULT=${RESULT}")
diff --git a/Tests/RunCMake/string/TimestampInvalid2-result.txt b/Tests/RunCMake/string/TimestampInvalid2-result.txt
new file mode 100644
index 0000000..f64f5d8
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid2-result.txt
@@ -0,0 +1 @@
+27
diff --git a/Tests/RunCMake/string/TimestampInvalid2-stderr.txt b/Tests/RunCMake/string/TimestampInvalid2-stderr.txt
new file mode 100644
index 0000000..f7195c2
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid2-stderr.txt
@@ -0,0 +1 @@
+CMake Error: Error parsing SOURCE_DATE_EPOCH as int
diff --git a/Tests/RunCMake/string/TimestampInvalid2.cmake b/Tests/RunCMake/string/TimestampInvalid2.cmake
new file mode 100644
index 0000000..5cc61b8
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid2.cmake
@@ -0,0 +1,3 @@
+set(ENV{SOURCE_DATE_EPOCH} "123trailing-garbage")
+string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
+message("RESULT=${RESULT}")

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

Summary of changes:
 Help/command/string.rst                                      |    6 ++++++
 Help/release/dev/SOURCE_DATE_EPOCH.rst                       |    5 +++++
 Source/cmTimestamp.cxx                                       |   10 ++++++++++
 Tests/RunCMake/string/RunCMakeTest.cmake                     |    5 +++++
 .../Timestamp-result.txt}                                    |    0
 Tests/RunCMake/string/Timestamp-stderr.txt                   |    1 +
 Tests/RunCMake/string/Timestamp.cmake                        |    3 +++
 .../TimestampEmpty-result.txt}                               |    0
 Tests/RunCMake/string/TimestampEmpty-stderr.txt              |    1 +
 Tests/RunCMake/string/TimestampEmpty.cmake                   |    3 +++
 Tests/RunCMake/string/TimestampInvalid-result.txt            |    1 +
 Tests/RunCMake/string/TimestampInvalid-stderr.txt            |    1 +
 Tests/RunCMake/string/TimestampInvalid.cmake                 |    3 +++
 Tests/RunCMake/string/TimestampInvalid2-result.txt           |    1 +
 Tests/RunCMake/string/TimestampInvalid2-stderr.txt           |    1 +
 Tests/RunCMake/string/TimestampInvalid2.cmake                |    3 +++
 16 files changed, 44 insertions(+)
 create mode 100644 Help/release/dev/SOURCE_DATE_EPOCH.rst
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => string/Timestamp-result.txt} (100%)
 create mode 100644 Tests/RunCMake/string/Timestamp-stderr.txt
 create mode 100644 Tests/RunCMake/string/Timestamp.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => string/TimestampEmpty-result.txt} (100%)
 create mode 100644 Tests/RunCMake/string/TimestampEmpty-stderr.txt
 create mode 100644 Tests/RunCMake/string/TimestampEmpty.cmake
 create mode 100644 Tests/RunCMake/string/TimestampInvalid-result.txt
 create mode 100644 Tests/RunCMake/string/TimestampInvalid-stderr.txt
 create mode 100644 Tests/RunCMake/string/TimestampInvalid.cmake
 create mode 100644 Tests/RunCMake/string/TimestampInvalid2-result.txt
 create mode 100644 Tests/RunCMake/string/TimestampInvalid2-stderr.txt
 create mode 100644 Tests/RunCMake/string/TimestampInvalid2.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 25 13:48:33 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Jan 2017 13:48:33 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2342-g1d0ed30
Message-ID: <20170125184833.275A8FA692@public.kitware.com>

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  1d0ed3063e2e9cc918b9fdcf45bbdb3aa6b0ce09 (commit)
       via  2759e22575b9c63f3162a9629c2d8aa6b9d7effa (commit)
      from  ffd0a359ca89ce397cd2603166b3370cbcfb25ff (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=1d0ed3063e2e9cc918b9fdcf45bbdb3aa6b0ce09
commit 1d0ed3063e2e9cc918b9fdcf45bbdb3aa6b0ce09
Merge: ffd0a35 2759e22
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 25 13:48:32 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 13:48:32 2017 -0500

    Merge topic 'FindLua-versioned-lib' into next
    
    2759e225 FindLua: try to find library according to version from header


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2759e22575b9c63f3162a9629c2d8aa6b9d7effa
commit 2759e22575b9c63f3162a9629c2d8aa6b9d7effa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 15:19:34 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 24 15:21:33 2017 -0500

    FindLua: try to find library according to version from header
    
    Patch-by: fft on gitlab.kitware.com
    Issue: #15756

diff --git a/Modules/FindLua.cmake b/Modules/FindLua.cmake
index c777970..b59b9b3 100644
--- a/Modules/FindLua.cmake
+++ b/Modules/FindLua.cmake
@@ -75,16 +75,9 @@ function(_lua_set_version_vars)
              include/lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
              include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
         )
-        list(APPEND _lua_library_names
-             lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
-             lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-             lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-             lua.${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-        )
     endforeach ()
 
     set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE)
-    set(_lua_library_names "${_lua_library_names}" PARENT_SCOPE)
     set(_lua_append_versions "${_lua_append_versions}" PARENT_SCOPE)
 endfunction(_lua_set_version_vars)
 
@@ -152,6 +145,15 @@ endif ()
 unset(_lua_include_subdirs)
 unset(_lua_append_versions)
 
+if (LUA_VERSION_STRING)
+    set(_lua_library_names
+        lua${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR}
+        lua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
+        lua-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
+        lua.${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
+    )
+endif ()
+
 find_library(LUA_LIBRARY
   NAMES ${_lua_library_names} lua
   HINTS

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

Summary of changes:
 Modules/FindLua.cmake |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 25 13:54:40 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Jan 2017 13:54:40 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2344-gc6db873
Message-ID: <20170125185440.9696FFA718@public.kitware.com>

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  c6db87387ee1e5c30b9bc873ad2438db5bd6e43a (commit)
       via  610e3cfb8b490ddd154f3a47d676e03e82dc714a (commit)
      from  1d0ed3063e2e9cc918b9fdcf45bbdb3aa6b0ce09 (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=c6db87387ee1e5c30b9bc873ad2438db5bd6e43a
commit c6db87387ee1e5c30b9bc873ad2438db5bd6e43a
Merge: 1d0ed30 610e3cf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 25 13:54:40 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 13:54:40 2017 -0500

    Merge topic 'topic-reproducible-build' into next
    
    610e3cfb fixup! cmTimestamp: Support SOURCE_DATE_EPOCH to override current time


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=610e3cfb8b490ddd154f3a47d676e03e82dc714a
commit 610e3cfb8b490ddd154f3a47d676e03e82dc714a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 25 13:54:30 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 25 13:54:30 2017 -0500

    fixup! cmTimestamp: Support SOURCE_DATE_EPOCH to override current time

diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index b61b15d..87677ec 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -5,6 +5,7 @@
 #include <cmConfigure.h>
 #include <cstring>
 #include <sstream>
+#include <stdlib.h>
 
 #include "cmSystemTools.h"
 

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

Summary of changes:
 Source/cmTimestamp.cxx |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Jan 25 15:05:36 2017
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Jan 2017 15:05:36 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2346-ge2dadb0
Message-ID: <20170125200536.879F0FA5CC@public.kitware.com>

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  e2dadb0802b1e329d6b1df771ce6bfbe84b08a4b (commit)
       via  ef47272b075a2ad8018481d3fdfb6f2beb514056 (commit)
      from  c6db87387ee1e5c30b9bc873ad2438db5bd6e43a (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=e2dadb0802b1e329d6b1df771ce6bfbe84b08a4b
commit e2dadb0802b1e329d6b1df771ce6bfbe84b08a4b
Merge: c6db873 ef47272
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 25 15:05:35 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 15:05:35 2017 -0500

    Merge topic 'tests_auto_type' into next
    
    ef47272b Tests: use cxx_auto_type only if actually available


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef47272b075a2ad8018481d3fdfb6f2beb514056
commit ef47272b075a2ad8018481d3fdfb6f2beb514056
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 25 21:00:30 2017 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Jan 25 21:00:30 2017 +0100

    Tests: use cxx_auto_type only if actually available
    
    The presence of CMAKE_CXX_COMPILE_FEATURES doesn't mean cxx_auto_type is always
    available.

diff --git a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
index 9b35f27..555a08f 100644
--- a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
@@ -26,7 +26,7 @@ if (CMAKE_C_COMPILE_FEATURES)
   target_link_libraries(restrict_user lib_restrict)
 endif()
 
-if (CMAKE_CXX_COMPILE_FEATURES)
+if (CMAKE_CXX_COMPILE_FEATURES AND ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_auto_type;")
   if (CMAKE_C_COMPILE_FEATURES)
     set(target_suffix _cxx)
   endif()
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 0405def..13aa86e 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -275,7 +275,10 @@ if (CMAKE_CXX_COMPILE_FEATURES)
       )
     endif()
   endif()
+endif ()
 
+# these tests only work if at least cxx_auto_type is available
+if (";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_auto_type;")
   add_executable(CompileFeatures main.cpp)
   set_property(TARGET CompileFeatures
     PROPERTY COMPILE_FEATURES "cxx_auto_type"

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

Summary of changes:
 Tests/CMakeCommands/target_compile_features/CMakeLists.txt |    2 +-
 Tests/CompileFeatures/CMakeLists.txt                       |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Thu Jan 26 00:01:07 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Thu, 26 Jan 2017 00:01:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1186-ga45de72
Message-ID: <20170126050107.EAE58FA369@public.kitware.com>

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  a45de72cc437a13179e933509d524d2088a86002 (commit)
      from  014365ea97848654cc9493225399528f8b7b15b7 (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=a45de72cc437a13179e933509d524d2088a86002
commit a45de72cc437a13179e933509d524d2088a86002
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Thu Jan 26 00:01:04 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jan 26 00:01:04 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 7624680..93f128f 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 20170125)
+set(CMake_VERSION_PATCH 20170126)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 26 10:20:56 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Jan 2017 10:20:56 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2348-g2a1a1cd
Message-ID: <20170126152056.A3FB1F9D89@public.kitware.com>

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  2a1a1cd66b63cac5cf2aff533bec4c35984a115c (commit)
       via  46177cceae13afa80baa87e6d84c17ed45ecb298 (commit)
      from  e2dadb0802b1e329d6b1df771ce6bfbe84b08a4b (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=2a1a1cd66b63cac5cf2aff533bec4c35984a115c
commit 2a1a1cd66b63cac5cf2aff533bec4c35984a115c
Merge: e2dadb0 46177cc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 10:20:55 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 10:20:55 2017 -0500

    Merge topic 'topic-reproducible-build' into next
    
    46177cce Revert topic 'topic-reproducible-build'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46177cceae13afa80baa87e6d84c17ed45ecb298
commit 46177cceae13afa80baa87e6d84c17ed45ecb298
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 10:20:34 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 26 10:20:34 2017 -0500

    Revert topic 'topic-reproducible-build'

diff --git a/Help/command/string.rst b/Help/command/string.rst
index 2c7847a..77538f6 100644
--- a/Help/command/string.rst
+++ b/Help/command/string.rst
@@ -329,12 +329,6 @@ If no explicit ``<format string>`` is given it will default to:
 
 Write a string which can be used as an identifier in C.
 
-.. note::
-
-  If the ``SOURCE_DATE_EPOCH`` environment variable is set,
-  its value will be used instead of the current time.
-  See https://reproducible-builds.org/specs/source-date-epoch/ for details.
-
 UUID
 """"
 
diff --git a/Help/release/dev/SOURCE_DATE_EPOCH.rst b/Help/release/dev/SOURCE_DATE_EPOCH.rst
deleted file mode 100644
index 576e1da..0000000
--- a/Help/release/dev/SOURCE_DATE_EPOCH.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCE_DATE_EPOCH
------------------
-
-* The :command:`string(TIMESTAMP)` will now honor the ``SOURCE_DATE_EPOCH``
-  environment variable and use its value instead of the current time.
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index 87677ec..4a97114 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -5,7 +5,6 @@
 #include <cmConfigure.h>
 #include <cstring>
 #include <sstream>
-#include <stdlib.h>
 
 #include "cmSystemTools.h"
 
@@ -13,16 +12,6 @@ std::string cmTimestamp::CurrentTime(const std::string& formatString,
                                      bool utcFlag)
 {
   time_t currentTimeT = time(CM_NULLPTR);
-  std::string source_date_epoch;
-  cmSystemTools::GetEnv("SOURCE_DATE_EPOCH", source_date_epoch);
-  if (!source_date_epoch.empty()) {
-    std::istringstream iss(source_date_epoch);
-    iss >> currentTimeT;
-    if (iss.fail() || !iss.eof()) {
-      cmSystemTools::Error("Error parsing SOURCE_DATE_EPOCH as int");
-      exit(27);
-    }
-  }
   if (currentTimeT == time_t(-1)) {
     return std::string();
   }
diff --git a/Tests/RunCMake/string/RunCMakeTest.cmake b/Tests/RunCMake/string/RunCMakeTest.cmake
index 38a77b0..8067d9d 100644
--- a/Tests/RunCMake/string/RunCMakeTest.cmake
+++ b/Tests/RunCMake/string/RunCMakeTest.cmake
@@ -6,11 +6,6 @@ run_cmake(AppendNoArgs)
 run_cmake(Concat)
 run_cmake(ConcatNoArgs)
 
-run_cmake(Timestamp)
-run_cmake(TimestampEmpty)
-run_cmake(TimestampInvalid)
-run_cmake(TimestampInvalid2)
-
 run_cmake(Uuid)
 run_cmake(UuidMissingNamespace)
 run_cmake(UuidMissingNamespaceValue)
diff --git a/Tests/RunCMake/string/Timestamp-result.txt b/Tests/RunCMake/string/Timestamp-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/string/Timestamp-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/string/Timestamp-stderr.txt b/Tests/RunCMake/string/Timestamp-stderr.txt
deleted file mode 100644
index 10952b2..0000000
--- a/Tests/RunCMake/string/Timestamp-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-RESULT=2005-08-07 23:19:49
diff --git a/Tests/RunCMake/string/Timestamp.cmake b/Tests/RunCMake/string/Timestamp.cmake
deleted file mode 100644
index b698627..0000000
--- a/Tests/RunCMake/string/Timestamp.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(ENV{SOURCE_DATE_EPOCH} "1123456789")
-string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
-message("RESULT=${RESULT}")
diff --git a/Tests/RunCMake/string/TimestampEmpty-result.txt b/Tests/RunCMake/string/TimestampEmpty-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/string/TimestampEmpty-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/string/TimestampEmpty-stderr.txt b/Tests/RunCMake/string/TimestampEmpty-stderr.txt
deleted file mode 100644
index 35cbd3c..0000000
--- a/Tests/RunCMake/string/TimestampEmpty-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-RESULT=2
diff --git a/Tests/RunCMake/string/TimestampEmpty.cmake b/Tests/RunCMake/string/TimestampEmpty.cmake
deleted file mode 100644
index 21b770f..0000000
--- a/Tests/RunCMake/string/TimestampEmpty.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(ENV{SOURCE_DATE_EPOCH} "")
-string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
-message("RESULT=${RESULT}")
diff --git a/Tests/RunCMake/string/TimestampInvalid-result.txt b/Tests/RunCMake/string/TimestampInvalid-result.txt
deleted file mode 100644
index f64f5d8..0000000
--- a/Tests/RunCMake/string/TimestampInvalid-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-27
diff --git a/Tests/RunCMake/string/TimestampInvalid-stderr.txt b/Tests/RunCMake/string/TimestampInvalid-stderr.txt
deleted file mode 100644
index f7195c2..0000000
--- a/Tests/RunCMake/string/TimestampInvalid-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-CMake Error: Error parsing SOURCE_DATE_EPOCH as int
diff --git a/Tests/RunCMake/string/TimestampInvalid.cmake b/Tests/RunCMake/string/TimestampInvalid.cmake
deleted file mode 100644
index ab36270..0000000
--- a/Tests/RunCMake/string/TimestampInvalid.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(ENV{SOURCE_DATE_EPOCH} "invalid-integer")
-string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
-message("RESULT=${RESULT}")
diff --git a/Tests/RunCMake/string/TimestampInvalid2-result.txt b/Tests/RunCMake/string/TimestampInvalid2-result.txt
deleted file mode 100644
index f64f5d8..0000000
--- a/Tests/RunCMake/string/TimestampInvalid2-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-27
diff --git a/Tests/RunCMake/string/TimestampInvalid2-stderr.txt b/Tests/RunCMake/string/TimestampInvalid2-stderr.txt
deleted file mode 100644
index f7195c2..0000000
--- a/Tests/RunCMake/string/TimestampInvalid2-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-CMake Error: Error parsing SOURCE_DATE_EPOCH as int
diff --git a/Tests/RunCMake/string/TimestampInvalid2.cmake b/Tests/RunCMake/string/TimestampInvalid2.cmake
deleted file mode 100644
index 5cc61b8..0000000
--- a/Tests/RunCMake/string/TimestampInvalid2.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(ENV{SOURCE_DATE_EPOCH} "123trailing-garbage")
-string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
-message("RESULT=${RESULT}")

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

Summary of changes:
 Help/command/string.rst                            |    6 ------
 Help/release/dev/SOURCE_DATE_EPOCH.rst             |    5 -----
 Source/cmTimestamp.cxx                             |   11 -----------
 Tests/RunCMake/string/RunCMakeTest.cmake           |    5 -----
 Tests/RunCMake/string/Timestamp-result.txt         |    1 -
 Tests/RunCMake/string/Timestamp-stderr.txt         |    1 -
 Tests/RunCMake/string/Timestamp.cmake              |    3 ---
 Tests/RunCMake/string/TimestampEmpty-result.txt    |    1 -
 Tests/RunCMake/string/TimestampEmpty-stderr.txt    |    1 -
 Tests/RunCMake/string/TimestampEmpty.cmake         |    3 ---
 Tests/RunCMake/string/TimestampInvalid-result.txt  |    1 -
 Tests/RunCMake/string/TimestampInvalid-stderr.txt  |    1 -
 Tests/RunCMake/string/TimestampInvalid.cmake       |    3 ---
 Tests/RunCMake/string/TimestampInvalid2-result.txt |    1 -
 Tests/RunCMake/string/TimestampInvalid2-stderr.txt |    1 -
 Tests/RunCMake/string/TimestampInvalid2.cmake      |    3 ---
 16 files changed, 47 deletions(-)
 delete mode 100644 Help/release/dev/SOURCE_DATE_EPOCH.rst
 delete mode 100644 Tests/RunCMake/string/Timestamp-result.txt
 delete mode 100644 Tests/RunCMake/string/Timestamp-stderr.txt
 delete mode 100644 Tests/RunCMake/string/Timestamp.cmake
 delete mode 100644 Tests/RunCMake/string/TimestampEmpty-result.txt
 delete mode 100644 Tests/RunCMake/string/TimestampEmpty-stderr.txt
 delete mode 100644 Tests/RunCMake/string/TimestampEmpty.cmake
 delete mode 100644 Tests/RunCMake/string/TimestampInvalid-result.txt
 delete mode 100644 Tests/RunCMake/string/TimestampInvalid-stderr.txt
 delete mode 100644 Tests/RunCMake/string/TimestampInvalid.cmake
 delete mode 100644 Tests/RunCMake/string/TimestampInvalid2-result.txt
 delete mode 100644 Tests/RunCMake/string/TimestampInvalid2-stderr.txt
 delete mode 100644 Tests/RunCMake/string/TimestampInvalid2.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 26 10:24:05 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Jan 2017 10:24:05 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2350-g67c2364
Message-ID: <20170126152405.5FD18F9FE3@public.kitware.com>

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  67c2364394141cecc3aa1f3c065ff25ce71a4efe (commit)
       via  243aed525a2fd8e5fe32139fd0f8d0cc0e40cc33 (commit)
      from  2a1a1cd66b63cac5cf2aff533bec4c35984a115c (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=67c2364394141cecc3aa1f3c065ff25ce71a4efe
commit 67c2364394141cecc3aa1f3c065ff25ce71a4efe
Merge: 2a1a1cd 243aed5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 10:24:03 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 10:24:03 2017 -0500

    Merge topic 'topic-reproducible-build' into next
    
    243aed52 cmTimestamp: Support SOURCE_DATE_EPOCH to override current time


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=243aed525a2fd8e5fe32139fd0f8d0cc0e40cc33
commit 243aed525a2fd8e5fe32139fd0f8d0cc0e40cc33
Author:     Bernhard M. Wiedemann <bwiedemann at suse.de>
AuthorDate: Wed Jan 25 07:15:40 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 26 10:21:41 2017 -0500

    cmTimestamp: Support SOURCE_DATE_EPOCH to override current time
    
    See https://reproducible-builds.org/ for why this is good and
    https://reproducible-builds.org/specs/source-date-epoch/ for the
    definition of this variable.

diff --git a/Help/command/string.rst b/Help/command/string.rst
index 77538f6..2c7847a 100644
--- a/Help/command/string.rst
+++ b/Help/command/string.rst
@@ -329,6 +329,12 @@ If no explicit ``<format string>`` is given it will default to:
 
 Write a string which can be used as an identifier in C.
 
+.. note::
+
+  If the ``SOURCE_DATE_EPOCH`` environment variable is set,
+  its value will be used instead of the current time.
+  See https://reproducible-builds.org/specs/source-date-epoch/ for details.
+
 UUID
 """"
 
diff --git a/Help/release/dev/SOURCE_DATE_EPOCH.rst b/Help/release/dev/SOURCE_DATE_EPOCH.rst
new file mode 100644
index 0000000..576e1da
--- /dev/null
+++ b/Help/release/dev/SOURCE_DATE_EPOCH.rst
@@ -0,0 +1,5 @@
+SOURCE_DATE_EPOCH
+-----------------
+
+* The :command:`string(TIMESTAMP)` will now honor the ``SOURCE_DATE_EPOCH``
+  environment variable and use its value instead of the current time.
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index 4a97114..1e5ac5b 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -5,6 +5,7 @@
 #include <cmConfigure.h>
 #include <cstring>
 #include <sstream>
+#include <stdlib.h>
 
 #include "cmSystemTools.h"
 
@@ -12,6 +13,16 @@ std::string cmTimestamp::CurrentTime(const std::string& formatString,
                                      bool utcFlag)
 {
   time_t currentTimeT = time(CM_NULLPTR);
+  std::string source_date_epoch;
+  cmSystemTools::GetEnv("SOURCE_DATE_EPOCH", source_date_epoch);
+  if (!source_date_epoch.empty()) {
+    std::istringstream iss(source_date_epoch);
+    iss >> currentTimeT;
+    if (iss.fail() || !iss.eof()) {
+      cmSystemTools::Error("Cannot parse SOURCE_DATE_EPOCH as integer");
+      exit(27);
+    }
+  }
   if (currentTimeT == time_t(-1)) {
     return std::string();
   }
diff --git a/Tests/RunCMake/string/RunCMakeTest.cmake b/Tests/RunCMake/string/RunCMakeTest.cmake
index 8067d9d..38a77b0 100644
--- a/Tests/RunCMake/string/RunCMakeTest.cmake
+++ b/Tests/RunCMake/string/RunCMakeTest.cmake
@@ -6,6 +6,11 @@ run_cmake(AppendNoArgs)
 run_cmake(Concat)
 run_cmake(ConcatNoArgs)
 
+run_cmake(Timestamp)
+run_cmake(TimestampEmpty)
+run_cmake(TimestampInvalid)
+run_cmake(TimestampInvalid2)
+
 run_cmake(Uuid)
 run_cmake(UuidMissingNamespace)
 run_cmake(UuidMissingNamespaceValue)
diff --git a/Tests/RunCMake/string/Timestamp-result.txt b/Tests/RunCMake/string/Timestamp-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/string/Timestamp-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/string/Timestamp-stderr.txt b/Tests/RunCMake/string/Timestamp-stderr.txt
new file mode 100644
index 0000000..c12b070
--- /dev/null
+++ b/Tests/RunCMake/string/Timestamp-stderr.txt
@@ -0,0 +1 @@
+RESULT=2005-08-07 23:19:49 Sun Aug 05 day=219 wd=0 week=32 %%I=11
diff --git a/Tests/RunCMake/string/Timestamp.cmake b/Tests/RunCMake/string/Timestamp.cmake
new file mode 100644
index 0000000..1232300
--- /dev/null
+++ b/Tests/RunCMake/string/Timestamp.cmake
@@ -0,0 +1,3 @@
+set(ENV{SOURCE_DATE_EPOCH} "1123456789")
+string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S %a %b %y day=%j wd=%w week=%U %%I=%I" UTC)
+message("RESULT=${RESULT}")
diff --git a/Tests/RunCMake/string/TimestampEmpty-result.txt b/Tests/RunCMake/string/TimestampEmpty-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampEmpty-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/string/TimestampEmpty-stderr.txt b/Tests/RunCMake/string/TimestampEmpty-stderr.txt
new file mode 100644
index 0000000..35cbd3c
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampEmpty-stderr.txt
@@ -0,0 +1 @@
+RESULT=2
diff --git a/Tests/RunCMake/string/TimestampEmpty.cmake b/Tests/RunCMake/string/TimestampEmpty.cmake
new file mode 100644
index 0000000..21b770f
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampEmpty.cmake
@@ -0,0 +1,3 @@
+set(ENV{SOURCE_DATE_EPOCH} "")
+string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
+message("RESULT=${RESULT}")
diff --git a/Tests/RunCMake/string/TimestampInvalid-result.txt b/Tests/RunCMake/string/TimestampInvalid-result.txt
new file mode 100644
index 0000000..f64f5d8
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid-result.txt
@@ -0,0 +1 @@
+27
diff --git a/Tests/RunCMake/string/TimestampInvalid-stderr.txt b/Tests/RunCMake/string/TimestampInvalid-stderr.txt
new file mode 100644
index 0000000..75566da
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid-stderr.txt
@@ -0,0 +1 @@
+CMake Error: Cannot parse SOURCE_DATE_EPOCH as integer
diff --git a/Tests/RunCMake/string/TimestampInvalid.cmake b/Tests/RunCMake/string/TimestampInvalid.cmake
new file mode 100644
index 0000000..ab36270
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid.cmake
@@ -0,0 +1,3 @@
+set(ENV{SOURCE_DATE_EPOCH} "invalid-integer")
+string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
+message("RESULT=${RESULT}")
diff --git a/Tests/RunCMake/string/TimestampInvalid2-result.txt b/Tests/RunCMake/string/TimestampInvalid2-result.txt
new file mode 100644
index 0000000..f64f5d8
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid2-result.txt
@@ -0,0 +1 @@
+27
diff --git a/Tests/RunCMake/string/TimestampInvalid2-stderr.txt b/Tests/RunCMake/string/TimestampInvalid2-stderr.txt
new file mode 100644
index 0000000..75566da
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid2-stderr.txt
@@ -0,0 +1 @@
+CMake Error: Cannot parse SOURCE_DATE_EPOCH as integer
diff --git a/Tests/RunCMake/string/TimestampInvalid2.cmake b/Tests/RunCMake/string/TimestampInvalid2.cmake
new file mode 100644
index 0000000..5cc61b8
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid2.cmake
@@ -0,0 +1,3 @@
+set(ENV{SOURCE_DATE_EPOCH} "123trailing-garbage")
+string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
+message("RESULT=${RESULT}")

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

Summary of changes:
 Help/command/string.rst                                     |    6 ++++++
 Help/release/dev/SOURCE_DATE_EPOCH.rst                      |    5 +++++
 Source/cmTimestamp.cxx                                      |   11 +++++++++++
 Tests/RunCMake/string/RunCMakeTest.cmake                    |    5 +++++
 .../Timestamp-result.txt}                                   |    0
 Tests/RunCMake/string/Timestamp-stderr.txt                  |    1 +
 Tests/RunCMake/string/Timestamp.cmake                       |    3 +++
 .../TimestampEmpty-result.txt}                              |    0
 Tests/RunCMake/string/TimestampEmpty-stderr.txt             |    1 +
 Tests/RunCMake/string/TimestampEmpty.cmake                  |    3 +++
 Tests/RunCMake/string/TimestampInvalid-result.txt           |    1 +
 Tests/RunCMake/string/TimestampInvalid-stderr.txt           |    1 +
 Tests/RunCMake/string/TimestampInvalid.cmake                |    3 +++
 Tests/RunCMake/string/TimestampInvalid2-result.txt          |    1 +
 Tests/RunCMake/string/TimestampInvalid2-stderr.txt          |    1 +
 Tests/RunCMake/string/TimestampInvalid2.cmake               |    3 +++
 16 files changed, 45 insertions(+)
 create mode 100644 Help/release/dev/SOURCE_DATE_EPOCH.rst
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => string/Timestamp-result.txt} (100%)
 create mode 100644 Tests/RunCMake/string/Timestamp-stderr.txt
 create mode 100644 Tests/RunCMake/string/Timestamp.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => string/TimestampEmpty-result.txt} (100%)
 create mode 100644 Tests/RunCMake/string/TimestampEmpty-stderr.txt
 create mode 100644 Tests/RunCMake/string/TimestampEmpty.cmake
 create mode 100644 Tests/RunCMake/string/TimestampInvalid-result.txt
 create mode 100644 Tests/RunCMake/string/TimestampInvalid-stderr.txt
 create mode 100644 Tests/RunCMake/string/TimestampInvalid.cmake
 create mode 100644 Tests/RunCMake/string/TimestampInvalid2-result.txt
 create mode 100644 Tests/RunCMake/string/TimestampInvalid2-stderr.txt
 create mode 100644 Tests/RunCMake/string/TimestampInvalid2.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 26 10:40:39 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Jan 2017 10:40:39 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1188-g6ee9efa
Message-ID: <20170126154039.09068F388E@public.kitware.com>

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  6ee9efa883c19c7c1ebfba660c76d42551bbaee8 (commit)
       via  2759e22575b9c63f3162a9629c2d8aa6b9d7effa (commit)
      from  a45de72cc437a13179e933509d524d2088a86002 (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=6ee9efa883c19c7c1ebfba660c76d42551bbaee8
commit 6ee9efa883c19c7c1ebfba660c76d42551bbaee8
Merge: a45de72 2759e22
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 10:40:36 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 10:40:36 2017 -0500

    Merge topic 'FindLua-versioned-lib'
    
    2759e225 FindLua: try to find library according to version from header


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

Summary of changes:
 Modules/FindLua.cmake |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 26 10:40:41 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Jan 2017 10:40:41 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1191-g09cad30
Message-ID: <20170126154041.9A33CF5426@public.kitware.com>

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  09cad3090415fbe59474232675e8124c8332116a (commit)
       via  4bc2c16b5d01a66c00100171ad083e9ab5a6506c (commit)
       via  9702b3eefd2baccd24eea9779e17da8fc143fa4c (commit)
      from  6ee9efa883c19c7c1ebfba660c76d42551bbaee8 (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=09cad3090415fbe59474232675e8124c8332116a
commit 09cad3090415fbe59474232675e8124c8332116a
Merge: 6ee9efa 4bc2c16
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 10:40:39 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 10:40:39 2017 -0500

    Merge topic 'FindGTK2_RunTwice'
    
    4bc2c16b FindGTK2: Add unit test to check variables when run twice
    9702b3ee FindGTK2: Fix GTK2_LIBRARIES and GTK2_TARGETS when called twice


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

Summary of changes:
 Modules/FindGTK2.cmake                             |   82 ++++++++++----------
 Tests/RunCMake/CMakeLists.txt                      |    5 ++
 .../{ClangTidy => FindGTK2}/CMakeLists.txt         |    0
 Tests/RunCMake/FindGTK2/FindGTK2RunTwice.cmake     |   21 +++++
 Tests/RunCMake/FindGTK2/RunCMakeTest.cmake         |    3 +
 5 files changed, 69 insertions(+), 42 deletions(-)
 copy Tests/RunCMake/{ClangTidy => FindGTK2}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/FindGTK2/FindGTK2RunTwice.cmake
 create mode 100644 Tests/RunCMake/FindGTK2/RunCMakeTest.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 26 10:40:44 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Jan 2017 10:40:44 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1193-g4ab35eb
Message-ID: <20170126154044.26FF4F5954@public.kitware.com>

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  4ab35eb661f92686cc3ed3a1b52f7c2ef49bf8a1 (commit)
       via  796dea67a68be432f98e2fef50059c93106557a2 (commit)
      from  09cad3090415fbe59474232675e8124c8332116a (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=4ab35eb661f92686cc3ed3a1b52f7c2ef49bf8a1
commit 4ab35eb661f92686cc3ed3a1b52f7c2ef49bf8a1
Merge: 09cad30 796dea6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 10:40:42 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 10:40:42 2017 -0500

    Merge topic 'pkg-config-recheck'
    
    796dea67 FindPkgConfig: Recheck pkg-config on parameter change.


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

Summary of changes:
 Help/release/dev/pkg-config-recheck.rst |    7 +++++++
 Modules/FindPkgConfig.cmake             |    5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/pkg-config-recheck.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 26 10:40:46 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Jan 2017 10:40:46 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1195-g90ee3bd
Message-ID: <20170126154046.7413DF5AD2@public.kitware.com>

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  90ee3bd3b0b22c62cbb96334ba6620b89ea3d6be (commit)
       via  c1f3086de70793ee5552986347291d814b796232 (commit)
      from  4ab35eb661f92686cc3ed3a1b52f7c2ef49bf8a1 (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=90ee3bd3b0b22c62cbb96334ba6620b89ea3d6be
commit 90ee3bd3b0b22c62cbb96334ba6620b89ea3d6be
Merge: 4ab35eb c1f3086
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 10:40:44 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 10:40:44 2017 -0500

    Merge topic 'FindCUDA-select-flags-auto-msvc'
    
    c1f3086d FindCUDA: Enable CUDA_SELECT_NVCC_ARCH_FLAGS Auto for MSVC


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

Summary of changes:
 Modules/FindCUDA/select_compute_arch.cmake |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 26 10:40:48 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Jan 2017 10:40:48 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1197-gb8db2ed
Message-ID: <20170126154048.B36EEF5E29@public.kitware.com>

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  b8db2ed79675930421ac96256d63af515e624d38 (commit)
       via  ef47272b075a2ad8018481d3fdfb6f2beb514056 (commit)
      from  90ee3bd3b0b22c62cbb96334ba6620b89ea3d6be (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=b8db2ed79675930421ac96256d63af515e624d38
commit b8db2ed79675930421ac96256d63af515e624d38
Merge: 90ee3bd ef47272
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 10:40:47 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 10:40:47 2017 -0500

    Merge topic 'tests_auto_type'
    
    ef47272b Tests: use cxx_auto_type only if actually available


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

Summary of changes:
 Tests/CMakeCommands/target_compile_features/CMakeLists.txt |    2 +-
 Tests/CompileFeatures/CMakeLists.txt                       |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 26 10:41:12 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Jan 2017 10:41:12 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2357-g1325cfc
Message-ID: <20170126154112.7CD8CF5426@public.kitware.com>

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  1325cfc3a76387a327b5758adcf8ef42f2e19af3 (commit)
       via  b8db2ed79675930421ac96256d63af515e624d38 (commit)
       via  90ee3bd3b0b22c62cbb96334ba6620b89ea3d6be (commit)
       via  4ab35eb661f92686cc3ed3a1b52f7c2ef49bf8a1 (commit)
       via  09cad3090415fbe59474232675e8124c8332116a (commit)
       via  6ee9efa883c19c7c1ebfba660c76d42551bbaee8 (commit)
       via  a45de72cc437a13179e933509d524d2088a86002 (commit)
      from  67c2364394141cecc3aa1f3c065ff25ce71a4efe (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=1325cfc3a76387a327b5758adcf8ef42f2e19af3
commit 1325cfc3a76387a327b5758adcf8ef42f2e19af3
Merge: 67c2364 b8db2ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 10:41:04 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 26 10:41:04 2017 -0500

    Merge branch 'master' into next


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 26 11:05:47 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Jan 2017 11:05:47 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2359-g63bba4d
Message-ID: <20170126160547.19532FA645@public.kitware.com>

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  63bba4d2b9d729ffb852e93df4b04c6635f04c21 (commit)
       via  24d73fa0eb2e9f7cdc8fb8192445ce3ee04cf7d3 (commit)
      from  1325cfc3a76387a327b5758adcf8ef42f2e19af3 (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=63bba4d2b9d729ffb852e93df4b04c6635f04c21
commit 63bba4d2b9d729ffb852e93df4b04c6635f04c21
Merge: 1325cfc 24d73fa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 11:05:46 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 11:05:46 2017 -0500

    Merge topic 'GNUG_define' into next
    
    24d73fa0 GNUC: also check __GNUG__ define when checking for g++


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24d73fa0eb2e9f7cdc8fb8192445ce3ee04cf7d3
commit 24d73fa0eb2e9f7cdc8fb8192445ce3ee04cf7d3
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 25 21:53:40 2017 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Jan 25 21:53:40 2017 +0100

    GNUC: also check __GNUG__ define when checking for g++
    
    At least the scratchbox compiler for the N900, which basically is a gcc 4.2,
    sets only __GNUG__ in C++ mode, but not __GNUC__. It does indeed set
    __GNUC_MINOR__ and __GNUC_PATCHLEVEL__. Extend the compiler detection code for
    GNU compilers in C++ mode to look at __GNUG__ in case __GNUC__ is absent.

diff --git a/Modules/Compiler/GNU-DetermineCompiler.cmake b/Modules/Compiler/GNU-C-DetermineCompiler.cmake
similarity index 100%
copy from Modules/Compiler/GNU-DetermineCompiler.cmake
copy to Modules/Compiler/GNU-C-DetermineCompiler.cmake
diff --git a/Modules/Compiler/GNU-DetermineCompiler.cmake b/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake
similarity index 53%
rename from Modules/Compiler/GNU-DetermineCompiler.cmake
rename to Modules/Compiler/GNU-CXX-DetermineCompiler.cmake
index 6ddc566..c25b147 100644
--- a/Modules/Compiler/GNU-DetermineCompiler.cmake
+++ b/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake
@@ -1,8 +1,12 @@
 
-set(_compiler_id_pp_test "defined(__GNUC__)")
+set(_compiler_id_pp_test "defined(__GNUC__) || defined(__GNUG__)")
 
 set(_compiler_id_version_compute "
-# define @PREFIX at COMPILER_VERSION_MAJOR @MACRO_DEC@(__GNUC__)
+# if defined(__GNUC__)
+#  define @PREFIX at COMPILER_VERSION_MAJOR @MACRO_DEC@(__GNUC__)
+# else
+#  define @PREFIX at COMPILER_VERSION_MAJOR @MACRO_DEC@(__GNUG__)
+# endif
 # if defined(__GNUC_MINOR__)
 #  define @PREFIX at COMPILER_VERSION_MINOR @MACRO_DEC@(__GNUC_MINOR__)
 # endif

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

Summary of changes:
 ...U-DetermineCompiler.cmake => GNU-C-DetermineCompiler.cmake} |    0
 ...DetermineCompiler.cmake => GNU-CXX-DetermineCompiler.cmake} |    8 ++++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 copy Modules/Compiler/{GNU-DetermineCompiler.cmake => GNU-C-DetermineCompiler.cmake} (100%)
 rename Modules/Compiler/{GNU-DetermineCompiler.cmake => GNU-CXX-DetermineCompiler.cmake} (53%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 26 11:19:17 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Jan 2017 11:19:17 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2361-g7c51e93
Message-ID: <20170126161917.8215EF9E47@public.kitware.com>

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  7c51e930146249c1220275a030af5b557b0a4799 (commit)
       via  895f7f16a79428689a263ba5cd9a72647dc8e912 (commit)
      from  63bba4d2b9d729ffb852e93df4b04c6635f04c21 (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=7c51e930146249c1220275a030af5b557b0a4799
commit 7c51e930146249c1220275a030af5b557b0a4799
Merge: 63bba4d 895f7f1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 11:19:16 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 11:19:16 2017 -0500

    Merge topic 'genex-if' into next
    
    895f7f16 Genex: Add `IF` generator expression


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=895f7f16a79428689a263ba5cd9a72647dc8e912
commit 895f7f16a79428689a263ba5cd9a72647dc8e912
Author:     Colby Pike <vectorofbool at gmail.com>
AuthorDate: Mon Jan 23 20:14:03 2017 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 26 11:18:50 2017 -0500

    Genex: Add `IF` generator expression
    
    This allows a single condition to be used to choose between two
    alternatives.  Without this the condition must be duplicated with
    one surrounded by `NOT`.
    
    Closes: #15585

diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index 64d15a9..3a225ad 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -51,6 +51,8 @@ Available logical expressions are:
   ``0`` if all ``?`` are ``0``, else ``1``
 ``$<NOT:?>``
   ``0`` if ``?`` is ``1``, else ``1``
+``$<IF:?,true-value...,false-value...>```
+  ``true-value...`` if ``?`` is ``1``, ``false-value...`` if ``?`` is ``0``
 ``$<STREQUAL:a,b>``
   ``1`` if ``a`` is STREQUAL ``b``, else ``0``
 ``$<EQUAL:a,b>``
diff --git a/Help/release/dev/if-genex.rst b/Help/release/dev/if-genex.rst
new file mode 100644
index 0000000..62be3a7
--- /dev/null
+++ b/Help/release/dev/if-genex.rst
@@ -0,0 +1,7 @@
+genex-if
+--------
+
+* A new logical generator expression for immediate-if was added:
+  ``$<IF:cond,true-value,false-value>``. It takes three arguments: One
+  condition, a true-value, and a false-value. Resolves to the true-value if the
+  condition is ``1``, and resolves to the false-value if the condition is ``0``.
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 398f95b..66202df 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -162,6 +162,27 @@ static const struct BoolNode : public cmGeneratorExpressionNode
   }
 } boolNode;
 
+static const struct IfNode : public cmGeneratorExpressionNode
+{
+  IfNode() {}
+
+  int NumExpectedParameters() const CM_OVERRIDE { return 3; }
+
+  std::string Evaluate(const std::vector<std::string>& parameters,
+                       cmGeneratorExpressionContext* context,
+                       const GeneratorExpressionContent* content,
+                       cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
+  {
+    if (parameters[0] != "1" && parameters[0] != "0") {
+      reportError(context, content->GetOriginalExpression(),
+                  "First parameter to $<IF> must resolve to exactly one '0' "
+                  "or '1' value.");
+      return std::string();
+    }
+    return parameters[0] == "1" ? parameters[1] : parameters[2];
+  }
+} ifNode;
+
 static const struct StrEqualNode : public cmGeneratorExpressionNode
 {
   StrEqualNode() {}
@@ -1757,6 +1778,7 @@ const cmGeneratorExpressionNode* cmGeneratorExpressionNode::GetNode(
     nodeMap["UPPER_CASE"] = &upperCaseNode;
     nodeMap["MAKE_C_IDENTIFIER"] = &makeCIdentifierNode;
     nodeMap["BOOL"] = &boolNode;
+    nodeMap["IF"] = &ifNode;
     nodeMap["ANGLE-R"] = &angle_rNode;
     nodeMap["COMMA"] = &commaNode;
     nodeMap["SEMICOLON"] = &semicolonNode;
diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index f0d6abf..f920188 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -246,6 +246,10 @@ add_custom_target(check-part4 ALL
     # CMake as command-line argument
     -Dtest_shell_path=${path_prefix}$<SHELL_PATH:${test_shell_path}>
     -Dpath_prefix=${path_prefix}
+    -Dif_1=$<IF:1,a,b>
+    -Dif_2=$<IF:0,a,b>
+    -Dif_3=$<IF:$<EQUAL:10,30>,a,b>
+    -Dif_4=$<IF:$<EQUAL:30,30>,a,b>
     -DWIN32=${WIN32}
     -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
     -P ${CMAKE_CURRENT_SOURCE_DIR}/check-part4.cmake
diff --git a/Tests/GeneratorExpression/check-part4.cmake b/Tests/GeneratorExpression/check-part4.cmake
index 9e516d5..f5d14dd 100644
--- a/Tests/GeneratorExpression/check-part4.cmake
+++ b/Tests/GeneratorExpression/check-part4.cmake
@@ -13,3 +13,8 @@ if(WIN32)
 else()
   check(test_shell_path [[/shell/path]])
 endif()
+
+check(if_1 "a")
+check(if_2 "b")
+check(if_3 "b")
+check(if_4 "a")
diff --git a/Tests/RunCMake/GeneratorExpression/BadIF-result.txt b/Tests/RunCMake/GeneratorExpression/BadIF-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/BadIF-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/GeneratorExpression/BadIF-stderr.txt b/Tests/RunCMake/GeneratorExpression/BadIF-stderr.txt
new file mode 100644
index 0000000..7c7506c
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/BadIF-stderr.txt
@@ -0,0 +1,15 @@
+CMake Error at BadIF.cmake:2 \(add_custom_target\):
+  Error evaluating generator expression:
+
+    \$<IF:asdf,a,b>
+
+  First parameter to \$<IF> must resolve to exactly one '0' or '1' value.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
++
+CMake Error at BadIF.cmake:2 \(add_custom_target\):
+  Error evaluating generator expression:
+
+    \$<IF:asdf,a>
+
+  \$<IF> expression requires 3 comma separated parameters, but got 2 instead.
diff --git a/Tests/RunCMake/GeneratorExpression/BadIF.cmake b/Tests/RunCMake/GeneratorExpression/BadIF.cmake
new file mode 100644
index 0000000..583f68d
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/BadIF.cmake
@@ -0,0 +1,5 @@
+
+add_custom_target(check ALL COMMAND check
+    $<IF:asdf,a,b>
+    $<IF:asdf,a>
+    )
diff --git a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
index f5584d5..084b5c3 100644
--- a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
@@ -1,5 +1,6 @@
 include(RunCMake)
 
+run_cmake(BadIF)
 run_cmake(BadCONFIG)
 run_cmake(BadOR)
 run_cmake(BadAND)

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

Summary of changes:
 Help/manual/cmake-generator-expressions.7.rst      |    2 ++
 Help/release/dev/if-genex.rst                      |    7 +++++++
 Source/cmGeneratorExpressionNode.cxx               |   22 ++++++++++++++++++++
 Tests/GeneratorExpression/CMakeLists.txt           |    4 ++++
 Tests/GeneratorExpression/check-part4.cmake        |    5 +++++
 .../BadIF-result.txt}                              |    0
 .../RunCMake/GeneratorExpression/BadIF-stderr.txt  |   15 +++++++++++++
 .../{BadZero.cmake => BadIF.cmake}                 |    6 +++---
 .../GeneratorExpression/RunCMakeTest.cmake         |    1 +
 9 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 Help/release/dev/if-genex.rst
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => GeneratorExpression/BadIF-result.txt} (100%)
 create mode 100644 Tests/RunCMake/GeneratorExpression/BadIF-stderr.txt
 copy Tests/RunCMake/GeneratorExpression/{BadZero.cmake => BadIF.cmake} (50%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 26 13:05:13 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Jan 2017 13:05:13 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2365-g4b9e085
Message-ID: <20170126180513.6BD4BFA4C4@public.kitware.com>

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  4b9e085f77ac2500d2a3bbd2253acbc6b1c84c0e (commit)
       via  c3a22518f83dfe8e1787e93f05398a5263cc781a (commit)
       via  d491172445dcd32547fbeb3598510455e8e44132 (commit)
       via  1a2a9b0d08c7ba2af168856b1220d42ff9a80921 (commit)
      from  7c51e930146249c1220275a030af5b557b0a4799 (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=4b9e085f77ac2500d2a3bbd2253acbc6b1c84c0e
commit 4b9e085f77ac2500d2a3bbd2253acbc6b1c84c0e
Merge: 7c51e93 c3a2251
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 13:05:12 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 13:05:12 2017 -0500

    Merge topic 'test-GeneratorExpression-update' into next
    
    c3a22518 Tests: Extend GeneratorExpression to work with more configurations
    d4911724 Tests: Teach GeneratorExpression to cover spaces in include dirs
    1a2a9b0d Tests: Simplify GeneratorExpression imported include directory check


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3a22518f83dfe8e1787e93f05398a5263cc781a
commit c3a22518f83dfe8e1787e93f05398a5263cc781a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 10:13:14 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 26 10:16:08 2017 -0500

    Tests: Extend GeneratorExpression to work with more configurations
    
    Add missing pieces for RelWithDebInfo and MinSizeRel.

diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index dd86b6f..3091780 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -161,6 +161,10 @@ set_property(TARGET imported3 APPEND PROPERTY
   INTERFACE_INCLUDE_DIRECTORIES $<$<CONFIG:DEBUG>:$<TARGET_PROPERTY:imported1,INTERFACE_INCLUDE_DIRECTORIES>>)
 set_property(TARGET imported3 APPEND PROPERTY
   INTERFACE_INCLUDE_DIRECTORIES $<$<CONFIG:RELEASE>:$<TARGET_PROPERTY:imported2,INTERFACE_INCLUDE_DIRECTORIES>>)
+set_property(TARGET imported3 APPEND PROPERTY
+  INTERFACE_INCLUDE_DIRECTORIES $<$<CONFIG:RELWITHDEBINFO>:$<TARGET_PROPERTY:imported2,INTERFACE_INCLUDE_DIRECTORIES>>)
+set_property(TARGET imported3 APPEND PROPERTY
+  INTERFACE_INCLUDE_DIRECTORIES $<$<CONFIG:MINSIZEREL>:$<TARGET_PROPERTY:imported2,INTERFACE_INCLUDE_DIRECTORIES>>)
 
 add_library(imported4 SHARED IMPORTED)
 set_property(TARGET imported4 APPEND PROPERTY
diff --git a/Tests/GeneratorExpression/check-part3.cmake b/Tests/GeneratorExpression/check-part3.cmake
index 57abbcc..9014406 100644
--- a/Tests/GeneratorExpression/check-part3.cmake
+++ b/Tests/GeneratorExpression/check-part3.cmake
@@ -13,7 +13,7 @@ if(config AND NOT config STREQUAL NoConfig)
     message(SEND_ERROR "test_imported_includes is not correct: ${test_imported_includes}")
   endif()
 else()
-  if(NOT "${test_imported_includes}" MATCHES "^;$")
+  if(NOT "${test_imported_includes}" MATCHES "^;;;$")
     message(SEND_ERROR "test_imported_includes is not an empty list: ${test_imported_includes}")
   endif()
 endif()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d491172445dcd32547fbeb3598510455e8e44132
commit d491172445dcd32547fbeb3598510455e8e44132
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 10:11:25 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 26 10:11:25 2017 -0500

    Tests: Teach GeneratorExpression to cover spaces in include dirs
    
    Add a space to the imported include directories used for the test.
    This works around funny quoted-`;` interpretation by Visual Studio.

diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index 8ecfdd9..dd86b6f 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -145,13 +145,13 @@ add_library(imported1 SHARED IMPORTED)
 set_property(TARGET imported1 PROPERTY IMPORTED_LOCATION_RELEASE release_loc)
 set_property(TARGET imported1 PROPERTY IMPORTED_LOCATION_DEBUG debug_loc)
 set_property(TARGET imported1 PROPERTY IMPORTED_CONFIGURATIONS RELEASE DEBUG)
-set_property(TARGET imported1 PROPERTY INTERFACE_INCLUDE_DIRECTORIES /imported1/include)
+set_property(TARGET imported1 PROPERTY INTERFACE_INCLUDE_DIRECTORIES "/imported1/include/with space")
 
 add_library(imported2 SHARED IMPORTED)
 set_property(TARGET imported2 PROPERTY IMPORTED_LOCATION_RELEASE release_loc)
 set_property(TARGET imported2 PROPERTY IMPORTED_LOCATION_DEBUG debug_loc)
 set_property(TARGET imported2 PROPERTY IMPORTED_CONFIGURATIONS RELEASE DEBUG)
-set_property(TARGET imported2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES /imported2/include)
+set_property(TARGET imported2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES "/imported2/include/with space")
 
 add_library(imported3 SHARED IMPORTED)
 set_property(TARGET imported3 PROPERTY IMPORTED_LOCATION_RELEASE release_loc)
diff --git a/Tests/GeneratorExpression/check-part3.cmake b/Tests/GeneratorExpression/check-part3.cmake
index 927ead4..57abbcc 100644
--- a/Tests/GeneratorExpression/check-part3.cmake
+++ b/Tests/GeneratorExpression/check-part3.cmake
@@ -9,7 +9,7 @@ check(test_version_equal_1 "0")
 check(test_version_equal_2 "1")
 
 if(config AND NOT config STREQUAL NoConfig)
-  if(NOT "${test_imported_includes}" MATCHES "^;*/imported[12]/include;*$")
+  if(NOT "${test_imported_includes}" MATCHES "^;*/imported[12]/include/with space;*$")
     message(SEND_ERROR "test_imported_includes is not correct: ${test_imported_includes}")
   endif()
 else()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a2a9b0d08c7ba2af168856b1220d42ff9a80921
commit 1a2a9b0d08c7ba2af168856b1220d42ff9a80921
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 10:09:55 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 26 10:09:55 2017 -0500

    Tests: Simplify GeneratorExpression imported include directory check
    
    Do not duplicate the list of include directories 4 times.

diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index f0d6abf..8ecfdd9 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -187,10 +187,7 @@ add_custom_target(check-part3 ALL
     -Dtest_version_equal_1=$<VERSION_EQUAL:1.0.1,1.1>
     -Dtest_version_equal_2=$<VERSION_EQUAL:1.1,1.1>
     -Dconfig=$<CONFIGURATION>
-    -Dtest_imported_debug=$<TARGET_PROPERTY:imported4,INCLUDE_DIRECTORIES>
-    -Dtest_imported_release=$<TARGET_PROPERTY:imported4,INCLUDE_DIRECTORIES>
-    -Dtest_imported_relwithdebinfo=$<TARGET_PROPERTY:imported4,INCLUDE_DIRECTORIES>
-    -Dtest_imported_minsizerel=$<TARGET_PROPERTY:imported4,INCLUDE_DIRECTORIES>
+    -Dtest_imported_includes=$<TARGET_PROPERTY:imported4,INCLUDE_DIRECTORIES>
     -Dtest_imported_fallback=$<STREQUAL:$<TARGET_FILE_NAME:importedFallback>,fallback_loc>
     -Dtest_alias_file_exe=$<STREQUAL:$<TARGET_FILE:Alias::SomeExe>,$<TARGET_FILE:someexe>>
     -Dtest_alias_file_lib=$<STREQUAL:$<TARGET_FILE:Alias::SomeLib>,$<TARGET_FILE:empty1>>
diff --git a/Tests/GeneratorExpression/check-part3.cmake b/Tests/GeneratorExpression/check-part3.cmake
index e12d8c6..927ead4 100644
--- a/Tests/GeneratorExpression/check-part3.cmake
+++ b/Tests/GeneratorExpression/check-part3.cmake
@@ -8,18 +8,15 @@ check(test_version_less_2 "1")
 check(test_version_equal_1 "0")
 check(test_version_equal_2 "1")
 
-foreach(c debug release relwithdebinfo minsizerel)
-  if(config AND NOT config STREQUAL NoConfig)
-    if(NOT "${test_imported_${c}}" MATCHES "^;/imported2/include$"
-        AND NOT "${test_imported_${c}}" MATCHES "^/imported1/include;$")
-      message(SEND_ERROR "test_imported_${c} is not correct: ${test_imported_${c}}")
-    endif()
-  else()
-    if(NOT "${test_imported_${c}}" MATCHES "^;$")
-      message(SEND_ERROR "test_imported_${c} is not an empty list: ${test_imported_${c}}")
-    endif()
+if(config AND NOT config STREQUAL NoConfig)
+  if(NOT "${test_imported_includes}" MATCHES "^;*/imported[12]/include;*$")
+    message(SEND_ERROR "test_imported_includes is not correct: ${test_imported_includes}")
   endif()
-endforeach()
+else()
+  if(NOT "${test_imported_includes}" MATCHES "^;$")
+    message(SEND_ERROR "test_imported_includes is not an empty list: ${test_imported_includes}")
+  endif()
+endif()
 
 check(test_imported_fallback "1")
 

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

Summary of changes:
 Tests/GeneratorExpression/CMakeLists.txt    |   13 +++++++------
 Tests/GeneratorExpression/check-part3.cmake |   19 ++++++++-----------
 2 files changed, 15 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Jan 26 13:36:47 2017
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Jan 2017 13:36:47 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2371-g0758c65
Message-ID: <20170126183647.939FDFA601@public.kitware.com>

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  0758c659996640f6558d09ee9835ad325c60c25d (commit)
       via  266fe3bd760dcd93d51c556baff7dfcf5bfc66f4 (commit)
       via  d525754eabef7a9f6e6696ae323a8ed965e12f2e (commit)
       via  45405f00d27031fb9641408c56673532a3ee3bde (commit)
       via  50e1c1056ea82690474dc186d7a4103b33547fa6 (commit)
       via  8643ca75c705568bc9bb084a5182baef04865d2d (commit)
      from  4b9e085f77ac2500d2a3bbd2253acbc6b1c84c0e (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=0758c659996640f6558d09ee9835ad325c60c25d
commit 0758c659996640f6558d09ee9835ad325c60c25d
Merge: 4b9e085 266fe3b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 13:36:45 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 13:36:45 2017 -0500

    Merge topic '16432-static-frameworks' into next
    
    266fe3bd Apple: Add support for static frameworks
    d525754e Xcode: Refactor RunCMake.Framework test to prepare for static frameworks
    45405f00 Xcode: Ignore Xcode project warning until issue is fixed
    50e1c105 Makefile: For static libraries remove only the "real" lib before creating
    8643ca75 Makefile: Re-order list of files to clean


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=266fe3bd760dcd93d51c556baff7dfcf5bfc66f4
commit 266fe3bd760dcd93d51c556baff7dfcf5bfc66f4
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Mon Dec 26 18:07:24 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 26 13:35:14 2017 -0500

    Apple: Add support for static frameworks
    
    Closes: #16432

diff --git a/Help/command/add_library.rst b/Help/command/add_library.rst
index 36adcbe..af75a39 100644
--- a/Help/command/add_library.rst
+++ b/Help/command/add_library.rst
@@ -33,7 +33,7 @@ type is ``STATIC`` or ``SHARED`` based on whether the current value of the
 variable :variable:`BUILD_SHARED_LIBS` is ``ON``.  For ``SHARED`` and
 ``MODULE`` libraries the :prop_tgt:`POSITION_INDEPENDENT_CODE` target
 property is set to ``ON`` automatically.
-A ``SHARED`` library may be marked with the :prop_tgt:`FRAMEWORK`
+A ``SHARED`` or ``STATIC`` library may be marked with the :prop_tgt:`FRAMEWORK`
 target property to create an OS X Framework.
 
 If a library does not export any symbols, it must not be declared as a
diff --git a/Help/command/install.rst b/Help/command/install.rst
index d57dd75..70087a4 100644
--- a/Help/command/install.rst
+++ b/Help/command/install.rst
@@ -90,8 +90,10 @@ project.  There are five kinds of target files that may be installed:
 ``ARCHIVE``, ``LIBRARY``, ``RUNTIME``, ``FRAMEWORK``, and ``BUNDLE``.
 Executables are treated as ``RUNTIME`` targets, except that those
 marked with the ``MACOSX_BUNDLE`` property are treated as ``BUNDLE``
-targets on OS X.  Static libraries are always treated as ``ARCHIVE``
-targets.  Module libraries are always treated as ``LIBRARY`` targets.
+targets on OS X.  Static libraries are treated as ``ARCHIVE`` targets,
+except that those marked with the ``FRAMEWORK`` property are treated
+as ``FRAMEWORK`` targets on OS X.
+Module libraries are always treated as ``LIBRARY`` targets.
 For non-DLL platforms shared libraries are treated as ``LIBRARY``
 targets, except that those marked with the ``FRAMEWORK`` property are
 treated as ``FRAMEWORK`` targets on OS X.  For DLL platforms the DLL
diff --git a/Help/prop_tgt/FRAMEWORK.rst b/Help/prop_tgt/FRAMEWORK.rst
index 8120c36..495d30e 100644
--- a/Help/prop_tgt/FRAMEWORK.rst
+++ b/Help/prop_tgt/FRAMEWORK.rst
@@ -1,9 +1,9 @@
 FRAMEWORK
 ---------
 
-Build ``SHARED`` library as Framework Bundle on the OS X and iOS.
+Build ``SHARED`` or ``STATIC`` library as Framework Bundle on the OS X and iOS.
 
-If a ``SHARED`` library target has this property set to ``TRUE`` it will be
+If such a library target has this property set to ``TRUE`` it will be
 built as a framework when built on the OS X and iOS.  It will have the
 directory structure required for a framework and will be suitable to
 be used with the ``-framework`` option
diff --git a/Help/release/dev/static-frameworks.rst b/Help/release/dev/static-frameworks.rst
new file mode 100644
index 0000000..eae80bd
--- /dev/null
+++ b/Help/release/dev/static-frameworks.rst
@@ -0,0 +1,6 @@
+static-frameworks
+-----------------
+
+* The :prop_tgt:`FRAMEWORK` property could now also be applied to
+  static libraries on Apple targets.  It will result in a proper
+  Framework but with a static library inside.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index dcf3764..6ce8140 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5308,7 +5308,8 @@ bool cmGeneratorTarget::IsLinkable() const
 
 bool cmGeneratorTarget::IsFrameworkOnApple() const
 {
-  return (this->GetType() == cmStateEnums::SHARED_LIBRARY &&
+  return ((this->GetType() == cmStateEnums::SHARED_LIBRARY ||
+           this->GetType() == cmStateEnums::STATIC_LIBRARY) &&
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("FRAMEWORK"));
 }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index d448315..8627cf2 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1816,8 +1816,34 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
 
   // Handle settings for each target type.
   switch (gtgt->GetType()) {
-    case cmStateEnums::OBJECT_LIBRARY:
-    case cmStateEnums::STATIC_LIBRARY: {
+    case cmStateEnums::STATIC_LIBRARY:
+      if (gtgt->GetPropertyAsBool("FRAMEWORK")) {
+        std::string fw_version = gtgt->GetFrameworkVersion();
+        buildSettings->AddAttribute("FRAMEWORK_VERSION",
+                                    this->CreateString(fw_version));
+        const char* ext = gtgt->GetProperty("BUNDLE_EXTENSION");
+        if (ext) {
+          buildSettings->AddAttribute("WRAPPER_EXTENSION",
+                                      this->CreateString(ext));
+        }
+
+        std::string plist = this->ComputeInfoPListLocation(gtgt);
+        // Xcode will create the final version of Info.plist at build time,
+        // so let it replace the framework name. This avoids creating
+        // a per-configuration Info.plist file.
+        this->CurrentLocalGenerator->GenerateFrameworkInfoPList(
+          gtgt, "$(EXECUTABLE_NAME)", plist.c_str());
+        buildSettings->AddAttribute("INFOPLIST_FILE",
+                                    this->CreateString(plist));
+        buildSettings->AddAttribute("MACH_O_TYPE",
+                                    this->CreateString("staticlib"));
+      } else {
+        buildSettings->AddAttribute("LIBRARY_STYLE",
+                                    this->CreateString("STATIC"));
+      }
+      break;
+
+    case cmStateEnums::OBJECT_LIBRARY: {
       buildSettings->AddAttribute("LIBRARY_STYLE",
                                   this->CreateString("STATIC"));
       break;
@@ -2336,8 +2362,10 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(
 
   switch (target->GetType()) {
     case cmStateEnums::OBJECT_LIBRARY:
-    case cmStateEnums::STATIC_LIBRARY:
       return "archive.ar";
+    case cmStateEnums::STATIC_LIBRARY:
+      return (target->GetPropertyAsBool("FRAMEWORK") ? "wrapper.framework"
+                                                     : "archive.ar");
     case cmStateEnums::MODULE_LIBRARY:
       if (target->IsXCTestOnApple())
         return "wrapper.cfbundle";
@@ -2367,8 +2395,11 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(
 
   switch (target->GetType()) {
     case cmStateEnums::OBJECT_LIBRARY:
-    case cmStateEnums::STATIC_LIBRARY:
       return "com.apple.product-type.library.static";
+    case cmStateEnums::STATIC_LIBRARY:
+      return (target->GetPropertyAsBool("FRAMEWORK")
+                ? "com.apple.product-type.framework"
+                : "com.apple.product-type.library.static");
     case cmStateEnums::MODULE_LIBRARY:
       if (target->IsXCTestOnApple())
         return "com.apple.product-type.bundle.unit-test";
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index fadebb4..4c331c7 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -471,17 +471,39 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
         }
       } break;
       case cmStateEnums::STATIC_LIBRARY: {
-        // Static libraries use ARCHIVE properties.
-        if (!archiveArgs.GetDestination().empty()) {
-          archiveGenerator =
-            CreateInstallTargetGenerator(target, archiveArgs, false);
+        // If it is marked with FRAMEWORK property use the FRAMEWORK set of
+        // INSTALL properties. Otherwise, use the LIBRARY properties.
+        if (target.IsFrameworkOnApple()) {
+          // When in namelink only mode skip frameworks.
+          if (namelinkMode == cmInstallTargetGenerator::NamelinkModeOnly) {
+            continue;
+          }
+
+          // Use the FRAMEWORK properties.
+          if (!frameworkArgs.GetDestination().empty()) {
+            frameworkGenerator =
+              CreateInstallTargetGenerator(target, frameworkArgs, false);
+          } else {
+            std::ostringstream e;
+            e << "TARGETS given no FRAMEWORK DESTINATION for static library "
+                 "FRAMEWORK target \""
+              << target.GetName() << "\".";
+            this->SetError(e.str());
+            return false;
+          }
         } else {
-          std::ostringstream e;
-          e << "TARGETS given no ARCHIVE DESTINATION for static library "
-               "target \""
-            << target.GetName() << "\".";
-          this->SetError(e.str());
-          return false;
+          // Static libraries use ARCHIVE properties.
+          if (!archiveArgs.GetDestination().empty()) {
+            archiveGenerator =
+              CreateInstallTargetGenerator(target, archiveArgs, false);
+          } else {
+            std::ostringstream e;
+            e << "TARGETS given no ARCHIVE DESTINATION for static library "
+                 "target \""
+              << target.GetName() << "\".";
+            this->SetError(e.str());
+            return false;
+          }
         }
       } break;
       case cmStateEnums::MODULE_LIBRARY: {
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 8c62c48..fe3472d 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -451,7 +451,8 @@ bool cmTarget::HasImportLibrary() const
 
 bool cmTarget::IsFrameworkOnApple() const
 {
-  return (this->GetType() == cmStateEnums::SHARED_LIBRARY &&
+  return ((this->GetType() == cmStateEnums::SHARED_LIBRARY ||
+           this->GetType() == cmStateEnums::STATIC_LIBRARY) &&
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("FRAMEWORK"));
 }
diff --git a/Tests/RunCMake/Framework/FrameworkLayout.cmake b/Tests/RunCMake/Framework/FrameworkLayout.cmake
index 5184755..ae32134 100644
--- a/Tests/RunCMake/Framework/FrameworkLayout.cmake
+++ b/Tests/RunCMake/Framework/FrameworkLayout.cmake
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.4)
 enable_language(C)
 
-add_library(Framework SHARED
+add_library(Framework ${FRAMEWORK_TYPE}
             foo.c
             foo.h
             res.txt)
@@ -9,3 +9,6 @@ set_target_properties(Framework PROPERTIES
                       FRAMEWORK TRUE
                       PUBLIC_HEADER foo.h
                       RESOURCE "res.txt")
+
+add_custom_command(TARGET Framework POST_BUILD
+                   COMMAND /usr/bin/file $<TARGET_FILE:Framework>)
diff --git a/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt b/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt
new file mode 100644
index 0000000..8d90f5f
--- /dev/null
+++ b/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt
@@ -0,0 +1 @@
+.*/Framework: Mach-O[^\n]* dynamically linked shared library.*
diff --git a/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt b/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt
new file mode 100644
index 0000000..c9f50b6
--- /dev/null
+++ b/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt
@@ -0,0 +1 @@
+.*/Framework: current ar archive random library.*
diff --git a/Tests/RunCMake/Framework/RunCMakeTest.cmake b/Tests/RunCMake/Framework/RunCMakeTest.cmake
index 1f7d54e..e64892d 100644
--- a/Tests/RunCMake/Framework/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Framework/RunCMakeTest.cmake
@@ -1,9 +1,10 @@
 include(RunCMake)
 
-function(framework_layout_test Name Toolchain)
-  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${Toolchain}FrameworkLayout-build)
+function(framework_layout_test Name Toolchain Type)
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${Toolchain}${Type}FrameworkLayout-build)
   set(RunCMake_TEST_NO_CLEAN 1)
   set(RunCMake_TEST_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/${Toolchain}.cmake")
+  list(APPEND RunCMake_TEST_OPTIONS "-DFRAMEWORK_TYPE=${Type}")
 
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
   file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
@@ -14,6 +15,26 @@ endfunction()
 
 # build check cannot cope with multi-configuration generators directory layout
 if(NOT RunCMake_GENERATOR STREQUAL "Xcode")
-  framework_layout_test(iOSFrameworkLayout-build ios)
-  framework_layout_test(OSXFrameworkLayout-build osx)
+  framework_layout_test(iOSFrameworkLayout-build ios SHARED)
+  framework_layout_test(iOSFrameworkLayout-build ios STATIC)
+  framework_layout_test(OSXFrameworkLayout-build osx SHARED)
+  framework_layout_test(OSXFrameworkLayout-build osx STATIC)
 endif()
+
+function(framework_type_test Toolchain Type)
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${Toolchain}${Type}FrameworkType-build)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  set(RunCMake_TEST_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/${Toolchain}.cmake")
+  list(APPEND RunCMake_TEST_OPTIONS "-DFRAMEWORK_TYPE=${Type}")
+
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+  run_cmake(FrameworkLayout)
+  run_cmake_command(FrameworkType${Type}-build ${CMAKE_COMMAND} --build .)
+endfunction()
+
+framework_type_test(ios SHARED)
+framework_type_test(ios STATIC)
+framework_type_test(osx SHARED)
+framework_type_test(osx STATIC)
diff --git a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
index ad4268d..833eb85 100644
--- a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
@@ -50,30 +50,56 @@ if (NOT TEST_IOS AND NOT TEST_WATCHOS AND NOT TEST_TVOS)
   add_dependencies(AppBundleExtTest AppBundleExt)
 endif()
 
-# Framework (not supported for iOS on Xcode < 6)
+# Shared Framework (not supported for iOS on Xcode < 6)
 
 if(NOT TEST_IOS OR NOT XCODE_VERSION VERSION_LESS 6)
-  add_library(Framework SHARED main.c)
-  set_target_properties(Framework PROPERTIES FRAMEWORK TRUE)
+  add_library(SharedFramework SHARED main.c)
+  set_target_properties(SharedFramework PROPERTIES FRAMEWORK TRUE)
 
-  add_custom_target(FrameworkTest ALL
+  add_custom_target(SharedFrameworkTest ALL
     COMMAND ${CMAKE_COMMAND} -E copy
-      "$<TARGET_FILE:Framework>" "$<TARGET_FILE:Framework>.old")
+      "$<TARGET_FILE:SharedFramework>" "$<TARGET_FILE:SharedFramework>.old")
 
-  add_dependencies(FrameworkTest Framework)
+  add_dependencies(SharedFrameworkTest SharedFramework)
 
   # with custom extension
 
-  add_library(FrameworkExt SHARED main.c)
-  set_target_properties(FrameworkExt PROPERTIES FRAMEWORK TRUE)
-  set_target_properties(FrameworkExt PROPERTIES BUNDLE_EXTENSION "foo")
-  install(TARGETS FrameworkExt FRAMEWORK DESTINATION FooExtension)
+  add_library(SharedFrameworkExt SHARED main.c)
+  set_target_properties(SharedFrameworkExt PROPERTIES FRAMEWORK TRUE)
+  set_target_properties(SharedFrameworkExt PROPERTIES BUNDLE_EXTENSION "foo")
+  install(TARGETS SharedFrameworkExt FRAMEWORK DESTINATION FooExtension)
 
-  add_custom_target(FrameworkExtTest ALL
+  add_custom_target(SharedFrameworkExtTest ALL
     COMMAND ${CMAKE_COMMAND} -E copy
-      "$<TARGET_FILE:FrameworkExt>" "$<TARGET_FILE:FrameworkExt>.old")
+      "$<TARGET_FILE:SharedFrameworkExt>" "$<TARGET_FILE:SharedFrameworkExt>.old")
 
-  add_dependencies(FrameworkExtTest FrameworkExt)
+  add_dependencies(SharedFrameworkExtTest SharedFrameworkExt)
+endif()
+
+# Static Framework (not supported for Xcode < 6)
+
+if(NOT XCODE_VERSION VERSION_LESS 6)
+  add_library(StaticFramework STATIC main.c)
+  set_target_properties(StaticFramework PROPERTIES FRAMEWORK TRUE)
+
+  add_custom_target(StaticFrameworkTest ALL
+    COMMAND ${CMAKE_COMMAND} -E copy
+      "$<TARGET_FILE:StaticFramework>" "$<TARGET_FILE:StaticFramework>.old")
+
+  add_dependencies(StaticFrameworkTest StaticFramework)
+
+  # with custom extension
+
+  add_library(StaticFrameworkExt STATIC main.c)
+  set_target_properties(StaticFrameworkExt PROPERTIES FRAMEWORK TRUE)
+  set_target_properties(StaticFrameworkExt PROPERTIES BUNDLE_EXTENSION "foo")
+  install(TARGETS StaticFrameworkExt FRAMEWORK DESTINATION StaticFooExtension)
+
+  add_custom_target(StaticFrameworkExtTest ALL
+    COMMAND ${CMAKE_COMMAND} -E copy
+      "$<TARGET_FILE:StaticFrameworkExt>" "$<TARGET_FILE:StaticFrameworkExt>.old")
+
+  add_dependencies(StaticFrameworkExtTest StaticFrameworkExt)
 endif()
 
 # Bundle

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d525754eabef7a9f6e6696ae323a8ed965e12f2e
commit d525754eabef7a9f6e6696ae323a8ed965e12f2e
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Mon Dec 26 18:01:32 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 26 13:34:58 2017 -0500

    Xcode: Refactor RunCMake.Framework test to prepare for static frameworks

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index c2c744f..63016f1 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -276,8 +276,7 @@ if(XCODE_VERSION AND NOT "${XCODE_VERSION}" VERSION_LESS 3)
   add_RunCMake_test(XcodeProject -DXCODE_VERSION=${XCODE_VERSION})
 endif()
 
-if(NOT XCODE
-    AND CMAKE_C_COMPILER_ID STREQUAL "AppleClang"
+if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang"
     AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 6.0)
   add_RunCMake_test(Framework)
 endif()
diff --git a/Tests/RunCMake/Framework/RunCMakeTest.cmake b/Tests/RunCMake/Framework/RunCMakeTest.cmake
index eeea6f1..1f7d54e 100644
--- a/Tests/RunCMake/Framework/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Framework/RunCMakeTest.cmake
@@ -1,33 +1,19 @@
 include(RunCMake)
 
-# iOS
-
-set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/iOSFrameworkLayout-build)
-set(RunCMake_TEST_NO_CLEAN 1)
-set(RunCMake_TEST_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/ios.cmake")
-
-file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
-file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
-
-run_cmake(FrameworkLayout)
-run_cmake_command(iOSFrameworkLayout-build ${CMAKE_COMMAND} --build .)
-
-unset(RunCMake_TEST_BINARY_DIR)
-unset(RunCMake_TEST_NO_CLEAN)
-unset(RunCMake_TEST_OPTIONS)
-
-# OSX
-
-set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/OSXFrameworkLayout-build)
-set(RunCMake_TEST_NO_CLEAN 1)
-set(RunCMake_TEST_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/osx.cmake")
-
-file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
-file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
-
-run_cmake(FrameworkLayout)
-run_cmake_command(OSXFrameworkLayout-build ${CMAKE_COMMAND} --build .)
-
-unset(RunCMake_TEST_BINARY_DIR)
-unset(RunCMake_TEST_NO_CLEAN)
-unset(RunCMake_TEST_OPTIONS)
+function(framework_layout_test Name Toolchain)
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${Toolchain}FrameworkLayout-build)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  set(RunCMake_TEST_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/${Toolchain}.cmake")
+
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+  run_cmake(FrameworkLayout)
+  run_cmake_command(${Name} ${CMAKE_COMMAND} --build .)
+endfunction()
+
+# build check cannot cope with multi-configuration generators directory layout
+if(NOT RunCMake_GENERATOR STREQUAL "Xcode")
+  framework_layout_test(iOSFrameworkLayout-build ios)
+  framework_layout_test(OSXFrameworkLayout-build osx)
+endif()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45405f00d27031fb9641408c56673532a3ee3bde
commit 45405f00d27031fb9641408c56673532a3ee3bde
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Mon Dec 26 17:55:06 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 26 13:34:40 2017 -0500

    Xcode: Ignore Xcode project warning until issue is fixed
    
    Issue: #15272

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 6cc3054..5f66da0 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -101,7 +101,7 @@ function(run_cmake test)
   endif()
   foreach(o out err)
     string(REGEX REPLACE "\r\n" "\n" actual_std${o} "${actual_std${o}}")
-    string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:|Error kstat returned|[^\n]*from Time Machine by path|[^\n]*Bullseye Testing Technology)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}")
+    string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:|Error kstat returned|[^\n]*is a member of multiple groups|[^\n]*from Time Machine by path|[^\n]*Bullseye Testing Technology)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}")
     string(REGEX REPLACE "\n+$" "" actual_std${o} "${actual_std${o}}")
     set(expect_${o} "")
     if(DEFINED expect_std${o})

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50e1c1056ea82690474dc186d7a4103b33547fa6
commit 50e1c1056ea82690474dc186d7a4103b33547fa6
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Jan 20 23:24:05 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 26 13:30:37 2017 -0500

    Makefile: For static libraries remove only the "real" lib before creating
    
    When creating a static library with the archive tool, only the `.a`
    needs to be removed to start a fresh archive.  Any other files (e.g.
    symbolic links we may later add) are not managed by the archive tool and
    therefore do not need to be cleaned.

diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 33f2c35..ff8b604 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -598,6 +598,20 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules(
   std::vector<std::string> libCleanFiles;
   libCleanFiles.push_back(this->LocalGenerator->MaybeConvertToRelativePath(
     this->LocalGenerator->GetCurrentBinaryDirectory(), targetFullPathReal));
+
+  std::vector<std::string> commands1;
+  // Add a command to remove any existing files for this library.
+  // for static libs only
+  if (this->GeneratorTarget->GetType() == cmStateEnums::STATIC_LIBRARY) {
+    this->LocalGenerator->AppendCleanCommand(commands1, libCleanFiles,
+                                             this->GeneratorTarget, "target");
+    this->LocalGenerator->CreateCDCommand(
+      commands1, this->Makefile->GetCurrentBinaryDirectory(),
+      this->LocalGenerator->GetBinaryDirectory());
+    commands.insert(commands.end(), commands1.begin(), commands1.end());
+    commands1.clear();
+  }
+
   if (targetName != targetNameReal) {
     libCleanFiles.push_back(this->LocalGenerator->MaybeConvertToRelativePath(
       this->LocalGenerator->GetCurrentBinaryDirectory(), targetFullPath));
@@ -634,19 +648,6 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules(
   }
 #endif
 
-  std::vector<std::string> commands1;
-  // Add a command to remove any existing files for this library.
-  // for static libs only
-  if (this->GeneratorTarget->GetType() == cmStateEnums::STATIC_LIBRARY) {
-    this->LocalGenerator->AppendCleanCommand(commands1, libCleanFiles,
-                                             this->GeneratorTarget, "target");
-    this->LocalGenerator->CreateCDCommand(
-      commands1, this->Makefile->GetCurrentBinaryDirectory(),
-      this->LocalGenerator->GetBinaryDirectory());
-    commands.insert(commands.end(), commands1.begin(), commands1.end());
-    commands1.clear();
-  }
-
   // Add the pre-build and pre-link rules building but not when relinking.
   if (!relink) {
     this->LocalGenerator->AppendCustomCommands(

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8643ca75c705568bc9bb084a5182baef04865d2d
commit 8643ca75c705568bc9bb084a5182baef04865d2d
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Jan 20 23:24:05 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 26 13:28:38 2017 -0500

    Makefile: Re-order list of files to clean
    
    Revise construction of the list of files to be cleaned for the target to
    list the "real" file first.

diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 27b7c21..33f2c35 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -597,12 +597,12 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules(
   // Clean files associated with this library.
   std::vector<std::string> libCleanFiles;
   libCleanFiles.push_back(this->LocalGenerator->MaybeConvertToRelativePath(
-    this->LocalGenerator->GetCurrentBinaryDirectory(), targetFullPath));
-  if (targetNameReal != targetName) {
+    this->LocalGenerator->GetCurrentBinaryDirectory(), targetFullPathReal));
+  if (targetName != targetNameReal) {
     libCleanFiles.push_back(this->LocalGenerator->MaybeConvertToRelativePath(
-      this->LocalGenerator->GetCurrentBinaryDirectory(), targetFullPathReal));
+      this->LocalGenerator->GetCurrentBinaryDirectory(), targetFullPath));
   }
-  if (targetNameSO != targetName && targetNameSO != targetNameReal) {
+  if (targetNameSO != targetNameReal && targetNameSO != targetName) {
     libCleanFiles.push_back(this->LocalGenerator->MaybeConvertToRelativePath(
       this->LocalGenerator->GetCurrentBinaryDirectory(), targetFullPathSO));
   }

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

Summary of changes:
 Help/command/add_library.rst                       |    2 +-
 Help/command/install.rst                           |    6 +-
 Help/prop_tgt/FRAMEWORK.rst                        |    4 +-
 Help/release/dev/static-frameworks.rst             |    6 ++
 Source/cmGeneratorTarget.cxx                       |    3 +-
 Source/cmGlobalXCodeGenerator.cxx                  |   39 +++++++++--
 Source/cmInstallCommand.cxx                        |   42 +++++++++---
 Source/cmMakefileLibraryTargetGenerator.cxx        |   35 +++++-----
 Source/cmTarget.cxx                                |    3 +-
 Tests/RunCMake/CMakeLists.txt                      |    3 +-
 Tests/RunCMake/Framework/FrameworkLayout.cmake     |    5 +-
 .../Framework/FrameworkTypeSHARED-build-stdout.txt |    1 +
 .../Framework/FrameworkTypeSTATIC-build-stdout.txt |    1 +
 Tests/RunCMake/Framework/RunCMakeTest.cmake        |   69 +++++++++++---------
 Tests/RunCMake/RunCMake.cmake                      |    2 +-
 Tests/RunCMake/XcodeProject/XcodeBundles.cmake     |   52 +++++++++++----
 16 files changed, 187 insertions(+), 86 deletions(-)
 create mode 100644 Help/release/dev/static-frameworks.rst
 create mode 100644 Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt
 create mode 100644 Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Fri Jan 27 00:01:08 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Fri, 27 Jan 2017 00:01:08 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1198-g83596d4
Message-ID: <20170127050108.7AF92FA590@public.kitware.com>

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  83596d4ba133014b6ed1ab993f61476634e2bfdb (commit)
      from  b8db2ed79675930421ac96256d63af515e624d38 (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=83596d4ba133014b6ed1ab993f61476634e2bfdb
commit 83596d4ba133014b6ed1ab993f61476634e2bfdb
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Fri Jan 27 00:01:05 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jan 27 00:01:05 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 93f128f..8290ba3 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 20170126)
+set(CMake_VERSION_PATCH 20170127)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 27 09:04:52 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Jan 2017 09:04:52 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1202-gfa9c129
Message-ID: <20170127140452.34CA4FA502@public.kitware.com>

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  fa9c12933f0fc51ee577a43b51381b4d8e4a127b (commit)
       via  c3a22518f83dfe8e1787e93f05398a5263cc781a (commit)
       via  d491172445dcd32547fbeb3598510455e8e44132 (commit)
       via  1a2a9b0d08c7ba2af168856b1220d42ff9a80921 (commit)
      from  83596d4ba133014b6ed1ab993f61476634e2bfdb (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=fa9c12933f0fc51ee577a43b51381b4d8e4a127b
commit fa9c12933f0fc51ee577a43b51381b4d8e4a127b
Merge: 83596d4 c3a2251
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 27 09:04:49 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 27 09:04:49 2017 -0500

    Merge topic 'test-GeneratorExpression-update'
    
    c3a22518 Tests: Extend GeneratorExpression to work with more configurations
    d4911724 Tests: Teach GeneratorExpression to cover spaces in include dirs
    1a2a9b0d Tests: Simplify GeneratorExpression imported include directory check


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

Summary of changes:
 Tests/GeneratorExpression/CMakeLists.txt    |   13 +++++++------
 Tests/GeneratorExpression/check-part3.cmake |   19 ++++++++-----------
 2 files changed, 15 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 27 09:04:55 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Jan 2017 09:04:55 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1204-g86ec0ac
Message-ID: <20170127140455.5F8FEFA503@public.kitware.com>

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  86ec0aca050f2568cea691a0ec965f6a95e06d2b (commit)
       via  243aed525a2fd8e5fe32139fd0f8d0cc0e40cc33 (commit)
      from  fa9c12933f0fc51ee577a43b51381b4d8e4a127b (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=86ec0aca050f2568cea691a0ec965f6a95e06d2b
commit 86ec0aca050f2568cea691a0ec965f6a95e06d2b
Merge: fa9c129 243aed5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 27 09:04:53 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 27 09:04:53 2017 -0500

    Merge topic 'topic-reproducible-build'
    
    243aed52 cmTimestamp: Support SOURCE_DATE_EPOCH to override current time


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

Summary of changes:
 Help/command/string.rst                                     |    6 ++++++
 Help/release/dev/SOURCE_DATE_EPOCH.rst                      |    5 +++++
 Source/cmTimestamp.cxx                                      |   11 +++++++++++
 Tests/RunCMake/string/RunCMakeTest.cmake                    |    5 +++++
 .../Timestamp-result.txt}                                   |    0
 Tests/RunCMake/string/Timestamp-stderr.txt                  |    1 +
 Tests/RunCMake/string/Timestamp.cmake                       |    3 +++
 .../TimestampEmpty-result.txt}                              |    0
 Tests/RunCMake/string/TimestampEmpty-stderr.txt             |    1 +
 Tests/RunCMake/string/TimestampEmpty.cmake                  |    3 +++
 Tests/RunCMake/string/TimestampInvalid-result.txt           |    1 +
 Tests/RunCMake/string/TimestampInvalid-stderr.txt           |    1 +
 Tests/RunCMake/string/TimestampInvalid.cmake                |    3 +++
 Tests/RunCMake/string/TimestampInvalid2-result.txt          |    1 +
 Tests/RunCMake/string/TimestampInvalid2-stderr.txt          |    1 +
 Tests/RunCMake/string/TimestampInvalid2.cmake               |    3 +++
 16 files changed, 45 insertions(+)
 create mode 100644 Help/release/dev/SOURCE_DATE_EPOCH.rst
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => string/Timestamp-result.txt} (100%)
 create mode 100644 Tests/RunCMake/string/Timestamp-stderr.txt
 create mode 100644 Tests/RunCMake/string/Timestamp.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => string/TimestampEmpty-result.txt} (100%)
 create mode 100644 Tests/RunCMake/string/TimestampEmpty-stderr.txt
 create mode 100644 Tests/RunCMake/string/TimestampEmpty.cmake
 create mode 100644 Tests/RunCMake/string/TimestampInvalid-result.txt
 create mode 100644 Tests/RunCMake/string/TimestampInvalid-stderr.txt
 create mode 100644 Tests/RunCMake/string/TimestampInvalid.cmake
 create mode 100644 Tests/RunCMake/string/TimestampInvalid2-result.txt
 create mode 100644 Tests/RunCMake/string/TimestampInvalid2-stderr.txt
 create mode 100644 Tests/RunCMake/string/TimestampInvalid2.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 27 09:04:57 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Jan 2017 09:04:57 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1206-g0ea578b
Message-ID: <20170127140457.DC709FA521@public.kitware.com>

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  0ea578b498059340d575be263f5b6a91581f5ce5 (commit)
       via  24d73fa0eb2e9f7cdc8fb8192445ce3ee04cf7d3 (commit)
      from  86ec0aca050f2568cea691a0ec965f6a95e06d2b (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=0ea578b498059340d575be263f5b6a91581f5ce5
commit 0ea578b498059340d575be263f5b6a91581f5ce5
Merge: 86ec0ac 24d73fa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 27 09:04:56 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 27 09:04:56 2017 -0500

    Merge topic 'GNUG_define'
    
    24d73fa0 GNUC: also check __GNUG__ define when checking for g++


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

Summary of changes:
 ...U-DetermineCompiler.cmake => GNU-C-DetermineCompiler.cmake} |    0
 ...DetermineCompiler.cmake => GNU-CXX-DetermineCompiler.cmake} |    8 ++++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 copy Modules/Compiler/{GNU-DetermineCompiler.cmake => GNU-C-DetermineCompiler.cmake} (100%)
 rename Modules/Compiler/{GNU-DetermineCompiler.cmake => GNU-CXX-DetermineCompiler.cmake} (53%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 27 09:05:00 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Jan 2017 09:05:00 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1208-g325c615
Message-ID: <20170127140500.A7D4BFA521@public.kitware.com>

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  325c6153088c673569971958f107f6cb97b67c50 (commit)
       via  895f7f16a79428689a263ba5cd9a72647dc8e912 (commit)
      from  0ea578b498059340d575be263f5b6a91581f5ce5 (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=325c6153088c673569971958f107f6cb97b67c50
commit 325c6153088c673569971958f107f6cb97b67c50
Merge: 0ea578b 895f7f1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 27 09:04:58 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 27 09:04:58 2017 -0500

    Merge topic 'genex-if'
    
    895f7f16 Genex: Add `IF` generator expression


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

Summary of changes:
 Help/manual/cmake-generator-expressions.7.rst      |    2 ++
 Help/release/dev/if-genex.rst                      |    7 +++++++
 Source/cmGeneratorExpressionNode.cxx               |   22 ++++++++++++++++++++
 Tests/GeneratorExpression/CMakeLists.txt           |    4 ++++
 Tests/GeneratorExpression/check-part4.cmake        |    5 +++++
 .../BadIF-result.txt}                              |    0
 .../RunCMake/GeneratorExpression/BadIF-stderr.txt  |   15 +++++++++++++
 .../{BadZero.cmake => BadIF.cmake}                 |    6 +++---
 .../GeneratorExpression/RunCMakeTest.cmake         |    1 +
 9 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 Help/release/dev/if-genex.rst
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => GeneratorExpression/BadIF-result.txt} (100%)
 create mode 100644 Tests/RunCMake/GeneratorExpression/BadIF-stderr.txt
 copy Tests/RunCMake/GeneratorExpression/{BadZero.cmake => BadIF.cmake} (50%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 27 09:05:30 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Jan 2017 09:05:30 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2377-gad64b91
Message-ID: <20170127140530.B9C7CFA510@public.kitware.com>

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  ad64b91c25208a5b27f49cef201ae155aae3cd9e (commit)
       via  325c6153088c673569971958f107f6cb97b67c50 (commit)
       via  0ea578b498059340d575be263f5b6a91581f5ce5 (commit)
       via  86ec0aca050f2568cea691a0ec965f6a95e06d2b (commit)
       via  fa9c12933f0fc51ee577a43b51381b4d8e4a127b (commit)
       via  83596d4ba133014b6ed1ab993f61476634e2bfdb (commit)
      from  0758c659996640f6558d09ee9835ad325c60c25d (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=ad64b91c25208a5b27f49cef201ae155aae3cd9e
commit ad64b91c25208a5b27f49cef201ae155aae3cd9e
Merge: 0758c65 325c615
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 27 09:05:07 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 27 09:05:07 2017 -0500

    Merge branch 'master' into next


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 27 09:17:38 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Jan 2017 09:17:38 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2379-g75650c6
Message-ID: <20170127141738.D3009F95EF@public.kitware.com>

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  75650c68024ad5d9d3374e197d5fdec5ae9406aa (commit)
       via  f01045ea36621fbc66a87bb041cd403d47304211 (commit)
      from  ad64b91c25208a5b27f49cef201ae155aae3cd9e (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=75650c68024ad5d9d3374e197d5fdec5ae9406aa
commit 75650c68024ad5d9d3374e197d5fdec5ae9406aa
Merge: ad64b91 f01045e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 27 09:17:38 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 27 09:17:38 2017 -0500

    Merge topic 'test-preprocess-configs' into next
    
    f01045ea Tests: Make Preprocess test work in RelWithDebInfo and MinSizeRel


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f01045ea36621fbc66a87bb041cd403d47304211
commit f01045ea36621fbc66a87bb041cd403d47304211
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Thu Jan 26 15:34:24 2017 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 27 09:09:15 2017 -0500

    Tests: Make Preprocess test work in RelWithDebInfo and MinSizeRel

diff --git a/Tests/Preprocess/CMakeLists.txt b/Tests/Preprocess/CMakeLists.txt
index 15f0338..807a427 100644
--- a/Tests/Preprocess/CMakeLists.txt
+++ b/Tests/Preprocess/CMakeLists.txt
@@ -214,18 +214,24 @@ set(FILE_PATH "${Preprocess_SOURCE_DIR}/file_def.h")
 set(TARGET_PATH "${Preprocess_SOURCE_DIR}/target_def.h")
 
 # Set some definition properties.
-foreach(c "" "_DEBUG" "_RELEASE")
+foreach(c "" "_DEBUG" "_RELEASE" "_RELWITHDEBINFO" "_MINSIZEREL")
+  set(FLAVOR "${c}")
+  # Treat RelWithDebInfo and MinSizeRel as Release to avoid having
+  # an exponentional matrix of inclusions and exclusions of defines
+  if("${c}" STREQUAL "_RELWITHDEBINFO" OR "${c}" STREQUAL "_MINSIZEREL")
+    set(FLAVOR "_RELEASE")
+  endif()
   set_property(
     DIRECTORY .
-    APPEND PROPERTY COMPILE_DEFINITIONS${c} "DIRECTORY_DEF${c}"
+    APPEND PROPERTY COMPILE_DEFINITIONS${c} "DIRECTORY_DEF${FLAVOR}"
     )
   set_property(
     TARGET Preprocess
-    PROPERTY COMPILE_DEFINITIONS${c} "TARGET_DEF${c}"
+    PROPERTY COMPILE_DEFINITIONS${c} "TARGET_DEF${FLAVOR}"
     )
   set_property(
     SOURCE preprocess.c preprocess.cxx
-    PROPERTY COMPILE_DEFINITIONS${c} "FILE_DEF${c}"
+    PROPERTY COMPILE_DEFINITIONS${c} "FILE_DEF${FLAVOR}"
     )
 endforeach()
 

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

Summary of changes:
 Tests/Preprocess/CMakeLists.txt |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 27 09:21:25 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Jan 2017 09:21:25 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2388-g51c1863
Message-ID: <20170127142125.07E78F9E46@public.kitware.com>

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  51c1863936254a27fb1fe756f2c5c2bcef718422 (commit)
       via  560574b0c03f2cd8f34cf4a90f6f41648b08a1e9 (commit)
       via  3cfde818354a8f8e26a9b0b6589f3cc38b50e48d (commit)
       via  f0165eb624403c26989d1039c076d61536cc3074 (commit)
       via  9da7bf082513952c47ffb738b722df49a2fd7152 (commit)
       via  4cf4acebe347bfd55e051354b9748a5b0c25b58a (commit)
       via  614a97a57b65454a14231ed60346884bab2399be (commit)
       via  65a0bfd83cc47e60b9f42262f762c676fb210aa2 (commit)
       via  4da3cae9ffb3202d9c447e9f497f8a2758538b06 (commit)
      from  75650c68024ad5d9d3374e197d5fdec5ae9406aa (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=51c1863936254a27fb1fe756f2c5c2bcef718422
commit 51c1863936254a27fb1fe756f2c5c2bcef718422
Merge: 75650c6 560574b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 27 09:21:20 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 27 09:21:20 2017 -0500

    Merge topic 'FeatureSummary_enhancement' into next
    
    560574b0 FeatureSummary: Update release notes
    3cfde818 FeatureSummary: Refactor to use global properties for package types
    f0165eb6 FeatureSummary: Allow lists of dependencies in ADD_FEATURE_INFO
    9da7bf08 FeatureSummary: Add QUIET_ON_EMPTY option to feature_summary
    4cf4aceb FeatureSummary: Add unit tests
    614a97a5 FeatureSummary: Do not force OPTIONAL type in SET_PACKAGE_PROPERTIES
    65a0bfd8 FeatureSummary: Add deprecation warnings to deprecated commands
    4da3cae9 FeatureSummary: Clean printed output


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=560574b0c03f2cd8f34cf4a90f6f41648b08a1e9
commit 560574b0c03f2cd8f34cf4a90f6f41648b08a1e9
Author:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
AuthorDate: Fri Jan 27 09:24:28 2017 +0100
Commit:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
CommitDate: Fri Jan 27 09:24:28 2017 +0100

    FeatureSummary: Update release notes

diff --git a/Help/release/dev/FeatureSummary_enhancement.rst b/Help/release/dev/FeatureSummary_enhancement.rst
new file mode 100644
index 0000000..3a5d85f
--- /dev/null
+++ b/Help/release/dev/FeatureSummary_enhancement.rst
@@ -0,0 +1,22 @@
+FeatureSummary_enhancement
+--------------------------
+
+* The :command:`set_package_info`, :command:`set_feature_info`,
+  :command:`print_enabled_features` and :command:`print_disabled_features`
+  commands from the the :module:`FeatureSummary` module are now deprecated.
+
+* The :command:`set_package_properties` command no longer forces the package
+  type to ``OPTIONAL`` when the type is not explicitly set.
+
+* The :command:`feature_summary` command in the :module:`FeatureSummary` module
+  accepts the new ``QUIET_ON_EMPTY`` option that will suppresses the output when
+  the list of packages that belong to the selected category is empty.
+
+* The :command:`add_feature_info` in the :module:`FeatureSummary` module learned
+  to accept lists of dependencies for deciding whether a feature is enabled or
+  not.
+
+* The package types accepted by the the :module:`FeatureSummary` module can now
+  be tweaked by changing the :variable:`FeatureSummary_PKG_TYPES`,
+  :variable:`FeatureSummary_REQUIRED_PKG_TYPES` and
+  :variable:`FeatureSummary_DEFAULT_PKG_TYPE` global properties.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cfde818354a8f8e26a9b0b6589f3cc38b50e48d
commit 3cfde818354a8f8e26a9b0b6589f3cc38b50e48d
Author:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
AuthorDate: Wed Jan 25 09:34:45 2017 +0100
Commit:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
CommitDate: Thu Jan 26 12:28:12 2017 +0100

    FeatureSummary: Refactor to use global properties for package types
    
    These new global properties were added:
    
    * FeatureSummary_PKG_TYPES: Package types accepted by FeatureSummary
      (default REQUIRED RECOMMENDED OPTIONAL RUNTIME).
    * FeatureSummary_REQUIRED_PKG_TYPES: Package types that will cause
      FeatureSummary to abort when called with
      FATAL_ON_MISSING_REQUIRED_PACKAGES and a package in these categories
      is missing (default REQUIRED).
    * FeatureSummary_DEFAULT_PKG_TYPE: Default package type assigned when
      not explicitly assigned by the user (default OPTIONAL).
    
    This allows to add and remove new package types that can be printed
    selectively using the "WHAT" argument.

diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index 490c956..8910be7 100644
--- a/Modules/FeatureSummary.cmake
+++ b/Modules/FeatureSummary.cmake
@@ -21,23 +21,86 @@ packages and/or feature for a build tree such as::
        * Enables macros in MyWordProcessor
     Foo, Foo provides cool stuff.
 
+Global Properties
+^^^^^^^^^^^^^^^^^
+
+.. variable:: FeatureSummary_PKG_TYPES
+
+The global property :variable:`FeatureSummary_PKG_TYPES` defines the type of
+packages used by `FeatureSummary`.
+
+The order in this list is important, the first package type in the list is the
+least important, the last is the most important. the of a package can only be
+changed to higher types.
+
+The default package types are , ``RUNTIME``, ``OPTIONAL``, ``RECOMMENDED`` and
+``REQUIRED``, and their importance is
+``RUNTIME < OPTIONAL < RECOMMENDED < REQUIRED``.
+
+
+.. variable:: FeatureSummary_REQUIRED_PKG_TYPES
+
+The global property :variable:`FeatureSummary_REQUIRED_PKG_TYPES` defines which
+package types are required.
+
+If one or more package in this categories has not been found, CMake will abort
+when calling :cmd;`feature_summary` with the
+'FATAL_ON_MISSING_REQUIRED_PACKAGES' option enabled.
+
+The default value for this global property is ``REQUIRED``.
+
+
+.. variable:: FeatureSummary_DEFAULT_PKG_TYPE
+
+The global property :variable:`FeatureSummary_DEFAULT_PKG_TYPE` defines which
+package type is the default one.
+When calling :cmd;`feature_summary`, if the user did not set the package type
+explicitly, the package will be assigned to this category.
+
+This value must be one of the types defined in the
+:variable:`FeatureSummary_PKG_TYPES` global property unless the package type
+is set for all the packages.
+
+The default value for this global property is ``OPTIONAL``.
+
+#]=======================================================================]
+
+get_property(_fsPkgTypeIsSet GLOBAL PROPERTY FeatureSummary_PKG_TYPES SET)
+if(NOT _fsPkgTypeIsSet)
+  set_property(GLOBAL PROPERTY FeatureSummary_PKG_TYPES RUNTIME OPTIONAL RECOMMENDED REQUIRED)
+endif()
+
+get_property(_fsReqPkgTypesIsSet GLOBAL PROPERTY FeatureSummary_REQUIRED_PKG_TYPES SET)
+if(NOT _fsReqPkgTypesIsSet)
+  set_property(GLOBAL PROPERTY FeatureSummary_REQUIRED_PKG_TYPES REQUIRED)
+endif()
+
+get_property(_fsDefaultPkgTypeIsSet GLOBAL PROPERTY FeatureSummary_DEFAULT_PKG_TYPE SET)
+if(NOT _fsDefaultPkgTypeIsSet)
+  set_property(GLOBAL PROPERTY FeatureSummary_DEFAULT_PKG_TYPE OPTIONAL)
+endif()
+
+#[=======================================================================[.rst:
+
 Functions
 ^^^^^^^^^
 
 #]=======================================================================]
 
+include(CMakeParseArguments)
+
 function(_FS_GET_FEATURE_SUMMARY _property _var _includeQuiet)
 
+  get_property(_fsPkgTypes GLOBAL PROPERTY FeatureSummary_PKG_TYPES)
+  get_property(_fsDefaultPkgType GLOBAL PROPERTY FeatureSummary_DEFAULT_PKG_TYPE)
+
   set(_type "ANY")
-  if("${_property}" MATCHES "REQUIRED_")
-    set(_type "REQUIRED")
-  elseif("${_property}" MATCHES "RECOMMENDED_")
-    set(_type "RECOMMENDED")
-  elseif("${_property}" MATCHES "RUNTIME_")
-    set(_type "RUNTIME")
-  elseif("${_property}" MATCHES "OPTIONAL_")
-    set(_type "OPTIONAL")
-  endif()
+  foreach(_fsPkgType ${_fsPkgTypes})
+    if("${_property}" MATCHES "${_fsPkgType}_PACKAGES_(NOT_)?FOUND")
+      set(_type "${_fsPkgType}")
+      break()
+    endif()
+  endforeach()
 
   if("${_property}" MATCHES "PACKAGES_FOUND")
     set(_property "PACKAGES_FOUND")
@@ -57,15 +120,30 @@ function(_FS_GET_FEATURE_SUMMARY _property _var _includeQuiet)
     # does this package belong to the type we currently want to list ?
     get_property(_currentType  GLOBAL PROPERTY _CMAKE_${_currentFeature}_TYPE)
     if(NOT _currentType)
-      set(_currentType OPTIONAL)
+      list(FIND _fsPkgTypes "${_fsDefaultPkgType}" _defaultInPkgTypes)
+      if("${_defaultInPkgTypes}" STREQUAL "-1")
+        string(REGEX REPLACE ";([^;]+)$" " and \\1" _fsPkgTypes_msg "${_fsPkgTypes}")
+        string(REPLACE ";" ", " _fsPkgTypes_msg "${_fsPkgTypes_msg}")
+        message(FATAL_ERROR "Bad package property type ${_fsDefaultPkgType} used in global property FeatureSummary_DEFAULT_PKG_TYPE. "
+                            "Valid types are ${_fsPkgTypes_msg}. "
+                            "Either update FeatureSummary_DEFAULT_PKG_TYPE or add ${_fsDefaultPkgType} to the FeatureSummary_PKG_TYPES global property.")
+      endif()
+      set(_currentType ${_fsDefaultPkgType})
     endif()
 
     if("${_type}" STREQUAL ANY  OR  "${_type}" STREQUAL "${_currentType}")
-
       # check whether the current feature/package should be in the output depending on whether it was QUIET or not
       set(includeThisOne TRUE)
+      set(_required FALSE)
       # skip QUIET packages, except if they are REQUIRED or INCLUDE_QUIET_PACKAGES has been set
-      if((NOT "${_currentType}" STREQUAL "REQUIRED") AND NOT _includeQuiet)
+      get_property(_fsReqPkgTypes GLOBAL PROPERTY FeatureSummary_REQUIRED_PKG_TYPES)
+      foreach(_fsReqPkgType ${_fsReqPkgTypes})
+        if("${_currentType}" STREQUAL "${_fsReqPkgType}")
+          set(_required TRUE)
+          break()
+        endif()
+      endforeach()
+      if(NOT _required AND NOT _includeQuiet)
         get_property(_isQuiet  GLOBAL PROPERTY _CMAKE_${_currentFeature}_QUIET)
         if(_isQuiet)
           set(includeThisOne FALSE)
@@ -144,22 +222,15 @@ endfunction()
    the list of all packages which have been found
   ``PACKAGES_NOT_FOUND``
    the list of all packages which have not been found
-  ``OPTIONAL_PACKAGES_FOUND``
-   only those packages which have been found which have the type OPTIONAL
-  ``OPTIONAL_PACKAGES_NOT_FOUND``
-   only those packages which have not been found which have the type OPTIONAL
-  ``RECOMMENDED_PACKAGES_FOUND``
-   only those packages which have been found which have the type RECOMMENDED
-  ``RECOMMENDED_PACKAGES_NOT_FOUND``
-   only those packages which have not been found which have the type RECOMMENDED
-  ``REQUIRED_PACKAGES_FOUND``
-   only those packages which have been found which have the type REQUIRED
-  ``REQUIRED_PACKAGES_NOT_FOUND``
-   only those packages which have not been found which have the type REQUIRED
-  ``RUNTIME_PACKAGES_FOUND``
-   only those packages which have been found which have the type RUNTIME
-  ``RUNTIME_PACKAGES_NOT_FOUND``
-   only those packages which have not been found which have the type RUNTIME
+
+  For each package type ``<TYPE>`` defined by the
+  :variable:`FeatureSummary_PKG_TYPES` global property, the following
+  information can also be used:
+
+  ``<TYPE>_PACKAGES_FOUND``
+   only those packages which have been found which have the type <TYPE>
+  ``<TYPE>_PACKAGES_NOT_FOUND``
+   only those packages which have not been found which have the type <TYPE>
 
   With the exception of the ``ALL`` value, these values can be combined
   in order to customize the output. For example:
@@ -178,7 +249,15 @@ endfunction()
   packages which have been searched with ``find_package(... QUIET)`` will
   also be listed.  By default they are skipped.  If
   ``FATAL_ON_MISSING_REQUIRED_PACKAGES`` is given, CMake will abort if a
-  package which is marked as ``REQUIRED`` has not been found.
+  package which is marked as one of the package types listed in the
+  :variable:`FeatureSummary_REQUIRED_PKG_TYPES` global property has not been
+  found.
+  The default value for the :variable:`FeatureSummary_REQUIRED_PKG_TYPES` global
+  property is ``REQUIRED``.
+
+  The :variable:`FeatureSummary_DEFAULT_PKG_TYPE` global property can be
+  modified to change the default package type assigned when not explicitly
+  assigned by the user.
 
   If the ``QUIET_ON_EMPTY`` option is used, if only one type of package was
   requested, and no packages belonging to that category were found, then no
@@ -204,6 +283,23 @@ endfunction()
                    DESCRIPTION "Enabled Features:"
                    VAR enabledFeaturesText)
    message(STATUS "${enabledFeaturesText}")
+
+  Example 3, change default package types and print only the categories that
+  are not empty:
+
+  .. code-block:: cmake
+
+   include(FeatureSummary)
+   set_property(GLOBAL APPEND PROPERTY FeatureSummary_PKG_TYPES BUILD)
+   find_package(FOO)
+   set_package_properties(FOO PROPERTIES TYPE BUILD)
+   feature_summary(WHAT BUILD_PACKAGES_FOUND
+                   Description "Build tools found:"
+                   QUIET_ON_EMPTY)
+   feature_summary(WHAT BUILD_PACKAGES_NOT_FOUND
+                   Description "Build tools not found:"
+                   QUIET_ON_EMPTY)
+
 #]=======================================================================]
 
 function(FEATURE_SUMMARY)
@@ -225,15 +321,14 @@ function(FEATURE_SUMMARY)
   set(validWhatParts "ENABLED_FEATURES"
                      "DISABLED_FEATURES"
                      "PACKAGES_FOUND"
-                     "PACKAGES_NOT_FOUND"
-                     "OPTIONAL_PACKAGES_FOUND"
-                     "OPTIONAL_PACKAGES_NOT_FOUND"
-                     "RECOMMENDED_PACKAGES_FOUND"
-                     "RECOMMENDED_PACKAGES_NOT_FOUND"
-                     "REQUIRED_PACKAGES_FOUND"
-                     "REQUIRED_PACKAGES_NOT_FOUND"
-                     "RUNTIME_PACKAGES_FOUND"
-                     "RUNTIME_PACKAGES_NOT_FOUND")
+                     "PACKAGES_NOT_FOUND")
+
+  get_property(_fsPkgTypes GLOBAL PROPERTY FeatureSummary_PKG_TYPES)
+  get_property(_fsReqPkgTypes GLOBAL PROPERTY FeatureSummary_REQUIRED_PKG_TYPES)
+  foreach(_fsPkgType ${_fsPkgTypes})
+    list(APPEND validWhatParts "${_fsPkgType}_PACKAGES_FOUND"
+                               "${_fsPkgType}_PACKAGES_NOT_FOUND")
+  endforeach()
 
   list(FIND validWhatParts "${_FS_WHAT}" indexInList)
   if(NOT "${indexInList}" STREQUAL "-1")
@@ -241,26 +336,27 @@ function(FEATURE_SUMMARY)
     if(_featureSummary OR NOT _FS_QUIET_ON_EMPTY)
       set(_fullText "${_FS_DESCRIPTION}${_featureSummary}\n")
     endif()
-    if (("${_FS_WHAT}" STREQUAL "REQUIRED_PACKAGES_NOT_FOUND") AND _featureSummary)
-      set(requiredPackagesNotFound TRUE)
+
+    if(_featureSummary)
+      foreach(_fsReqPkgType ${_fsReqPkgTypes})
+        if("${_FS_WHAT}" STREQUAL "${_fsReqPkgType}_PACKAGES_NOT_FOUND")
+          set(requiredPackagesNotFound TRUE)
+          break()
+        endif()
+      endforeach()
     endif()
 
   else()
     if("${_FS_WHAT}" STREQUAL "ALL")
 
-      set(allWhatParts "ENABLED_FEATURES"
-                       "RUNTIME_PACKAGES_FOUND"
-                       "OPTIONAL_PACKAGES_FOUND"
-                       "RECOMMENDED_PACKAGES_FOUND"
-                       "REQUIRED_PACKAGES_FOUND"
-
-                       "DISABLED_FEATURES"
-                       "RUNTIME_PACKAGES_NOT_FOUND"
-                       "OPTIONAL_PACKAGES_NOT_FOUND"
-                       "RECOMMENDED_PACKAGES_NOT_FOUND"
-                       "REQUIRED_PACKAGES_NOT_FOUND"
-      )
-
+      set(allWhatParts "ENABLED_FEATURES")
+      foreach(_fsPkgType ${_fsPkgTypes})
+        list(APPEND allWhatParts "${_fsPkgType}_PACKAGES_FOUND")
+      endforeach()
+      list(APPEND allWhatParts "DISABLED_FEATURES")
+      foreach(_fsPkgType ${_fsPkgTypes})
+        list(APPEND allWhatParts "${_fsPkgType}_PACKAGES_NOT_FOUND")
+      endforeach()
     else()
       set(allWhatParts)
       foreach(part ${_FS_WHAT})
@@ -281,14 +377,10 @@ function(FEATURE_SUMMARY)
     set(title_DISABLED_FEATURES              "The following features have been disabled:")
     set(title_PACKAGES_FOUND                 "The following packages have been found:")
     set(title_PACKAGES_NOT_FOUND             "The following packages have not been found:")
-    set(title_OPTIONAL_PACKAGES_FOUND        "The following OPTIONAL packages have been found:")
-    set(title_OPTIONAL_PACKAGES_NOT_FOUND    "The following OPTIONAL packages have not been found:")
-    set(title_RECOMMENDED_PACKAGES_FOUND     "The following RECOMMENDED packages have been found:")
-    set(title_RECOMMENDED_PACKAGES_NOT_FOUND "The following RECOMMENDED packages have not been found:")
-    set(title_REQUIRED_PACKAGES_FOUND        "The following REQUIRED packages have been found:")
-    set(title_REQUIRED_PACKAGES_NOT_FOUND    "The following REQUIRED packages have not been found:")
-    set(title_RUNTIME_PACKAGES_FOUND         "The following RUNTIME packages have been found:")
-    set(title_RUNTIME_PACKAGES_NOT_FOUND     "The following RUNTIME packages have not been found:")
+    foreach(_fsPkgType ${_fsPkgTypes})
+      set(title_${_fsPkgType}_PACKAGES_FOUND     "The following ${_fsPkgType} packages have been found:")
+      set(title_${_fsPkgType}_PACKAGES_NOT_FOUND "The following ${_fsPkgType} packages have not been found:")
+    endforeach()
 
     set(_fullText "${_FS_DESCRIPTION}")
     foreach(part ${allWhatParts})
@@ -299,9 +391,12 @@ function(FEATURE_SUMMARY)
           string(APPEND _fullText "\n-- ")
         endif()
         string(APPEND _fullText "${title_${part}}\n${_tmp}\n")
-        if("${part}" STREQUAL "REQUIRED_PACKAGES_NOT_FOUND")
-          set(requiredPackagesNotFound TRUE)
-        endif()
+        foreach(_fsReqPkgType ${_fsReqPkgTypes})
+          if("${part}" STREQUAL "${_fsReqPkgType}_PACKAGES_NOT_FOUND")
+            set(requiredPackagesNotFound TRUE)
+            break()
+          endif()
+        endforeach()
       endif()
     endforeach()
   endif()
@@ -375,7 +470,8 @@ endfunction()
     TYPEs (``RUNTIME < OPTIONAL < RECOMMENDED < REQUIRED``), lower TYPEs are
     ignored.  The ``TYPE`` property is project-specific, so it cannot be set
     by the Find-module, but must be set in the project.
-
+    Type accepted can be changed by setting the
+    :variable:`FeatureSummary_PKG_TYPES` global property.
 
   ``PURPOSE <purpose>``
     This describes which features this package enables in the
@@ -448,18 +544,23 @@ function(SET_PACKAGE_PROPERTIES _name _props)
     set_property(GLOBAL APPEND PROPERTY _CMAKE_${_name}_PURPOSE "${_SPP_PURPOSE}" )
   endif()
 
+  get_property(_fsPkgTypes GLOBAL PROPERTY FeatureSummary_PKG_TYPES)
+  get_property(_fsDefaultPkgType GLOBAL PROPERTY FeatureSummary_DEFAULT_PKG_TYPE)
+
   # handle the TYPE
   if(DEFINED _SPP_TYPE)
-    # List the supported types, according to their priority
-    set(validTypes "RUNTIME" "OPTIONAL" "RECOMMENDED" "REQUIRED" )
-    list(FIND validTypes ${_SPP_TYPE} _typeIndexInList)
+    # Supported types are listed in FeatureSummary_PKG_TYPES according to their priority
+    get_property(_fsPkgTypes GLOBAL PROPERTY FeatureSummary_PKG_TYPES)
+    list(FIND _fsPkgTypes ${_SPP_TYPE} _typeIndexInList)
     if("${_typeIndexInList}" STREQUAL "-1" )
+      string(REGEX REPLACE ";([^;]+)$" " and \\1" _fsPkgTypes_msg "${_fsPkgTypes}")
+      string(REPLACE ";" ", " _fsPkgTypes_msg "${_fsPkgTypes_msg}")
       message(FATAL_ERROR "Bad package property type ${_SPP_TYPE} used in SET_PACKAGE_PROPERTIES(). "
-                          "Valid types are OPTIONAL, RECOMMENDED, REQUIRED and RUNTIME." )
+                          "Valid types are ${_fsPkgTypes_msg}." )
     endif()
 
     get_property(_previousType  GLOBAL PROPERTY _CMAKE_${_name}_TYPE)
-    list(FIND validTypes "${_previousType}" _prevTypeIndexInList)
+    list(FIND _fsPkgTypes "${_previousType}" _prevTypeIndexInList)
 
     # make sure a previously set TYPE is not overridden with a lower new TYPE:
     if("${_typeIndexInList}" GREATER "${_prevTypeIndexInList}")
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomBadDefault-result.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomBadDefault-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomBadDefault-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomBadDefault-stderr.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomBadDefault-stderr.txt
new file mode 100644
index 0000000..58f6125
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomBadDefault-stderr.txt
@@ -0,0 +1,9 @@
+CMake Error at .*/Modules/FeatureSummary\.cmake:[0-9]+. \(message\):
+  Bad package property type OPTIONAL used in global property
+  FeatureSummary_DEFAULT_PKG_TYPE.  Valid types are TYPE1, TYPE2 and TYPE3.
+  Either update FeatureSummary_DEFAULT_PKG_TYPE or add OPTIONAL to the
+  FeatureSummary_PKG_TYPES global property.
+Call Stack \(most recent call first\):
+  .*/Modules/FeatureSummary\.cmake:[0-9]+. \(_FS_GET_FEATURE_SUMMARY\)
+  FeatureSummaryCustomBadDefault.cmake:[0-9]+ \(feature_summary\)
+  CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomBadDefault.cmake b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomBadDefault.cmake
new file mode 100644
index 0000000..7e2fd55
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomBadDefault.cmake
@@ -0,0 +1,8 @@
+include(FeatureSummary)
+set_property(GLOBAL PROPERTY FeatureSummary_PKG_TYPES TYPE1 TYPE2 TYPE3)
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+find_package(Foo)
+
+feature_summary(WHAT ALL)
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired-result.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired-stderr.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired-stderr.txt
new file mode 100644
index 0000000..e37b9f5
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired-stderr.txt
@@ -0,0 +1,6 @@
+CMake Error at .*/Modules/FeatureSummary\.cmake:[0-9]+. \(message\):
+  feature_summary\(\) Error: REQUIRED package\(s\) are missing, aborting CMake
+  run.
+Call Stack \(most recent call first\):
+  FeatureSummaryCustomRequired.cmake:[0-9]+ \(feature_summary\)
+  CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired-stdout.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired-stdout.txt
new file mode 100644
index 0000000..ecca71f
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired-stdout.txt
@@ -0,0 +1,17 @@
+-- The following TYPE3 packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following TYPE2 packages have not been found:
+
+ \* Bar
+
+-- The following TYPE3 packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following TYPE3 packages have not been found:
+
+ \* Bar
+
+-- Configuring incomplete, errors occurred!
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired.cmake b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired.cmake
new file mode 100644
index 0000000..11cf04c
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired.cmake
@@ -0,0 +1,16 @@
+include(FeatureSummary)
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+set_property(GLOBAL PROPERTY FeatureSummary_PKG_TYPES TYPE1 TYPE2 TYPE3)
+set_property(GLOBAL PROPERTY FeatureSummary_REQUIRED_PKG_TYPES TYPE3)
+set_property(GLOBAL PROPERTY FeatureSummary_DEFAULT_PKG_TYPE TYPE2)
+
+find_package(Foo)
+find_package(Bar)
+
+set_package_properties(Foo PROPERTIES TYPE TYPE3)
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+
+set_package_properties(Bar PROPERTIES TYPE TYPE3)
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA-result.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA-stderr.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA-stderr.txt
new file mode 100644
index 0000000..c9d8b4b
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA-stderr.txt
@@ -0,0 +1,6 @@
+CMake Error at .*/Modules/FeatureSummary\.cmake:[0-9]+. \(message\):
+  feature_summary\(\) Error: REQUIRED package\(s\) are missing, aborting CMake
+  run.
+Call Stack \(most recent call first\):
+  FeatureSummaryCustomRequiredListA.cmake:[0-9]+ \(feature_summary\)
+  CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA-stdout.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA-stdout.txt
new file mode 100644
index 0000000..b12d53a
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA-stdout.txt
@@ -0,0 +1,17 @@
+-- The following TYPE2 packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following TYPE1 packages have not been found:
+
+ \* Bar
+
+-- The following TYPE2 packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following TYPE2 packages have not been found:
+
+ \* Bar
+
+-- Configuring incomplete, errors occurred!
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA.cmake b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA.cmake
new file mode 100644
index 0000000..53111be
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA.cmake
@@ -0,0 +1,16 @@
+include(FeatureSummary)
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+set_property(GLOBAL PROPERTY FeatureSummary_PKG_TYPES TYPE1 TYPE2 TYPE3)
+set_property(GLOBAL PROPERTY FeatureSummary_REQUIRED_PKG_TYPES TYPE2 TYPE3)
+set_property(GLOBAL PROPERTY FeatureSummary_DEFAULT_PKG_TYPE TYPE1)
+
+find_package(Foo)
+find_package(Bar)
+
+set_package_properties(Foo PROPERTIES TYPE TYPE2)
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+
+set_package_properties(Bar PROPERTIES TYPE TYPE2)
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB-result.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB-stderr.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB-stderr.txt
new file mode 100644
index 0000000..8ef7a8d
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB-stderr.txt
@@ -0,0 +1,6 @@
+CMake Error at .*/Modules/FeatureSummary\.cmake:[0-9]+. \(message\):
+  feature_summary\(\) Error: REQUIRED package\(s\) are missing, aborting CMake
+  run.
+Call Stack \(most recent call first\):
+  FeatureSummaryCustomRequiredListB.cmake:[0-9]+ \(feature_summary\)
+  CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB-stdout.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB-stdout.txt
new file mode 100644
index 0000000..5f07173
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB-stdout.txt
@@ -0,0 +1,17 @@
+-- The following TYPE3 packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following TYPE1 packages have not been found:
+
+ \* Bar
+
+-- The following TYPE3 packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following TYPE3 packages have not been found:
+
+ \* Bar
+
+-- Configuring incomplete, errors occurred!
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB.cmake b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB.cmake
new file mode 100644
index 0000000..526b979
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB.cmake
@@ -0,0 +1,16 @@
+include(FeatureSummary)
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+set_property(GLOBAL PROPERTY FeatureSummary_PKG_TYPES TYPE1 TYPE2 TYPE3)
+set_property(GLOBAL PROPERTY FeatureSummary_REQUIRED_PKG_TYPES TYPE2 TYPE3)
+set_property(GLOBAL PROPERTY FeatureSummary_DEFAULT_PKG_TYPE TYPE1)
+
+find_package(Foo)
+find_package(Bar)
+
+set_package_properties(Foo PROPERTIES TYPE TYPE3)
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+
+set_package_properties(Bar PROPERTIES TYPE TYPE3)
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomTypes-stdout.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomTypes-stdout.txt
new file mode 100644
index 0000000..a7f973b
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomTypes-stdout.txt
@@ -0,0 +1,29 @@
+-- The following TYPE2 packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following TYPE1 packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following TYPE2 packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following TYPE2 packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following TYPE3 packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following TYPE3 packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following TYPE3 packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- Configuring done
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomTypes.cmake b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomTypes.cmake
new file mode 100644
index 0000000..34b0c1f
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryCustomTypes.cmake
@@ -0,0 +1,36 @@
+include(FeatureSummary)
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+set_property(GLOBAL PROPERTY FeatureSummary_PKG_TYPES TYPE1 TYPE2 TYPE3)
+set_property(GLOBAL PROPERTY FeatureSummary_REQUIRED_PKG_TYPES TYPE3)
+set_property(GLOBAL PROPERTY FeatureSummary_DEFAULT_PKG_TYPE TYPE2)
+
+find_package(Foo)
+
+# Type not set => TYPE2
+feature_summary(WHAT ALL)
+
+# TYPE1 > not set => TYPE1
+set_package_properties(Foo PROPERTIES TYPE TYPE1)
+feature_summary(WHAT ALL)
+
+# TYPE2 > TYPE1 => TYPE2
+set_package_properties(Foo PROPERTIES TYPE TYPE2)
+feature_summary(WHAT ALL)
+
+# TYPE1 < TYPE2 => TYPE2
+set_package_properties(Foo PROPERTIES TYPE TYPE2)
+feature_summary(WHAT ALL)
+
+# TYPE3 > TYPE2 => TYPE3
+set_package_properties(Foo PROPERTIES TYPE TYPE3)
+feature_summary(WHAT ALL)
+
+# TYPE2 < TYPE3 => TYPE3
+set_package_properties(Foo PROPERTIES TYPE TYPE2)
+feature_summary(WHAT ALL)
+
+# TYPE1 < TYPE3 => TYPE3
+set_package_properties(Foo PROPERTIES TYPE TYPE1)
+feature_summary(WHAT ALL)
diff --git a/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake b/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake
index 97c23f9..9caee4c 100644
--- a/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake
+++ b/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake
@@ -14,3 +14,8 @@ run_cmake(FeatureSummaryFatalOnMissingRequiredPackages)
 run_cmake(FeatureSummaryIncludeQuietPackages)
 run_cmake(FeatureSummaryQuietOnEmpty)
 run_cmake(FeatureSummaryMultipleDepends)
+run_cmake(FeatureSummaryCustomTypes)
+run_cmake(FeatureSummaryCustomBadDefault)
+run_cmake(FeatureSummaryCustomRequired)
+run_cmake(FeatureSummaryCustomRequiredListA)
+run_cmake(FeatureSummaryCustomRequiredListB)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0165eb624403c26989d1039c076d61536cc3074
commit f0165eb624403c26989d1039c076d61536cc3074
Author:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
AuthorDate: Fri Jan 20 19:02:29 2017 +0100
Commit:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
CommitDate: Thu Jan 26 10:52:37 2017 +0100

    FeatureSummary: Allow lists of dependencies in ADD_FEATURE_INFO

diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index dce0330..490c956 100644
--- a/Modules/FeatureSummary.cmake
+++ b/Modules/FeatureSummary.cmake
@@ -477,7 +477,8 @@ endfunction()
     add_feature_info(<name> <enabled> <description>)
 
   Use this macro to add information about a feature with the given ``<name>``.
-  ``<enabled>`` contains whether this feature is enabled or not.
+  ``<enabled>`` contains whether this feature is enabled or not. It can be a
+  variable or a list of conditions.
   ``<description>`` is a text describing the feature.  The information can
   be displayed using ``feature_summary()`` for ``ENABLED_FEATURES`` and
   ``DISABLED_FEATURES`` respectively.
@@ -489,7 +490,16 @@ endfunction()
      option(WITH_FOO "Help for foo" ON)
      add_feature_info(Foo WITH_FOO "The Foo feature provides very cool stuff.")
 #]=======================================================================]
-function(ADD_FEATURE_INFO _name _enabled _desc)
+function(ADD_FEATURE_INFO _name _depends _desc)
+  set(_enabled 1)
+  foreach(_d ${_depends})
+    string(REGEX REPLACE " +" ";" _d "${_d}")
+    if(${_d})
+    else()
+      set(_enabled 0)
+      break()
+    endif()
+  endforeach()
   if (${_enabled})
     set_property(GLOBAL APPEND PROPERTY ENABLED_FEATURES "${_name}")
   else ()
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryMultipleDepends-stdout.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryMultipleDepends-stdout.txt
new file mode 100644
index 0000000..d5875e0
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryMultipleDepends-stdout.txt
@@ -0,0 +1,10 @@
+-- The following features have been enabled:
+
+ \* Bar, Bar\.
+ \* Baz, Baz\.
+ \* Goo, Goo\.
+
+-- The following features have been disabled:
+
+ \* Foo, Foo\.
+ \* Fez, Fez\.
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryMultipleDepends.cmake b/Tests/RunCMake/FeatureSummary/FeatureSummaryMultipleDepends.cmake
new file mode 100644
index 0000000..f355ae7
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryMultipleDepends.cmake
@@ -0,0 +1,12 @@
+include(FeatureSummary)
+
+set(WITH_FOO 1)
+set(WITH_BAR 0)
+
+add_feature_info(Foo "WITH_FOO;WITH_BAR" "Foo.")
+add_feature_info(Bar "WITH_FOO;NOT WITH_BAR" "Bar.")
+add_feature_info(Baz "WITH_FOO AND NOT WITH_BAR" "Baz.")
+add_feature_info(Goo "WITH_FOO OR WITH_BAR" "Goo.")
+add_feature_info(Fez "NOT WITH_FOO OR WITH_BAR" "Fez.")
+
+feature_summary(WHAT ALL)
diff --git a/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake b/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake
index 585a6ee..97c23f9 100644
--- a/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake
+++ b/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake
@@ -13,3 +13,4 @@ run_cmake(FeatureSummaryTypes)
 run_cmake(FeatureSummaryFatalOnMissingRequiredPackages)
 run_cmake(FeatureSummaryIncludeQuietPackages)
 run_cmake(FeatureSummaryQuietOnEmpty)
+run_cmake(FeatureSummaryMultipleDepends)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9da7bf082513952c47ffb738b722df49a2fd7152
commit 9da7bf082513952c47ffb738b722df49a2fd7152
Author:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
AuthorDate: Fri Jan 20 19:00:07 2017 +0100
Commit:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
CommitDate: Thu Jan 26 10:52:35 2017 +0100

    FeatureSummary: Add QUIET_ON_EMPTY option to feature_summary
    
    This option suppresses the output when the list of packages that belong
    to the selected category is empty.

diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index 11ed170..dce0330 100644
--- a/Modules/FeatureSummary.cmake
+++ b/Modules/FeatureSummary.cmake
@@ -119,6 +119,7 @@ endfunction()
                      [INCLUDE_QUIET_PACKAGES]
                      [FATAL_ON_MISSING_REQUIRED_PACKAGES]
                      [DESCRIPTION "Found packages:"]
+                     [QUIET_ON_EMPTY]
                      WHAT (ALL | PACKAGES_FOUND | PACKAGES_NOT_FOUND
                           | ENABLED_FEATURES | DISABLED_FEATURES)
                    )
@@ -179,6 +180,11 @@ endfunction()
   ``FATAL_ON_MISSING_REQUIRED_PACKAGES`` is given, CMake will abort if a
   package which is marked as ``REQUIRED`` has not been found.
 
+  If the ``QUIET_ON_EMPTY`` option is used, if only one type of package was
+  requested, and no packages belonging to that category were found, then no
+  output (including the ``DESCRIPTION``) is printed or added to the ``VAR``
+  variable.
+
   Example 1, append everything to a file:
 
   .. code-block:: cmake
@@ -202,7 +208,7 @@ endfunction()
 
 function(FEATURE_SUMMARY)
 # CMAKE_PARSE_ARGUMENTS(<prefix> <options> <one_value_keywords> <multi_value_keywords> args...)
-  set(options APPEND INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+  set(options APPEND INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES QUIET_ON_EMPTY)
   set(oneValueArgs FILENAME VAR DESCRIPTION)
   set(multiValueArgs WHAT)
 
@@ -232,7 +238,9 @@ function(FEATURE_SUMMARY)
   list(FIND validWhatParts "${_FS_WHAT}" indexInList)
   if(NOT "${indexInList}" STREQUAL "-1")
     _FS_GET_FEATURE_SUMMARY( ${_FS_WHAT} _featureSummary ${_FS_INCLUDE_QUIET_PACKAGES} )
-    set(_fullText "${_FS_DESCRIPTION}${_featureSummary}\n")
+    if(_featureSummary OR NOT _FS_QUIET_ON_EMPTY)
+      set(_fullText "${_FS_DESCRIPTION}${_featureSummary}\n")
+    endif()
     if (("${_FS_WHAT}" STREQUAL "REQUIRED_PACKAGES_NOT_FOUND") AND _featureSummary)
       set(requiredPackagesNotFound TRUE)
     endif()
@@ -298,23 +306,25 @@ function(FEATURE_SUMMARY)
     endforeach()
   endif()
 
-  if(_FS_FILENAME)
-    if(_FS_APPEND)
-      file(APPEND "${_FS_FILENAME}" "${_fullText}")
+  if(_fullText OR NOT _FS_QUIET_ON_EMPTY)
+    if(_FS_FILENAME)
+      if(_FS_APPEND)
+        file(APPEND "${_FS_FILENAME}" "${_fullText}")
+      else()
+        file(WRITE  "${_FS_FILENAME}" "${_fullText}")
+      endif()
+
     else()
-      file(WRITE  "${_FS_FILENAME}" "${_fullText}")
+      if(NOT _FS_VAR)
+        message(STATUS "${_fullText}")
+      endif()
     endif()
 
-  else()
-    if(NOT _FS_VAR)
-      message(STATUS "${_fullText}")
+    if(_FS_VAR)
+      set(${_FS_VAR} "${_fullText}" PARENT_SCOPE)
     endif()
   endif()
 
-  if(_FS_VAR)
-    set(${_FS_VAR} "${_fullText}" PARENT_SCOPE)
-  endif()
-
   if(requiredPackagesNotFound  AND  _FS_FATAL_ON_MISSING_REQUIRED_PACKAGES)
     message(FATAL_ERROR "feature_summary() Error: REQUIRED package(s) are missing, aborting CMake run.")
   endif()
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryQuietOnEmpty-stdout.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryQuietOnEmpty-stdout.txt
new file mode 100644
index 0000000..65e97e0
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryQuietOnEmpty-stdout.txt
@@ -0,0 +1,5 @@
+-- Enabled features:
+ \* Foo, Foo\.
+ \* Bar, Bar\.
+
+-- Configuring done
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryQuietOnEmpty.cmake b/Tests/RunCMake/FeatureSummary/FeatureSummaryQuietOnEmpty.cmake
new file mode 100644
index 0000000..8d1d007
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryQuietOnEmpty.cmake
@@ -0,0 +1,14 @@
+include(FeatureSummary)
+
+set(WITH_FOO 1)
+set(WITH_BAR 1)
+
+add_feature_info(Foo WITH_FOO "Foo.")
+add_feature_info(Bar WITH_BAR "Bar.")
+
+feature_summary(WHAT ENABLED_FEATURES
+                DESCRIPTION "Enabled features:"
+                QUIET_ON_EMPTY)
+feature_summary(WHAT DISABLED_FEATURES
+                DESCRIPTION "Disabled features:"
+                QUIET_ON_EMPTY)
diff --git a/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake b/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake
index 2edd8a5..585a6ee 100644
--- a/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake
+++ b/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake
@@ -12,3 +12,4 @@ run_cmake(FeatureSummaryURLDescription)
 run_cmake(FeatureSummaryTypes)
 run_cmake(FeatureSummaryFatalOnMissingRequiredPackages)
 run_cmake(FeatureSummaryIncludeQuietPackages)
+run_cmake(FeatureSummaryQuietOnEmpty)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cf4acebe347bfd55e051354b9748a5b0c25b58a
commit 4cf4acebe347bfd55e051354b9748a5b0c25b58a
Author:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
AuthorDate: Thu Jan 26 10:48:13 2017 +0100
Commit:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
CommitDate: Thu Jan 26 10:52:09 2017 +0100

    FeatureSummary: Add unit tests

diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages-result.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages-stderr.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages-stderr.txt
new file mode 100644
index 0000000..214d74a
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages-stderr.txt
@@ -0,0 +1,6 @@
+CMake Error at .*/Modules/FeatureSummary\.cmake:[0-9]+. \(message\):
+  feature_summary\(\) Error: REQUIRED package\(s\) are missing, aborting CMake
+  run.
+Call Stack \(most recent call first\):
+  FeatureSummaryFatalOnMissingRequiredPackages.cmake:[0-9]+ \(feature_summary\)
+  CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages-stdout.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages-stdout.txt
new file mode 100644
index 0000000..6bd6427
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages-stdout.txt
@@ -0,0 +1,17 @@
+-- The following REQUIRED packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following OPTIONAL packages have not been found:
+
+ \* Bar
+
+-- The following REQUIRED packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following REQUIRED packages have not been found:
+
+ \* Bar
+
+-- Configuring incomplete, errors occurred!
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages.cmake b/Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages.cmake
new file mode 100644
index 0000000..9563186
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages.cmake
@@ -0,0 +1,12 @@
+include(FeatureSummary)
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+find_package(Foo)
+find_package(Bar)
+
+set_package_properties(Foo PROPERTIES TYPE REQUIRED)
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+
+set_package_properties(Bar PROPERTIES TYPE REQUIRED)
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryIncludeQuietPackages-stdout.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryIncludeQuietPackages-stdout.txt
new file mode 100644
index 0000000..58599e0
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryIncludeQuietPackages-stdout.txt
@@ -0,0 +1,14 @@
+-- The following OPTIONAL packages have not been found:
+
+ \* Baz
+
+-- The following OPTIONAL packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following OPTIONAL packages have not been found:
+
+ \* Bar
+ \* Baz
+
+-- Configuring done
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryIncludeQuietPackages.cmake b/Tests/RunCMake/FeatureSummary/FeatureSummaryIncludeQuietPackages.cmake
new file mode 100644
index 0000000..5cdb443
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryIncludeQuietPackages.cmake
@@ -0,0 +1,11 @@
+include(FeatureSummary)
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+find_package(Foo QUIET)
+find_package(Bar QUIET)
+find_package(Baz)
+
+feature_summary(WHAT ALL)
+
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES)
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryPurpose-stdout.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryPurpose-stdout.txt
new file mode 100644
index 0000000..78e4fe1
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryPurpose-stdout.txt
@@ -0,0 +1,16 @@
+The following OPTIONAL packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following OPTIONAL packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+   Because everyone needs some Foo.
+
+-- The following OPTIONAL packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+   Because everyone needs some Foo.
+   Because Foo is better than Bar.
+
+-- Configuring done
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryPurpose.cmake b/Tests/RunCMake/FeatureSummary/FeatureSummaryPurpose.cmake
new file mode 100644
index 0000000..64735b6
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryPurpose.cmake
@@ -0,0 +1,16 @@
+include(FeatureSummary)
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+find_package(Foo)
+
+# Purpose not set
+feature_summary(WHAT ALL)
+
+# Purpose set once
+set_package_properties(Foo PROPERTIES PURPOSE "Because everyone needs some Foo.")
+feature_summary(WHAT ALL)
+
+# Purpose set twice
+set_package_properties(Foo PROPERTIES PURPOSE "Because Foo is better than Bar.")
+feature_summary(WHAT ALL)
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryTypes-stdout.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryTypes-stdout.txt
new file mode 100644
index 0000000..79bb1e3
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryTypes-stdout.txt
@@ -0,0 +1,45 @@
+-- The following OPTIONAL packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following RUNTIME packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following OPTIONAL packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following OPTIONAL packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following RECOMMENDED packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following RECOMMENDED packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following RECOMMENDED packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following REQUIRED packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following REQUIRED packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following REQUIRED packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following REQUIRED packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- Configuring done
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryTypes.cmake b/Tests/RunCMake/FeatureSummary/FeatureSummaryTypes.cmake
new file mode 100644
index 0000000..09d1e7a
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryTypes.cmake
@@ -0,0 +1,48 @@
+include(FeatureSummary)
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+find_package(Foo)
+
+# Type not set => OPTIONAL
+feature_summary(WHAT ALL)
+
+# RUNTIME > not set => RUNTIME
+set_package_properties(Foo PROPERTIES TYPE RUNTIME)
+feature_summary(WHAT ALL)
+
+# OPTIONAL > RUNTIME => OPTIONAL
+set_package_properties(Foo PROPERTIES TYPE OPTIONAL)
+feature_summary(WHAT ALL)
+
+# RUNTIME < OPTIONAL => OPTIONAL
+set_package_properties(Foo PROPERTIES TYPE OPTIONAL)
+feature_summary(WHAT ALL)
+
+# RECOMMENDED > OPTIONAL => RECOMMENDED
+set_package_properties(Foo PROPERTIES TYPE RECOMMENDED)
+feature_summary(WHAT ALL)
+
+# OPTIONAL < RECOMMENDED => RECOMMENDED
+set_package_properties(Foo PROPERTIES TYPE OPTIONAL)
+feature_summary(WHAT ALL)
+
+# RUNTIME < RECOMMENDED => RECOMMENDED
+set_package_properties(Foo PROPERTIES TYPE RUNTIME)
+feature_summary(WHAT ALL)
+
+# REQUIRED > RECOMMENDED => REQUIRED
+set_package_properties(Foo PROPERTIES TYPE REQUIRED)
+feature_summary(WHAT ALL)
+
+# RECOMMENDED < REQUIRED => REQUIRED
+set_package_properties(Foo PROPERTIES TYPE RECOMMENDED)
+feature_summary(WHAT ALL)
+
+# OPTIONAL < REQUIRED => REQUIRED
+set_package_properties(Foo PROPERTIES TYPE OPTIONAL)
+feature_summary(WHAT ALL)
+
+# RUNTIME < REQUIRED => REQUIRED
+set_package_properties(Foo PROPERTIES TYPE RUNTIME)
+feature_summary(WHAT ALL)
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryURLDescription-stdout.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryURLDescription-stdout.txt
new file mode 100644
index 0000000..6a55bdf
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryURLDescription-stdout.txt
@@ -0,0 +1,32 @@
+-- The following OPTIONAL packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following OPTIONAL packages have not been found:
+
+ \* Bar
+ \* Baz
+
+-- The following OPTIONAL packages have been found:
+
+ \* Foo, The Foo package, <https://foo.example/>
+
+-- The following OPTIONAL packages have not been found:
+
+ \* Bar, <https://bar.net/>
+ \* Baz, A Baz package
+
+-- Warning: Property DESCRIPTION for package Foo already set to "The Foo package", overriding it with "A Foo package"
+-- Warning: Property URL already set to "https://foo.example/", overriding it with "https://foo.net/"
+-- Warning: Property URL already set to "https://bar.net/", overriding it with "https://bar.example/"
+-- Warning: Property DESCRIPTION for package Baz already set to "A Baz package", overriding it with "The Baz package"
+-- The following OPTIONAL packages have been found:
+
+ \* Foo, A Foo package, <https://foo.net/>
+
+-- The following OPTIONAL packages have not been found:
+
+ \* Bar, The Bar package, <https://bar.example/>
+ \* Baz, The Baz package, <https://baz.example/>
+
+-- Configuring done
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryURLDescription.cmake b/Tests/RunCMake/FeatureSummary/FeatureSummaryURLDescription.cmake
new file mode 100644
index 0000000..77fcf28
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryURLDescription.cmake
@@ -0,0 +1,28 @@
+include(FeatureSummary)
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+find_package(Foo) # URL and DESCRIPTION are set in the FindFoo.cmake file
+find_package(Bar) # URL and DESCRIPTION are not set
+find_package(Baz) # URL and DESCRIPTION are not set
+
+feature_summary(WHAT ALL)
+
+set_package_properties(Bar PROPERTIES URL "https://bar.net/") # URL and no DESCRIPTION
+set_package_properties(Baz PROPERTIES DESCRIPTION "A Baz package") # DESCRIPTION and no URL
+feature_summary(WHAT ALL)
+
+# Overwrite with the same value (no warning)
+set_package_properties(Foo PROPERTIES URL "https://foo.example/"
+                                      DESCRIPTION "The Foo package")
+set_package_properties(Bar PROPERTIES URL "https://bar.net/")
+set_package_properties(Baz PROPERTIES DESCRIPTION "A Baz package")
+
+# Overwrite with different values (warnings)
+set_package_properties(Foo PROPERTIES URL "https://foo.net/"
+                                      DESCRIPTION "A Foo package") # Overwrite URL and DESCRIPTION
+set_package_properties(Bar PROPERTIES URL "https://bar.example/"
+                                      DESCRIPTION "The Bar package") # Overwrite URL and add DESCRIPTION
+set_package_properties(Baz PROPERTIES URL "https://baz.example/"
+                                      DESCRIPTION "The Baz package") # Overwrite URL and add DESCRIPTION
+feature_summary(WHAT ALL)
diff --git a/Tests/RunCMake/FeatureSummary/FindBar.cmake b/Tests/RunCMake/FeatureSummary/FindBar.cmake
new file mode 100644
index 0000000..45f4d54
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FindBar.cmake
@@ -0,0 +1,2 @@
+include(FeatureSummary)
+set(Bar_FOUND 0)
diff --git a/Tests/RunCMake/FeatureSummary/FindBaz.cmake b/Tests/RunCMake/FeatureSummary/FindBaz.cmake
new file mode 100644
index 0000000..73aafcd
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FindBaz.cmake
@@ -0,0 +1,2 @@
+include(FeatureSummary)
+set(Baz_FOUND 0)
diff --git a/Tests/RunCMake/FeatureSummary/FindFoo.cmake b/Tests/RunCMake/FeatureSummary/FindFoo.cmake
new file mode 100644
index 0000000..baec987
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FindFoo.cmake
@@ -0,0 +1,4 @@
+include(FeatureSummary)
+set_package_properties(Foo PROPERTIES URL "https://foo.example/"
+                                      DESCRIPTION "The Foo package")
+set(Foo_FOUND 1)
diff --git a/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake b/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake
index 6a5fc28..2edd8a5 100644
--- a/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake
+++ b/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake
@@ -7,3 +7,8 @@ run_cmake(FeatureSummaryWhatList)
 run_cmake(FeatureSummaryWhatListUnknown)
 run_cmake(FeatureSummaryWhatListAll)
 run_cmake(FeatureSummaryWhatOnce)
+run_cmake(FeatureSummaryPurpose)
+run_cmake(FeatureSummaryURLDescription)
+run_cmake(FeatureSummaryTypes)
+run_cmake(FeatureSummaryFatalOnMissingRequiredPackages)
+run_cmake(FeatureSummaryIncludeQuietPackages)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=614a97a57b65454a14231ed60346884bab2399be
commit 614a97a57b65454a14231ed60346884bab2399be
Author:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
AuthorDate: Thu Jan 26 08:57:05 2017 +0100
Commit:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
CommitDate: Thu Jan 26 10:50:47 2017 +0100

    FeatureSummary: Do not force OPTIONAL type in SET_PACKAGE_PROPERTIES
    
    The OPTIONAL type is used anyway as default when the type is not set
    
    Since RUNTIME < OPTIONAL, forcing it here forces the user to set
    "RUNTIME" at the first SET_PACKAGE_PROPERTIES, otherwise it is
    impossible to set it later.
    Without this it is impossible, for example, to add package information
    (URL and DESCRIPTION) in the FindPackage file, but allow the package
    to be RUNTIME.

diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index 80589f1..11ed170 100644
--- a/Modules/FeatureSummary.cmake
+++ b/Modules/FeatureSummary.cmake
@@ -439,24 +439,22 @@ function(SET_PACKAGE_PROPERTIES _name _props)
   endif()
 
   # handle the TYPE
-  if(NOT _SPP_TYPE)
-    set(_SPP_TYPE OPTIONAL)
-  endif()
-
-  # List the supported types, according to their priority
-  set(validTypes "RUNTIME" "OPTIONAL" "RECOMMENDED" "REQUIRED" )
-  list(FIND validTypes ${_SPP_TYPE} _typeIndexInList)
-  if("${_typeIndexInList}" STREQUAL "-1" )
-    message(FATAL_ERROR "Bad package property type ${_SPP_TYPE} used in SET_PACKAGE_PROPERTIES(). "
-                        "Valid types are OPTIONAL, RECOMMENDED, REQUIRED and RUNTIME." )
-  endif()
+  if(DEFINED _SPP_TYPE)
+    # List the supported types, according to their priority
+    set(validTypes "RUNTIME" "OPTIONAL" "RECOMMENDED" "REQUIRED" )
+    list(FIND validTypes ${_SPP_TYPE} _typeIndexInList)
+    if("${_typeIndexInList}" STREQUAL "-1" )
+      message(FATAL_ERROR "Bad package property type ${_SPP_TYPE} used in SET_PACKAGE_PROPERTIES(). "
+                          "Valid types are OPTIONAL, RECOMMENDED, REQUIRED and RUNTIME." )
+    endif()
 
-  get_property(_previousType  GLOBAL PROPERTY _CMAKE_${_name}_TYPE)
-  list(FIND validTypes "${_previousType}" _prevTypeIndexInList)
+    get_property(_previousType  GLOBAL PROPERTY _CMAKE_${_name}_TYPE)
+    list(FIND validTypes "${_previousType}" _prevTypeIndexInList)
 
-  # make sure a previously set TYPE is not overridden with a lower new TYPE:
-  if("${_typeIndexInList}" GREATER "${_prevTypeIndexInList}")
-    set_property(GLOBAL PROPERTY _CMAKE_${_name}_TYPE "${_SPP_TYPE}" )
+    # make sure a previously set TYPE is not overridden with a lower new TYPE:
+    if("${_typeIndexInList}" GREATER "${_prevTypeIndexInList}")
+      set_property(GLOBAL PROPERTY _CMAKE_${_name}_TYPE "${_SPP_TYPE}" )
+    endif()
   endif()
 
 endfunction()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65a0bfd83cc47e60b9f42262f762c676fb210aa2
commit 65a0bfd83cc47e60b9f42262f762c676fb210aa2
Author:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
AuthorDate: Fri Jan 20 19:03:11 2017 +0100
Commit:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
CommitDate: Thu Jan 26 10:50:47 2017 +0100

    FeatureSummary: Add deprecation warnings to deprecated commands

diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index 93da021..80589f1 100644
--- a/Modules/FeatureSummary.cmake
+++ b/Modules/FeatureSummary.cmake
@@ -514,6 +514,7 @@ CMake versions:
   can be set are added automatically by the ``find_package()`` command.
 #]=======================================================================]
 function(SET_PACKAGE_INFO _name _desc)
+  message(DEPRECATION "SET_PACKAGE_INFO is deprecated. Use SET_PACKAGE_PROPERTIES instead.")
   unset(_url)
   unset(_purpose)
   if(ARGC GREATER 2)
@@ -543,6 +544,7 @@ endfunction()
     set_package_info(<name> <description> <url>)
 #]=======================================================================]
 function(SET_FEATURE_INFO)
+  message(DEPRECATION "SET_FEATURE_INFO is deprecated. Use ADD_FEATURE_INFO instead.")
   SET_PACKAGE_INFO(${ARGN})
 endfunction()
 
@@ -560,6 +562,8 @@ endfunction()
     feature_summary(WHAT ENABLED_FEATURES DESCRIPTION "Enabled features:")
 #]=======================================================================]
 function(PRINT_ENABLED_FEATURES)
+  message(DEPRECATION "PRINT_ENABLED_FEATURES is deprecated. Use
+    feature_summary(WHAT ENABLED_FEATURES DESCRIPTION \"Enabled features:\")")
   FEATURE_SUMMARY(WHAT ENABLED_FEATURES  DESCRIPTION "Enabled features:")
 endfunction()
 
@@ -577,5 +581,7 @@ endfunction()
     feature_summary(WHAT DISABLED_FEATURES DESCRIPTION "Disabled features:")
 #]=======================================================================]
 function(PRINT_DISABLED_FEATURES)
+  message(DEPRECATION "PRINT_DISABLED_FEATURES is deprecated. Use
+    feature_summary(WHAT DISABLED_FEATURES DESCRIPTION \"Disabled features:\")")
   FEATURE_SUMMARY(WHAT DISABLED_FEATURES  DESCRIPTION "Disabled features:")
 endfunction()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4da3cae9ffb3202d9c447e9f497f8a2758538b06
commit 4da3cae9ffb3202d9c447e9f497f8a2758538b06
Author:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
AuthorDate: Fri Jan 20 18:59:17 2017 +0100
Commit:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
CommitDate: Thu Jan 26 10:50:08 2017 +0100

    FeatureSummary: Clean printed output
    
    * Remove space before commas
    * Do not add an empty line before the first type of packages
    
    Also fix a typo in unit test.

diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index 78d9df3..93da021 100644
--- a/Modules/FeatureSummary.cmake
+++ b/Modules/FeatureSummary.cmake
@@ -14,12 +14,12 @@ packages and/or feature for a build tree such as::
     LibXml2 (required version >= 2.4), XML processing lib, <http://xmlsoft.org>
        * Enables HTML-import in MyWordProcessor
        * Enables odt-export in MyWordProcessor
-    PNG , A PNG image library. , <http://www.libpng.org/pub/png/>
+    PNG, A PNG image library., <http://www.libpng.org/pub/png/>
        * Enables saving screenshots
     -- The following OPTIONAL packages have not been found:
-    Lua51 , The Lua scripting language. , <http://www.lua.org>
+    Lua51, The Lua scripting language., <http://www.lua.org>
        * Enables macros in MyWordProcessor
-    Foo , Foo provides cool stuff.
+    Foo, Foo provides cool stuff.
 
 Functions
 ^^^^^^^^^
@@ -87,11 +87,11 @@ function(_FS_GET_FEATURE_SUMMARY _property _var _includeQuiet)
         endif()
         get_property(_info  GLOBAL PROPERTY _CMAKE_${_currentFeature}_DESCRIPTION)
         if(_info)
-          string(APPEND _currentFeatureText " , ${_info}")
+          string(APPEND _currentFeatureText ", ${_info}")
         endif()
         get_property(_info  GLOBAL PROPERTY _CMAKE_${_currentFeature}_URL)
         if(_info)
-          string(APPEND _currentFeatureText " , <${_info}>")
+          string(APPEND _currentFeatureText ", <${_info}>")
         endif()
 
         get_property(_info  GLOBAL PROPERTY _CMAKE_${_currentFeature}_PURPOSE)
@@ -287,7 +287,10 @@ function(FEATURE_SUMMARY)
       set(_tmp)
       _FS_GET_FEATURE_SUMMARY( ${part} _tmp ${_FS_INCLUDE_QUIET_PACKAGES})
       if(_tmp)
-        string(APPEND _fullText "\n-- ${title_${part}}\n${_tmp}\n")
+        if(_fullText)
+          string(APPEND _fullText "\n-- ")
+        endif()
+        string(APPEND _fullText "${title_${part}}\n${_tmp}\n")
         if("${part}" STREQUAL "REQUIRED_PACKAGES_NOT_FOUND")
           set(requiredPackagesNotFound TRUE)
         endif()
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatAll-stdout.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatAll-stdout.txt
index 9a3f023..f0631ae 100644
--- a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatAll-stdout.txt
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatAll-stdout.txt
@@ -1,7 +1,7 @@
 -- The following features have been enabled:
 
- \* Foo , Foo\.
+ \* Foo, Foo\.
 
 -- The following features have been disabled:
 
- \* Bar , Bar\.
+ \* Bar, Bar\.
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatList-stdout.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatList-stdout.txt
index 4d8f25f..f121417 100644
--- a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatList-stdout.txt
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatList-stdout.txt
@@ -1,7 +1,7 @@
 -- The following features have been disabled:
 
- \* Bar , Bar\.
+ \* Bar, Bar\.
 
 -- The following features have been enabled:
 
- \* Foo , Foo\.
+ \* Foo, Foo\.
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce-stdout.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce-stdout.txt
index 39be105..8b4cd43 100644
--- a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce-stdout.txt
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce-stdout.txt
@@ -1,4 +1,4 @@
 --( )
- \* Foo , Foo decscription\.
+ \* Foo, Foo description\.
 +
 --
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce.cmake b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce.cmake
index 545fb92..eaea40e 100644
--- a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce.cmake
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce.cmake
@@ -2,7 +2,7 @@ include(FeatureSummary)
 
 set(WITH_FOO 1)
 
-add_feature_info(Foo WITH_FOO "Foo decscription.")
-add_feature_info(Foo WITH_FOO "Foo decscription.")
+add_feature_info(Foo WITH_FOO "Foo description.")
+add_feature_info(Foo WITH_FOO "Foo description.")
 
 feature_summary(WHAT ENABLED_FEATURES)
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatSingle-stdout.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatSingle-stdout.txt
index 240632d..7485df9 100644
--- a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatSingle-stdout.txt
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatSingle-stdout.txt
@@ -1 +1 @@
- \* Foo , Foo\.
+ \* Foo, Foo\.

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

Summary of changes:
 Help/release/dev/FeatureSummary_enhancement.rst    |   22 ++
 Modules/FeatureSummary.cmake                       |  330 ++++++++++++++------
 .../FeatureSummaryCustomBadDefault-result.txt}     |    0
 .../FeatureSummaryCustomBadDefault-stderr.txt      |    9 +
 .../FeatureSummaryCustomBadDefault.cmake           |    8 +
 .../FeatureSummaryCustomRequired-result.txt}       |    0
 .../FeatureSummaryCustomRequired-stderr.txt        |    6 +
 .../FeatureSummaryCustomRequired-stdout.txt        |   17 +
 .../FeatureSummaryCustomRequired.cmake             |   16 +
 .../FeatureSummaryCustomRequiredListA-result.txt}  |    0
 .../FeatureSummaryCustomRequiredListA-stderr.txt   |    6 +
 .../FeatureSummaryCustomRequiredListA-stdout.txt   |   17 +
 .../FeatureSummaryCustomRequiredListA.cmake        |   16 +
 .../FeatureSummaryCustomRequiredListB-result.txt}  |    0
 .../FeatureSummaryCustomRequiredListB-stderr.txt   |    6 +
 .../FeatureSummaryCustomRequiredListB-stdout.txt   |   17 +
 .../FeatureSummaryCustomRequiredListB.cmake        |   16 +
 .../FeatureSummaryCustomTypes-stdout.txt           |   29 ++
 .../FeatureSummary/FeatureSummaryCustomTypes.cmake |   36 +++
 ...mmaryFatalOnMissingRequiredPackages-result.txt} |    0
 ...ummaryFatalOnMissingRequiredPackages-stderr.txt |    6 +
 ...ummaryFatalOnMissingRequiredPackages-stdout.txt |   17 +
 ...tureSummaryFatalOnMissingRequiredPackages.cmake |   12 +
 .../FeatureSummaryIncludeQuietPackages-stdout.txt  |   14 +
 .../FeatureSummaryIncludeQuietPackages.cmake       |   11 +
 ...xt => FeatureSummaryMultipleDepends-stdout.txt} |    7 +-
 .../FeatureSummaryMultipleDepends.cmake            |   12 +
 .../FeatureSummaryPurpose-stdout.txt               |   16 +
 .../FeatureSummary/FeatureSummaryPurpose.cmake     |   16 +
 .../FeatureSummaryQuietOnEmpty-stdout.txt          |    5 +
 .../FeatureSummaryQuietOnEmpty.cmake               |   14 +
 .../FeatureSummary/FeatureSummaryTypes-stdout.txt  |   45 +++
 .../FeatureSummary/FeatureSummaryTypes.cmake       |   48 +++
 .../FeatureSummaryURLDescription-stdout.txt        |   32 ++
 .../FeatureSummaryURLDescription.cmake             |   28 ++
 .../FeatureSummaryWhatAll-stdout.txt               |    4 +-
 .../FeatureSummaryWhatList-stdout.txt              |    4 +-
 .../FeatureSummaryWhatOnce-stdout.txt              |    2 +-
 .../FeatureSummary/FeatureSummaryWhatOnce.cmake    |    4 +-
 .../FeatureSummaryWhatSingle-stdout.txt            |    2 +-
 Tests/RunCMake/FeatureSummary/FindBar.cmake        |    2 +
 Tests/RunCMake/FeatureSummary/FindBaz.cmake        |    2 +
 Tests/RunCMake/FeatureSummary/FindFoo.cmake        |    4 +
 Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake   |   12 +
 44 files changed, 759 insertions(+), 111 deletions(-)
 create mode 100644 Help/release/dev/FeatureSummary_enhancement.rst
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => FeatureSummary/FeatureSummaryCustomBadDefault-result.txt} (100%)
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomBadDefault-stderr.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomBadDefault.cmake
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => FeatureSummary/FeatureSummaryCustomRequired-result.txt} (100%)
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired-stderr.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired.cmake
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => FeatureSummary/FeatureSummaryCustomRequiredListA-result.txt} (100%)
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA-stderr.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA.cmake
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => FeatureSummary/FeatureSummaryCustomRequiredListB-result.txt} (100%)
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB-stderr.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomTypes-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomTypes.cmake
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages-result.txt} (100%)
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages-stderr.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryIncludeQuietPackages-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryIncludeQuietPackages.cmake
 copy Tests/RunCMake/FeatureSummary/{FeatureSummaryWhatAll-stdout.txt => FeatureSummaryMultipleDepends-stdout.txt} (55%)
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryMultipleDepends.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryPurpose-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryPurpose.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryQuietOnEmpty-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryQuietOnEmpty.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryTypes-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryTypes.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryURLDescription-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryURLDescription.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FindBar.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FindBaz.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FindFoo.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 27 09:27:01 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Jan 2017 09:27:01 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2390-gc610be3
Message-ID: <20170127142701.EF849FA24F@public.kitware.com>

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  c610be3c4f698e4fdb3e3272305e381121c8103b (commit)
       via  6c54f7b3655737406c53fa1e4fc1d8f4cc22f9f9 (commit)
      from  51c1863936254a27fb1fe756f2c5c2bcef718422 (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=c610be3c4f698e4fdb3e3272305e381121c8103b
commit c610be3c4f698e4fdb3e3272305e381121c8103b
Merge: 51c1863 6c54f7b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 27 09:27:01 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 27 09:27:01 2017 -0500

    Merge topic 'timestamp-percent' into next
    
    6c54f7b3 string: Teach TIMESTAMP to treat %% as %


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c54f7b3655737406c53fa1e4fc1d8f4cc22f9f9
commit 6c54f7b3655737406c53fa1e4fc1d8f4cc22f9f9
Author:     Bernhard M. Wiedemann <bwiedemann at suse.de>
AuthorDate: Fri Jan 27 14:12:58 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 27 09:25:37 2017 -0500

    string: Teach TIMESTAMP to treat %% as %
    
    This encoding is documented by `strptime`.

diff --git a/Help/command/string.rst b/Help/command/string.rst
index 2c7847a..698a91d 100644
--- a/Help/command/string.rst
+++ b/Help/command/string.rst
@@ -296,6 +296,7 @@ specifiers:
 
 ::
 
+   %%        A literal percent sign (%).
    %d        The day of the current month (01-31).
    %H        The hour on a 24-hour clock (00-23).
    %I        The hour on a 12-hour clock (01-12).
diff --git a/Help/release/dev/timestamp-percent.rst b/Help/release/dev/timestamp-percent.rst
new file mode 100644
index 0000000..046d6c5
--- /dev/null
+++ b/Help/release/dev/timestamp-percent.rst
@@ -0,0 +1,5 @@
+timestamp-percent
+-----------------
+
+* The :command:`string(TIMESTAMP)` command learned to treat ``%%``
+  as a way to encode plain ``%``.
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index 1e5ac5b..3d42e26 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -136,6 +136,7 @@ std::string cmTimestamp::AddTimestampComponent(char flag,
     case 'w':
     case 'y':
     case 'Y':
+    case '%':
       break;
     case 's': // Seconds since UNIX epoch (midnight 1-jan-1970)
     {
diff --git a/Tests/RunCMake/string/Timestamp-stderr.txt b/Tests/RunCMake/string/Timestamp-stderr.txt
index c12b070..653974c 100644
--- a/Tests/RunCMake/string/Timestamp-stderr.txt
+++ b/Tests/RunCMake/string/Timestamp-stderr.txt
@@ -1 +1 @@
-RESULT=2005-08-07 23:19:49 Sun Aug 05 day=219 wd=0 week=32 %%I=11
+RESULT=2005-08-07 23:19:49 Sun Aug 05 day=219 wd=0 week=32 %I=11 epoch=1123456789
diff --git a/Tests/RunCMake/string/Timestamp.cmake b/Tests/RunCMake/string/Timestamp.cmake
index 1232300..d242039 100644
--- a/Tests/RunCMake/string/Timestamp.cmake
+++ b/Tests/RunCMake/string/Timestamp.cmake
@@ -1,3 +1,3 @@
 set(ENV{SOURCE_DATE_EPOCH} "1123456789")
-string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S %a %b %y day=%j wd=%w week=%U %%I=%I" UTC)
+string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S %a %b %y day=%j wd=%w week=%U %%I=%I epoch=%s" UTC)
 message("RESULT=${RESULT}")

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

Summary of changes:
 Help/command/string.rst                    |    1 +
 Help/release/dev/timestamp-percent.rst     |    5 +++++
 Source/cmTimestamp.cxx                     |    1 +
 Tests/RunCMake/string/Timestamp-stderr.txt |    2 +-
 Tests/RunCMake/string/Timestamp.cmake      |    2 +-
 5 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 Help/release/dev/timestamp-percent.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 27 11:06:45 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Jan 2017 11:06:45 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2393-g597fe23
Message-ID: <20170127160645.87CE1FA57B@public.kitware.com>

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  597fe23b9bdeff2276adc1c6204c7d45eee7f7bd (commit)
       via  22e81072b78eeca40e4a68f79b2bb0d19e059c85 (commit)
       via  9ee77262c3485d0079698ce52ec163a9971ca6d1 (commit)
      from  c610be3c4f698e4fdb3e3272305e381121c8103b (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=597fe23b9bdeff2276adc1c6204c7d45eee7f7bd
commit 597fe23b9bdeff2276adc1c6204c7d45eee7f7bd
Merge: c610be3 22e8107
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 27 11:06:44 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 27 11:06:44 2017 -0500

    Merge topic 'gcc-features' into next
    
    22e81072 GNU C++: record that -fvisibility-inlines-hidden is available since 4.0
    9ee77262 GNU C: record that C99 is available since at least 3.4


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22e81072b78eeca40e4a68f79b2bb0d19e059c85
commit 22e81072b78eeca40e4a68f79b2bb0d19e059c85
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 27 16:52:42 2017 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Jan 27 17:02:50 2017 +0100

    GNU C++: record that -fvisibility-inlines-hidden is available since 4.0
    
    See https://gcc.gnu.org/onlinedocs/gcc-4.0.0/gcc/Option-Summary.html

diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index b04ea11..c007c98 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -6,7 +6,7 @@ if (WIN32)
     set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fno-keep-inline-dllexport")
   endif()
 else()
-  if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.2)
+  if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
     set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
   endif()
 endif()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ee77262c3485d0079698ce52ec163a9971ca6d1
commit 9ee77262c3485d0079698ce52ec163a9971ca6d1
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 27 16:49:45 2017 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Jan 27 16:49:45 2017 +0100

    GNU C: record that C99 is available since at least 3.4

diff --git a/Modules/Compiler/GNU-C-FeatureTests.cmake b/Modules/Compiler/GNU-C-FeatureTests.cmake
index b3fe33f..0ab5265 100644
--- a/Modules/Compiler/GNU-C-FeatureTests.cmake
+++ b/Modules/Compiler/GNU-C-FeatureTests.cmake
@@ -1,5 +1,5 @@
 
-set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404")
+set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304")
 
 # GNU 4.7 correctly sets __STDC_VERSION__ to 201112L, but GNU 4.6 sets it
 # to 201000L.  As the former is strictly greater than the latter, test only
@@ -8,10 +8,10 @@ set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404")
 # to the distinction between __cplusplus and __GXX_EXPERIMENTAL_CXX0X__ tests.
 set(GNU46_C11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 406 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201000L")
 set(_cmake_feature_test_c_static_assert "${GNU46_C11}")
-# Since 4.4 at least:
-set(GNU44_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L")
-set(_cmake_feature_test_c_restrict "${GNU44_C99}")
-set(_cmake_feature_test_c_variadic_macros "${GNU44_C99}")
+# Since 3.4 at least:
+set(GNU34_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L")
+set(_cmake_feature_test_c_restrict "${GNU34_C99}")
+set(_cmake_feature_test_c_variadic_macros "${GNU34_C99}")
 
 set(GNU_C90 "${_cmake_oldestSupported}")
 set(_cmake_feature_test_c_function_prototypes "${GNU_C90}")
diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index 05c3bb2..3f02618 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -4,12 +4,12 @@ __compiler_gnu(C)
 if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5)
   set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90")
   set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu90")
-elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
   set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c89")
   set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu89")
 endif()
 
-if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
   set(CMAKE_C99_STANDARD_COMPILE_OPTION "-std=c99")
   set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-std=gnu99")
 endif()
@@ -22,7 +22,7 @@ elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6)
   set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu1x")
 endif()
 
-if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
   if (NOT CMAKE_C_COMPILER_FORCED)
     if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT)
       message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version ${CMAKE_C_COMPILER_VERSION}")
@@ -38,10 +38,9 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
   endif()
 endif()
 
-
 macro(cmake_record_c_compile_features)
   set(_result 0)
-  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
     if(_result EQUAL 0 AND CMAKE_C11_STANDARD_COMPILE_OPTION)
       _record_compiler_features_c(11)
     endif()

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

Summary of changes:
 Modules/Compiler/GNU-C-FeatureTests.cmake |   10 +++++-----
 Modules/Compiler/GNU-C.cmake              |    9 ++++-----
 Modules/Compiler/GNU-CXX.cmake            |    2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Jan 27 11:33:28 2017
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Jan 2017 11:33:28 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2396-g2086b6a
Message-ID: <20170127163328.87DECFA344@public.kitware.com>

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  2086b6a344ba7dbf235a5d161035aea9fb966628 (commit)
       via  0fbe7569ce673f75d61e01cf644006df8e1d0432 (commit)
       via  0fabbf1027a5872b8c9228bdcc548133bb08005b (commit)
      from  597fe23b9bdeff2276adc1c6204c7d45eee7f7bd (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=2086b6a344ba7dbf235a5d161035aea9fb966628
commit 2086b6a344ba7dbf235a5d161035aea9fb966628
Merge: 597fe23 0fbe756
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 27 11:33:27 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 27 11:33:27 2017 -0500

    Merge topic 'WCDH_allow_unsupported' into next
    
    0fbe7569 WCDH: optionally omit error code for unknown compilers or compiler versions
    0fabbf10 WCDH: add macro to write simple replacement defines


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fbe7569ce673f75d61e01cf644006df8e1d0432
commit 0fbe7569ce673f75d61e01cf644006df8e1d0432
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 25 20:32:59 2017 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Jan 27 17:11:35 2017 +0100

    WCDH: optionally omit error code for unknown compilers or compiler versions
    
    This allows one to generate a header that will basically always work. In case
    an unknown compiler or compiler version is encountered it simply falls back to
    the unsupported case.

diff --git a/Help/release/dev/WCDH_allow_unsupported.rst b/Help/release/dev/WCDH_allow_unsupported.rst
new file mode 100644
index 0000000..c0b7377
--- /dev/null
+++ b/Help/release/dev/WCDH_allow_unsupported.rst
@@ -0,0 +1,8 @@
+WCDH_allow_unsupported
+----------------------
+
+* The :module:`WriteCompilerDetectionHeader` module gained the
+  ``ALLOW_UNKNOWN_COMPILERS`` and ``ALLOW_UNKNOWN_COMPILER_VERSIONS`` options
+  that allow creation of headers that will work also with unknown or old
+  compilers by simply assuming they do not support any of the requested
+  features.
diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
index c96a701..0b16aa4 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -20,6 +20,8 @@
 #              [VERSION <version>]
 #              [PROLOG <prolog>]
 #              [EPILOG <epilog>]
+#              [ALLOW_UNKNOWN_COMPILERS]
+#              [ALLOW_UNKNOWN_COMPILER_VERSIONS]
 #    )
 #
 # The ``write_compiler_detection_header`` function generates the
@@ -81,6 +83,11 @@
 # See the :manual:`cmake-compile-features(7)` manual for information on
 # compile features.
 #
+# ``ALLOW_UNKNOWN_COMPILERS`` and ``ALLOW_UNKNOWN_COMPILER_VERSIONS`` cause
+# the module to generate conditions that treat unknown compilers as simply
+# lacking all features.  Without these options the default behavior is to
+# generate a ``#error`` for unknown compilers.
+#
 # Feature Test Macros
 # ===================
 #
@@ -236,7 +243,7 @@ macro(_simpledefine FEATURE_NAME FEATURE_TESTNAME FEATURE_STRING FEATURE_DEFAULT
   if (feature STREQUAL "${FEATURE_NAME}")
         set(def_value "${prefix_arg}_${FEATURE_TESTNAME}")
         string(APPEND file_content "
-#  if ${def_name}
+#  if defined(${def_name}) && ${def_name}
 #    define ${def_value} ${FEATURE_STRING}
 #  else
 #    define ${def_value} ${FEATURE_DEFAULT_STRING}
@@ -255,7 +262,7 @@ function(write_compiler_detection_header
   if (NOT "x${prefix_keyword}" STREQUAL "xPREFIX")
     message(FATAL_ERROR "write_compiler_detection_header: PREFIX parameter missing.")
   endif()
-  set(options)
+  set(options ALLOW_UNKNOWN_COMPILERS ALLOW_UNKNOWN_COMPILER_VERSIONS)
   set(oneValueArgs VERSION EPILOG PROLOG OUTPUT_FILES_VAR OUTPUT_DIR)
   set(multiValueArgs COMPILERS FEATURES)
   cmake_parse_arguments(_WCD "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -439,10 +446,12 @@ function(write_compiler_detection_header
         set(compiler_file_content file_content)
       endif()
 
-      set(${compiler_file_content} "${${compiler_file_content}}
+      if(NOT _WCD_ALLOW_UNKNOWN_COMPILER_VERSIONS)
+        set(${compiler_file_content} "${${compiler_file_content}}
 #    if !(${_cmake_oldestSupported_${compiler}})
 #      error Unsupported compiler version
 #    endif\n")
+      endif()
 
       set(PREFIX ${prefix_arg}_)
       if (_need_hex_conversion)
@@ -473,10 +482,15 @@ function(write_compiler_detection_header
       endforeach()
     endforeach()
     if(pp_if STREQUAL "elif")
-      string(APPEND file_content "
+      if(_WCD_ALLOW_UNKNOWN_COMPILERS)
+        string(APPEND file_content "
+#  endif\n")
+      else()
+        string(APPEND file_content "
 #  else
 #    error Unsupported compiler
 #  endif\n")
+      endif()
     endif()
     foreach(feature ${${_lang}_features})
       string(TOUPPER ${feature} feature_upper)
@@ -492,12 +506,12 @@ function(write_compiler_detection_header
         set(static_assert_struct "template<bool> struct ${prefix_arg}StaticAssert;\ntemplate<> struct ${prefix_arg}StaticAssert<true>{};\n")
         set(def_standard "#    define ${def_value} static_assert(X, #X)\n#    define ${def_value_msg} static_assert(X, MSG)")
         set(def_alternative "${static_assert_struct}#    define ${def_value} sizeof(${prefix_arg}StaticAssert<X>)\n#    define ${def_value_msg} sizeof(${prefix_arg}StaticAssert<X>)")
-        string(APPEND file_content "#  if ${def_name}\n${def_standard}\n#  else\n${def_alternative}\n#  endif\n\n")
+        string(APPEND file_content "#  if defined(${def_name}) && ${def_name}\n${def_standard}\n#  else\n${def_alternative}\n#  endif\n\n")
       endif()
       if (feature STREQUAL cxx_alignas)
         set(def_value "${prefix_arg}_ALIGNAS(X)")
         string(APPEND file_content "
-#  if ${def_name}
+#  if defined(${def_name}) && ${def_name}
 #    define ${def_value} alignas(X)
 #  elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang || ${prefix_arg}_COMPILER_IS_AppleClang
 #    define ${def_value} __attribute__ ((__aligned__(X)))
@@ -511,7 +525,7 @@ function(write_compiler_detection_header
       if (feature STREQUAL cxx_alignof)
         set(def_value "${prefix_arg}_ALIGNOF(X)")
         string(APPEND file_content "
-#  if ${def_name}
+#  if defined(${def_name}) && ${def_name}
 #    define ${def_value} alignof(X)
 #  elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang || ${prefix_arg}_COMPILER_IS_AppleClang
 #    define ${def_value} __alignof__(X)
@@ -525,7 +539,7 @@ function(write_compiler_detection_header
       if (feature STREQUAL cxx_noexcept)
         set(def_value "${prefix_arg}_NOEXCEPT")
         string(APPEND file_content "
-#  if ${def_name}
+#  if defined(${def_name}) && ${def_name}
 #    define ${def_value} noexcept
 #    define ${def_value}_EXPR(X) noexcept(X)
 #  else
@@ -538,7 +552,7 @@ function(write_compiler_detection_header
       if (feature STREQUAL cxx_thread_local)
         set(def_value "${prefix_arg}_THREAD_LOCAL")
         string(APPEND file_content "
-#  if ${def_name}
+#  if defined(${def_name}) && ${def_name}
 #    define ${def_value} thread_local
 #  elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang || ${prefix_arg}_COMPILER_IS_AppleClang
 #    define ${def_value} __thread
@@ -554,7 +568,7 @@ function(write_compiler_detection_header
         set(def_value "${prefix_arg}_DEPRECATED")
         string(APPEND file_content "
 #  ifndef ${def_value}
-#    if ${def_name}
+#    if defined(${def_name}) && ${def_name}
 #      define ${def_value} [[deprecated]]
 #      define ${def_value}_MSG(MSG) [[deprecated(MSG)]]
 #    elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index 8b251d7..9f229f9 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -4,6 +4,7 @@ project(WriteCompilerDetectionHeader)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 include(WriteCompilerDetectionHeader)
+include(CheckCXXSourceCompiles)
 
 get_property(cxx_known_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
 get_property(c_known_features GLOBAL PROPERTY CMAKE_C_KNOWN_FEATURES)
@@ -26,7 +27,6 @@ if (NOT CMAKE_CXX_COMPILE_FEATURES AND NOT CMAKE_C_COMPILE_FEATURES)
   add_executable(WriteCompilerDetectionHeader "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp")
 
   if(UNIX OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    include(CheckCXXSourceCompiles)
     check_cxx_source_compiles("#include \"${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h\"\nint main() { return 0; }\n"
       file_include_works
     )
@@ -156,3 +156,31 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
   set_defines(WriteCompilerDetectionHeader_C11_multi "EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES;EXPECTED_COMPILER_C_RESTRICT" "")
   target_include_directories(WriteCompilerDetectionHeader_C11_multi PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files)
 endif()
+
+# test for ALLOW_UNKNOWN_COMPILERS
+
+# use a compiler does not match the current one,
+# so one always hits the fallback code
+if (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
+  set(OTHER_CXX "Intel")
+else()
+  set(OTHER_CXX "SunPro")
+endif()
+
+write_compiler_detection_header(
+  FILE "${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection_allow_unknown.h"
+  PREFIX TEST
+  COMPILERS ${OTHER_CXX}
+  FEATURES cxx_nullptr
+  ALLOW_UNKNOWN_COMPILERS
+)
+
+# intentionally abuse the TEST_NULLPR variable: this will only work
+# with the fallback code.
+check_cxx_source_compiles("#include \"${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection_allow_unknown.h\"
+int main() {\n int i = TEST_NULLPTR;\n return 0; }\n"
+  file_include_works_allow_unknown
+)
+if (NOT file_include_works_allow_unknown)
+  message(SEND_ERROR "Inclusion of ${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection_allow_unknown.h was expected to work, but did not.")
+endif()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fabbf1027a5872b8c9228bdcc548133bb08005b
commit 0fabbf1027a5872b8c9228bdcc548133bb08005b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 25 20:26:28 2017 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Jan 27 16:47:41 2017 +0100

    WCDH: add macro to write simple replacement defines

diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
index ba249e1..c96a701 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -232,6 +232,19 @@ function(_load_compiler_variables CompilerId lang)
   set(_compiler_id_version_compute_${CompilerId} ${_compiler_id_version_compute} PARENT_SCOPE)
 endfunction()
 
+macro(_simpledefine FEATURE_NAME FEATURE_TESTNAME FEATURE_STRING FEATURE_DEFAULT_STRING)
+  if (feature STREQUAL "${FEATURE_NAME}")
+        set(def_value "${prefix_arg}_${FEATURE_TESTNAME}")
+        string(APPEND file_content "
+#  if ${def_name}
+#    define ${def_value} ${FEATURE_STRING}
+#  else
+#    define ${def_value} ${FEATURE_DEFAULT_STRING}
+#  endif
+\n")
+  endif()
+endmacro()
+
 function(write_compiler_detection_header
     file_keyword file_arg
     prefix_keyword prefix_arg
@@ -469,46 +482,10 @@ function(write_compiler_detection_header
       string(TOUPPER ${feature} feature_upper)
       set(feature_PP "COMPILER_${feature_upper}")
       set(def_name ${prefix_arg}_${feature_PP})
-      if (feature STREQUAL c_restrict)
-        set(def_value "${prefix_arg}_RESTRICT")
-        string(APPEND file_content "
-#  if ${def_name}
-#    define ${def_value} restrict
-#  else
-#    define ${def_value}
-#  endif
-\n")
-      endif()
-      if (feature STREQUAL cxx_constexpr)
-        set(def_value "${prefix_arg}_CONSTEXPR")
-        string(APPEND file_content "
-#  if ${def_name}
-#    define ${def_value} constexpr
-#  else
-#    define ${def_value}
-#  endif
-\n")
-      endif()
-      if (feature STREQUAL cxx_final)
-        set(def_value "${prefix_arg}_FINAL")
-        string(APPEND file_content "
-#  if ${def_name}
-#    define ${def_value} final
-#  else
-#    define ${def_value}
-#  endif
-\n")
-      endif()
-      if (feature STREQUAL cxx_override)
-        set(def_value "${prefix_arg}_OVERRIDE")
-        string(APPEND file_content "
-#  if ${def_name}
-#    define ${def_value} override
-#  else
-#    define ${def_value}
-#  endif
-\n")
-      endif()
+      _simpledefine(c_restrict RESTRICT restrict "")
+      _simpledefine(cxx_constexpr CONSTEXPR constexpr "")
+      _simpledefine(cxx_final FINAL final "")
+      _simpledefine(cxx_override OVERRIDE override "")
       if (feature STREQUAL cxx_static_assert)
         set(def_value "${prefix_arg}_STATIC_ASSERT(X)")
         set(def_value_msg "${prefix_arg}_STATIC_ASSERT_MSG(X, MSG)")
@@ -543,26 +520,8 @@ function(write_compiler_detection_header
 #  endif
 \n")
       endif()
-      if (feature STREQUAL cxx_deleted_functions)
-        set(def_value "${prefix_arg}_DELETED_FUNCTION")
-        string(APPEND file_content "
-#  if ${def_name}
-#    define ${def_value} = delete
-#  else
-#    define ${def_value}
-#  endif
-\n")
-      endif()
-      if (feature STREQUAL cxx_extern_templates)
-        set(def_value "${prefix_arg}_EXTERN_TEMPLATE")
-        string(APPEND file_content "
-#  if ${def_name}
-#    define ${def_value} extern
-#  else
-#    define ${def_value}
-#  endif
-\n")
-      endif()
+      _simpledefine(cxx_deleted_functions DELETED_FUNCTION "= delete" "")
+      _simpledefine(cxx_extern_templates EXTERN_TEMPLATE extern "")
       if (feature STREQUAL cxx_noexcept)
         set(def_value "${prefix_arg}_NOEXCEPT")
         string(APPEND file_content "
@@ -575,16 +534,7 @@ function(write_compiler_detection_header
 #  endif
 \n")
       endif()
-      if (feature STREQUAL cxx_nullptr)
-        set(def_value "${prefix_arg}_NULLPTR")
-        string(APPEND file_content "
-#  if ${def_name}
-#    define ${def_value} nullptr
-#  else
-#    define ${def_value} 0
-#  endif
-\n")
-      endif()
+      _simpledefine(cxx_nullptr NULLPTR nullptr 0)
       if (feature STREQUAL cxx_thread_local)
         set(def_value "${prefix_arg}_THREAD_LOCAL")
         string(APPEND file_content "

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

Summary of changes:
 Help/release/dev/WCDH_allow_unsupported.rst        |    8 ++
 Modules/WriteCompilerDetectionHeader.cmake         |  122 +++++++-------------
 .../WriteCompilerDetectionHeader/CMakeLists.txt    |   30 ++++-
 3 files changed, 80 insertions(+), 80 deletions(-)
 create mode 100644 Help/release/dev/WCDH_allow_unsupported.rst


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sat Jan 28 00:01:11 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Sat, 28 Jan 2017 00:01:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1209-gb30ac98
Message-ID: <20170128050112.1C007FA394@public.kitware.com>

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  b30ac988d02d00f7423870799d59272a553ab9e9 (commit)
      from  325c6153088c673569971958f107f6cb97b67c50 (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=b30ac988d02d00f7423870799d59272a553ab9e9
commit b30ac988d02d00f7423870799d59272a553ab9e9
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sat Jan 28 00:01:05 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sat Jan 28 00:01:05 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 8290ba3..1422451 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 20170127)
+set(CMake_VERSION_PATCH 20170128)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sun Jan 29 00:01:06 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Sun, 29 Jan 2017 00:01:06 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1210-g84963f4
Message-ID: <20170129050106.8DA36FA42F@public.kitware.com>

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  84963f429a74c251accfcbd1d4923e1e8ced6bcf (commit)
      from  b30ac988d02d00f7423870799d59272a553ab9e9 (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=84963f429a74c251accfcbd1d4923e1e8ced6bcf
commit 84963f429a74c251accfcbd1d4923e1e8ced6bcf
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sun Jan 29 00:01:03 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun Jan 29 00:01:03 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 1422451..70dbab1 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 20170128)
+set(CMake_VERSION_PATCH 20170129)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Mon Jan 30 00:01:11 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Mon, 30 Jan 2017 00:01:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1211-gcbabde8
Message-ID: <20170130050111.0F01CFA3AA@public.kitware.com>

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  cbabde81f26db615411aafc788b9a0db35a87267 (commit)
      from  84963f429a74c251accfcbd1d4923e1e8ced6bcf (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=cbabde81f26db615411aafc788b9a0db35a87267
commit cbabde81f26db615411aafc788b9a0db35a87267
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Mon Jan 30 00:01:08 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jan 30 00:01:08 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 70dbab1..374bbcd 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 20170129)
+set(CMake_VERSION_PATCH 20170130)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 30 08:43:19 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 30 Jan 2017 08:43:19 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1213-ge6659f6
Message-ID: <20170130134320.1ACAAF3FDF@public.kitware.com>

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  e6659f6323c75331f15fe93bb8d060ec03729738 (commit)
       via  f01045ea36621fbc66a87bb041cd403d47304211 (commit)
      from  cbabde81f26db615411aafc788b9a0db35a87267 (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=e6659f6323c75331f15fe93bb8d060ec03729738
commit e6659f6323c75331f15fe93bb8d060ec03729738
Merge: cbabde8 f01045e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 08:43:17 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 08:43:17 2017 -0500

    Merge topic 'test-preprocess-configs'
    
    f01045ea Tests: Make Preprocess test work in RelWithDebInfo and MinSizeRel


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

Summary of changes:
 Tests/Preprocess/CMakeLists.txt |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 30 08:43:23 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 30 Jan 2017 08:43:23 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1215-g5c6c766
Message-ID: <20170130134323.27E7FF418E@public.kitware.com>

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  5c6c766da1b30f2d886ba369a4c407e575ee1ccf (commit)
       via  6c54f7b3655737406c53fa1e4fc1d8f4cc22f9f9 (commit)
      from  e6659f6323c75331f15fe93bb8d060ec03729738 (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=5c6c766da1b30f2d886ba369a4c407e575ee1ccf
commit 5c6c766da1b30f2d886ba369a4c407e575ee1ccf
Merge: e6659f6 6c54f7b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 08:43:21 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 08:43:21 2017 -0500

    Merge topic 'timestamp-percent'
    
    6c54f7b3 string: Teach TIMESTAMP to treat %% as %


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

Summary of changes:
 Help/command/string.rst                    |    1 +
 Help/release/dev/timestamp-percent.rst     |    5 +++++
 Source/cmTimestamp.cxx                     |    1 +
 Tests/RunCMake/string/Timestamp-stderr.txt |    2 +-
 Tests/RunCMake/string/Timestamp.cmake      |    2 +-
 5 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 Help/release/dev/timestamp-percent.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 30 08:43:25 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 30 Jan 2017 08:43:25 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1224-g8df12fc
Message-ID: <20170130134325.8756BF7E8B@public.kitware.com>

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  8df12fc9d4b52cdd18d4fa9408325be7d0c28ed2 (commit)
       via  560574b0c03f2cd8f34cf4a90f6f41648b08a1e9 (commit)
       via  3cfde818354a8f8e26a9b0b6589f3cc38b50e48d (commit)
       via  f0165eb624403c26989d1039c076d61536cc3074 (commit)
       via  9da7bf082513952c47ffb738b722df49a2fd7152 (commit)
       via  4cf4acebe347bfd55e051354b9748a5b0c25b58a (commit)
       via  614a97a57b65454a14231ed60346884bab2399be (commit)
       via  65a0bfd83cc47e60b9f42262f762c676fb210aa2 (commit)
       via  4da3cae9ffb3202d9c447e9f497f8a2758538b06 (commit)
      from  5c6c766da1b30f2d886ba369a4c407e575ee1ccf (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=8df12fc9d4b52cdd18d4fa9408325be7d0c28ed2
commit 8df12fc9d4b52cdd18d4fa9408325be7d0c28ed2
Merge: 5c6c766 560574b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 08:43:23 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 08:43:23 2017 -0500

    Merge topic 'FeatureSummary_enhancement'
    
    560574b0 FeatureSummary: Update release notes
    3cfde818 FeatureSummary: Refactor to use global properties for package types
    f0165eb6 FeatureSummary: Allow lists of dependencies in ADD_FEATURE_INFO
    9da7bf08 FeatureSummary: Add QUIET_ON_EMPTY option to feature_summary
    4cf4aceb FeatureSummary: Add unit tests
    614a97a5 FeatureSummary: Do not force OPTIONAL type in SET_PACKAGE_PROPERTIES
    65a0bfd8 FeatureSummary: Add deprecation warnings to deprecated commands
    4da3cae9 FeatureSummary: Clean printed output


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

Summary of changes:
 Help/release/dev/FeatureSummary_enhancement.rst    |   22 ++
 Modules/FeatureSummary.cmake                       |  330 ++++++++++++++------
 .../FeatureSummaryCustomBadDefault-result.txt}     |    0
 .../FeatureSummaryCustomBadDefault-stderr.txt      |    9 +
 .../FeatureSummaryCustomBadDefault.cmake           |    8 +
 .../FeatureSummaryCustomRequired-result.txt}       |    0
 .../FeatureSummaryCustomRequired-stderr.txt        |    6 +
 .../FeatureSummaryCustomRequired-stdout.txt        |   17 +
 .../FeatureSummaryCustomRequired.cmake             |   16 +
 .../FeatureSummaryCustomRequiredListA-result.txt}  |    0
 .../FeatureSummaryCustomRequiredListA-stderr.txt   |    6 +
 .../FeatureSummaryCustomRequiredListA-stdout.txt   |   17 +
 .../FeatureSummaryCustomRequiredListA.cmake        |   16 +
 .../FeatureSummaryCustomRequiredListB-result.txt}  |    0
 .../FeatureSummaryCustomRequiredListB-stderr.txt   |    6 +
 .../FeatureSummaryCustomRequiredListB-stdout.txt   |   17 +
 .../FeatureSummaryCustomRequiredListB.cmake        |   16 +
 .../FeatureSummaryCustomTypes-stdout.txt           |   29 ++
 .../FeatureSummary/FeatureSummaryCustomTypes.cmake |   36 +++
 ...mmaryFatalOnMissingRequiredPackages-result.txt} |    0
 ...ummaryFatalOnMissingRequiredPackages-stderr.txt |    6 +
 ...ummaryFatalOnMissingRequiredPackages-stdout.txt |   17 +
 ...tureSummaryFatalOnMissingRequiredPackages.cmake |   12 +
 .../FeatureSummaryIncludeQuietPackages-stdout.txt  |   14 +
 .../FeatureSummaryIncludeQuietPackages.cmake       |   11 +
 ...xt => FeatureSummaryMultipleDepends-stdout.txt} |    7 +-
 .../FeatureSummaryMultipleDepends.cmake            |   12 +
 .../FeatureSummaryPurpose-stdout.txt               |   16 +
 .../FeatureSummary/FeatureSummaryPurpose.cmake     |   16 +
 .../FeatureSummaryQuietOnEmpty-stdout.txt          |    5 +
 .../FeatureSummaryQuietOnEmpty.cmake               |   14 +
 .../FeatureSummary/FeatureSummaryTypes-stdout.txt  |   45 +++
 .../FeatureSummary/FeatureSummaryTypes.cmake       |   48 +++
 .../FeatureSummaryURLDescription-stdout.txt        |   32 ++
 .../FeatureSummaryURLDescription.cmake             |   28 ++
 .../FeatureSummaryWhatAll-stdout.txt               |    4 +-
 .../FeatureSummaryWhatList-stdout.txt              |    4 +-
 .../FeatureSummaryWhatOnce-stdout.txt              |    2 +-
 .../FeatureSummary/FeatureSummaryWhatOnce.cmake    |    4 +-
 .../FeatureSummaryWhatSingle-stdout.txt            |    2 +-
 Tests/RunCMake/FeatureSummary/FindBar.cmake        |    2 +
 Tests/RunCMake/FeatureSummary/FindBaz.cmake        |    2 +
 Tests/RunCMake/FeatureSummary/FindFoo.cmake        |    4 +
 Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake   |   12 +
 44 files changed, 759 insertions(+), 111 deletions(-)
 create mode 100644 Help/release/dev/FeatureSummary_enhancement.rst
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => FeatureSummary/FeatureSummaryCustomBadDefault-result.txt} (100%)
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomBadDefault-stderr.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomBadDefault.cmake
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => FeatureSummary/FeatureSummaryCustomRequired-result.txt} (100%)
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired-stderr.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequired.cmake
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => FeatureSummary/FeatureSummaryCustomRequiredListA-result.txt} (100%)
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA-stderr.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListA.cmake
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => FeatureSummary/FeatureSummaryCustomRequiredListB-result.txt} (100%)
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB-stderr.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomRequiredListB.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomTypes-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryCustomTypes.cmake
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages-result.txt} (100%)
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages-stderr.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryFatalOnMissingRequiredPackages.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryIncludeQuietPackages-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryIncludeQuietPackages.cmake
 copy Tests/RunCMake/FeatureSummary/{FeatureSummaryWhatAll-stdout.txt => FeatureSummaryMultipleDepends-stdout.txt} (55%)
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryMultipleDepends.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryPurpose-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryPurpose.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryQuietOnEmpty-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryQuietOnEmpty.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryTypes-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryTypes.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryURLDescription-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryURLDescription.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FindBar.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FindBaz.cmake
 create mode 100644 Tests/RunCMake/FeatureSummary/FindFoo.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 30 08:44:17 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 30 Jan 2017 08:44:17 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2403-gfb28d94
Message-ID: <20170130134417.43D2EF4B70@public.kitware.com>

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  fb28d942cb449a91356f5da31033b312993740ba (commit)
       via  8df12fc9d4b52cdd18d4fa9408325be7d0c28ed2 (commit)
       via  5c6c766da1b30f2d886ba369a4c407e575ee1ccf (commit)
       via  e6659f6323c75331f15fe93bb8d060ec03729738 (commit)
       via  cbabde81f26db615411aafc788b9a0db35a87267 (commit)
       via  84963f429a74c251accfcbd1d4923e1e8ced6bcf (commit)
       via  b30ac988d02d00f7423870799d59272a553ab9e9 (commit)
      from  2086b6a344ba7dbf235a5d161035aea9fb966628 (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=fb28d942cb449a91356f5da31033b312993740ba
commit fb28d942cb449a91356f5da31033b312993740ba
Merge: 2086b6a 8df12fc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 08:43:36 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 30 08:43:36 2017 -0500

    Merge branch 'master' into next


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 30 08:58:53 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 30 Jan 2017 08:58:53 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2405-g6932f84
Message-ID: <20170130135853.6DC50FA30B@public.kitware.com>

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  6932f8466cae72e4d231bb2ce4929d38a306e00a (commit)
       via  2903e108bde5d4e493a0fbbef1eebba0e49e49da (commit)
      from  fb28d942cb449a91356f5da31033b312993740ba (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=6932f8466cae72e4d231bb2ce4929d38a306e00a
commit 6932f8466cae72e4d231bb2ce4929d38a306e00a
Merge: fb28d94 2903e10
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 08:58:52 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 08:58:52 2017 -0500

    Merge topic 'gcc-features' into next
    
    2903e108 Revert topic 'gcc-features'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2903e108bde5d4e493a0fbbef1eebba0e49e49da
commit 2903e108bde5d4e493a0fbbef1eebba0e49e49da
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 08:58:40 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 30 08:58:40 2017 -0500

    Revert topic 'gcc-features'

diff --git a/Modules/Compiler/GNU-C-FeatureTests.cmake b/Modules/Compiler/GNU-C-FeatureTests.cmake
index 0ab5265..b3fe33f 100644
--- a/Modules/Compiler/GNU-C-FeatureTests.cmake
+++ b/Modules/Compiler/GNU-C-FeatureTests.cmake
@@ -1,5 +1,5 @@
 
-set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304")
+set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404")
 
 # GNU 4.7 correctly sets __STDC_VERSION__ to 201112L, but GNU 4.6 sets it
 # to 201000L.  As the former is strictly greater than the latter, test only
@@ -8,10 +8,10 @@ set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304")
 # to the distinction between __cplusplus and __GXX_EXPERIMENTAL_CXX0X__ tests.
 set(GNU46_C11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 406 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201000L")
 set(_cmake_feature_test_c_static_assert "${GNU46_C11}")
-# Since 3.4 at least:
-set(GNU34_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L")
-set(_cmake_feature_test_c_restrict "${GNU34_C99}")
-set(_cmake_feature_test_c_variadic_macros "${GNU34_C99}")
+# Since 4.4 at least:
+set(GNU44_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L")
+set(_cmake_feature_test_c_restrict "${GNU44_C99}")
+set(_cmake_feature_test_c_variadic_macros "${GNU44_C99}")
 
 set(GNU_C90 "${_cmake_oldestSupported}")
 set(_cmake_feature_test_c_function_prototypes "${GNU_C90}")
diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index 3f02618..05c3bb2 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -4,12 +4,12 @@ __compiler_gnu(C)
 if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5)
   set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90")
   set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu90")
-elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
+elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
   set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c89")
   set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu89")
 endif()
 
-if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
+if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
   set(CMAKE_C99_STANDARD_COMPILE_OPTION "-std=c99")
   set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-std=gnu99")
 endif()
@@ -22,7 +22,7 @@ elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6)
   set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu1x")
 endif()
 
-if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
+if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
   if (NOT CMAKE_C_COMPILER_FORCED)
     if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT)
       message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version ${CMAKE_C_COMPILER_VERSION}")
@@ -38,9 +38,10 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
   endif()
 endif()
 
+
 macro(cmake_record_c_compile_features)
   set(_result 0)
-  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
     if(_result EQUAL 0 AND CMAKE_C11_STANDARD_COMPILE_OPTION)
       _record_compiler_features_c(11)
     endif()
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index c007c98..b04ea11 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -6,7 +6,7 @@ if (WIN32)
     set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fno-keep-inline-dllexport")
   endif()
 else()
-  if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
+  if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.2)
     set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
   endif()
 endif()

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

Summary of changes:
 Modules/Compiler/GNU-C-FeatureTests.cmake |   10 +++++-----
 Modules/Compiler/GNU-C.cmake              |    9 +++++----
 Modules/Compiler/GNU-CXX.cmake            |    2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 30 09:01:41 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 30 Jan 2017 09:01:41 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2407-g6d2ebf5
Message-ID: <20170130140141.25A9BFA3A5@public.kitware.com>

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  6d2ebf57d7ad7e9772ef2cbc2321329b03e50770 (commit)
       via  4dde0bc8ef1d953b8e4b13a2e465d756b5274933 (commit)
      from  6932f8466cae72e4d231bb2ce4929d38a306e00a (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=6d2ebf57d7ad7e9772ef2cbc2321329b03e50770
commit 6d2ebf57d7ad7e9772ef2cbc2321329b03e50770
Merge: 6932f84 4dde0bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 09:01:40 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 09:01:40 2017 -0500

    Merge topic 'vs-export-external-objects' into next
    
    4dde0bc8 VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for external objects


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4dde0bc8ef1d953b8e4b13a2e465d756b5274933
commit 4dde0bc8ef1d953b8e4b13a2e465d756b5274933
Author:     Zsolt Parragi <zsolt.parragi at cancellar.hu>
AuthorDate: Sat Jan 28 17:10:02 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 30 08:54:49 2017 -0500

    VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for external objects
    
    Teach Visual Studio generators to include external object files in the
    list of objects whose symbols are to be exported.  The Makefile and
    Ninja generators already did this.

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 5edb81f..cc2536c 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -856,6 +856,14 @@ void cmGlobalVisualStudioGenerator::AddSymbolExportCommand(
     std::string objFile = obj_dir + map_it->second;
     objs.push_back(objFile);
   }
+  std::vector<cmSourceFile const*> externalObjectSources;
+  gt->GetExternalObjects(externalObjectSources, configName);
+  for (std::vector<cmSourceFile const*>::const_iterator it =
+         externalObjectSources.begin();
+       it != externalObjectSources.end(); ++it) {
+    objs.push_back((*it)->GetFullPath());
+  }
+
   gt->UseObjectLibraries(objs, configName);
   for (std::vector<std::string>::iterator it = objs.begin(); it != objs.end();
        ++it) {

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

Summary of changes:
 Source/cmGlobalVisualStudioGenerator.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 30 09:04:36 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 30 Jan 2017 09:04:36 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2409-ge715efb
Message-ID: <20170130140436.95393FA478@public.kitware.com>

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  e715efbedea5ef980aee816f6a398ce8752e5877 (commit)
       via  ced346efc67dbfa23f76cb13622485d07c8e9f5f (commit)
      from  6d2ebf57d7ad7e9772ef2cbc2321329b03e50770 (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=e715efbedea5ef980aee816f6a398ce8752e5877
commit e715efbedea5ef980aee816f6a398ce8752e5877
Merge: 6d2ebf5 ced346e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 09:04:36 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 09:04:36 2017 -0500

    Merge topic 'CSharpVS2017' into next
    
    ced346ef Fix CSharp compiler identification for VS 2017


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ced346efc67dbfa23f76cb13622485d07c8e9f5f
commit ced346efc67dbfa23f76cb13622485d07c8e9f5f
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Fri Jan 27 13:50:17 2017 -0800
Commit:     Gilles Khouzam <gillesk at microsoft.com>
CommitDate: Fri Jan 27 14:05:27 2017 -0800

    Fix CSharp compiler identification for VS 2017
    
    The CSharp compiler for VS2017 has moved from MSBuildTools to RoslynTargets
    this change accounts for both locations giving priority to the MSBuildTools location

diff --git a/Modules/CompilerId/VS-10.csproj.in b/Modules/CompilerId/VS-10.csproj.in
index 833dca7..2bd179e 100644
--- a/Modules/CompilerId/VS-10.csproj.in
+++ b/Modules/CompilerId/VS-10.csproj.in
@@ -47,9 +47,9 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>cd /D &quot;$(MSBuildToolsPath)&quot;
-if not %errorlevel%==0 exit -1
-if not exist @id_cl@ exit -2
-%40echo CMAKE_ at id_lang@_COMPILER=$(MSBuildToolsPath)\@id_cl@</PostBuildEvent>
+    <PostBuildEvent>if not "$(RoslynTargetsPath)"=="" if exist "$(RoslynTargetsPath)\@id_cl@" set _CSC=$(RoslynTargetsPath)
+if exist "$(MSBuildToolsPath)\@id_cl@" set _CSC=$(MSBuildToolsPath)
+if "_CSC"=="" exit -1
+%40echo CMAKE_ at id_lang@_COMPILER=%_CSC%\@id_cl@</PostBuildEvent>
   </PropertyGroup>
 </Project>

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

Summary of changes:
 Modules/CompilerId/VS-10.csproj.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 30 09:27:32 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 30 Jan 2017 09:27:32 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2411-ga3faf12
Message-ID: <20170130142732.4EE30FA470@public.kitware.com>

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  a3faf127a169cad512f9d6c67adfa1d8cc781f11 (commit)
       via  5181f1f86a4d4c2ac09a540285c938fe2c2fa262 (commit)
      from  e715efbedea5ef980aee816f6a398ce8752e5877 (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=a3faf127a169cad512f9d6c67adfa1d8cc781f11
commit a3faf127a169cad512f9d6c67adfa1d8cc781f11
Merge: e715efb 5181f1f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 09:27:31 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 09:27:31 2017 -0500

    Merge topic 'topic-reproducible-build' into next
    
    5181f1f8 Tests: make tests pass with SOURCE_DATE_EPOCH set


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5181f1f86a4d4c2ac09a540285c938fe2c2fa262
commit 5181f1f86a4d4c2ac09a540285c938fe2c2fa262
Author:     Bernhard M. Wiedemann <bwiedemann at suse.de>
AuthorDate: Sun Jan 29 11:52:55 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 30 09:25:44 2017 -0500

    Tests: make tests pass with SOURCE_DATE_EPOCH set
    
    Fix tests to account for commit 243aed52 (cmTimestamp: Support
    SOURCE_DATE_EPOCH to override current time, 2017-01-25).
    
    In openSUSE we are running the test-suite as part of the build and that
    failed in these two places when building everything with
    `SOURCE_DATE_EPOCH` set.

diff --git a/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake b/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake
index d0e5fe3..f1aa390 100644
--- a/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake
+++ b/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake
@@ -1,6 +1,7 @@
 set(STAMP_FILENAME "${CMAKE_CURRENT_BINARY_DIR}/FileTimestamp-Stamp")
 set(STAMP_FORMAT "%Y-%m-%d")
 
+unset(ENV{SOURCE_DATE_EPOCH})
 string(TIMESTAMP timestamp1 "${STAMP_FORMAT}")
 
 file(WRITE "${STAMP_FILENAME}" "foo")
diff --git a/Tests/CTestTestStopTime/GetDate.cmake b/Tests/CTestTestStopTime/GetDate.cmake
index 1f4cb24..46ab2fb 100644
--- a/Tests/CTestTestStopTime/GetDate.cmake
+++ b/Tests/CTestTestStopTime/GetDate.cmake
@@ -49,6 +49,7 @@ macro(GET_DATE)
   # 01/12/2006  08:55:12
   # mm/dd/YYYY HH:MM:SS
   #
+  unset(ENV{SOURCE_DATE_EPOCH})
   string(TIMESTAMP "${GD_PREFIX}OV" "%m/%d/%Y %H:%M:%S")
 
   if(${GD_PREFIX}VERBOSE)

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

Summary of changes:
 Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake |    1 +
 Tests/CTestTestStopTime/GetDate.cmake          |    1 +
 2 files changed, 2 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 30 09:31:43 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 30 Jan 2017 09:31:43 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2413-ga38022e
Message-ID: <20170130143143.315F3FA328@public.kitware.com>

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  a38022e786f751fea0785f45df9a611cbf863b34 (commit)
       via  97d61562d064af4e79ed51cfe4ef4ea95f780b23 (commit)
      from  a3faf127a169cad512f9d6c67adfa1d8cc781f11 (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=a38022e786f751fea0785f45df9a611cbf863b34
commit a38022e786f751fea0785f45df9a611cbf863b34
Merge: a3faf12 97d6156
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 09:31:42 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 09:31:42 2017 -0500

    Merge topic 'FindBoost-cache-unset-on-change' into next
    
    97d61562 FindBoost: unset cache variables if the lib dir changes


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97d61562d064af4e79ed51cfe4ef4ea95f780b23
commit 97d61562d064af4e79ed51cfe4ef4ea95f780b23
Author:     Yves Frederix <yves.frederix at gmail.com>
AuthorDate: Mon Jan 30 11:53:42 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 30 09:29:28 2017 -0500

    FindBoost: unset cache variables if the lib dir changes
    
    This fixes a regression introduced by commit v3.3.0-rc1~5^2~2
    (FindBoost: Search for debug and release libraries separately,
    2015-01-26).  The `_Boost_CHANGE_LIBDIR` variable was split into
    `_Boost_CHANGE_LIBDIR_{DEBUG,RELEASE}` but one usage site was not
    updated.

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 266d135..e795aad 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1463,7 +1463,7 @@ if(NOT _Boost_THREAD_DEPENDENCY_LIBS EQUAL -1)
 endif()
 
 # If the user changed any of our control inputs flush previous results.
-if(_Boost_CHANGE_LIBDIR OR _Boost_CHANGE_LIBNAME)
+if(_Boost_CHANGE_LIBDIR_DEBUG OR _Boost_CHANGE_LIBDIR_RELEASE OR _Boost_CHANGE_LIBNAME)
   foreach(COMPONENT ${_Boost_COMPONENTS_SEARCHED})
     string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
     foreach(c DEBUG RELEASE)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 30 13:47:52 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 30 Jan 2017 13:47:52 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2415-g784fe97
Message-ID: <20170130184752.A6272F94EC@public.kitware.com>

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  784fe97dbf81cb1dcf81f213de1843a5351a94c7 (commit)
       via  498ac510f97da1932b7cf01ada26dd6401db00f0 (commit)
      from  a38022e786f751fea0785f45df9a611cbf863b34 (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=784fe97dbf81cb1dcf81f213de1843a5351a94c7
commit 784fe97dbf81cb1dcf81f213de1843a5351a94c7
Merge: a38022e 498ac51
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 13:47:52 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 13:47:52 2017 -0500

    Merge topic '16432-static-frameworks' into next
    
    498ac510 fixup! Apple: Add support for static frameworks


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=498ac510f97da1932b7cf01ada26dd6401db00f0
commit 498ac510f97da1932b7cf01ada26dd6401db00f0
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Mon Jan 30 19:32:22 2017 +0100
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Mon Jan 30 19:32:22 2017 +0100

    fixup! Apple: Add support for static frameworks

diff --git a/Tests/Framework/CMakeLists.txt b/Tests/Framework/CMakeLists.txt
index 271aaf1..a313c2c 100644
--- a/Tests/Framework/CMakeLists.txt
+++ b/Tests/Framework/CMakeLists.txt
@@ -57,29 +57,30 @@ add_custom_target(fooCustom ALL COMMAND ${CMAKE_COMMAND} -E copy foo-post-build
 add_dependencies(fooCustom foo)
 
 # Make a static library and apply the framework properties to it to verify
-# that everything still builds correctly, but it will not actually produce
-# a framework... The framework properties only apply when the library type
-# is SHARED.
+# that everything still builds correctly. Xcode prior to version 5 does not
+# support static Frameworks.
 #
-add_library(fooStatic STATIC
-  foo.cxx
-  foo.h
-  foo2.h
-  fooExtensionlessResource
-  fooPublic.h
-  fooPublicExtensionlessHeader
-  fooPrivate.h
-  fooPrivateExtensionlessHeader
-  fooNeither.h
-  fooBoth.h
-  test.lua
-  fooDeepPublic.h
-)
-set_target_properties(fooStatic PROPERTIES
-  FRAMEWORK TRUE
-  FRAMEWORK_VERSION none
-)
-add_executable(barStatic bar.cxx)
-target_link_libraries(barStatic fooStatic)
+if(NOT XCODE OR NOT XCODE_VERSION VERSION_LESS 5)
+  add_library(fooStatic STATIC
+    foo.cxx
+    foo.h
+    foo2.h
+    fooExtensionlessResource
+    fooPublic.h
+    fooPublicExtensionlessHeader
+    fooPrivate.h
+    fooPrivateExtensionlessHeader
+    fooNeither.h
+    fooBoth.h
+    test.lua
+    fooDeepPublic.h
+  )
+  set_target_properties(fooStatic PROPERTIES
+    FRAMEWORK TRUE
+    FRAMEWORK_VERSION none
+  )
+  add_executable(barStatic bar.cxx)
+  target_link_libraries(barStatic fooStatic)
+endif()
 
 include(CPack)

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

Summary of changes:
 Tests/Framework/CMakeLists.txt |   47 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 30 13:50:14 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 30 Jan 2017 13:50:14 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2417-g91751d6
Message-ID: <20170130185014.18BCFF9C16@public.kitware.com>

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  91751d6491c7fad048a5fa62fe52c9db043c4801 (commit)
       via  6ccabce2cd5736f076ebf079cd05e0ac6ff28209 (commit)
      from  784fe97dbf81cb1dcf81f213de1843a5351a94c7 (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=91751d6491c7fad048a5fa62fe52c9db043c4801
commit 91751d6491c7fad048a5fa62fe52c9db043c4801
Merge: 784fe97 6ccabce
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 13:50:13 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 13:50:13 2017 -0500

    Merge topic 'WCDH_allow_unsupported' into next
    
    6ccabce2 Revert topic 'WCDH_allow_unsupported'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ccabce2cd5736f076ebf079cd05e0ac6ff28209
commit 6ccabce2cd5736f076ebf079cd05e0ac6ff28209
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 13:50:00 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 30 13:50:00 2017 -0500

    Revert topic 'WCDH_allow_unsupported'

diff --git a/Help/release/dev/WCDH_allow_unsupported.rst b/Help/release/dev/WCDH_allow_unsupported.rst
deleted file mode 100644
index c0b7377..0000000
--- a/Help/release/dev/WCDH_allow_unsupported.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-WCDH_allow_unsupported
-----------------------
-
-* The :module:`WriteCompilerDetectionHeader` module gained the
-  ``ALLOW_UNKNOWN_COMPILERS`` and ``ALLOW_UNKNOWN_COMPILER_VERSIONS`` options
-  that allow creation of headers that will work also with unknown or old
-  compilers by simply assuming they do not support any of the requested
-  features.
diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
index 0b16aa4..ba249e1 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -20,8 +20,6 @@
 #              [VERSION <version>]
 #              [PROLOG <prolog>]
 #              [EPILOG <epilog>]
-#              [ALLOW_UNKNOWN_COMPILERS]
-#              [ALLOW_UNKNOWN_COMPILER_VERSIONS]
 #    )
 #
 # The ``write_compiler_detection_header`` function generates the
@@ -83,11 +81,6 @@
 # See the :manual:`cmake-compile-features(7)` manual for information on
 # compile features.
 #
-# ``ALLOW_UNKNOWN_COMPILERS`` and ``ALLOW_UNKNOWN_COMPILER_VERSIONS`` cause
-# the module to generate conditions that treat unknown compilers as simply
-# lacking all features.  Without these options the default behavior is to
-# generate a ``#error`` for unknown compilers.
-#
 # Feature Test Macros
 # ===================
 #
@@ -239,19 +232,6 @@ function(_load_compiler_variables CompilerId lang)
   set(_compiler_id_version_compute_${CompilerId} ${_compiler_id_version_compute} PARENT_SCOPE)
 endfunction()
 
-macro(_simpledefine FEATURE_NAME FEATURE_TESTNAME FEATURE_STRING FEATURE_DEFAULT_STRING)
-  if (feature STREQUAL "${FEATURE_NAME}")
-        set(def_value "${prefix_arg}_${FEATURE_TESTNAME}")
-        string(APPEND file_content "
-#  if defined(${def_name}) && ${def_name}
-#    define ${def_value} ${FEATURE_STRING}
-#  else
-#    define ${def_value} ${FEATURE_DEFAULT_STRING}
-#  endif
-\n")
-  endif()
-endmacro()
-
 function(write_compiler_detection_header
     file_keyword file_arg
     prefix_keyword prefix_arg
@@ -262,7 +242,7 @@ function(write_compiler_detection_header
   if (NOT "x${prefix_keyword}" STREQUAL "xPREFIX")
     message(FATAL_ERROR "write_compiler_detection_header: PREFIX parameter missing.")
   endif()
-  set(options ALLOW_UNKNOWN_COMPILERS ALLOW_UNKNOWN_COMPILER_VERSIONS)
+  set(options)
   set(oneValueArgs VERSION EPILOG PROLOG OUTPUT_FILES_VAR OUTPUT_DIR)
   set(multiValueArgs COMPILERS FEATURES)
   cmake_parse_arguments(_WCD "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -446,12 +426,10 @@ function(write_compiler_detection_header
         set(compiler_file_content file_content)
       endif()
 
-      if(NOT _WCD_ALLOW_UNKNOWN_COMPILER_VERSIONS)
-        set(${compiler_file_content} "${${compiler_file_content}}
+      set(${compiler_file_content} "${${compiler_file_content}}
 #    if !(${_cmake_oldestSupported_${compiler}})
 #      error Unsupported compiler version
 #    endif\n")
-      endif()
 
       set(PREFIX ${prefix_arg}_)
       if (_need_hex_conversion)
@@ -482,36 +460,67 @@ function(write_compiler_detection_header
       endforeach()
     endforeach()
     if(pp_if STREQUAL "elif")
-      if(_WCD_ALLOW_UNKNOWN_COMPILERS)
-        string(APPEND file_content "
-#  endif\n")
-      else()
-        string(APPEND file_content "
+      string(APPEND file_content "
 #  else
 #    error Unsupported compiler
 #  endif\n")
-      endif()
     endif()
     foreach(feature ${${_lang}_features})
       string(TOUPPER ${feature} feature_upper)
       set(feature_PP "COMPILER_${feature_upper}")
       set(def_name ${prefix_arg}_${feature_PP})
-      _simpledefine(c_restrict RESTRICT restrict "")
-      _simpledefine(cxx_constexpr CONSTEXPR constexpr "")
-      _simpledefine(cxx_final FINAL final "")
-      _simpledefine(cxx_override OVERRIDE override "")
+      if (feature STREQUAL c_restrict)
+        set(def_value "${prefix_arg}_RESTRICT")
+        string(APPEND file_content "
+#  if ${def_name}
+#    define ${def_value} restrict
+#  else
+#    define ${def_value}
+#  endif
+\n")
+      endif()
+      if (feature STREQUAL cxx_constexpr)
+        set(def_value "${prefix_arg}_CONSTEXPR")
+        string(APPEND file_content "
+#  if ${def_name}
+#    define ${def_value} constexpr
+#  else
+#    define ${def_value}
+#  endif
+\n")
+      endif()
+      if (feature STREQUAL cxx_final)
+        set(def_value "${prefix_arg}_FINAL")
+        string(APPEND file_content "
+#  if ${def_name}
+#    define ${def_value} final
+#  else
+#    define ${def_value}
+#  endif
+\n")
+      endif()
+      if (feature STREQUAL cxx_override)
+        set(def_value "${prefix_arg}_OVERRIDE")
+        string(APPEND file_content "
+#  if ${def_name}
+#    define ${def_value} override
+#  else
+#    define ${def_value}
+#  endif
+\n")
+      endif()
       if (feature STREQUAL cxx_static_assert)
         set(def_value "${prefix_arg}_STATIC_ASSERT(X)")
         set(def_value_msg "${prefix_arg}_STATIC_ASSERT_MSG(X, MSG)")
         set(static_assert_struct "template<bool> struct ${prefix_arg}StaticAssert;\ntemplate<> struct ${prefix_arg}StaticAssert<true>{};\n")
         set(def_standard "#    define ${def_value} static_assert(X, #X)\n#    define ${def_value_msg} static_assert(X, MSG)")
         set(def_alternative "${static_assert_struct}#    define ${def_value} sizeof(${prefix_arg}StaticAssert<X>)\n#    define ${def_value_msg} sizeof(${prefix_arg}StaticAssert<X>)")
-        string(APPEND file_content "#  if defined(${def_name}) && ${def_name}\n${def_standard}\n#  else\n${def_alternative}\n#  endif\n\n")
+        string(APPEND file_content "#  if ${def_name}\n${def_standard}\n#  else\n${def_alternative}\n#  endif\n\n")
       endif()
       if (feature STREQUAL cxx_alignas)
         set(def_value "${prefix_arg}_ALIGNAS(X)")
         string(APPEND file_content "
-#  if defined(${def_name}) && ${def_name}
+#  if ${def_name}
 #    define ${def_value} alignas(X)
 #  elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang || ${prefix_arg}_COMPILER_IS_AppleClang
 #    define ${def_value} __attribute__ ((__aligned__(X)))
@@ -525,7 +534,7 @@ function(write_compiler_detection_header
       if (feature STREQUAL cxx_alignof)
         set(def_value "${prefix_arg}_ALIGNOF(X)")
         string(APPEND file_content "
-#  if defined(${def_name}) && ${def_name}
+#  if ${def_name}
 #    define ${def_value} alignof(X)
 #  elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang || ${prefix_arg}_COMPILER_IS_AppleClang
 #    define ${def_value} __alignof__(X)
@@ -534,12 +543,30 @@ function(write_compiler_detection_header
 #  endif
 \n")
       endif()
-      _simpledefine(cxx_deleted_functions DELETED_FUNCTION "= delete" "")
-      _simpledefine(cxx_extern_templates EXTERN_TEMPLATE extern "")
+      if (feature STREQUAL cxx_deleted_functions)
+        set(def_value "${prefix_arg}_DELETED_FUNCTION")
+        string(APPEND file_content "
+#  if ${def_name}
+#    define ${def_value} = delete
+#  else
+#    define ${def_value}
+#  endif
+\n")
+      endif()
+      if (feature STREQUAL cxx_extern_templates)
+        set(def_value "${prefix_arg}_EXTERN_TEMPLATE")
+        string(APPEND file_content "
+#  if ${def_name}
+#    define ${def_value} extern
+#  else
+#    define ${def_value}
+#  endif
+\n")
+      endif()
       if (feature STREQUAL cxx_noexcept)
         set(def_value "${prefix_arg}_NOEXCEPT")
         string(APPEND file_content "
-#  if defined(${def_name}) && ${def_name}
+#  if ${def_name}
 #    define ${def_value} noexcept
 #    define ${def_value}_EXPR(X) noexcept(X)
 #  else
@@ -548,11 +575,20 @@ function(write_compiler_detection_header
 #  endif
 \n")
       endif()
-      _simpledefine(cxx_nullptr NULLPTR nullptr 0)
+      if (feature STREQUAL cxx_nullptr)
+        set(def_value "${prefix_arg}_NULLPTR")
+        string(APPEND file_content "
+#  if ${def_name}
+#    define ${def_value} nullptr
+#  else
+#    define ${def_value} 0
+#  endif
+\n")
+      endif()
       if (feature STREQUAL cxx_thread_local)
         set(def_value "${prefix_arg}_THREAD_LOCAL")
         string(APPEND file_content "
-#  if defined(${def_name}) && ${def_name}
+#  if ${def_name}
 #    define ${def_value} thread_local
 #  elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang || ${prefix_arg}_COMPILER_IS_AppleClang
 #    define ${def_value} __thread
@@ -568,7 +604,7 @@ function(write_compiler_detection_header
         set(def_value "${prefix_arg}_DEPRECATED")
         string(APPEND file_content "
 #  ifndef ${def_value}
-#    if defined(${def_name}) && ${def_name}
+#    if ${def_name}
 #      define ${def_value} [[deprecated]]
 #      define ${def_value}_MSG(MSG) [[deprecated(MSG)]]
 #    elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index 9f229f9..8b251d7 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -4,7 +4,6 @@ project(WriteCompilerDetectionHeader)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 include(WriteCompilerDetectionHeader)
-include(CheckCXXSourceCompiles)
 
 get_property(cxx_known_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
 get_property(c_known_features GLOBAL PROPERTY CMAKE_C_KNOWN_FEATURES)
@@ -27,6 +26,7 @@ if (NOT CMAKE_CXX_COMPILE_FEATURES AND NOT CMAKE_C_COMPILE_FEATURES)
   add_executable(WriteCompilerDetectionHeader "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp")
 
   if(UNIX OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    include(CheckCXXSourceCompiles)
     check_cxx_source_compiles("#include \"${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h\"\nint main() { return 0; }\n"
       file_include_works
     )
@@ -156,31 +156,3 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
   set_defines(WriteCompilerDetectionHeader_C11_multi "EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES;EXPECTED_COMPILER_C_RESTRICT" "")
   target_include_directories(WriteCompilerDetectionHeader_C11_multi PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files)
 endif()
-
-# test for ALLOW_UNKNOWN_COMPILERS
-
-# use a compiler does not match the current one,
-# so one always hits the fallback code
-if (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
-  set(OTHER_CXX "Intel")
-else()
-  set(OTHER_CXX "SunPro")
-endif()
-
-write_compiler_detection_header(
-  FILE "${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection_allow_unknown.h"
-  PREFIX TEST
-  COMPILERS ${OTHER_CXX}
-  FEATURES cxx_nullptr
-  ALLOW_UNKNOWN_COMPILERS
-)
-
-# intentionally abuse the TEST_NULLPR variable: this will only work
-# with the fallback code.
-check_cxx_source_compiles("#include \"${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection_allow_unknown.h\"
-int main() {\n int i = TEST_NULLPTR;\n return 0; }\n"
-  file_include_works_allow_unknown
-)
-if (NOT file_include_works_allow_unknown)
-  message(SEND_ERROR "Inclusion of ${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection_allow_unknown.h was expected to work, but did not.")
-endif()

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

Summary of changes:
 Help/release/dev/WCDH_allow_unsupported.rst        |    8 --
 Modules/WriteCompilerDetectionHeader.cmake         |  122 +++++++++++++-------
 .../WriteCompilerDetectionHeader/CMakeLists.txt    |   30 +----
 3 files changed, 80 insertions(+), 80 deletions(-)
 delete mode 100644 Help/release/dev/WCDH_allow_unsupported.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 30 13:51:41 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 30 Jan 2017 13:51:41 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2422-g48381a9
Message-ID: <20170130185141.BBE2AF9EAD@public.kitware.com>

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  48381a9899894532e40e6ecaa4f2e83b0b35b171 (commit)
       via  1679fecb74ee4eb4500d591796f93fe4271b688e (commit)
       via  98e6d1e5e426c491e04faa746c11746002e6a69d (commit)
       via  c8703e9d7b6c3f7ad58429317a6bf75c1e415568 (commit)
       via  0de9c3985004ef802aac97e20b4efde49989794c (commit)
      from  91751d6491c7fad048a5fa62fe52c9db043c4801 (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=48381a9899894532e40e6ecaa4f2e83b0b35b171
commit 48381a9899894532e40e6ecaa4f2e83b0b35b171
Merge: 91751d6 1679fec
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 13:51:40 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 13:51:40 2017 -0500

    Merge topic 'WCDH_allow_unsupported' into next
    
    1679fecb CompileFeatures Test: make sure the target "CompileFeatures" is always defined
    98e6d1e5 Tests/Module/WCDH: make it work with only C features defined
    c8703e9d WCDH: optionally omit error code for unknown compilers or compiler versions
    0de9c398 WCDH: add macro to write simple replacement defines


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1679fecb74ee4eb4500d591796f93fe4271b688e
commit 1679fecb74ee4eb4500d591796f93fe4271b688e
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 30 19:17:19 2017 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jan 30 19:19:44 2017 +0100

    CompileFeatures Test: make sure the target "CompileFeatures" is always defined
    
    Everything in there guards against unsupported compilers already, so no need to
    skip the whole file if no features are defined. This in turn allows to have a
    simpler fallback in case there is no C++ auto_type feature available.

diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 13aa86e..2a307d0 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -3,14 +3,6 @@ cmake_minimum_required(VERSION 3.1)
 
 project(CompileFeatures)
 
-if (NOT CMAKE_C_COMPILE_FEATURES AND NOT CMAKE_CXX_COMPILE_FEATURES)
-  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp"
-    "int main(int,char**) { return 0; }\n"
-  )
-  add_executable(CompileFeatures "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp")
-  return()
-endif()
-
 macro(run_test feature lang)
   if (";${CMAKE_${lang}_COMPILE_FEATURES};" MATCHES ${feature})
     add_library(test_${feature} OBJECT ${feature})
@@ -277,8 +269,14 @@ if (CMAKE_CXX_COMPILE_FEATURES)
   endif()
 endif ()
 
-# these tests only work if at least cxx_auto_type is available
-if (";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_auto_type;")
+# always add a target "CompileFeatures"
+if (NOT ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_auto_type;")
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp"
+    "int main(int,char**) { return 0; }\n"
+  )
+  add_executable(CompileFeatures "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp")
+else()
+  # these tests only work if at least cxx_auto_type is available
   add_executable(CompileFeatures main.cpp)
   set_property(TARGET CompileFeatures
     PROPERTY COMPILE_FEATURES "cxx_auto_type"

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98e6d1e5e426c491e04faa746c11746002e6a69d
commit 98e6d1e5e426c491e04faa746c11746002e6a69d
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 30 19:02:02 2017 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jan 30 19:19:44 2017 +0100

    Tests/Module/WCDH: make it work with only C features defined

diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index 9f229f9..7957ab8 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -20,7 +20,57 @@ write_compiler_detection_header(
     ${cxx_known_features} ${c_known_features}
 )
 
-if (NOT CMAKE_CXX_COMPILE_FEATURES AND NOT CMAKE_C_COMPILE_FEATURES)
+macro(set_defines target true_defs false_defs)
+  set(defines)
+  foreach(def ${true_defs})
+    list(APPEND defines ${def}=1)
+  endforeach()
+  foreach(def ${false_defs})
+    list(APPEND defines ${def}=0)
+  endforeach()
+  target_compile_definitions(${target}
+    PRIVATE
+      ${defines}
+      EXPECTED_COMPILER_VERSION_MAJOR=${COMPILER_VERSION_MAJOR}
+      EXPECTED_COMPILER_VERSION_MINOR=${COMPILER_VERSION_MINOR}
+      EXPECTED_COMPILER_VERSION_PATCH=${COMPILER_VERSION_PATCH}
+  )
+endmacro()
+
+if (CMAKE_C_COMPILE_FEATURES)
+  string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" COMPILER_VERSION_MAJOR "${CMAKE_C_COMPILER_VERSION}")
+  string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" COMPILER_VERSION_MINOR "${CMAKE_C_COMPILER_VERSION}")
+  string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" COMPILER_VERSION_PATCH "${CMAKE_C_COMPILER_VERSION}")
+
+  if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
+      OR CMAKE_C_COMPILER_ID STREQUAL "Clang"
+      OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang"
+      OR CMAKE_C_COMPILER_ID STREQUAL "Intel")
+    add_executable(WriteCompilerDetectionHeader_C11 main.c)
+    set_property(TARGET WriteCompilerDetectionHeader_C11 PROPERTY C_STANDARD 11)
+    set_defines(WriteCompilerDetectionHeader_C11 "EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES;EXPECTED_COMPILER_C_RESTRICT" "")
+
+    add_executable(WriteCompilerDetectionHeader_C11_multi main_multi.c)
+    set_property(TARGET WriteCompilerDetectionHeader_C11_multi PROPERTY C_STANDARD 11)
+    set_defines(WriteCompilerDetectionHeader_C11_multi "EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES;EXPECTED_COMPILER_C_RESTRICT" "")
+    target_include_directories(WriteCompilerDetectionHeader_C11_multi PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files)
+
+    add_executable(C_undefined c_undefined.c)
+    set_property(TARGET C_undefined PROPERTY C_STANDARD 90)
+    target_compile_options(C_undefined PRIVATE -Werror=undef)
+
+    add_executable(WriteCompilerDetectionHeader_C main.c)
+    set_property(TARGET WriteCompilerDetectionHeader_C PROPERTY C_STANDARD 90)
+    set_defines(WriteCompilerDetectionHeader_C "EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES" "EXPECTED_COMPILER_C_RESTRICT")
+
+    add_executable(WriteCompilerDetectionHeader_C_multi main_multi.c)
+    set_property(TARGET WriteCompilerDetectionHeader_C_multi PROPERTY C_STANDARD 90)
+    set_defines(WriteCompilerDetectionHeader_C_multi "EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES" "EXPECTED_COMPILER_C_RESTRICT")
+    target_include_directories(WriteCompilerDetectionHeader_C_multi PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files)
+  endif()
+endif()
+
+if (NOT CMAKE_CXX_COMPILE_FEATURES)
   file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp"
     "int main(int,char**) { return 0; }\n"
   )
@@ -41,23 +91,6 @@ string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" COMPILER_VERSION_MAJO
 string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" COMPILER_VERSION_MINOR "${CMAKE_CXX_COMPILER_VERSION}")
 string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" COMPILER_VERSION_PATCH "${CMAKE_CXX_COMPILER_VERSION}")
 
-macro(set_defines target true_defs false_defs)
-  set(defines)
-  foreach(def ${true_defs})
-    list(APPEND defines ${def}=1)
-  endforeach()
-  foreach(def ${false_defs})
-    list(APPEND defines ${def}=0)
-  endforeach()
-  target_compile_definitions(${target}
-    PRIVATE
-      ${defines}
-      EXPECTED_COMPILER_VERSION_MAJOR=${COMPILER_VERSION_MAJOR}
-      EXPECTED_COMPILER_VERSION_MINOR=${COMPILER_VERSION_MINOR}
-      EXPECTED_COMPILER_VERSION_PATCH=${COMPILER_VERSION_PATCH}
-  )
-endmacro()
-
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
     OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
     OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"
@@ -79,25 +112,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
   endif()
 endif()
 
-if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
-    OR CMAKE_C_COMPILER_ID STREQUAL "Clang"
-    OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang"
-    OR CMAKE_C_COMPILER_ID STREQUAL "Intel")
-
-  add_executable(C_undefined c_undefined.c)
-  set_property(TARGET C_undefined PROPERTY C_STANDARD 90)
-  target_compile_options(C_undefined PRIVATE -Werror=undef)
-
-  add_executable(WriteCompilerDetectionHeader_C main.c)
-  set_property(TARGET WriteCompilerDetectionHeader_C PROPERTY C_STANDARD 90)
-  set_defines(WriteCompilerDetectionHeader_C "EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES" "EXPECTED_COMPILER_C_RESTRICT")
-
-  add_executable(WriteCompilerDetectionHeader_C_multi main_multi.c)
-  set_property(TARGET WriteCompilerDetectionHeader_C_multi PROPERTY C_STANDARD 90)
-  set_defines(WriteCompilerDetectionHeader_C_multi "EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES" "EXPECTED_COMPILER_C_RESTRICT")
-  target_include_directories(WriteCompilerDetectionHeader_C_multi PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files)
-endif()
-
 add_executable(WriteCompilerDetectionHeader main.cpp)
 set_property(TARGET WriteCompilerDetectionHeader PROPERTY CXX_STANDARD 98)
 set_defines(WriteCompilerDetectionHeader "${true_defs}" "${false_defs}")
@@ -143,20 +157,6 @@ set_property(TARGET multi_files_11 PROPERTY CXX_STANDARD 11)
 target_include_directories(multi_files_11 PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files)
 set_defines(multi_files_11 "${true_defs}" "${false_defs}")
 
-if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
-    OR CMAKE_C_COMPILER_ID STREQUAL "Clang"
-    OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang"
-    OR CMAKE_C_COMPILER_ID STREQUAL "Intel")
-  add_executable(WriteCompilerDetectionHeader_C11 main.c)
-  set_property(TARGET WriteCompilerDetectionHeader_C11 PROPERTY C_STANDARD 11)
-  set_defines(WriteCompilerDetectionHeader_C11 "EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES;EXPECTED_COMPILER_C_RESTRICT" "")
-
-  add_executable(WriteCompilerDetectionHeader_C11_multi main_multi.c)
-  set_property(TARGET WriteCompilerDetectionHeader_C11_multi PROPERTY C_STANDARD 11)
-  set_defines(WriteCompilerDetectionHeader_C11_multi "EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES;EXPECTED_COMPILER_C_RESTRICT" "")
-  target_include_directories(WriteCompilerDetectionHeader_C11_multi PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files)
-endif()
-
 # test for ALLOW_UNKNOWN_COMPILERS
 
 # use a compiler does not match the current one,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8703e9d7b6c3f7ad58429317a6bf75c1e415568
commit c8703e9d7b6c3f7ad58429317a6bf75c1e415568
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 25 20:32:59 2017 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jan 30 19:19:44 2017 +0100

    WCDH: optionally omit error code for unknown compilers or compiler versions
    
    This allows one to generate a header that will basically always work. In case
    an unknown compiler or compiler version is encountered it simply falls back to
    the unsupported case.

diff --git a/Help/release/dev/WCDH_allow_unsupported.rst b/Help/release/dev/WCDH_allow_unsupported.rst
new file mode 100644
index 0000000..c0b7377
--- /dev/null
+++ b/Help/release/dev/WCDH_allow_unsupported.rst
@@ -0,0 +1,8 @@
+WCDH_allow_unsupported
+----------------------
+
+* The :module:`WriteCompilerDetectionHeader` module gained the
+  ``ALLOW_UNKNOWN_COMPILERS`` and ``ALLOW_UNKNOWN_COMPILER_VERSIONS`` options
+  that allow creation of headers that will work also with unknown or old
+  compilers by simply assuming they do not support any of the requested
+  features.
diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
index c96a701..0b16aa4 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -20,6 +20,8 @@
 #              [VERSION <version>]
 #              [PROLOG <prolog>]
 #              [EPILOG <epilog>]
+#              [ALLOW_UNKNOWN_COMPILERS]
+#              [ALLOW_UNKNOWN_COMPILER_VERSIONS]
 #    )
 #
 # The ``write_compiler_detection_header`` function generates the
@@ -81,6 +83,11 @@
 # See the :manual:`cmake-compile-features(7)` manual for information on
 # compile features.
 #
+# ``ALLOW_UNKNOWN_COMPILERS`` and ``ALLOW_UNKNOWN_COMPILER_VERSIONS`` cause
+# the module to generate conditions that treat unknown compilers as simply
+# lacking all features.  Without these options the default behavior is to
+# generate a ``#error`` for unknown compilers.
+#
 # Feature Test Macros
 # ===================
 #
@@ -236,7 +243,7 @@ macro(_simpledefine FEATURE_NAME FEATURE_TESTNAME FEATURE_STRING FEATURE_DEFAULT
   if (feature STREQUAL "${FEATURE_NAME}")
         set(def_value "${prefix_arg}_${FEATURE_TESTNAME}")
         string(APPEND file_content "
-#  if ${def_name}
+#  if defined(${def_name}) && ${def_name}
 #    define ${def_value} ${FEATURE_STRING}
 #  else
 #    define ${def_value} ${FEATURE_DEFAULT_STRING}
@@ -255,7 +262,7 @@ function(write_compiler_detection_header
   if (NOT "x${prefix_keyword}" STREQUAL "xPREFIX")
     message(FATAL_ERROR "write_compiler_detection_header: PREFIX parameter missing.")
   endif()
-  set(options)
+  set(options ALLOW_UNKNOWN_COMPILERS ALLOW_UNKNOWN_COMPILER_VERSIONS)
   set(oneValueArgs VERSION EPILOG PROLOG OUTPUT_FILES_VAR OUTPUT_DIR)
   set(multiValueArgs COMPILERS FEATURES)
   cmake_parse_arguments(_WCD "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -439,10 +446,12 @@ function(write_compiler_detection_header
         set(compiler_file_content file_content)
       endif()
 
-      set(${compiler_file_content} "${${compiler_file_content}}
+      if(NOT _WCD_ALLOW_UNKNOWN_COMPILER_VERSIONS)
+        set(${compiler_file_content} "${${compiler_file_content}}
 #    if !(${_cmake_oldestSupported_${compiler}})
 #      error Unsupported compiler version
 #    endif\n")
+      endif()
 
       set(PREFIX ${prefix_arg}_)
       if (_need_hex_conversion)
@@ -473,10 +482,15 @@ function(write_compiler_detection_header
       endforeach()
     endforeach()
     if(pp_if STREQUAL "elif")
-      string(APPEND file_content "
+      if(_WCD_ALLOW_UNKNOWN_COMPILERS)
+        string(APPEND file_content "
+#  endif\n")
+      else()
+        string(APPEND file_content "
 #  else
 #    error Unsupported compiler
 #  endif\n")
+      endif()
     endif()
     foreach(feature ${${_lang}_features})
       string(TOUPPER ${feature} feature_upper)
@@ -492,12 +506,12 @@ function(write_compiler_detection_header
         set(static_assert_struct "template<bool> struct ${prefix_arg}StaticAssert;\ntemplate<> struct ${prefix_arg}StaticAssert<true>{};\n")
         set(def_standard "#    define ${def_value} static_assert(X, #X)\n#    define ${def_value_msg} static_assert(X, MSG)")
         set(def_alternative "${static_assert_struct}#    define ${def_value} sizeof(${prefix_arg}StaticAssert<X>)\n#    define ${def_value_msg} sizeof(${prefix_arg}StaticAssert<X>)")
-        string(APPEND file_content "#  if ${def_name}\n${def_standard}\n#  else\n${def_alternative}\n#  endif\n\n")
+        string(APPEND file_content "#  if defined(${def_name}) && ${def_name}\n${def_standard}\n#  else\n${def_alternative}\n#  endif\n\n")
       endif()
       if (feature STREQUAL cxx_alignas)
         set(def_value "${prefix_arg}_ALIGNAS(X)")
         string(APPEND file_content "
-#  if ${def_name}
+#  if defined(${def_name}) && ${def_name}
 #    define ${def_value} alignas(X)
 #  elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang || ${prefix_arg}_COMPILER_IS_AppleClang
 #    define ${def_value} __attribute__ ((__aligned__(X)))
@@ -511,7 +525,7 @@ function(write_compiler_detection_header
       if (feature STREQUAL cxx_alignof)
         set(def_value "${prefix_arg}_ALIGNOF(X)")
         string(APPEND file_content "
-#  if ${def_name}
+#  if defined(${def_name}) && ${def_name}
 #    define ${def_value} alignof(X)
 #  elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang || ${prefix_arg}_COMPILER_IS_AppleClang
 #    define ${def_value} __alignof__(X)
@@ -525,7 +539,7 @@ function(write_compiler_detection_header
       if (feature STREQUAL cxx_noexcept)
         set(def_value "${prefix_arg}_NOEXCEPT")
         string(APPEND file_content "
-#  if ${def_name}
+#  if defined(${def_name}) && ${def_name}
 #    define ${def_value} noexcept
 #    define ${def_value}_EXPR(X) noexcept(X)
 #  else
@@ -538,7 +552,7 @@ function(write_compiler_detection_header
       if (feature STREQUAL cxx_thread_local)
         set(def_value "${prefix_arg}_THREAD_LOCAL")
         string(APPEND file_content "
-#  if ${def_name}
+#  if defined(${def_name}) && ${def_name}
 #    define ${def_value} thread_local
 #  elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang || ${prefix_arg}_COMPILER_IS_AppleClang
 #    define ${def_value} __thread
@@ -554,7 +568,7 @@ function(write_compiler_detection_header
         set(def_value "${prefix_arg}_DEPRECATED")
         string(APPEND file_content "
 #  ifndef ${def_value}
-#    if ${def_name}
+#    if defined(${def_name}) && ${def_name}
 #      define ${def_value} [[deprecated]]
 #      define ${def_value}_MSG(MSG) [[deprecated(MSG)]]
 #    elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index 8b251d7..9f229f9 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -4,6 +4,7 @@ project(WriteCompilerDetectionHeader)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 include(WriteCompilerDetectionHeader)
+include(CheckCXXSourceCompiles)
 
 get_property(cxx_known_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
 get_property(c_known_features GLOBAL PROPERTY CMAKE_C_KNOWN_FEATURES)
@@ -26,7 +27,6 @@ if (NOT CMAKE_CXX_COMPILE_FEATURES AND NOT CMAKE_C_COMPILE_FEATURES)
   add_executable(WriteCompilerDetectionHeader "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp")
 
   if(UNIX OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    include(CheckCXXSourceCompiles)
     check_cxx_source_compiles("#include \"${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h\"\nint main() { return 0; }\n"
       file_include_works
     )
@@ -156,3 +156,31 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
   set_defines(WriteCompilerDetectionHeader_C11_multi "EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES;EXPECTED_COMPILER_C_RESTRICT" "")
   target_include_directories(WriteCompilerDetectionHeader_C11_multi PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files)
 endif()
+
+# test for ALLOW_UNKNOWN_COMPILERS
+
+# use a compiler does not match the current one,
+# so one always hits the fallback code
+if (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
+  set(OTHER_CXX "Intel")
+else()
+  set(OTHER_CXX "SunPro")
+endif()
+
+write_compiler_detection_header(
+  FILE "${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection_allow_unknown.h"
+  PREFIX TEST
+  COMPILERS ${OTHER_CXX}
+  FEATURES cxx_nullptr
+  ALLOW_UNKNOWN_COMPILERS
+)
+
+# intentionally abuse the TEST_NULLPR variable: this will only work
+# with the fallback code.
+check_cxx_source_compiles("#include \"${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection_allow_unknown.h\"
+int main() {\n int i = TEST_NULLPTR;\n return 0; }\n"
+  file_include_works_allow_unknown
+)
+if (NOT file_include_works_allow_unknown)
+  message(SEND_ERROR "Inclusion of ${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection_allow_unknown.h was expected to work, but did not.")
+endif()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0de9c3985004ef802aac97e20b4efde49989794c
commit 0de9c3985004ef802aac97e20b4efde49989794c
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 25 20:26:28 2017 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jan 30 19:19:43 2017 +0100

    WCDH: add macro to write simple replacement defines

diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
index ba249e1..c96a701 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -232,6 +232,19 @@ function(_load_compiler_variables CompilerId lang)
   set(_compiler_id_version_compute_${CompilerId} ${_compiler_id_version_compute} PARENT_SCOPE)
 endfunction()
 
+macro(_simpledefine FEATURE_NAME FEATURE_TESTNAME FEATURE_STRING FEATURE_DEFAULT_STRING)
+  if (feature STREQUAL "${FEATURE_NAME}")
+        set(def_value "${prefix_arg}_${FEATURE_TESTNAME}")
+        string(APPEND file_content "
+#  if ${def_name}
+#    define ${def_value} ${FEATURE_STRING}
+#  else
+#    define ${def_value} ${FEATURE_DEFAULT_STRING}
+#  endif
+\n")
+  endif()
+endmacro()
+
 function(write_compiler_detection_header
     file_keyword file_arg
     prefix_keyword prefix_arg
@@ -469,46 +482,10 @@ function(write_compiler_detection_header
       string(TOUPPER ${feature} feature_upper)
       set(feature_PP "COMPILER_${feature_upper}")
       set(def_name ${prefix_arg}_${feature_PP})
-      if (feature STREQUAL c_restrict)
-        set(def_value "${prefix_arg}_RESTRICT")
-        string(APPEND file_content "
-#  if ${def_name}
-#    define ${def_value} restrict
-#  else
-#    define ${def_value}
-#  endif
-\n")
-      endif()
-      if (feature STREQUAL cxx_constexpr)
-        set(def_value "${prefix_arg}_CONSTEXPR")
-        string(APPEND file_content "
-#  if ${def_name}
-#    define ${def_value} constexpr
-#  else
-#    define ${def_value}
-#  endif
-\n")
-      endif()
-      if (feature STREQUAL cxx_final)
-        set(def_value "${prefix_arg}_FINAL")
-        string(APPEND file_content "
-#  if ${def_name}
-#    define ${def_value} final
-#  else
-#    define ${def_value}
-#  endif
-\n")
-      endif()
-      if (feature STREQUAL cxx_override)
-        set(def_value "${prefix_arg}_OVERRIDE")
-        string(APPEND file_content "
-#  if ${def_name}
-#    define ${def_value} override
-#  else
-#    define ${def_value}
-#  endif
-\n")
-      endif()
+      _simpledefine(c_restrict RESTRICT restrict "")
+      _simpledefine(cxx_constexpr CONSTEXPR constexpr "")
+      _simpledefine(cxx_final FINAL final "")
+      _simpledefine(cxx_override OVERRIDE override "")
       if (feature STREQUAL cxx_static_assert)
         set(def_value "${prefix_arg}_STATIC_ASSERT(X)")
         set(def_value_msg "${prefix_arg}_STATIC_ASSERT_MSG(X, MSG)")
@@ -543,26 +520,8 @@ function(write_compiler_detection_header
 #  endif
 \n")
       endif()
-      if (feature STREQUAL cxx_deleted_functions)
-        set(def_value "${prefix_arg}_DELETED_FUNCTION")
-        string(APPEND file_content "
-#  if ${def_name}
-#    define ${def_value} = delete
-#  else
-#    define ${def_value}
-#  endif
-\n")
-      endif()
-      if (feature STREQUAL cxx_extern_templates)
-        set(def_value "${prefix_arg}_EXTERN_TEMPLATE")
-        string(APPEND file_content "
-#  if ${def_name}
-#    define ${def_value} extern
-#  else
-#    define ${def_value}
-#  endif
-\n")
-      endif()
+      _simpledefine(cxx_deleted_functions DELETED_FUNCTION "= delete" "")
+      _simpledefine(cxx_extern_templates EXTERN_TEMPLATE extern "")
       if (feature STREQUAL cxx_noexcept)
         set(def_value "${prefix_arg}_NOEXCEPT")
         string(APPEND file_content "
@@ -575,16 +534,7 @@ function(write_compiler_detection_header
 #  endif
 \n")
       endif()
-      if (feature STREQUAL cxx_nullptr)
-        set(def_value "${prefix_arg}_NULLPTR")
-        string(APPEND file_content "
-#  if ${def_name}
-#    define ${def_value} nullptr
-#  else
-#    define ${def_value} 0
-#  endif
-\n")
-      endif()
+      _simpledefine(cxx_nullptr NULLPTR nullptr 0)
       if (feature STREQUAL cxx_thread_local)
         set(def_value "${prefix_arg}_THREAD_LOCAL")
         string(APPEND file_content "

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

Summary of changes:
 Help/release/dev/WCDH_allow_unsupported.rst        |    8 ++
 Modules/WriteCompilerDetectionHeader.cmake         |  122 +++++++------------
 Tests/CompileFeatures/CMakeLists.txt               |   18 ++-
 .../WriteCompilerDetectionHeader/CMakeLists.txt    |  128 ++++++++++++--------
 4 files changed, 137 insertions(+), 139 deletions(-)
 create mode 100644 Help/release/dev/WCDH_allow_unsupported.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 30 16:58:40 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 30 Jan 2017 16:58:40 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2424-g9c7eecc
Message-ID: <20170130215840.C0F87FA3B4@public.kitware.com>

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  9c7eecc64a484482e55f584ec97f582288faadf5 (commit)
       via  abb20e3234f49fe6d40bf3506b1d8f28277198c3 (commit)
      from  48381a9899894532e40e6ecaa4f2e83b0b35b171 (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=9c7eecc64a484482e55f584ec97f582288faadf5
commit 9c7eecc64a484482e55f584ec97f582288faadf5
Merge: 48381a9 abb20e3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 16:58:40 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 16:58:40 2017 -0500

    Merge topic 'CSharpVS2017' into next
    
    abb20e32 Missing environment variable reference operator.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=abb20e3234f49fe6d40bf3506b1d8f28277198c3
commit abb20e3234f49fe6d40bf3506b1d8f28277198c3
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Mon Jan 30 13:50:27 2017 -0800
Commit:     Gilles Khouzam <gillesk at microsoft.com>
CommitDate: Mon Jan 30 13:50:27 2017 -0800

    Missing environment variable reference operator.

diff --git a/Modules/CompilerId/VS-10.csproj.in b/Modules/CompilerId/VS-10.csproj.in
index 2bd179e..ed5e847 100644
--- a/Modules/CompilerId/VS-10.csproj.in
+++ b/Modules/CompilerId/VS-10.csproj.in
@@ -49,7 +49,7 @@
   <PropertyGroup>
     <PostBuildEvent>if not "$(RoslynTargetsPath)"=="" if exist "$(RoslynTargetsPath)\@id_cl@" set _CSC=$(RoslynTargetsPath)
 if exist "$(MSBuildToolsPath)\@id_cl@" set _CSC=$(MSBuildToolsPath)
-if "_CSC"=="" exit -1
+if "%_CSC%"=="" exit -1
 %40echo CMAKE_ at id_lang@_COMPILER=%_CSC%\@id_cl@</PostBuildEvent>
   </PropertyGroup>
 </Project>

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

Summary of changes:
 Modules/CompilerId/VS-10.csproj.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Jan 30 17:00:16 2017
From: brad.king at kitware.com (Brad King)
Date: Mon, 30 Jan 2017 17:00:16 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2432-ge2025bc
Message-ID: <20170130220016.219BDFA407@public.kitware.com>

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  e2025bcc8ba13eef8f2e8f6709128f845dc3ff2b (commit)
       via  050bb41ca71d2cd9d4a229cdae19c97f77753273 (commit)
       via  d6108c87afb03a326b14bc6feafeb14e99316e5f (commit)
       via  3642d657b153f212eb119f1003e11c3079494630 (commit)
       via  7e5ef9ca78f67c2f4def64408ce4c7ecc03917a7 (commit)
       via  a6fda7bf4010051c2232d4ba6c64f310862a6471 (commit)
       via  a2d393d648d0f64010a4b34b84ab7985a284e294 (commit)
       via  c7b846edaa7cee549ca08cbfbab2843daf106a01 (commit)
      from  9c7eecc64a484482e55f584ec97f582288faadf5 (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=e2025bcc8ba13eef8f2e8f6709128f845dc3ff2b
commit e2025bcc8ba13eef8f2e8f6709128f845dc3ff2b
Merge: 9c7eecc 050bb41
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 17:00:13 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 17:00:13 2017 -0500

    Merge topic 'developer-setup' into next
    
    050bb41c Tell Git not to export the GitSetup directory
    d6108c87 GitSetup: Tell Git not to export .gitattributes
    3642d657 Merge branch 'upstream-GitSetup' into developer-setup
    7e5ef9ca GitSetup 2016-12-13 (cd5ada6d)
    a6fda7bf Merge branch 'upstream-GitSetup' into developer-setup
    a2d393d6 Add script to update GitSetup from upstream
    c7b846ed GitSetup 2012-04-26 (b7daff9b)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=050bb41ca71d2cd9d4a229cdae19c97f77753273
commit 050bb41ca71d2cd9d4a229cdae19c97f77753273
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 16:55:35 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 30 16:56:31 2017 -0500

    Tell Git not to export the GitSetup directory
    
    The `Utilities/GitSetup` directory is useful only in Git work trees
    and so does not need to be distributed with source tarballs.

diff --git a/Utilities/.gitattributes b/Utilities/.gitattributes
index e3a9e61..c6345eb 100644
--- a/Utilities/.gitattributes
+++ b/Utilities/.gitattributes
@@ -1,2 +1,3 @@
 /Git                    export-ignore
+/GitSetup               export-ignore
 SetupForDevelopment.sh  export-ignore

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6108c87afb03a326b14bc6feafeb14e99316e5f
commit d6108c87afb03a326b14bc6feafeb14e99316e5f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 16:53:14 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 30 16:53:14 2017 -0500

    GitSetup: Tell Git not to export .gitattributes
    
    GitSetup upstream added an attribute to export `.gitattributes` so that
    importing snapshots into the sources of other projects would bring along
    the attributes.  However, we don't want to export them from CMake.  Drop
    `.gitattributes` entries not relevant to CMake.

diff --git a/Utilities/GitSetup/.gitattributes b/Utilities/GitSetup/.gitattributes
index f7531d4..e96d1f8 100644
--- a/Utilities/GitSetup/.gitattributes
+++ b/Utilities/GitSetup/.gitattributes
@@ -1,5 +1,4 @@
 .git*            export-ignore
-.gitattributes  -export-ignore
 
 config*          eol=lf         whitespace=indent-with-non-tab
 git-*            eol=lf         whitespace=indent-with-non-tab

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3642d657b153f212eb119f1003e11c3079494630
commit 3642d657b153f212eb119f1003e11c3079494630
Merge: a6fda7b 7e5ef9c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 16:45:48 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 30 16:45:48 2017 -0500

    Merge branch 'upstream-GitSetup' into developer-setup
    
    * upstream-GitSetup:
      GitSetup 2016-12-13 (cd5ada6d)

diff --cc Utilities/GitSetup/git-gerrit-push
index 0000000,b46f753..b46f753
mode 000000,100755..100755
--- a/Utilities/GitSetup/git-gerrit-push
+++ b/Utilities/GitSetup/git-gerrit-push
diff --cc Utilities/GitSetup/git-gitlab-push
index 0000000,768f853..768f853
mode 000000,100755..100755
--- a/Utilities/GitSetup/git-gitlab-push
+++ b/Utilities/GitSetup/git-gitlab-push
diff --cc Utilities/GitSetup/setup-gitlab
index 0000000,9c7574d..9c7574d
mode 000000,100755..100755
--- a/Utilities/GitSetup/setup-gitlab
+++ b/Utilities/GitSetup/setup-gitlab
diff --cc Utilities/GitSetup/setup-upstream
index 0000000,92ce1da..92ce1da
mode 000000,100755..100755
--- a/Utilities/GitSetup/setup-upstream
+++ b/Utilities/GitSetup/setup-upstream

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e5ef9ca78f67c2f4def64408ce4c7ecc03917a7
commit 7e5ef9ca78f67c2f4def64408ce4c7ecc03917a7
Author:     GitSetup Upstream <kwrobot at kitware.com>
AuthorDate: Tue Dec 13 16:00:00 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 30 16:45:47 2017 -0500

    GitSetup 2016-12-13 (cd5ada6d)
    
    Code extracted from:
    
        https://gitlab.kitware.com/utils/gitsetup.git
    
    at commit cd5ada6d5626da409d3ff108c341b9afd615803f (setup).

diff --git a/.gitattributes b/.gitattributes
index facbbb2..f7531d4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,7 @@
 .git*            export-ignore
+.gitattributes  -export-ignore
 
-# Exclude from source archives files specific to Git work tree.
-*                export-ignore
-
+config*          eol=lf         whitespace=indent-with-non-tab
+git-*            eol=lf         whitespace=indent-with-non-tab
 tips             eol=lf         whitespace=indent-with-non-tab
 setup-*          eol=lf         whitespace=indent-with-non-tab
diff --git a/README b/README
index cf468fb..2f9f1ec 100644
--- a/README
+++ b/README
@@ -37,6 +37,13 @@ Commit the merge with an informative message:
  the general GitSetup repository "setup" branch.
  ------------------------------------------------------------------------
 
+Optionally add to the project ".gitattributes" file the line
+
+ /Utilities/GitSetup export-ignore
+
+to exclude the GitSetup directory from inclusion by "git archive"
+since it does not make sense in source tarballs.
+
 
 Configuration
 -------------
diff --git a/config.sample b/config.sample
index bba2382..eeb468b 100644
--- a/config.sample
+++ b/config.sample
@@ -20,3 +20,13 @@
 	site = http://review.source.kitware.com
 	# pushurl placeholder "$username" is literal
 	pushurl = $username at review.source.kitware.com:Project
+
+[upstream]
+	url = git://public.kitware.com/Project.git
+
+[gitlab]
+	host = gitlab.kitware.com
+	group-path = group
+	group-name = Group
+	project-path = project
+	project-name = Project
diff --git a/git-gerrit-push b/git-gerrit-push
new file mode 100755
index 0000000..b46f753
--- /dev/null
+++ b/git-gerrit-push
@@ -0,0 +1,74 @@
+#!/usr/bin/env bash
+#=============================================================================
+# Copyright 2010-2015 Kitware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+USAGE="[<remote>] [--no-topic] [--dry-run] [--]"
+OPTIONS_SPEC=
+SUBDIRECTORY_OK=Yes
+. "$(git --exec-path)/git-sh-setup"
+
+#-----------------------------------------------------------------------------
+
+remote=''
+refspecs=''
+no_topic=''
+dry_run=''
+
+# Parse the command line options.
+while test $# != 0; do
+	case "$1" in
+		--no-topic) no_topic=1 ;;
+		--dry-run)  dry_run=--dry-run ;;
+		--) shift; break ;;
+		-*) usage ;;
+		*) test -z "$remote" || usage ; remote="$1" ;;
+	esac
+	shift
+done
+test $# = 0 || usage
+
+# Default remote.
+test -n "$remote" || remote="gerrit"
+
+if test -z "$no_topic"; then
+	# Identify and validate the topic branch name.
+	head="$(git symbolic-ref HEAD)" && topic="${head#refs/heads/}" || topic=''
+	if test -z "$topic" -o "$topic" = "master"; then
+		die 'Please name your topic:
+		git checkout -b descriptive-name'
+	fi
+	# The topic branch will be pushed by name.
+	refspecs="HEAD:refs/for/master/$topic $refspecs"
+fi
+
+# Fetch the current upstream master branch head.
+# This helps computation of a minimal pack to push.
+echo "Fetching $remote master"
+fetch_out=$(git fetch "$remote" master 2>&1) || die "$fetch_out"
+
+# Exit early if we have nothing to push.
+if test -z "$refspecs"; then
+	echo 'Nothing to push!'
+	exit 0
+fi
+
+# Push.  Save output and exit code.
+echo "Pushing to $remote"
+push_stdout=$(git push --porcelain $dry_run "$remote" $refspecs); push_exit=$?
+echo "$push_stdout"
+
+# Reproduce the push exit code.
+exit $push_exit
diff --git a/git-gitlab-push b/git-gitlab-push
new file mode 100755
index 0000000..768f853
--- /dev/null
+++ b/git-gitlab-push
@@ -0,0 +1,177 @@
+#!/usr/bin/env bash
+#=============================================================================
+# Copyright 2010-2015 Kitware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+USAGE='[<remote>] [<options>...] [--]
+
+OPTIONS
+
+--dry-run
+    Show what would be pushed without actually updating the destination
+
+-f,--force
+    Force-push the topic HEAD to rewrite the destination branch
+
+--no-default
+    Do not push the default branch (e.g. master)
+
+--no-topic
+    Do not push the topic HEAD.
+'
+OPTIONS_SPEC=
+SUBDIRECTORY_OK=Yes
+. "$(git --exec-path)/git-sh-setup"
+
+egrep-q() {
+	egrep "$@" >/dev/null 2>/dev/null
+}
+
+# Load the project configuration.
+gitlab_upstream='' &&
+gitlab_configured='' &&
+config="${BASH_SOURCE%/*}/config" &&
+protocol=$(git config -f "$config" --get gitlab.protocol ||
+	   echo "https") &&
+host=$(git config -f "$config" --get gitlab.host) &&
+site=$(git config -f "$config" --get gitlab.site ||
+       echo "$protocol://$host") &&
+group_path=$(git config -f "$config" --get gitlab.group-path) &&
+project_path=$(git config -f "$config" --get gitlab.project-path) &&
+gitlab_upstream="$site/$group_path/$project_path.git" &&
+gitlab_pushurl=$(git config --get remote.gitlab.pushurl ||
+		 git config --get remote.gitlab.url) &&
+gitlab_configured=1
+
+#-----------------------------------------------------------------------------
+
+remote=''
+refspecs=''
+force=''
+lease=false
+lease_flag=''
+no_topic=''
+no_default=''
+dry_run=''
+
+# Parse the command line options.
+while test $# != 0; do
+	case "$1" in
+		-f|--force)   force='+'; lease=true ;;
+		--no-topic)   no_topic=1 ;;
+		--dry-run)    dry_run=--dry-run ;;
+		--no-default) no_default=1 ;;
+		--) shift; break ;;
+		-*) usage ;;
+		*) test -z "$remote" || usage ; remote="$1" ;;
+	esac
+	shift
+done
+test $# = 0 || usage
+
+# Default remote.
+test -n "$remote" || remote="gitlab"
+
+if test -z "$no_topic"; then
+	# Identify and validate the topic branch name.
+	head="$(git symbolic-ref HEAD)" && topic="${head#refs/heads/}" || topic=''
+	if test -z "$topic" -o "$topic" = "master"; then
+		die 'Please name your topic:
+		git checkout -b descriptive-name'
+	fi
+
+	if $lease; then
+		have_ref=false
+		remoteref="refs/remotes/$remote/$topic"
+		if git rev-parse --verify -q "$remoteref"; then
+			have_ref=true
+		else
+			die "It seems that a local ref for the branch is
+missing; forcing a push is dangerous and may overwrite
+previous work.  Fetch from the $remote remote first or
+push without '-f' or '--force'."
+		fi
+
+		have_lease_flag=false
+		if git push -h | egrep-q -e '--force-with-lease'; then
+			have_lease_flag=true
+		fi
+
+		if $have_lease_flag && $have_ref; then
+			# Set the lease flag.
+			lease_flag="--force-with-lease=$topic:$remoteref"
+			# Clear the force string.
+			force=''
+		fi
+	fi
+
+	# The topic branch will be pushed by name.
+	refspecs="${force}HEAD:refs/heads/$topic $refspecs"
+fi
+
+# Fetch the current remote master branch head.
+# This helps computation of a minimal pack to push.
+echo "Fetching $remote master"
+fetch_out=$(git fetch "$remote" master 2>&1) || die "$fetch_out"
+gitlab_head=$(git rev-parse FETCH_HEAD) || exit
+
+# Fetch the current upstream master branch head.
+if origin_fetchurl=$(git config --get remote.origin.url) &&
+   test "$origin_fetchurl" = "$gitlab_upstream"; then
+	upstream_remote='origin'
+else
+	upstream_remote="$gitlab_upstream"
+fi
+echo "Fetching $upstream_remote master"
+fetch_out=$(git fetch "$upstream_remote" master 2>&1) || die "$fetch_out"
+upstream_head=$(git rev-parse FETCH_HEAD) || exit
+
+# Add a refspec to keep the remote master up to date if possible.
+if test -z "$no_default" &&
+   base=$(git merge-base "$gitlab_head" "$upstream_head") &&
+   test "$base" = "$gitlab_head"; then
+	refspecs="$upstream_head:refs/heads/master $refspecs"
+fi
+
+# Exit early if we have nothing to push.
+if test -z "$refspecs"; then
+	echo 'Nothing to push!'
+	exit 0
+fi
+
+# Push.  Save output and exit code.
+echo "Pushing to $remote"
+push_config='-c advice.pushUpdateRejected=false'
+push_stdout=$(git $push_config push $lease_flag --porcelain $dry_run "$remote" $refspecs); push_exit=$?
+echo "$push_stdout"
+
+if test "$push_exit" -ne 0 && test -z "$force"; then
+	# Advise the user to fetch if needed.
+	if echo "$push_stdout" | egrep-q 'stale info'; then
+		echo "
+You have pushed to your branch from another machine; you may be overwriting
+commits unintentionally.  Fetch from the $remote remote and check that you are
+not pushing an outdated branch."
+	fi
+
+	# Advise the user to force-push if needed.
+	if echo "$push_stdout" | egrep-q 'non-fast-forward'; then
+		echo '
+Add "-f" or "--force" to push a rewritten topic.'
+	fi
+fi
+
+# Reproduce the push exit code.
+exit $push_exit
diff --git a/setup-gerrit b/setup-gerrit
index 9e8fa62..6d46e3c 100755
--- a/setup-gerrit
+++ b/setup-gerrit
@@ -28,6 +28,7 @@
 #    gerrit.pushurl = Review site push URL with "$username" placeholder
 #    gerrit.remote = Gerrit remote name, if not "gerrit"
 #    gerrit.url = Gerrit project URL, if not "$site/p/$project"
+#                 optionally with "$username" placeholder
 
 die() {
 	echo 1>&2 "$@" ; exit 1
@@ -39,11 +40,12 @@ cd "${BASH_SOURCE%/*}" &&
 # Load the project configuration.
 site=$(git config -f config --get gerrit.site) &&
 project=$(git config -f config --get gerrit.project) &&
-pushurl_=$(git config -f config --get gerrit.pushurl) &&
 remote=$(git config -f config --get gerrit.remote ||
 	 echo "gerrit") &&
-fetchurl=$(git config -f config --get gerrit.url ||
-	   echo "$site/p/$project") ||
+fetchurl_=$(git config -f config --get gerrit.url ||
+	    echo "$site/p/$project") &&
+pushurl_=$(git config -f config --get gerrit.pushurl ||
+	   git config -f config --get gerrit.url) ||
 die 'This project is not configured to use Gerrit.'
 
 # Get current gerrit push URL.
@@ -67,7 +69,7 @@ else
 
 '"$project"' changes must be pushed to our Gerrit Code Review site:
 
-  '"$fetchurl"'
+  '"$site/p/$project"'
 
 Register a Gerrit account and select a username (used below).
 You will need an OpenID:
@@ -96,13 +98,16 @@ Add your SSH public keys at
 	if test -z "$gu"; then
 		gu="$USER"
 	fi &&
+	fetchurl="${fetchurl_/\$username/$gu}" &&
 	if test -z "$pushurl"; then
 		git remote add "$remote" "$fetchurl"
 	else
 		git config remote."$remote".url "$fetchurl"
 	fi &&
 	pushurl="${pushurl_/\$username/$gu}" &&
-	git config remote."$remote".pushurl "$pushurl" &&
+	if test "$pushurl" != "$fetchurl"; then
+		git config remote."$remote".pushurl "$pushurl"
+	fi &&
 	echo 'Remote "'"$remote"'" is now configured to push to
 
   '"$pushurl"'
diff --git a/setup-gitlab b/setup-gitlab
new file mode 100755
index 0000000..9c7574d
--- /dev/null
+++ b/setup-gitlab
@@ -0,0 +1,140 @@
+#!/usr/bin/env bash
+#=============================================================================
+# Copyright 2010-2015 Kitware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+# Run this script to set up the local Git repository to push to
+# a personal fork for this project in GitLab.
+
+# Project configuration instructions:
+#
+# - Run a GitLab server
+#
+# - Populate adjacent "config" file with:
+#    gitlab.protocol = Top GitLab protocol, if not 'https'
+#    gitlab.host = Top GitLab fully qualified host name
+#    gitlab.site = Top GitLab URL, if not "<protocol>://<host>"
+#    gitlab.group-name = Name of group containing project in GitLab
+#    gitlab.group-path = Path of group containing project in GitLab
+#    gitlab.project-name = Name of project within GitLab group
+#    gitlab.project-path = Path of project within GitLab group
+#    gitlab.url = GitLab push URL with "$username" placeholder,
+#                 if not "<site>/$username/<project-path>.git"
+#    gitlab.pushurl = GitLab push URL with "$username" placeholder,
+#                     if not "git@<host>:$username/<project-path>.git"
+#    gitlab.remote = GitLab remote name, if not "gitlab"
+
+die() {
+	echo 1>&2 "$@" ; exit 1
+}
+
+# Make sure we are inside the repository.
+cd "${BASH_SOURCE%/*}" &&
+
+# Load the project configuration.
+protocol=$(git config -f config --get gitlab.protocol ||
+	   echo "https") &&
+host=$(git config -f config --get gitlab.host) &&
+site=$(git config -f config --get gitlab.site ||
+       echo "$protocol://$host") &&
+group_path=$(git config -f config --get gitlab.group-path) &&
+group_name=$(git config -f config --get gitlab.group-name) &&
+project_name=$(git config -f config --get gitlab.project-name) &&
+project_path=$(git config -f config --get gitlab.project-path) &&
+pushurl_=$(git config -f config --get gitlab.pushurl ||
+	   echo "git@$host:\$username/$project_path.git") &&
+remote=$(git config -f config --get gitlab.remote ||
+	 echo "gitlab") &&
+fetchurl_=$(git config -f config --get gitlab.url ||
+	    echo "$site/\$username/$project_path.git") ||
+die 'This project is not configured to use GitLab.'
+
+# Get current gitlab push URL.
+pushurl=$(git config --get remote."$remote".pushurl ||
+	  git config --get remote."$remote".url || echo '') &&
+
+# Tell user about current configuration.
+if test -n "$pushurl"; then
+	echo 'Remote "'"$remote"'" is currently configured to push to
+
+  '"$pushurl"'
+' &&
+	read -ep 'Reconfigure GitLab? [y/N]: ' ans &&
+	if [ "$ans" == "y" ] || [ "$ans" == "Y" ]; then
+		setup=1
+	else
+		setup=''
+	fi
+else
+	echo 'Remote "'"$remote"'" is not yet configured.
+' &&
+	read -ep 'Configure GitLab to contribute to '"$project_name"'? [Y/n]: ' ans &&
+	if [ "$ans" == "n" ] || [ "$ans" == "N" ]; then
+		exit 0
+	else
+		setup=1
+	fi
+fi &&
+
+setup_instructions='Add your SSH public keys at
+
+  '"$site"'/profile/keys
+
+Then visit the main repository at:
+
+  '"$site/$group_path/$project_path"'
+
+and use the Fork button in the upper right.
+'
+
+# Perform setup if necessary.
+if test -n "$setup"; then
+	echo 'Sign-in to GitLab to get/set your username at
+
+  '"$site/profile/account"'
+
+'"$setup_instructions" &&
+	read -ep "GitLab username? [$USER]: " gu &&
+	if test -z "$gu"; then
+		gu="$USER"
+	fi &&
+	fetchurl="${fetchurl_/\$username/$gu}" &&
+	if test -z "$pushurl"; then
+		git remote add "$remote" "$fetchurl"
+	else
+		git config remote."$remote".url "$fetchurl"
+	fi &&
+	pushurl="${pushurl_/\$username/$gu}" &&
+	git config remote."$remote".pushurl "$pushurl" &&
+	echo 'Remote "'"$remote"'" is now configured to push to
+
+  '"$pushurl"'
+'
+fi &&
+
+# Optionally test GitLab access.
+if test -n "$pushurl"; then
+	read -ep 'Test access to GitLab (SSH)? [y/N]: ' ans &&
+	if [ "$ans" == "y" ] || [ "$ans" == "Y" ]; then
+		echo -n 'Testing GitLab access by SSH...'
+		if git ls-remote --heads "$pushurl" >/dev/null; then
+			echo 'passed.'
+		else
+			echo 'failed.' &&
+			die 'Could not access your GitLab fork of this project.
+'"$setup_instructions"
+		fi
+	fi
+fi
diff --git a/setup-hooks b/setup-hooks
index c07985a..ca07712 100755
--- a/setup-hooks
+++ b/setup-hooks
@@ -55,6 +55,7 @@ fi &&
 # Populate ".git/hooks".
 echo 'Setting up git hooks...' &&
 git_dir=$(git rev-parse --git-dir) &&
+mkdir -p "$git_dir/hooks" &&
 cd "$git_dir/hooks" &&
 if ! test -e .git; then
 	git init -q || die 'Could not run git init for hooks.'
diff --git a/setup-stage b/setup-stage
index 323e47a..ce6ec45 100755
--- a/setup-stage
+++ b/setup-stage
@@ -37,8 +37,8 @@ die() {
 cd "${BASH_SOURCE%/*}" &&
 
 # Load the project configuration.
-fetchurl=$(git config -f config --get stage.url) &&
-pushurl_=$(git config -f config --get stage.pushurl || echo '') &&
+fetchurl_=$(git config -f config --get stage.url) &&
+pushurl_=$(git config -f config --get stage.pushurl || echo "$fetchurl_") &&
 remote=$(git config -f config --get stage.remote || echo 'stage') ||
 die 'This project is not configured to use a topic stage.'
 
@@ -65,13 +65,16 @@ fi
 # Perform setup if necessary.
 if test -n "$setup"; then
 	echo 'Setting up the topic stage...' &&
+	fetchurl="${fetchurl_}" &&
 	if test -z "$pushurl"; then
 		git remote add "$remote" "$fetchurl"
 	else
 		git config remote."$remote".url "$fetchurl"
 	fi &&
 	pushurl="${pushurl_}" &&
-	git config remote."$remote".pushurl "$pushurl" &&
+	if test "$pushurl" != "$fetchurl"; then
+		git config remote."$remote".pushurl "$pushurl"
+	fi &&
 	echo 'Remote "'"$remote"'" is now configured to push to
 
   '"$pushurl"'
diff --git a/setup-upstream b/setup-upstream
new file mode 100755
index 0000000..92ce1da
--- /dev/null
+++ b/setup-upstream
@@ -0,0 +1,104 @@
+#!/usr/bin/env bash
+#=============================================================================
+# Copyright 2010-2015 Kitware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+# Run this script to set up the local Git repository to use the
+# preferred upstream repository URLs.
+
+# Project configuration instructions:
+#
+# - Populate adjacent "config" file with:
+#    upstream.url = Preferred fetch url for upstream remote
+#    upstream.remote = Preferred name for upstream remote, if not "origin"
+
+die() {
+	echo 1>&2 "$@" ; exit 1
+}
+
+# Make sure we are inside the repository.
+cd "${BASH_SOURCE%/*}" &&
+
+# Load the project configuration.
+url=$(git config -f config --get upstream.url) &&
+remote=$(git config -f config --get upstream.remote ||
+	 echo 'origin') ||
+die 'This project is not configured to use a preferred upstream repository.'
+
+# Get current upstream URLs.
+fetchurl=$(git config --get remote."$remote".url || echo '') &&
+pushurl=$(git config --get remote."$remote".pushurl || echo '') &&
+
+if test "$fetchurl" = "$url"; then
+	echo 'Remote "'"$remote"'" already uses recommended upstream repository.'
+	exit 0
+fi
+
+upstream_recommend='
+We recommended configuring the "'"$remote"'" remote to fetch from upstream at
+
+  '"$url"'
+'
+
+# Tell user about current configuration.
+if test -n "$fetchurl"; then
+	echo 'Remote "'"$remote"'" is currently configured to fetch from
+
+  '"$fetchurl"'
+' &&
+	if test -n "$pushurl"; then
+		echo 'and push to
+
+  '"$pushurl"
+	fi &&
+	echo "$upstream_recommend" &&
+	if test -n "$pushurl"; then
+		echo 'and to never push to it directly.
+'
+	fi &&
+
+	read -ep 'Reconfigure "'"$remote"'" remote as recommended? [y/N]: ' ans &&
+	if [ "$ans" == "y" ] || [ "$ans" == "Y" ]; then
+		setup=1
+	else
+		setup=''
+	fi
+else
+	echo 'Remote "'"$remote"'" is not yet configured.' &&
+	echo "$upstream_recommend" &&
+	read -ep 'Configure "'"$remote"'" remote as recommended? [Y/n]: ' ans &&
+	if [ "$ans" == "n" ] || [ "$ans" == "N" ]; then
+		exit 0
+	else
+		setup=1
+	fi
+fi &&
+
+# Perform setup if necessary.
+if test -n "$setup"; then
+	if test -z "$fetchurl"; then
+		git remote add "$remote" "$url"
+	else
+		git config remote."$remote".url "$url" &&
+		if old=$(git config --get remote."$remote".pushurl); then
+			git config --unset remote."$remote".pushurl ||
+			echo 'Warning: failed to unset remote.'"$remote"'.pushurl'
+		fi
+	fi &&
+	echo 'Remote "'"$remote"'" is now configured to fetch from
+
+  '"$url"'
+'
+fi

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6fda7bf4010051c2232d4ba6c64f310862a6471
commit a6fda7bf4010051c2232d4ba6c64f310862a6471
Merge: a2d393d c7b846e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 16:45:07 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 30 16:45:07 2017 -0500

    Merge branch 'upstream-GitSetup' into developer-setup


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2d393d648d0f64010a4b34b84ab7985a284e294
commit a2d393d648d0f64010a4b34b84ab7985a284e294
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 16:31:33 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 30 16:40:21 2017 -0500

    Add script to update GitSetup from upstream

diff --git a/Utilities/Scripts/update-gitsetup.bash b/Utilities/Scripts/update-gitsetup.bash
new file mode 100755
index 0000000..8f0da76
--- /dev/null
+++ b/Utilities/Scripts/update-gitsetup.bash
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -e
+set -x
+shopt -s dotglob
+
+readonly name="GitSetup"
+readonly ownership="GitSetup Upstream <kwrobot at kitware.com>"
+readonly subtree="Utilities/GitSetup"
+readonly repo="https://gitlab.kitware.com/utils/gitsetup.git"
+readonly tag="setup"
+readonly shortlog=false
+readonly paths="
+"
+
+extract_source () {
+    git_archive
+}
+
+. "${BASH_SOURCE%/*}/update-third-party.bash"

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7b846edaa7cee549ca08cbfbab2843daf106a01
commit c7b846edaa7cee549ca08cbfbab2843daf106a01
Author:     GitSetup Upstream <kwrobot at kitware.com>
AuthorDate: Mon Jan 30 16:39:16 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 30 16:39:16 2017 -0500

    GitSetup 2012-04-26 (b7daff9b)
    
    Code extracted from:
    
        https://gitlab.kitware.com/utils/gitsetup.git
    
    at commit b7daff9b8b776eeed34385d8ae2019dc9e113c52 (setup).

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..facbbb2
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,7 @@
+.git*            export-ignore
+
+# Exclude from source archives files specific to Git work tree.
+*                export-ignore
+
+tips             eol=lf         whitespace=indent-with-non-tab
+setup-*          eol=lf         whitespace=indent-with-non-tab
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..0d32c02
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,5 @@
+Kitware Local Git Setup Scripts
+Copyright 2010-2012 Kitware, Inc.
+
+This product includes software developed at Kitware, Inc.
+(http://www.kitware.com/).
diff --git a/README b/README
new file mode 100644
index 0000000..cf468fb
--- /dev/null
+++ b/README
@@ -0,0 +1,80 @@
+Kitware Local Git Setup Scripts
+
+
+Introduction
+------------
+
+This is a collection of local Git development setup scripts meant for
+inclusion in project source trees to aid their development workflow.
+Project-specific information needed by the scripts may be configured
+in a "config" file added next to them in the project.
+
+
+Import
+------
+
+A project may import these scripts into their source tree by
+initializing a subtree merge.  Bring up a Git prompt and set the
+current working directory inside a clone of the target project.
+Fetch the "setup" branch from the GitSetup repository:
+
+ $ git fetch ../GitSetup setup:setup
+
+Prepare to merge the branch but place the content in a subdirectory.
+Any prefix (with trailing '/') may be chosen so long as it is used
+consistently within a project through the rest of these instructions:
+
+ $ git merge -s ours --no-commit setup
+ $ git read-tree -u --prefix=Utilities/GitSetup/ setup
+
+Commit the merge with an informative message:
+
+ $ git commit
+ ------------------------------------------------------------------------
+ Merge branch 'setup'
+
+ Add Utilities/GitSetup/ directory using subtree merge from
+ the general GitSetup repository "setup" branch.
+ ------------------------------------------------------------------------
+
+
+Configuration
+-------------
+
+Read the "Project configuration instructions" comment in each script.
+Add a "config" file next to the scripts with desired configuration
+(optionally copy and modify "config.sample").  For example, to
+configure the "setup-hooks" script:
+
+ $ git config -f Utilities/GitSetup/config hooks.url "$url"
+
+where "$url" is the project repository publishing the "hooks" branch.
+When finished, add and commit the configuration file:
+
+ $ git add Utilities/GitSetup/config
+ $ git commit
+
+
+Update
+------
+
+A project may update these scripts from the GitSetup repository.
+Bring up a Git prompt and set the current working directory inside a
+clone of the target project.  Fetch the "setup" branch from the
+GitSetup repository:
+
+ $ git fetch ../GitSetup setup:setup
+
+Merge the "setup" branch into the subtree:
+
+ $ git merge -X subtree=Utilities/GitSetup setup
+
+where "Utilities/GitSetup" is the same prefix used during the import
+setup, but without a trailing '/'.
+
+
+License
+-------
+
+Distributed under the Apache License 2.0.
+See LICENSE and NOTICE for details.
diff --git a/config.sample b/config.sample
new file mode 100644
index 0000000..bba2382
--- /dev/null
+++ b/config.sample
@@ -0,0 +1,22 @@
+# Kitware Local Git Setup Scripts - Sample Project Configuration
+#
+# Copy to "config" and edit as necessary.
+
+[hooks]
+	url = http://public.kitware.com/GitSetup.git
+	#branch = hooks
+
+[ssh]
+	host = public.kitware.com
+	key = id_git_public
+	request-url = https://www.kitware.com/Admin/SendPassword.cgi
+
+[stage]
+	#url = git://public.kitware.com/stage/Project.git
+	#pushurl = git at public.kitware.com:stage/Project.git
+
+[gerrit]
+	#project = Project
+	site = http://review.source.kitware.com
+	# pushurl placeholder "$username" is literal
+	pushurl = $username at review.source.kitware.com:Project
diff --git a/setup-gerrit b/setup-gerrit
new file mode 100755
index 0000000..9e8fa62
--- /dev/null
+++ b/setup-gerrit
@@ -0,0 +1,142 @@
+#!/usr/bin/env bash
+#=============================================================================
+# Copyright 2010-2012 Kitware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+# Run this script to set up the local Git repository to push to
+# a Gerrit Code Review instance for this project.
+
+# Project configuration instructions:
+#
+# - Run a Gerrit Code Review server
+#
+# - Populate adjacent "config" file with:
+#    gerrit.site = Top Gerrit URL (not project-specific)
+#    gerrit.project = Name of project in Gerrit
+#    gerrit.pushurl = Review site push URL with "$username" placeholder
+#    gerrit.remote = Gerrit remote name, if not "gerrit"
+#    gerrit.url = Gerrit project URL, if not "$site/p/$project"
+
+die() {
+	echo 1>&2 "$@" ; exit 1
+}
+
+# Make sure we are inside the repository.
+cd "${BASH_SOURCE%/*}" &&
+
+# Load the project configuration.
+site=$(git config -f config --get gerrit.site) &&
+project=$(git config -f config --get gerrit.project) &&
+pushurl_=$(git config -f config --get gerrit.pushurl) &&
+remote=$(git config -f config --get gerrit.remote ||
+	 echo "gerrit") &&
+fetchurl=$(git config -f config --get gerrit.url ||
+	   echo "$site/p/$project") ||
+die 'This project is not configured to use Gerrit.'
+
+# Get current gerrit push URL.
+pushurl=$(git config --get remote."$remote".pushurl ||
+	  git config --get remote."$remote".url || echo '') &&
+
+# Tell user about current configuration.
+if test -n "$pushurl"; then
+	echo 'Remote "'"$remote"'" is currently configured to push to
+
+  '"$pushurl"'
+' &&
+	read -ep 'Reconfigure Gerrit? [y/N]: ' ans &&
+	if [ "$ans" == "y" ] || [ "$ans" == "Y" ]; then
+		setup=1
+	else
+		setup=''
+	fi
+else
+	echo 'Remote "'"$remote"'" is not yet configured.
+
+'"$project"' changes must be pushed to our Gerrit Code Review site:
+
+  '"$fetchurl"'
+
+Register a Gerrit account and select a username (used below).
+You will need an OpenID:
+
+  http://openid.net/get-an-openid/
+' &&
+	read -ep 'Configure Gerrit? [Y/n]: ' ans &&
+	if [ "$ans" == "n" ] || [ "$ans" == "N" ]; then
+		exit 0
+	else
+		setup=1
+	fi
+fi &&
+
+# Perform setup if necessary.
+if test -n "$setup"; then
+	echo 'Sign-in to Gerrit to get/set your username at
+
+  '"$site"'/#/settings
+
+Add your SSH public keys at
+
+  '"$site"'/#/settings/ssh-keys
+' &&
+	read -ep "Gerrit username? [$USER]: " gu &&
+	if test -z "$gu"; then
+		gu="$USER"
+	fi &&
+	if test -z "$pushurl"; then
+		git remote add "$remote" "$fetchurl"
+	else
+		git config remote."$remote".url "$fetchurl"
+	fi &&
+	pushurl="${pushurl_/\$username/$gu}" &&
+	git config remote."$remote".pushurl "$pushurl" &&
+	echo 'Remote "'"$remote"'" is now configured to push to
+
+  '"$pushurl"'
+'
+fi &&
+
+# Optionally test Gerrit access.
+if test -n "$pushurl"; then
+	read -ep 'Test access to Gerrit (SSH)? [y/N]: ' ans &&
+	if [ "$ans" == "y" ] || [ "$ans" == "Y" ]; then
+		echo -n 'Testing Gerrit access by SSH...'
+		if git ls-remote --heads "$pushurl" >/dev/null; then
+			echo 'passed.'
+		else
+			echo 'failed.' &&
+			die 'Could not access Gerrit.  Add your SSH public keys at
+
+  '"$site"'/#/settings/ssh-keys
+'
+		fi
+	fi
+fi &&
+
+# Set up GerritId hook.
+hook=$(git config --get hooks.GerritId || echo '') &&
+if test -z "$hook"; then
+	echo '
+Enabling GerritId hook to add a "Change-Id" footer to commit
+messages for interaction with Gerrit.  Run
+
+  git config hooks.GerritId false
+
+to disable this feature (but you will be on your own).' &&
+	git config hooks.GerritId true
+else
+	echo 'GerritId hook already configured to "'"$hook"'".'
+fi
diff --git a/setup-hooks b/setup-hooks
new file mode 100755
index 0000000..c07985a
--- /dev/null
+++ b/setup-hooks
@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+#=============================================================================
+# Copyright 2010-2012 Kitware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+# Run this script to set up local Git hooks for this project.
+
+# Project configuration instructions:
+#
+# - Publish a "hooks" branch in the project repository such that
+#   clones will have "refs/remotes/origin/hooks".
+#
+# - Populate adjacent "config" file with:
+#    hooks.url    = Repository URL publishing "hooks" branch
+#    hooks.branch = Repository branch instead of "hooks"
+
+egrep-q() {
+	egrep "$@" >/dev/null 2>/dev/null
+}
+
+die() {
+	echo 1>&2 "$@" ; exit 1
+}
+
+# Make sure we are inside the repository.
+cd "${BASH_SOURCE%/*}" &&
+
+# Select a hooks branch.
+if url=$(git config --get hooks.url); then
+	# Fetch hooks from locally configured repository.
+	branch=$(git config hooks.branch || echo hooks)
+elif git for-each-ref refs/remotes/origin/hooks 2>/dev/null |
+     egrep-q 'refs/remotes/origin/hooks$'; then
+	# Use hooks cloned from origin.
+	url=.. && branch=remotes/origin/hooks
+elif url=$(git config -f config --get hooks.url); then
+	# Fetch hooks from project-configured repository.
+	branch=$(git config -f config hooks.branch || echo hooks)
+else
+	die 'This project is not configured to install local hooks.'
+fi &&
+
+# Populate ".git/hooks".
+echo 'Setting up git hooks...' &&
+git_dir=$(git rev-parse --git-dir) &&
+cd "$git_dir/hooks" &&
+if ! test -e .git; then
+	git init -q || die 'Could not run git init for hooks.'
+fi &&
+git fetch -q "$url" "$branch" &&
+git reset -q --hard FETCH_HEAD || die 'Failed to install hooks'
diff --git a/setup-ssh b/setup-ssh
new file mode 100755
index 0000000..8920a5b
--- /dev/null
+++ b/setup-ssh
@@ -0,0 +1,111 @@
+#!/usr/bin/env bash
+#=============================================================================
+# Copyright 2010-2012 Kitware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+# Run this script to set up ssh push access to the repository host.
+
+# Project configuration instructions:
+#
+# - Populate adjacent "config" file with:
+#    ssh.host = Repository host name
+#    ssh.user = Username on host, if not "git"
+#    ssh.key = Local ssh key name
+#    ssh.request-url = Web page URL to request ssh access
+
+egrep-q() {
+	egrep "$@" >/dev/null 2>/dev/null
+}
+
+die() {
+	echo 1>&2 "$@" ; exit 1
+}
+
+# Make sure we are inside the repository.
+cd "${BASH_SOURCE%/*}" &&
+
+# Load the project configuration.
+host=$(git config -f config --get ssh.host) &&
+user=$(git config -f config --get ssh.user || echo git) &&
+key=$(git config -f config --get ssh.key) &&
+request_url=$(git config -f config --get ssh.request-url) ||
+die 'This project is not configured for ssh push access.'
+
+# Check for existing configuration.
+if test -r ~/.ssh/config &&
+   egrep-q 'Host[= ]'"${host//\./\\.}" ~/.ssh/config; then
+	echo 'Host "'"$host"'" is already in ~/.ssh/config' &&
+	setup= &&
+	question='Test'
+else
+	echo 'Host "'"$host"'" not found in ~/.ssh/config' &&
+	setup=1 &&
+	question='Setup and test'
+fi &&
+
+# Ask the user whether to make changes.
+echo '' &&
+read -ep "${question} push access by ssh to $user@$host? [y/N]: " access &&
+if test "$access" != "y" -a "$access" != "Y"; then
+	exit 0
+fi &&
+
+# Setup host configuration if necessary.
+if test -n "$setup"; then
+	if ! test -d ~/.ssh; then
+		mkdir -p ~/.ssh &&
+		chmod 700 ~/.ssh
+	fi &&
+	if ! test -f ~/.ssh/config; then
+		touch ~/.ssh/config &&
+		chmod 600 ~/.ssh/config
+	fi &&
+	ssh_config='Host='"$host"'
+  IdentityFile ~/.ssh/'"$key" &&
+	echo "Adding to ~/.ssh/config:
+
+$ssh_config
+" &&
+	echo "$ssh_config" >> ~/.ssh/config &&
+	if ! test -e ~/.ssh/"$key"; then
+		if test -f ~/.ssh/id_rsa; then
+			# Take care of the common case.
+			ln -s id_rsa ~/.ssh/"$key"
+			echo '
+Assuming ~/.ssh/id_rsa is the private key corresponding to the public key for
+
+  '"$user@$host"'
+
+If this is incorrect place private key at "~/.ssh/'"$key"'".'
+		else
+			echo '
+Place the private key corresponding to the public key registered for
+
+  '"$user@$host"'
+
+at "~/.ssh/'"$key"'".'
+		fi
+		read -e -n 1 -p 'Press any key to continue...'
+	fi
+fi || exit 1
+
+# Test access configuration.
+echo 'Testing ssh push access to "'"$user@$host"'"...' &&
+if ! ssh "$user@$host" info; then
+	die 'No ssh push access to "'"$user@$host"'".  You may need to request access at
+
+  '"$request_url"'
+'
+fi
diff --git a/setup-stage b/setup-stage
new file mode 100755
index 0000000..323e47a
--- /dev/null
+++ b/setup-stage
@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+#=============================================================================
+# Copyright 2010-2012 Kitware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+# Run this script to set up the topic stage for pushing changes.
+
+# Project configuration instructions:
+#
+# - Run a Topic Stage repository next to the main project repository.
+#
+# - Populate adjacent "config" file with:
+#    stage.url = Topic Stage repository URL
+#    stage.pushurl = Topic Stage push URL if not "$url"
+
+egrep-q() {
+	egrep "$@" >/dev/null 2>/dev/null
+}
+
+die() {
+	echo 1>&2 "$@" ; exit 1
+}
+
+# Make sure we are inside the repository.
+cd "${BASH_SOURCE%/*}" &&
+
+# Load the project configuration.
+fetchurl=$(git config -f config --get stage.url) &&
+pushurl_=$(git config -f config --get stage.pushurl || echo '') &&
+remote=$(git config -f config --get stage.remote || echo 'stage') ||
+die 'This project is not configured to use a topic stage.'
+
+# Get current stage push URL.
+pushurl=$(git config --get remote."$remote".pushurl ||
+	  git config --get remote."$remote".url || echo '') &&
+
+# Tell user about current configuration.
+if test -n "$pushurl"; then
+	echo 'Remote "'"$remote"'" is currently configured to push to
+
+  '"$pushurl"'
+' &&
+	read -ep 'Reconfigure Topic Stage? [y/N]: ' ans &&
+	if [ "$ans" == "y" ] || [ "$ans" == "Y" ]; then
+		setup=1
+	else
+		setup=''
+	fi
+else
+	setup=1
+fi
+
+# Perform setup if necessary.
+if test -n "$setup"; then
+	echo 'Setting up the topic stage...' &&
+	if test -z "$pushurl"; then
+		git remote add "$remote" "$fetchurl"
+	else
+		git config remote."$remote".url "$fetchurl"
+	fi &&
+	pushurl="${pushurl_}" &&
+	git config remote."$remote".pushurl "$pushurl" &&
+	echo 'Remote "'"$remote"'" is now configured to push to
+
+  '"$pushurl"'
+'
+fi || die 'Could not configure the topic stage remote.'
diff --git a/setup-user b/setup-user
new file mode 100755
index 0000000..1af439c
--- /dev/null
+++ b/setup-user
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+#=============================================================================
+# Copyright 2010-2012 Kitware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+# Run this script to configure Git user info in this repository.
+
+# Project configuration instructions: NONE
+
+for (( ; ; )); do
+	user_name=$(git config user.name || echo '') &&
+	user_email=$(git config user.email || echo '') &&
+	if test -n "$user_name" -a -n "$user_email"; then
+		echo 'Your commits will record as Author:
+
+  '"$user_name <$user_email>"'
+' &&
+		read -ep 'Is the author name and email address above correct? [Y/n] ' correct &&
+		if test "$correct" != "n" -a "$correct" != "N"; then
+			break
+		fi
+	fi &&
+	read -ep 'Enter your full name e.g. "John Doe": ' name &&
+	read -ep 'Enter your email address e.g. "john at gmail.com": ' email &&
+	git config user.name "$name" &&
+	git config user.email "$email"
+done
diff --git a/tips b/tips
new file mode 100755
index 0000000..784e1ed
--- /dev/null
+++ b/tips
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+#=============================================================================
+# Copyright 2010-2012 Kitware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+# This script makes optional suggestions for working with Git.
+
+# Project configuration instructions: NONE
+
+egrep-q() {
+	egrep "$@" >/dev/null 2>/dev/null
+}
+
+# Suggest color configuration.
+if test -z "$(git config --get color.ui)"; then
+	echo '
+One may enable color output from Git commands with
+
+  git config --global color.ui auto
+'
+fi
+
+# Suggest bash completion.
+if ! bash -i -c 'echo $PS1' | egrep-q '__git_ps1'; then
+	echo '
+A dynamic, informative Git shell prompt can be obtained by sourcing
+the git bash-completion script in your "~/.bashrc".  Set the PS1
+environmental variable as suggested in the comments at the top of the
+bash-completion script.  You may need to install the bash-completion
+package from your distribution to obtain it.
+'
+fi
+
+# Suggest merge tool.
+if test -z "$(git config --get merge.tool)"; then
+	echo '
+One may configure Git to load a merge tool with
+
+  git config merge.tool <toolname>
+
+See "git help mergetool" for more information.
+'
+fi

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

Summary of changes:
 Utilities/.gitattributes               |    1 +
 Utilities/GitSetup/.gitattributes      |    5 +-
 Utilities/GitSetup/README              |    7 ++
 Utilities/GitSetup/config.sample       |   10 ++
 Utilities/GitSetup/git-gerrit-push     |   74 +++++++++++++
 Utilities/GitSetup/git-gitlab-push     |  177 ++++++++++++++++++++++++++++++++
 Utilities/GitSetup/setup-gerrit        |   15 ++-
 Utilities/GitSetup/setup-gitlab        |  140 +++++++++++++++++++++++++
 Utilities/GitSetup/setup-hooks         |    1 +
 Utilities/GitSetup/setup-stage         |    9 +-
 Utilities/GitSetup/setup-upstream      |  104 +++++++++++++++++++
 Utilities/Scripts/update-gitsetup.bash |   20 ++++
 12 files changed, 552 insertions(+), 11 deletions(-)
 create mode 100755 Utilities/GitSetup/git-gerrit-push
 create mode 100755 Utilities/GitSetup/git-gitlab-push
 create mode 100755 Utilities/GitSetup/setup-gitlab
 create mode 100755 Utilities/GitSetup/setup-upstream
 create mode 100755 Utilities/Scripts/update-gitsetup.bash


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Tue Jan 31 00:01:07 2017
From: kwrobot at kitware.com (Kitware Robot)
Date: Tue, 31 Jan 2017 00:01:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1225-g07d3695
Message-ID: <20170131050107.B7DD2FA000@public.kitware.com>

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  07d3695e75d1bbeaa571901708350efc3f936e0e (commit)
      from  8df12fc9d4b52cdd18d4fa9408325be7d0c28ed2 (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=07d3695e75d1bbeaa571901708350efc3f936e0e
commit 07d3695e75d1bbeaa571901708350efc3f936e0e
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Tue Jan 31 00:01:05 2017 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jan 31 00:01:05 2017 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 374bbcd..8621bdf 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 20170130)
+set(CMake_VERSION_PATCH 20170131)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 31 08:49:07 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 31 Jan 2017 08:49:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2435-g698f524
Message-ID: <20170131134907.2A52DF9ECD@public.kitware.com>

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  698f5243cde7238cb289f1750e56a01d571591e7 (commit)
       via  ef372b3a0a6b1d6c915ba404ec0acb83e6d89925 (commit)
       via  07d3695e75d1bbeaa571901708350efc3f936e0e (commit)
      from  e2025bcc8ba13eef8f2e8f6709128f845dc3ff2b (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=698f5243cde7238cb289f1750e56a01d571591e7
commit 698f5243cde7238cb289f1750e56a01d571591e7
Merge: e2025bc ef372b3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 08:49:06 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 08:49:06 2017 -0500

    Merge topic 'intel-c11-windows' into next
    
    ef372b3a Features: Update version of Intel Compiler on Windows supporting C 11
    07d3695e CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef372b3a0a6b1d6c915ba404ec0acb83e6d89925
commit ef372b3a0a6b1d6c915ba404ec0acb83e6d89925
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 08:31:41 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 31 08:31:41 2017 -0500

    Features: Update version of Intel Compiler on Windows supporting C 11
    
    The Intel Compiler 15.0.0 on Windows does not support `-std=c11`.
    Bump our version requirement to 16 to use that flag.

diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index 6408392..9c67fbd 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -10,14 +10,17 @@ set(CMAKE_DEPFILE_FLAGS_C "-MD -MT <OBJECT> -MF <DEPFILE>")
 if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC")
   set(_std -Qstd)
   set(_ext c)
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 16.0.0)
+    set(CMAKE_C11_STANDARD_COMPILE_OPTION "-Qstd=c11")
+    set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-Qstd=c11")
+  endif()
 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}=${_ext}11")
+  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")
+  endif()
 endif()
 
 if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0)

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

Summary of changes:
 Modules/Compiler/Intel-C.cmake |   13 ++++++++-----
 Source/CMakeVersion.cmake      |    2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 31 08:59:52 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 31 Jan 2017 08:59:52 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2437-g7d4c722
Message-ID: <20170131135952.575F1FA498@public.kitware.com>

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  7d4c722add9f1e799fc278d164fa4fb0916f3aa4 (commit)
       via  071f8e78dda152d8759539fa390b25c7f58d3cc5 (commit)
      from  698f5243cde7238cb289f1750e56a01d571591e7 (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=7d4c722add9f1e799fc278d164fa4fb0916f3aa4
commit 7d4c722add9f1e799fc278d164fa4fb0916f3aa4
Merge: 698f524 071f8e7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 08:59:51 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 08:59:51 2017 -0500

    Merge topic '16432-static-frameworks' into next
    
    071f8e78 Apple: Add support for static frameworks


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=071f8e78dda152d8759539fa390b25c7f58d3cc5
commit 071f8e78dda152d8759539fa390b25c7f58d3cc5
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Mon Dec 26 18:07:24 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 31 08:59:15 2017 -0500

    Apple: Add support for static frameworks
    
    Closes: #16432

diff --git a/Help/command/add_library.rst b/Help/command/add_library.rst
index 36adcbe..af75a39 100644
--- a/Help/command/add_library.rst
+++ b/Help/command/add_library.rst
@@ -33,7 +33,7 @@ type is ``STATIC`` or ``SHARED`` based on whether the current value of the
 variable :variable:`BUILD_SHARED_LIBS` is ``ON``.  For ``SHARED`` and
 ``MODULE`` libraries the :prop_tgt:`POSITION_INDEPENDENT_CODE` target
 property is set to ``ON`` automatically.
-A ``SHARED`` library may be marked with the :prop_tgt:`FRAMEWORK`
+A ``SHARED`` or ``STATIC`` library may be marked with the :prop_tgt:`FRAMEWORK`
 target property to create an OS X Framework.
 
 If a library does not export any symbols, it must not be declared as a
diff --git a/Help/command/install.rst b/Help/command/install.rst
index d57dd75..70087a4 100644
--- a/Help/command/install.rst
+++ b/Help/command/install.rst
@@ -90,8 +90,10 @@ project.  There are five kinds of target files that may be installed:
 ``ARCHIVE``, ``LIBRARY``, ``RUNTIME``, ``FRAMEWORK``, and ``BUNDLE``.
 Executables are treated as ``RUNTIME`` targets, except that those
 marked with the ``MACOSX_BUNDLE`` property are treated as ``BUNDLE``
-targets on OS X.  Static libraries are always treated as ``ARCHIVE``
-targets.  Module libraries are always treated as ``LIBRARY`` targets.
+targets on OS X.  Static libraries are treated as ``ARCHIVE`` targets,
+except that those marked with the ``FRAMEWORK`` property are treated
+as ``FRAMEWORK`` targets on OS X.
+Module libraries are always treated as ``LIBRARY`` targets.
 For non-DLL platforms shared libraries are treated as ``LIBRARY``
 targets, except that those marked with the ``FRAMEWORK`` property are
 treated as ``FRAMEWORK`` targets on OS X.  For DLL platforms the DLL
diff --git a/Help/prop_tgt/FRAMEWORK.rst b/Help/prop_tgt/FRAMEWORK.rst
index 8120c36..495d30e 100644
--- a/Help/prop_tgt/FRAMEWORK.rst
+++ b/Help/prop_tgt/FRAMEWORK.rst
@@ -1,9 +1,9 @@
 FRAMEWORK
 ---------
 
-Build ``SHARED`` library as Framework Bundle on the OS X and iOS.
+Build ``SHARED`` or ``STATIC`` library as Framework Bundle on the OS X and iOS.
 
-If a ``SHARED`` library target has this property set to ``TRUE`` it will be
+If such a library target has this property set to ``TRUE`` it will be
 built as a framework when built on the OS X and iOS.  It will have the
 directory structure required for a framework and will be suitable to
 be used with the ``-framework`` option
diff --git a/Help/release/dev/static-frameworks.rst b/Help/release/dev/static-frameworks.rst
new file mode 100644
index 0000000..eae80bd
--- /dev/null
+++ b/Help/release/dev/static-frameworks.rst
@@ -0,0 +1,6 @@
+static-frameworks
+-----------------
+
+* The :prop_tgt:`FRAMEWORK` property could now also be applied to
+  static libraries on Apple targets.  It will result in a proper
+  Framework but with a static library inside.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index dcf3764..6ce8140 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5308,7 +5308,8 @@ bool cmGeneratorTarget::IsLinkable() const
 
 bool cmGeneratorTarget::IsFrameworkOnApple() const
 {
-  return (this->GetType() == cmStateEnums::SHARED_LIBRARY &&
+  return ((this->GetType() == cmStateEnums::SHARED_LIBRARY ||
+           this->GetType() == cmStateEnums::STATIC_LIBRARY) &&
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("FRAMEWORK"));
 }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index d448315..8627cf2 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1816,8 +1816,34 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
 
   // Handle settings for each target type.
   switch (gtgt->GetType()) {
-    case cmStateEnums::OBJECT_LIBRARY:
-    case cmStateEnums::STATIC_LIBRARY: {
+    case cmStateEnums::STATIC_LIBRARY:
+      if (gtgt->GetPropertyAsBool("FRAMEWORK")) {
+        std::string fw_version = gtgt->GetFrameworkVersion();
+        buildSettings->AddAttribute("FRAMEWORK_VERSION",
+                                    this->CreateString(fw_version));
+        const char* ext = gtgt->GetProperty("BUNDLE_EXTENSION");
+        if (ext) {
+          buildSettings->AddAttribute("WRAPPER_EXTENSION",
+                                      this->CreateString(ext));
+        }
+
+        std::string plist = this->ComputeInfoPListLocation(gtgt);
+        // Xcode will create the final version of Info.plist at build time,
+        // so let it replace the framework name. This avoids creating
+        // a per-configuration Info.plist file.
+        this->CurrentLocalGenerator->GenerateFrameworkInfoPList(
+          gtgt, "$(EXECUTABLE_NAME)", plist.c_str());
+        buildSettings->AddAttribute("INFOPLIST_FILE",
+                                    this->CreateString(plist));
+        buildSettings->AddAttribute("MACH_O_TYPE",
+                                    this->CreateString("staticlib"));
+      } else {
+        buildSettings->AddAttribute("LIBRARY_STYLE",
+                                    this->CreateString("STATIC"));
+      }
+      break;
+
+    case cmStateEnums::OBJECT_LIBRARY: {
       buildSettings->AddAttribute("LIBRARY_STYLE",
                                   this->CreateString("STATIC"));
       break;
@@ -2336,8 +2362,10 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(
 
   switch (target->GetType()) {
     case cmStateEnums::OBJECT_LIBRARY:
-    case cmStateEnums::STATIC_LIBRARY:
       return "archive.ar";
+    case cmStateEnums::STATIC_LIBRARY:
+      return (target->GetPropertyAsBool("FRAMEWORK") ? "wrapper.framework"
+                                                     : "archive.ar");
     case cmStateEnums::MODULE_LIBRARY:
       if (target->IsXCTestOnApple())
         return "wrapper.cfbundle";
@@ -2367,8 +2395,11 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(
 
   switch (target->GetType()) {
     case cmStateEnums::OBJECT_LIBRARY:
-    case cmStateEnums::STATIC_LIBRARY:
       return "com.apple.product-type.library.static";
+    case cmStateEnums::STATIC_LIBRARY:
+      return (target->GetPropertyAsBool("FRAMEWORK")
+                ? "com.apple.product-type.framework"
+                : "com.apple.product-type.library.static");
     case cmStateEnums::MODULE_LIBRARY:
       if (target->IsXCTestOnApple())
         return "com.apple.product-type.bundle.unit-test";
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index fadebb4..4c331c7 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -471,17 +471,39 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
         }
       } break;
       case cmStateEnums::STATIC_LIBRARY: {
-        // Static libraries use ARCHIVE properties.
-        if (!archiveArgs.GetDestination().empty()) {
-          archiveGenerator =
-            CreateInstallTargetGenerator(target, archiveArgs, false);
+        // If it is marked with FRAMEWORK property use the FRAMEWORK set of
+        // INSTALL properties. Otherwise, use the LIBRARY properties.
+        if (target.IsFrameworkOnApple()) {
+          // When in namelink only mode skip frameworks.
+          if (namelinkMode == cmInstallTargetGenerator::NamelinkModeOnly) {
+            continue;
+          }
+
+          // Use the FRAMEWORK properties.
+          if (!frameworkArgs.GetDestination().empty()) {
+            frameworkGenerator =
+              CreateInstallTargetGenerator(target, frameworkArgs, false);
+          } else {
+            std::ostringstream e;
+            e << "TARGETS given no FRAMEWORK DESTINATION for static library "
+                 "FRAMEWORK target \""
+              << target.GetName() << "\".";
+            this->SetError(e.str());
+            return false;
+          }
         } else {
-          std::ostringstream e;
-          e << "TARGETS given no ARCHIVE DESTINATION for static library "
-               "target \""
-            << target.GetName() << "\".";
-          this->SetError(e.str());
-          return false;
+          // Static libraries use ARCHIVE properties.
+          if (!archiveArgs.GetDestination().empty()) {
+            archiveGenerator =
+              CreateInstallTargetGenerator(target, archiveArgs, false);
+          } else {
+            std::ostringstream e;
+            e << "TARGETS given no ARCHIVE DESTINATION for static library "
+                 "target \""
+              << target.GetName() << "\".";
+            this->SetError(e.str());
+            return false;
+          }
         }
       } break;
       case cmStateEnums::MODULE_LIBRARY: {
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 8c62c48..fe3472d 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -451,7 +451,8 @@ bool cmTarget::HasImportLibrary() const
 
 bool cmTarget::IsFrameworkOnApple() const
 {
-  return (this->GetType() == cmStateEnums::SHARED_LIBRARY &&
+  return ((this->GetType() == cmStateEnums::SHARED_LIBRARY ||
+           this->GetType() == cmStateEnums::STATIC_LIBRARY) &&
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("FRAMEWORK"));
 }
diff --git a/Tests/Framework/CMakeLists.txt b/Tests/Framework/CMakeLists.txt
index 271aaf1..a313c2c 100644
--- a/Tests/Framework/CMakeLists.txt
+++ b/Tests/Framework/CMakeLists.txt
@@ -57,29 +57,30 @@ add_custom_target(fooCustom ALL COMMAND ${CMAKE_COMMAND} -E copy foo-post-build
 add_dependencies(fooCustom foo)
 
 # Make a static library and apply the framework properties to it to verify
-# that everything still builds correctly, but it will not actually produce
-# a framework... The framework properties only apply when the library type
-# is SHARED.
+# that everything still builds correctly. Xcode prior to version 5 does not
+# support static Frameworks.
 #
-add_library(fooStatic STATIC
-  foo.cxx
-  foo.h
-  foo2.h
-  fooExtensionlessResource
-  fooPublic.h
-  fooPublicExtensionlessHeader
-  fooPrivate.h
-  fooPrivateExtensionlessHeader
-  fooNeither.h
-  fooBoth.h
-  test.lua
-  fooDeepPublic.h
-)
-set_target_properties(fooStatic PROPERTIES
-  FRAMEWORK TRUE
-  FRAMEWORK_VERSION none
-)
-add_executable(barStatic bar.cxx)
-target_link_libraries(barStatic fooStatic)
+if(NOT XCODE OR NOT XCODE_VERSION VERSION_LESS 5)
+  add_library(fooStatic STATIC
+    foo.cxx
+    foo.h
+    foo2.h
+    fooExtensionlessResource
+    fooPublic.h
+    fooPublicExtensionlessHeader
+    fooPrivate.h
+    fooPrivateExtensionlessHeader
+    fooNeither.h
+    fooBoth.h
+    test.lua
+    fooDeepPublic.h
+  )
+  set_target_properties(fooStatic PROPERTIES
+    FRAMEWORK TRUE
+    FRAMEWORK_VERSION none
+  )
+  add_executable(barStatic bar.cxx)
+  target_link_libraries(barStatic fooStatic)
+endif()
 
 include(CPack)
diff --git a/Tests/RunCMake/Framework/FrameworkLayout.cmake b/Tests/RunCMake/Framework/FrameworkLayout.cmake
index 5184755..ae32134 100644
--- a/Tests/RunCMake/Framework/FrameworkLayout.cmake
+++ b/Tests/RunCMake/Framework/FrameworkLayout.cmake
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.4)
 enable_language(C)
 
-add_library(Framework SHARED
+add_library(Framework ${FRAMEWORK_TYPE}
             foo.c
             foo.h
             res.txt)
@@ -9,3 +9,6 @@ set_target_properties(Framework PROPERTIES
                       FRAMEWORK TRUE
                       PUBLIC_HEADER foo.h
                       RESOURCE "res.txt")
+
+add_custom_command(TARGET Framework POST_BUILD
+                   COMMAND /usr/bin/file $<TARGET_FILE:Framework>)
diff --git a/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt b/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt
new file mode 100644
index 0000000..8d90f5f
--- /dev/null
+++ b/Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt
@@ -0,0 +1 @@
+.*/Framework: Mach-O[^\n]* dynamically linked shared library.*
diff --git a/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt b/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt
new file mode 100644
index 0000000..c9f50b6
--- /dev/null
+++ b/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt
@@ -0,0 +1 @@
+.*/Framework: current ar archive random library.*
diff --git a/Tests/RunCMake/Framework/RunCMakeTest.cmake b/Tests/RunCMake/Framework/RunCMakeTest.cmake
index 1f7d54e..e64892d 100644
--- a/Tests/RunCMake/Framework/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Framework/RunCMakeTest.cmake
@@ -1,9 +1,10 @@
 include(RunCMake)
 
-function(framework_layout_test Name Toolchain)
-  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${Toolchain}FrameworkLayout-build)
+function(framework_layout_test Name Toolchain Type)
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${Toolchain}${Type}FrameworkLayout-build)
   set(RunCMake_TEST_NO_CLEAN 1)
   set(RunCMake_TEST_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/${Toolchain}.cmake")
+  list(APPEND RunCMake_TEST_OPTIONS "-DFRAMEWORK_TYPE=${Type}")
 
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
   file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
@@ -14,6 +15,26 @@ endfunction()
 
 # build check cannot cope with multi-configuration generators directory layout
 if(NOT RunCMake_GENERATOR STREQUAL "Xcode")
-  framework_layout_test(iOSFrameworkLayout-build ios)
-  framework_layout_test(OSXFrameworkLayout-build osx)
+  framework_layout_test(iOSFrameworkLayout-build ios SHARED)
+  framework_layout_test(iOSFrameworkLayout-build ios STATIC)
+  framework_layout_test(OSXFrameworkLayout-build osx SHARED)
+  framework_layout_test(OSXFrameworkLayout-build osx STATIC)
 endif()
+
+function(framework_type_test Toolchain Type)
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${Toolchain}${Type}FrameworkType-build)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  set(RunCMake_TEST_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/${Toolchain}.cmake")
+  list(APPEND RunCMake_TEST_OPTIONS "-DFRAMEWORK_TYPE=${Type}")
+
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+  run_cmake(FrameworkLayout)
+  run_cmake_command(FrameworkType${Type}-build ${CMAKE_COMMAND} --build .)
+endfunction()
+
+framework_type_test(ios SHARED)
+framework_type_test(ios STATIC)
+framework_type_test(osx SHARED)
+framework_type_test(osx STATIC)
diff --git a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
index ad4268d..833eb85 100644
--- a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
@@ -50,30 +50,56 @@ if (NOT TEST_IOS AND NOT TEST_WATCHOS AND NOT TEST_TVOS)
   add_dependencies(AppBundleExtTest AppBundleExt)
 endif()
 
-# Framework (not supported for iOS on Xcode < 6)
+# Shared Framework (not supported for iOS on Xcode < 6)
 
 if(NOT TEST_IOS OR NOT XCODE_VERSION VERSION_LESS 6)
-  add_library(Framework SHARED main.c)
-  set_target_properties(Framework PROPERTIES FRAMEWORK TRUE)
+  add_library(SharedFramework SHARED main.c)
+  set_target_properties(SharedFramework PROPERTIES FRAMEWORK TRUE)
 
-  add_custom_target(FrameworkTest ALL
+  add_custom_target(SharedFrameworkTest ALL
     COMMAND ${CMAKE_COMMAND} -E copy
-      "$<TARGET_FILE:Framework>" "$<TARGET_FILE:Framework>.old")
+      "$<TARGET_FILE:SharedFramework>" "$<TARGET_FILE:SharedFramework>.old")
 
-  add_dependencies(FrameworkTest Framework)
+  add_dependencies(SharedFrameworkTest SharedFramework)
 
   # with custom extension
 
-  add_library(FrameworkExt SHARED main.c)
-  set_target_properties(FrameworkExt PROPERTIES FRAMEWORK TRUE)
-  set_target_properties(FrameworkExt PROPERTIES BUNDLE_EXTENSION "foo")
-  install(TARGETS FrameworkExt FRAMEWORK DESTINATION FooExtension)
+  add_library(SharedFrameworkExt SHARED main.c)
+  set_target_properties(SharedFrameworkExt PROPERTIES FRAMEWORK TRUE)
+  set_target_properties(SharedFrameworkExt PROPERTIES BUNDLE_EXTENSION "foo")
+  install(TARGETS SharedFrameworkExt FRAMEWORK DESTINATION FooExtension)
 
-  add_custom_target(FrameworkExtTest ALL
+  add_custom_target(SharedFrameworkExtTest ALL
     COMMAND ${CMAKE_COMMAND} -E copy
-      "$<TARGET_FILE:FrameworkExt>" "$<TARGET_FILE:FrameworkExt>.old")
+      "$<TARGET_FILE:SharedFrameworkExt>" "$<TARGET_FILE:SharedFrameworkExt>.old")
 
-  add_dependencies(FrameworkExtTest FrameworkExt)
+  add_dependencies(SharedFrameworkExtTest SharedFrameworkExt)
+endif()
+
+# Static Framework (not supported for Xcode < 6)
+
+if(NOT XCODE_VERSION VERSION_LESS 6)
+  add_library(StaticFramework STATIC main.c)
+  set_target_properties(StaticFramework PROPERTIES FRAMEWORK TRUE)
+
+  add_custom_target(StaticFrameworkTest ALL
+    COMMAND ${CMAKE_COMMAND} -E copy
+      "$<TARGET_FILE:StaticFramework>" "$<TARGET_FILE:StaticFramework>.old")
+
+  add_dependencies(StaticFrameworkTest StaticFramework)
+
+  # with custom extension
+
+  add_library(StaticFrameworkExt STATIC main.c)
+  set_target_properties(StaticFrameworkExt PROPERTIES FRAMEWORK TRUE)
+  set_target_properties(StaticFrameworkExt PROPERTIES BUNDLE_EXTENSION "foo")
+  install(TARGETS StaticFrameworkExt FRAMEWORK DESTINATION StaticFooExtension)
+
+  add_custom_target(StaticFrameworkExtTest ALL
+    COMMAND ${CMAKE_COMMAND} -E copy
+      "$<TARGET_FILE:StaticFrameworkExt>" "$<TARGET_FILE:StaticFrameworkExt>.old")
+
+  add_dependencies(StaticFrameworkExtTest StaticFrameworkExt)
 endif()
 
 # Bundle

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 31 09:01:55 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 31 Jan 2017 09:01:55 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2439-g6f89974
Message-ID: <20170131140155.517EAFA4AE@public.kitware.com>

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  6f899744ad89c07185b4ab89c0d14f5289369ea4 (commit)
       via  435cebaaa1663274cbe43c19cb8244011b6d1384 (commit)
      from  7d4c722add9f1e799fc278d164fa4fb0916f3aa4 (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=6f899744ad89c07185b4ab89c0d14f5289369ea4
commit 6f899744ad89c07185b4ab89c0d14f5289369ea4
Merge: 7d4c722 435ceba
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 09:01:54 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 09:01:54 2017 -0500

    Merge topic 'CSharpVS2017' into next
    
    435cebaa VS: Fix CSharp compiler identification for VS 2017


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=435cebaaa1663274cbe43c19cb8244011b6d1384
commit 435cebaaa1663274cbe43c19cb8244011b6d1384
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Fri Jan 27 13:50:17 2017 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 31 09:00:20 2017 -0500

    VS: Fix CSharp compiler identification for VS 2017
    
    The CSharp compiler for VS 2017 has moved from `MSBuildTools` to
    `RoslynTargets`.  Account for both locations giving priority to the
    `MSBuildTools` location.

diff --git a/Modules/CompilerId/VS-10.csproj.in b/Modules/CompilerId/VS-10.csproj.in
index 833dca7..ed5e847 100644
--- a/Modules/CompilerId/VS-10.csproj.in
+++ b/Modules/CompilerId/VS-10.csproj.in
@@ -47,9 +47,9 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>cd /D &quot;$(MSBuildToolsPath)&quot;
-if not %errorlevel%==0 exit -1
-if not exist @id_cl@ exit -2
-%40echo CMAKE_ at id_lang@_COMPILER=$(MSBuildToolsPath)\@id_cl@</PostBuildEvent>
+    <PostBuildEvent>if not "$(RoslynTargetsPath)"=="" if exist "$(RoslynTargetsPath)\@id_cl@" set _CSC=$(RoslynTargetsPath)
+if exist "$(MSBuildToolsPath)\@id_cl@" set _CSC=$(MSBuildToolsPath)
+if "%_CSC%"=="" exit -1
+%40echo CMAKE_ at id_lang@_COMPILER=%_CSC%\@id_cl@</PostBuildEvent>
   </PropertyGroup>
 </Project>

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 31 09:04:16 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 31 Jan 2017 09:04:16 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1233-g8a76536
Message-ID: <20170131140416.18DC8FA4D0@public.kitware.com>

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  8a76536e78e9084fb9636b2f0c57121522cfbbaf (commit)
       via  050bb41ca71d2cd9d4a229cdae19c97f77753273 (commit)
       via  d6108c87afb03a326b14bc6feafeb14e99316e5f (commit)
       via  3642d657b153f212eb119f1003e11c3079494630 (commit)
       via  7e5ef9ca78f67c2f4def64408ce4c7ecc03917a7 (commit)
       via  a6fda7bf4010051c2232d4ba6c64f310862a6471 (commit)
       via  a2d393d648d0f64010a4b34b84ab7985a284e294 (commit)
       via  c7b846edaa7cee549ca08cbfbab2843daf106a01 (commit)
      from  07d3695e75d1bbeaa571901708350efc3f936e0e (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=8a76536e78e9084fb9636b2f0c57121522cfbbaf
commit 8a76536e78e9084fb9636b2f0c57121522cfbbaf
Merge: 07d3695 050bb41
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 09:04:13 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 09:04:13 2017 -0500

    Merge topic 'developer-setup'
    
    050bb41c Tell Git not to export the GitSetup directory
    d6108c87 GitSetup: Tell Git not to export .gitattributes
    3642d657 Merge branch 'upstream-GitSetup' into developer-setup
    7e5ef9ca GitSetup 2016-12-13 (cd5ada6d)
    a6fda7bf Merge branch 'upstream-GitSetup' into developer-setup
    a2d393d6 Add script to update GitSetup from upstream
    c7b846ed GitSetup 2012-04-26 (b7daff9b)


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

Summary of changes:
 Utilities/.gitattributes               |    1 +
 Utilities/GitSetup/.gitattributes      |    5 +-
 Utilities/GitSetup/README              |    7 ++
 Utilities/GitSetup/config.sample       |   10 ++
 Utilities/GitSetup/git-gerrit-push     |   74 +++++++++++++
 Utilities/GitSetup/git-gitlab-push     |  177 ++++++++++++++++++++++++++++++++
 Utilities/GitSetup/setup-gerrit        |   15 ++-
 Utilities/GitSetup/setup-gitlab        |  140 +++++++++++++++++++++++++
 Utilities/GitSetup/setup-hooks         |    1 +
 Utilities/GitSetup/setup-stage         |    9 +-
 Utilities/GitSetup/setup-upstream      |  104 +++++++++++++++++++
 Utilities/Scripts/update-gitsetup.bash |   20 ++++
 12 files changed, 552 insertions(+), 11 deletions(-)
 create mode 100755 Utilities/GitSetup/git-gerrit-push
 create mode 100755 Utilities/GitSetup/git-gitlab-push
 create mode 100755 Utilities/GitSetup/setup-gitlab
 create mode 100755 Utilities/GitSetup/setup-upstream
 create mode 100755 Utilities/Scripts/update-gitsetup.bash


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 31 09:04:18 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 31 Jan 2017 09:04:18 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1239-gf012a95
Message-ID: <20170131140418.B17EBFA4C2@public.kitware.com>

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  f012a95836e14e12f5a445abd72fa79599736641 (commit)
       via  071f8e78dda152d8759539fa390b25c7f58d3cc5 (commit)
       via  d525754eabef7a9f6e6696ae323a8ed965e12f2e (commit)
       via  45405f00d27031fb9641408c56673532a3ee3bde (commit)
       via  50e1c1056ea82690474dc186d7a4103b33547fa6 (commit)
       via  8643ca75c705568bc9bb084a5182baef04865d2d (commit)
      from  8a76536e78e9084fb9636b2f0c57121522cfbbaf (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=f012a95836e14e12f5a445abd72fa79599736641
commit f012a95836e14e12f5a445abd72fa79599736641
Merge: 8a76536 071f8e7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 09:04:16 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 09:04:16 2017 -0500

    Merge topic '16432-static-frameworks'
    
    071f8e78 Apple: Add support for static frameworks
    d525754e Xcode: Refactor RunCMake.Framework test to prepare for static frameworks
    45405f00 Xcode: Ignore Xcode project warning until issue is fixed
    50e1c105 Makefile: For static libraries remove only the "real" lib before creating
    8643ca75 Makefile: Re-order list of files to clean


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

Summary of changes:
 Help/command/add_library.rst                       |    2 +-
 Help/command/install.rst                           |    6 +-
 Help/prop_tgt/FRAMEWORK.rst                        |    4 +-
 Help/release/dev/static-frameworks.rst             |    6 ++
 Source/cmGeneratorTarget.cxx                       |    3 +-
 Source/cmGlobalXCodeGenerator.cxx                  |   39 +++++++++--
 Source/cmInstallCommand.cxx                        |   42 +++++++++---
 Source/cmMakefileLibraryTargetGenerator.cxx        |   35 +++++-----
 Source/cmTarget.cxx                                |    3 +-
 Tests/Framework/CMakeLists.txt                     |   47 ++++++-------
 Tests/RunCMake/CMakeLists.txt                      |    3 +-
 Tests/RunCMake/Framework/FrameworkLayout.cmake     |    5 +-
 .../Framework/FrameworkTypeSHARED-build-stdout.txt |    1 +
 .../Framework/FrameworkTypeSTATIC-build-stdout.txt |    1 +
 Tests/RunCMake/Framework/RunCMakeTest.cmake        |   69 +++++++++++---------
 Tests/RunCMake/RunCMake.cmake                      |    2 +-
 Tests/RunCMake/XcodeProject/XcodeBundles.cmake     |   52 +++++++++++----
 17 files changed, 211 insertions(+), 109 deletions(-)
 create mode 100644 Help/release/dev/static-frameworks.rst
 create mode 100644 Tests/RunCMake/Framework/FrameworkTypeSHARED-build-stdout.txt
 create mode 100644 Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 31 09:04:21 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 31 Jan 2017 09:04:21 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1241-g5accbac
Message-ID: <20170131140421.0B187FA4E4@public.kitware.com>

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  5accbaccbcc5f876a444c26987b66bf6d023880d (commit)
       via  4dde0bc8ef1d953b8e4b13a2e465d756b5274933 (commit)
      from  f012a95836e14e12f5a445abd72fa79599736641 (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=5accbaccbcc5f876a444c26987b66bf6d023880d
commit 5accbaccbcc5f876a444c26987b66bf6d023880d
Merge: f012a95 4dde0bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 09:04:19 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 09:04:19 2017 -0500

    Merge topic 'vs-export-external-objects'
    
    4dde0bc8 VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for external objects


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

Summary of changes:
 Source/cmGlobalVisualStudioGenerator.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 31 09:04:23 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 31 Jan 2017 09:04:23 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1243-g6ec0c09
Message-ID: <20170131140423.58D39FA4D6@public.kitware.com>

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  6ec0c09a7a1f148f747db97228fc3bf1f63e3ed1 (commit)
       via  5181f1f86a4d4c2ac09a540285c938fe2c2fa262 (commit)
      from  5accbaccbcc5f876a444c26987b66bf6d023880d (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=6ec0c09a7a1f148f747db97228fc3bf1f63e3ed1
commit 6ec0c09a7a1f148f747db97228fc3bf1f63e3ed1
Merge: 5accbac 5181f1f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 09:04:21 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 09:04:21 2017 -0500

    Merge topic 'topic-reproducible-build'
    
    5181f1f8 Tests: make tests pass with SOURCE_DATE_EPOCH set


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

Summary of changes:
 Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake |    1 +
 Tests/CTestTestStopTime/GetDate.cmake          |    1 +
 2 files changed, 2 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 31 09:04:25 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 31 Jan 2017 09:04:25 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1245-g2e2c92e
Message-ID: <20170131140425.B1AFFFA4DC@public.kitware.com>

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  2e2c92edb03a28ccc6b0755410e58125a472aa52 (commit)
       via  97d61562d064af4e79ed51cfe4ef4ea95f780b23 (commit)
      from  6ec0c09a7a1f148f747db97228fc3bf1f63e3ed1 (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=2e2c92edb03a28ccc6b0755410e58125a472aa52
commit 2e2c92edb03a28ccc6b0755410e58125a472aa52
Merge: 6ec0c09 97d6156
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 09:04:23 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 09:04:23 2017 -0500

    Merge topic 'FindBoost-cache-unset-on-change'
    
    97d61562 FindBoost: unset cache variables if the lib dir changes


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 31 09:04:27 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 31 Jan 2017 09:04:27 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.7.2-1247-g5efb8b9
Message-ID: <20170131140428.01B8BFA4E3@public.kitware.com>

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  5efb8b9a5df82fef0b6abac11f590f2a655c184e (commit)
       via  435cebaaa1663274cbe43c19cb8244011b6d1384 (commit)
      from  2e2c92edb03a28ccc6b0755410e58125a472aa52 (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=5efb8b9a5df82fef0b6abac11f590f2a655c184e
commit 5efb8b9a5df82fef0b6abac11f590f2a655c184e
Merge: 2e2c92e 435ceba
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 09:04:26 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 09:04:26 2017 -0500

    Merge topic 'CSharpVS2017'
    
    435cebaa VS: Fix CSharp compiler identification for VS 2017


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

Summary of changes:
 Modules/CompilerId/VS-10.csproj.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 31 09:04:42 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 31 Jan 2017 09:04:42 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2446-g06a5bb5
Message-ID: <20170131140442.4207BFA4CF@public.kitware.com>

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  06a5bb57c31fa588e939ba5fdd66a2337da73035 (commit)
       via  5efb8b9a5df82fef0b6abac11f590f2a655c184e (commit)
       via  2e2c92edb03a28ccc6b0755410e58125a472aa52 (commit)
       via  6ec0c09a7a1f148f747db97228fc3bf1f63e3ed1 (commit)
       via  5accbaccbcc5f876a444c26987b66bf6d023880d (commit)
       via  f012a95836e14e12f5a445abd72fa79599736641 (commit)
       via  8a76536e78e9084fb9636b2f0c57121522cfbbaf (commit)
      from  6f899744ad89c07185b4ab89c0d14f5289369ea4 (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=06a5bb57c31fa588e939ba5fdd66a2337da73035
commit 06a5bb57c31fa588e939ba5fdd66a2337da73035
Merge: 6f89974 5efb8b9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 09:04:33 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 31 09:04:33 2017 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 31 09:21:37 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 31 Jan 2017 09:21:37 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2449-g4407ab5
Message-ID: <20170131142137.6A5B6FA0AB@public.kitware.com>

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  4407ab5ece0abb662b86a53bc651651141c4b162 (commit)
       via  086a1ec7889b14375c628cc58be721011de41abc (commit)
       via  0440b8fa4e8475e062c23aa1729984659028bd0b (commit)
      from  06a5bb57c31fa588e939ba5fdd66a2337da73035 (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=4407ab5ece0abb662b86a53bc651651141c4b162
commit 4407ab5ece0abb662b86a53bc651651141c4b162
Merge: 06a5bb5 086a1ec
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 09:21:36 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 09:21:36 2017 -0500

    Merge topic 'gcc-features' into next
    
    086a1ec7 GNU C++: record that -fvisibility-inlines-hidden is available since 4.0
    0440b8fa GNU C: record that C99 is available since at least 3.4


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=086a1ec7889b14375c628cc58be721011de41abc
commit 086a1ec7889b14375c628cc58be721011de41abc
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 27 16:52:42 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 31 09:21:28 2017 -0500

    GNU C++: record that -fvisibility-inlines-hidden is available since 4.0
    
    See https://gcc.gnu.org/onlinedocs/gcc-4.0.0/gcc/Option-Summary.html

diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index b04ea11..c007c98 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -6,7 +6,7 @@ if (WIN32)
     set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fno-keep-inline-dllexport")
   endif()
 else()
-  if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.2)
+  if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
     set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
   endif()
 endif()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0440b8fa4e8475e062c23aa1729984659028bd0b
commit 0440b8fa4e8475e062c23aa1729984659028bd0b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 27 16:49:45 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 31 09:21:28 2017 -0500

    GNU C: record that C99 is available since at least 3.4

diff --git a/Modules/Compiler/GNU-C-FeatureTests.cmake b/Modules/Compiler/GNU-C-FeatureTests.cmake
index b3fe33f..0ab5265 100644
--- a/Modules/Compiler/GNU-C-FeatureTests.cmake
+++ b/Modules/Compiler/GNU-C-FeatureTests.cmake
@@ -1,5 +1,5 @@
 
-set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404")
+set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304")
 
 # GNU 4.7 correctly sets __STDC_VERSION__ to 201112L, but GNU 4.6 sets it
 # to 201000L.  As the former is strictly greater than the latter, test only
@@ -8,10 +8,10 @@ set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404")
 # to the distinction between __cplusplus and __GXX_EXPERIMENTAL_CXX0X__ tests.
 set(GNU46_C11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 406 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201000L")
 set(_cmake_feature_test_c_static_assert "${GNU46_C11}")
-# Since 4.4 at least:
-set(GNU44_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L")
-set(_cmake_feature_test_c_restrict "${GNU44_C99}")
-set(_cmake_feature_test_c_variadic_macros "${GNU44_C99}")
+# Since 3.4 at least:
+set(GNU34_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L")
+set(_cmake_feature_test_c_restrict "${GNU34_C99}")
+set(_cmake_feature_test_c_variadic_macros "${GNU34_C99}")
 
 set(GNU_C90 "${_cmake_oldestSupported}")
 set(_cmake_feature_test_c_function_prototypes "${GNU_C90}")
diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index 05c3bb2..3f02618 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -4,12 +4,12 @@ __compiler_gnu(C)
 if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5)
   set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90")
   set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu90")
-elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
   set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c89")
   set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu89")
 endif()
 
-if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
   set(CMAKE_C99_STANDARD_COMPILE_OPTION "-std=c99")
   set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-std=gnu99")
 endif()
@@ -22,7 +22,7 @@ elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6)
   set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu1x")
 endif()
 
-if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
   if (NOT CMAKE_C_COMPILER_FORCED)
     if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT)
       message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version ${CMAKE_C_COMPILER_VERSION}")
@@ -38,10 +38,9 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
   endif()
 endif()
 
-
 macro(cmake_record_c_compile_features)
   set(_result 0)
-  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
     if(_result EQUAL 0 AND CMAKE_C11_STANDARD_COMPILE_OPTION)
       _record_compiler_features_c(11)
     endif()

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

Summary of changes:
 Modules/Compiler/GNU-C-FeatureTests.cmake |   10 +++++-----
 Modules/Compiler/GNU-C.cmake              |    9 ++++-----
 Modules/Compiler/GNU-CXX.cmake            |    2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 31 11:01:01 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 31 Jan 2017 11:01:01 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2452-g3a61f7e
Message-ID: <20170131160101.074E2FA3A8@public.kitware.com>

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  3a61f7e8e2ec578a9512dd3599088d8d24f158dd (commit)
       via  e93b76ec1e916a4546dee8f8735b4115f16b201c (commit)
       via  3c97335df6f03f4c9737f75eaff65e9ba2e718ec (commit)
      from  4407ab5ece0abb662b86a53bc651651141c4b162 (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=3a61f7e8e2ec578a9512dd3599088d8d24f158dd
commit 3a61f7e8e2ec578a9512dd3599088d8d24f158dd
Merge: 4407ab5 e93b76e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 11:00:59 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 11:00:59 2017 -0500

    Merge topic 'developer-setup' into next
    
    e93b76ec Convert local hook configuration to a Git config file format
    3c97335d Add pre-commit hook to check whether SetupForDevelopment must re-run


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e93b76ec1e916a4546dee8f8735b4115f16b201c
commit e93b76ec1e916a4546dee8f8735b4115f16b201c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 10:56:35 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 31 10:59:38 2017 -0500

    Convert local hook configuration to a Git config file format
    
    The `git config` format is cleaner than a bash script and is also
    supported by our `hooks` branch to specify CMake-specific hooks.

diff --git a/.hooks-config.bash b/.hooks-config
similarity index 61%
rename from .hooks-config.bash
rename to .hooks-config
index ea9342a..064371c 100644
--- a/.hooks-config.bash
+++ b/.hooks-config
@@ -4,6 +4,7 @@
 # Loaded by .git/hooks/(pre-commit|commit-msg|prepare-commit-msg)
 # during git commit after local hooks have been installed.
 
-hooks_chain_pre_commit="Utilities/Git/pre-commit"
-hooks_chain_commit_msg="Utilities/Git/commit-msg"
-hooks_chain_prepare_commit_msg="Utilities/Git/prepare-commit-msg"
+[hooks "chain"]
+	pre-commit = Utilities/Git/pre-commit
+	commit-msg = Utilities/Git/commit-msg
+	prepare-commit-msg = Utilities/Git/prepare-commit-msg

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c97335df6f03f4c9737f75eaff65e9ba2e718ec
commit 3c97335df6f03f4c9737f75eaff65e9ba2e718ec
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 10:51:46 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 31 10:59:38 2017 -0500

    Add pre-commit hook to check whether SetupForDevelopment must re-run
    
    Add a version number to the `SetupForDevelopment.sh` script and use
    a pre-commit hook to check when it changes.

diff --git a/Utilities/Git/pre-commit b/Utilities/Git/pre-commit
index b232ac0..2ec78f4 100755
--- a/Utilities/Git/pre-commit
+++ b/Utilities/Git/pre-commit
@@ -29,6 +29,19 @@ die 'The following changes add lines too long for our C++ style:
 
 Use lines strictly less than '"$line_too_long"' characters in C++ code.'
 
+#-----------------------------------------------------------------------------
+
+# Check that developmer setup is up-to-date.
+lastSetupForDevelopment=$(git config --get hooks.SetupForDevelopment || echo 0)
+eval $(grep '^SetupForDevelopment_VERSION=' "${BASH_SOURCE%/*}/../SetupForDevelopment.sh")
+test -n "$SetupForDevelopment_VERSION" || SetupForDevelopment_VERSION=0
+if test $lastSetupForDevelopment -lt $SetupForDevelopment_VERSION; then
+  die 'Developer setup in this work tree is out of date.  Please re-run
+
+  Utilities/SetupForDevelopment.sh
+'
+fi
+
 #-------------------------------------------------------------------------------
 if test -z "$HOOKS_ALLOW_KWSYS"; then
   # Disallow changes to KWSys
diff --git a/Utilities/SetupForDevelopment.sh b/Utilities/SetupForDevelopment.sh
index 0a9df7e..39152bc 100755
--- a/Utilities/SetupForDevelopment.sh
+++ b/Utilities/SetupForDevelopment.sh
@@ -11,3 +11,7 @@ Utilities/GitSetup/tips
 # Rebase master by default
 git config rebase.stat true
 git config branch.master.rebase true
+
+# Record the version of this setup so Git/pre-commit can check it.
+SetupForDevelopment_VERSION=1
+git config hooks.SetupForDevelopment ${SetupForDevelopment_VERSION}

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

Summary of changes:
 .hooks-config.bash => .hooks-config |    7 ++++---
 Utilities/Git/pre-commit            |   13 +++++++++++++
 Utilities/SetupForDevelopment.sh    |    4 ++++
 3 files changed, 21 insertions(+), 3 deletions(-)
 rename .hooks-config.bash => .hooks-config (61%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 31 11:16:04 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 31 Jan 2017 11:16:04 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2454-g2a99491
Message-ID: <20170131161604.621AAFA09A@public.kitware.com>

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  2a99491734ddf8a879ab7ca6492373cf072031d4 (commit)
       via  372e87197b07d1b5d68712b609f5184d1d974f73 (commit)
      from  3a61f7e8e2ec578a9512dd3599088d8d24f158dd (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=2a99491734ddf8a879ab7ca6492373cf072031d4
commit 2a99491734ddf8a879ab7ca6492373cf072031d4
Merge: 3a61f7e 372e871
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 11:16:03 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 11:16:03 2017 -0500

    Merge topic 'developer-setup' into next
    
    372e8719 fixup! Add pre-commit hook to check whether SetupForDevelopment must re-run


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=372e87197b07d1b5d68712b609f5184d1d974f73
commit 372e87197b07d1b5d68712b609f5184d1d974f73
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 11:15:31 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 31 11:15:31 2017 -0500

    fixup! Add pre-commit hook to check whether SetupForDevelopment must re-run

diff --git a/Utilities/Git/pre-commit b/Utilities/Git/pre-commit
index 2ec78f4..b63ae5e 100755
--- a/Utilities/Git/pre-commit
+++ b/Utilities/Git/pre-commit
@@ -31,7 +31,7 @@ Use lines strictly less than '"$line_too_long"' characters in C++ code.'
 
 #-----------------------------------------------------------------------------
 
-# Check that developmer setup is up-to-date.
+# Check that development setup is up-to-date.
 lastSetupForDevelopment=$(git config --get hooks.SetupForDevelopment || echo 0)
 eval $(grep '^SetupForDevelopment_VERSION=' "${BASH_SOURCE%/*}/../SetupForDevelopment.sh")
 test -n "$SetupForDevelopment_VERSION" || SetupForDevelopment_VERSION=0

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

Summary of changes:
 Utilities/Git/pre-commit |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 31 11:16:26 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 31 Jan 2017 11:16:26 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2457-g17e5230
Message-ID: <20170131161626.9D721FA111@public.kitware.com>

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  17e5230ea6f68587ee2eda1145ef086d564e1229 (commit)
       via  3288ab0c78057e2388b247d326dc80011488a0bb (commit)
       via  773df0e2d7596d84a711914f1cffb4fb5a107c17 (commit)
      from  2a99491734ddf8a879ab7ca6492373cf072031d4 (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=17e5230ea6f68587ee2eda1145ef086d564e1229
commit 17e5230ea6f68587ee2eda1145ef086d564e1229
Merge: 2a99491 3288ab0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 11:16:26 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 11:16:26 2017 -0500

    Merge topic 'developer-setup' into next
    
    3288ab0c Convert local hook configuration to a Git config file format
    773df0e2 Add pre-commit hook to check whether SetupForDevelopment must re-run


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3288ab0c78057e2388b247d326dc80011488a0bb
commit 3288ab0c78057e2388b247d326dc80011488a0bb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 10:56:35 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 31 11:16:10 2017 -0500

    Convert local hook configuration to a Git config file format
    
    The `git config` format is cleaner than a bash script and is also
    supported by our `hooks` branch to specify CMake-specific hooks.

diff --git a/.hooks-config.bash b/.hooks-config
similarity index 61%
rename from .hooks-config.bash
rename to .hooks-config
index ea9342a..064371c 100644
--- a/.hooks-config.bash
+++ b/.hooks-config
@@ -4,6 +4,7 @@
 # Loaded by .git/hooks/(pre-commit|commit-msg|prepare-commit-msg)
 # during git commit after local hooks have been installed.
 
-hooks_chain_pre_commit="Utilities/Git/pre-commit"
-hooks_chain_commit_msg="Utilities/Git/commit-msg"
-hooks_chain_prepare_commit_msg="Utilities/Git/prepare-commit-msg"
+[hooks "chain"]
+	pre-commit = Utilities/Git/pre-commit
+	commit-msg = Utilities/Git/commit-msg
+	prepare-commit-msg = Utilities/Git/prepare-commit-msg

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=773df0e2d7596d84a711914f1cffb4fb5a107c17
commit 773df0e2d7596d84a711914f1cffb4fb5a107c17
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 10:51:46 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 31 11:16:10 2017 -0500

    Add pre-commit hook to check whether SetupForDevelopment must re-run
    
    Add a version number to the `SetupForDevelopment.sh` script and use
    a pre-commit hook to check when it changes.

diff --git a/Utilities/Git/pre-commit b/Utilities/Git/pre-commit
index b232ac0..b63ae5e 100755
--- a/Utilities/Git/pre-commit
+++ b/Utilities/Git/pre-commit
@@ -29,6 +29,19 @@ die 'The following changes add lines too long for our C++ style:
 
 Use lines strictly less than '"$line_too_long"' characters in C++ code.'
 
+#-----------------------------------------------------------------------------
+
+# Check that development setup is up-to-date.
+lastSetupForDevelopment=$(git config --get hooks.SetupForDevelopment || echo 0)
+eval $(grep '^SetupForDevelopment_VERSION=' "${BASH_SOURCE%/*}/../SetupForDevelopment.sh")
+test -n "$SetupForDevelopment_VERSION" || SetupForDevelopment_VERSION=0
+if test $lastSetupForDevelopment -lt $SetupForDevelopment_VERSION; then
+  die 'Developer setup in this work tree is out of date.  Please re-run
+
+  Utilities/SetupForDevelopment.sh
+'
+fi
+
 #-------------------------------------------------------------------------------
 if test -z "$HOOKS_ALLOW_KWSYS"; then
   # Disallow changes to KWSys
diff --git a/Utilities/SetupForDevelopment.sh b/Utilities/SetupForDevelopment.sh
index 0a9df7e..39152bc 100755
--- a/Utilities/SetupForDevelopment.sh
+++ b/Utilities/SetupForDevelopment.sh
@@ -11,3 +11,7 @@ Utilities/GitSetup/tips
 # Rebase master by default
 git config rebase.stat true
 git config branch.master.rebase true
+
+# Record the version of this setup so Git/pre-commit can check it.
+SetupForDevelopment_VERSION=1
+git config hooks.SetupForDevelopment ${SetupForDevelopment_VERSION}

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Jan 31 11:17:09 2017
From: brad.king at kitware.com (Brad King)
Date: Tue, 31 Jan 2017 11:17:09 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.7.2-2459-g5eb3c08
Message-ID: <20170131161710.81FF8FA18C@public.kitware.com>

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  5eb3c083401d6cf054a6841688702c0102b4aecb (commit)
       via  6de43c42ad12bd8bc92845cfcdbaf7d623e44ca3 (commit)
      from  17e5230ea6f68587ee2eda1145ef086d564e1229 (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=5eb3c083401d6cf054a6841688702c0102b4aecb
commit 5eb3c083401d6cf054a6841688702c0102b4aecb
Merge: 17e5230 6de43c4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 11:17:07 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 11:17:07 2017 -0500

    Merge topic 'FortranCInterface-vs-intel-workaround' into next
    
    6de43c42 FortranCInterface: Fix support for VS with Intel toolset


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6de43c42ad12bd8bc92845cfcdbaf7d623e44ca3
commit 6de43c42ad12bd8bc92845cfcdbaf7d623e44ca3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 31 11:06:20 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 31 11:06:20 2017 -0500

    FortranCInterface: Fix support for VS with Intel toolset
    
    When using a Visual Studio generator with an Intel toolset, such as
    
        -T "Intel C++ Compiler XE 14.0"
    
    the generated FortranCInterface mangling detection project may fail to
    build due to `devenv` not working with the `/project ALL_BUILD` option.
    This seems to be a bug in `devenv` or the Intel VS integration.  Work
    around the problem by building with `/project FortranCInterface`
    instead.  We only need to build this executable and its dependencies
    within the detection test project anyway.
    
    Fixes: #16519

diff --git a/Modules/FortranCInterface/Detect.cmake b/Modules/FortranCInterface/Detect.cmake
index 9984efd..7612890 100644
--- a/Modules/FortranCInterface/Detect.cmake
+++ b/Modules/FortranCInterface/Detect.cmake
@@ -30,7 +30,8 @@ set(_result)
 try_compile(FortranCInterface_COMPILED
   ${FortranCInterface_BINARY_DIR}
   ${FortranCInterface_SOURCE_DIR}
-  FortranCInterface
+  FortranCInterface # project name
+  FortranCInterface # target name
   CMAKE_FLAGS
     "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}"
     "-DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}"

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

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


hooks/post-receive
-- 
CMake