From kwrobot at kitware.com  Sun Feb  1 00:01:11 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Sun,  1 Feb 2015 00:01:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.1-985-g8d69764
Message-ID: <20150201050111.9FBF8AA148@public.kitware.com>

This is an automated email from 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  8d69764d06ba0dca6e1e15bd5efeaac640ece49b (commit)
      from  83ae27dcd18a746af35434bede9e3a7ee0aeef9b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d69764d06ba0dca6e1e15bd5efeaac640ece49b
commit 8d69764d06ba0dca6e1e15bd5efeaac640ece49b
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sun Feb 1 00:01:08 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun Feb 1 00:01:08 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 34d59bb..947cae7 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 1)
-set(CMake_VERSION_PATCH 20150131)
+set(CMake_VERSION_PATCH 20150201)
 #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 Feb  2 00:01:09 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Mon,  2 Feb 2015 00:01:09 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.1-986-gcf38f68
Message-ID: <20150202050109.7ECECAAA98@public.kitware.com>

This is an automated email from 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  cf38f6868536e8439bc84d57363dcc51f1fea998 (commit)
      from  8d69764d06ba0dca6e1e15bd5efeaac640ece49b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf38f6868536e8439bc84d57363dcc51f1fea998
commit cf38f6868536e8439bc84d57363dcc51f1fea998
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Mon Feb 2 00:01:07 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Feb 2 00:01:07 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 947cae7..68dff35 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 1)
-set(CMake_VERSION_PATCH 20150201)
+set(CMake_VERSION_PATCH 20150202)
 #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 Feb  2 10:32:49 2015
From: ben.boeckel at kitware.com (Ben Boeckel)
Date: Mon,  2 Feb 2015 10:32:49 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2538-g2b24a11
Message-ID: <20150202153249.EC496AAC0A@public.kitware.com>

This is an automated email from 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  2b24a1129330027717429d0a2be1ce7d7bd4202a (commit)
       via  4c98de33d71fece4333607225ab030c1c7eee76c (commit)
       via  cf38f6868536e8439bc84d57363dcc51f1fea998 (commit)
       via  8d69764d06ba0dca6e1e15bd5efeaac640ece49b (commit)
       via  83ae27dcd18a746af35434bede9e3a7ee0aeef9b (commit)
      from  951b4a382df85ca097859fdfb81bb3a6b886a0b9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b24a1129330027717429d0a2be1ce7d7bd4202a
commit 2b24a1129330027717429d0a2be1ce7d7bd4202a
Merge: 951b4a3 4c98de3
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Feb 2 10:32:49 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 2 10:32:49 2015 -0500

    Merge topic 'fix-local-generator-config-check' into next
    
    4c98de33 cmLocalGenerator: fix the default configuration check
    cf38f686 CMake Nightly Date Stamp
    8d69764d CMake Nightly Date Stamp
    83ae27dc CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c98de33d71fece4333607225ab030c1c7eee76c
commit 4c98de33d71fece4333607225ab030c1c7eee76c
Author:     Ben Boeckel <mathstuf at gmail.com>
AuthorDate: Mon Feb 2 10:31:43 2015 -0500
Commit:     Ben Boeckel <mathstuf at gmail.com>
CommitDate: Mon Feb 2 10:31:43 2015 -0500

    cmLocalGenerator: fix the default configuration check
    
    Empty also means the default configuration should be used.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index af4c950..6b7a520 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -425,7 +425,7 @@ void cmLocalGenerator::GenerateInstallRules()
     {
     default_config = configurationTypes[0].c_str();
     }
-  if(!default_config)
+  if(!default_config || !*default_config)
     {
     default_config = "Release";
     }

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

Summary of changes:
 Source/CMakeVersion.cmake   |    2 +-
 Source/cmLocalGenerator.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Tue Feb  3 00:01:11 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Tue,  3 Feb 2015 00:01:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.1-987-g460f7bc
Message-ID: <20150203050111.2EFE1AA12F@public.kitware.com>

This is an automated email from 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  460f7bcb7d11e905ee025c9d9cc9629d597fa91b (commit)
      from  cf38f6868536e8439bc84d57363dcc51f1fea998 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=460f7bcb7d11e905ee025c9d9cc9629d597fa91b
commit 460f7bcb7d11e905ee025c9d9cc9629d597fa91b
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Tue Feb 3 00:01:08 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Feb 3 00:01:08 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 68dff35..dacbd20 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 1)
-set(CMake_VERSION_PATCH 20150202)
+set(CMake_VERSION_PATCH 20150203)
 #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 Feb  3 09:31:42 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  3 Feb 2015 09:31:42 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2540-gf0e2fdd
Message-ID: <20150203143142.7DDFBAACFF@public.kitware.com>

This is an automated email from 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  f0e2fdd201e3b7b466efb0710d0cbad317bbc8bd (commit)
       via  fb828b44ebfd0f9a2c74d16efd15d4cc0716cb60 (commit)
      from  2b24a1129330027717429d0a2be1ce7d7bd4202a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0e2fdd201e3b7b466efb0710d0cbad317bbc8bd
commit f0e2fdd201e3b7b466efb0710d0cbad317bbc8bd
Merge: 2b24a11 fb828b4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 09:31:41 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 3 09:31:41 2015 -0500

    Merge topic 'fix-local-generator-config-check' into next
    
    fb828b44 Revert "cmLocalGenerator: fix the default configuration check"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb828b44ebfd0f9a2c74d16efd15d4cc0716cb60
commit fb828b44ebfd0f9a2c74d16efd15d4cc0716cb60
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 09:31:05 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 3 09:31:05 2015 -0500

    Revert "cmLocalGenerator: fix the default configuration check"
    
    This reverts commit 4c98de33d71fece4333607225ab030c1c7eee76c.
    We have always supported an empty config.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6b7a520..af4c950 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -425,7 +425,7 @@ void cmLocalGenerator::GenerateInstallRules()
     {
     default_config = configurationTypes[0].c_str();
     }
-  if(!default_config || !*default_config)
+  if(!default_config)
     {
     default_config = "Release";
     }

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb  3 09:46:19 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  3 Feb 2015 09:46:19 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.1-989-g1acf362
Message-ID: <20150203144619.4FFD1AA2B1@public.kitware.com>

This is an automated email from 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  1acf36241fee134faed4355be2c9b5afa5500714 (commit)
       via  68b5b23b3bd948ec15f2ebed2154db8ab50f66e9 (commit)
      from  460f7bcb7d11e905ee025c9d9cc9629d597fa91b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1acf36241fee134faed4355be2c9b5afa5500714
commit 1acf36241fee134faed4355be2c9b5afa5500714
Merge: 460f7bc 68b5b23
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 09:46:18 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 3 09:46:18 2015 -0500

    Merge topic 'GNU-5-CXX14'
    
    68b5b23b Features: Update GNU 5.0 C++14 features.


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb  3 09:46:21 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  3 Feb 2015 09:46:21 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.1-991-g99e3650
Message-ID: <20150203144621.0397FAA2B1@public.kitware.com>

This is an automated email from 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  99e3650e66399e75efb989322d4b0146c549dbfa (commit)
       via  3cec0c75f73cc3d5c68cbb9e03e94ed38d60d0a9 (commit)
      from  1acf36241fee134faed4355be2c9b5afa5500714 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99e3650e66399e75efb989322d4b0146c549dbfa
commit 99e3650e66399e75efb989322d4b0146c549dbfa
Merge: 1acf362 3cec0c7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 09:46:20 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 3 09:46:20 2015 -0500

    Merge topic 'make-NOTPARALLEL-not-PHONY'
    
    3cec0c75 Makefile: Generate .NOTPARALLEL without .PHONY (#14312)


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb  3 09:46:23 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  3 Feb 2015 09:46:23 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.1-993-gaec1137
Message-ID: <20150203144623.5FC31AA2B5@public.kitware.com>

This is an automated email from 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  aec11372a5868694937b1c232af9d7510ad8497e (commit)
       via  3ec025472735c22cb90b09bc171190005dd28bb1 (commit)
      from  99e3650e66399e75efb989322d4b0146c549dbfa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aec11372a5868694937b1c232af9d7510ad8497e
commit aec11372a5868694937b1c232af9d7510ad8497e
Merge: 99e3650 3ec0254
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 09:46:21 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 3 09:46:21 2015 -0500

    Merge topic 'rpm_multi_prefix'
    
    3ec02547 CPackRPM: Allow multiple path relocation prefixes for one package


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

Summary of changes:
 Help/release/dev/rpm_multi_prefix.rst              |   11 ++
 Modules/CPackRPM.cmake                             |  115 ++++++++++++++++++--
 Tests/CPackComponentsForAll/CMakeLists.txt         |    6 +
 .../MyLibCPackConfig-IgnoreGroup.cmake.in          |   16 +--
 .../RunCPackVerifyResult.cmake                     |   30 ++++-
 Tests/RunCMake/CMakeLists.txt                      |    4 +
 Tests/RunCMake/CPackRPM/CMakeLists.txt             |    7 ++
 ...ackRPM_PARTIALLY_RELOCATABLE_WARNING-stderr.txt |    1 +
 .../CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake   |    7 ++
 Tests/RunCMake/CPackRPM/RunCMakeTest.cmake         |   17 +++
 10 files changed, 194 insertions(+), 20 deletions(-)
 create mode 100644 Help/release/dev/rpm_multi_prefix.rst
 create mode 100644 Tests/RunCMake/CPackRPM/CMakeLists.txt
 create mode 100644 Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING-stderr.txt
 create mode 100644 Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake
 create mode 100644 Tests/RunCMake/CPackRPM/RunCMakeTest.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb  3 09:46:51 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  3 Feb 2015 09:46:51 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2545-g98e6914
Message-ID: <20150203144651.9CD61AA4B9@public.kitware.com>

This is an automated email from 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  98e6914a157b219ef6b5b70c3ba699a3402e633f (commit)
       via  aec11372a5868694937b1c232af9d7510ad8497e (commit)
       via  99e3650e66399e75efb989322d4b0146c549dbfa (commit)
       via  1acf36241fee134faed4355be2c9b5afa5500714 (commit)
       via  460f7bcb7d11e905ee025c9d9cc9629d597fa91b (commit)
      from  f0e2fdd201e3b7b466efb0710d0cbad317bbc8bd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98e6914a157b219ef6b5b70c3ba699a3402e633f
commit 98e6914a157b219ef6b5b70c3ba699a3402e633f
Merge: f0e2fdd aec1137
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 09:46:35 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 3 09:46:35 2015 -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 Feb  3 10:01:34 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  3 Feb 2015 10:01:34 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2547-g70fd484
Message-ID: <20150203150134.CB63AAADDE@public.kitware.com>

This is an automated email from 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  70fd484a81d55b9177b48f460f4d37d12089d0b2 (commit)
       via  d7b3f1d19326bb0221562d6b4e1006eb40251650 (commit)
      from  98e6914a157b219ef6b5b70c3ba699a3402e633f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70fd484a81d55b9177b48f460f4d37d12089d0b2
commit 70fd484a81d55b9177b48f460f4d37d12089d0b2
Merge: 98e6914 d7b3f1d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 10:01:34 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 3 10:01:34 2015 -0500

    Merge topic 'CTestCoverageCollectGCOV-refinements' into next
    
    d7b3f1d1 CTestCoverageCollectGCOV: Rename GCOV_{EXTRA_ => }OPTIONS


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7b3f1d19326bb0221562d6b4e1006eb40251650
commit d7b3f1d19326bb0221562d6b4e1006eb40251650
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 09:58:36 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 3 09:58:36 2015 -0500

    CTestCoverageCollectGCOV: Rename GCOV_{EXTRA_ => }OPTIONS

diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index 037d3bc..dd10e83 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -19,7 +19,7 @@
 #     ctest_coverage_collect_gcov(TARBALL <tarfile>
 #       [SOURCE <source_dir>][BUILD <build_dir>]
 #       [GCOV_COMMAND <gcov_command>]
-#       [GCOV_EXTRA_OPTIONS <extra_options>...]
+#       [GCOV_OPTIONS <options>...]
 #       )
 #
 #   Run gcov and package a tar file for CDash.  The options are:
@@ -41,12 +41,10 @@
 #     Specify the full path to the ``gcov`` command on the machine.
 #     Default is the value of :variable:`CTEST_COVERAGE_COMMAND`.
 #
-#   ``GCOV_EXTRA_OPTIONS <extra_options>...``
-#     Specify extra options to be passed to gcov.  By default
-#     gcov is run as ``gcov -b -o <gcov-dir> <file>.gcda``.
-#     If GCOV_EXTRA_OPTIONS is specified, gcov will be run as
-#     ``gcov <extra_options>... -o <gcov-dir> <file>.gcda``.
-
+#   ``GCOV_OPTIONS <options>...``
+#     Specify options to be passed to gcov.  The ``gcov`` command
+#     is run as ``gcov <options>... -o <gcov-dir> <file>.gcda``.
+#     If not specified, the default option is just ``-b``.
 
 #=============================================================================
 # Copyright 2014-2015 Kitware, Inc.
@@ -64,7 +62,7 @@ include(CMakeParseArguments)
 function(ctest_coverage_collect_gcov)
   set(options "")
   set(oneValueArgs TARBALL SOURCE BUILD GCOV_COMMAND)
-  set(multiValueArgs GCOV_EXTRA_OPTIONS)
+  set(multiValueArgs GCOV_OPTIONS)
   cmake_parse_arguments(GCOV  "${options}" "${oneValueArgs}"
     "${multiValueArgs}" "" ${ARGN} )
   if(NOT DEFINED GCOV_TARBALL)
@@ -121,11 +119,11 @@ function(ctest_coverage_collect_gcov)
     get_filename_component(gcov_dir ${gcda_file} DIRECTORY)
     # run gcov, this will produce the .gcov file in the current
     # working directory
-    if(NOT DEFINED GCOV_GCOV_EXTRA_OPTIONS)
-      set(GCOV_GCOV_EXTRA_OPTIONS -b)
+    if(NOT DEFINED GCOV_GCOV_OPTIONS)
+      set(GCOV_GCOV_OPTIONS -b)
     endif()
     execute_process(COMMAND
-      ${gcov_command} ${GCOV_GCOV_EXTRA_OPTIONS} -o ${gcov_dir} ${gcda_file}
+      ${gcov_command} ${GCOV_GCOV_OPTIONS} -o ${gcov_dir} ${gcda_file}
       OUTPUT_VARIABLE out
       RESULT_VARIABLE res
       WORKING_DIRECTORY ${coverage_dir})
diff --git a/Tests/CTestCoverageCollectGCOV/test.cmake.in b/Tests/CTestCoverageCollectGCOV/test.cmake.in
index 2560542..4bdcb10 100644
--- a/Tests/CTestCoverageCollectGCOV/test.cmake.in
+++ b/Tests/CTestCoverageCollectGCOV/test.cmake.in
@@ -19,7 +19,7 @@ ctest_coverage_collect_gcov(
   SOURCE "${CTEST_SOURCE_DIRECTORY}"
   BUILD "${CTEST_BINARY_DIRECTORY}"
   GCOV_COMMAND "${CMAKE_COMMAND}"
-  GCOV_EXTRA_OPTIONS -P "@CMake_SOURCE_DIR@/Tests/CTestCoverageCollectGCOV/fakegcov.cmake")
+  GCOV_OPTIONS -P "@CMake_SOURCE_DIR@/Tests/CTestCoverageCollectGCOV/fakegcov.cmake")
 
 execute_process(COMMAND
       ${CMAKE_COMMAND} -E tar tf ${tar_file}

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

Summary of changes:
 Modules/CTestCoverageCollectGCOV.cmake       |   20 +++++++++-----------
 Tests/CTestCoverageCollectGCOV/test.cmake.in |    2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb  3 10:38:21 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  3 Feb 2015 10:38:21 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2549-g0539d92
Message-ID: <20150203153821.76EB5AAD64@public.kitware.com>

This is an automated email from 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  0539d927c370a25e09b59e8fb90e382cae13a224 (commit)
       via  23fca4c96912b9a4bd012000f2af6851eb0b02a2 (commit)
      from  70fd484a81d55b9177b48f460f4d37d12089d0b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0539d927c370a25e09b59e8fb90e382cae13a224
commit 0539d927c370a25e09b59e8fb90e382cae13a224
Merge: 70fd484 23fca4c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 10:38:20 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 3 10:38:20 2015 -0500

    Merge topic 'CTestCoverageCollectGCOV-refinements' into next
    
    23fca4c9 CTestCoverageCollectGCOV: Fix handling of international characters


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23fca4c96912b9a4bd012000f2af6851eb0b02a2
commit 23fca4c96912b9a4bd012000f2af6851eb0b02a2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 10:36:17 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 3 10:36:17 2015 -0500

    CTestCoverageCollectGCOV: Fix handling of international characters
    
    When loading the list of target support directories, read the file
    with UTF-8 encoding since that is what CMake writes into the file.
    This allows us to support international characters in the path to
    the build tree containing the target support directories.

diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index dd10e83..a607c52 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -90,7 +90,8 @@ function(ctest_coverage_collect_gcov)
   # look for gcda files in the target directories
   # could do a glob from the top of the binary tree but
   # this will be faster and only look where the files will be
-  file(STRINGS "${binary_dir}/CMakeFiles/TargetDirectories.txt" target_dirs)
+  file(STRINGS "${binary_dir}/CMakeFiles/TargetDirectories.txt" target_dirs
+       ENCODING UTF-8)
   foreach(target_dir ${target_dirs})
     file(GLOB_RECURSE gfiles RELATIVE ${binary_dir} "${target_dir}/*.gcda")
     list(LENGTH gfiles len)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb  3 10:41:22 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  3 Feb 2015 10:41:22 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2554-g062cb2f
Message-ID: <20150203154122.4558A25ED@public.kitware.com>

This is an automated email from 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  062cb2f5d0c7ab90f04805207bf4bef6469764d3 (commit)
       via  03c0812c41d4db2a48687ce0c053452906dfe69f (commit)
       via  8caa4e72abe4393914f4dcefd1621d3c86a7d139 (commit)
       via  5c828cc89b4f78eceaf0402719cf5693a6627935 (commit)
       via  30cb628ecb31484015136bf6065c9c40f59a9297 (commit)
      from  0539d927c370a25e09b59e8fb90e382cae13a224 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=062cb2f5d0c7ab90f04805207bf4bef6469764d3
commit 062cb2f5d0c7ab90f04805207bf4bef6469764d3
Merge: 0539d92 03c0812
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 10:41:21 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 3 10:41:21 2015 -0500

    Merge topic 'CTestCoverageCollectGCOV-refinements' into next
    
    03c0812c CTestCoverageCollectGCOV: Fix handling of international characters
    8caa4e72 CTestCoverageCollectGCOV: Add test case
    5c828cc8 CTestCoverageCollectGCOV: Allow custom flags to gcov
    30cb628e CTestCoverageCollectGCOV: Fix handling of large file counts


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03c0812c41d4db2a48687ce0c053452906dfe69f
commit 03c0812c41d4db2a48687ce0c053452906dfe69f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 10:36:17 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 3 10:40:58 2015 -0500

    CTestCoverageCollectGCOV: Fix handling of international characters
    
    When loading the list of target support directories, read the file
    with UTF-8 encoding since that is what CMake writes into the file.
    This allows us to support international characters in the path to
    the build tree containing the target support directories.

diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index dd10e83..a607c52 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -90,7 +90,8 @@ function(ctest_coverage_collect_gcov)
   # look for gcda files in the target directories
   # could do a glob from the top of the binary tree but
   # this will be faster and only look where the files will be
-  file(STRINGS "${binary_dir}/CMakeFiles/TargetDirectories.txt" target_dirs)
+  file(STRINGS "${binary_dir}/CMakeFiles/TargetDirectories.txt" target_dirs
+       ENCODING UTF-8)
   foreach(target_dir ${target_dirs})
     file(GLOB_RECURSE gfiles RELATIVE ${binary_dir} "${target_dir}/*.gcda")
     list(LENGTH gfiles len)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8caa4e72abe4393914f4dcefd1621d3c86a7d139
commit 8caa4e72abe4393914f4dcefd1621d3c86a7d139
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Jan 28 17:08:41 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 3 10:40:58 2015 -0500

    CTestCoverageCollectGCOV: Add test case

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 3aecd9b..1a79854 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2269,6 +2269,18 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     PASS_REGULAR_EXPRESSION "Upload\\.xml")
 
   configure_file(
+    "${CMake_SOURCE_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake.in"
+    "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake"
+    @ONLY ESCAPE_QUOTES)
+  add_test(CTestCoverageCollectGCOV ${CMAKE_CTEST_COMMAND}
+    -S "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake" -VV
+    --output-log "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/testOut.log"
+    )
+  set_tests_properties(CTestCoverageCollectGCOV PROPERTIES
+    PASS_REGULAR_EXPRESSION
+    "PASSED with correct output.*Testing/CoverageInfo/echoargs.gcov")
+
+  configure_file(
     "${CMake_SOURCE_DIR}/Tests/CTestTestEmptyBinaryDirectory/test.cmake.in"
     "${CMake_BINARY_DIR}/Tests/CTestTestEmptyBinaryDirectory/test.cmake"
     @ONLY ESCAPE_QUOTES)
diff --git a/Tests/CTestCoverageCollectGCOV/fakegcov.cmake b/Tests/CTestCoverageCollectGCOV/fakegcov.cmake
new file mode 100644
index 0000000..e704f14
--- /dev/null
+++ b/Tests/CTestCoverageCollectGCOV/fakegcov.cmake
@@ -0,0 +1,8 @@
+foreach(I RANGE 0 ${CMAKE_ARGC})
+  if("${CMAKE_ARGV${I}}" MATCHES ".*\\.gcda")
+    set(gcda_file "${CMAKE_ARGV${I}}")
+  endif()
+endforeach()
+get_filename_component(gcda_file ${gcda_file} NAME_WE)
+file(WRITE "${CMAKE_SOURCE_DIR}/${gcda_file}.gcov"
+"fake gcov file")
diff --git a/Tests/CTestCoverageCollectGCOV/test.cmake.in b/Tests/CTestCoverageCollectGCOV/test.cmake.in
new file mode 100644
index 0000000..4bdcb10
--- /dev/null
+++ b/Tests/CTestCoverageCollectGCOV/test.cmake.in
@@ -0,0 +1,39 @@
+cmake_minimum_required(VERSION 2.8.12)
+set(CTEST_PROJECT_NAME "SmallAndFast")
+set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTest/SmallAndFast")
+set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestCoverageCollectGCOV")
+set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
+ctest_start(Experimental)
+ctest_configure()
+ctest_build()
+ctest_test()
+
+file(WRITE ${CTEST_BINARY_DIRECTORY}/CMakeFiles/echoargs.dir/echoargs.gcda
+"dummy
+")
+
+include(CTestCoverageCollectGCOV)
+set(tar_file ${CTEST_BINARY_DIRECTORY}/gcov.tar)
+ctest_coverage_collect_gcov(
+  TARBALL "${tar_file}"
+  SOURCE "${CTEST_SOURCE_DIRECTORY}"
+  BUILD "${CTEST_BINARY_DIRECTORY}"
+  GCOV_COMMAND "${CMAKE_COMMAND}"
+  GCOV_OPTIONS -P "@CMake_SOURCE_DIR@/Tests/CTestCoverageCollectGCOV/fakegcov.cmake")
+
+execute_process(COMMAND
+      ${CMAKE_COMMAND} -E tar tf ${tar_file}
+      OUTPUT_VARIABLE out
+      WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+
+set(expected_out
+"Testing/CoverageInfo/echoargs.gcov
+Testing/CoverageInfo/data.json
+CMakeFiles/echoargs.dir/Labels.json
+")
+
+if("${out}" STREQUAL "${expected_out}")
+  message("PASSED with correct output: ${out}")
+else()
+  message(FATAL_ERROR "FAILED: expected:\n${expected_out}\nGot:\n${out}")
+endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c828cc89b4f78eceaf0402719cf5693a6627935
commit 5c828cc89b4f78eceaf0402719cf5693a6627935
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Jan 28 17:08:41 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 3 10:40:58 2015 -0500

    CTestCoverageCollectGCOV: Allow custom flags to gcov
    
    Add a GCOV_OPTIONS option to allow specification of custom flags.  In
    ctest_coverage gcov support, if you set CTEST_COVERAGE_EXTRA_FLAGS, they
    get put on the command line before the -o.  In this case we remove the
    -b and replace it with GCOV_OPTIONS.  All other arguments remain the
    same.

diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index f8058cd..dd10e83 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -19,6 +19,7 @@
 #     ctest_coverage_collect_gcov(TARBALL <tarfile>
 #       [SOURCE <source_dir>][BUILD <build_dir>]
 #       [GCOV_COMMAND <gcov_command>]
+#       [GCOV_OPTIONS <options>...]
 #       )
 #
 #   Run gcov and package a tar file for CDash.  The options are:
@@ -39,6 +40,11 @@
 #   ``GCOV_COMMAND <gcov_command>``
 #     Specify the full path to the ``gcov`` command on the machine.
 #     Default is the value of :variable:`CTEST_COVERAGE_COMMAND`.
+#
+#   ``GCOV_OPTIONS <options>...``
+#     Specify options to be passed to gcov.  The ``gcov`` command
+#     is run as ``gcov <options>... -o <gcov-dir> <file>.gcda``.
+#     If not specified, the default option is just ``-b``.
 
 #=============================================================================
 # Copyright 2014-2015 Kitware, Inc.
@@ -56,7 +62,7 @@ include(CMakeParseArguments)
 function(ctest_coverage_collect_gcov)
   set(options "")
   set(oneValueArgs TARBALL SOURCE BUILD GCOV_COMMAND)
-  set(multiValueArgs "")
+  set(multiValueArgs GCOV_OPTIONS)
   cmake_parse_arguments(GCOV  "${options}" "${oneValueArgs}"
     "${multiValueArgs}" "" ${ARGN} )
   if(NOT DEFINED GCOV_TARBALL)
@@ -113,11 +119,18 @@ function(ctest_coverage_collect_gcov)
     get_filename_component(gcov_dir ${gcda_file} DIRECTORY)
     # run gcov, this will produce the .gcov file in the current
     # working directory
+    if(NOT DEFINED GCOV_GCOV_OPTIONS)
+      set(GCOV_GCOV_OPTIONS -b)
+    endif()
     execute_process(COMMAND
-      ${gcov_command} -b -o ${gcov_dir} ${gcda_file}
+      ${gcov_command} ${GCOV_GCOV_OPTIONS} -o ${gcov_dir} ${gcda_file}
       OUTPUT_VARIABLE out
+      RESULT_VARIABLE res
       WORKING_DIRECTORY ${coverage_dir})
   endforeach()
+  if(NOT "${res}" EQUAL 0)
+    message(STATUS "Error running gcov: ${res} ${out}")
+  endif()
   # create json file with project information
   file(WRITE ${coverage_dir}/data.json
     "{

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30cb628ecb31484015136bf6065c9c40f59a9297
commit 30cb628ecb31484015136bf6065c9c40f59a9297
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Jan 28 17:08:41 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 3 10:40:53 2015 -0500

    CTestCoverageCollectGCOV: Fix handling of large file counts
    
    Use the --files-from option to tar to handle lots of files.

diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index f6616e0..f8058cd 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -130,9 +130,16 @@ function(ctest_coverage_collect_gcov)
   # tar up the coverage info with the same date so that the md5
   # sum will be the same for the tar file independent of file time
   # stamps
+  string(REPLACE ";" "\n" gcov_files "${gcov_files}")
+  string(REPLACE ";" "\n" label_files "${label_files}")
+  file(WRITE "${coverage_dir}/coverage_file_list.txt"
+    "${gcov_files}
+${coverage_dir}/data.json
+${label_files}
+")
   execute_process(COMMAND
     ${CMAKE_COMMAND} -E tar cvfj ${GCOV_TARBALL}
-    "--mtime=1970-01-01 0:0:0 UTC" ${gcov_files}
-    ${coverage_dir}/data.json  ${label_files}
+    "--mtime=1970-01-01 0:0:0 UTC"
+    --files-from=${coverage_dir}/coverage_file_list.txt
     WORKING_DIRECTORY ${binary_dir})
 endfunction()

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb  3 13:22:59 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  3 Feb 2015 13:22:59 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2556-g8e80319
Message-ID: <20150203182259.33895A9EA1@public.kitware.com>

This is an automated email from 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  8e8031933929b12fac8b167b542526af045a415a (commit)
       via  dea42d929699ef62c1d6df0eb273beb30c9fbf6e (commit)
      from  062cb2f5d0c7ab90f04805207bf4bef6469764d3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e8031933929b12fac8b167b542526af045a415a
commit 8e8031933929b12fac8b167b542526af045a415a
Merge: 062cb2f dea42d9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 13:22:58 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 3 13:22:58 2015 -0500

    Merge topic 'fix-default-install-config' into next
    
    dea42d92 install: Fix regression in default configuration selection


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dea42d929699ef62c1d6df0eb273beb30c9fbf6e
commit dea42d929699ef62c1d6df0eb273beb30c9fbf6e
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Feb 3 13:01:03 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 3 13:05:47 2015 -0500

    install: Fix regression in default configuration selection
    
    The refactoring in commit v3.1.0-rc1~812^2~16 (stringapi: Pass
    configuration names as strings, 2014-02-09) broke the code path in
    cmLocalGenerator::GenerateInstallRules that intends to pick a default
    install configuration for multi-config generators.  Fix the logic to
    select an empty default configuration only when using a single-config
    generator whose CMAKE_BUILD_TYPE is not set.
    
    Inspired-by: Roman W?ger <roman.wueger at gmx.at>
    Reported-by: NoRulez <norulez at me.com>

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 50e279b..e726ab9 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -390,27 +390,23 @@ void cmLocalGenerator::GenerateInstallRules()
     this->Makefile->GetConfigurations(configurationTypes, false);
 
   // Choose a default install configuration.
-  const char* default_config = config.c_str();
+  std::string default_config = config;
   const char* default_order[] = {"RELEASE", "MINSIZEREL",
                                  "RELWITHDEBINFO", "DEBUG", 0};
-  for(const char** c = default_order; *c && !default_config; ++c)
+  for(const char** c = default_order; *c && default_config.empty(); ++c)
     {
     for(std::vector<std::string>::iterator i = configurationTypes.begin();
         i != configurationTypes.end(); ++i)
       {
       if(cmSystemTools::UpperCase(*i) == *c)
         {
-        default_config = i->c_str();
+        default_config = *i;
         }
       }
     }
-  if(!default_config && !configurationTypes.empty())
+  if(default_config.empty() && !configurationTypes.empty())
     {
-    default_config = configurationTypes[0].c_str();
-    }
-  if(!default_config)
-    {
-    default_config = "Release";
+    default_config = configurationTypes[0];
     }
 
   // Create the install script file.

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

Summary of changes:
 Source/cmLocalGenerator.cxx |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb  3 13:41:32 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  3 Feb 2015 13:41:32 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2558-gff75867
Message-ID: <20150203184132.27C464943@public.kitware.com>

This is an automated email from 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  ff758672b69e0992e4bf7a7c9d031b3ce4bb5d20 (commit)
       via  467f5bcc6ebb8468bb2ef1fc4edaeab9970a37d4 (commit)
      from  8e8031933929b12fac8b167b542526af045a415a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff758672b69e0992e4bf7a7c9d031b3ce4bb5d20
commit ff758672b69e0992e4bf7a7c9d031b3ce4bb5d20
Merge: 8e80319 467f5bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 13:41:31 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 3 13:41:31 2015 -0500

    Merge topic 'fix-msvc-linker-flags-typo' into next
    
    467f5bcc MSVC: Fix initialization of RelWithDebInfo shared library link flags (#15385)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=467f5bcc6ebb8468bb2ef1fc4edaeab9970a37d4
commit 467f5bcc6ebb8468bb2ef1fc4edaeab9970a37d4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 3 13:36:37 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 3 13:41:21 2015 -0500

    MSVC: Fix initialization of RelWithDebInfo shared library link flags (#15385)
    
    Initialize CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT from the value
    of CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT rather than the one for
    the DEBUG configuration.  This typo has been present since the logic was
    first added in  commit 36db45082e (ENH: fix up several problems with new
    stuff, 2002-11-11).
    
    Reported-by: Gunnar Roth <gunnar.roth at gmx.de>

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index a72f946..2440f89 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -235,7 +235,7 @@ set(CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT "/INCREMENTAL:NO")
 # shared linker flags
 set (CMAKE_SHARED_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT})
 set (CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT})
-set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT})
+set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT})
 set (CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT ${CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT})
 set (CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL_INIT ${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT})
 # module linker flags
diff --git a/Modules/Platform/Windows-df.cmake b/Modules/Platform/Windows-df.cmake
index 211cc9d..59d88a3 100644
--- a/Modules/Platform/Windows-df.cmake
+++ b/Modules/Platform/Windows-df.cmake
@@ -62,7 +62,7 @@ endif ()
 
 set (CMAKE_SHARED_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT})
 set (CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT})
-set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT})
+set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT})
 set (CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_SHARED_LINKER_FLAGS_INIT})
 set (CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT ${CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT})
 set (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT})

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

Summary of changes:
 Modules/Platform/Windows-MSVC.cmake |    2 +-
 Modules/Platform/Windows-df.cmake   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Feb  3 16:32:55 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue,  3 Feb 2015 16:32:55 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2560-gdc5bd78
Message-ID: <20150203213255.2E454AAC95@public.kitware.com>

This is an automated email from 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  dc5bd78ae99b4851dbc505ec5a47622c7045ff9e (commit)
       via  584ba3fe68d49dcb7d0d4d5d826f883548a24e5d (commit)
      from  ff758672b69e0992e4bf7a7c9d031b3ce4bb5d20 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc5bd78ae99b4851dbc505ec5a47622c7045ff9e
commit dc5bd78ae99b4851dbc505ec5a47622c7045ff9e
Merge: ff75867 584ba3f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 3 16:32:54 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 3 16:32:54 2015 -0500

    Merge topic 'fix-C-standard-features' into next
    
    584ba3fe Features: Fix C90 feature detection.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=584ba3fe68d49dcb7d0d4d5d826f883548a24e5d
commit 584ba3fe68d49dcb7d0d4d5d826f883548a24e5d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 3 21:47:45 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 3 22:05:27 2015 +0100

    Features: Fix C90 feature detection.
    
    This bug caused c_function_prototypes to not be recorded at configure
    time when compiling with -std=gnu99 or similar. In the case of feature
    recording, that was not a problem, because the logic in
    CMakeDetermineCompileFeatures.cmake currently assumes that a feature
    present for an earlier standard is present for a later standard.
    
    However, the detection strings are also used in WriteCompilerDetectionHeader,
    so the feature macro has been defined to '0' when using a later language
    dialect.
    
    Fix that by not checking the existence of the __STDC_VERSION__ macro at
    all when detecting C90 features.

diff --git a/Modules/Compiler/AppleClang-C-FeatureTests.cmake b/Modules/Compiler/AppleClang-C-FeatureTests.cmake
index 6f3d6a7..e80b526 100644
--- a/Modules/Compiler/AppleClang-C-FeatureTests.cmake
+++ b/Modules/Compiler/AppleClang-C-FeatureTests.cmake
@@ -7,5 +7,5 @@ set(AppleClang_C99 "${_cmake_oldestSupported} && defined(__STDC_VERSION__) && __
 set(_cmake_feature_test_c_restrict "${AppleClang_C99}")
 set(_cmake_feature_test_c_variadic_macros "${AppleClang_C99}")
 
-set(AppleClang_C90 "${_cmake_oldestSupported} && !defined(__STDC_VERSION__)")
+set(AppleClang_C90 "${_cmake_oldestSupported}")
 set(_cmake_feature_test_c_function_prototypes "${AppleClang_C90}")
diff --git a/Modules/Compiler/Clang-C-FeatureTests.cmake b/Modules/Compiler/Clang-C-FeatureTests.cmake
index 2d8673d..99c2252 100644
--- a/Modules/Compiler/Clang-C-FeatureTests.cmake
+++ b/Modules/Compiler/Clang-C-FeatureTests.cmake
@@ -7,5 +7,5 @@ set(Clang_C99 "${_cmake_oldestSupported} && defined(__STDC_VERSION__) && __STDC_
 set(_cmake_feature_test_c_restrict "${Clang_C99}")
 set(_cmake_feature_test_c_variadic_macros "${Clang_C99}")
 
-set(Clang_C90 "${_cmake_oldestSupported} && !defined(__STDC_VERSION__)")
+set(Clang_C90 "${_cmake_oldestSupported}")
 set(_cmake_feature_test_c_function_prototypes "${Clang_C90}")
diff --git a/Modules/Compiler/GNU-C-FeatureTests.cmake b/Modules/Compiler/GNU-C-FeatureTests.cmake
index d8e456c..b3fe33f 100644
--- a/Modules/Compiler/GNU-C-FeatureTests.cmake
+++ b/Modules/Compiler/GNU-C-FeatureTests.cmake
@@ -13,5 +13,5 @@ set(GNU44_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404 && defined(__STDC_VERSIO
 set(_cmake_feature_test_c_restrict "${GNU44_C99}")
 set(_cmake_feature_test_c_variadic_macros "${GNU44_C99}")
 
-set(GNU_C90 "${_cmake_oldestSupported} && !defined(__STDC_VERSION__)")
+set(GNU_C90 "${_cmake_oldestSupported}")
 set(_cmake_feature_test_c_function_prototypes "${GNU_C90}")
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 38c44c8..3ba1e0a 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -164,6 +164,38 @@ if (CMAKE_C_COMPILE_FEATURES)
       )
     endif()
   endif()
+
+  add_executable(CompileFeaturesGenex_C genex_test.c)
+  set_property(TARGET CompileFeaturesGenex_C PROPERTY C_STANDARD 11)
+
+  if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6)
+      list(APPEND expected_defs
+        EXPECT_C_STATIC_ASSERT=1
+      )
+    else()
+      list(APPEND expected_defs
+        EXPECT_C_STATIC_ASSERT=0
+      )
+    endif()
+  elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang"
+      OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
+    list(APPEND expected_defs
+      EXPECT_C_STATIC_ASSERT=1
+    )
+  endif()
+
+  list(APPEND expected_defs
+    EXPECT_C_FUNCTION_PROTOTYPES=1
+    EXPECT_C_RESTRICT=1
+  )
+
+  target_compile_definitions(CompileFeaturesGenex_C PRIVATE
+    HAVE_C_FUNCTION_PROTOTYPES=$<COMPILE_FEATURES:c_function_prototypes>
+    HAVE_C_RESTRICT=$<COMPILE_FEATURES:c_restrict>
+    HAVE_C_STATIC_ASSERT=$<COMPILE_FEATURES:c_static_assert>
+    ${expected_defs}
+  )
 endif()
 
 if (CMAKE_CXX_COMPILE_FEATURES)
diff --git a/Tests/CompileFeatures/genex_test.c b/Tests/CompileFeatures/genex_test.c
new file mode 100644
index 0000000..b1215bd
--- /dev/null
+++ b/Tests/CompileFeatures/genex_test.c
@@ -0,0 +1,38 @@
+#ifndef EXPECT_C_STATIC_ASSERT
+# error EXPECT_C_STATIC_ASSERT not defined
+#endif
+#ifndef EXPECT_C_FUNCTION_PROTOTYPES
+# error EXPECT_C_FUNCTION_PROTOTYPES not defined
+#endif
+#ifndef EXPECT_C_RESTRICT
+# error EXPECT_C_RESTRICT not defined
+#endif
+
+#if !EXPECT_C_STATIC_ASSERT
+#if EXPECT_C_STATIC_ASSERT
+#error "Expect c_static_assert feature"
+#endif
+#else
+#if !EXPECT_C_STATIC_ASSERT
+#error "Expect no c_static_assert feature"
+#endif
+#endif
+
+#if !EXPECT_C_FUNCTION_PROTOTYPES
+#  error Expect c_function_prototypes support
+#endif
+
+#if !EXPECT_C_RESTRICT
+#  if EXPECT_C_RESTRICT
+#    error Expect c_restrict support
+#  endif
+#else
+#  if !EXPECT_C_RESTRICT
+#    error Expect no c_restrict support
+#  endif
+#endif
+
+int main()
+{
+
+}
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index e70a977..d431c0e 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -90,6 +90,15 @@ add_executable(WriteCompilerDetectionHeader main.cpp)
 set_property(TARGET WriteCompilerDetectionHeader PROPERTY CXX_STANDARD 98)
 set_defines(WriteCompilerDetectionHeader "${true_defs}" "${false_defs}")
 
+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)
+
 write_compiler_detection_header(
   FILE "${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files/multi_file_compiler_detection.h"
   PREFIX MULTI
@@ -130,3 +139,12 @@ add_executable(multi_files_11 multi_files.cpp)
 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}")
+
+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)
diff --git a/Tests/Module/WriteCompilerDetectionHeader/main.c b/Tests/Module/WriteCompilerDetectionHeader/main.c
new file mode 100644
index 0000000..9023b0f
--- /dev/null
+++ b/Tests/Module/WriteCompilerDetectionHeader/main.c
@@ -0,0 +1,29 @@
+
+#include "test_compiler_detection.h"
+
+#if !defined(TEST_COMPILER_C_FUNCTION_PROTOTYPES) || !TEST_COMPILER_C_FUNCTION_PROTOTYPES
+#  error Expected TEST_COMPILER_C_FUNCTION_PROTOTYPES
+#endif
+
+#if !EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
+#  error Expected EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
+#endif
+
+#if !defined(TEST_COMPILER_C_RESTRICT) || !TEST_COMPILER_C_RESTRICT
+#  if EXPECTED_COMPILER_C_RESTRICT
+#    error Expected TEST_COMPILER_C_RESTRICT
+#  endif
+#else
+#  if !EXPECTED_COMPILER_C_RESTRICT
+#    error Expect no TEST_COMPILER_C_RESTRICT
+#  endif
+#endif
+
+#ifdef TEST_COMPILER_CXX_STATIC_ASSERT
+#error Expect no CXX features defined
+#endif
+
+int main()
+{
+  return 0;
+}
diff --git a/Tests/Module/WriteCompilerDetectionHeader/main_multi.c b/Tests/Module/WriteCompilerDetectionHeader/main_multi.c
new file mode 100644
index 0000000..6f4573f
--- /dev/null
+++ b/Tests/Module/WriteCompilerDetectionHeader/main_multi.c
@@ -0,0 +1,29 @@
+
+#include "multi_file_compiler_detection.h"
+
+#if !defined(MULTI_COMPILER_C_FUNCTION_PROTOTYPES) || !MULTI_COMPILER_C_FUNCTION_PROTOTYPES
+#  error Expected MULTI_COMPILER_C_FUNCTION_PROTOTYPES
+#endif
+
+#if !EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
+#  error Expected EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
+#endif
+
+#if !defined(MULTI_COMPILER_C_RESTRICT) || !MULTI_COMPILER_C_RESTRICT
+#  if EXPECTED_COMPILER_C_RESTRICT
+#    error Expected MULTI_COMPILER_C_RESTRICT
+#  endif
+#else
+#  if !EXPECTED_COMPILER_C_RESTRICT
+#    error Expect no MULTI_COMPILER_C_RESTRICT
+#  endif
+#endif
+
+#ifdef MULTI_COMPILER_CXX_STATIC_ASSERT
+#error Expect no CXX features defined
+#endif
+
+int main()
+{
+  return 0;
+}

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

Summary of changes:
 Modules/Compiler/AppleClang-C-FeatureTests.cmake   |    2 +-
 Modules/Compiler/Clang-C-FeatureTests.cmake        |    2 +-
 Modules/Compiler/GNU-C-FeatureTests.cmake          |    2 +-
 Tests/CompileFeatures/CMakeLists.txt               |   32 +++++++++++++++++
 Tests/CompileFeatures/genex_test.c                 |   38 ++++++++++++++++++++
 .../WriteCompilerDetectionHeader/CMakeLists.txt    |   18 ++++++++++
 Tests/Module/WriteCompilerDetectionHeader/main.c   |   29 +++++++++++++++
 .../WriteCompilerDetectionHeader/main_multi.c      |   29 +++++++++++++++
 8 files changed, 149 insertions(+), 3 deletions(-)
 create mode 100644 Tests/CompileFeatures/genex_test.c
 create mode 100644 Tests/Module/WriteCompilerDetectionHeader/main.c
 create mode 100644 Tests/Module/WriteCompilerDetectionHeader/main_multi.c


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Feb  3 16:56:03 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue,  3 Feb 2015 16:56:03 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2562-g9fad1bd
Message-ID: <20150203215603.8C7F5AA9BB@public.kitware.com>

This is an automated email from 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  9fad1bd5aef1d7c46dff587febd66808781e88ad (commit)
       via  2fed8e173cbd8c897b0cf2fd46ec72fedc3c43ed (commit)
      from  dc5bd78ae99b4851dbc505ec5a47622c7045ff9e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fad1bd5aef1d7c46dff587febd66808781e88ad
commit 9fad1bd5aef1d7c46dff587febd66808781e88ad
Merge: dc5bd78 2fed8e1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 3 16:56:02 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 3 16:56:02 2015 -0500

    Merge topic 'Qt-AUTOUIC-file-origin' into next
    
    2fed8e17 QtAutogen: Issue error message with origin file (#15342).


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2fed8e173cbd8c897b0cf2fd46ec72fedc3c43ed
commit 2fed8e173cbd8c897b0cf2fd46ec72fedc3c43ed
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 3 22:52:17 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 3 22:52:17 2015 +0100

    QtAutogen: Issue error message with origin file (#15342).

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index bf79066..e18e757 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -2243,7 +2243,8 @@ bool cmQtAutoGenerators::GenerateUi(const std::string& realName,
     if (!result || retVal)
       {
       std::cerr << "AUTOUIC: error: process for " << ui_output_file <<
-                " failed:\n" << output << std::endl;
+                " needed by\n \"" << realName << "\"\nfailed:\n" << output
+                << std::endl;
       this->RunUicFailed = true;
       cmSystemTools::RemoveFile(ui_output_file);
       return false;

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

Summary of changes:
 Source/cmQtAutoGenerators.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Feb  3 17:50:08 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue,  3 Feb 2015 17:50:08 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2564-gb7225dd
Message-ID: <20150203225008.26E0EA7B18@public.kitware.com>

This is an automated email from 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  b7225ddb44bf375df320a3c9096ab8dac965c3a8 (commit)
       via  117176317359cbdaa09afad7168f1d6c923c56b5 (commit)
      from  9fad1bd5aef1d7c46dff587febd66808781e88ad (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7225ddb44bf375df320a3c9096ab8dac965c3a8
commit b7225ddb44bf375df320a3c9096ab8dac965c3a8
Merge: 9fad1bd 1171763
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 3 17:50:07 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 3 17:50:07 2015 -0500

    Merge topic 'fix-C-standard-features' into next
    
    11717631 avoid-MSVC


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=117176317359cbdaa09afad7168f1d6c923c56b5
commit 117176317359cbdaa09afad7168f1d6c923c56b5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 3 23:49:40 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 3 23:49:40 2015 +0100

    avoid-MSVC

diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index d431c0e..c538280 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -84,21 +84,21 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
   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}")
 
-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)
-
 write_compiler_detection_header(
   FILE "${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files/multi_file_compiler_detection.h"
   PREFIX MULTI
@@ -140,11 +140,15 @@ 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}")
 
-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)
+if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
+    OR CMAKE_C_COMPILER_ID STREQUAL "Clang"
+    OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
+  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()

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

Summary of changes:
 .../WriteCompilerDetectionHeader/CMakeLists.txt    |   38 +++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Feb  3 17:50:29 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue,  3 Feb 2015 17:50:29 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2566-g8beff48
Message-ID: <20150203225029.5300CA7CCD@public.kitware.com>

This is an automated email from 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  8beff487b2f22cb03b78fcc1f6375a63ce04420e (commit)
       via  5c23ef334f3c5132f24d96dee23bf1a8430951f3 (commit)
      from  b7225ddb44bf375df320a3c9096ab8dac965c3a8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8beff487b2f22cb03b78fcc1f6375a63ce04420e
commit 8beff487b2f22cb03b78fcc1f6375a63ce04420e
Merge: b7225dd 5c23ef3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 3 17:50:28 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 3 17:50:28 2015 -0500

    Merge topic 'fix-C-standard-features' into next
    
    5c23ef33 Features: Fix C90 feature detection.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c23ef334f3c5132f24d96dee23bf1a8430951f3
commit 5c23ef334f3c5132f24d96dee23bf1a8430951f3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 3 21:47:45 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 3 23:50:13 2015 +0100

    Features: Fix C90 feature detection.
    
    This bug caused c_function_prototypes to not be recorded at configure
    time when compiling with -std=gnu99 or similar. In the case of feature
    recording, that was not a problem, because the logic in
    CMakeDetermineCompileFeatures.cmake currently assumes that a feature
    present for an earlier standard is present for a later standard.
    
    However, the detection strings are also used in WriteCompilerDetectionHeader,
    so the feature macro has been defined to '0' when using a later language
    dialect.
    
    Fix that by not checking the existence of the __STDC_VERSION__ macro at
    all when detecting C90 features.

diff --git a/Modules/Compiler/AppleClang-C-FeatureTests.cmake b/Modules/Compiler/AppleClang-C-FeatureTests.cmake
index 6f3d6a7..e80b526 100644
--- a/Modules/Compiler/AppleClang-C-FeatureTests.cmake
+++ b/Modules/Compiler/AppleClang-C-FeatureTests.cmake
@@ -7,5 +7,5 @@ set(AppleClang_C99 "${_cmake_oldestSupported} && defined(__STDC_VERSION__) && __
 set(_cmake_feature_test_c_restrict "${AppleClang_C99}")
 set(_cmake_feature_test_c_variadic_macros "${AppleClang_C99}")
 
-set(AppleClang_C90 "${_cmake_oldestSupported} && !defined(__STDC_VERSION__)")
+set(AppleClang_C90 "${_cmake_oldestSupported}")
 set(_cmake_feature_test_c_function_prototypes "${AppleClang_C90}")
diff --git a/Modules/Compiler/Clang-C-FeatureTests.cmake b/Modules/Compiler/Clang-C-FeatureTests.cmake
index 2d8673d..99c2252 100644
--- a/Modules/Compiler/Clang-C-FeatureTests.cmake
+++ b/Modules/Compiler/Clang-C-FeatureTests.cmake
@@ -7,5 +7,5 @@ set(Clang_C99 "${_cmake_oldestSupported} && defined(__STDC_VERSION__) && __STDC_
 set(_cmake_feature_test_c_restrict "${Clang_C99}")
 set(_cmake_feature_test_c_variadic_macros "${Clang_C99}")
 
-set(Clang_C90 "${_cmake_oldestSupported} && !defined(__STDC_VERSION__)")
+set(Clang_C90 "${_cmake_oldestSupported}")
 set(_cmake_feature_test_c_function_prototypes "${Clang_C90}")
diff --git a/Modules/Compiler/GNU-C-FeatureTests.cmake b/Modules/Compiler/GNU-C-FeatureTests.cmake
index d8e456c..b3fe33f 100644
--- a/Modules/Compiler/GNU-C-FeatureTests.cmake
+++ b/Modules/Compiler/GNU-C-FeatureTests.cmake
@@ -13,5 +13,5 @@ set(GNU44_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404 && defined(__STDC_VERSIO
 set(_cmake_feature_test_c_restrict "${GNU44_C99}")
 set(_cmake_feature_test_c_variadic_macros "${GNU44_C99}")
 
-set(GNU_C90 "${_cmake_oldestSupported} && !defined(__STDC_VERSION__)")
+set(GNU_C90 "${_cmake_oldestSupported}")
 set(_cmake_feature_test_c_function_prototypes "${GNU_C90}")
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 38c44c8..3ba1e0a 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -164,6 +164,38 @@ if (CMAKE_C_COMPILE_FEATURES)
       )
     endif()
   endif()
+
+  add_executable(CompileFeaturesGenex_C genex_test.c)
+  set_property(TARGET CompileFeaturesGenex_C PROPERTY C_STANDARD 11)
+
+  if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6)
+      list(APPEND expected_defs
+        EXPECT_C_STATIC_ASSERT=1
+      )
+    else()
+      list(APPEND expected_defs
+        EXPECT_C_STATIC_ASSERT=0
+      )
+    endif()
+  elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang"
+      OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
+    list(APPEND expected_defs
+      EXPECT_C_STATIC_ASSERT=1
+    )
+  endif()
+
+  list(APPEND expected_defs
+    EXPECT_C_FUNCTION_PROTOTYPES=1
+    EXPECT_C_RESTRICT=1
+  )
+
+  target_compile_definitions(CompileFeaturesGenex_C PRIVATE
+    HAVE_C_FUNCTION_PROTOTYPES=$<COMPILE_FEATURES:c_function_prototypes>
+    HAVE_C_RESTRICT=$<COMPILE_FEATURES:c_restrict>
+    HAVE_C_STATIC_ASSERT=$<COMPILE_FEATURES:c_static_assert>
+    ${expected_defs}
+  )
 endif()
 
 if (CMAKE_CXX_COMPILE_FEATURES)
diff --git a/Tests/CompileFeatures/genex_test.c b/Tests/CompileFeatures/genex_test.c
new file mode 100644
index 0000000..b1215bd
--- /dev/null
+++ b/Tests/CompileFeatures/genex_test.c
@@ -0,0 +1,38 @@
+#ifndef EXPECT_C_STATIC_ASSERT
+# error EXPECT_C_STATIC_ASSERT not defined
+#endif
+#ifndef EXPECT_C_FUNCTION_PROTOTYPES
+# error EXPECT_C_FUNCTION_PROTOTYPES not defined
+#endif
+#ifndef EXPECT_C_RESTRICT
+# error EXPECT_C_RESTRICT not defined
+#endif
+
+#if !EXPECT_C_STATIC_ASSERT
+#if EXPECT_C_STATIC_ASSERT
+#error "Expect c_static_assert feature"
+#endif
+#else
+#if !EXPECT_C_STATIC_ASSERT
+#error "Expect no c_static_assert feature"
+#endif
+#endif
+
+#if !EXPECT_C_FUNCTION_PROTOTYPES
+#  error Expect c_function_prototypes support
+#endif
+
+#if !EXPECT_C_RESTRICT
+#  if EXPECT_C_RESTRICT
+#    error Expect c_restrict support
+#  endif
+#else
+#  if !EXPECT_C_RESTRICT
+#    error Expect no c_restrict support
+#  endif
+#endif
+
+int main()
+{
+
+}
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index e70a977..c538280 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -84,6 +84,15 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
   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)
@@ -130,3 +139,16 @@ add_executable(multi_files_11 multi_files.cpp)
 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")
+  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()
diff --git a/Tests/Module/WriteCompilerDetectionHeader/main.c b/Tests/Module/WriteCompilerDetectionHeader/main.c
new file mode 100644
index 0000000..9023b0f
--- /dev/null
+++ b/Tests/Module/WriteCompilerDetectionHeader/main.c
@@ -0,0 +1,29 @@
+
+#include "test_compiler_detection.h"
+
+#if !defined(TEST_COMPILER_C_FUNCTION_PROTOTYPES) || !TEST_COMPILER_C_FUNCTION_PROTOTYPES
+#  error Expected TEST_COMPILER_C_FUNCTION_PROTOTYPES
+#endif
+
+#if !EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
+#  error Expected EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
+#endif
+
+#if !defined(TEST_COMPILER_C_RESTRICT) || !TEST_COMPILER_C_RESTRICT
+#  if EXPECTED_COMPILER_C_RESTRICT
+#    error Expected TEST_COMPILER_C_RESTRICT
+#  endif
+#else
+#  if !EXPECTED_COMPILER_C_RESTRICT
+#    error Expect no TEST_COMPILER_C_RESTRICT
+#  endif
+#endif
+
+#ifdef TEST_COMPILER_CXX_STATIC_ASSERT
+#error Expect no CXX features defined
+#endif
+
+int main()
+{
+  return 0;
+}
diff --git a/Tests/Module/WriteCompilerDetectionHeader/main_multi.c b/Tests/Module/WriteCompilerDetectionHeader/main_multi.c
new file mode 100644
index 0000000..6f4573f
--- /dev/null
+++ b/Tests/Module/WriteCompilerDetectionHeader/main_multi.c
@@ -0,0 +1,29 @@
+
+#include "multi_file_compiler_detection.h"
+
+#if !defined(MULTI_COMPILER_C_FUNCTION_PROTOTYPES) || !MULTI_COMPILER_C_FUNCTION_PROTOTYPES
+#  error Expected MULTI_COMPILER_C_FUNCTION_PROTOTYPES
+#endif
+
+#if !EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
+#  error Expected EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
+#endif
+
+#if !defined(MULTI_COMPILER_C_RESTRICT) || !MULTI_COMPILER_C_RESTRICT
+#  if EXPECTED_COMPILER_C_RESTRICT
+#    error Expected MULTI_COMPILER_C_RESTRICT
+#  endif
+#else
+#  if !EXPECTED_COMPILER_C_RESTRICT
+#    error Expect no MULTI_COMPILER_C_RESTRICT
+#  endif
+#endif
+
+#ifdef MULTI_COMPILER_CXX_STATIC_ASSERT
+#error Expect no CXX features defined
+#endif
+
+int main()
+{
+  return 0;
+}

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

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Wed Feb  4 00:01:11 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Wed,  4 Feb 2015 00:01:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.1-994-g5f37785
Message-ID: <20150204050111.A666EAAA57@public.kitware.com>

This is an automated email from 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  5f3778571770ccbceca22aa18ad06f1779a3ca5a (commit)
      from  aec11372a5868694937b1c232af9d7510ad8497e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f3778571770ccbceca22aa18ad06f1779a3ca5a
commit 5f3778571770ccbceca22aa18ad06f1779a3ca5a
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Wed Feb 4 00:01:09 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Feb 4 00:01:09 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index dacbd20..8722425 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 1)
-set(CMake_VERSION_PATCH 20150203)
+set(CMake_VERSION_PATCH 20150204)
 #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 Feb  4 12:22:15 2015
From: brad.king at kitware.com (Brad King)
Date: Wed,  4 Feb 2015 12:22:15 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2568-ga6db7d2
Message-ID: <20150204172215.506EAAA08A@public.kitware.com>

This is an automated email from 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  a6db7d2d48faf5a7455b2cca6e310e24fed6e85a (commit)
       via  809a5a5e2391484966614f11100de956619adda6 (commit)
      from  8beff487b2f22cb03b78fcc1f6375a63ce04420e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6db7d2d48faf5a7455b2cca6e310e24fed6e85a
commit a6db7d2d48faf5a7455b2cca6e310e24fed6e85a
Merge: 8beff48 809a5a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 12:22:14 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 12:22:14 2015 -0500

    Merge topic 'CTestCoverageCollectGCOV-refinements' into next
    
    809a5a5e Help: Add notes for topic 'CTestCoverageCollectGCOV-refinements'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=809a5a5e2391484966614f11100de956619adda6
commit 809a5a5e2391484966614f11100de956619adda6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 12:21:52 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 12:21:52 2015 -0500

    Help: Add notes for topic 'CTestCoverageCollectGCOV-refinements'

diff --git a/Help/release/dev/CTestCoverageCollectGCOV-refinements.rst b/Help/release/dev/CTestCoverageCollectGCOV-refinements.rst
new file mode 100644
index 0000000..afa0a52
--- /dev/null
+++ b/Help/release/dev/CTestCoverageCollectGCOV-refinements.rst
@@ -0,0 +1,6 @@
+CTestCoverageCollectGCOV-refinements
+------------------------------------
+
+* The :module:`CTestCoverageCollectGCOV` module was introduced as an
+  alternative to the :command:`ctest_coverage` command for collecting
+  ``gcov`` results for submission to CDash.

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

Summary of changes:
 Help/release/dev/CTestCoverageCollectGCOV-refinements.rst |    6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 Help/release/dev/CTestCoverageCollectGCOV-refinements.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb  4 12:30:11 2015
From: brad.king at kitware.com (Brad King)
Date: Wed,  4 Feb 2015 12:30:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.1-1000-g8f82004
Message-ID: <20150204173011.A4D45AA960@public.kitware.com>

This is an automated email from 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  8f820043684fa8a11289061297828bccce7ba080 (commit)
       via  809a5a5e2391484966614f11100de956619adda6 (commit)
       via  03c0812c41d4db2a48687ce0c053452906dfe69f (commit)
       via  8caa4e72abe4393914f4dcefd1621d3c86a7d139 (commit)
       via  5c828cc89b4f78eceaf0402719cf5693a6627935 (commit)
       via  30cb628ecb31484015136bf6065c9c40f59a9297 (commit)
      from  5f3778571770ccbceca22aa18ad06f1779a3ca5a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f820043684fa8a11289061297828bccce7ba080
commit 8f820043684fa8a11289061297828bccce7ba080
Merge: 5f37785 809a5a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 12:30:10 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 12:30:10 2015 -0500

    Merge topic 'CTestCoverageCollectGCOV-refinements'
    
    809a5a5e Help: Add notes for topic 'CTestCoverageCollectGCOV-refinements'
    03c0812c CTestCoverageCollectGCOV: Fix handling of international characters
    8caa4e72 CTestCoverageCollectGCOV: Add test case
    5c828cc8 CTestCoverageCollectGCOV: Allow custom flags to gcov
    30cb628e CTestCoverageCollectGCOV: Fix handling of large file counts


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

Summary of changes:
 .../dev/CTestCoverageCollectGCOV-refinements.rst   |    6 +++
 Modules/CTestCoverageCollectGCOV.cmake             |   31 +++++++++++++---
 Tests/CMakeLists.txt                               |   12 ++++++
 Tests/CTestCoverageCollectGCOV/fakegcov.cmake      |    8 ++++
 Tests/CTestCoverageCollectGCOV/test.cmake.in       |   39 ++++++++++++++++++++
 5 files changed, 91 insertions(+), 5 deletions(-)
 create mode 100644 Help/release/dev/CTestCoverageCollectGCOV-refinements.rst
 create mode 100644 Tests/CTestCoverageCollectGCOV/fakegcov.cmake
 create mode 100644 Tests/CTestCoverageCollectGCOV/test.cmake.in


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb  4 12:30:13 2015
From: brad.king at kitware.com (Brad King)
Date: Wed,  4 Feb 2015 12:30:13 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.1-1002-gbe072d3
Message-ID: <20150204173013.7AD01AA964@public.kitware.com>

This is an automated email from 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  be072d3fe1872651ce03ad8258bef23e1e3f795c (commit)
       via  2fed8e173cbd8c897b0cf2fd46ec72fedc3c43ed (commit)
      from  8f820043684fa8a11289061297828bccce7ba080 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be072d3fe1872651ce03ad8258bef23e1e3f795c
commit be072d3fe1872651ce03ad8258bef23e1e3f795c
Merge: 8f82004 2fed8e1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 12:30:12 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 12:30:12 2015 -0500

    Merge topic 'Qt-AUTOUIC-file-origin'
    
    2fed8e17 QtAutogen: Issue error message with origin file (#15342).


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

Summary of changes:
 Source/cmQtAutoGenerators.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb  4 12:30:15 2015
From: brad.king at kitware.com (Brad King)
Date: Wed,  4 Feb 2015 12:30:15 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.1-1004-gff90f49
Message-ID: <20150204173015.DD0E9AA968@public.kitware.com>

This is an automated email from 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  ff90f49d188b4e700abe31afe66c31f38e315648 (commit)
       via  467f5bcc6ebb8468bb2ef1fc4edaeab9970a37d4 (commit)
      from  be072d3fe1872651ce03ad8258bef23e1e3f795c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff90f49d188b4e700abe31afe66c31f38e315648
commit ff90f49d188b4e700abe31afe66c31f38e315648
Merge: be072d3 467f5bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 12:30:14 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 12:30:14 2015 -0500

    Merge topic 'fix-msvc-linker-flags-typo'
    
    467f5bcc MSVC: Fix initialization of RelWithDebInfo shared library link flags (#15385)


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

Summary of changes:
 Modules/Platform/Windows-MSVC.cmake |    2 +-
 Modules/Platform/Windows-df.cmake   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb  4 12:30:18 2015
From: brad.king at kitware.com (Brad King)
Date: Wed,  4 Feb 2015 12:30:18 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.1-1006-gf560fdd
Message-ID: <20150204173018.1BF94AA97F@public.kitware.com>

This is an automated email from 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  f560fdddd19200f994fb98ba5576bed34938a7a3 (commit)
       via  dea42d929699ef62c1d6df0eb273beb30c9fbf6e (commit)
      from  ff90f49d188b4e700abe31afe66c31f38e315648 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f560fdddd19200f994fb98ba5576bed34938a7a3
commit f560fdddd19200f994fb98ba5576bed34938a7a3
Merge: ff90f49 dea42d9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 12:30:17 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 12:30:17 2015 -0500

    Merge topic 'fix-default-install-config'
    
    dea42d92 install: Fix regression in default configuration selection


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

Summary of changes:
 Source/cmLocalGenerator.cxx |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb  4 12:30:33 2015
From: brad.king at kitware.com (Brad King)
Date: Wed,  4 Feb 2015 12:30:33 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2574-g1c5fef6
Message-ID: <20150204173033.0D4E8AA986@public.kitware.com>

This is an automated email from 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  1c5fef6fdc772db6d0f603da9eb44831103aa27f (commit)
       via  f560fdddd19200f994fb98ba5576bed34938a7a3 (commit)
       via  ff90f49d188b4e700abe31afe66c31f38e315648 (commit)
       via  be072d3fe1872651ce03ad8258bef23e1e3f795c (commit)
       via  8f820043684fa8a11289061297828bccce7ba080 (commit)
       via  5f3778571770ccbceca22aa18ad06f1779a3ca5a (commit)
      from  a6db7d2d48faf5a7455b2cca6e310e24fed6e85a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c5fef6fdc772db6d0f603da9eb44831103aa27f
commit 1c5fef6fdc772db6d0f603da9eb44831103aa27f
Merge: a6db7d2 f560fdd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 12:30:24 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 12:30:24 2015 -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 Feb  4 12:31:20 2015
From: brad.king at kitware.com (Brad King)
Date: Wed,  4 Feb 2015 12:31:20 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.1-1009-geef9a47
Message-ID: <20150204173120.98C38AA9C3@public.kitware.com>

This is an automated email from 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  eef9a476179dd91c69d30f937e742ea484436fc6 (commit)
       via  e6afd9500d0d00855ef0144a1e7c913a8bf4927d (commit)
       via  fdb0799d7568efbae2b01ede62e6cec30a0798ce (commit)
      from  f560fdddd19200f994fb98ba5576bed34938a7a3 (commit)

Those revisions listed 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 Feb  4 12:31:20 2015
From: brad.king at kitware.com (Brad King)
Date: Wed,  4 Feb 2015 12:31:20 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2578-g294d9ad
Message-ID: <20150204173120.BD0B4AA9C5@public.kitware.com>

This is an automated email from 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  294d9ad1248020d3ea8e9c5a04dfd7fb6d89bdcb (commit)
       via  eef9a476179dd91c69d30f937e742ea484436fc6 (commit)
       via  e6afd9500d0d00855ef0144a1e7c913a8bf4927d (commit)
       via  fdb0799d7568efbae2b01ede62e6cec30a0798ce (commit)
      from  1c5fef6fdc772db6d0f603da9eb44831103aa27f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=294d9ad1248020d3ea8e9c5a04dfd7fb6d89bdcb
commit 294d9ad1248020d3ea8e9c5a04dfd7fb6d89bdcb
Merge: 1c5fef6 eef9a47
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 12:31:09 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 12:31:09 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb  4 12:31:20 2015
From: brad.king at kitware.com (Brad King)
Date: Wed,  4 Feb 2015 12:31:20 -0500 (EST)
Subject: [Cmake-commits] CMake branch, release, updated. v3.1.1-18-ge6afd95
Message-ID: <20150204173120.CD976AA9C6@public.kitware.com>

This is an automated email from 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  e6afd9500d0d00855ef0144a1e7c913a8bf4927d (commit)
       via  467f5bcc6ebb8468bb2ef1fc4edaeab9970a37d4 (commit)
       via  fdb0799d7568efbae2b01ede62e6cec30a0798ce (commit)
       via  dea42d929699ef62c1d6df0eb273beb30c9fbf6e (commit)
      from  37662ea4bf64087f2251e2f4a71a13623cfe047f (commit)

Those revisions listed 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/Platform/Windows-MSVC.cmake |    2 +-
 Modules/Platform/Windows-df.cmake   |    2 +-
 Source/cmLocalGenerator.cxx         |   14 +++++---------
 3 files changed, 7 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Feb  4 13:37:33 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  4 Feb 2015 13:37:33 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2580-gf54e479
Message-ID: <20150204183733.0EB6EAACCF@public.kitware.com>

This is an automated email from 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  f54e479a42f74753a9052fe0eb822d407d5f2a76 (commit)
       via  12f30fde379d3bfe6c6302c5d50915a413f2c5af (commit)
      from  294d9ad1248020d3ea8e9c5a04dfd7fb6d89bdcb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f54e479a42f74753a9052fe0eb822d407d5f2a76
commit f54e479a42f74753a9052fe0eb822d407d5f2a76
Merge: 294d9ad 12f30fd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 13:37:32 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 13:37:32 2015 -0500

    Merge topic 'fix-C-standard-features' into next
    
    12f30fde Features: Allow setting standard dialect below the default.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12f30fde379d3bfe6c6302c5d50915a413f2c5af
commit 12f30fde379d3bfe6c6302c5d50915a413f2c5af
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 19:14:00 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 4 19:34:17 2015 +0100

    Features: Allow setting standard dialect below the default.
    
    Prior to looping from the requested version to the default dialect
    to find a suitable flag, find a suitable flag it the default dialect
    or a previous dialect is selected. In that case, the loop is not
    entered at all.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index af4c950..298d547 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2287,7 +2287,21 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
     defaultStdIt = stds.end() - 1;
     }
 
-  for ( ; stdIt <= defaultStdIt; ++stdIt)
+  // Greater or equal because the standards are stored in
+  // backward chronological order.
+  if (stdIt >= defaultStdIt)
+    {
+    std::string option_flag =
+              "CMAKE_" + lang + *stdIt
+                      + "_" + type + "_COMPILE_OPTION";
+
+    const char *opt =
+        target->GetMakefile()->GetRequiredDefinition(option_flag);
+    this->AppendFlagEscape(flags, opt);
+    return;
+    }
+
+  for ( ; stdIt < defaultStdIt; ++stdIt)
     {
     std::string option_flag =
               "CMAKE_" + lang + *stdIt

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

Summary of changes:
 Source/cmLocalGenerator.cxx |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Feb  4 13:38:21 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  4 Feb 2015 13:38:21 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2583-g3e56e29
Message-ID: <20150204183821.B870FAAD40@public.kitware.com>

This is an automated email from 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  3e56e295bc901ff7af64463e2b91cdbcd960d950 (commit)
       via  60ed7bbb83e8e585865cfca49cf1f26ea0c58295 (commit)
       via  a64323966805fe0089763f39c92e75529aeffd13 (commit)
      from  f54e479a42f74753a9052fe0eb822d407d5f2a76 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e56e295bc901ff7af64463e2b91cdbcd960d950
commit 3e56e295bc901ff7af64463e2b91cdbcd960d950
Merge: f54e479 60ed7bb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 13:38:20 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 13:38:20 2015 -0500

    Merge topic 'fix-C-standard-features' into next
    
    60ed7bbb Features: Fix C90 feature detection.
    a6432396 Features: Allow setting standard dialect below the default.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60ed7bbb83e8e585865cfca49cf1f26ea0c58295
commit 60ed7bbb83e8e585865cfca49cf1f26ea0c58295
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 3 21:47:45 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 4 19:37:57 2015 +0100

    Features: Fix C90 feature detection.
    
    This bug caused c_function_prototypes to not be recorded at configure
    time when compiling with -std=gnu99 or similar. In the case of feature
    recording, that was not a problem, because the logic in
    CMakeDetermineCompileFeatures.cmake currently assumes that a feature
    present for an earlier standard is present for a later standard.
    
    However, the detection strings are also used in WriteCompilerDetectionHeader,
    so the feature macro has been defined to '0' when using a later language
    dialect.
    
    Fix that by not checking the existence of the __STDC_VERSION__ macro at
    all when detecting C90 features.

diff --git a/Modules/Compiler/AppleClang-C-FeatureTests.cmake b/Modules/Compiler/AppleClang-C-FeatureTests.cmake
index 6f3d6a7..e80b526 100644
--- a/Modules/Compiler/AppleClang-C-FeatureTests.cmake
+++ b/Modules/Compiler/AppleClang-C-FeatureTests.cmake
@@ -7,5 +7,5 @@ set(AppleClang_C99 "${_cmake_oldestSupported} && defined(__STDC_VERSION__) && __
 set(_cmake_feature_test_c_restrict "${AppleClang_C99}")
 set(_cmake_feature_test_c_variadic_macros "${AppleClang_C99}")
 
-set(AppleClang_C90 "${_cmake_oldestSupported} && !defined(__STDC_VERSION__)")
+set(AppleClang_C90 "${_cmake_oldestSupported}")
 set(_cmake_feature_test_c_function_prototypes "${AppleClang_C90}")
diff --git a/Modules/Compiler/Clang-C-FeatureTests.cmake b/Modules/Compiler/Clang-C-FeatureTests.cmake
index 2d8673d..99c2252 100644
--- a/Modules/Compiler/Clang-C-FeatureTests.cmake
+++ b/Modules/Compiler/Clang-C-FeatureTests.cmake
@@ -7,5 +7,5 @@ set(Clang_C99 "${_cmake_oldestSupported} && defined(__STDC_VERSION__) && __STDC_
 set(_cmake_feature_test_c_restrict "${Clang_C99}")
 set(_cmake_feature_test_c_variadic_macros "${Clang_C99}")
 
-set(Clang_C90 "${_cmake_oldestSupported} && !defined(__STDC_VERSION__)")
+set(Clang_C90 "${_cmake_oldestSupported}")
 set(_cmake_feature_test_c_function_prototypes "${Clang_C90}")
diff --git a/Modules/Compiler/GNU-C-FeatureTests.cmake b/Modules/Compiler/GNU-C-FeatureTests.cmake
index d8e456c..b3fe33f 100644
--- a/Modules/Compiler/GNU-C-FeatureTests.cmake
+++ b/Modules/Compiler/GNU-C-FeatureTests.cmake
@@ -13,5 +13,5 @@ set(GNU44_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404 && defined(__STDC_VERSIO
 set(_cmake_feature_test_c_restrict "${GNU44_C99}")
 set(_cmake_feature_test_c_variadic_macros "${GNU44_C99}")
 
-set(GNU_C90 "${_cmake_oldestSupported} && !defined(__STDC_VERSION__)")
+set(GNU_C90 "${_cmake_oldestSupported}")
 set(_cmake_feature_test_c_function_prototypes "${GNU_C90}")
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 38c44c8..3ba1e0a 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -164,6 +164,38 @@ if (CMAKE_C_COMPILE_FEATURES)
       )
     endif()
   endif()
+
+  add_executable(CompileFeaturesGenex_C genex_test.c)
+  set_property(TARGET CompileFeaturesGenex_C PROPERTY C_STANDARD 11)
+
+  if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6)
+      list(APPEND expected_defs
+        EXPECT_C_STATIC_ASSERT=1
+      )
+    else()
+      list(APPEND expected_defs
+        EXPECT_C_STATIC_ASSERT=0
+      )
+    endif()
+  elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang"
+      OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
+    list(APPEND expected_defs
+      EXPECT_C_STATIC_ASSERT=1
+    )
+  endif()
+
+  list(APPEND expected_defs
+    EXPECT_C_FUNCTION_PROTOTYPES=1
+    EXPECT_C_RESTRICT=1
+  )
+
+  target_compile_definitions(CompileFeaturesGenex_C PRIVATE
+    HAVE_C_FUNCTION_PROTOTYPES=$<COMPILE_FEATURES:c_function_prototypes>
+    HAVE_C_RESTRICT=$<COMPILE_FEATURES:c_restrict>
+    HAVE_C_STATIC_ASSERT=$<COMPILE_FEATURES:c_static_assert>
+    ${expected_defs}
+  )
 endif()
 
 if (CMAKE_CXX_COMPILE_FEATURES)
diff --git a/Tests/CompileFeatures/genex_test.c b/Tests/CompileFeatures/genex_test.c
new file mode 100644
index 0000000..b1215bd
--- /dev/null
+++ b/Tests/CompileFeatures/genex_test.c
@@ -0,0 +1,38 @@
+#ifndef EXPECT_C_STATIC_ASSERT
+# error EXPECT_C_STATIC_ASSERT not defined
+#endif
+#ifndef EXPECT_C_FUNCTION_PROTOTYPES
+# error EXPECT_C_FUNCTION_PROTOTYPES not defined
+#endif
+#ifndef EXPECT_C_RESTRICT
+# error EXPECT_C_RESTRICT not defined
+#endif
+
+#if !EXPECT_C_STATIC_ASSERT
+#if EXPECT_C_STATIC_ASSERT
+#error "Expect c_static_assert feature"
+#endif
+#else
+#if !EXPECT_C_STATIC_ASSERT
+#error "Expect no c_static_assert feature"
+#endif
+#endif
+
+#if !EXPECT_C_FUNCTION_PROTOTYPES
+#  error Expect c_function_prototypes support
+#endif
+
+#if !EXPECT_C_RESTRICT
+#  if EXPECT_C_RESTRICT
+#    error Expect c_restrict support
+#  endif
+#else
+#  if !EXPECT_C_RESTRICT
+#    error Expect no c_restrict support
+#  endif
+#endif
+
+int main()
+{
+
+}
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index e70a977..c538280 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -84,6 +84,15 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
   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)
@@ -130,3 +139,16 @@ add_executable(multi_files_11 multi_files.cpp)
 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")
+  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()
diff --git a/Tests/Module/WriteCompilerDetectionHeader/main.c b/Tests/Module/WriteCompilerDetectionHeader/main.c
new file mode 100644
index 0000000..9023b0f
--- /dev/null
+++ b/Tests/Module/WriteCompilerDetectionHeader/main.c
@@ -0,0 +1,29 @@
+
+#include "test_compiler_detection.h"
+
+#if !defined(TEST_COMPILER_C_FUNCTION_PROTOTYPES) || !TEST_COMPILER_C_FUNCTION_PROTOTYPES
+#  error Expected TEST_COMPILER_C_FUNCTION_PROTOTYPES
+#endif
+
+#if !EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
+#  error Expected EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
+#endif
+
+#if !defined(TEST_COMPILER_C_RESTRICT) || !TEST_COMPILER_C_RESTRICT
+#  if EXPECTED_COMPILER_C_RESTRICT
+#    error Expected TEST_COMPILER_C_RESTRICT
+#  endif
+#else
+#  if !EXPECTED_COMPILER_C_RESTRICT
+#    error Expect no TEST_COMPILER_C_RESTRICT
+#  endif
+#endif
+
+#ifdef TEST_COMPILER_CXX_STATIC_ASSERT
+#error Expect no CXX features defined
+#endif
+
+int main()
+{
+  return 0;
+}
diff --git a/Tests/Module/WriteCompilerDetectionHeader/main_multi.c b/Tests/Module/WriteCompilerDetectionHeader/main_multi.c
new file mode 100644
index 0000000..6f4573f
--- /dev/null
+++ b/Tests/Module/WriteCompilerDetectionHeader/main_multi.c
@@ -0,0 +1,29 @@
+
+#include "multi_file_compiler_detection.h"
+
+#if !defined(MULTI_COMPILER_C_FUNCTION_PROTOTYPES) || !MULTI_COMPILER_C_FUNCTION_PROTOTYPES
+#  error Expected MULTI_COMPILER_C_FUNCTION_PROTOTYPES
+#endif
+
+#if !EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
+#  error Expected EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
+#endif
+
+#if !defined(MULTI_COMPILER_C_RESTRICT) || !MULTI_COMPILER_C_RESTRICT
+#  if EXPECTED_COMPILER_C_RESTRICT
+#    error Expected MULTI_COMPILER_C_RESTRICT
+#  endif
+#else
+#  if !EXPECTED_COMPILER_C_RESTRICT
+#    error Expect no MULTI_COMPILER_C_RESTRICT
+#  endif
+#endif
+
+#ifdef MULTI_COMPILER_CXX_STATIC_ASSERT
+#error Expect no CXX features defined
+#endif
+
+int main()
+{
+  return 0;
+}

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a64323966805fe0089763f39c92e75529aeffd13
commit a64323966805fe0089763f39c92e75529aeffd13
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 19:14:00 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 4 19:37:57 2015 +0100

    Features: Allow setting standard dialect below the default.
    
    Prior to looping from the requested version to the default dialect
    to find a suitable flag, find a suitable flag it the default dialect
    or a previous dialect is selected. In that case, the loop is not
    entered at all.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index af4c950..298d547 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2287,7 +2287,21 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
     defaultStdIt = stds.end() - 1;
     }
 
-  for ( ; stdIt <= defaultStdIt; ++stdIt)
+  // Greater or equal because the standards are stored in
+  // backward chronological order.
+  if (stdIt >= defaultStdIt)
+    {
+    std::string option_flag =
+              "CMAKE_" + lang + *stdIt
+                      + "_" + type + "_COMPILE_OPTION";
+
+    const char *opt =
+        target->GetMakefile()->GetRequiredDefinition(option_flag);
+    this->AppendFlagEscape(flags, opt);
+    return;
+    }
+
+  for ( ; stdIt < defaultStdIt; ++stdIt)
     {
     std::string option_flag =
               "CMAKE_" + lang + *stdIt

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb  4 13:48:41 2015
From: brad.king at kitware.com (Brad King)
Date: Wed,  4 Feb 2015 13:48:41 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2586-gba1989e
Message-ID: <20150204184841.E049FAA098@public.kitware.com>

This is an automated email from 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  ba1989e5609850771ea4291c85fcd0a0620b3c68 (commit)
       via  9122ca6f7ebaf47cb3d1e27859a5b19f7f84940e (commit)
       via  7b53ca2bfc5b2afb722b7438084c1536c31cc789 (commit)
      from  3e56e295bc901ff7af64463e2b91cdbcd960d950 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba1989e5609850771ea4291c85fcd0a0620b3c68
commit ba1989e5609850771ea4291c85fcd0a0620b3c68
Merge: 3e56e29 9122ca6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 13:48:40 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 13:48:40 2015 -0500

    Merge topic 'doc-3.2-relnotes' into next
    
    9122ca6f Help: Organize 3.2 release notes
    7b53ca2b Help: Consolidate 3.2 release notes


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9122ca6f7ebaf47cb3d1e27859a5b19f7f84940e
commit 9122ca6f7ebaf47cb3d1e27859a5b19f7f84940e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 13:33:49 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 13:47:12 2015 -0500

    Help: Organize 3.2 release notes
    
    Add section headers similar to the 3.1 release notes and move each
    individual bullet into an appropriate section.  Revise and consolidate
    some bullets covering related areas.

diff --git a/Help/release/3.2.0.rst b/Help/release/3.2.0.rst
index 142d408..fba6523 100644
--- a/Help/release/3.2.0.rst
+++ b/Help/release/3.2.0.rst
@@ -7,47 +7,27 @@ CMake 3.2.0 Release Notes
 
 Changes made since CMake 3.1.0 include the following.
 
-* A new :command:`continue` command was added that can be called inside loop
-  contexts to end the current iteration and start the next one at the top of
-  the loop block.
-
-* A :module:`FindGSL` module was introduced to find the
-  GNU Scientific Library.
-
-* The :module:`FindIntl` module was added to find the Gettext ``libintl``
-  library.
-
-* A :module:`FindJsonCpp` module was introduced to find the
-  JsonCpp package.
-
-* The :command:`ctest_coverage` learned to support Javascript coverage.
-
-* The :manual:`cmake(1)` ``-E tar`` command now supports creating
-  ``.xz``-compressed archives with the ``J`` flag.
-
-* On OS X with Makefile and Ninja generators, when a compiler is found
-  in ``/usr/bin`` it is now mapped to the corresponding compiler inside
-  the Xcode application folder, if any.  This allows such build
-  trees to continue to work with their original compiler even when
-  ``xcode-select`` switches to a different Xcode installation.
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU compilers on OS X.
+New Features
+============
 
-* The :command:`break` command now rejects calls outside of a loop
-  context or that pass arguments to the command.
-  See policy :policy:`CMP0055`.
+Syntax
+------
 
-* Add :variable:`CMAKE_MATCH_COUNT` for the number of matches made in the last
-  regular expression.
+* On Windows, CMake learned to support international characters.
+  This allows use of characters from multiple (spoken) languages
+  in CMake code, paths to source files, configured files such as
+  ``.h.in`` files, and other files read and written by CMake.
+  Because CMake interoperates with many other tools, there may
+  still be some limitations when using certain international
+  characters.
 
-* The :manual:`cmake(1)` ``-E tar`` command learned a new
-  ``--files-from=<file>`` option to specify file names using
-  lines in a file to overcome command-line length limits.
+Commands
+--------
 
-* The :manual:`cmake(1)` ``-E tar`` command learned a new
-  ``--mtime=<date>`` option to specify the modification time
-  recorded in tarball entries.
+* The :command:`add_custom_command` and :command:`add_custom_target`
+  commands learned a new ``BYPRODUCTS`` option to specify files
+  produced as side effects of the custom commands.  These are not
+  outputs because they do not always have to be newer than inputs.
 
 * The :command:`add_custom_command` and :command:`add_custom_target`
   commands learned a new ``USES_TERMINAL`` option to request that
@@ -57,81 +37,75 @@ Changes made since CMake 3.1.0 include the following.
   for individual interactive use, such as ``install``, are now
   placed in this pool.
 
-* The :module:`CPackRPM` module learned options to set per-component
-  descriptions and summaries.  See the
-  :variable:`CPACK_RPM_<component>_PACKAGE_DESCRIPTION` and
-  :variable:`CPACK_RPM_<component>_PACKAGE_SUMMARY` variables.
+* A new :command:`continue` command was added that can be called inside loop
+  contexts to end the current iteration and start the next one at the top of
+  the loop block.
 
-* The :module:`CPackRPM` module learned options to specify
-  requirements for pre- and post-install scripts.  See the
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PRE` and
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POST` variables.
+* The :command:`file(LOCK)` subcommand was created to allow CMake
+  processes to synchronize through file and directory locks.
 
-* The :module:`CPackRPM` module learned options to specify
-  requirements for pre- and post-uninstall scripts.  See the
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PREUN` and
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POSTUN` variables.
+* The :command:`file(STRINGS)` now supports UTF-16LE, UTF-16BE,
+  UTF-32LE, UTF-32BE as ``ENCODING`` options.
 
-* The :module:`CTestCoverageCollectGCOV` module was introduced as an
-  alternative to the :command:`ctest_coverage` command for collecting
-  ``gcov`` results for submission to CDash.
+* The :command:`install(EXPORT)` command now works with an absolute
+  ``DESTINATION`` even if targets in the export set are installed
+  with a destination or usage requirements specified relative to the
+  install prefix.  The value of the :variable:`CMAKE_INSTALL_PREFIX`
+  variable is hard-coded into the installed export file as the base
+  for relative references.
 
-* The :command:`ctest_coverage` learned to support Delphi coverage.
+* The :command:`try_compile` command source file signature now honors
+  link flags (e.g. :variable:`CMAKE_EXE_LINKER_FLAGS`) in the generated
+  test project.  See policy :policy:`CMP0056`.
 
-* On OS X, commands supporting network communication, such as
-  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now support SSL/TLS even when CMake
-  is not built against OpenSSL.  The OS X native SSL/TLS
-  implementation is used by default.  OS-configured certificate
-  authorities will be trusted automatically.
+* The :command:`try_run` command learned to honor the ``LINK_LIBRARIES``
+  option just as :command:`try_compile` already does.
 
-* When CMake is built with OpenSSL on systems other than Windows
-  and OS X, commands supporting network communication via ``https``,
-  such as :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now search for OS-configured certificate
-  authorities in a few ``/etc`` paths to be trusted automatically.
+Variables
+---------
 
-* On Windows, commands supporting network communication, such as
-  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now support SSL/TLS even when CMake
-  is not built against OpenSSL.  The Windows native SSL/TLS
-  implementation is used by default.  OS-configured certificate
-  authorities will be trusted automatically.
+* The :variable:`CMAKE_MATCH_COUNT` variable was introduced to record the
+  number of matches made in the last regular expression matched in an
+  :command:`if` command or a :command:`string` command.
 
-* The :command:`add_custom_command` and :command:`add_custom_target`
-  commands learned a new ``BYPRODUCTS`` option to specify files
-  produced as side effects of the custom commands.  These are not
-  outputs because they do not always have to be newer than inputs.
+Properties
+----------
+
+* An :prop_tgt:`ANDROID_API_MIN` target property was introduced to
+  specify the minimum version to be targeted by the toolchain.
+
+* A :prop_sf:`VS_SHADER_FLAGS` source file property was added to specify
+  additional shader flags to ``.hlsl`` files, for the Visual Studio
+  generators.
+
+Modules
+-------
+
+* The :module:`CTestCoverageCollectGCOV` module was introduced as an
+  alternative to the :command:`ctest_coverage` command for collecting
+  ``gcov`` results for submission to CDash.
 
 * The :module:`ExternalData` module learned to support
   :ref:`Custom Fetch Scripts <ExternalData Custom Fetch Scripts>`.
   This allows projects to specify custom ``.cmake`` scripts for
   fetching data objects during the build.
 
-* The :module:`ExternalProject` module ``ExternalProject_Add`` function
-  learned a new ``CMAKE_CACHE_DEFAULT_ARGS`` option to initialize cache
-  values in the external project without setting them on future builds.
-
 * The :module:`ExternalProject` module learned options to create
   independent external project step targets that do not depend
   on the builtin steps.
 
 * The :module:`ExternalProject` module :command:`ExternalProject_Add`
-  command learned a ``TEST_EXCLUDE_FROM_MAIN`` option to exclude tests
-  from the main build.
-
-* The :module:`ExternalProject` module ``ExternalProject_Add`` command
-  learned an ``UPDATE_DISCONNECTED`` option to avoid automatically
-  updating the source tree checkout from version control.
+  command learned a new ``CMAKE_CACHE_DEFAULT_ARGS`` option to
+  initialize cache values in the external project without setting
+  them on future builds.
 
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Microsoft Visual Studio (``MSVC``).
-
-* The :command:`file(LOCK)` subcommand was created to allow CMake
-  processes to synchronize through file and directory locks.
+* The :module:`ExternalProject` module :command:`ExternalProject_Add`
+  command learned a new ``TEST_EXCLUDE_FROM_MAIN`` option to exclude
+  tests from the main build.
 
-* The :command:`file(STRINGS)` now supports UTF-16LE, UTF-16BE,
-  UTF-32LE, UTF-32BE as ``ENCODING`` options.
+* The :module:`ExternalProject` module :command:`ExternalProject_Add`
+  command learned a new ``UPDATE_DISCONNECTED`` option to avoid
+  automatically updating the source tree checkout from version control.
 
 * The :module:`FindCUDA` module learned about the ``cusolver``
   library in CUDA 7.0.
@@ -139,6 +113,15 @@ Changes made since CMake 3.1.0 include the following.
 * The :module:`FindGit` module learned to find the ``git`` command-line tool
   that comes with GitHub for Windows installed in user home directories.
 
+* A :module:`FindGSL` module was introduced to find the
+  GNU Scientific Library.
+
+* A :module:`FindIntl` module was introduced to find the
+  Gettext ``libintl`` library.
+
+* A :module:`FindJsonCpp` module was introduced to find the
+  JsonCpp package.
+
 * The :module:`FindLATEX` module learned to support components.
 
 * The :module:`FindMPI` module learned to find MS-MPI on Windows.
@@ -154,18 +137,38 @@ Changes made since CMake 3.1.0 include the following.
   ``OPENSSL_SSL_LIBRARY``, respectively, to allow applications to
   link to one without the other.
 
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU 4.4 to 4.6 compilers.
+* The :module:`WriteCompilerDetectionHeader` module learned to
+  create a define for portability of the ``cxx_thread_local`` feature.
+  The define expands to either the C++11 ``thread_local`` keyword, or a
+  pre-standardization compiler-specific equivalent, as appropriate.
 
-* The :command:`install(EXPORT)` command now works with an absolute
-  ``DESTINATION`` even if targets in the export set are installed
-  with a destination or usage requirements specified relative to the
-  install prefix.  The value of the :variable:`CMAKE_INSTALL_PREFIX`
-  variable is hard-coded into the installed export file as the base
-  for relative references.
+* The :module:`WriteCompilerDetectionHeader` module learned to create
+  multiple output files per compiler and per language, instead of creating
+  one large file.
 
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU compiler version 5.0.
+CTest
+-----
+
+* The :command:`ctest_coverage` command learned to support Delphi coverage.
+* The :command:`ctest_coverage` command learned to support Javascript coverage.
+
+CPack
+-----
+
+* The :module:`CPackRPM` module learned options to set per-component
+  descriptions and summaries.  See the
+  :variable:`CPACK_RPM_<component>_PACKAGE_DESCRIPTION` and
+  :variable:`CPACK_RPM_<component>_PACKAGE_SUMMARY` variables.
+
+* The :module:`CPackRPM` module learned options to specify
+  requirements for pre- and post-install scripts.  See the
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PRE` and
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POST` variables.
+
+* The :module:`CPackRPM` module learned options to specify
+  requirements for pre- and post-uninstall scripts.  See the
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PREUN` and
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POSTUN` variables.
 
 * The :module:`CPackRPM` module learned a new
   :variable:`CPACK_RPM_<COMPONENT>_PACKAGE_PREFIX` variable to
@@ -176,74 +179,89 @@ Changes made since CMake 3.1.0 include the following.
   :variable:`CPACK_RPM_RELOCATION_PATHS` variable to
   specify multiple relocation prefixes for a single rpm package.
 
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Oracle SolarisStudio (``SunPro``).
+Other
+-----
 
-* The :command:`try_compile` command source file signature now honors
-  link flags (e.g. :variable:`CMAKE_EXE_LINKER_FLAGS`) in the generated
-  test project.  See policy :policy:`CMP0056`.
+* The :manual:`cmake(1)` ``-E tar`` command now supports creating
+  ``.xz``-compressed archives with the ``J`` flag.
 
-* The :command:`try_run` command learned to honor the ``LINK_LIBRARIES``
-  option just as :command:`try_compile` already does.
+* The :manual:`cmake(1)` ``-E tar`` command learned a new
+  ``--files-from=<file>`` option to specify file names using
+  lines in a file to overcome command-line length limits.
 
-* The implementation of CMake relies on some C++ compiler features which are
-  not supported by some older compilers.  As a result, those old compilers
-  can no longer be used to build CMake itself.  CMake continues to be able to
-  generate Makefiles and project files for users of those old compilers
-  however.  The compilers known to no longer be capable of building CMake
-  are:
-
-  * MSVC 6 and 7.0 - superceded by VisualStudio 7.1 and newer compilers.
-  * GCC 2.95 - superceded by GCC 3 and newer compilers.
-  * Borland compilers - superceded by other Windows compilers.
-  * Compaq compilers - superceded by other compilers.
-  * Comeau compilers - superceded by other compilers.
-  * SGI compilers - IRIX was dropped as a host platform.
-
-  When building using SolarisStudio 12, the default ``libCStd`` standard
-  library is not sufficient to build CMake.  The SolarisStudio distribution
-  supports compiler options to use ``STLPort4`` or ``libstdc++``.  An
-  appropriate option to select the standard library is now added
-  automatically when building CMake with SolarisStudio compilers.
+* The :manual:`cmake(1)` ``-E tar`` command learned a new
+  ``--mtime=<date>`` option to specify the modification time
+  recorded in tarball entries.
 
-* A :prop_tgt:`ANDROID_API_MIN` target property was introduced to
-  specify the minimum version to be targeted by the toolchain.
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by more compilers, including:
 
-* A :prop_sf:`VS_SHADER_FLAGS` source file property was added to specify
-  additional shader flags to ``.hlsl`` files, for the Visual Studio generators.
+  * Apple Clang (``AppleClang``).
+  * GNU compiler versions 4.4 through 5.0, including Apple variants (``GNU``).
+  * Microsoft Visual Studio (``MSVC``).
+  * Oracle SolarisStudio (``SunPro``).
 
-* The :module:`WriteCompilerDetectionHeader` module learned to
-  create a define for portability of the cxx_thread_local feature. The define
-  expands to either the C++11 ``thread_local`` keyword, or a
-  pre-standardization compiler-specific equivalent, as appropriate.
+New Diagnostics
+===============
 
-* On Windows, CMake learned to support international characters.
-  This allows use of characters from multiple (spoken) languages
-  in CMake code, paths to source files, configured files such as
-  ``.h.in`` files, and other files read and written by CMake.
-  Because CMake interoperates with many other tools, there may
-  still be some limitations when using certain international
-  characters.
+* The :command:`break` command now rejects calls outside of a loop
+  context or that pass arguments to the command.
+  See policy :policy:`CMP0055`.
 
-  Files written in the :manual:`cmake-language(7)`, such as
-  ``CMakeLists.txt`` or ``*.cmake`` files, are expected to be
+Deprecated and Removed Features
+===============================
+
+* Files written in the :manual:`cmake-language(7)`, such as
+  ``CMakeLists.txt`` or ``*.cmake`` files, are now expected to be
   encoded as UTF-8.  If files are already ASCII, they will be
   compatible.  If files were in a different encoding, including
   Latin 1, they will need to be converted.
 
-  The Visual Studio generators now write solution and project
+
+* The implementation of CMake now relies on some C++ compiler features which
+  are not supported by some older compilers.  As a result, those old compilers
+  can no longer be used to build CMake itself.  CMake continues to be able to
+  generate Makefiles and project files for users of those old compilers
+  however.  Compilers known to no longer be capable of building CMake are:
+
+  * Visual Studio 6 and 7.0 -- superseded by VisualStudio 7.1 and newer.
+  * GCC 2.95 -- superseded by GCC 3 and newer compilers.
+  * Borland compilers -- superseded by other Windows compilers.
+  * Compaq compilers -- superseded by other compilers.
+  * SGI compilers -- IRIX was dropped as a host platform.
+
+Other Changes
+=============
+
+* On Windows and OS X, commands supporting network communication
+  via ``https``, such as :command:`file(DOWNLOAD)`,
+  :command:`file(UPLOAD)`, and :command:`ctest_submit`, now support
+  SSL/TLS even when CMake is not built against OpenSSL.
+  The Windows or OS X native SSL/TLS implementation is used by default.
+  OS-configured certificate authorities will be trusted automatically.
+
+  On other platforms, when CMake is built with OpenSSL, these
+  commands now search for OS-configured certificate authorities
+  in a few ``/etc`` paths to be trusted automatically.
+
+* On OS X with Makefile and Ninja generators, when a compiler is found
+  in ``/usr/bin`` it is now mapped to the corresponding compiler inside
+  the Xcode application folder, if any.  This allows such build
+  trees to continue to work with their original compiler even when
+  ``xcode-select`` switches to a different Xcode installation.
+
+* The Visual Studio generators now write solution and project
   files in UTF-8 instead of Windows-1252.  Windows-1252 supported
   Latin 1 languages such as those found in North and South America
   and Western Europe.  With UTF-8, additional languages are now
   supported.
 
-* The :module:`WriteCompilerDetectionHeader` module learned to create
-  multiple output files per compiler and per language, instead of creating
-  one large file.
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Apple Clang (``AppleClang``).
-
 * The :generator:`Xcode` generator no longer requires a value for
   the :variable:`CMAKE_MAKE_PROGRAM` variable to be located up front.
   It now locates ``xcodebuild`` when needed at build time.
+
+* When building CMake itself using SolarisStudio 12, the default ``libCStd``
+  standard library is not sufficient to build CMake.  The SolarisStudio
+  distribution supports compiler options to use ``STLPort4`` or ``libstdc++``.
+  An appropriate option to select the standard library is now added
+  automatically when building CMake with SolarisStudio compilers.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b53ca2bfc5b2afb722b7438084c1536c31cc789
commit 7b53ca2bfc5b2afb722b7438084c1536c31cc789
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 13:12:12 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 13:14:08 2015 -0500

    Help: Consolidate 3.2 release notes
    
    Move all development release notes into a new version-specific document:
    
     tail -q -n +3 Help/release/dev/* > Help/release/3.2.0.rst
     git rm -- Help/release/dev/*
    
    except the sample topic:
    
     git checkout HEAD -- Help/release/dev/0-sample-topic.rst
    
    Reference the new document from the release notes index document.
    Add a title and intro sentence to the new document by hand.

diff --git a/Help/release/3.2.0.rst b/Help/release/3.2.0.rst
new file mode 100644
index 0000000..142d408
--- /dev/null
+++ b/Help/release/3.2.0.rst
@@ -0,0 +1,249 @@
+CMake 3.2.0 Release Notes
+*************************
+
+.. only:: html
+
+  .. contents::
+
+Changes made since CMake 3.1.0 include the following.
+
+* A new :command:`continue` command was added that can be called inside loop
+  contexts to end the current iteration and start the next one at the top of
+  the loop block.
+
+* A :module:`FindGSL` module was introduced to find the
+  GNU Scientific Library.
+
+* The :module:`FindIntl` module was added to find the Gettext ``libintl``
+  library.
+
+* A :module:`FindJsonCpp` module was introduced to find the
+  JsonCpp package.
+
+* The :command:`ctest_coverage` learned to support Javascript coverage.
+
+* The :manual:`cmake(1)` ``-E tar`` command now supports creating
+  ``.xz``-compressed archives with the ``J`` flag.
+
+* On OS X with Makefile and Ninja generators, when a compiler is found
+  in ``/usr/bin`` it is now mapped to the corresponding compiler inside
+  the Xcode application folder, if any.  This allows such build
+  trees to continue to work with their original compiler even when
+  ``xcode-select`` switches to a different Xcode installation.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by GNU compilers on OS X.
+
+* The :command:`break` command now rejects calls outside of a loop
+  context or that pass arguments to the command.
+  See policy :policy:`CMP0055`.
+
+* Add :variable:`CMAKE_MATCH_COUNT` for the number of matches made in the last
+  regular expression.
+
+* The :manual:`cmake(1)` ``-E tar`` command learned a new
+  ``--files-from=<file>`` option to specify file names using
+  lines in a file to overcome command-line length limits.
+
+* The :manual:`cmake(1)` ``-E tar`` command learned a new
+  ``--mtime=<date>`` option to specify the modification time
+  recorded in tarball entries.
+
+* The :command:`add_custom_command` and :command:`add_custom_target`
+  commands learned a new ``USES_TERMINAL`` option to request that
+  the command be given direct access to the terminal if possible.
+  The :generator:`Ninja` generator will places such commands in the
+  ``console`` pool.  Build targets provided by CMake that are meant
+  for individual interactive use, such as ``install``, are now
+  placed in this pool.
+
+* The :module:`CPackRPM` module learned options to set per-component
+  descriptions and summaries.  See the
+  :variable:`CPACK_RPM_<component>_PACKAGE_DESCRIPTION` and
+  :variable:`CPACK_RPM_<component>_PACKAGE_SUMMARY` variables.
+
+* The :module:`CPackRPM` module learned options to specify
+  requirements for pre- and post-install scripts.  See the
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PRE` and
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POST` variables.
+
+* The :module:`CPackRPM` module learned options to specify
+  requirements for pre- and post-uninstall scripts.  See the
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PREUN` and
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POSTUN` variables.
+
+* The :module:`CTestCoverageCollectGCOV` module was introduced as an
+  alternative to the :command:`ctest_coverage` command for collecting
+  ``gcov`` results for submission to CDash.
+
+* The :command:`ctest_coverage` learned to support Delphi coverage.
+
+* On OS X, commands supporting network communication, such as
+  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
+  :command:`ctest_submit`, now support SSL/TLS even when CMake
+  is not built against OpenSSL.  The OS X native SSL/TLS
+  implementation is used by default.  OS-configured certificate
+  authorities will be trusted automatically.
+
+* When CMake is built with OpenSSL on systems other than Windows
+  and OS X, commands supporting network communication via ``https``,
+  such as :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
+  :command:`ctest_submit`, now search for OS-configured certificate
+  authorities in a few ``/etc`` paths to be trusted automatically.
+
+* On Windows, commands supporting network communication, such as
+  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
+  :command:`ctest_submit`, now support SSL/TLS even when CMake
+  is not built against OpenSSL.  The Windows native SSL/TLS
+  implementation is used by default.  OS-configured certificate
+  authorities will be trusted automatically.
+
+* The :command:`add_custom_command` and :command:`add_custom_target`
+  commands learned a new ``BYPRODUCTS`` option to specify files
+  produced as side effects of the custom commands.  These are not
+  outputs because they do not always have to be newer than inputs.
+
+* The :module:`ExternalData` module learned to support
+  :ref:`Custom Fetch Scripts <ExternalData Custom Fetch Scripts>`.
+  This allows projects to specify custom ``.cmake`` scripts for
+  fetching data objects during the build.
+
+* The :module:`ExternalProject` module ``ExternalProject_Add`` function
+  learned a new ``CMAKE_CACHE_DEFAULT_ARGS`` option to initialize cache
+  values in the external project without setting them on future builds.
+
+* The :module:`ExternalProject` module learned options to create
+  independent external project step targets that do not depend
+  on the builtin steps.
+
+* The :module:`ExternalProject` module :command:`ExternalProject_Add`
+  command learned a ``TEST_EXCLUDE_FROM_MAIN`` option to exclude tests
+  from the main build.
+
+* The :module:`ExternalProject` module ``ExternalProject_Add`` command
+  learned an ``UPDATE_DISCONNECTED`` option to avoid automatically
+  updating the source tree checkout from version control.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by Microsoft Visual Studio (``MSVC``).
+
+* The :command:`file(LOCK)` subcommand was created to allow CMake
+  processes to synchronize through file and directory locks.
+
+* The :command:`file(STRINGS)` now supports UTF-16LE, UTF-16BE,
+  UTF-32LE, UTF-32BE as ``ENCODING`` options.
+
+* The :module:`FindCUDA` module learned about the ``cusolver``
+  library in CUDA 7.0.
+
+* The :module:`FindGit` module learned to find the ``git`` command-line tool
+  that comes with GitHub for Windows installed in user home directories.
+
+* The :module:`FindLATEX` module learned to support components.
+
+* The :module:`FindMPI` module learned to find MS-MPI on Windows.
+
+* The :module:`FindOpenGL` module no longer explicitly searches
+  for any dependency on X11 libraries with the :module:`FindX11`
+  module.  Such dependencies should not need to be explicit.
+  Applications using X11 APIs themselves should find and link
+  to X11 libraries explicitly.
+
+* The :module:`FindOpenSSL` module now reports ``crypto`` and ``ssl``
+  libraries separately in ``OPENSSL_CRYPTO_LIBRARY`` and
+  ``OPENSSL_SSL_LIBRARY``, respectively, to allow applications to
+  link to one without the other.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by GNU 4.4 to 4.6 compilers.
+
+* The :command:`install(EXPORT)` command now works with an absolute
+  ``DESTINATION`` even if targets in the export set are installed
+  with a destination or usage requirements specified relative to the
+  install prefix.  The value of the :variable:`CMAKE_INSTALL_PREFIX`
+  variable is hard-coded into the installed export file as the base
+  for relative references.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by GNU compiler version 5.0.
+
+* The :module:`CPackRPM` module learned a new
+  :variable:`CPACK_RPM_<COMPONENT>_PACKAGE_PREFIX` variable to
+  specify a component-specific value to use instead of
+  :variable:`CPACK_PACKAGING_INSTALL_PREFIX`.
+
+* The :module:`CPackRPM` module learned a new
+  :variable:`CPACK_RPM_RELOCATION_PATHS` variable to
+  specify multiple relocation prefixes for a single rpm package.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by Oracle SolarisStudio (``SunPro``).
+
+* The :command:`try_compile` command source file signature now honors
+  link flags (e.g. :variable:`CMAKE_EXE_LINKER_FLAGS`) in the generated
+  test project.  See policy :policy:`CMP0056`.
+
+* The :command:`try_run` command learned to honor the ``LINK_LIBRARIES``
+  option just as :command:`try_compile` already does.
+
+* The implementation of CMake relies on some C++ compiler features which are
+  not supported by some older compilers.  As a result, those old compilers
+  can no longer be used to build CMake itself.  CMake continues to be able to
+  generate Makefiles and project files for users of those old compilers
+  however.  The compilers known to no longer be capable of building CMake
+  are:
+
+  * MSVC 6 and 7.0 - superceded by VisualStudio 7.1 and newer compilers.
+  * GCC 2.95 - superceded by GCC 3 and newer compilers.
+  * Borland compilers - superceded by other Windows compilers.
+  * Compaq compilers - superceded by other compilers.
+  * Comeau compilers - superceded by other compilers.
+  * SGI compilers - IRIX was dropped as a host platform.
+
+  When building using SolarisStudio 12, the default ``libCStd`` standard
+  library is not sufficient to build CMake.  The SolarisStudio distribution
+  supports compiler options to use ``STLPort4`` or ``libstdc++``.  An
+  appropriate option to select the standard library is now added
+  automatically when building CMake with SolarisStudio compilers.
+
+* A :prop_tgt:`ANDROID_API_MIN` target property was introduced to
+  specify the minimum version to be targeted by the toolchain.
+
+* A :prop_sf:`VS_SHADER_FLAGS` source file property was added to specify
+  additional shader flags to ``.hlsl`` files, for the Visual Studio generators.
+
+* The :module:`WriteCompilerDetectionHeader` module learned to
+  create a define for portability of the cxx_thread_local feature. The define
+  expands to either the C++11 ``thread_local`` keyword, or a
+  pre-standardization compiler-specific equivalent, as appropriate.
+
+* On Windows, CMake learned to support international characters.
+  This allows use of characters from multiple (spoken) languages
+  in CMake code, paths to source files, configured files such as
+  ``.h.in`` files, and other files read and written by CMake.
+  Because CMake interoperates with many other tools, there may
+  still be some limitations when using certain international
+  characters.
+
+  Files written in the :manual:`cmake-language(7)`, such as
+  ``CMakeLists.txt`` or ``*.cmake`` files, are expected to be
+  encoded as UTF-8.  If files are already ASCII, they will be
+  compatible.  If files were in a different encoding, including
+  Latin 1, they will need to be converted.
+
+  The Visual Studio generators now write solution and project
+  files in UTF-8 instead of Windows-1252.  Windows-1252 supported
+  Latin 1 languages such as those found in North and South America
+  and Western Europe.  With UTF-8, additional languages are now
+  supported.
+
+* The :module:`WriteCompilerDetectionHeader` module learned to create
+  multiple output files per compiler and per language, instead of creating
+  one large file.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by Apple Clang (``AppleClang``).
+
+* The :generator:`Xcode` generator no longer requires a value for
+  the :variable:`CMAKE_MAKE_PROGRAM` variable to be located up front.
+  It now locates ``xcodebuild`` when needed at build time.
diff --git a/Help/release/dev/Apple-GNU-compiler-features.rst b/Help/release/dev/Apple-GNU-compiler-features.rst
deleted file mode 100644
index 40c3712..0000000
--- a/Help/release/dev/Apple-GNU-compiler-features.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Apple-GNU-compiler-features
----------------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU compilers on OS X.
diff --git a/Help/release/dev/Apple-compiler-selection.rst b/Help/release/dev/Apple-compiler-selection.rst
deleted file mode 100644
index 5ff5653..0000000
--- a/Help/release/dev/Apple-compiler-selection.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-Apple-compiler-selection
-------------------------
-
-* On OS X with Makefile and Ninja generators, when a compiler is found
-  in ``/usr/bin`` it is now mapped to the corresponding compiler inside
-  the Xcode application folder, if any.  This allows such build
-  trees to continue to work with their original compiler even when
-  ``xcode-select`` switches to a different Xcode installation.
diff --git a/Help/release/dev/CTestCoverageCollectGCOV-refinements.rst b/Help/release/dev/CTestCoverageCollectGCOV-refinements.rst
deleted file mode 100644
index afa0a52..0000000
--- a/Help/release/dev/CTestCoverageCollectGCOV-refinements.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-CTestCoverageCollectGCOV-refinements
-------------------------------------
-
-* The :module:`CTestCoverageCollectGCOV` module was introduced as an
-  alternative to the :command:`ctest_coverage` command for collecting
-  ``gcov`` results for submission to CDash.
diff --git a/Help/release/dev/ExternalData-custom-download.rst b/Help/release/dev/ExternalData-custom-download.rst
deleted file mode 100644
index c40f4f7..0000000
--- a/Help/release/dev/ExternalData-custom-download.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-ExternalData-custom-download
-----------------------------
-
-* The :module:`ExternalData` module learned to support
-  :ref:`Custom Fetch Scripts <ExternalData Custom Fetch Scripts>`.
-  This allows projects to specify custom ``.cmake`` scripts for
-  fetching data objects during the build.
diff --git a/Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst b/Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst
deleted file mode 100644
index 1838ab6..0000000
--- a/Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-ExternalProject_CMAKE_CACHE_DEFAULT_ARGS
-----------------------------------------
-
-* The :module:`ExternalProject` module ``ExternalProject_Add`` function
-  learned a new ``CMAKE_CACHE_DEFAULT_ARGS`` option to initialize cache
-  values in the external project without setting them on future builds.
diff --git a/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst b/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
deleted file mode 100644
index dfbf108..0000000
--- a/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-ExternalProject_TEST_EXCLUDE_FROM_MAIN
---------------------------------------
-
-* The :module:`ExternalProject` module :command:`ExternalProject_Add`
-  command learned a ``TEST_EXCLUDE_FROM_MAIN`` option to exclude tests
-  from the main build.
diff --git a/Help/release/dev/ExternalProject_UPDATE_DISCONNECTED.rst b/Help/release/dev/ExternalProject_UPDATE_DISCONNECTED.rst
deleted file mode 100644
index bed4a89..0000000
--- a/Help/release/dev/ExternalProject_UPDATE_DISCONNECTED.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-ExternalProject_UPDATE_DISCONNECTED
------------------------------------
-
-* The :module:`ExternalProject` module ``ExternalProject_Add`` command
-  learned an ``UPDATE_DISCONNECTED`` option to avoid automatically
-  updating the source tree checkout from version control.
diff --git a/Help/release/dev/ExternalProject_independent-step-targets.rst b/Help/release/dev/ExternalProject_independent-step-targets.rst
deleted file mode 100644
index 02e8db8..0000000
--- a/Help/release/dev/ExternalProject_independent-step-targets.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-ExternalProject_independent-step-targets
-----------------------------------------
-
-* The :module:`ExternalProject` module learned options to create
-  independent external project step targets that do not depend
-  on the builtin steps.
diff --git a/Help/release/dev/FindCUDA-cusolver.rst b/Help/release/dev/FindCUDA-cusolver.rst
deleted file mode 100644
index 7a61e78..0000000
--- a/Help/release/dev/FindCUDA-cusolver.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindCUDA-cusolver
------------------
-
-* The :module:`FindCUDA` module learned about the ``cusolver``
-  library in CUDA 7.0.
diff --git a/Help/release/dev/FindGit-local-Github.rst b/Help/release/dev/FindGit-local-Github.rst
deleted file mode 100644
index 3523e86..0000000
--- a/Help/release/dev/FindGit-local-Github.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindGit-local-Github
---------------------
-
-* The :module:`FindGit` module learned to find the ``git`` command-line tool
-  that comes with GitHub for Windows installed in user home directories.
diff --git a/Help/release/dev/FindLATEX-components.rst b/Help/release/dev/FindLATEX-components.rst
deleted file mode 100644
index d161c1f..0000000
--- a/Help/release/dev/FindLATEX-components.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-FindLATEX-components
---------------------
-
-* The :module:`FindLATEX` module learned to support components.
diff --git a/Help/release/dev/FindOpenGL-no-X11.rst b/Help/release/dev/FindOpenGL-no-X11.rst
deleted file mode 100644
index dacf165..0000000
--- a/Help/release/dev/FindOpenGL-no-X11.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-FindOpenGL-no-X11
------------------
-
-* The :module:`FindOpenGL` module no longer explicitly searches
-  for any dependency on X11 libraries with the :module:`FindX11`
-  module.  Such dependencies should not need to be explicit.
-  Applications using X11 APIs themselves should find and link
-  to X11 libraries explicitly.
diff --git a/Help/release/dev/FindOpenSSL-separate-libs.rst b/Help/release/dev/FindOpenSSL-separate-libs.rst
deleted file mode 100644
index 96e3961..0000000
--- a/Help/release/dev/FindOpenSSL-separate-libs.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-FindOpenSSL-separate-libs
--------------------------
-
-* The :module:`FindOpenSSL` module now reports ``crypto`` and ``ssl``
-  libraries separately in ``OPENSSL_CRYPTO_LIBRARY`` and
-  ``OPENSSL_SSL_LIBRARY``, respectively, to allow applications to
-  link to one without the other.
diff --git a/Help/release/dev/GNU-4.4-compile-features.rst b/Help/release/dev/GNU-4.4-compile-features.rst
deleted file mode 100644
index d5c1356..0000000
--- a/Help/release/dev/GNU-4.4-compile-features.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-GNU-4.4-compile-features
-------------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU 4.4 to 4.6 compilers.
diff --git a/Help/release/dev/SolarisStudio-compile-features.rst b/Help/release/dev/SolarisStudio-compile-features.rst
deleted file mode 100644
index 83110cd..0000000
--- a/Help/release/dev/SolarisStudio-compile-features.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-SolarisStudio-compile-features
-------------------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Oracle SolarisStudio (``SunPro``).
diff --git a/Help/release/dev/WCDH-thread_local.rst b/Help/release/dev/WCDH-thread_local.rst
deleted file mode 100644
index 44516a7..0000000
--- a/Help/release/dev/WCDH-thread_local.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-WriteCompilerDetectionHeader thread_local portability
------------------------------------------------------
-
-* The :module:`WriteCompilerDetectionHeader` module learned to
-  create a define for portability of the cxx_thread_local feature. The define
-  expands to either the C++11 ``thread_local`` keyword, or a
-  pre-standardization compiler-specific equivalent, as appropriate.
diff --git a/Help/release/dev/WriteCompilerDetectionHeader-multi-file-lang.rst b/Help/release/dev/WriteCompilerDetectionHeader-multi-file-lang.rst
deleted file mode 100644
index a8665da..0000000
--- a/Help/release/dev/WriteCompilerDetectionHeader-multi-file-lang.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-WriteCompilerDetectionHeader-multi-file
----------------------------------------
-
-* The :module:`WriteCompilerDetectionHeader` module learned to create
-  multiple output files per compiler and per language, instead of creating
-  one large file.
diff --git a/Help/release/dev/Xcode-clang-compile-features.rst b/Help/release/dev/Xcode-clang-compile-features.rst
deleted file mode 100644
index d93475f..0000000
--- a/Help/release/dev/Xcode-clang-compile-features.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Xcode-clang-compile-features
-----------------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Apple Clang (``AppleClang``).
diff --git a/Help/release/dev/add-FindGSL.rst b/Help/release/dev/add-FindGSL.rst
deleted file mode 100644
index 47a0a25..0000000
--- a/Help/release/dev/add-FindGSL.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-add-FindGSL
------------
-
-* A :module:`FindGSL` module was introduced to find the
-  GNU Scientific Library.
diff --git a/Help/release/dev/add-FindIntl.rst b/Help/release/dev/add-FindIntl.rst
deleted file mode 100644
index ac048c9..0000000
--- a/Help/release/dev/add-FindIntl.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-add-FindIntl
-------------
-
-* The :module:`FindIntl` module was added to find the Gettext ``libintl``
-  library.
diff --git a/Help/release/dev/add-FindJsonCpp.rst b/Help/release/dev/add-FindJsonCpp.rst
deleted file mode 100644
index 5d1cb18..0000000
--- a/Help/release/dev/add-FindJsonCpp.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-add-FindJsonCpp
----------------
-
-* A :module:`FindJsonCpp` module was introduced to find the
-  JsonCpp package.
diff --git a/Help/release/dev/add-continue-command.rst b/Help/release/dev/add-continue-command.rst
deleted file mode 100644
index 4995a8e..0000000
--- a/Help/release/dev/add-continue-command.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-add-continue-command
---------------------
-
-* A new :command:`continue` command was added that can be called inside loop
-  contexts to end the current iteration and start the next one at the top of
-  the loop block.
diff --git a/Help/release/dev/add-xz-support.rst b/Help/release/dev/add-xz-support.rst
deleted file mode 100644
index 9bdf528..0000000
--- a/Help/release/dev/add-xz-support.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-add-xz-support
---------------
-
-* The :manual:`cmake(1)` ``-E tar`` command now supports creating
-  ``.xz``-compressed archives with the ``J`` flag.
diff --git a/Help/release/dev/add_javascript_coverage_parser.rst b/Help/release/dev/add_javascript_coverage_parser.rst
deleted file mode 100644
index 0d068ee..0000000
--- a/Help/release/dev/add_javascript_coverage_parser.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-add_javascript_coverage_parser
-------------------------------
-
-* The :command:`ctest_coverage` learned to support Javascript coverage.
diff --git a/Help/release/dev/break-command-strictness.rst b/Help/release/dev/break-command-strictness.rst
deleted file mode 100644
index 0723774..0000000
--- a/Help/release/dev/break-command-strictness.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-break-command-strictness
-------------------------
-
-* The :command:`break` command now rejects calls outside of a loop
-  context or that pass arguments to the command.
-  See policy :policy:`CMP0055`.
diff --git a/Help/release/dev/cached-regex-clear-fixed.rst b/Help/release/dev/cached-regex-clear-fixed.rst
deleted file mode 100644
index fbf08cc..0000000
--- a/Help/release/dev/cached-regex-clear-fixed.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-cached-regex-clear-fixed
-------------------------
-
-* Add :variable:`CMAKE_MATCH_COUNT` for the number of matches made in the last
-  regular expression.
diff --git a/Help/release/dev/cmake-E-tar-files-from.rst b/Help/release/dev/cmake-E-tar-files-from.rst
deleted file mode 100644
index f6087ff..0000000
--- a/Help/release/dev/cmake-E-tar-files-from.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake-E-tar-files-from
-----------------------
-
-* The :manual:`cmake(1)` ``-E tar`` command learned a new
-  ``--files-from=<file>`` option to specify file names using
-  lines in a file to overcome command-line length limits.
diff --git a/Help/release/dev/cmake-E-tar-mtime.rst b/Help/release/dev/cmake-E-tar-mtime.rst
deleted file mode 100644
index 6496577..0000000
--- a/Help/release/dev/cmake-E-tar-mtime.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake-E-tar-mtime
------------------
-
-* The :manual:`cmake(1)` ``-E tar`` command learned a new
-  ``--mtime=<date>`` option to specify the modification time
-  recorded in tarball entries.
diff --git a/Help/release/dev/console-pool.rst b/Help/release/dev/console-pool.rst
deleted file mode 100644
index 1d9bdb8..0000000
--- a/Help/release/dev/console-pool.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-console-pool
-------------
-
-* The :command:`add_custom_command` and :command:`add_custom_target`
-  commands learned a new ``USES_TERMINAL`` option to request that
-  the command be given direct access to the terminal if possible.
-  The :generator:`Ninja` generator will places such commands in the
-  ``console`` pool.  Build targets provided by CMake that are meant
-  for individual interactive use, such as ``install``, are now
-  placed in this pool.
diff --git a/Help/release/dev/cpack-rpm-component-descriptions.rst b/Help/release/dev/cpack-rpm-component-descriptions.rst
deleted file mode 100644
index 769a912..0000000
--- a/Help/release/dev/cpack-rpm-component-descriptions.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-cpack-rpm-component-descriptions
---------------------------------
-
-* The :module:`CPackRPM` module learned options to set per-component
-  descriptions and summaries.  See the
-  :variable:`CPACK_RPM_<component>_PACKAGE_DESCRIPTION` and
-  :variable:`CPACK_RPM_<component>_PACKAGE_SUMMARY` variables.
diff --git a/Help/release/dev/cpack-rpm-pre-post-install.rst b/Help/release/dev/cpack-rpm-pre-post-install.rst
deleted file mode 100644
index 0909d94..0000000
--- a/Help/release/dev/cpack-rpm-pre-post-install.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-cpack-rpm-pre-post-install
---------------------------
-
-* The :module:`CPackRPM` module learned options to specify
-  requirements for pre- and post-install scripts.  See the
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PRE` and
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POST` variables.
-
-* The :module:`CPackRPM` module learned options to specify
-  requirements for pre- and post-uninstall scripts.  See the
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PREUN` and
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POSTUN` variables.
diff --git a/Help/release/dev/ctest-delphi-coverage.rst b/Help/release/dev/ctest-delphi-coverage.rst
deleted file mode 100644
index efa97c9..0000000
--- a/Help/release/dev/ctest-delphi-coverage.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-ctest-delphi-coverage
----------------------
-
-* The :command:`ctest_coverage` learned to support Delphi coverage.
diff --git a/Help/release/dev/curl-darwinssl.rst b/Help/release/dev/curl-darwinssl.rst
deleted file mode 100644
index 3571bd1..0000000
--- a/Help/release/dev/curl-darwinssl.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-curl-darwinssl
---------------
-
-* On OS X, commands supporting network communication, such as
-  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now support SSL/TLS even when CMake
-  is not built against OpenSSL.  The OS X native SSL/TLS
-  implementation is used by default.  OS-configured certificate
-  authorities will be trusted automatically.
diff --git a/Help/release/dev/curl-default-cainfo.rst b/Help/release/dev/curl-default-cainfo.rst
deleted file mode 100644
index ed45d36..0000000
--- a/Help/release/dev/curl-default-cainfo.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-curl-default-cainfo
--------------------
-
-* When CMake is built with OpenSSL on systems other than Windows
-  and OS X, commands supporting network communication via ``https``,
-  such as :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now search for OS-configured certificate
-  authorities in a few ``/etc`` paths to be trusted automatically.
diff --git a/Help/release/dev/curl-winssl.rst b/Help/release/dev/curl-winssl.rst
deleted file mode 100644
index 9a28f4f..0000000
--- a/Help/release/dev/curl-winssl.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-curl-winssl
------------
-
-* On Windows, commands supporting network communication, such as
-  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now support SSL/TLS even when CMake
-  is not built against OpenSSL.  The Windows native SSL/TLS
-  implementation is used by default.  OS-configured certificate
-  authorities will be trusted automatically.
diff --git a/Help/release/dev/custom-command-byproducts.rst b/Help/release/dev/custom-command-byproducts.rst
deleted file mode 100644
index dc85fdb..0000000
--- a/Help/release/dev/custom-command-byproducts.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-custom-command-byproducts
--------------------------
-
-* The :command:`add_custom_command` and :command:`add_custom_target`
-  commands learned a new ``BYPRODUCTS`` option to specify files
-  produced as side effects of the custom commands.  These are not
-  outputs because they do not always have to be newer than inputs.
diff --git a/Help/release/dev/feature-record-msvc.rst b/Help/release/dev/feature-record-msvc.rst
deleted file mode 100644
index a8c9fd1..0000000
--- a/Help/release/dev/feature-record-msvc.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-feature-record-msvc
--------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Microsoft Visual Studio (``MSVC``).
diff --git a/Help/release/dev/file-LOCK-command.rst b/Help/release/dev/file-LOCK-command.rst
deleted file mode 100644
index 4b11e9e..0000000
--- a/Help/release/dev/file-LOCK-command.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-file-LOCK-command
------------------
-
-* The :command:`file(LOCK)` subcommand was created to allow CMake
-  processes to synchronize through file and directory locks.
diff --git a/Help/release/dev/file-strings-utf-16.rst b/Help/release/dev/file-strings-utf-16.rst
deleted file mode 100644
index f40b63e..0000000
--- a/Help/release/dev/file-strings-utf-16.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-file-strings-utf-16
--------------------
-
-* The :command:`file(STRINGS)` now supports UTF-16LE, UTF-16BE,
-  UTF-32LE, UTF-32BE as ``ENCODING`` options.
diff --git a/Help/release/dev/find-msmpi.rst b/Help/release/dev/find-msmpi.rst
deleted file mode 100644
index 6ece5c8..0000000
--- a/Help/release/dev/find-msmpi.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-find-msmpi
-----------
-
-* The :module:`FindMPI` module learned to find MS-MPI on Windows.
diff --git a/Help/release/dev/install-EXPORT-absolute-prefix.rst b/Help/release/dev/install-EXPORT-absolute-prefix.rst
deleted file mode 100644
index 1b2a01c..0000000
--- a/Help/release/dev/install-EXPORT-absolute-prefix.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-install-EXPORT-absolute-prefix
-------------------------------
-
-* The :command:`install(EXPORT)` command now works with an absolute
-  ``DESTINATION`` even if targets in the export set are installed
-  with a destination or usage requirements specified relative to the
-  install prefix.  The value of the :variable:`CMAKE_INSTALL_PREFIX`
-  variable is hard-coded into the installed export file as the base
-  for relative references.
diff --git a/Help/release/dev/record-GNU-5-features.rst b/Help/release/dev/record-GNU-5-features.rst
deleted file mode 100644
index 0da9e75..0000000
--- a/Help/release/dev/record-GNU-5-features.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-record-GNU-5-features
----------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU compiler version 5.0.
diff --git a/Help/release/dev/rpm_multi_prefix.rst b/Help/release/dev/rpm_multi_prefix.rst
deleted file mode 100644
index 0329592..0000000
--- a/Help/release/dev/rpm_multi_prefix.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-rpm_multi_prefix
-----------------
-
-* The :module:`CPackRPM` module learned a new
-  :variable:`CPACK_RPM_<COMPONENT>_PACKAGE_PREFIX` variable to
-  specify a component-specific value to use instead of
-  :variable:`CPACK_PACKAGING_INSTALL_PREFIX`.
-
-* The :module:`CPackRPM` module learned a new
-  :variable:`CPACK_RPM_RELOCATION_PATHS` variable to
-  specify multiple relocation prefixes for a single rpm package.
diff --git a/Help/release/dev/try-run-link-libraries.rst b/Help/release/dev/try-run-link-libraries.rst
deleted file mode 100644
index 4f20cbd..0000000
--- a/Help/release/dev/try-run-link-libraries.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-try-run-link-libraries
-----------------------
-
-* The :command:`try_run` command learned to honor the ``LINK_LIBRARIES``
-  option just as :command:`try_compile` already does.
diff --git a/Help/release/dev/try_compile-link-flags.rst b/Help/release/dev/try_compile-link-flags.rst
deleted file mode 100644
index d995e0b..0000000
--- a/Help/release/dev/try_compile-link-flags.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-try_compile-link-flags
-----------------------
-
-* The :command:`try_compile` command source file signature now honors
-  link flags (e.g. :variable:`CMAKE_EXE_LINKER_FLAGS`) in the generated
-  test project.  See policy :policy:`CMP0056`.
diff --git a/Help/release/dev/unsupported-compilers.rst b/Help/release/dev/unsupported-compilers.rst
deleted file mode 100644
index 1f3e8c1..0000000
--- a/Help/release/dev/unsupported-compilers.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-unsupported-compilers
----------------------
-
-* The implementation of CMake relies on some C++ compiler features which are
-  not supported by some older compilers.  As a result, those old compilers
-  can no longer be used to build CMake itself.  CMake continues to be able to
-  generate Makefiles and project files for users of those old compilers
-  however.  The compilers known to no longer be capable of building CMake
-  are:
-
-  * MSVC 6 and 7.0 - superceded by VisualStudio 7.1 and newer compilers.
-  * GCC 2.95 - superceded by GCC 3 and newer compilers.
-  * Borland compilers - superceded by other Windows compilers.
-  * Compaq compilers - superceded by other compilers.
-  * Comeau compilers - superceded by other compilers.
-  * SGI compilers - IRIX was dropped as a host platform.
-
-  When building using SolarisStudio 12, the default ``libCStd`` standard
-  library is not sufficient to build CMake.  The SolarisStudio distribution
-  supports compiler options to use ``STLPort4`` or ``libstdc++``.  An
-  appropriate option to select the standard library is now added
-  automatically when building CMake with SolarisStudio compilers.
diff --git a/Help/release/dev/vs-nsight-tegra-min-api.rst b/Help/release/dev/vs-nsight-tegra-min-api.rst
deleted file mode 100644
index f8fa056..0000000
--- a/Help/release/dev/vs-nsight-tegra-min-api.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-vs-nsight-tegra-min-api
------------------------
-
-* A :prop_tgt:`ANDROID_API_MIN` target property was introduced to
-  specify the minimum version to be targeted by the toolchain.
diff --git a/Help/release/dev/vs-shader-flags.rst b/Help/release/dev/vs-shader-flags.rst
deleted file mode 100644
index 0d3f6cc..0000000
--- a/Help/release/dev/vs-shader-flags.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-vs-shader-flags
----------------
-
-* A :prop_sf:`VS_SHADER_FLAGS` source file property was added to specify
-  additional shader flags to ``.hlsl`` files, for the Visual Studio generators.
diff --git a/Help/release/dev/windows-utf-8.rst b/Help/release/dev/windows-utf-8.rst
deleted file mode 100644
index 64cd616..0000000
--- a/Help/release/dev/windows-utf-8.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-windows-utf-8
--------------
-
-* On Windows, CMake learned to support international characters.
-  This allows use of characters from multiple (spoken) languages
-  in CMake code, paths to source files, configured files such as
-  ``.h.in`` files, and other files read and written by CMake.
-  Because CMake interoperates with many other tools, there may
-  still be some limitations when using certain international
-  characters.
-
-  Files written in the :manual:`cmake-language(7)`, such as
-  ``CMakeLists.txt`` or ``*.cmake`` files, are expected to be
-  encoded as UTF-8.  If files are already ASCII, they will be
-  compatible.  If files were in a different encoding, including
-  Latin 1, they will need to be converted.
-
-  The Visual Studio generators now write solution and project
-  files in UTF-8 instead of Windows-1252.  Windows-1252 supported
-  Latin 1 languages such as those found in North and South America
-  and Western Europe.  With UTF-8, additional languages are now
-  supported.
diff --git a/Help/release/dev/xcode-revise-make-program.rst b/Help/release/dev/xcode-revise-make-program.rst
deleted file mode 100644
index f50cf44..0000000
--- a/Help/release/dev/xcode-revise-make-program.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-xcode-revise-make-program
--------------------------
-
-* The :generator:`Xcode` generator no longer requires a value for
-  the :variable:`CMAKE_MAKE_PROGRAM` variable to be located up front.
-  It now locates ``xcodebuild`` when needed at build time.
diff --git a/Help/release/index.rst b/Help/release/index.rst
index abc19b8..990accf 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -13,5 +13,6 @@ Releases
 .. toctree::
    :maxdepth: 1
 
+   3.2.0 <3.2.0>
    3.1.0 <3.1.0>
    3.0.0 <3.0.0>

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

Summary of changes:
 Help/release/3.2.0.rst                             |  267 ++++++++++++++++++++
 Help/release/dev/Apple-GNU-compiler-features.rst   |    5 -
 Help/release/dev/Apple-compiler-selection.rst      |    8 -
 .../dev/CTestCoverageCollectGCOV-refinements.rst   |    6 -
 Help/release/dev/ExternalData-custom-download.rst  |    7 -
 .../ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst   |    6 -
 .../dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst |    6 -
 .../dev/ExternalProject_UPDATE_DISCONNECTED.rst    |    6 -
 .../ExternalProject_independent-step-targets.rst   |    6 -
 Help/release/dev/FindCUDA-cusolver.rst             |    5 -
 Help/release/dev/FindGit-local-Github.rst          |    5 -
 Help/release/dev/FindLATEX-components.rst          |    4 -
 Help/release/dev/FindOpenGL-no-X11.rst             |    8 -
 Help/release/dev/FindOpenSSL-separate-libs.rst     |    7 -
 Help/release/dev/GNU-4.4-compile-features.rst      |    5 -
 .../release/dev/SolarisStudio-compile-features.rst |    5 -
 Help/release/dev/WCDH-thread_local.rst             |    7 -
 ...riteCompilerDetectionHeader-multi-file-lang.rst |    6 -
 Help/release/dev/Xcode-clang-compile-features.rst  |    5 -
 Help/release/dev/add-FindGSL.rst                   |    5 -
 Help/release/dev/add-FindIntl.rst                  |    5 -
 Help/release/dev/add-FindJsonCpp.rst               |    5 -
 Help/release/dev/add-continue-command.rst          |    6 -
 Help/release/dev/add-xz-support.rst                |    5 -
 .../release/dev/add_javascript_coverage_parser.rst |    4 -
 Help/release/dev/break-command-strictness.rst      |    6 -
 Help/release/dev/cached-regex-clear-fixed.rst      |    5 -
 Help/release/dev/cmake-E-tar-files-from.rst        |    6 -
 Help/release/dev/cmake-E-tar-mtime.rst             |    6 -
 Help/release/dev/console-pool.rst                  |   10 -
 .../dev/cpack-rpm-component-descriptions.rst       |    7 -
 Help/release/dev/cpack-rpm-pre-post-install.rst    |   12 -
 Help/release/dev/ctest-delphi-coverage.rst         |    4 -
 Help/release/dev/curl-darwinssl.rst                |    9 -
 Help/release/dev/curl-default-cainfo.rst           |    8 -
 Help/release/dev/curl-winssl.rst                   |    9 -
 Help/release/dev/custom-command-byproducts.rst     |    7 -
 Help/release/dev/feature-record-msvc.rst           |    5 -
 Help/release/dev/file-LOCK-command.rst             |    5 -
 Help/release/dev/file-strings-utf-16.rst           |    5 -
 Help/release/dev/find-msmpi.rst                    |    4 -
 .../release/dev/install-EXPORT-absolute-prefix.rst |    9 -
 Help/release/dev/record-GNU-5-features.rst         |    5 -
 Help/release/dev/rpm_multi_prefix.rst              |   11 -
 Help/release/dev/try-run-link-libraries.rst        |    5 -
 Help/release/dev/try_compile-link-flags.rst        |    6 -
 Help/release/dev/unsupported-compilers.rst         |   22 --
 Help/release/dev/vs-nsight-tegra-min-api.rst       |    5 -
 Help/release/dev/vs-shader-flags.rst               |    5 -
 Help/release/dev/windows-utf-8.rst                 |   22 --
 Help/release/dev/xcode-revise-make-program.rst     |    6 -
 Help/release/index.rst                             |    1 +
 52 files changed, 268 insertions(+), 341 deletions(-)
 create mode 100644 Help/release/3.2.0.rst
 delete mode 100644 Help/release/dev/Apple-GNU-compiler-features.rst
 delete mode 100644 Help/release/dev/Apple-compiler-selection.rst
 delete mode 100644 Help/release/dev/CTestCoverageCollectGCOV-refinements.rst
 delete mode 100644 Help/release/dev/ExternalData-custom-download.rst
 delete mode 100644 Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst
 delete mode 100644 Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
 delete mode 100644 Help/release/dev/ExternalProject_UPDATE_DISCONNECTED.rst
 delete mode 100644 Help/release/dev/ExternalProject_independent-step-targets.rst
 delete mode 100644 Help/release/dev/FindCUDA-cusolver.rst
 delete mode 100644 Help/release/dev/FindGit-local-Github.rst
 delete mode 100644 Help/release/dev/FindLATEX-components.rst
 delete mode 100644 Help/release/dev/FindOpenGL-no-X11.rst
 delete mode 100644 Help/release/dev/FindOpenSSL-separate-libs.rst
 delete mode 100644 Help/release/dev/GNU-4.4-compile-features.rst
 delete mode 100644 Help/release/dev/SolarisStudio-compile-features.rst
 delete mode 100644 Help/release/dev/WCDH-thread_local.rst
 delete mode 100644 Help/release/dev/WriteCompilerDetectionHeader-multi-file-lang.rst
 delete mode 100644 Help/release/dev/Xcode-clang-compile-features.rst
 delete mode 100644 Help/release/dev/add-FindGSL.rst
 delete mode 100644 Help/release/dev/add-FindIntl.rst
 delete mode 100644 Help/release/dev/add-FindJsonCpp.rst
 delete mode 100644 Help/release/dev/add-continue-command.rst
 delete mode 100644 Help/release/dev/add-xz-support.rst
 delete mode 100644 Help/release/dev/add_javascript_coverage_parser.rst
 delete mode 100644 Help/release/dev/break-command-strictness.rst
 delete mode 100644 Help/release/dev/cached-regex-clear-fixed.rst
 delete mode 100644 Help/release/dev/cmake-E-tar-files-from.rst
 delete mode 100644 Help/release/dev/cmake-E-tar-mtime.rst
 delete mode 100644 Help/release/dev/console-pool.rst
 delete mode 100644 Help/release/dev/cpack-rpm-component-descriptions.rst
 delete mode 100644 Help/release/dev/cpack-rpm-pre-post-install.rst
 delete mode 100644 Help/release/dev/ctest-delphi-coverage.rst
 delete mode 100644 Help/release/dev/curl-darwinssl.rst
 delete mode 100644 Help/release/dev/curl-default-cainfo.rst
 delete mode 100644 Help/release/dev/curl-winssl.rst
 delete mode 100644 Help/release/dev/custom-command-byproducts.rst
 delete mode 100644 Help/release/dev/feature-record-msvc.rst
 delete mode 100644 Help/release/dev/file-LOCK-command.rst
 delete mode 100644 Help/release/dev/file-strings-utf-16.rst
 delete mode 100644 Help/release/dev/find-msmpi.rst
 delete mode 100644 Help/release/dev/install-EXPORT-absolute-prefix.rst
 delete mode 100644 Help/release/dev/record-GNU-5-features.rst
 delete mode 100644 Help/release/dev/rpm_multi_prefix.rst
 delete mode 100644 Help/release/dev/try-run-link-libraries.rst
 delete mode 100644 Help/release/dev/try_compile-link-flags.rst
 delete mode 100644 Help/release/dev/unsupported-compilers.rst
 delete mode 100644 Help/release/dev/vs-nsight-tegra-min-api.rst
 delete mode 100644 Help/release/dev/vs-shader-flags.rst
 delete mode 100644 Help/release/dev/windows-utf-8.rst
 delete mode 100644 Help/release/dev/xcode-revise-make-program.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb  4 13:59:34 2015
From: brad.king at kitware.com (Brad King)
Date: Wed,  4 Feb 2015 13:59:34 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2589-g6894b25
Message-ID: <20150204185934.A0F72AAB43@public.kitware.com>

This is an automated email from 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  6894b2511b2517091d3383b5a6313467919f1847 (commit)
       via  2bbbf99d7bd27844dcf157f72bd05eb7d20ce888 (commit)
       via  44100adc6c7f7db7bfd4ccf0d8bd18de8ab195c0 (commit)
      from  ba1989e5609850771ea4291c85fcd0a0620b3c68 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6894b2511b2517091d3383b5a6313467919f1847
commit 6894b2511b2517091d3383b5a6313467919f1847
Merge: ba1989e 2bbbf99
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 13:59:33 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 13:59:33 2015 -0500

    Merge topic 'test-release' into next
    
    2bbbf99d Merge branch 'release-3.1' into test-release
    44100adc CMake 3.1.2


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2bbbf99d7bd27844dcf157f72bd05eb7d20ce888
commit 2bbbf99d7bd27844dcf157f72bd05eb7d20ce888
Merge: eef9a47 44100ad
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 13:59:02 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 13:59:02 2015 -0500

    Merge branch 'release-3.1' into test-release


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44100adc6c7f7db7bfd4ccf0d8bd18de8ab195c0
commit 44100adc6c7f7db7bfd4ccf0d8bd18de8ab195c0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 13:58:33 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 13:58:33 2015 -0500

    CMake 3.1.2

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

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb  4 15:25:11 2015
From: brad.king at kitware.com (Brad King)
Date: Wed,  4 Feb 2015 15:25:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2591-g950f8fe
Message-ID: <20150204202511.4616BAA9F3@public.kitware.com>

This is an automated email from 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  950f8fe104ee7f45fb1cd2a240bc80ede115e6ad (commit)
       via  ecaee7caca4e3d4528e643736c0620e785e84153 (commit)
      from  6894b2511b2517091d3383b5a6313467919f1847 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=950f8fe104ee7f45fb1cd2a240bc80ede115e6ad
commit 950f8fe104ee7f45fb1cd2a240bc80ede115e6ad
Merge: 6894b25 ecaee7c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 15:25:10 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 15:25:10 2015 -0500

    Merge topic 'cpack-nsis-win64' into next
    
    ecaee7ca CPack: Fix NSIS default 64-bit Windows install directory (#14211)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ecaee7caca4e3d4528e643736c0620e785e84153
commit ecaee7caca4e3d4528e643736c0620e785e84153
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 15:09:18 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 15:11:10 2015 -0500

    CPack: Fix NSIS default 64-bit Windows install directory (#14211)
    
    When targeting Windows with a 64-bit architecture, use "$PROGRAMFILES64"
    to get the Program Files folder.  Use CMAKE_SIZEOF_VOID_P to check for
    the architecture size instead of CMAKE_CL_64 because the latter is not
    defined for all compilers.
    
    Inspired-by: Hugh Sorby <h.sorby at auckland.ac.nz>
    Inspired-by: ?smail D?nmez <ismail at donmez.ws>

diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 35259c4..ce1536e 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -352,8 +352,8 @@ if(CPACK_NSIS_MODIFY_PATH)
 endif()
 
 set(__cpack_system_name ${CMAKE_SYSTEM_NAME})
-if(${__cpack_system_name} MATCHES Windows)
-  if(CMAKE_CL_64)
+if(__cpack_system_name MATCHES "Windows")
+  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     set(__cpack_system_name win64)
   else()
     set(__cpack_system_name win32)
@@ -363,7 +363,12 @@ cpack_set_if_not_set(CPACK_SYSTEM_NAME "${__cpack_system_name}")
 
 # Root dir: default value should be the string literal "$PROGRAMFILES"
 # for backwards compatibility. Projects may set this value to anything.
-set(__cpack_root_default "$PROGRAMFILES")
+# When creating 64 bit binaries we set the default value to "$PROGRAMFILES64"
+if("x${__cpack_system_name}" STREQUAL "xwin64")
+  set(__cpack_root_default "$PROGRAMFILES64")
+else()
+  set(__cpack_root_default "$PROGRAMFILES")
+endif()
 cpack_set_if_not_set(CPACK_NSIS_INSTALL_ROOT "${__cpack_root_default}")
 
 # <project>-<major>.<minor>.<patch>-<release>-<platform>.<pkgtype>

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

Summary of changes:
 Modules/CPack.cmake |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Feb  4 15:51:39 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  4 Feb 2015 15:51:39 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2596-gcd7e669
Message-ID: <20150204205139.933E2AAAFD@public.kitware.com>

This is an automated email from 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  cd7e6690f95e3fb6c61bf2c0fdbd12880f55bb66 (commit)
       via  e49ac7e1faccdbcffa88127a92d7184832fbc383 (commit)
       via  5e2569af959073ff3b91a5ee2a5325ad8c854744 (commit)
       via  6ed3d551f7caf18b50a4ce6c82323e3cdddd5c62 (commit)
       via  415151c383e74402d8922cbc1fc2ed8ee7040f0c (commit)
      from  950f8fe104ee7f45fb1cd2a240bc80ede115e6ad (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd7e6690f95e3fb6c61bf2c0fdbd12880f55bb66
commit cd7e6690f95e3fb6c61bf2c0fdbd12880f55bb66
Merge: 950f8fe e49ac7e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 15:51:38 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 15:51:38 2015 -0500

    Merge topic 'doc-3.2-relnotes' into next
    
    e49ac7e1 RelNotes: Document that the AUTORCC feature tracks dependencies.
    5e2569af RelNotes: Document the versions of compilers supported for features.
    6ed3d551 RelNotes: Document some new features of file(GENERATE).
    415151c3 RelNotes: Add some cross-linking.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e49ac7e1faccdbcffa88127a92d7184832fbc383
commit e49ac7e1faccdbcffa88127a92d7184832fbc383
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 21:45:25 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 4 21:50:35 2015 +0100

    RelNotes: Document that the AUTORCC feature tracks dependencies.

diff --git a/Help/release/3.2.0.rst b/Help/release/3.2.0.rst
index 9068a97..fc3c1b3 100644
--- a/Help/release/3.2.0.rst
+++ b/Help/release/3.2.0.rst
@@ -208,6 +208,10 @@ Other
   * Microsoft Visual Studio (``MSVC``) for versions 2010 through 2015.
   * Oracle SolarisStudio (``SunPro``) version 12.4.
 
+* The :ref:`Qt AUTORCC` feature now tracks files listed in ``.qrc`` files
+  as dependencies. If an input file to the ``rcc`` tool is changed, the tool
+  is automatically re-run.
+
 New Diagnostics
 ===============
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e2569af959073ff3b91a5ee2a5325ad8c854744
commit 5e2569af959073ff3b91a5ee2a5325ad8c854744
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 21:44:46 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 4 21:50:35 2015 +0100

    RelNotes: Document the versions of compilers supported for features.

diff --git a/Help/release/3.2.0.rst b/Help/release/3.2.0.rst
index 0793d8e..9068a97 100644
--- a/Help/release/3.2.0.rst
+++ b/Help/release/3.2.0.rst
@@ -203,10 +203,10 @@ Other
 * The :manual:`Compile Features <cmake-compile-features(7)>` functionality
   is now aware of features supported by more compilers, including:
 
-  * Apple Clang (``AppleClang``).
-  * GNU compiler versions 4.4 through 5.0, including Apple variants (``GNU``).
-  * Microsoft Visual Studio (``MSVC``).
-  * Oracle SolarisStudio (``SunPro``).
+  * Apple Clang (``AppleClang``) for Xcode versions 4.4 though 6.1.
+  * GNU compiler versions 4.4 through 5.0 on UNIX and Apple (``GNU``).
+  * Microsoft Visual Studio (``MSVC``) for versions 2010 through 2015.
+  * Oracle SolarisStudio (``SunPro``) version 12.4.
 
 New Diagnostics
 ===============

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ed3d551f7caf18b50a4ce6c82323e3cdddd5c62
commit 6ed3d551f7caf18b50a4ce6c82323e3cdddd5c62
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 21:44:11 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 4 21:44:11 2015 +0100

    RelNotes: Document some new features of file(GENERATE).

diff --git a/Help/release/3.2.0.rst b/Help/release/3.2.0.rst
index 55c0c9d..0793d8e 100644
--- a/Help/release/3.2.0.rst
+++ b/Help/release/3.2.0.rst
@@ -61,6 +61,13 @@ Commands
 * The :command:`try_run` command learned to honor the ``LINK_LIBRARIES``
   option just as :command:`try_compile` already does.
 
+* The :command:`file(GENERATE)` command now generates the output file with
+  the same permissions as the input file if set.
+
+* The :command:`file(GENERATE)` command can now generate files which are
+  used as source files for buildsystem targets.  Generated files
+  automatically get their :prop_sf:`GENERATED` property set to ``TRUE``.
+
 Variables
 ---------
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=415151c383e74402d8922cbc1fc2ed8ee7040f0c
commit 415151c383e74402d8922cbc1fc2ed8ee7040f0c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 21:43:40 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 4 21:43:40 2015 +0100

    RelNotes: Add some cross-linking.

diff --git a/Help/release/3.2.0.rst b/Help/release/3.2.0.rst
index fba6523..55c0c9d 100644
--- a/Help/release/3.2.0.rst
+++ b/Help/release/3.2.0.rst
@@ -33,8 +33,8 @@ Commands
   commands learned a new ``USES_TERMINAL`` option to request that
   the command be given direct access to the terminal if possible.
   The :generator:`Ninja` generator will places such commands in the
-  ``console`` pool.  Build targets provided by CMake that are meant
-  for individual interactive use, such as ``install``, are now
+  ``console`` :prop_gbl:`pool <JOB_POOLS>`.  Build targets provided by CMake
+  that are meant for individual interactive use, such as ``install``, are now
   placed in this pool.
 
 * A new :command:`continue` command was added that can be called inside loop
@@ -49,10 +49,10 @@ Commands
 
 * The :command:`install(EXPORT)` command now works with an absolute
   ``DESTINATION`` even if targets in the export set are installed
-  with a destination or usage requirements specified relative to the
-  install prefix.  The value of the :variable:`CMAKE_INSTALL_PREFIX`
-  variable is hard-coded into the installed export file as the base
-  for relative references.
+  with a destination or :ref:`usage requirements <Target Usage Requirements>`
+  specified relative to the install prefix.  The value of the
+  :variable:`CMAKE_INSTALL_PREFIX` variable is hard-coded into the installed
+  export file as the base for relative references.
 
 * The :command:`try_compile` command source file signature now honors
   link flags (e.g. :variable:`CMAKE_EXE_LINKER_FLAGS`) in the generated

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

Summary of changes:
 Help/release/3.2.0.rst |   31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Feb  4 15:57:00 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  4 Feb 2015 15:57:00 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2599-g20dca82
Message-ID: <20150204205700.65761AACAC@public.kitware.com>

This is an automated email from 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  20dca828e47efc9d01f6f7ead0a0691a142f3175 (commit)
       via  f9839c491ef926b71487345fdcc7054324587168 (commit)
       via  44d6f3ce0839ba0407dc095d1edc1f30e732b719 (commit)
      from  cd7e6690f95e3fb6c61bf2c0fdbd12880f55bb66 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20dca828e47efc9d01f6f7ead0a0691a142f3175
commit 20dca828e47efc9d01f6f7ead0a0691a142f3175
Merge: cd7e669 f9839c4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 15:56:59 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 15:56:59 2015 -0500

    Merge topic 'update-docs' into next
    
    f9839c49 Help: Document build targets automatically added to console pool.
    44d6f3ce Help: Add some cross-linking.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9839c491ef926b71487345fdcc7054324587168
commit f9839c491ef926b71487345fdcc7054324587168
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 21:52:13 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 4 21:52:13 2015 +0100

    Help: Document build targets automatically added to console pool.

diff --git a/Help/prop_gbl/JOB_POOLS.rst b/Help/prop_gbl/JOB_POOLS.rst
index 98b9f7e..2ce74b8 100644
--- a/Help/prop_gbl/JOB_POOLS.rst
+++ b/Help/prop_gbl/JOB_POOLS.rst
@@ -18,3 +18,6 @@ Defined pools could be used globally by setting
 :variable:`CMAKE_JOB_POOL_COMPILE` and :variable:`CMAKE_JOB_POOL_LINK`
 or per target by setting the target properties
 :prop_tgt:`JOB_POOL_COMPILE` and :prop_tgt:`JOB_POOL_LINK`.
+
+Build targets provided by CMake that are meant for individual interactive
+use, such as ``install``, are placed in the ``console`` pool automatically.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44d6f3ce0839ba0407dc095d1edc1f30e732b719
commit 44d6f3ce0839ba0407dc095d1edc1f30e732b719
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 21:52:00 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 4 21:52:00 2015 +0100

    Help: Add some cross-linking.

diff --git a/Help/command/add_custom_command.rst b/Help/command/add_custom_command.rst
index 1307a58..e646c56 100644
--- a/Help/command/add_custom_command.rst
+++ b/Help/command/add_custom_command.rst
@@ -147,7 +147,7 @@ The options are:
 ``USES_TERMINAL``
   The command will be given direct access to the terminal if possible.
   With the :generator:`Ninja` generator, this places the command in
-  the ``console`` pool.
+  the ``console`` :prop_gbl:`pool <JOB_POOLS>`.
 
 ``VERBATIM``
   All arguments to the commands will be escaped properly for the
diff --git a/Help/command/add_custom_target.rst b/Help/command/add_custom_target.rst
index 5134a70..82d69db 100644
--- a/Help/command/add_custom_target.rst
+++ b/Help/command/add_custom_target.rst
@@ -103,7 +103,7 @@ The options are:
 ``USES_TERMINAL``
   The command will be given direct access to the terminal if possible.
   With the :generator:`Ninja` generator, this places the command in
-  the ``console`` pool.
+  the ``console`` :prop_gbl:`pool <JOB_POOLS>`.
 
 ``WORKING_DIRECTORY``
   Execute the command with the given current working directory.
diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst
index fba1d61..3367ba4 100644
--- a/Help/manual/cmake-packages.7.rst
+++ b/Help/manual/cmake-packages.7.rst
@@ -358,7 +358,7 @@ and a ``cmake/ClimbingStatsConfig.cmake`` are installed to the same location,
 completing the package.
 
 The generated :prop_tgt:`IMPORTED` targets have appropriate properties set
-to define their usage requirements, such as
+to define their :ref:`usage requirements <Target Usage Requirements>`, such as
 :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES`,
 :prop_tgt:`INTERFACE_COMPILE_DEFINITIONS` and other relevant built-in
 ``INTERFACE_`` properties.  The ``INTERFACE`` variant of user-defined

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

Summary of changes:
 Help/command/add_custom_command.rst |    2 +-
 Help/command/add_custom_target.rst  |    2 +-
 Help/manual/cmake-packages.7.rst    |    2 +-
 Help/prop_gbl/JOB_POOLS.rst         |    3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Feb  4 16:06:38 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  4 Feb 2015 16:06:38 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2602-g3a3d9fb
Message-ID: <20150204210638.B501FAAE6A@public.kitware.com>

This is an automated email from 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  3a3d9fb5810cd408a232df2fcb86599624eb216b (commit)
       via  43cdef5bbde4616bce8be3144d0cdfa005cece03 (commit)
       via  572dbfc18ee29474590ca8170074190c074761f5 (commit)
      from  20dca828e47efc9d01f6f7ead0a0691a142f3175 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a3d9fb5810cd408a232df2fcb86599624eb216b
commit 3a3d9fb5810cd408a232df2fcb86599624eb216b
Merge: 20dca82 43cdef5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 16:06:37 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 16:06:37 2015 -0500

    Merge topic 'fix-C-standard-features' into next
    
    43cdef5b Features: Populate CMAKE_<LANG>_STANDARD_DEFAULT only for supported compilers.
    572dbfc1 AppleClang: Remove redundant UNIX condition.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43cdef5bbde4616bce8be3144d0cdfa005cece03
commit 43cdef5bbde4616bce8be3144d0cdfa005cece03
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 22:04:18 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 4 22:04:18 2015 +0100

    Features: Populate CMAKE_<LANG>_STANDARD_DEFAULT only for supported compilers.

diff --git a/Modules/Compiler/AppleClang-C.cmake b/Modules/Compiler/AppleClang-C.cmake
index 00d2633..10454f6 100644
--- a/Modules/Compiler/AppleClang-C.cmake
+++ b/Modules/Compiler/AppleClang-C.cmake
@@ -12,7 +12,9 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
   set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu11")
 endif()
 
-set(CMAKE_C_STANDARD_DEFAULT 99)
+if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
+  set(CMAKE_C_STANDARD_DEFAULT 99)
+endif()
 
 macro(cmake_record_c_compile_features)
   macro(_get_appleclang_features std_version list)
diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake
index 6d58be3..5194da4 100644
--- a/Modules/Compiler/AppleClang-CXX.cmake
+++ b/Modules/Compiler/AppleClang-CXX.cmake
@@ -19,7 +19,9 @@ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1)
   set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
 endif()
 
-set(CMAKE_CXX_STANDARD_DEFAULT 98)
+if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
+  set(CMAKE_CXX_STANDARD_DEFAULT 98)
+endif()
 
 macro(cmake_record_cxx_compile_features)
   macro(_get_appleclang_features std_version list)
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index e07eace..84b2c74 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -31,7 +31,9 @@ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
   set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
 endif()
 
-set(CMAKE_CXX_STANDARD_DEFAULT 98)
+if(UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
+  set(CMAKE_CXX_STANDARD_DEFAULT 98)
+endif()
 
 macro(cmake_record_cxx_compile_features)
   macro(_get_clang_features std_version list)
diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index fa97a94..89704e6 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -24,7 +24,7 @@ endif()
 
 if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
   set(CMAKE_C_STANDARD_DEFAULT 11)
-else()
+elseif(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
   set(CMAKE_C_STANDARD_DEFAULT 90)
 endif()
 
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index c471daf..86a31e4 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -34,7 +34,9 @@ elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
   set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
 endif()
 
-set(CMAKE_CXX_STANDARD_DEFAULT 98)
+if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
+  set(CMAKE_CXX_STANDARD_DEFAULT 98)
+endif()
 
 macro(cmake_record_cxx_compile_features)
   macro(_get_gcc_features std_version list)
diff --git a/Modules/Compiler/MSVC-CXX.cmake b/Modules/Compiler/MSVC-CXX.cmake
index 962aaeb..82ce069 100644
--- a/Modules/Compiler/MSVC-CXX.cmake
+++ b/Modules/Compiler/MSVC-CXX.cmake
@@ -1,5 +1,8 @@
-# MSVC has no specific language level or flags to change it.
-set(CMAKE_CXX_STANDARD_DEFAULT "")
+
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.0)
+  # MSVC has no specific language level or flags to change it.
+  set(CMAKE_CXX_STANDARD_DEFAULT "")
+endif()
 
 macro(cmake_record_cxx_compile_features)
   record_compiler_features(CXX "" CMAKE_CXX_COMPILE_FEATURES)
diff --git a/Modules/Compiler/SunPro-CXX.cmake b/Modules/Compiler/SunPro-CXX.cmake
index cb37713..c7bc734 100644
--- a/Modules/Compiler/SunPro-CXX.cmake
+++ b/Modules/Compiler/SunPro-CXX.cmake
@@ -37,7 +37,9 @@ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
   set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=c++11")
 endif()
 
-set(CMAKE_CXX_STANDARD_DEFAULT 98)
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
+  set(CMAKE_CXX_STANDARD_DEFAULT 98)
+endif()
 
 macro(cmake_record_cxx_compile_features)
   macro(_get_solaris_studio_features std_version list)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=572dbfc18ee29474590ca8170074190c074761f5
commit 572dbfc18ee29474590ca8170074190c074761f5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 22:03:49 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 4 22:03:49 2015 +0100

    AppleClang: Remove redundant UNIX condition.

diff --git a/Modules/Compiler/AppleClang-C.cmake b/Modules/Compiler/AppleClang-C.cmake
index 16f420f..00d2633 100644
--- a/Modules/Compiler/AppleClang-C.cmake
+++ b/Modules/Compiler/AppleClang-C.cmake
@@ -20,7 +20,7 @@ macro(cmake_record_c_compile_features)
   endmacro()
 
   set(_result 0)
-  if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
     _get_appleclang_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
     if (_result EQUAL 0)
       _get_appleclang_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES)
diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake
index 978c382..6d58be3 100644
--- a/Modules/Compiler/AppleClang-CXX.cmake
+++ b/Modules/Compiler/AppleClang-CXX.cmake
@@ -27,7 +27,7 @@ macro(cmake_record_cxx_compile_features)
   endmacro()
 
   set(_result 0)
-  if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
     set(_result 0)
     if(CMAKE_CXX14_STANDARD_COMPILE_OPTION)
       _get_appleclang_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES)

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

Summary of changes:
 Modules/Compiler/AppleClang-C.cmake   |    6 ++++--
 Modules/Compiler/AppleClang-CXX.cmake |    6 ++++--
 Modules/Compiler/Clang-CXX.cmake      |    4 +++-
 Modules/Compiler/GNU-C.cmake          |    2 +-
 Modules/Compiler/GNU-CXX.cmake        |    4 +++-
 Modules/Compiler/MSVC-CXX.cmake       |    7 +++++--
 Modules/Compiler/SunPro-CXX.cmake     |    4 +++-
 7 files changed, 23 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb  4 16:07:54 2015
From: brad.king at kitware.com (Brad King)
Date: Wed,  4 Feb 2015 16:07:54 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2604-gfb35d8d
Message-ID: <20150204210754.B8D2DAAF19@public.kitware.com>

This is an automated email from 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  fb35d8df9d7263cb417fb4037df768fa40a49ed9 (commit)
       via  219797e4befa19a79d2d94e0b5a2bbe75415606a (commit)
      from  3a3d9fb5810cd408a232df2fcb86599624eb216b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb35d8df9d7263cb417fb4037df768fa40a49ed9
commit fb35d8df9d7263cb417fb4037df768fa40a49ed9
Merge: 3a3d9fb 219797e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 16:07:54 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 16:07:54 2015 -0500

    Merge topic 'doc-try_compile' into next
    
    219797e4 Help: Revise try_compile and try_run documentation (#15358)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=219797e4befa19a79d2d94e0b5a2bbe75415606a
commit 219797e4befa19a79d2d94e0b5a2bbe75415606a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 16:06:13 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 16:06:13 2015 -0500

    Help: Revise try_compile and try_run documentation (#15358)
    
    Rewrite the documentation using better reStructuredText markup
    constructs.  Clarify interaction of options like LINK_LIBRARIES and
    CMAKE_FLAGS.

diff --git a/Help/command/try_compile.rst b/Help/command/try_compile.rst
index 224c67b..9a70885 100644
--- a/Help/command/try_compile.rst
+++ b/Help/command/try_compile.rst
@@ -1,72 +1,100 @@
 try_compile
 -----------
 
+.. only:: html
+
+   .. contents::
+
 Try building some code.
 
+Try Compiling Whole Projects
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 ::
 
   try_compile(RESULT_VAR <bindir> <srcdir>
-              <projectName> [targetName] [CMAKE_FLAGS flags...]
+              <projectName> [<targetName>] [CMAKE_FLAGS <flags>...]
               [OUTPUT_VARIABLE <var>])
 
-Try building a project.  In this form, srcdir should contain a
-complete CMake project with a CMakeLists.txt file and all sources.
-The bindir and srcdir will not be deleted after this command is run.
-Specify targetName to build a specific target instead of the 'all' or
-'ALL_BUILD' target.
+Try building a project.  The success or failure of the ``try_compile``,
+i.e. ``TRUE`` or ``FALSE`` respectively, is returned in ``RESULT_VAR``.
+
+In this form, ``<srcdir>`` should contain a complete CMake project with a
+``CMakeLists.txt`` file and all sources.  The ``<bindir>`` and ``<srcdir>``
+will not be deleted after this command is run.  Specify ``<targetName>`` to
+build a specific target instead of the ``all`` or ``ALL_BUILD`` target.  See
+below for the meaning of other options.
+
+Try Compiling Source Files
+^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 ::
 
   try_compile(RESULT_VAR <bindir> <srcfile|SOURCES srcfile...>
-              [CMAKE_FLAGS flags...]
-              [COMPILE_DEFINITIONS flags...]
-              [LINK_LIBRARIES libs...]
+              [CMAKE_FLAGS <flags>...]
+              [COMPILE_DEFINITIONS <defs>...]
+              [LINK_LIBRARIES <libs>...]
               [OUTPUT_VARIABLE <var>]
               [COPY_FILE <fileName> [COPY_FILE_ERROR <var>]])
 
-Try building an executable from one or more source files.  In this
-form the user need only supply one or more source files that include a
-definition for 'main'.  CMake will create a CMakeLists.txt file to
-build the source(s) as an executable.  Specify COPY_FILE to get a copy
-of the linked executable at the given fileName and optionally
-COPY_FILE_ERROR to capture any error.
-
-In this version all files in bindir/CMakeFiles/CMakeTmp will be
-cleaned automatically.  For debugging, --debug-trycompile can be
-passed to cmake to avoid this clean.  However, multiple sequential
-try_compile operations reuse this single output directory.  If you use
---debug-trycompile, you can only debug one try_compile call at a time.
-The recommended procedure is to protect all try_compile calls in your
-project by ``if(NOT DEFINED RESULT_VAR)`` logic, configure with cmake
-all the way through once, then delete the cache entry associated with
-the try_compile call of interest, and then re-run cmake again with
---debug-trycompile.
-
-Some extra flags that can be included are, INCLUDE_DIRECTORIES,
-LINK_DIRECTORIES, and LINK_LIBRARIES.  COMPILE_DEFINITIONS are
--Ddefinition that will be passed to the compile line.
-
-The srcfile signature also accepts a LINK_LIBRARIES argument which may
-contain a list of libraries or IMPORTED targets which will be linked
-to in the generated project.  If LINK_LIBRARIES is specified as a
-parameter to try_compile, then any LINK_LIBRARIES passed as
-CMAKE_FLAGS will be ignored.
+Try building an executable from one or more source files.  The success or
+failure of the ``try_compile``, i.e. ``TRUE`` or ``FALSE`` respectively, is
+returned in ``RESULT_VAR``.
 
-try_compile creates a CMakeList.txt file on the fly that looks like
-this:
+In this form the user need only supply one or more source files that include a
+definition for ``main``.  CMake will create a ``CMakeLists.txt`` file to build
+the source(s) as an executable that looks something like this::
 
-::
-
-  add_definitions( <expanded COMPILE_DEFINITIONS from calling cmake>)
+  add_definitions(<expanded COMPILE_DEFINITIONS from caller>)
   include_directories(${INCLUDE_DIRECTORIES})
   link_directories(${LINK_DIRECTORIES})
-  add_executable(cmTryCompileExec sources)
+  add_executable(cmTryCompileExec <srcfile>...)
   target_link_libraries(cmTryCompileExec ${LINK_LIBRARIES})
 
-In both versions of the command, if OUTPUT_VARIABLE is specified, then
-the output from the build process is stored in the given variable.
-The success or failure of the try_compile, i.e.  TRUE or FALSE
-respectively, is returned in RESULT_VAR.  CMAKE_FLAGS can be used to
-pass -DVAR:TYPE=VALUE flags to the cmake that is run during the build.
-Set variable CMAKE_TRY_COMPILE_CONFIGURATION to choose a build
-configuration.
+The options are:
+
+``CMAKE_FLAGS <flags>...``
+  Specify flags of the form ``-DVAR:TYPE=VALUE`` to be passed to
+  the ``cmake`` command-line used to drive the test build.
+  The above example shows how values for variables
+  ``INCLUDE_DIRECTORIES``, ``LINK_DIRECTORIES``, and ``LINK_LIBRARIES``
+  are used.
+
+``COMPILE_DEFINITIONS <defs>...``
+  Specify ``-Ddefinition`` arguments to pass to ``add_definitions``
+  in the generated test project.
+
+``COPY_FILE <fileName>``
+  Copy the linked executable to the given ``<fileName>``.
+
+``COPY_FILE_ERROR <var>``
+  Use after ``COPY_FILE`` to capture into variable ``<var>`` any error
+  message encountered while trying to copy the file.
+
+``LINK_LIBRARIES <libs>...``
+  Specify libraries to be linked in the generated project.
+  The list of libraries may refer to system libraries and to
+  :ref:`Imported Targets <Imported Targets>` from the calling project.
+
+  If this option is specified, any ``-DLINK_LIBRARIES=...`` value
+  given to the ``CMAKE_FLAGS`` option will be ignored.
+
+``OUTPUT_VARIABLE <var>``
+  Store the output from the build process the given variable.
+
+In this version all files in ``<bindir>/CMakeFiles/CMakeTmp`` will be
+cleaned automatically.  For debugging, ``--debug-trycompile`` can be
+passed to ``cmake`` to avoid this clean.  However, multiple sequential
+``try_compile`` operations reuse this single output directory.  If you use
+``--debug-trycompile``, you can only debug one ``try_compile`` call at a time.
+The recommended procedure is to protect all ``try_compile`` calls in your
+project by ``if(NOT DEFINED RESULT_VAR)`` logic, configure with cmake
+all the way through once, then delete the cache entry associated with
+the try_compile call of interest, and then re-run cmake again with
+``--debug-trycompile``.
+
+Other Behavior Settings
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Set the :variable:`CMAKE_TRY_COMPILE_CONFIGURATION` variable to choose
+a build configuration.
diff --git a/Help/command/try_run.rst b/Help/command/try_run.rst
index b8ea0fe..43ee219 100644
--- a/Help/command/try_run.rst
+++ b/Help/command/try_run.rst
@@ -1,59 +1,97 @@
 try_run
 -------
 
+.. only:: html
+
+   .. contents::
+
 Try compiling and then running some code.
 
+Try Compiling and Running Source Files
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 ::
 
   try_run(RUN_RESULT_VAR COMPILE_RESULT_VAR
-          bindir srcfile [CMAKE_FLAGS <flags>]
-          [COMPILE_DEFINITIONS <flags>]
-          [LINK_LIBRARIES <libs>]
-          [COMPILE_OUTPUT_VARIABLE comp]
-          [RUN_OUTPUT_VARIABLE run]
-          [OUTPUT_VARIABLE var]
-          [ARGS <arg1> <arg2>...])
-
-Try compiling a srcfile.  Return TRUE or FALSE for success or failure
-in COMPILE_RESULT_VAR.  Then if the compile succeeded, run the
-executable and return its exit code in RUN_RESULT_VAR.  If the
-executable was built, but failed to run, then RUN_RESULT_VAR will be
-set to FAILED_TO_RUN.  COMPILE_OUTPUT_VARIABLE specifies the variable
-where the output from the compile step goes.  RUN_OUTPUT_VARIABLE
-specifies the variable where the output from the running executable
-goes.
-
-The srcfile signature also accepts a LINK_LIBRARIES argument which may
-contain a list of libraries or IMPORTED targets which will be linked
-to in the generated project.  If LINK_LIBRARIES is specified as a
-parameter to try_run, then any LINK_LIBRARIES passed as
-CMAKE_FLAGS will be ignored.
-
-For compatibility reasons OUTPUT_VARIABLE is still supported, which
-gives you the output from the compile and run step combined.
-
-Cross compiling issues
+          bindir srcfile [CMAKE_FLAGS <flags>...]
+          [COMPILE_DEFINITIONS <defs>...]
+          [LINK_LIBRARIES <libs>...]
+          [COMPILE_OUTPUT_VARIABLE <var>]
+          [RUN_OUTPUT_VARIABLE <var>]
+          [OUTPUT_VARIABLE <var>]
+          [ARGS <args>...])
+
+Try compiling a ``<srcfile>``.  Returns ``TRUE`` or ``FALSE`` for success
+or failure in ``COMPILE_RESULT_VAR``.  If the compile succeeded, runs the
+executable and returns its exit code in ``RUN_RESULT_VAR``.  If the
+executable was built, but failed to run, then ``RUN_RESULT_VAR`` will be
+set to ``FAILED_TO_RUN``.  See the :command:`try_compile` command for
+information on how the test project is constructed to build the source file.
+
+The options are:
+
+``CMAKE_FLAGS <flags>...``
+  Specify flags of the form ``-DVAR:TYPE=VALUE`` to be passed to
+  the ``cmake`` command-line used to drive the test build.
+  The example in :command:`try_compile` shows how values for variables
+  ``INCLUDE_DIRECTORIES``, ``LINK_DIRECTORIES``, and ``LINK_LIBRARIES``
+  are used.
+
+``COMPILE_DEFINITIONS <defs>...``
+  Specify ``-Ddefinition`` arguments to pass to ``add_definitions``
+  in the generated test project.
+
+``COMPILE_OUTPUT_VARIABLE <var>``
+  Report the compile step build output in a given variable.
+
+``LINK_LIBRARIES <libs>...``
+  Specify libraries to be linked in the generated project.
+  The list of libraries may refer to system libraries and to
+  :ref:`Imported Targets <Imported Targets>` from the calling project.
+
+  If this option is specified, any ``-DLINK_LIBRARIES=...`` value
+  given to the ``CMAKE_FLAGS`` option will be ignored.
+
+``OUTPUT_VARIABLE <var>``
+  Report the compile build output and the output from running the executable
+  in the given variable.  This option exists for legacy reasons.  Prefer
+  ``COMPILE_OUTPUT_VARIABLE`` and ``RUN_OUTPUT_VARIABLE`` instead.
+
+``RUN_OUTPUT_VARIABLE <var>``
+  Report the output from running the executable in a given variable.
+
+Other Behavior Settings
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Set the :variable:`CMAKE_TRY_COMPILE_CONFIGURATION` variable to choose
+a build configuration.
+
+Behavior when Cross Compiling
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 When cross compiling, the executable compiled in the first step
-usually cannot be run on the build host.  try_run() checks the
-CMAKE_CROSSCOMPILING variable to detect whether CMake is in
-crosscompiling mode.  If that's the case, it will still try to compile
+usually cannot be run on the build host.  The ``try_run`` command checks
+the :variable:`CMAKE_CROSSCOMPILING` variable to detect whether CMake is in
+cross-compiling mode.  If that is the case, it will still try to compile
 the executable, but it will not try to run the executable.  Instead it
 will create cache variables which must be filled by the user or by
 presetting them in some CMake script file to the values the executable
 would have produced if it had been run on its actual target platform.
-These variables are RUN_RESULT_VAR (explanation see above) and if
-RUN_OUTPUT_VARIABLE (or OUTPUT_VARIABLE) was used, an additional cache
-variable RUN_RESULT_VAR__COMPILE_RESULT_VAR__TRYRUN_OUTPUT.This is
-intended to hold stdout and stderr from the executable.
-
-In order to make cross compiling your project easier, use try_run only
-if really required.  If you use try_run, use RUN_OUTPUT_VARIABLE (or
-OUTPUT_VARIABLE) only if really required.  Using them will require
-that when crosscompiling, the cache variables will have to be set
-manually to the output of the executable.  You can also "guard" the
-calls to try_run with if(CMAKE_CROSSCOMPILING) and provide an
-easy-to-preset alternative for this case.
-
-Set variable CMAKE_TRY_COMPILE_CONFIGURATION to choose a build
-configuration.
+These cache entries are:
+
+``<RUN_RESULT_VAR>``
+  Exit code if the executable were to be run on the target platform.
+
+``<RUN_RESULT_VAR>__TRYRUN_OUTPUT``
+  Output from stdout and stderr if the executable were to be run on
+  the target platform.  This is created only if the
+  ``RUN_OUTPUT_VARIABLE`` or ``OUTPUT_VARIABLE`` option was used.
+
+In order to make cross compiling your project easier, use ``try_run``
+only if really required.  If you use ``try_run``, use the
+``RUN_OUTPUT_VARIABLE`` or ``OUTPUT_VARIABLE`` options only if really
+required.  Using them will require that when cross-compiling, the cache
+variables will have to be set manually to the output of the executable.
+You can also "guard" the calls to ``try_run`` with an :command:`if`
+block checking the :variable:`CMAKE_CROSSCOMPILING` variable and
+provide an easy-to-preset alternative for this case.

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

Summary of changes:
 Help/command/try_compile.rst |  126 +++++++++++++++++++++++++----------------
 Help/command/try_run.rst     |  128 +++++++++++++++++++++++++++---------------
 2 files changed, 160 insertions(+), 94 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb  4 16:37:02 2015
From: brad.king at kitware.com (Brad King)
Date: Wed,  4 Feb 2015 16:37:02 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2606-gf95cfd9
Message-ID: <20150204213702.614D6AAEA5@public.kitware.com>

This is an automated email from 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  f95cfd91ff382777936cce827596de63718fdbbe (commit)
       via  977eb5b472d036bfc38abcfdd8eb454a5f606022 (commit)
      from  fb35d8df9d7263cb417fb4037df768fa40a49ed9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f95cfd91ff382777936cce827596de63718fdbbe
commit f95cfd91ff382777936cce827596de63718fdbbe
Merge: fb35d8d 977eb5b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 16:37:01 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 16:37:01 2015 -0500

    Merge topic 'doc-3.2-relnotes' into next
    
    977eb5b4 Help: Revise 3.2 relnotes on unicode


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=977eb5b472d036bfc38abcfdd8eb454a5f606022
commit 977eb5b472d036bfc38abcfdd8eb454a5f606022
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 16:36:45 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 16:36:45 2015 -0500

    Help: Revise 3.2 relnotes on unicode

diff --git a/Help/release/3.2.0.rst b/Help/release/3.2.0.rst
index fc3c1b3..f683438 100644
--- a/Help/release/3.2.0.rst
+++ b/Help/release/3.2.0.rst
@@ -13,13 +13,14 @@ New Features
 Syntax
 ------
 
-* On Windows, CMake learned to support international characters.
-  This allows use of characters from multiple (spoken) languages
-  in CMake code, paths to source files, configured files such as
-  ``.h.in`` files, and other files read and written by CMake.
-  Because CMake interoperates with many other tools, there may
-  still be some limitations when using certain international
-  characters.
+* CMake learned to support unicode characters encoded as UTF-8
+  on Windows.  This was already supported on platforms whose
+  system APIs accept UTF-8 encoded strings.
+  Unicode characters may now be used in CMake code, paths to
+  source files, configured files such as ``.h.in`` files, and
+  other files read and written by CMake.  Note that because CMake
+  interoperates with many other tools, there may still be some
+  limitations when using certain unicode characters.
 
 Commands
 --------
@@ -228,7 +229,6 @@ Deprecated and Removed Features
   compatible.  If files were in a different encoding, including
   Latin 1, they will need to be converted.
 
-
 * The implementation of CMake now relies on some C++ compiler features which
   are not supported by some older compilers.  As a result, those old compilers
   can no longer be used to build CMake itself.  CMake continues to be able to

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

Summary of changes:
 Help/release/3.2.0.rst |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb  4 16:43:48 2015
From: brad.king at kitware.com (Brad King)
Date: Wed,  4 Feb 2015 16:43:48 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2611-g37e5f95
Message-ID: <20150204214348.45741A9FAE@public.kitware.com>

This is an automated email from 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  37e5f9557dc518b10eed9d8ff6b32ae76c78dd92 (commit)
       via  d97ada67e5e2753216d6b2b8adb8275b79eb4f9c (commit)
       via  2ce10a997401f1d978f56f83f3c0baaa241f12dc (commit)
       via  b23158a63b547abe2ad85f82b4c5109cf3db07d8 (commit)
       via  7ba8c31e4e0829433a4ee3a852fc6f2b396fcc6e (commit)
      from  f95cfd91ff382777936cce827596de63718fdbbe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37e5f9557dc518b10eed9d8ff6b32ae76c78dd92
commit 37e5f9557dc518b10eed9d8ff6b32ae76c78dd92
Merge: f95cfd9 d97ada6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 16:43:47 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 16:43:47 2015 -0500

    Merge topic 'doc-3.2-relnotes' into next
    
    d97ada67 Help: Add 3.2 release note for AUTORCC dependency tracking
    2ce10a99 Help: Add 3.2 release notes for file(GENERATE) features
    b23158a6 Help: Organize and revise 3.2 release notes
    7ba8c31e Help: Consolidate 3.2 release notes


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d97ada67e5e2753216d6b2b8adb8275b79eb4f9c
commit d97ada67e5e2753216d6b2b8adb8275b79eb4f9c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 21:45:25 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 16:42:15 2015 -0500

    Help: Add 3.2 release note for AUTORCC dependency tracking

diff --git a/Help/release/3.2.0.rst b/Help/release/3.2.0.rst
index 4e1cf47..f683438 100644
--- a/Help/release/3.2.0.rst
+++ b/Help/release/3.2.0.rst
@@ -209,6 +209,10 @@ Other
   * Microsoft Visual Studio (``MSVC``) for versions 2010 through 2015.
   * Oracle SolarisStudio (``SunPro``) version 12.4.
 
+* The :ref:`Qt AUTORCC` feature now tracks files listed in ``.qrc`` files
+  as dependencies. If an input file to the ``rcc`` tool is changed, the tool
+  is automatically re-run.
+
 New Diagnostics
 ===============
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ce10a997401f1d978f56f83f3c0baaa241f12dc
commit 2ce10a997401f1d978f56f83f3c0baaa241f12dc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 21:44:11 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 16:41:59 2015 -0500

    Help: Add 3.2 release notes for file(GENERATE) features

diff --git a/Help/release/3.2.0.rst b/Help/release/3.2.0.rst
index a04bee5..4e1cf47 100644
--- a/Help/release/3.2.0.rst
+++ b/Help/release/3.2.0.rst
@@ -62,6 +62,13 @@ Commands
 * The :command:`try_run` command learned to honor the ``LINK_LIBRARIES``
   option just as :command:`try_compile` already does.
 
+* The :command:`file(GENERATE)` command now generates the output file with
+  the same permissions as the input file if set.
+
+* The :command:`file(GENERATE)` command can now generate files which are
+  used as source files for buildsystem targets.  Generated files
+  automatically get their :prop_sf:`GENERATED` property set to ``TRUE``.
+
 Variables
 ---------
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b23158a63b547abe2ad85f82b4c5109cf3db07d8
commit b23158a63b547abe2ad85f82b4c5109cf3db07d8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 13:33:49 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 16:41:14 2015 -0500

    Help: Organize and revise 3.2 release notes
    
    Add section headers similar to the 3.1 release notes and move each
    individual bullet into an appropriate section.  Revise and consolidate
    some bullets covering related areas.
    
    Co-Author: Stephen Kelly <steveire at gmail.com>

diff --git a/Help/release/3.2.0.rst b/Help/release/3.2.0.rst
index 142d408..a04bee5 100644
--- a/Help/release/3.2.0.rst
+++ b/Help/release/3.2.0.rst
@@ -7,131 +7,106 @@ CMake 3.2.0 Release Notes
 
 Changes made since CMake 3.1.0 include the following.
 
-* A new :command:`continue` command was added that can be called inside loop
-  contexts to end the current iteration and start the next one at the top of
-  the loop block.
-
-* A :module:`FindGSL` module was introduced to find the
-  GNU Scientific Library.
-
-* The :module:`FindIntl` module was added to find the Gettext ``libintl``
-  library.
-
-* A :module:`FindJsonCpp` module was introduced to find the
-  JsonCpp package.
-
-* The :command:`ctest_coverage` learned to support Javascript coverage.
-
-* The :manual:`cmake(1)` ``-E tar`` command now supports creating
-  ``.xz``-compressed archives with the ``J`` flag.
-
-* On OS X with Makefile and Ninja generators, when a compiler is found
-  in ``/usr/bin`` it is now mapped to the corresponding compiler inside
-  the Xcode application folder, if any.  This allows such build
-  trees to continue to work with their original compiler even when
-  ``xcode-select`` switches to a different Xcode installation.
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU compilers on OS X.
+New Features
+============
 
-* The :command:`break` command now rejects calls outside of a loop
-  context or that pass arguments to the command.
-  See policy :policy:`CMP0055`.
+Syntax
+------
 
-* Add :variable:`CMAKE_MATCH_COUNT` for the number of matches made in the last
-  regular expression.
+* CMake learned to support unicode characters encoded as UTF-8
+  on Windows.  This was already supported on platforms whose
+  system APIs accept UTF-8 encoded strings.
+  Unicode characters may now be used in CMake code, paths to
+  source files, configured files such as ``.h.in`` files, and
+  other files read and written by CMake.  Note that because CMake
+  interoperates with many other tools, there may still be some
+  limitations when using certain unicode characters.
 
-* The :manual:`cmake(1)` ``-E tar`` command learned a new
-  ``--files-from=<file>`` option to specify file names using
-  lines in a file to overcome command-line length limits.
+Commands
+--------
 
-* The :manual:`cmake(1)` ``-E tar`` command learned a new
-  ``--mtime=<date>`` option to specify the modification time
-  recorded in tarball entries.
+* The :command:`add_custom_command` and :command:`add_custom_target`
+  commands learned a new ``BYPRODUCTS`` option to specify files
+  produced as side effects of the custom commands.  These are not
+  outputs because they do not always have to be newer than inputs.
 
 * The :command:`add_custom_command` and :command:`add_custom_target`
   commands learned a new ``USES_TERMINAL`` option to request that
   the command be given direct access to the terminal if possible.
   The :generator:`Ninja` generator will places such commands in the
-  ``console`` pool.  Build targets provided by CMake that are meant
-  for individual interactive use, such as ``install``, are now
+  ``console`` :prop_gbl:`pool <JOB_POOLS>`.  Build targets provided by CMake
+  that are meant for individual interactive use, such as ``install``, are now
   placed in this pool.
 
-* The :module:`CPackRPM` module learned options to set per-component
-  descriptions and summaries.  See the
-  :variable:`CPACK_RPM_<component>_PACKAGE_DESCRIPTION` and
-  :variable:`CPACK_RPM_<component>_PACKAGE_SUMMARY` variables.
+* A new :command:`continue` command was added that can be called inside loop
+  contexts to end the current iteration and start the next one at the top of
+  the loop block.
 
-* The :module:`CPackRPM` module learned options to specify
-  requirements for pre- and post-install scripts.  See the
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PRE` and
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POST` variables.
+* The :command:`file(LOCK)` subcommand was created to allow CMake
+  processes to synchronize through file and directory locks.
 
-* The :module:`CPackRPM` module learned options to specify
-  requirements for pre- and post-uninstall scripts.  See the
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PREUN` and
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POSTUN` variables.
+* The :command:`file(STRINGS)` now supports UTF-16LE, UTF-16BE,
+  UTF-32LE, UTF-32BE as ``ENCODING`` options.
 
-* The :module:`CTestCoverageCollectGCOV` module was introduced as an
-  alternative to the :command:`ctest_coverage` command for collecting
-  ``gcov`` results for submission to CDash.
+* The :command:`install(EXPORT)` command now works with an absolute
+  ``DESTINATION`` even if targets in the export set are installed
+  with a destination or :ref:`usage requirements <Target Usage Requirements>`
+  specified relative to the install prefix.  The value of the
+  :variable:`CMAKE_INSTALL_PREFIX` variable is hard-coded into the installed
+  export file as the base for relative references.
+
+* The :command:`try_compile` command source file signature now honors
+  link flags (e.g. :variable:`CMAKE_EXE_LINKER_FLAGS`) in the generated
+  test project.  See policy :policy:`CMP0056`.
 
-* The :command:`ctest_coverage` learned to support Delphi coverage.
+* The :command:`try_run` command learned to honor the ``LINK_LIBRARIES``
+  option just as :command:`try_compile` already does.
 
-* On OS X, commands supporting network communication, such as
-  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now support SSL/TLS even when CMake
-  is not built against OpenSSL.  The OS X native SSL/TLS
-  implementation is used by default.  OS-configured certificate
-  authorities will be trusted automatically.
+Variables
+---------
 
-* When CMake is built with OpenSSL on systems other than Windows
-  and OS X, commands supporting network communication via ``https``,
-  such as :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now search for OS-configured certificate
-  authorities in a few ``/etc`` paths to be trusted automatically.
+* The :variable:`CMAKE_MATCH_COUNT` variable was introduced to record the
+  number of matches made in the last regular expression matched in an
+  :command:`if` command or a :command:`string` command.
 
-* On Windows, commands supporting network communication, such as
-  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now support SSL/TLS even when CMake
-  is not built against OpenSSL.  The Windows native SSL/TLS
-  implementation is used by default.  OS-configured certificate
-  authorities will be trusted automatically.
+Properties
+----------
 
-* The :command:`add_custom_command` and :command:`add_custom_target`
-  commands learned a new ``BYPRODUCTS`` option to specify files
-  produced as side effects of the custom commands.  These are not
-  outputs because they do not always have to be newer than inputs.
+* An :prop_tgt:`ANDROID_API_MIN` target property was introduced to
+  specify the minimum version to be targeted by the toolchain.
+
+* A :prop_sf:`VS_SHADER_FLAGS` source file property was added to specify
+  additional shader flags to ``.hlsl`` files, for the Visual Studio
+  generators.
+
+Modules
+-------
+
+* The :module:`CTestCoverageCollectGCOV` module was introduced as an
+  alternative to the :command:`ctest_coverage` command for collecting
+  ``gcov`` results for submission to CDash.
 
 * The :module:`ExternalData` module learned to support
   :ref:`Custom Fetch Scripts <ExternalData Custom Fetch Scripts>`.
   This allows projects to specify custom ``.cmake`` scripts for
   fetching data objects during the build.
 
-* The :module:`ExternalProject` module ``ExternalProject_Add`` function
-  learned a new ``CMAKE_CACHE_DEFAULT_ARGS`` option to initialize cache
-  values in the external project without setting them on future builds.
-
 * The :module:`ExternalProject` module learned options to create
   independent external project step targets that do not depend
   on the builtin steps.
 
 * The :module:`ExternalProject` module :command:`ExternalProject_Add`
-  command learned a ``TEST_EXCLUDE_FROM_MAIN`` option to exclude tests
-  from the main build.
-
-* The :module:`ExternalProject` module ``ExternalProject_Add`` command
-  learned an ``UPDATE_DISCONNECTED`` option to avoid automatically
-  updating the source tree checkout from version control.
+  command learned a new ``CMAKE_CACHE_DEFAULT_ARGS`` option to
+  initialize cache values in the external project without setting
+  them on future builds.
 
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Microsoft Visual Studio (``MSVC``).
-
-* The :command:`file(LOCK)` subcommand was created to allow CMake
-  processes to synchronize through file and directory locks.
+* The :module:`ExternalProject` module :command:`ExternalProject_Add`
+  command learned a new ``TEST_EXCLUDE_FROM_MAIN`` option to exclude
+  tests from the main build.
 
-* The :command:`file(STRINGS)` now supports UTF-16LE, UTF-16BE,
-  UTF-32LE, UTF-32BE as ``ENCODING`` options.
+* The :module:`ExternalProject` module :command:`ExternalProject_Add`
+  command learned a new ``UPDATE_DISCONNECTED`` option to avoid
+  automatically updating the source tree checkout from version control.
 
 * The :module:`FindCUDA` module learned about the ``cusolver``
   library in CUDA 7.0.
@@ -139,6 +114,15 @@ Changes made since CMake 3.1.0 include the following.
 * The :module:`FindGit` module learned to find the ``git`` command-line tool
   that comes with GitHub for Windows installed in user home directories.
 
+* A :module:`FindGSL` module was introduced to find the
+  GNU Scientific Library.
+
+* A :module:`FindIntl` module was introduced to find the
+  Gettext ``libintl`` library.
+
+* A :module:`FindJsonCpp` module was introduced to find the
+  JsonCpp package.
+
 * The :module:`FindLATEX` module learned to support components.
 
 * The :module:`FindMPI` module learned to find MS-MPI on Windows.
@@ -154,18 +138,38 @@ Changes made since CMake 3.1.0 include the following.
   ``OPENSSL_SSL_LIBRARY``, respectively, to allow applications to
   link to one without the other.
 
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU 4.4 to 4.6 compilers.
+* The :module:`WriteCompilerDetectionHeader` module learned to
+  create a define for portability of the ``cxx_thread_local`` feature.
+  The define expands to either the C++11 ``thread_local`` keyword, or a
+  pre-standardization compiler-specific equivalent, as appropriate.
 
-* The :command:`install(EXPORT)` command now works with an absolute
-  ``DESTINATION`` even if targets in the export set are installed
-  with a destination or usage requirements specified relative to the
-  install prefix.  The value of the :variable:`CMAKE_INSTALL_PREFIX`
-  variable is hard-coded into the installed export file as the base
-  for relative references.
+* The :module:`WriteCompilerDetectionHeader` module learned to create
+  multiple output files per compiler and per language, instead of creating
+  one large file.
 
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU compiler version 5.0.
+CTest
+-----
+
+* The :command:`ctest_coverage` command learned to support Delphi coverage.
+* The :command:`ctest_coverage` command learned to support Javascript coverage.
+
+CPack
+-----
+
+* The :module:`CPackRPM` module learned options to set per-component
+  descriptions and summaries.  See the
+  :variable:`CPACK_RPM_<component>_PACKAGE_DESCRIPTION` and
+  :variable:`CPACK_RPM_<component>_PACKAGE_SUMMARY` variables.
+
+* The :module:`CPackRPM` module learned options to specify
+  requirements for pre- and post-install scripts.  See the
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PRE` and
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POST` variables.
+
+* The :module:`CPackRPM` module learned options to specify
+  requirements for pre- and post-uninstall scripts.  See the
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PREUN` and
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POSTUN` variables.
 
 * The :module:`CPackRPM` module learned a new
   :variable:`CPACK_RPM_<COMPONENT>_PACKAGE_PREFIX` variable to
@@ -176,74 +180,88 @@ Changes made since CMake 3.1.0 include the following.
   :variable:`CPACK_RPM_RELOCATION_PATHS` variable to
   specify multiple relocation prefixes for a single rpm package.
 
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Oracle SolarisStudio (``SunPro``).
+Other
+-----
 
-* The :command:`try_compile` command source file signature now honors
-  link flags (e.g. :variable:`CMAKE_EXE_LINKER_FLAGS`) in the generated
-  test project.  See policy :policy:`CMP0056`.
+* The :manual:`cmake(1)` ``-E tar`` command now supports creating
+  ``.xz``-compressed archives with the ``J`` flag.
 
-* The :command:`try_run` command learned to honor the ``LINK_LIBRARIES``
-  option just as :command:`try_compile` already does.
+* The :manual:`cmake(1)` ``-E tar`` command learned a new
+  ``--files-from=<file>`` option to specify file names using
+  lines in a file to overcome command-line length limits.
 
-* The implementation of CMake relies on some C++ compiler features which are
-  not supported by some older compilers.  As a result, those old compilers
-  can no longer be used to build CMake itself.  CMake continues to be able to
-  generate Makefiles and project files for users of those old compilers
-  however.  The compilers known to no longer be capable of building CMake
-  are:
-
-  * MSVC 6 and 7.0 - superceded by VisualStudio 7.1 and newer compilers.
-  * GCC 2.95 - superceded by GCC 3 and newer compilers.
-  * Borland compilers - superceded by other Windows compilers.
-  * Compaq compilers - superceded by other compilers.
-  * Comeau compilers - superceded by other compilers.
-  * SGI compilers - IRIX was dropped as a host platform.
-
-  When building using SolarisStudio 12, the default ``libCStd`` standard
-  library is not sufficient to build CMake.  The SolarisStudio distribution
-  supports compiler options to use ``STLPort4`` or ``libstdc++``.  An
-  appropriate option to select the standard library is now added
-  automatically when building CMake with SolarisStudio compilers.
+* The :manual:`cmake(1)` ``-E tar`` command learned a new
+  ``--mtime=<date>`` option to specify the modification time
+  recorded in tarball entries.
 
-* A :prop_tgt:`ANDROID_API_MIN` target property was introduced to
-  specify the minimum version to be targeted by the toolchain.
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by more compilers, including:
 
-* A :prop_sf:`VS_SHADER_FLAGS` source file property was added to specify
-  additional shader flags to ``.hlsl`` files, for the Visual Studio generators.
+  * Apple Clang (``AppleClang``) for Xcode versions 4.4 though 6.1.
+  * GNU compiler versions 4.4 through 5.0 on UNIX and Apple (``GNU``).
+  * Microsoft Visual Studio (``MSVC``) for versions 2010 through 2015.
+  * Oracle SolarisStudio (``SunPro``) version 12.4.
 
-* The :module:`WriteCompilerDetectionHeader` module learned to
-  create a define for portability of the cxx_thread_local feature. The define
-  expands to either the C++11 ``thread_local`` keyword, or a
-  pre-standardization compiler-specific equivalent, as appropriate.
+New Diagnostics
+===============
 
-* On Windows, CMake learned to support international characters.
-  This allows use of characters from multiple (spoken) languages
-  in CMake code, paths to source files, configured files such as
-  ``.h.in`` files, and other files read and written by CMake.
-  Because CMake interoperates with many other tools, there may
-  still be some limitations when using certain international
-  characters.
+* The :command:`break` command now rejects calls outside of a loop
+  context or that pass arguments to the command.
+  See policy :policy:`CMP0055`.
 
-  Files written in the :manual:`cmake-language(7)`, such as
-  ``CMakeLists.txt`` or ``*.cmake`` files, are expected to be
+Deprecated and Removed Features
+===============================
+
+* Files written in the :manual:`cmake-language(7)`, such as
+  ``CMakeLists.txt`` or ``*.cmake`` files, are now expected to be
   encoded as UTF-8.  If files are already ASCII, they will be
   compatible.  If files were in a different encoding, including
   Latin 1, they will need to be converted.
 
-  The Visual Studio generators now write solution and project
+* The implementation of CMake now relies on some C++ compiler features which
+  are not supported by some older compilers.  As a result, those old compilers
+  can no longer be used to build CMake itself.  CMake continues to be able to
+  generate Makefiles and project files for users of those old compilers
+  however.  Compilers known to no longer be capable of building CMake are:
+
+  * Visual Studio 6 and 7.0 -- superseded by VisualStudio 7.1 and newer.
+  * GCC 2.95 -- superseded by GCC 3 and newer compilers.
+  * Borland compilers -- superseded by other Windows compilers.
+  * Compaq compilers -- superseded by other compilers.
+  * SGI compilers -- IRIX was dropped as a host platform.
+
+Other Changes
+=============
+
+* On Windows and OS X, commands supporting network communication
+  via ``https``, such as :command:`file(DOWNLOAD)`,
+  :command:`file(UPLOAD)`, and :command:`ctest_submit`, now support
+  SSL/TLS even when CMake is not built against OpenSSL.
+  The Windows or OS X native SSL/TLS implementation is used by default.
+  OS-configured certificate authorities will be trusted automatically.
+
+  On other platforms, when CMake is built with OpenSSL, these
+  commands now search for OS-configured certificate authorities
+  in a few ``/etc`` paths to be trusted automatically.
+
+* On OS X with Makefile and Ninja generators, when a compiler is found
+  in ``/usr/bin`` it is now mapped to the corresponding compiler inside
+  the Xcode application folder, if any.  This allows such build
+  trees to continue to work with their original compiler even when
+  ``xcode-select`` switches to a different Xcode installation.
+
+* The Visual Studio generators now write solution and project
   files in UTF-8 instead of Windows-1252.  Windows-1252 supported
   Latin 1 languages such as those found in North and South America
   and Western Europe.  With UTF-8, additional languages are now
   supported.
 
-* The :module:`WriteCompilerDetectionHeader` module learned to create
-  multiple output files per compiler and per language, instead of creating
-  one large file.
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Apple Clang (``AppleClang``).
-
 * The :generator:`Xcode` generator no longer requires a value for
   the :variable:`CMAKE_MAKE_PROGRAM` variable to be located up front.
   It now locates ``xcodebuild`` when needed at build time.
+
+* When building CMake itself using SolarisStudio 12, the default ``libCStd``
+  standard library is not sufficient to build CMake.  The SolarisStudio
+  distribution supports compiler options to use ``STLPort4`` or ``libstdc++``.
+  An appropriate option to select the standard library is now added
+  automatically when building CMake with SolarisStudio compilers.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ba8c31e4e0829433a4ee3a852fc6f2b396fcc6e
commit 7ba8c31e4e0829433a4ee3a852fc6f2b396fcc6e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 13:12:12 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 16:40:51 2015 -0500

    Help: Consolidate 3.2 release notes
    
    Move all development release notes into a new version-specific document:
    
     tail -q -n +3 Help/release/dev/* > Help/release/3.2.0.rst
     git rm -- Help/release/dev/*
    
    except the sample topic:
    
     git checkout HEAD -- Help/release/dev/0-sample-topic.rst
    
    Reference the new document from the release notes index document.
    Add a title and intro sentence to the new document by hand.

diff --git a/Help/release/3.2.0.rst b/Help/release/3.2.0.rst
new file mode 100644
index 0000000..142d408
--- /dev/null
+++ b/Help/release/3.2.0.rst
@@ -0,0 +1,249 @@
+CMake 3.2.0 Release Notes
+*************************
+
+.. only:: html
+
+  .. contents::
+
+Changes made since CMake 3.1.0 include the following.
+
+* A new :command:`continue` command was added that can be called inside loop
+  contexts to end the current iteration and start the next one at the top of
+  the loop block.
+
+* A :module:`FindGSL` module was introduced to find the
+  GNU Scientific Library.
+
+* The :module:`FindIntl` module was added to find the Gettext ``libintl``
+  library.
+
+* A :module:`FindJsonCpp` module was introduced to find the
+  JsonCpp package.
+
+* The :command:`ctest_coverage` learned to support Javascript coverage.
+
+* The :manual:`cmake(1)` ``-E tar`` command now supports creating
+  ``.xz``-compressed archives with the ``J`` flag.
+
+* On OS X with Makefile and Ninja generators, when a compiler is found
+  in ``/usr/bin`` it is now mapped to the corresponding compiler inside
+  the Xcode application folder, if any.  This allows such build
+  trees to continue to work with their original compiler even when
+  ``xcode-select`` switches to a different Xcode installation.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by GNU compilers on OS X.
+
+* The :command:`break` command now rejects calls outside of a loop
+  context or that pass arguments to the command.
+  See policy :policy:`CMP0055`.
+
+* Add :variable:`CMAKE_MATCH_COUNT` for the number of matches made in the last
+  regular expression.
+
+* The :manual:`cmake(1)` ``-E tar`` command learned a new
+  ``--files-from=<file>`` option to specify file names using
+  lines in a file to overcome command-line length limits.
+
+* The :manual:`cmake(1)` ``-E tar`` command learned a new
+  ``--mtime=<date>`` option to specify the modification time
+  recorded in tarball entries.
+
+* The :command:`add_custom_command` and :command:`add_custom_target`
+  commands learned a new ``USES_TERMINAL`` option to request that
+  the command be given direct access to the terminal if possible.
+  The :generator:`Ninja` generator will places such commands in the
+  ``console`` pool.  Build targets provided by CMake that are meant
+  for individual interactive use, such as ``install``, are now
+  placed in this pool.
+
+* The :module:`CPackRPM` module learned options to set per-component
+  descriptions and summaries.  See the
+  :variable:`CPACK_RPM_<component>_PACKAGE_DESCRIPTION` and
+  :variable:`CPACK_RPM_<component>_PACKAGE_SUMMARY` variables.
+
+* The :module:`CPackRPM` module learned options to specify
+  requirements for pre- and post-install scripts.  See the
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PRE` and
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POST` variables.
+
+* The :module:`CPackRPM` module learned options to specify
+  requirements for pre- and post-uninstall scripts.  See the
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PREUN` and
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POSTUN` variables.
+
+* The :module:`CTestCoverageCollectGCOV` module was introduced as an
+  alternative to the :command:`ctest_coverage` command for collecting
+  ``gcov`` results for submission to CDash.
+
+* The :command:`ctest_coverage` learned to support Delphi coverage.
+
+* On OS X, commands supporting network communication, such as
+  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
+  :command:`ctest_submit`, now support SSL/TLS even when CMake
+  is not built against OpenSSL.  The OS X native SSL/TLS
+  implementation is used by default.  OS-configured certificate
+  authorities will be trusted automatically.
+
+* When CMake is built with OpenSSL on systems other than Windows
+  and OS X, commands supporting network communication via ``https``,
+  such as :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
+  :command:`ctest_submit`, now search for OS-configured certificate
+  authorities in a few ``/etc`` paths to be trusted automatically.
+
+* On Windows, commands supporting network communication, such as
+  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
+  :command:`ctest_submit`, now support SSL/TLS even when CMake
+  is not built against OpenSSL.  The Windows native SSL/TLS
+  implementation is used by default.  OS-configured certificate
+  authorities will be trusted automatically.
+
+* The :command:`add_custom_command` and :command:`add_custom_target`
+  commands learned a new ``BYPRODUCTS`` option to specify files
+  produced as side effects of the custom commands.  These are not
+  outputs because they do not always have to be newer than inputs.
+
+* The :module:`ExternalData` module learned to support
+  :ref:`Custom Fetch Scripts <ExternalData Custom Fetch Scripts>`.
+  This allows projects to specify custom ``.cmake`` scripts for
+  fetching data objects during the build.
+
+* The :module:`ExternalProject` module ``ExternalProject_Add`` function
+  learned a new ``CMAKE_CACHE_DEFAULT_ARGS`` option to initialize cache
+  values in the external project without setting them on future builds.
+
+* The :module:`ExternalProject` module learned options to create
+  independent external project step targets that do not depend
+  on the builtin steps.
+
+* The :module:`ExternalProject` module :command:`ExternalProject_Add`
+  command learned a ``TEST_EXCLUDE_FROM_MAIN`` option to exclude tests
+  from the main build.
+
+* The :module:`ExternalProject` module ``ExternalProject_Add`` command
+  learned an ``UPDATE_DISCONNECTED`` option to avoid automatically
+  updating the source tree checkout from version control.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by Microsoft Visual Studio (``MSVC``).
+
+* The :command:`file(LOCK)` subcommand was created to allow CMake
+  processes to synchronize through file and directory locks.
+
+* The :command:`file(STRINGS)` now supports UTF-16LE, UTF-16BE,
+  UTF-32LE, UTF-32BE as ``ENCODING`` options.
+
+* The :module:`FindCUDA` module learned about the ``cusolver``
+  library in CUDA 7.0.
+
+* The :module:`FindGit` module learned to find the ``git`` command-line tool
+  that comes with GitHub for Windows installed in user home directories.
+
+* The :module:`FindLATEX` module learned to support components.
+
+* The :module:`FindMPI` module learned to find MS-MPI on Windows.
+
+* The :module:`FindOpenGL` module no longer explicitly searches
+  for any dependency on X11 libraries with the :module:`FindX11`
+  module.  Such dependencies should not need to be explicit.
+  Applications using X11 APIs themselves should find and link
+  to X11 libraries explicitly.
+
+* The :module:`FindOpenSSL` module now reports ``crypto`` and ``ssl``
+  libraries separately in ``OPENSSL_CRYPTO_LIBRARY`` and
+  ``OPENSSL_SSL_LIBRARY``, respectively, to allow applications to
+  link to one without the other.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by GNU 4.4 to 4.6 compilers.
+
+* The :command:`install(EXPORT)` command now works with an absolute
+  ``DESTINATION`` even if targets in the export set are installed
+  with a destination or usage requirements specified relative to the
+  install prefix.  The value of the :variable:`CMAKE_INSTALL_PREFIX`
+  variable is hard-coded into the installed export file as the base
+  for relative references.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by GNU compiler version 5.0.
+
+* The :module:`CPackRPM` module learned a new
+  :variable:`CPACK_RPM_<COMPONENT>_PACKAGE_PREFIX` variable to
+  specify a component-specific value to use instead of
+  :variable:`CPACK_PACKAGING_INSTALL_PREFIX`.
+
+* The :module:`CPackRPM` module learned a new
+  :variable:`CPACK_RPM_RELOCATION_PATHS` variable to
+  specify multiple relocation prefixes for a single rpm package.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by Oracle SolarisStudio (``SunPro``).
+
+* The :command:`try_compile` command source file signature now honors
+  link flags (e.g. :variable:`CMAKE_EXE_LINKER_FLAGS`) in the generated
+  test project.  See policy :policy:`CMP0056`.
+
+* The :command:`try_run` command learned to honor the ``LINK_LIBRARIES``
+  option just as :command:`try_compile` already does.
+
+* The implementation of CMake relies on some C++ compiler features which are
+  not supported by some older compilers.  As a result, those old compilers
+  can no longer be used to build CMake itself.  CMake continues to be able to
+  generate Makefiles and project files for users of those old compilers
+  however.  The compilers known to no longer be capable of building CMake
+  are:
+
+  * MSVC 6 and 7.0 - superceded by VisualStudio 7.1 and newer compilers.
+  * GCC 2.95 - superceded by GCC 3 and newer compilers.
+  * Borland compilers - superceded by other Windows compilers.
+  * Compaq compilers - superceded by other compilers.
+  * Comeau compilers - superceded by other compilers.
+  * SGI compilers - IRIX was dropped as a host platform.
+
+  When building using SolarisStudio 12, the default ``libCStd`` standard
+  library is not sufficient to build CMake.  The SolarisStudio distribution
+  supports compiler options to use ``STLPort4`` or ``libstdc++``.  An
+  appropriate option to select the standard library is now added
+  automatically when building CMake with SolarisStudio compilers.
+
+* A :prop_tgt:`ANDROID_API_MIN` target property was introduced to
+  specify the minimum version to be targeted by the toolchain.
+
+* A :prop_sf:`VS_SHADER_FLAGS` source file property was added to specify
+  additional shader flags to ``.hlsl`` files, for the Visual Studio generators.
+
+* The :module:`WriteCompilerDetectionHeader` module learned to
+  create a define for portability of the cxx_thread_local feature. The define
+  expands to either the C++11 ``thread_local`` keyword, or a
+  pre-standardization compiler-specific equivalent, as appropriate.
+
+* On Windows, CMake learned to support international characters.
+  This allows use of characters from multiple (spoken) languages
+  in CMake code, paths to source files, configured files such as
+  ``.h.in`` files, and other files read and written by CMake.
+  Because CMake interoperates with many other tools, there may
+  still be some limitations when using certain international
+  characters.
+
+  Files written in the :manual:`cmake-language(7)`, such as
+  ``CMakeLists.txt`` or ``*.cmake`` files, are expected to be
+  encoded as UTF-8.  If files are already ASCII, they will be
+  compatible.  If files were in a different encoding, including
+  Latin 1, they will need to be converted.
+
+  The Visual Studio generators now write solution and project
+  files in UTF-8 instead of Windows-1252.  Windows-1252 supported
+  Latin 1 languages such as those found in North and South America
+  and Western Europe.  With UTF-8, additional languages are now
+  supported.
+
+* The :module:`WriteCompilerDetectionHeader` module learned to create
+  multiple output files per compiler and per language, instead of creating
+  one large file.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by Apple Clang (``AppleClang``).
+
+* The :generator:`Xcode` generator no longer requires a value for
+  the :variable:`CMAKE_MAKE_PROGRAM` variable to be located up front.
+  It now locates ``xcodebuild`` when needed at build time.
diff --git a/Help/release/dev/Apple-GNU-compiler-features.rst b/Help/release/dev/Apple-GNU-compiler-features.rst
deleted file mode 100644
index 40c3712..0000000
--- a/Help/release/dev/Apple-GNU-compiler-features.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Apple-GNU-compiler-features
----------------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU compilers on OS X.
diff --git a/Help/release/dev/Apple-compiler-selection.rst b/Help/release/dev/Apple-compiler-selection.rst
deleted file mode 100644
index 5ff5653..0000000
--- a/Help/release/dev/Apple-compiler-selection.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-Apple-compiler-selection
-------------------------
-
-* On OS X with Makefile and Ninja generators, when a compiler is found
-  in ``/usr/bin`` it is now mapped to the corresponding compiler inside
-  the Xcode application folder, if any.  This allows such build
-  trees to continue to work with their original compiler even when
-  ``xcode-select`` switches to a different Xcode installation.
diff --git a/Help/release/dev/CTestCoverageCollectGCOV-refinements.rst b/Help/release/dev/CTestCoverageCollectGCOV-refinements.rst
deleted file mode 100644
index afa0a52..0000000
--- a/Help/release/dev/CTestCoverageCollectGCOV-refinements.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-CTestCoverageCollectGCOV-refinements
-------------------------------------
-
-* The :module:`CTestCoverageCollectGCOV` module was introduced as an
-  alternative to the :command:`ctest_coverage` command for collecting
-  ``gcov`` results for submission to CDash.
diff --git a/Help/release/dev/ExternalData-custom-download.rst b/Help/release/dev/ExternalData-custom-download.rst
deleted file mode 100644
index c40f4f7..0000000
--- a/Help/release/dev/ExternalData-custom-download.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-ExternalData-custom-download
-----------------------------
-
-* The :module:`ExternalData` module learned to support
-  :ref:`Custom Fetch Scripts <ExternalData Custom Fetch Scripts>`.
-  This allows projects to specify custom ``.cmake`` scripts for
-  fetching data objects during the build.
diff --git a/Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst b/Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst
deleted file mode 100644
index 1838ab6..0000000
--- a/Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-ExternalProject_CMAKE_CACHE_DEFAULT_ARGS
-----------------------------------------
-
-* The :module:`ExternalProject` module ``ExternalProject_Add`` function
-  learned a new ``CMAKE_CACHE_DEFAULT_ARGS`` option to initialize cache
-  values in the external project without setting them on future builds.
diff --git a/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst b/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
deleted file mode 100644
index dfbf108..0000000
--- a/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-ExternalProject_TEST_EXCLUDE_FROM_MAIN
---------------------------------------
-
-* The :module:`ExternalProject` module :command:`ExternalProject_Add`
-  command learned a ``TEST_EXCLUDE_FROM_MAIN`` option to exclude tests
-  from the main build.
diff --git a/Help/release/dev/ExternalProject_UPDATE_DISCONNECTED.rst b/Help/release/dev/ExternalProject_UPDATE_DISCONNECTED.rst
deleted file mode 100644
index bed4a89..0000000
--- a/Help/release/dev/ExternalProject_UPDATE_DISCONNECTED.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-ExternalProject_UPDATE_DISCONNECTED
------------------------------------
-
-* The :module:`ExternalProject` module ``ExternalProject_Add`` command
-  learned an ``UPDATE_DISCONNECTED`` option to avoid automatically
-  updating the source tree checkout from version control.
diff --git a/Help/release/dev/ExternalProject_independent-step-targets.rst b/Help/release/dev/ExternalProject_independent-step-targets.rst
deleted file mode 100644
index 02e8db8..0000000
--- a/Help/release/dev/ExternalProject_independent-step-targets.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-ExternalProject_independent-step-targets
-----------------------------------------
-
-* The :module:`ExternalProject` module learned options to create
-  independent external project step targets that do not depend
-  on the builtin steps.
diff --git a/Help/release/dev/FindCUDA-cusolver.rst b/Help/release/dev/FindCUDA-cusolver.rst
deleted file mode 100644
index 7a61e78..0000000
--- a/Help/release/dev/FindCUDA-cusolver.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindCUDA-cusolver
------------------
-
-* The :module:`FindCUDA` module learned about the ``cusolver``
-  library in CUDA 7.0.
diff --git a/Help/release/dev/FindGit-local-Github.rst b/Help/release/dev/FindGit-local-Github.rst
deleted file mode 100644
index 3523e86..0000000
--- a/Help/release/dev/FindGit-local-Github.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindGit-local-Github
---------------------
-
-* The :module:`FindGit` module learned to find the ``git`` command-line tool
-  that comes with GitHub for Windows installed in user home directories.
diff --git a/Help/release/dev/FindLATEX-components.rst b/Help/release/dev/FindLATEX-components.rst
deleted file mode 100644
index d161c1f..0000000
--- a/Help/release/dev/FindLATEX-components.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-FindLATEX-components
---------------------
-
-* The :module:`FindLATEX` module learned to support components.
diff --git a/Help/release/dev/FindOpenGL-no-X11.rst b/Help/release/dev/FindOpenGL-no-X11.rst
deleted file mode 100644
index dacf165..0000000
--- a/Help/release/dev/FindOpenGL-no-X11.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-FindOpenGL-no-X11
------------------
-
-* The :module:`FindOpenGL` module no longer explicitly searches
-  for any dependency on X11 libraries with the :module:`FindX11`
-  module.  Such dependencies should not need to be explicit.
-  Applications using X11 APIs themselves should find and link
-  to X11 libraries explicitly.
diff --git a/Help/release/dev/FindOpenSSL-separate-libs.rst b/Help/release/dev/FindOpenSSL-separate-libs.rst
deleted file mode 100644
index 96e3961..0000000
--- a/Help/release/dev/FindOpenSSL-separate-libs.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-FindOpenSSL-separate-libs
--------------------------
-
-* The :module:`FindOpenSSL` module now reports ``crypto`` and ``ssl``
-  libraries separately in ``OPENSSL_CRYPTO_LIBRARY`` and
-  ``OPENSSL_SSL_LIBRARY``, respectively, to allow applications to
-  link to one without the other.
diff --git a/Help/release/dev/GNU-4.4-compile-features.rst b/Help/release/dev/GNU-4.4-compile-features.rst
deleted file mode 100644
index d5c1356..0000000
--- a/Help/release/dev/GNU-4.4-compile-features.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-GNU-4.4-compile-features
-------------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU 4.4 to 4.6 compilers.
diff --git a/Help/release/dev/SolarisStudio-compile-features.rst b/Help/release/dev/SolarisStudio-compile-features.rst
deleted file mode 100644
index 83110cd..0000000
--- a/Help/release/dev/SolarisStudio-compile-features.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-SolarisStudio-compile-features
-------------------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Oracle SolarisStudio (``SunPro``).
diff --git a/Help/release/dev/WCDH-thread_local.rst b/Help/release/dev/WCDH-thread_local.rst
deleted file mode 100644
index 44516a7..0000000
--- a/Help/release/dev/WCDH-thread_local.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-WriteCompilerDetectionHeader thread_local portability
------------------------------------------------------
-
-* The :module:`WriteCompilerDetectionHeader` module learned to
-  create a define for portability of the cxx_thread_local feature. The define
-  expands to either the C++11 ``thread_local`` keyword, or a
-  pre-standardization compiler-specific equivalent, as appropriate.
diff --git a/Help/release/dev/WriteCompilerDetectionHeader-multi-file-lang.rst b/Help/release/dev/WriteCompilerDetectionHeader-multi-file-lang.rst
deleted file mode 100644
index a8665da..0000000
--- a/Help/release/dev/WriteCompilerDetectionHeader-multi-file-lang.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-WriteCompilerDetectionHeader-multi-file
----------------------------------------
-
-* The :module:`WriteCompilerDetectionHeader` module learned to create
-  multiple output files per compiler and per language, instead of creating
-  one large file.
diff --git a/Help/release/dev/Xcode-clang-compile-features.rst b/Help/release/dev/Xcode-clang-compile-features.rst
deleted file mode 100644
index d93475f..0000000
--- a/Help/release/dev/Xcode-clang-compile-features.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Xcode-clang-compile-features
-----------------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Apple Clang (``AppleClang``).
diff --git a/Help/release/dev/add-FindGSL.rst b/Help/release/dev/add-FindGSL.rst
deleted file mode 100644
index 47a0a25..0000000
--- a/Help/release/dev/add-FindGSL.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-add-FindGSL
------------
-
-* A :module:`FindGSL` module was introduced to find the
-  GNU Scientific Library.
diff --git a/Help/release/dev/add-FindIntl.rst b/Help/release/dev/add-FindIntl.rst
deleted file mode 100644
index ac048c9..0000000
--- a/Help/release/dev/add-FindIntl.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-add-FindIntl
-------------
-
-* The :module:`FindIntl` module was added to find the Gettext ``libintl``
-  library.
diff --git a/Help/release/dev/add-FindJsonCpp.rst b/Help/release/dev/add-FindJsonCpp.rst
deleted file mode 100644
index 5d1cb18..0000000
--- a/Help/release/dev/add-FindJsonCpp.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-add-FindJsonCpp
----------------
-
-* A :module:`FindJsonCpp` module was introduced to find the
-  JsonCpp package.
diff --git a/Help/release/dev/add-continue-command.rst b/Help/release/dev/add-continue-command.rst
deleted file mode 100644
index 4995a8e..0000000
--- a/Help/release/dev/add-continue-command.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-add-continue-command
---------------------
-
-* A new :command:`continue` command was added that can be called inside loop
-  contexts to end the current iteration and start the next one at the top of
-  the loop block.
diff --git a/Help/release/dev/add-xz-support.rst b/Help/release/dev/add-xz-support.rst
deleted file mode 100644
index 9bdf528..0000000
--- a/Help/release/dev/add-xz-support.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-add-xz-support
---------------
-
-* The :manual:`cmake(1)` ``-E tar`` command now supports creating
-  ``.xz``-compressed archives with the ``J`` flag.
diff --git a/Help/release/dev/add_javascript_coverage_parser.rst b/Help/release/dev/add_javascript_coverage_parser.rst
deleted file mode 100644
index 0d068ee..0000000
--- a/Help/release/dev/add_javascript_coverage_parser.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-add_javascript_coverage_parser
-------------------------------
-
-* The :command:`ctest_coverage` learned to support Javascript coverage.
diff --git a/Help/release/dev/break-command-strictness.rst b/Help/release/dev/break-command-strictness.rst
deleted file mode 100644
index 0723774..0000000
--- a/Help/release/dev/break-command-strictness.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-break-command-strictness
-------------------------
-
-* The :command:`break` command now rejects calls outside of a loop
-  context or that pass arguments to the command.
-  See policy :policy:`CMP0055`.
diff --git a/Help/release/dev/cached-regex-clear-fixed.rst b/Help/release/dev/cached-regex-clear-fixed.rst
deleted file mode 100644
index fbf08cc..0000000
--- a/Help/release/dev/cached-regex-clear-fixed.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-cached-regex-clear-fixed
-------------------------
-
-* Add :variable:`CMAKE_MATCH_COUNT` for the number of matches made in the last
-  regular expression.
diff --git a/Help/release/dev/cmake-E-tar-files-from.rst b/Help/release/dev/cmake-E-tar-files-from.rst
deleted file mode 100644
index f6087ff..0000000
--- a/Help/release/dev/cmake-E-tar-files-from.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake-E-tar-files-from
-----------------------
-
-* The :manual:`cmake(1)` ``-E tar`` command learned a new
-  ``--files-from=<file>`` option to specify file names using
-  lines in a file to overcome command-line length limits.
diff --git a/Help/release/dev/cmake-E-tar-mtime.rst b/Help/release/dev/cmake-E-tar-mtime.rst
deleted file mode 100644
index 6496577..0000000
--- a/Help/release/dev/cmake-E-tar-mtime.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake-E-tar-mtime
------------------
-
-* The :manual:`cmake(1)` ``-E tar`` command learned a new
-  ``--mtime=<date>`` option to specify the modification time
-  recorded in tarball entries.
diff --git a/Help/release/dev/console-pool.rst b/Help/release/dev/console-pool.rst
deleted file mode 100644
index 1d9bdb8..0000000
--- a/Help/release/dev/console-pool.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-console-pool
-------------
-
-* The :command:`add_custom_command` and :command:`add_custom_target`
-  commands learned a new ``USES_TERMINAL`` option to request that
-  the command be given direct access to the terminal if possible.
-  The :generator:`Ninja` generator will places such commands in the
-  ``console`` pool.  Build targets provided by CMake that are meant
-  for individual interactive use, such as ``install``, are now
-  placed in this pool.
diff --git a/Help/release/dev/cpack-rpm-component-descriptions.rst b/Help/release/dev/cpack-rpm-component-descriptions.rst
deleted file mode 100644
index 769a912..0000000
--- a/Help/release/dev/cpack-rpm-component-descriptions.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-cpack-rpm-component-descriptions
---------------------------------
-
-* The :module:`CPackRPM` module learned options to set per-component
-  descriptions and summaries.  See the
-  :variable:`CPACK_RPM_<component>_PACKAGE_DESCRIPTION` and
-  :variable:`CPACK_RPM_<component>_PACKAGE_SUMMARY` variables.
diff --git a/Help/release/dev/cpack-rpm-pre-post-install.rst b/Help/release/dev/cpack-rpm-pre-post-install.rst
deleted file mode 100644
index 0909d94..0000000
--- a/Help/release/dev/cpack-rpm-pre-post-install.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-cpack-rpm-pre-post-install
---------------------------
-
-* The :module:`CPackRPM` module learned options to specify
-  requirements for pre- and post-install scripts.  See the
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PRE` and
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POST` variables.
-
-* The :module:`CPackRPM` module learned options to specify
-  requirements for pre- and post-uninstall scripts.  See the
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PREUN` and
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POSTUN` variables.
diff --git a/Help/release/dev/ctest-delphi-coverage.rst b/Help/release/dev/ctest-delphi-coverage.rst
deleted file mode 100644
index efa97c9..0000000
--- a/Help/release/dev/ctest-delphi-coverage.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-ctest-delphi-coverage
----------------------
-
-* The :command:`ctest_coverage` learned to support Delphi coverage.
diff --git a/Help/release/dev/curl-darwinssl.rst b/Help/release/dev/curl-darwinssl.rst
deleted file mode 100644
index 3571bd1..0000000
--- a/Help/release/dev/curl-darwinssl.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-curl-darwinssl
---------------
-
-* On OS X, commands supporting network communication, such as
-  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now support SSL/TLS even when CMake
-  is not built against OpenSSL.  The OS X native SSL/TLS
-  implementation is used by default.  OS-configured certificate
-  authorities will be trusted automatically.
diff --git a/Help/release/dev/curl-default-cainfo.rst b/Help/release/dev/curl-default-cainfo.rst
deleted file mode 100644
index ed45d36..0000000
--- a/Help/release/dev/curl-default-cainfo.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-curl-default-cainfo
--------------------
-
-* When CMake is built with OpenSSL on systems other than Windows
-  and OS X, commands supporting network communication via ``https``,
-  such as :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now search for OS-configured certificate
-  authorities in a few ``/etc`` paths to be trusted automatically.
diff --git a/Help/release/dev/curl-winssl.rst b/Help/release/dev/curl-winssl.rst
deleted file mode 100644
index 9a28f4f..0000000
--- a/Help/release/dev/curl-winssl.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-curl-winssl
------------
-
-* On Windows, commands supporting network communication, such as
-  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now support SSL/TLS even when CMake
-  is not built against OpenSSL.  The Windows native SSL/TLS
-  implementation is used by default.  OS-configured certificate
-  authorities will be trusted automatically.
diff --git a/Help/release/dev/custom-command-byproducts.rst b/Help/release/dev/custom-command-byproducts.rst
deleted file mode 100644
index dc85fdb..0000000
--- a/Help/release/dev/custom-command-byproducts.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-custom-command-byproducts
--------------------------
-
-* The :command:`add_custom_command` and :command:`add_custom_target`
-  commands learned a new ``BYPRODUCTS`` option to specify files
-  produced as side effects of the custom commands.  These are not
-  outputs because they do not always have to be newer than inputs.
diff --git a/Help/release/dev/feature-record-msvc.rst b/Help/release/dev/feature-record-msvc.rst
deleted file mode 100644
index a8c9fd1..0000000
--- a/Help/release/dev/feature-record-msvc.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-feature-record-msvc
--------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Microsoft Visual Studio (``MSVC``).
diff --git a/Help/release/dev/file-LOCK-command.rst b/Help/release/dev/file-LOCK-command.rst
deleted file mode 100644
index 4b11e9e..0000000
--- a/Help/release/dev/file-LOCK-command.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-file-LOCK-command
------------------
-
-* The :command:`file(LOCK)` subcommand was created to allow CMake
-  processes to synchronize through file and directory locks.
diff --git a/Help/release/dev/file-strings-utf-16.rst b/Help/release/dev/file-strings-utf-16.rst
deleted file mode 100644
index f40b63e..0000000
--- a/Help/release/dev/file-strings-utf-16.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-file-strings-utf-16
--------------------
-
-* The :command:`file(STRINGS)` now supports UTF-16LE, UTF-16BE,
-  UTF-32LE, UTF-32BE as ``ENCODING`` options.
diff --git a/Help/release/dev/find-msmpi.rst b/Help/release/dev/find-msmpi.rst
deleted file mode 100644
index 6ece5c8..0000000
--- a/Help/release/dev/find-msmpi.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-find-msmpi
-----------
-
-* The :module:`FindMPI` module learned to find MS-MPI on Windows.
diff --git a/Help/release/dev/install-EXPORT-absolute-prefix.rst b/Help/release/dev/install-EXPORT-absolute-prefix.rst
deleted file mode 100644
index 1b2a01c..0000000
--- a/Help/release/dev/install-EXPORT-absolute-prefix.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-install-EXPORT-absolute-prefix
-------------------------------
-
-* The :command:`install(EXPORT)` command now works with an absolute
-  ``DESTINATION`` even if targets in the export set are installed
-  with a destination or usage requirements specified relative to the
-  install prefix.  The value of the :variable:`CMAKE_INSTALL_PREFIX`
-  variable is hard-coded into the installed export file as the base
-  for relative references.
diff --git a/Help/release/dev/record-GNU-5-features.rst b/Help/release/dev/record-GNU-5-features.rst
deleted file mode 100644
index 0da9e75..0000000
--- a/Help/release/dev/record-GNU-5-features.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-record-GNU-5-features
----------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU compiler version 5.0.
diff --git a/Help/release/dev/rpm_multi_prefix.rst b/Help/release/dev/rpm_multi_prefix.rst
deleted file mode 100644
index 0329592..0000000
--- a/Help/release/dev/rpm_multi_prefix.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-rpm_multi_prefix
-----------------
-
-* The :module:`CPackRPM` module learned a new
-  :variable:`CPACK_RPM_<COMPONENT>_PACKAGE_PREFIX` variable to
-  specify a component-specific value to use instead of
-  :variable:`CPACK_PACKAGING_INSTALL_PREFIX`.
-
-* The :module:`CPackRPM` module learned a new
-  :variable:`CPACK_RPM_RELOCATION_PATHS` variable to
-  specify multiple relocation prefixes for a single rpm package.
diff --git a/Help/release/dev/try-run-link-libraries.rst b/Help/release/dev/try-run-link-libraries.rst
deleted file mode 100644
index 4f20cbd..0000000
--- a/Help/release/dev/try-run-link-libraries.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-try-run-link-libraries
-----------------------
-
-* The :command:`try_run` command learned to honor the ``LINK_LIBRARIES``
-  option just as :command:`try_compile` already does.
diff --git a/Help/release/dev/try_compile-link-flags.rst b/Help/release/dev/try_compile-link-flags.rst
deleted file mode 100644
index d995e0b..0000000
--- a/Help/release/dev/try_compile-link-flags.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-try_compile-link-flags
-----------------------
-
-* The :command:`try_compile` command source file signature now honors
-  link flags (e.g. :variable:`CMAKE_EXE_LINKER_FLAGS`) in the generated
-  test project.  See policy :policy:`CMP0056`.
diff --git a/Help/release/dev/unsupported-compilers.rst b/Help/release/dev/unsupported-compilers.rst
deleted file mode 100644
index 1f3e8c1..0000000
--- a/Help/release/dev/unsupported-compilers.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-unsupported-compilers
----------------------
-
-* The implementation of CMake relies on some C++ compiler features which are
-  not supported by some older compilers.  As a result, those old compilers
-  can no longer be used to build CMake itself.  CMake continues to be able to
-  generate Makefiles and project files for users of those old compilers
-  however.  The compilers known to no longer be capable of building CMake
-  are:
-
-  * MSVC 6 and 7.0 - superceded by VisualStudio 7.1 and newer compilers.
-  * GCC 2.95 - superceded by GCC 3 and newer compilers.
-  * Borland compilers - superceded by other Windows compilers.
-  * Compaq compilers - superceded by other compilers.
-  * Comeau compilers - superceded by other compilers.
-  * SGI compilers - IRIX was dropped as a host platform.
-
-  When building using SolarisStudio 12, the default ``libCStd`` standard
-  library is not sufficient to build CMake.  The SolarisStudio distribution
-  supports compiler options to use ``STLPort4`` or ``libstdc++``.  An
-  appropriate option to select the standard library is now added
-  automatically when building CMake with SolarisStudio compilers.
diff --git a/Help/release/dev/vs-nsight-tegra-min-api.rst b/Help/release/dev/vs-nsight-tegra-min-api.rst
deleted file mode 100644
index f8fa056..0000000
--- a/Help/release/dev/vs-nsight-tegra-min-api.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-vs-nsight-tegra-min-api
------------------------
-
-* A :prop_tgt:`ANDROID_API_MIN` target property was introduced to
-  specify the minimum version to be targeted by the toolchain.
diff --git a/Help/release/dev/vs-shader-flags.rst b/Help/release/dev/vs-shader-flags.rst
deleted file mode 100644
index 0d3f6cc..0000000
--- a/Help/release/dev/vs-shader-flags.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-vs-shader-flags
----------------
-
-* A :prop_sf:`VS_SHADER_FLAGS` source file property was added to specify
-  additional shader flags to ``.hlsl`` files, for the Visual Studio generators.
diff --git a/Help/release/dev/windows-utf-8.rst b/Help/release/dev/windows-utf-8.rst
deleted file mode 100644
index 64cd616..0000000
--- a/Help/release/dev/windows-utf-8.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-windows-utf-8
--------------
-
-* On Windows, CMake learned to support international characters.
-  This allows use of characters from multiple (spoken) languages
-  in CMake code, paths to source files, configured files such as
-  ``.h.in`` files, and other files read and written by CMake.
-  Because CMake interoperates with many other tools, there may
-  still be some limitations when using certain international
-  characters.
-
-  Files written in the :manual:`cmake-language(7)`, such as
-  ``CMakeLists.txt`` or ``*.cmake`` files, are expected to be
-  encoded as UTF-8.  If files are already ASCII, they will be
-  compatible.  If files were in a different encoding, including
-  Latin 1, they will need to be converted.
-
-  The Visual Studio generators now write solution and project
-  files in UTF-8 instead of Windows-1252.  Windows-1252 supported
-  Latin 1 languages such as those found in North and South America
-  and Western Europe.  With UTF-8, additional languages are now
-  supported.
diff --git a/Help/release/dev/xcode-revise-make-program.rst b/Help/release/dev/xcode-revise-make-program.rst
deleted file mode 100644
index f50cf44..0000000
--- a/Help/release/dev/xcode-revise-make-program.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-xcode-revise-make-program
--------------------------
-
-* The :generator:`Xcode` generator no longer requires a value for
-  the :variable:`CMAKE_MAKE_PROGRAM` variable to be located up front.
-  It now locates ``xcodebuild`` when needed at build time.
diff --git a/Help/release/index.rst b/Help/release/index.rst
index abc19b8..990accf 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -13,5 +13,6 @@ Releases
 .. toctree::
    :maxdepth: 1
 
+   3.2.0 <3.2.0>
    3.1.0 <3.1.0>
    3.0.0 <3.0.0>

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

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Feb  4 17:30:51 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  4 Feb 2015 17:30:51 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2613-gd411243
Message-ID: <20150204223051.4D97CAABBB@public.kitware.com>

This is an automated email from 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  d41124347b64a473eb1a732fb9690a9712474444 (commit)
       via  0fd9256c91fed57453b298e19be624c70273b101 (commit)
      from  37e5f9557dc518b10eed9d8ff6b32ae76c78dd92 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d41124347b64a473eb1a732fb9690a9712474444
commit d41124347b64a473eb1a732fb9690a9712474444
Merge: 37e5f95 0fd9256
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 17:30:50 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 17:30:50 2015 -0500

    Merge topic 'fix-C-standard-features' into next
    
    0fd9256c Features: Add dialect compile flags only if default is known.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fd9256c91fed57453b298e19be624c70273b101
commit 0fd9256c91fed57453b298e19be624c70273b101
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 23:26:11 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 4 23:27:45 2015 +0100

    Features: Add dialect compile flags only if default is known.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 298d547..e3bac9e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2209,7 +2209,7 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
     }
   const char* defaultStd
       = this->Makefile->GetDefinition("CMAKE_" + lang + "_STANDARD_DEFAULT");
-  if (defaultStd && !*defaultStd)
+  if (!defaultStd || !*defaultStd)
     {
     // This compiler has no notion of language standard levels.
     return;

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb  4 18:27:24 2015
From: brad.king at kitware.com (Brad King)
Date: Wed,  4 Feb 2015 18:27:24 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2615-g467b715
Message-ID: <20150204232724.8D7DEAA374@public.kitware.com>

This is an automated email from 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  467b7158cb60adca53fbeac2dfe2f5699cba7fb1 (commit)
       via  9e8ab436e1482b8aadc00951da55fca0e5e485af (commit)
      from  d41124347b64a473eb1a732fb9690a9712474444 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=467b7158cb60adca53fbeac2dfe2f5699cba7fb1
commit 467b7158cb60adca53fbeac2dfe2f5699cba7fb1
Merge: d411243 9e8ab43
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 18:27:22 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 18:27:22 2015 -0500

    Merge topic 'fix-C-standard-features' into next
    
    9e8ab436 fixup! Features: Add dialect compile flags only if default is known.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e8ab436e1482b8aadc00951da55fca0e5e485af
commit 9e8ab436e1482b8aadc00951da55fca0e5e485af
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 18:16:46 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 18:22:58 2015 -0500

    fixup! Features: Add dialect compile flags only if default is known.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index e3bac9e..400415b 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2276,15 +2276,15 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
                                 std::find(stds.begin(), stds.end(), standard);
   assert(stdIt != stds.end());
 
-  std::vector<std::string>::const_iterator defaultStdIt;
-  if (defaultStd)
-    {
-    defaultStdIt = std::find(stds.begin(), stds.end(), defaultStd);
-    assert(defaultStdIt != stds.end());
-    }
-  else
-    {
-    defaultStdIt = stds.end() - 1;
+  std::vector<std::string>::const_iterator defaultStdIt =
+    std::find(stds.begin(), stds.end(), defaultStd);
+  if (defaultStdIt == stds.end())
+    {
+    std::string e =
+      "CMAKE_" + lang + "_STANDARD_DEFAULT is set to invalid value '" +
+      std::string(defaultStd) + "'";
+    this->Makefile->IssueMessage(cmake::INTERNAL_ERROR, e);
+    return;
     }
 
   // Greater or equal because the standards are stored in

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

Summary of changes:
 Source/cmLocalGenerator.cxx |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb  4 18:40:14 2015
From: brad.king at kitware.com (Brad King)
Date: Wed,  4 Feb 2015 18:40:14 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2621-g18e30fb
Message-ID: <20150204234015.6C38421F8@public.kitware.com>

This is an automated email from 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  18e30fbaeb6a2c6a7ce66d8748f68ebaacca667a (commit)
       via  fb3487a9975ed321b48fad5c71dd655d66b68087 (commit)
       via  6027798a30eae02175ce4ad13e1439f4383b6cd3 (commit)
       via  9d767810e1e54eb9233854f0dbf1345a0b5be60f (commit)
       via  72537e4436a17535af5424628adef3b614a61679 (commit)
       via  82c9d6868b87a964214a468cae816642950e70b6 (commit)
      from  467b7158cb60adca53fbeac2dfe2f5699cba7fb1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18e30fbaeb6a2c6a7ce66d8748f68ebaacca667a
commit 18e30fbaeb6a2c6a7ce66d8748f68ebaacca667a
Merge: 467b715 fb3487a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 18:40:13 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 18:40:13 2015 -0500

    Merge topic 'fix-C-standard-features' into next
    
    fb3487a9 Features: Fix C90 feature detection.
    6027798a Features: Allow setting standard dialect below the default.
    9d767810 Features: Populate CMAKE_<LANG>_STANDARD_DEFAULT only for supported compilers.
    72537e44 Features: Add dialect compile flags only if default is known.
    82c9d686 AppleClang: Remove redundant UNIX condition.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb3487a9975ed321b48fad5c71dd655d66b68087
commit fb3487a9975ed321b48fad5c71dd655d66b68087
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 3 21:47:45 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 18:38:21 2015 -0500

    Features: Fix C90 feature detection.
    
    This bug caused c_function_prototypes to not be recorded at configure
    time when compiling with -std=gnu99 or similar. In the case of feature
    recording, that was not a problem, because the logic in
    CMakeDetermineCompileFeatures.cmake currently assumes that a feature
    present for an earlier standard is present for a later standard.
    
    However, the detection strings are also used in WriteCompilerDetectionHeader,
    so the feature macro has been defined to '0' when using a later language
    dialect.
    
    Fix that by not checking the existence of the __STDC_VERSION__ macro at
    all when detecting C90 features.

diff --git a/Modules/Compiler/AppleClang-C-FeatureTests.cmake b/Modules/Compiler/AppleClang-C-FeatureTests.cmake
index 6f3d6a7..e80b526 100644
--- a/Modules/Compiler/AppleClang-C-FeatureTests.cmake
+++ b/Modules/Compiler/AppleClang-C-FeatureTests.cmake
@@ -7,5 +7,5 @@ set(AppleClang_C99 "${_cmake_oldestSupported} && defined(__STDC_VERSION__) && __
 set(_cmake_feature_test_c_restrict "${AppleClang_C99}")
 set(_cmake_feature_test_c_variadic_macros "${AppleClang_C99}")
 
-set(AppleClang_C90 "${_cmake_oldestSupported} && !defined(__STDC_VERSION__)")
+set(AppleClang_C90 "${_cmake_oldestSupported}")
 set(_cmake_feature_test_c_function_prototypes "${AppleClang_C90}")
diff --git a/Modules/Compiler/Clang-C-FeatureTests.cmake b/Modules/Compiler/Clang-C-FeatureTests.cmake
index 2d8673d..99c2252 100644
--- a/Modules/Compiler/Clang-C-FeatureTests.cmake
+++ b/Modules/Compiler/Clang-C-FeatureTests.cmake
@@ -7,5 +7,5 @@ set(Clang_C99 "${_cmake_oldestSupported} && defined(__STDC_VERSION__) && __STDC_
 set(_cmake_feature_test_c_restrict "${Clang_C99}")
 set(_cmake_feature_test_c_variadic_macros "${Clang_C99}")
 
-set(Clang_C90 "${_cmake_oldestSupported} && !defined(__STDC_VERSION__)")
+set(Clang_C90 "${_cmake_oldestSupported}")
 set(_cmake_feature_test_c_function_prototypes "${Clang_C90}")
diff --git a/Modules/Compiler/GNU-C-FeatureTests.cmake b/Modules/Compiler/GNU-C-FeatureTests.cmake
index d8e456c..b3fe33f 100644
--- a/Modules/Compiler/GNU-C-FeatureTests.cmake
+++ b/Modules/Compiler/GNU-C-FeatureTests.cmake
@@ -13,5 +13,5 @@ set(GNU44_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404 && defined(__STDC_VERSIO
 set(_cmake_feature_test_c_restrict "${GNU44_C99}")
 set(_cmake_feature_test_c_variadic_macros "${GNU44_C99}")
 
-set(GNU_C90 "${_cmake_oldestSupported} && !defined(__STDC_VERSION__)")
+set(GNU_C90 "${_cmake_oldestSupported}")
 set(_cmake_feature_test_c_function_prototypes "${GNU_C90}")
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 38c44c8..3ba1e0a 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -164,6 +164,38 @@ if (CMAKE_C_COMPILE_FEATURES)
       )
     endif()
   endif()
+
+  add_executable(CompileFeaturesGenex_C genex_test.c)
+  set_property(TARGET CompileFeaturesGenex_C PROPERTY C_STANDARD 11)
+
+  if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6)
+      list(APPEND expected_defs
+        EXPECT_C_STATIC_ASSERT=1
+      )
+    else()
+      list(APPEND expected_defs
+        EXPECT_C_STATIC_ASSERT=0
+      )
+    endif()
+  elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang"
+      OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
+    list(APPEND expected_defs
+      EXPECT_C_STATIC_ASSERT=1
+    )
+  endif()
+
+  list(APPEND expected_defs
+    EXPECT_C_FUNCTION_PROTOTYPES=1
+    EXPECT_C_RESTRICT=1
+  )
+
+  target_compile_definitions(CompileFeaturesGenex_C PRIVATE
+    HAVE_C_FUNCTION_PROTOTYPES=$<COMPILE_FEATURES:c_function_prototypes>
+    HAVE_C_RESTRICT=$<COMPILE_FEATURES:c_restrict>
+    HAVE_C_STATIC_ASSERT=$<COMPILE_FEATURES:c_static_assert>
+    ${expected_defs}
+  )
 endif()
 
 if (CMAKE_CXX_COMPILE_FEATURES)
diff --git a/Tests/CompileFeatures/genex_test.c b/Tests/CompileFeatures/genex_test.c
new file mode 100644
index 0000000..b1215bd
--- /dev/null
+++ b/Tests/CompileFeatures/genex_test.c
@@ -0,0 +1,38 @@
+#ifndef EXPECT_C_STATIC_ASSERT
+# error EXPECT_C_STATIC_ASSERT not defined
+#endif
+#ifndef EXPECT_C_FUNCTION_PROTOTYPES
+# error EXPECT_C_FUNCTION_PROTOTYPES not defined
+#endif
+#ifndef EXPECT_C_RESTRICT
+# error EXPECT_C_RESTRICT not defined
+#endif
+
+#if !EXPECT_C_STATIC_ASSERT
+#if EXPECT_C_STATIC_ASSERT
+#error "Expect c_static_assert feature"
+#endif
+#else
+#if !EXPECT_C_STATIC_ASSERT
+#error "Expect no c_static_assert feature"
+#endif
+#endif
+
+#if !EXPECT_C_FUNCTION_PROTOTYPES
+#  error Expect c_function_prototypes support
+#endif
+
+#if !EXPECT_C_RESTRICT
+#  if EXPECT_C_RESTRICT
+#    error Expect c_restrict support
+#  endif
+#else
+#  if !EXPECT_C_RESTRICT
+#    error Expect no c_restrict support
+#  endif
+#endif
+
+int main()
+{
+
+}
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index e70a977..c538280 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -84,6 +84,15 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
   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)
@@ -130,3 +139,16 @@ add_executable(multi_files_11 multi_files.cpp)
 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")
+  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()
diff --git a/Tests/Module/WriteCompilerDetectionHeader/main.c b/Tests/Module/WriteCompilerDetectionHeader/main.c
new file mode 100644
index 0000000..9023b0f
--- /dev/null
+++ b/Tests/Module/WriteCompilerDetectionHeader/main.c
@@ -0,0 +1,29 @@
+
+#include "test_compiler_detection.h"
+
+#if !defined(TEST_COMPILER_C_FUNCTION_PROTOTYPES) || !TEST_COMPILER_C_FUNCTION_PROTOTYPES
+#  error Expected TEST_COMPILER_C_FUNCTION_PROTOTYPES
+#endif
+
+#if !EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
+#  error Expected EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
+#endif
+
+#if !defined(TEST_COMPILER_C_RESTRICT) || !TEST_COMPILER_C_RESTRICT
+#  if EXPECTED_COMPILER_C_RESTRICT
+#    error Expected TEST_COMPILER_C_RESTRICT
+#  endif
+#else
+#  if !EXPECTED_COMPILER_C_RESTRICT
+#    error Expect no TEST_COMPILER_C_RESTRICT
+#  endif
+#endif
+
+#ifdef TEST_COMPILER_CXX_STATIC_ASSERT
+#error Expect no CXX features defined
+#endif
+
+int main()
+{
+  return 0;
+}
diff --git a/Tests/Module/WriteCompilerDetectionHeader/main_multi.c b/Tests/Module/WriteCompilerDetectionHeader/main_multi.c
new file mode 100644
index 0000000..6f4573f
--- /dev/null
+++ b/Tests/Module/WriteCompilerDetectionHeader/main_multi.c
@@ -0,0 +1,29 @@
+
+#include "multi_file_compiler_detection.h"
+
+#if !defined(MULTI_COMPILER_C_FUNCTION_PROTOTYPES) || !MULTI_COMPILER_C_FUNCTION_PROTOTYPES
+#  error Expected MULTI_COMPILER_C_FUNCTION_PROTOTYPES
+#endif
+
+#if !EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
+#  error Expected EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES
+#endif
+
+#if !defined(MULTI_COMPILER_C_RESTRICT) || !MULTI_COMPILER_C_RESTRICT
+#  if EXPECTED_COMPILER_C_RESTRICT
+#    error Expected MULTI_COMPILER_C_RESTRICT
+#  endif
+#else
+#  if !EXPECTED_COMPILER_C_RESTRICT
+#    error Expect no MULTI_COMPILER_C_RESTRICT
+#  endif
+#endif
+
+#ifdef MULTI_COMPILER_CXX_STATIC_ASSERT
+#error Expect no CXX features defined
+#endif
+
+int main()
+{
+  return 0;
+}

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6027798a30eae02175ce4ad13e1439f4383b6cd3
commit 6027798a30eae02175ce4ad13e1439f4383b6cd3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 19:14:00 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 18:36:36 2015 -0500

    Features: Allow setting standard dialect below the default.
    
    If the requested standard dialect is older than the default dialect
    then we must use a flag because we cannot decay to a newer standard.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 81e37f6..400415b 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2287,7 +2287,21 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
     return;
     }
 
-  for ( ; stdIt <= defaultStdIt; ++stdIt)
+  // Greater or equal because the standards are stored in
+  // backward chronological order.
+  if (stdIt >= defaultStdIt)
+    {
+    std::string option_flag =
+              "CMAKE_" + lang + *stdIt
+                      + "_" + type + "_COMPILE_OPTION";
+
+    const char *opt =
+        target->GetMakefile()->GetRequiredDefinition(option_flag);
+    this->AppendFlagEscape(flags, opt);
+    return;
+    }
+
+  for ( ; stdIt < defaultStdIt; ++stdIt)
     {
     std::string option_flag =
               "CMAKE_" + lang + *stdIt

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d767810e1e54eb9233854f0dbf1345a0b5be60f
commit 9d767810e1e54eb9233854f0dbf1345a0b5be60f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 22:04:18 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 18:29:53 2015 -0500

    Features: Populate CMAKE_<LANG>_STANDARD_DEFAULT only for supported compilers.
    
    If no compiler feature information is known for a given compiler
    version, do not set a language standard default either.  The two
    settings must be recorded consistently.

diff --git a/Modules/Compiler/AppleClang-C.cmake b/Modules/Compiler/AppleClang-C.cmake
index 00d2633..10454f6 100644
--- a/Modules/Compiler/AppleClang-C.cmake
+++ b/Modules/Compiler/AppleClang-C.cmake
@@ -12,7 +12,9 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
   set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu11")
 endif()
 
-set(CMAKE_C_STANDARD_DEFAULT 99)
+if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
+  set(CMAKE_C_STANDARD_DEFAULT 99)
+endif()
 
 macro(cmake_record_c_compile_features)
   macro(_get_appleclang_features std_version list)
diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake
index 6d58be3..5194da4 100644
--- a/Modules/Compiler/AppleClang-CXX.cmake
+++ b/Modules/Compiler/AppleClang-CXX.cmake
@@ -19,7 +19,9 @@ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1)
   set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
 endif()
 
-set(CMAKE_CXX_STANDARD_DEFAULT 98)
+if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
+  set(CMAKE_CXX_STANDARD_DEFAULT 98)
+endif()
 
 macro(cmake_record_cxx_compile_features)
   macro(_get_appleclang_features std_version list)
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index e07eace..84b2c74 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -31,7 +31,9 @@ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
   set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
 endif()
 
-set(CMAKE_CXX_STANDARD_DEFAULT 98)
+if(UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
+  set(CMAKE_CXX_STANDARD_DEFAULT 98)
+endif()
 
 macro(cmake_record_cxx_compile_features)
   macro(_get_clang_features std_version list)
diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index fa97a94..89704e6 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -24,7 +24,7 @@ endif()
 
 if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
   set(CMAKE_C_STANDARD_DEFAULT 11)
-else()
+elseif(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
   set(CMAKE_C_STANDARD_DEFAULT 90)
 endif()
 
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index c471daf..86a31e4 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -34,7 +34,9 @@ elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
   set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
 endif()
 
-set(CMAKE_CXX_STANDARD_DEFAULT 98)
+if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
+  set(CMAKE_CXX_STANDARD_DEFAULT 98)
+endif()
 
 macro(cmake_record_cxx_compile_features)
   macro(_get_gcc_features std_version list)
diff --git a/Modules/Compiler/MSVC-CXX.cmake b/Modules/Compiler/MSVC-CXX.cmake
index 962aaeb..82ce069 100644
--- a/Modules/Compiler/MSVC-CXX.cmake
+++ b/Modules/Compiler/MSVC-CXX.cmake
@@ -1,5 +1,8 @@
-# MSVC has no specific language level or flags to change it.
-set(CMAKE_CXX_STANDARD_DEFAULT "")
+
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.0)
+  # MSVC has no specific language level or flags to change it.
+  set(CMAKE_CXX_STANDARD_DEFAULT "")
+endif()
 
 macro(cmake_record_cxx_compile_features)
   record_compiler_features(CXX "" CMAKE_CXX_COMPILE_FEATURES)
diff --git a/Modules/Compiler/SunPro-CXX.cmake b/Modules/Compiler/SunPro-CXX.cmake
index cb37713..c7bc734 100644
--- a/Modules/Compiler/SunPro-CXX.cmake
+++ b/Modules/Compiler/SunPro-CXX.cmake
@@ -37,7 +37,9 @@ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
   set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=c++11")
 endif()
 
-set(CMAKE_CXX_STANDARD_DEFAULT 98)
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
+  set(CMAKE_CXX_STANDARD_DEFAULT 98)
+endif()
 
 macro(cmake_record_cxx_compile_features)
   macro(_get_solaris_studio_features std_version list)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72537e4436a17535af5424628adef3b614a61679
commit 72537e4436a17535af5424628adef3b614a61679
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 23:26:11 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 18:28:07 2015 -0500

    Features: Add dialect compile flags only if default is known.
    
    The CMAKE_<LANG>_STANDARD_DEFAULT variable indicates whether the
    compiler has any notion of standard levels and that CMake knows
    about them.  If no language standard levels are available, skip
    all logic to attempt to add a flag for the level.
    
    Also fail with an internal error if a bad default value is set.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index af4c950..81e37f6 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2209,7 +2209,7 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
     }
   const char* defaultStd
       = this->Makefile->GetDefinition("CMAKE_" + lang + "_STANDARD_DEFAULT");
-  if (defaultStd && !*defaultStd)
+  if (!defaultStd || !*defaultStd)
     {
     // This compiler has no notion of language standard levels.
     return;
@@ -2276,15 +2276,15 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
                                 std::find(stds.begin(), stds.end(), standard);
   assert(stdIt != stds.end());
 
-  std::vector<std::string>::const_iterator defaultStdIt;
-  if (defaultStd)
+  std::vector<std::string>::const_iterator defaultStdIt =
+    std::find(stds.begin(), stds.end(), defaultStd);
+  if (defaultStdIt == stds.end())
     {
-    defaultStdIt = std::find(stds.begin(), stds.end(), defaultStd);
-    assert(defaultStdIt != stds.end());
-    }
-  else
-    {
-    defaultStdIt = stds.end() - 1;
+    std::string e =
+      "CMAKE_" + lang + "_STANDARD_DEFAULT is set to invalid value '" +
+      std::string(defaultStd) + "'";
+    this->Makefile->IssueMessage(cmake::INTERNAL_ERROR, e);
+    return;
     }
 
   for ( ; stdIt <= defaultStdIt; ++stdIt)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82c9d6868b87a964214a468cae816642950e70b6
commit 82c9d6868b87a964214a468cae816642950e70b6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 22:03:49 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 18:28:06 2015 -0500

    AppleClang: Remove redundant UNIX condition.

diff --git a/Modules/Compiler/AppleClang-C.cmake b/Modules/Compiler/AppleClang-C.cmake
index 16f420f..00d2633 100644
--- a/Modules/Compiler/AppleClang-C.cmake
+++ b/Modules/Compiler/AppleClang-C.cmake
@@ -20,7 +20,7 @@ macro(cmake_record_c_compile_features)
   endmacro()
 
   set(_result 0)
-  if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
     _get_appleclang_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
     if (_result EQUAL 0)
       _get_appleclang_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES)
diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake
index 978c382..6d58be3 100644
--- a/Modules/Compiler/AppleClang-CXX.cmake
+++ b/Modules/Compiler/AppleClang-CXX.cmake
@@ -27,7 +27,7 @@ macro(cmake_record_cxx_compile_features)
   endmacro()
 
   set(_result 0)
-  if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
     set(_result 0)
     if(CMAKE_CXX14_STANDARD_COMPILE_OPTION)
       _get_appleclang_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES)

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

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Thu Feb  5 00:01:16 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Thu,  5 Feb 2015 00:01:16 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.1-1010-gebe1f4f
Message-ID: <20150205050116.A6A35AABA4@public.kitware.com>

This is an automated email from 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  ebe1f4f896a18dc09bda431233a5cfeee5b2327b (commit)
      from  eef9a476179dd91c69d30f937e742ea484436fc6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ebe1f4f896a18dc09bda431233a5cfeee5b2327b
commit ebe1f4f896a18dc09bda431233a5cfeee5b2327b
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Thu Feb 5 00:01:15 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Feb 5 00:01:15 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 8722425..a9b0511 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 1)
-set(CMake_VERSION_PATCH 20150204)
+set(CMake_VERSION_PATCH 20150205)
 #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 Feb  5 08:42:44 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 08:42:44 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2624-gb901131
Message-ID: <20150205134244.CCB554983@public.kitware.com>

This is an automated email from 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  b901131640c66afdfc10f0b9d0f8bd3a59976daf (commit)
       via  f5d4c0dbf8e2d5182e458504a3fc882e9b83230b (commit)
       via  103f8137d247fe790caed9b062e199d119e60392 (commit)
      from  18e30fbaeb6a2c6a7ce66d8748f68ebaacca667a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b901131640c66afdfc10f0b9d0f8bd3a59976daf
commit b901131640c66afdfc10f0b9d0f8bd3a59976daf
Merge: 18e30fb f5d4c0d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 08:42:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 08:42:42 2015 -0500

    Merge topic 'doc-3.2-relnotes' into next
    
    f5d4c0db fixup! Help: Organize and revise 3.2 release notes
    103f8137 Help: Add link target to cmake-language.7 encoding section


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5d4c0dbf8e2d5182e458504a3fc882e9b83230b
commit f5d4c0dbf8e2d5182e458504a3fc882e9b83230b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 18:58:48 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 18:58:48 2015 -0500

    fixup! Help: Organize and revise 3.2 release notes

diff --git a/Help/release/3.2.0.rst b/Help/release/3.2.0.rst
index f683438..5b12163 100644
--- a/Help/release/3.2.0.rst
+++ b/Help/release/3.2.0.rst
@@ -13,7 +13,8 @@ New Features
 Syntax
 ------
 
-* CMake learned to support unicode characters encoded as UTF-8
+* CMake learned to support unicode characters
+  :ref:`encoded as UTF-8 <CMake Language Encoding>`
   on Windows.  This was already supported on platforms whose
   system APIs accept UTF-8 encoded strings.
   Unicode characters may now be used in CMake code, paths to
@@ -89,10 +90,6 @@ Properties
 Modules
 -------
 
-* The :module:`CTestCoverageCollectGCOV` module was introduced as an
-  alternative to the :command:`ctest_coverage` command for collecting
-  ``gcov`` results for submission to CDash.
-
 * The :module:`ExternalData` module learned to support
   :ref:`Custom Fetch Scripts <ExternalData Custom Fetch Scripts>`.
   This allows projects to specify custom ``.cmake`` scripts for
@@ -158,8 +155,13 @@ CTest
 -----
 
 * The :command:`ctest_coverage` command learned to support Delphi coverage.
+
 * The :command:`ctest_coverage` command learned to support Javascript coverage.
 
+* The :module:`CTestCoverageCollectGCOV` module was introduced as an
+  alternative to the :command:`ctest_coverage` command for collecting
+  ``gcov`` results for submission to CDash.
+
 CPack
 -----
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=103f8137d247fe790caed9b062e199d119e60392
commit 103f8137d247fe790caed9b062e199d119e60392
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 18:58:05 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 4 18:58:05 2015 -0500

    Help: Add link target to cmake-language.7 encoding section

diff --git a/Help/manual/cmake-language.7.rst b/Help/manual/cmake-language.7.rst
index 5ec5858..3e0297c 100644
--- a/Help/manual/cmake-language.7.rst
+++ b/Help/manual/cmake-language.7.rst
@@ -57,6 +57,8 @@ variable.
 Syntax
 ======
 
+.. _`CMake Language Encoding`:
+
 Encoding
 --------
 

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

Summary of changes:
 Help/manual/cmake-language.7.rst |    2 ++
 Help/release/3.2.0.rst           |   12 +++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb  5 08:44:11 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 08:44:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2630-g831d032
Message-ID: <20150205134411.6EDBB514E@public.kitware.com>

This is an automated email from 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  831d032017740493b3319e18d7cbf627e3f77702 (commit)
       via  d81bbc3fcee81bf0538c139637e0344c9fcad40a (commit)
       via  0f38d9c2ad53631185da9aa7d0f50b5816272a55 (commit)
       via  0f580e8e67fd307c21924dd732570937a0db25e2 (commit)
       via  e08a78dc2cf04682010a3d4496b4c454271f194a (commit)
       via  3a4381b6605f593abc9d9364f5ffa3fc9a209854 (commit)
      from  b901131640c66afdfc10f0b9d0f8bd3a59976daf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=831d032017740493b3319e18d7cbf627e3f77702
commit 831d032017740493b3319e18d7cbf627e3f77702
Merge: b901131 d81bbc3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 08:44:09 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 08:44:09 2015 -0500

    Merge topic 'doc-3.2-relnotes' into next
    
    d81bbc3f Help: Add 3.2 release note for AUTORCC dependency tracking
    0f38d9c2 Help: Add 3.2 release notes for file(GENERATE) features
    0f580e8e Help: Organize and revise 3.2 release notes
    e08a78dc Help: Consolidate 3.2 release notes
    3a4381b6 Help: Add link target to cmake-language.7 encoding section


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d81bbc3fcee81bf0538c139637e0344c9fcad40a
commit d81bbc3fcee81bf0538c139637e0344c9fcad40a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 21:45:25 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 5 08:43:23 2015 -0500

    Help: Add 3.2 release note for AUTORCC dependency tracking

diff --git a/Help/release/3.2.0.rst b/Help/release/3.2.0.rst
index d1be27e..5b12163 100644
--- a/Help/release/3.2.0.rst
+++ b/Help/release/3.2.0.rst
@@ -211,6 +211,10 @@ Other
   * Microsoft Visual Studio (``MSVC``) for versions 2010 through 2015.
   * Oracle SolarisStudio (``SunPro``) version 12.4.
 
+* The :ref:`Qt AUTORCC` feature now tracks files listed in ``.qrc`` files
+  as dependencies. If an input file to the ``rcc`` tool is changed, the tool
+  is automatically re-run.
+
 New Diagnostics
 ===============
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f38d9c2ad53631185da9aa7d0f50b5816272a55
commit 0f38d9c2ad53631185da9aa7d0f50b5816272a55
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 21:44:11 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 5 08:43:23 2015 -0500

    Help: Add 3.2 release notes for file(GENERATE) features

diff --git a/Help/release/3.2.0.rst b/Help/release/3.2.0.rst
index c6a8add..d1be27e 100644
--- a/Help/release/3.2.0.rst
+++ b/Help/release/3.2.0.rst
@@ -63,6 +63,13 @@ Commands
 * The :command:`try_run` command learned to honor the ``LINK_LIBRARIES``
   option just as :command:`try_compile` already does.
 
+* The :command:`file(GENERATE)` command now generates the output file with
+  the same permissions as the input file if set.
+
+* The :command:`file(GENERATE)` command can now generate files which are
+  used as source files for buildsystem targets.  Generated files
+  automatically get their :prop_sf:`GENERATED` property set to ``TRUE``.
+
 Variables
 ---------
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f580e8e67fd307c21924dd732570937a0db25e2
commit 0f580e8e67fd307c21924dd732570937a0db25e2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 13:33:49 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 5 08:43:22 2015 -0500

    Help: Organize and revise 3.2 release notes
    
    Add section headers similar to the 3.1 release notes and move each
    individual bullet into an appropriate section.  Revise and consolidate
    some bullets covering related areas.
    
    Co-Author: Stephen Kelly <steveire at gmail.com>

diff --git a/Help/release/3.2.0.rst b/Help/release/3.2.0.rst
index 142d408..c6a8add 100644
--- a/Help/release/3.2.0.rst
+++ b/Help/release/3.2.0.rst
@@ -7,131 +7,103 @@ CMake 3.2.0 Release Notes
 
 Changes made since CMake 3.1.0 include the following.
 
-* A new :command:`continue` command was added that can be called inside loop
-  contexts to end the current iteration and start the next one at the top of
-  the loop block.
-
-* A :module:`FindGSL` module was introduced to find the
-  GNU Scientific Library.
-
-* The :module:`FindIntl` module was added to find the Gettext ``libintl``
-  library.
-
-* A :module:`FindJsonCpp` module was introduced to find the
-  JsonCpp package.
-
-* The :command:`ctest_coverage` learned to support Javascript coverage.
-
-* The :manual:`cmake(1)` ``-E tar`` command now supports creating
-  ``.xz``-compressed archives with the ``J`` flag.
-
-* On OS X with Makefile and Ninja generators, when a compiler is found
-  in ``/usr/bin`` it is now mapped to the corresponding compiler inside
-  the Xcode application folder, if any.  This allows such build
-  trees to continue to work with their original compiler even when
-  ``xcode-select`` switches to a different Xcode installation.
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU compilers on OS X.
+New Features
+============
 
-* The :command:`break` command now rejects calls outside of a loop
-  context or that pass arguments to the command.
-  See policy :policy:`CMP0055`.
+Syntax
+------
 
-* Add :variable:`CMAKE_MATCH_COUNT` for the number of matches made in the last
-  regular expression.
+* CMake learned to support unicode characters
+  :ref:`encoded as UTF-8 <CMake Language Encoding>`
+  on Windows.  This was already supported on platforms whose
+  system APIs accept UTF-8 encoded strings.
+  Unicode characters may now be used in CMake code, paths to
+  source files, configured files such as ``.h.in`` files, and
+  other files read and written by CMake.  Note that because CMake
+  interoperates with many other tools, there may still be some
+  limitations when using certain unicode characters.
 
-* The :manual:`cmake(1)` ``-E tar`` command learned a new
-  ``--files-from=<file>`` option to specify file names using
-  lines in a file to overcome command-line length limits.
+Commands
+--------
 
-* The :manual:`cmake(1)` ``-E tar`` command learned a new
-  ``--mtime=<date>`` option to specify the modification time
-  recorded in tarball entries.
+* The :command:`add_custom_command` and :command:`add_custom_target`
+  commands learned a new ``BYPRODUCTS`` option to specify files
+  produced as side effects of the custom commands.  These are not
+  outputs because they do not always have to be newer than inputs.
 
 * The :command:`add_custom_command` and :command:`add_custom_target`
   commands learned a new ``USES_TERMINAL`` option to request that
   the command be given direct access to the terminal if possible.
   The :generator:`Ninja` generator will places such commands in the
-  ``console`` pool.  Build targets provided by CMake that are meant
-  for individual interactive use, such as ``install``, are now
+  ``console`` :prop_gbl:`pool <JOB_POOLS>`.  Build targets provided by CMake
+  that are meant for individual interactive use, such as ``install``, are now
   placed in this pool.
 
-* The :module:`CPackRPM` module learned options to set per-component
-  descriptions and summaries.  See the
-  :variable:`CPACK_RPM_<component>_PACKAGE_DESCRIPTION` and
-  :variable:`CPACK_RPM_<component>_PACKAGE_SUMMARY` variables.
+* A new :command:`continue` command was added that can be called inside loop
+  contexts to end the current iteration and start the next one at the top of
+  the loop block.
 
-* The :module:`CPackRPM` module learned options to specify
-  requirements for pre- and post-install scripts.  See the
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PRE` and
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POST` variables.
+* The :command:`file(LOCK)` subcommand was created to allow CMake
+  processes to synchronize through file and directory locks.
 
-* The :module:`CPackRPM` module learned options to specify
-  requirements for pre- and post-uninstall scripts.  See the
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PREUN` and
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POSTUN` variables.
+* The :command:`file(STRINGS)` now supports UTF-16LE, UTF-16BE,
+  UTF-32LE, UTF-32BE as ``ENCODING`` options.
 
-* The :module:`CTestCoverageCollectGCOV` module was introduced as an
-  alternative to the :command:`ctest_coverage` command for collecting
-  ``gcov`` results for submission to CDash.
+* The :command:`install(EXPORT)` command now works with an absolute
+  ``DESTINATION`` even if targets in the export set are installed
+  with a destination or :ref:`usage requirements <Target Usage Requirements>`
+  specified relative to the install prefix.  The value of the
+  :variable:`CMAKE_INSTALL_PREFIX` variable is hard-coded into the installed
+  export file as the base for relative references.
+
+* The :command:`try_compile` command source file signature now honors
+  link flags (e.g. :variable:`CMAKE_EXE_LINKER_FLAGS`) in the generated
+  test project.  See policy :policy:`CMP0056`.
 
-* The :command:`ctest_coverage` learned to support Delphi coverage.
+* The :command:`try_run` command learned to honor the ``LINK_LIBRARIES``
+  option just as :command:`try_compile` already does.
 
-* On OS X, commands supporting network communication, such as
-  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now support SSL/TLS even when CMake
-  is not built against OpenSSL.  The OS X native SSL/TLS
-  implementation is used by default.  OS-configured certificate
-  authorities will be trusted automatically.
+Variables
+---------
 
-* When CMake is built with OpenSSL on systems other than Windows
-  and OS X, commands supporting network communication via ``https``,
-  such as :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now search for OS-configured certificate
-  authorities in a few ``/etc`` paths to be trusted automatically.
+* The :variable:`CMAKE_MATCH_COUNT` variable was introduced to record the
+  number of matches made in the last regular expression matched in an
+  :command:`if` command or a :command:`string` command.
 
-* On Windows, commands supporting network communication, such as
-  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now support SSL/TLS even when CMake
-  is not built against OpenSSL.  The Windows native SSL/TLS
-  implementation is used by default.  OS-configured certificate
-  authorities will be trusted automatically.
+Properties
+----------
 
-* The :command:`add_custom_command` and :command:`add_custom_target`
-  commands learned a new ``BYPRODUCTS`` option to specify files
-  produced as side effects of the custom commands.  These are not
-  outputs because they do not always have to be newer than inputs.
+* An :prop_tgt:`ANDROID_API_MIN` target property was introduced to
+  specify the minimum version to be targeted by the toolchain.
+
+* A :prop_sf:`VS_SHADER_FLAGS` source file property was added to specify
+  additional shader flags to ``.hlsl`` files, for the Visual Studio
+  generators.
+
+Modules
+-------
 
 * The :module:`ExternalData` module learned to support
   :ref:`Custom Fetch Scripts <ExternalData Custom Fetch Scripts>`.
   This allows projects to specify custom ``.cmake`` scripts for
   fetching data objects during the build.
 
-* The :module:`ExternalProject` module ``ExternalProject_Add`` function
-  learned a new ``CMAKE_CACHE_DEFAULT_ARGS`` option to initialize cache
-  values in the external project without setting them on future builds.
-
 * The :module:`ExternalProject` module learned options to create
   independent external project step targets that do not depend
   on the builtin steps.
 
 * The :module:`ExternalProject` module :command:`ExternalProject_Add`
-  command learned a ``TEST_EXCLUDE_FROM_MAIN`` option to exclude tests
-  from the main build.
+  command learned a new ``CMAKE_CACHE_DEFAULT_ARGS`` option to
+  initialize cache values in the external project without setting
+  them on future builds.
 
-* The :module:`ExternalProject` module ``ExternalProject_Add`` command
-  learned an ``UPDATE_DISCONNECTED`` option to avoid automatically
-  updating the source tree checkout from version control.
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Microsoft Visual Studio (``MSVC``).
-
-* The :command:`file(LOCK)` subcommand was created to allow CMake
-  processes to synchronize through file and directory locks.
+* The :module:`ExternalProject` module :command:`ExternalProject_Add`
+  command learned a new ``TEST_EXCLUDE_FROM_MAIN`` option to exclude
+  tests from the main build.
 
-* The :command:`file(STRINGS)` now supports UTF-16LE, UTF-16BE,
-  UTF-32LE, UTF-32BE as ``ENCODING`` options.
+* The :module:`ExternalProject` module :command:`ExternalProject_Add`
+  command learned a new ``UPDATE_DISCONNECTED`` option to avoid
+  automatically updating the source tree checkout from version control.
 
 * The :module:`FindCUDA` module learned about the ``cusolver``
   library in CUDA 7.0.
@@ -139,6 +111,15 @@ Changes made since CMake 3.1.0 include the following.
 * The :module:`FindGit` module learned to find the ``git`` command-line tool
   that comes with GitHub for Windows installed in user home directories.
 
+* A :module:`FindGSL` module was introduced to find the
+  GNU Scientific Library.
+
+* A :module:`FindIntl` module was introduced to find the
+  Gettext ``libintl`` library.
+
+* A :module:`FindJsonCpp` module was introduced to find the
+  JsonCpp package.
+
 * The :module:`FindLATEX` module learned to support components.
 
 * The :module:`FindMPI` module learned to find MS-MPI on Windows.
@@ -154,18 +135,43 @@ Changes made since CMake 3.1.0 include the following.
   ``OPENSSL_SSL_LIBRARY``, respectively, to allow applications to
   link to one without the other.
 
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU 4.4 to 4.6 compilers.
+* The :module:`WriteCompilerDetectionHeader` module learned to
+  create a define for portability of the ``cxx_thread_local`` feature.
+  The define expands to either the C++11 ``thread_local`` keyword, or a
+  pre-standardization compiler-specific equivalent, as appropriate.
 
-* The :command:`install(EXPORT)` command now works with an absolute
-  ``DESTINATION`` even if targets in the export set are installed
-  with a destination or usage requirements specified relative to the
-  install prefix.  The value of the :variable:`CMAKE_INSTALL_PREFIX`
-  variable is hard-coded into the installed export file as the base
-  for relative references.
+* The :module:`WriteCompilerDetectionHeader` module learned to create
+  multiple output files per compiler and per language, instead of creating
+  one large file.
 
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU compiler version 5.0.
+CTest
+-----
+
+* The :command:`ctest_coverage` command learned to support Delphi coverage.
+
+* The :command:`ctest_coverage` command learned to support Javascript coverage.
+
+* The :module:`CTestCoverageCollectGCOV` module was introduced as an
+  alternative to the :command:`ctest_coverage` command for collecting
+  ``gcov`` results for submission to CDash.
+
+CPack
+-----
+
+* The :module:`CPackRPM` module learned options to set per-component
+  descriptions and summaries.  See the
+  :variable:`CPACK_RPM_<component>_PACKAGE_DESCRIPTION` and
+  :variable:`CPACK_RPM_<component>_PACKAGE_SUMMARY` variables.
+
+* The :module:`CPackRPM` module learned options to specify
+  requirements for pre- and post-install scripts.  See the
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PRE` and
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POST` variables.
+
+* The :module:`CPackRPM` module learned options to specify
+  requirements for pre- and post-uninstall scripts.  See the
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PREUN` and
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POSTUN` variables.
 
 * The :module:`CPackRPM` module learned a new
   :variable:`CPACK_RPM_<COMPONENT>_PACKAGE_PREFIX` variable to
@@ -176,74 +182,88 @@ Changes made since CMake 3.1.0 include the following.
   :variable:`CPACK_RPM_RELOCATION_PATHS` variable to
   specify multiple relocation prefixes for a single rpm package.
 
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Oracle SolarisStudio (``SunPro``).
+Other
+-----
 
-* The :command:`try_compile` command source file signature now honors
-  link flags (e.g. :variable:`CMAKE_EXE_LINKER_FLAGS`) in the generated
-  test project.  See policy :policy:`CMP0056`.
+* The :manual:`cmake(1)` ``-E tar`` command now supports creating
+  ``.xz``-compressed archives with the ``J`` flag.
 
-* The :command:`try_run` command learned to honor the ``LINK_LIBRARIES``
-  option just as :command:`try_compile` already does.
+* The :manual:`cmake(1)` ``-E tar`` command learned a new
+  ``--files-from=<file>`` option to specify file names using
+  lines in a file to overcome command-line length limits.
 
-* The implementation of CMake relies on some C++ compiler features which are
-  not supported by some older compilers.  As a result, those old compilers
-  can no longer be used to build CMake itself.  CMake continues to be able to
-  generate Makefiles and project files for users of those old compilers
-  however.  The compilers known to no longer be capable of building CMake
-  are:
-
-  * MSVC 6 and 7.0 - superceded by VisualStudio 7.1 and newer compilers.
-  * GCC 2.95 - superceded by GCC 3 and newer compilers.
-  * Borland compilers - superceded by other Windows compilers.
-  * Compaq compilers - superceded by other compilers.
-  * Comeau compilers - superceded by other compilers.
-  * SGI compilers - IRIX was dropped as a host platform.
-
-  When building using SolarisStudio 12, the default ``libCStd`` standard
-  library is not sufficient to build CMake.  The SolarisStudio distribution
-  supports compiler options to use ``STLPort4`` or ``libstdc++``.  An
-  appropriate option to select the standard library is now added
-  automatically when building CMake with SolarisStudio compilers.
+* The :manual:`cmake(1)` ``-E tar`` command learned a new
+  ``--mtime=<date>`` option to specify the modification time
+  recorded in tarball entries.
 
-* A :prop_tgt:`ANDROID_API_MIN` target property was introduced to
-  specify the minimum version to be targeted by the toolchain.
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by more compilers, including:
 
-* A :prop_sf:`VS_SHADER_FLAGS` source file property was added to specify
-  additional shader flags to ``.hlsl`` files, for the Visual Studio generators.
+  * Apple Clang (``AppleClang``) for Xcode versions 4.4 though 6.1.
+  * GNU compiler versions 4.4 through 5.0 on UNIX and Apple (``GNU``).
+  * Microsoft Visual Studio (``MSVC``) for versions 2010 through 2015.
+  * Oracle SolarisStudio (``SunPro``) version 12.4.
 
-* The :module:`WriteCompilerDetectionHeader` module learned to
-  create a define for portability of the cxx_thread_local feature. The define
-  expands to either the C++11 ``thread_local`` keyword, or a
-  pre-standardization compiler-specific equivalent, as appropriate.
+New Diagnostics
+===============
+
+* The :command:`break` command now rejects calls outside of a loop
+  context or that pass arguments to the command.
+  See policy :policy:`CMP0055`.
 
-* On Windows, CMake learned to support international characters.
-  This allows use of characters from multiple (spoken) languages
-  in CMake code, paths to source files, configured files such as
-  ``.h.in`` files, and other files read and written by CMake.
-  Because CMake interoperates with many other tools, there may
-  still be some limitations when using certain international
-  characters.
+Deprecated and Removed Features
+===============================
 
-  Files written in the :manual:`cmake-language(7)`, such as
-  ``CMakeLists.txt`` or ``*.cmake`` files, are expected to be
+* Files written in the :manual:`cmake-language(7)`, such as
+  ``CMakeLists.txt`` or ``*.cmake`` files, are now expected to be
   encoded as UTF-8.  If files are already ASCII, they will be
   compatible.  If files were in a different encoding, including
   Latin 1, they will need to be converted.
 
-  The Visual Studio generators now write solution and project
+* The implementation of CMake now relies on some C++ compiler features which
+  are not supported by some older compilers.  As a result, those old compilers
+  can no longer be used to build CMake itself.  CMake continues to be able to
+  generate Makefiles and project files for users of those old compilers
+  however.  Compilers known to no longer be capable of building CMake are:
+
+  * Visual Studio 6 and 7.0 -- superseded by VisualStudio 7.1 and newer.
+  * GCC 2.95 -- superseded by GCC 3 and newer compilers.
+  * Borland compilers -- superseded by other Windows compilers.
+  * Compaq compilers -- superseded by other compilers.
+  * SGI compilers -- IRIX was dropped as a host platform.
+
+Other Changes
+=============
+
+* On Windows and OS X, commands supporting network communication
+  via ``https``, such as :command:`file(DOWNLOAD)`,
+  :command:`file(UPLOAD)`, and :command:`ctest_submit`, now support
+  SSL/TLS even when CMake is not built against OpenSSL.
+  The Windows or OS X native SSL/TLS implementation is used by default.
+  OS-configured certificate authorities will be trusted automatically.
+
+  On other platforms, when CMake is built with OpenSSL, these
+  commands now search for OS-configured certificate authorities
+  in a few ``/etc`` paths to be trusted automatically.
+
+* On OS X with Makefile and Ninja generators, when a compiler is found
+  in ``/usr/bin`` it is now mapped to the corresponding compiler inside
+  the Xcode application folder, if any.  This allows such build
+  trees to continue to work with their original compiler even when
+  ``xcode-select`` switches to a different Xcode installation.
+
+* The Visual Studio generators now write solution and project
   files in UTF-8 instead of Windows-1252.  Windows-1252 supported
   Latin 1 languages such as those found in North and South America
   and Western Europe.  With UTF-8, additional languages are now
   supported.
 
-* The :module:`WriteCompilerDetectionHeader` module learned to create
-  multiple output files per compiler and per language, instead of creating
-  one large file.
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Apple Clang (``AppleClang``).
-
 * The :generator:`Xcode` generator no longer requires a value for
   the :variable:`CMAKE_MAKE_PROGRAM` variable to be located up front.
   It now locates ``xcodebuild`` when needed at build time.
+
+* When building CMake itself using SolarisStudio 12, the default ``libCStd``
+  standard library is not sufficient to build CMake.  The SolarisStudio
+  distribution supports compiler options to use ``STLPort4`` or ``libstdc++``.
+  An appropriate option to select the standard library is now added
+  automatically when building CMake with SolarisStudio compilers.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e08a78dc2cf04682010a3d4496b4c454271f194a
commit e08a78dc2cf04682010a3d4496b4c454271f194a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 13:12:12 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 5 08:43:22 2015 -0500

    Help: Consolidate 3.2 release notes
    
    Move all development release notes into a new version-specific document:
    
     tail -q -n +3 Help/release/dev/* > Help/release/3.2.0.rst
     git rm -- Help/release/dev/*
    
    except the sample topic:
    
     git checkout HEAD -- Help/release/dev/0-sample-topic.rst
    
    Reference the new document from the release notes index document.
    Add a title and intro sentence to the new document by hand.

diff --git a/Help/release/3.2.0.rst b/Help/release/3.2.0.rst
new file mode 100644
index 0000000..142d408
--- /dev/null
+++ b/Help/release/3.2.0.rst
@@ -0,0 +1,249 @@
+CMake 3.2.0 Release Notes
+*************************
+
+.. only:: html
+
+  .. contents::
+
+Changes made since CMake 3.1.0 include the following.
+
+* A new :command:`continue` command was added that can be called inside loop
+  contexts to end the current iteration and start the next one at the top of
+  the loop block.
+
+* A :module:`FindGSL` module was introduced to find the
+  GNU Scientific Library.
+
+* The :module:`FindIntl` module was added to find the Gettext ``libintl``
+  library.
+
+* A :module:`FindJsonCpp` module was introduced to find the
+  JsonCpp package.
+
+* The :command:`ctest_coverage` learned to support Javascript coverage.
+
+* The :manual:`cmake(1)` ``-E tar`` command now supports creating
+  ``.xz``-compressed archives with the ``J`` flag.
+
+* On OS X with Makefile and Ninja generators, when a compiler is found
+  in ``/usr/bin`` it is now mapped to the corresponding compiler inside
+  the Xcode application folder, if any.  This allows such build
+  trees to continue to work with their original compiler even when
+  ``xcode-select`` switches to a different Xcode installation.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by GNU compilers on OS X.
+
+* The :command:`break` command now rejects calls outside of a loop
+  context or that pass arguments to the command.
+  See policy :policy:`CMP0055`.
+
+* Add :variable:`CMAKE_MATCH_COUNT` for the number of matches made in the last
+  regular expression.
+
+* The :manual:`cmake(1)` ``-E tar`` command learned a new
+  ``--files-from=<file>`` option to specify file names using
+  lines in a file to overcome command-line length limits.
+
+* The :manual:`cmake(1)` ``-E tar`` command learned a new
+  ``--mtime=<date>`` option to specify the modification time
+  recorded in tarball entries.
+
+* The :command:`add_custom_command` and :command:`add_custom_target`
+  commands learned a new ``USES_TERMINAL`` option to request that
+  the command be given direct access to the terminal if possible.
+  The :generator:`Ninja` generator will places such commands in the
+  ``console`` pool.  Build targets provided by CMake that are meant
+  for individual interactive use, such as ``install``, are now
+  placed in this pool.
+
+* The :module:`CPackRPM` module learned options to set per-component
+  descriptions and summaries.  See the
+  :variable:`CPACK_RPM_<component>_PACKAGE_DESCRIPTION` and
+  :variable:`CPACK_RPM_<component>_PACKAGE_SUMMARY` variables.
+
+* The :module:`CPackRPM` module learned options to specify
+  requirements for pre- and post-install scripts.  See the
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PRE` and
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POST` variables.
+
+* The :module:`CPackRPM` module learned options to specify
+  requirements for pre- and post-uninstall scripts.  See the
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PREUN` and
+  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POSTUN` variables.
+
+* The :module:`CTestCoverageCollectGCOV` module was introduced as an
+  alternative to the :command:`ctest_coverage` command for collecting
+  ``gcov`` results for submission to CDash.
+
+* The :command:`ctest_coverage` learned to support Delphi coverage.
+
+* On OS X, commands supporting network communication, such as
+  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
+  :command:`ctest_submit`, now support SSL/TLS even when CMake
+  is not built against OpenSSL.  The OS X native SSL/TLS
+  implementation is used by default.  OS-configured certificate
+  authorities will be trusted automatically.
+
+* When CMake is built with OpenSSL on systems other than Windows
+  and OS X, commands supporting network communication via ``https``,
+  such as :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
+  :command:`ctest_submit`, now search for OS-configured certificate
+  authorities in a few ``/etc`` paths to be trusted automatically.
+
+* On Windows, commands supporting network communication, such as
+  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
+  :command:`ctest_submit`, now support SSL/TLS even when CMake
+  is not built against OpenSSL.  The Windows native SSL/TLS
+  implementation is used by default.  OS-configured certificate
+  authorities will be trusted automatically.
+
+* The :command:`add_custom_command` and :command:`add_custom_target`
+  commands learned a new ``BYPRODUCTS`` option to specify files
+  produced as side effects of the custom commands.  These are not
+  outputs because they do not always have to be newer than inputs.
+
+* The :module:`ExternalData` module learned to support
+  :ref:`Custom Fetch Scripts <ExternalData Custom Fetch Scripts>`.
+  This allows projects to specify custom ``.cmake`` scripts for
+  fetching data objects during the build.
+
+* The :module:`ExternalProject` module ``ExternalProject_Add`` function
+  learned a new ``CMAKE_CACHE_DEFAULT_ARGS`` option to initialize cache
+  values in the external project without setting them on future builds.
+
+* The :module:`ExternalProject` module learned options to create
+  independent external project step targets that do not depend
+  on the builtin steps.
+
+* The :module:`ExternalProject` module :command:`ExternalProject_Add`
+  command learned a ``TEST_EXCLUDE_FROM_MAIN`` option to exclude tests
+  from the main build.
+
+* The :module:`ExternalProject` module ``ExternalProject_Add`` command
+  learned an ``UPDATE_DISCONNECTED`` option to avoid automatically
+  updating the source tree checkout from version control.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by Microsoft Visual Studio (``MSVC``).
+
+* The :command:`file(LOCK)` subcommand was created to allow CMake
+  processes to synchronize through file and directory locks.
+
+* The :command:`file(STRINGS)` now supports UTF-16LE, UTF-16BE,
+  UTF-32LE, UTF-32BE as ``ENCODING`` options.
+
+* The :module:`FindCUDA` module learned about the ``cusolver``
+  library in CUDA 7.0.
+
+* The :module:`FindGit` module learned to find the ``git`` command-line tool
+  that comes with GitHub for Windows installed in user home directories.
+
+* The :module:`FindLATEX` module learned to support components.
+
+* The :module:`FindMPI` module learned to find MS-MPI on Windows.
+
+* The :module:`FindOpenGL` module no longer explicitly searches
+  for any dependency on X11 libraries with the :module:`FindX11`
+  module.  Such dependencies should not need to be explicit.
+  Applications using X11 APIs themselves should find and link
+  to X11 libraries explicitly.
+
+* The :module:`FindOpenSSL` module now reports ``crypto`` and ``ssl``
+  libraries separately in ``OPENSSL_CRYPTO_LIBRARY`` and
+  ``OPENSSL_SSL_LIBRARY``, respectively, to allow applications to
+  link to one without the other.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by GNU 4.4 to 4.6 compilers.
+
+* The :command:`install(EXPORT)` command now works with an absolute
+  ``DESTINATION`` even if targets in the export set are installed
+  with a destination or usage requirements specified relative to the
+  install prefix.  The value of the :variable:`CMAKE_INSTALL_PREFIX`
+  variable is hard-coded into the installed export file as the base
+  for relative references.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by GNU compiler version 5.0.
+
+* The :module:`CPackRPM` module learned a new
+  :variable:`CPACK_RPM_<COMPONENT>_PACKAGE_PREFIX` variable to
+  specify a component-specific value to use instead of
+  :variable:`CPACK_PACKAGING_INSTALL_PREFIX`.
+
+* The :module:`CPackRPM` module learned a new
+  :variable:`CPACK_RPM_RELOCATION_PATHS` variable to
+  specify multiple relocation prefixes for a single rpm package.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by Oracle SolarisStudio (``SunPro``).
+
+* The :command:`try_compile` command source file signature now honors
+  link flags (e.g. :variable:`CMAKE_EXE_LINKER_FLAGS`) in the generated
+  test project.  See policy :policy:`CMP0056`.
+
+* The :command:`try_run` command learned to honor the ``LINK_LIBRARIES``
+  option just as :command:`try_compile` already does.
+
+* The implementation of CMake relies on some C++ compiler features which are
+  not supported by some older compilers.  As a result, those old compilers
+  can no longer be used to build CMake itself.  CMake continues to be able to
+  generate Makefiles and project files for users of those old compilers
+  however.  The compilers known to no longer be capable of building CMake
+  are:
+
+  * MSVC 6 and 7.0 - superceded by VisualStudio 7.1 and newer compilers.
+  * GCC 2.95 - superceded by GCC 3 and newer compilers.
+  * Borland compilers - superceded by other Windows compilers.
+  * Compaq compilers - superceded by other compilers.
+  * Comeau compilers - superceded by other compilers.
+  * SGI compilers - IRIX was dropped as a host platform.
+
+  When building using SolarisStudio 12, the default ``libCStd`` standard
+  library is not sufficient to build CMake.  The SolarisStudio distribution
+  supports compiler options to use ``STLPort4`` or ``libstdc++``.  An
+  appropriate option to select the standard library is now added
+  automatically when building CMake with SolarisStudio compilers.
+
+* A :prop_tgt:`ANDROID_API_MIN` target property was introduced to
+  specify the minimum version to be targeted by the toolchain.
+
+* A :prop_sf:`VS_SHADER_FLAGS` source file property was added to specify
+  additional shader flags to ``.hlsl`` files, for the Visual Studio generators.
+
+* The :module:`WriteCompilerDetectionHeader` module learned to
+  create a define for portability of the cxx_thread_local feature. The define
+  expands to either the C++11 ``thread_local`` keyword, or a
+  pre-standardization compiler-specific equivalent, as appropriate.
+
+* On Windows, CMake learned to support international characters.
+  This allows use of characters from multiple (spoken) languages
+  in CMake code, paths to source files, configured files such as
+  ``.h.in`` files, and other files read and written by CMake.
+  Because CMake interoperates with many other tools, there may
+  still be some limitations when using certain international
+  characters.
+
+  Files written in the :manual:`cmake-language(7)`, such as
+  ``CMakeLists.txt`` or ``*.cmake`` files, are expected to be
+  encoded as UTF-8.  If files are already ASCII, they will be
+  compatible.  If files were in a different encoding, including
+  Latin 1, they will need to be converted.
+
+  The Visual Studio generators now write solution and project
+  files in UTF-8 instead of Windows-1252.  Windows-1252 supported
+  Latin 1 languages such as those found in North and South America
+  and Western Europe.  With UTF-8, additional languages are now
+  supported.
+
+* The :module:`WriteCompilerDetectionHeader` module learned to create
+  multiple output files per compiler and per language, instead of creating
+  one large file.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by Apple Clang (``AppleClang``).
+
+* The :generator:`Xcode` generator no longer requires a value for
+  the :variable:`CMAKE_MAKE_PROGRAM` variable to be located up front.
+  It now locates ``xcodebuild`` when needed at build time.
diff --git a/Help/release/dev/Apple-GNU-compiler-features.rst b/Help/release/dev/Apple-GNU-compiler-features.rst
deleted file mode 100644
index 40c3712..0000000
--- a/Help/release/dev/Apple-GNU-compiler-features.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Apple-GNU-compiler-features
----------------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU compilers on OS X.
diff --git a/Help/release/dev/Apple-compiler-selection.rst b/Help/release/dev/Apple-compiler-selection.rst
deleted file mode 100644
index 5ff5653..0000000
--- a/Help/release/dev/Apple-compiler-selection.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-Apple-compiler-selection
-------------------------
-
-* On OS X with Makefile and Ninja generators, when a compiler is found
-  in ``/usr/bin`` it is now mapped to the corresponding compiler inside
-  the Xcode application folder, if any.  This allows such build
-  trees to continue to work with their original compiler even when
-  ``xcode-select`` switches to a different Xcode installation.
diff --git a/Help/release/dev/CTestCoverageCollectGCOV-refinements.rst b/Help/release/dev/CTestCoverageCollectGCOV-refinements.rst
deleted file mode 100644
index afa0a52..0000000
--- a/Help/release/dev/CTestCoverageCollectGCOV-refinements.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-CTestCoverageCollectGCOV-refinements
-------------------------------------
-
-* The :module:`CTestCoverageCollectGCOV` module was introduced as an
-  alternative to the :command:`ctest_coverage` command for collecting
-  ``gcov`` results for submission to CDash.
diff --git a/Help/release/dev/ExternalData-custom-download.rst b/Help/release/dev/ExternalData-custom-download.rst
deleted file mode 100644
index c40f4f7..0000000
--- a/Help/release/dev/ExternalData-custom-download.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-ExternalData-custom-download
-----------------------------
-
-* The :module:`ExternalData` module learned to support
-  :ref:`Custom Fetch Scripts <ExternalData Custom Fetch Scripts>`.
-  This allows projects to specify custom ``.cmake`` scripts for
-  fetching data objects during the build.
diff --git a/Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst b/Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst
deleted file mode 100644
index 1838ab6..0000000
--- a/Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-ExternalProject_CMAKE_CACHE_DEFAULT_ARGS
-----------------------------------------
-
-* The :module:`ExternalProject` module ``ExternalProject_Add`` function
-  learned a new ``CMAKE_CACHE_DEFAULT_ARGS`` option to initialize cache
-  values in the external project without setting them on future builds.
diff --git a/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst b/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
deleted file mode 100644
index dfbf108..0000000
--- a/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-ExternalProject_TEST_EXCLUDE_FROM_MAIN
---------------------------------------
-
-* The :module:`ExternalProject` module :command:`ExternalProject_Add`
-  command learned a ``TEST_EXCLUDE_FROM_MAIN`` option to exclude tests
-  from the main build.
diff --git a/Help/release/dev/ExternalProject_UPDATE_DISCONNECTED.rst b/Help/release/dev/ExternalProject_UPDATE_DISCONNECTED.rst
deleted file mode 100644
index bed4a89..0000000
--- a/Help/release/dev/ExternalProject_UPDATE_DISCONNECTED.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-ExternalProject_UPDATE_DISCONNECTED
------------------------------------
-
-* The :module:`ExternalProject` module ``ExternalProject_Add`` command
-  learned an ``UPDATE_DISCONNECTED`` option to avoid automatically
-  updating the source tree checkout from version control.
diff --git a/Help/release/dev/ExternalProject_independent-step-targets.rst b/Help/release/dev/ExternalProject_independent-step-targets.rst
deleted file mode 100644
index 02e8db8..0000000
--- a/Help/release/dev/ExternalProject_independent-step-targets.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-ExternalProject_independent-step-targets
-----------------------------------------
-
-* The :module:`ExternalProject` module learned options to create
-  independent external project step targets that do not depend
-  on the builtin steps.
diff --git a/Help/release/dev/FindCUDA-cusolver.rst b/Help/release/dev/FindCUDA-cusolver.rst
deleted file mode 100644
index 7a61e78..0000000
--- a/Help/release/dev/FindCUDA-cusolver.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindCUDA-cusolver
------------------
-
-* The :module:`FindCUDA` module learned about the ``cusolver``
-  library in CUDA 7.0.
diff --git a/Help/release/dev/FindGit-local-Github.rst b/Help/release/dev/FindGit-local-Github.rst
deleted file mode 100644
index 3523e86..0000000
--- a/Help/release/dev/FindGit-local-Github.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindGit-local-Github
---------------------
-
-* The :module:`FindGit` module learned to find the ``git`` command-line tool
-  that comes with GitHub for Windows installed in user home directories.
diff --git a/Help/release/dev/FindLATEX-components.rst b/Help/release/dev/FindLATEX-components.rst
deleted file mode 100644
index d161c1f..0000000
--- a/Help/release/dev/FindLATEX-components.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-FindLATEX-components
---------------------
-
-* The :module:`FindLATEX` module learned to support components.
diff --git a/Help/release/dev/FindOpenGL-no-X11.rst b/Help/release/dev/FindOpenGL-no-X11.rst
deleted file mode 100644
index dacf165..0000000
--- a/Help/release/dev/FindOpenGL-no-X11.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-FindOpenGL-no-X11
------------------
-
-* The :module:`FindOpenGL` module no longer explicitly searches
-  for any dependency on X11 libraries with the :module:`FindX11`
-  module.  Such dependencies should not need to be explicit.
-  Applications using X11 APIs themselves should find and link
-  to X11 libraries explicitly.
diff --git a/Help/release/dev/FindOpenSSL-separate-libs.rst b/Help/release/dev/FindOpenSSL-separate-libs.rst
deleted file mode 100644
index 96e3961..0000000
--- a/Help/release/dev/FindOpenSSL-separate-libs.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-FindOpenSSL-separate-libs
--------------------------
-
-* The :module:`FindOpenSSL` module now reports ``crypto`` and ``ssl``
-  libraries separately in ``OPENSSL_CRYPTO_LIBRARY`` and
-  ``OPENSSL_SSL_LIBRARY``, respectively, to allow applications to
-  link to one without the other.
diff --git a/Help/release/dev/GNU-4.4-compile-features.rst b/Help/release/dev/GNU-4.4-compile-features.rst
deleted file mode 100644
index d5c1356..0000000
--- a/Help/release/dev/GNU-4.4-compile-features.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-GNU-4.4-compile-features
-------------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU 4.4 to 4.6 compilers.
diff --git a/Help/release/dev/SolarisStudio-compile-features.rst b/Help/release/dev/SolarisStudio-compile-features.rst
deleted file mode 100644
index 83110cd..0000000
--- a/Help/release/dev/SolarisStudio-compile-features.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-SolarisStudio-compile-features
-------------------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Oracle SolarisStudio (``SunPro``).
diff --git a/Help/release/dev/WCDH-thread_local.rst b/Help/release/dev/WCDH-thread_local.rst
deleted file mode 100644
index 44516a7..0000000
--- a/Help/release/dev/WCDH-thread_local.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-WriteCompilerDetectionHeader thread_local portability
------------------------------------------------------
-
-* The :module:`WriteCompilerDetectionHeader` module learned to
-  create a define for portability of the cxx_thread_local feature. The define
-  expands to either the C++11 ``thread_local`` keyword, or a
-  pre-standardization compiler-specific equivalent, as appropriate.
diff --git a/Help/release/dev/WriteCompilerDetectionHeader-multi-file-lang.rst b/Help/release/dev/WriteCompilerDetectionHeader-multi-file-lang.rst
deleted file mode 100644
index a8665da..0000000
--- a/Help/release/dev/WriteCompilerDetectionHeader-multi-file-lang.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-WriteCompilerDetectionHeader-multi-file
----------------------------------------
-
-* The :module:`WriteCompilerDetectionHeader` module learned to create
-  multiple output files per compiler and per language, instead of creating
-  one large file.
diff --git a/Help/release/dev/Xcode-clang-compile-features.rst b/Help/release/dev/Xcode-clang-compile-features.rst
deleted file mode 100644
index d93475f..0000000
--- a/Help/release/dev/Xcode-clang-compile-features.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Xcode-clang-compile-features
-----------------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Apple Clang (``AppleClang``).
diff --git a/Help/release/dev/add-FindGSL.rst b/Help/release/dev/add-FindGSL.rst
deleted file mode 100644
index 47a0a25..0000000
--- a/Help/release/dev/add-FindGSL.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-add-FindGSL
------------
-
-* A :module:`FindGSL` module was introduced to find the
-  GNU Scientific Library.
diff --git a/Help/release/dev/add-FindIntl.rst b/Help/release/dev/add-FindIntl.rst
deleted file mode 100644
index ac048c9..0000000
--- a/Help/release/dev/add-FindIntl.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-add-FindIntl
-------------
-
-* The :module:`FindIntl` module was added to find the Gettext ``libintl``
-  library.
diff --git a/Help/release/dev/add-FindJsonCpp.rst b/Help/release/dev/add-FindJsonCpp.rst
deleted file mode 100644
index 5d1cb18..0000000
--- a/Help/release/dev/add-FindJsonCpp.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-add-FindJsonCpp
----------------
-
-* A :module:`FindJsonCpp` module was introduced to find the
-  JsonCpp package.
diff --git a/Help/release/dev/add-continue-command.rst b/Help/release/dev/add-continue-command.rst
deleted file mode 100644
index 4995a8e..0000000
--- a/Help/release/dev/add-continue-command.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-add-continue-command
---------------------
-
-* A new :command:`continue` command was added that can be called inside loop
-  contexts to end the current iteration and start the next one at the top of
-  the loop block.
diff --git a/Help/release/dev/add-xz-support.rst b/Help/release/dev/add-xz-support.rst
deleted file mode 100644
index 9bdf528..0000000
--- a/Help/release/dev/add-xz-support.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-add-xz-support
---------------
-
-* The :manual:`cmake(1)` ``-E tar`` command now supports creating
-  ``.xz``-compressed archives with the ``J`` flag.
diff --git a/Help/release/dev/add_javascript_coverage_parser.rst b/Help/release/dev/add_javascript_coverage_parser.rst
deleted file mode 100644
index 0d068ee..0000000
--- a/Help/release/dev/add_javascript_coverage_parser.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-add_javascript_coverage_parser
-------------------------------
-
-* The :command:`ctest_coverage` learned to support Javascript coverage.
diff --git a/Help/release/dev/break-command-strictness.rst b/Help/release/dev/break-command-strictness.rst
deleted file mode 100644
index 0723774..0000000
--- a/Help/release/dev/break-command-strictness.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-break-command-strictness
-------------------------
-
-* The :command:`break` command now rejects calls outside of a loop
-  context or that pass arguments to the command.
-  See policy :policy:`CMP0055`.
diff --git a/Help/release/dev/cached-regex-clear-fixed.rst b/Help/release/dev/cached-regex-clear-fixed.rst
deleted file mode 100644
index fbf08cc..0000000
--- a/Help/release/dev/cached-regex-clear-fixed.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-cached-regex-clear-fixed
-------------------------
-
-* Add :variable:`CMAKE_MATCH_COUNT` for the number of matches made in the last
-  regular expression.
diff --git a/Help/release/dev/cmake-E-tar-files-from.rst b/Help/release/dev/cmake-E-tar-files-from.rst
deleted file mode 100644
index f6087ff..0000000
--- a/Help/release/dev/cmake-E-tar-files-from.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake-E-tar-files-from
-----------------------
-
-* The :manual:`cmake(1)` ``-E tar`` command learned a new
-  ``--files-from=<file>`` option to specify file names using
-  lines in a file to overcome command-line length limits.
diff --git a/Help/release/dev/cmake-E-tar-mtime.rst b/Help/release/dev/cmake-E-tar-mtime.rst
deleted file mode 100644
index 6496577..0000000
--- a/Help/release/dev/cmake-E-tar-mtime.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake-E-tar-mtime
------------------
-
-* The :manual:`cmake(1)` ``-E tar`` command learned a new
-  ``--mtime=<date>`` option to specify the modification time
-  recorded in tarball entries.
diff --git a/Help/release/dev/console-pool.rst b/Help/release/dev/console-pool.rst
deleted file mode 100644
index 1d9bdb8..0000000
--- a/Help/release/dev/console-pool.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-console-pool
-------------
-
-* The :command:`add_custom_command` and :command:`add_custom_target`
-  commands learned a new ``USES_TERMINAL`` option to request that
-  the command be given direct access to the terminal if possible.
-  The :generator:`Ninja` generator will places such commands in the
-  ``console`` pool.  Build targets provided by CMake that are meant
-  for individual interactive use, such as ``install``, are now
-  placed in this pool.
diff --git a/Help/release/dev/cpack-rpm-component-descriptions.rst b/Help/release/dev/cpack-rpm-component-descriptions.rst
deleted file mode 100644
index 769a912..0000000
--- a/Help/release/dev/cpack-rpm-component-descriptions.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-cpack-rpm-component-descriptions
---------------------------------
-
-* The :module:`CPackRPM` module learned options to set per-component
-  descriptions and summaries.  See the
-  :variable:`CPACK_RPM_<component>_PACKAGE_DESCRIPTION` and
-  :variable:`CPACK_RPM_<component>_PACKAGE_SUMMARY` variables.
diff --git a/Help/release/dev/cpack-rpm-pre-post-install.rst b/Help/release/dev/cpack-rpm-pre-post-install.rst
deleted file mode 100644
index 0909d94..0000000
--- a/Help/release/dev/cpack-rpm-pre-post-install.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-cpack-rpm-pre-post-install
---------------------------
-
-* The :module:`CPackRPM` module learned options to specify
-  requirements for pre- and post-install scripts.  See the
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PRE` and
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POST` variables.
-
-* The :module:`CPackRPM` module learned options to specify
-  requirements for pre- and post-uninstall scripts.  See the
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_PREUN` and
-  :variable:`CPACK_RPM_PACKAGE_REQUIRES_POSTUN` variables.
diff --git a/Help/release/dev/ctest-delphi-coverage.rst b/Help/release/dev/ctest-delphi-coverage.rst
deleted file mode 100644
index efa97c9..0000000
--- a/Help/release/dev/ctest-delphi-coverage.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-ctest-delphi-coverage
----------------------
-
-* The :command:`ctest_coverage` learned to support Delphi coverage.
diff --git a/Help/release/dev/curl-darwinssl.rst b/Help/release/dev/curl-darwinssl.rst
deleted file mode 100644
index 3571bd1..0000000
--- a/Help/release/dev/curl-darwinssl.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-curl-darwinssl
---------------
-
-* On OS X, commands supporting network communication, such as
-  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now support SSL/TLS even when CMake
-  is not built against OpenSSL.  The OS X native SSL/TLS
-  implementation is used by default.  OS-configured certificate
-  authorities will be trusted automatically.
diff --git a/Help/release/dev/curl-default-cainfo.rst b/Help/release/dev/curl-default-cainfo.rst
deleted file mode 100644
index ed45d36..0000000
--- a/Help/release/dev/curl-default-cainfo.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-curl-default-cainfo
--------------------
-
-* When CMake is built with OpenSSL on systems other than Windows
-  and OS X, commands supporting network communication via ``https``,
-  such as :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now search for OS-configured certificate
-  authorities in a few ``/etc`` paths to be trusted automatically.
diff --git a/Help/release/dev/curl-winssl.rst b/Help/release/dev/curl-winssl.rst
deleted file mode 100644
index 9a28f4f..0000000
--- a/Help/release/dev/curl-winssl.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-curl-winssl
------------
-
-* On Windows, commands supporting network communication, such as
-  :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
-  :command:`ctest_submit`, now support SSL/TLS even when CMake
-  is not built against OpenSSL.  The Windows native SSL/TLS
-  implementation is used by default.  OS-configured certificate
-  authorities will be trusted automatically.
diff --git a/Help/release/dev/custom-command-byproducts.rst b/Help/release/dev/custom-command-byproducts.rst
deleted file mode 100644
index dc85fdb..0000000
--- a/Help/release/dev/custom-command-byproducts.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-custom-command-byproducts
--------------------------
-
-* The :command:`add_custom_command` and :command:`add_custom_target`
-  commands learned a new ``BYPRODUCTS`` option to specify files
-  produced as side effects of the custom commands.  These are not
-  outputs because they do not always have to be newer than inputs.
diff --git a/Help/release/dev/feature-record-msvc.rst b/Help/release/dev/feature-record-msvc.rst
deleted file mode 100644
index a8c9fd1..0000000
--- a/Help/release/dev/feature-record-msvc.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-feature-record-msvc
--------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by Microsoft Visual Studio (``MSVC``).
diff --git a/Help/release/dev/file-LOCK-command.rst b/Help/release/dev/file-LOCK-command.rst
deleted file mode 100644
index 4b11e9e..0000000
--- a/Help/release/dev/file-LOCK-command.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-file-LOCK-command
------------------
-
-* The :command:`file(LOCK)` subcommand was created to allow CMake
-  processes to synchronize through file and directory locks.
diff --git a/Help/release/dev/file-strings-utf-16.rst b/Help/release/dev/file-strings-utf-16.rst
deleted file mode 100644
index f40b63e..0000000
--- a/Help/release/dev/file-strings-utf-16.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-file-strings-utf-16
--------------------
-
-* The :command:`file(STRINGS)` now supports UTF-16LE, UTF-16BE,
-  UTF-32LE, UTF-32BE as ``ENCODING`` options.
diff --git a/Help/release/dev/find-msmpi.rst b/Help/release/dev/find-msmpi.rst
deleted file mode 100644
index 6ece5c8..0000000
--- a/Help/release/dev/find-msmpi.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-find-msmpi
-----------
-
-* The :module:`FindMPI` module learned to find MS-MPI on Windows.
diff --git a/Help/release/dev/install-EXPORT-absolute-prefix.rst b/Help/release/dev/install-EXPORT-absolute-prefix.rst
deleted file mode 100644
index 1b2a01c..0000000
--- a/Help/release/dev/install-EXPORT-absolute-prefix.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-install-EXPORT-absolute-prefix
-------------------------------
-
-* The :command:`install(EXPORT)` command now works with an absolute
-  ``DESTINATION`` even if targets in the export set are installed
-  with a destination or usage requirements specified relative to the
-  install prefix.  The value of the :variable:`CMAKE_INSTALL_PREFIX`
-  variable is hard-coded into the installed export file as the base
-  for relative references.
diff --git a/Help/release/dev/record-GNU-5-features.rst b/Help/release/dev/record-GNU-5-features.rst
deleted file mode 100644
index 0da9e75..0000000
--- a/Help/release/dev/record-GNU-5-features.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-record-GNU-5-features
----------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU compiler version 5.0.
diff --git a/Help/release/dev/rpm_multi_prefix.rst b/Help/release/dev/rpm_multi_prefix.rst
deleted file mode 100644
index 0329592..0000000
--- a/Help/release/dev/rpm_multi_prefix.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-rpm_multi_prefix
-----------------
-
-* The :module:`CPackRPM` module learned a new
-  :variable:`CPACK_RPM_<COMPONENT>_PACKAGE_PREFIX` variable to
-  specify a component-specific value to use instead of
-  :variable:`CPACK_PACKAGING_INSTALL_PREFIX`.
-
-* The :module:`CPackRPM` module learned a new
-  :variable:`CPACK_RPM_RELOCATION_PATHS` variable to
-  specify multiple relocation prefixes for a single rpm package.
diff --git a/Help/release/dev/try-run-link-libraries.rst b/Help/release/dev/try-run-link-libraries.rst
deleted file mode 100644
index 4f20cbd..0000000
--- a/Help/release/dev/try-run-link-libraries.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-try-run-link-libraries
-----------------------
-
-* The :command:`try_run` command learned to honor the ``LINK_LIBRARIES``
-  option just as :command:`try_compile` already does.
diff --git a/Help/release/dev/try_compile-link-flags.rst b/Help/release/dev/try_compile-link-flags.rst
deleted file mode 100644
index d995e0b..0000000
--- a/Help/release/dev/try_compile-link-flags.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-try_compile-link-flags
-----------------------
-
-* The :command:`try_compile` command source file signature now honors
-  link flags (e.g. :variable:`CMAKE_EXE_LINKER_FLAGS`) in the generated
-  test project.  See policy :policy:`CMP0056`.
diff --git a/Help/release/dev/unsupported-compilers.rst b/Help/release/dev/unsupported-compilers.rst
deleted file mode 100644
index 1f3e8c1..0000000
--- a/Help/release/dev/unsupported-compilers.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-unsupported-compilers
----------------------
-
-* The implementation of CMake relies on some C++ compiler features which are
-  not supported by some older compilers.  As a result, those old compilers
-  can no longer be used to build CMake itself.  CMake continues to be able to
-  generate Makefiles and project files for users of those old compilers
-  however.  The compilers known to no longer be capable of building CMake
-  are:
-
-  * MSVC 6 and 7.0 - superceded by VisualStudio 7.1 and newer compilers.
-  * GCC 2.95 - superceded by GCC 3 and newer compilers.
-  * Borland compilers - superceded by other Windows compilers.
-  * Compaq compilers - superceded by other compilers.
-  * Comeau compilers - superceded by other compilers.
-  * SGI compilers - IRIX was dropped as a host platform.
-
-  When building using SolarisStudio 12, the default ``libCStd`` standard
-  library is not sufficient to build CMake.  The SolarisStudio distribution
-  supports compiler options to use ``STLPort4`` or ``libstdc++``.  An
-  appropriate option to select the standard library is now added
-  automatically when building CMake with SolarisStudio compilers.
diff --git a/Help/release/dev/vs-nsight-tegra-min-api.rst b/Help/release/dev/vs-nsight-tegra-min-api.rst
deleted file mode 100644
index f8fa056..0000000
--- a/Help/release/dev/vs-nsight-tegra-min-api.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-vs-nsight-tegra-min-api
------------------------
-
-* A :prop_tgt:`ANDROID_API_MIN` target property was introduced to
-  specify the minimum version to be targeted by the toolchain.
diff --git a/Help/release/dev/vs-shader-flags.rst b/Help/release/dev/vs-shader-flags.rst
deleted file mode 100644
index 0d3f6cc..0000000
--- a/Help/release/dev/vs-shader-flags.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-vs-shader-flags
----------------
-
-* A :prop_sf:`VS_SHADER_FLAGS` source file property was added to specify
-  additional shader flags to ``.hlsl`` files, for the Visual Studio generators.
diff --git a/Help/release/dev/windows-utf-8.rst b/Help/release/dev/windows-utf-8.rst
deleted file mode 100644
index 64cd616..0000000
--- a/Help/release/dev/windows-utf-8.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-windows-utf-8
--------------
-
-* On Windows, CMake learned to support international characters.
-  This allows use of characters from multiple (spoken) languages
-  in CMake code, paths to source files, configured files such as
-  ``.h.in`` files, and other files read and written by CMake.
-  Because CMake interoperates with many other tools, there may
-  still be some limitations when using certain international
-  characters.
-
-  Files written in the :manual:`cmake-language(7)`, such as
-  ``CMakeLists.txt`` or ``*.cmake`` files, are expected to be
-  encoded as UTF-8.  If files are already ASCII, they will be
-  compatible.  If files were in a different encoding, including
-  Latin 1, they will need to be converted.
-
-  The Visual Studio generators now write solution and project
-  files in UTF-8 instead of Windows-1252.  Windows-1252 supported
-  Latin 1 languages such as those found in North and South America
-  and Western Europe.  With UTF-8, additional languages are now
-  supported.
diff --git a/Help/release/dev/xcode-revise-make-program.rst b/Help/release/dev/xcode-revise-make-program.rst
deleted file mode 100644
index f50cf44..0000000
--- a/Help/release/dev/xcode-revise-make-program.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-xcode-revise-make-program
--------------------------
-
-* The :generator:`Xcode` generator no longer requires a value for
-  the :variable:`CMAKE_MAKE_PROGRAM` variable to be located up front.
-  It now locates ``xcodebuild`` when needed at build time.
diff --git a/Help/release/index.rst b/Help/release/index.rst
index abc19b8..990accf 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -13,5 +13,6 @@ Releases
 .. toctree::
    :maxdepth: 1
 
+   3.2.0 <3.2.0>
    3.1.0 <3.1.0>
    3.0.0 <3.0.0>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a4381b6605f593abc9d9364f5ffa3fc9a209854
commit 3a4381b6605f593abc9d9364f5ffa3fc9a209854
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 4 18:58:05 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 5 08:43:21 2015 -0500

    Help: Add link target to cmake-language.7 encoding section

diff --git a/Help/manual/cmake-language.7.rst b/Help/manual/cmake-language.7.rst
index 5ec5858..3e0297c 100644
--- a/Help/manual/cmake-language.7.rst
+++ b/Help/manual/cmake-language.7.rst
@@ -57,6 +57,8 @@ variable.
 Syntax
 ======
 
+.. _`CMake Language Encoding`:
+
 Encoding
 --------
 

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb  5 09:09:12 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 09:09:12 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.1-1012-gf55a2b2
Message-ID: <20150205140912.33630789@public.kitware.com>

This is an automated email from 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  f55a2b2ac208969fea684664c812a368137aac8d (commit)
       via  44100adc6c7f7db7bfd4ccf0d8bd18de8ab195c0 (commit)
      from  ebe1f4f896a18dc09bda431233a5cfeee5b2327b (commit)

Those revisions listed 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 Feb  5 09:09:12 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 09:09:12 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.1-2634-gdfb837f
Message-ID: <20150205140912.5D53613C9@public.kitware.com>

This is an automated email from 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  dfb837f667f05c8904fb50d7b132d46c9e8692c0 (commit)
       via  f55a2b2ac208969fea684664c812a368137aac8d (commit)
       via  618454549067c02ebfaa8b2fe4640e8016e853bd (commit)
       via  ebe1f4f896a18dc09bda431233a5cfeee5b2327b (commit)
      from  831d032017740493b3319e18d7cbf627e3f77702 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dfb837f667f05c8904fb50d7b132d46c9e8692c0
commit dfb837f667f05c8904fb50d7b132d46c9e8692c0
Merge: 6184545 f55a2b2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 09:08:50 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 5 09:08:50 2015 -0500

    Merge branch 'master' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=618454549067c02ebfaa8b2fe4640e8016e853bd
commit 618454549067c02ebfaa8b2fe4640e8016e853bd
Merge: 831d032 ebe1f4f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 09:08:21 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 5 09:08:21 2015 -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 Feb  5 09:09:12 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 09:09:12 -0500 (EST)
Subject: [Cmake-commits] CMake branch, release, updated. v3.1.1-19-g44100ad
Message-ID: <20150205140912.849501D7E@public.kitware.com>

This is an automated email from 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  44100adc6c7f7db7bfd4ccf0d8bd18de8ab195c0 (commit)
      from  e6afd9500d0d00855ef0144a1e7c913a8bf4927d (commit)

Those revisions listed 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  Thu Feb  5 09:13:49 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 09:13:49 -0500 (EST)
Subject: [Cmake-commits] CMake annotated tag, v3.1.2, created. v3.1.2
Message-ID: <20150205141350.86763AA02C@public.kitware.com>

This is an automated email 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.1.2 has been created
        at  469a5fcee6d83124d6ce7428a975aa8d3f8a8c2c (tag)
   tagging  44100adc6c7f7db7bfd4ccf0d8bd18de8ab195c0 (commit)
  replaces  v3.1.1
 tagged by  Brad King
        on  Thu Feb 5 09:11:22 2015 -0500

- Log -----------------------------------------------------------------
CMake 3.1.2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAABAgAGBQJU03oKAAoJEOyP7zp7+07aBB4QAMNzbPId7Bg4URBspdFwgyx9
8aS8fsy3xIuPg/dum6HBjgN/04cMthJZ5syiy/7sH/ujowX1QCkGE4KTUmXRxUNK
Wth34dyZeyS8Djwc6rHuS8z4EPrrtbZpK+c/t0JGOvIzHCjFc+Y3+SGiSBTgCN0L
42OX8lBvaPS+Lf0D47rcC+mvuBIvPuN/96/1i+SRYb6uQNv1ilcQpXZui02k0qfz
gNMMVQhzbhOf45h8tT2fn3IjnjeMrPAze+OQamT8Xmpdmr9oXVkQ32itbnHAoMaX
dfWZgWuM6U5G8pyPv8vbVgRZ3X/MmfQlecO73yD0vxnZMDHOmYOZe4DzmAA2C+i4
NfZeN3qTVCZNg/igjAKSuq6/+ZEsjHLlD3r+fDH0BZZ0snCR6syikesAu+h/bYi/
8l1MXYiVWT65MYBhkXWq5g3Ztylxeynr/oLObA2SfmOGYJqSyAL9q3Fb6THrWnkN
0yCXndr9bBocc091/dHDiC9QRLl8sMjGRbzHG/8tFeWxSl7cKvMG+e0Vl8IPZq5f
yjZPGdmlvfB/oAX/DD9/gsE8S8PD+giRKdsjijXmSzl00i/nGZnSOuggK1B18ta2
RHAit513/oEOGPK87x7K060Fb79HpAfzRq6w1S7S5XNJNnXUxAtlfukMNKGBd/im
f+Oy9QbtRLifVCq5jh/y
=6x40
-----END PGP SIGNATURE-----

Ben Boeckel (1):
      install: Fix regression in default configuration selection

Bill Hoffman (1):
      CPack: Fix packaging of source tarballs with symbolic links

Brad King (14):
      Merge branch 'FeatureSummary-fix-doc-typo' into release
      KWSys Directory: Check opendir return value before using it (#15367)
      Merge branch 'backport-kwsys-directory-check-opendir' into release
      Help: Clarify status of link_libraries command
      Merge branch 'doc-link_libraries-note' into release
      Merge branch 'OpenSSL_102' into release
      Normalize OBJECT_DEPENDS paths to match custom commands (#15366)
      Merge branch 'fix-OBJECT_DEPENDS-after-path-normalization' into release
      Merge branch 'ctest-update-gmake-error-match' into release
      Merge branch 'backport-fix-cpack-symlink-create-dir' into release-3.1
      Merge branch 'fix-default-install-config' into release-3.1
      MSVC: Fix initialization of RelWithDebInfo shared library link flags (#15385)
      Merge branch 'fix-msvc-linker-flags-typo' into release-3.1
      CMake 3.1.2

Christoph Gr?ninger (1):
      FeatureSummary: Fix bracket in documentation.

Guillaume Belz (1):
      FindOpenSSL: fix detection of OpenSSL 1.0.2

Marco Nolden (1):
      ctest_build: Update GNU make error message matching (#15379)

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb  5 09:25:11 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 09:25:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-995-g5c29e88
Message-ID: <20150205142511.C6374A9FB0@public.kitware.com>

This is an automated email from 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  5c29e8897223928855eb6af4d95b063565f11202 (commit)
       via  ecaee7caca4e3d4528e643736c0620e785e84153 (commit)
      from  f55a2b2ac208969fea684664c812a368137aac8d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c29e8897223928855eb6af4d95b063565f11202
commit 5c29e8897223928855eb6af4d95b063565f11202
Merge: f55a2b2 ecaee7c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 09:25:10 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 09:25:10 2015 -0500

    Merge topic 'cpack-nsis-win64'
    
    ecaee7ca CPack: Fix NSIS default 64-bit Windows install directory (#14211)


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

Summary of changes:
 Modules/CPack.cmake |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb  5 09:25:13 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 09:25:13 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-997-g0ae11b1
Message-ID: <20150205142513.E36D7AAC2F@public.kitware.com>

This is an automated email from 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  0ae11b1fb0925a172adcc7cc3c9b804e2ece9ba7 (commit)
       via  219797e4befa19a79d2d94e0b5a2bbe75415606a (commit)
      from  5c29e8897223928855eb6af4d95b063565f11202 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ae11b1fb0925a172adcc7cc3c9b804e2ece9ba7
commit 0ae11b1fb0925a172adcc7cc3c9b804e2ece9ba7
Merge: 5c29e88 219797e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 09:25:12 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 09:25:12 2015 -0500

    Merge topic 'doc-try_compile'
    
    219797e4 Help: Revise try_compile and try_run documentation (#15358)


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

Summary of changes:
 Help/command/try_compile.rst |  126 +++++++++++++++++++++++++----------------
 Help/command/try_run.rst     |  128 +++++++++++++++++++++++++++---------------
 2 files changed, 160 insertions(+), 94 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb  5 09:25:16 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 09:25:16 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1003-g9042c87
Message-ID: <20150205142516.2C471AAC70@public.kitware.com>

This is an automated email from 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  9042c875dcbd0f4b7150e9050b60fb0d40365e45 (commit)
       via  fb3487a9975ed321b48fad5c71dd655d66b68087 (commit)
       via  6027798a30eae02175ce4ad13e1439f4383b6cd3 (commit)
       via  9d767810e1e54eb9233854f0dbf1345a0b5be60f (commit)
       via  72537e4436a17535af5424628adef3b614a61679 (commit)
       via  82c9d6868b87a964214a468cae816642950e70b6 (commit)
      from  0ae11b1fb0925a172adcc7cc3c9b804e2ece9ba7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9042c875dcbd0f4b7150e9050b60fb0d40365e45
commit 9042c875dcbd0f4b7150e9050b60fb0d40365e45
Merge: 0ae11b1 fb3487a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 09:25:14 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 09:25:14 2015 -0500

    Merge topic 'fix-C-standard-features'
    
    fb3487a9 Features: Fix C90 feature detection.
    6027798a Features: Allow setting standard dialect below the default.
    9d767810 Features: Populate CMAKE_<LANG>_STANDARD_DEFAULT only for supported compilers.
    72537e44 Features: Add dialect compile flags only if default is known.
    82c9d686 AppleClang: Remove redundant UNIX condition.


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

Summary of changes:
 Modules/Compiler/AppleClang-C-FeatureTests.cmake   |    2 +-
 Modules/Compiler/AppleClang-C.cmake                |    6 ++--
 Modules/Compiler/AppleClang-CXX.cmake              |    6 ++--
 Modules/Compiler/Clang-C-FeatureTests.cmake        |    2 +-
 Modules/Compiler/Clang-CXX.cmake                   |    4 ++-
 Modules/Compiler/GNU-C-FeatureTests.cmake          |    2 +-
 Modules/Compiler/GNU-C.cmake                       |    2 +-
 Modules/Compiler/GNU-CXX.cmake                     |    4 ++-
 Modules/Compiler/MSVC-CXX.cmake                    |    7 ++--
 Modules/Compiler/SunPro-CXX.cmake                  |    4 ++-
 Source/cmLocalGenerator.cxx                        |   30 +++++++++++-----
 Tests/CompileFeatures/CMakeLists.txt               |   32 +++++++++++++++++
 Tests/CompileFeatures/genex_test.c                 |   38 ++++++++++++++++++++
 .../WriteCompilerDetectionHeader/CMakeLists.txt    |   22 ++++++++++++
 Tests/Module/WriteCompilerDetectionHeader/main.c   |   29 +++++++++++++++
 .../WriteCompilerDetectionHeader/main_multi.c      |   29 +++++++++++++++
 16 files changed, 198 insertions(+), 21 deletions(-)
 create mode 100644 Tests/CompileFeatures/genex_test.c
 create mode 100644 Tests/Module/WriteCompilerDetectionHeader/main.c
 create mode 100644 Tests/Module/WriteCompilerDetectionHeader/main_multi.c


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb  5 09:25:17 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 09:25:17 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1006-g02d0318
Message-ID: <20150205142518.01F3BAAC72@public.kitware.com>

This is an automated email from 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  02d031827d824e15e902b95f833b77ca7379bde4 (commit)
       via  f9839c491ef926b71487345fdcc7054324587168 (commit)
       via  44d6f3ce0839ba0407dc095d1edc1f30e732b719 (commit)
      from  9042c875dcbd0f4b7150e9050b60fb0d40365e45 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02d031827d824e15e902b95f833b77ca7379bde4
commit 02d031827d824e15e902b95f833b77ca7379bde4
Merge: 9042c87 f9839c4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 09:25:16 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 09:25:16 2015 -0500

    Merge topic 'update-docs'
    
    f9839c49 Help: Document build targets automatically added to console pool.
    44d6f3ce Help: Add some cross-linking.


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

Summary of changes:
 Help/command/add_custom_command.rst |    2 +-
 Help/command/add_custom_target.rst  |    2 +-
 Help/manual/cmake-packages.7.rst    |    2 +-
 Help/prop_gbl/JOB_POOLS.rst         |    3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb  5 09:25:19 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 09:25:19 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1012-gf9e05ea
Message-ID: <20150205142519.D83BCAAC7A@public.kitware.com>

This is an automated email from 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  f9e05ea0d47eedda997d024f3ce7bf1be4f812d3 (commit)
       via  d81bbc3fcee81bf0538c139637e0344c9fcad40a (commit)
       via  0f38d9c2ad53631185da9aa7d0f50b5816272a55 (commit)
       via  0f580e8e67fd307c21924dd732570937a0db25e2 (commit)
       via  e08a78dc2cf04682010a3d4496b4c454271f194a (commit)
       via  3a4381b6605f593abc9d9364f5ffa3fc9a209854 (commit)
      from  02d031827d824e15e902b95f833b77ca7379bde4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9e05ea0d47eedda997d024f3ce7bf1be4f812d3
commit f9e05ea0d47eedda997d024f3ce7bf1be4f812d3
Merge: 02d0318 d81bbc3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 09:25:18 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 09:25:18 2015 -0500

    Merge topic 'doc-3.2-relnotes'
    
    d81bbc3f Help: Add 3.2 release note for AUTORCC dependency tracking
    0f38d9c2 Help: Add 3.2 release notes for file(GENERATE) features
    0f580e8e Help: Organize and revise 3.2 release notes
    e08a78dc Help: Consolidate 3.2 release notes
    3a4381b6 Help: Add link target to cmake-language.7 encoding section


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

Summary of changes:
 Help/manual/cmake-language.7.rst                   |    2 +
 Help/release/3.2.0.rst                             |  280 ++++++++++++++++++++
 Help/release/dev/Apple-GNU-compiler-features.rst   |    5 -
 Help/release/dev/Apple-compiler-selection.rst      |    8 -
 .../dev/CTestCoverageCollectGCOV-refinements.rst   |    6 -
 Help/release/dev/ExternalData-custom-download.rst  |    7 -
 .../ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst   |    6 -
 .../dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst |    6 -
 .../dev/ExternalProject_UPDATE_DISCONNECTED.rst    |    6 -
 .../ExternalProject_independent-step-targets.rst   |    6 -
 Help/release/dev/FindCUDA-cusolver.rst             |    5 -
 Help/release/dev/FindGit-local-Github.rst          |    5 -
 Help/release/dev/FindLATEX-components.rst          |    4 -
 Help/release/dev/FindOpenGL-no-X11.rst             |    8 -
 Help/release/dev/FindOpenSSL-separate-libs.rst     |    7 -
 Help/release/dev/GNU-4.4-compile-features.rst      |    5 -
 .../release/dev/SolarisStudio-compile-features.rst |    5 -
 Help/release/dev/WCDH-thread_local.rst             |    7 -
 ...riteCompilerDetectionHeader-multi-file-lang.rst |    6 -
 Help/release/dev/Xcode-clang-compile-features.rst  |    5 -
 Help/release/dev/add-FindGSL.rst                   |    5 -
 Help/release/dev/add-FindIntl.rst                  |    5 -
 Help/release/dev/add-FindJsonCpp.rst               |    5 -
 Help/release/dev/add-continue-command.rst          |    6 -
 Help/release/dev/add-xz-support.rst                |    5 -
 .../release/dev/add_javascript_coverage_parser.rst |    4 -
 Help/release/dev/break-command-strictness.rst      |    6 -
 Help/release/dev/cached-regex-clear-fixed.rst      |    5 -
 Help/release/dev/cmake-E-tar-files-from.rst        |    6 -
 Help/release/dev/cmake-E-tar-mtime.rst             |    6 -
 Help/release/dev/console-pool.rst                  |   10 -
 .../dev/cpack-rpm-component-descriptions.rst       |    7 -
 Help/release/dev/cpack-rpm-pre-post-install.rst    |   12 -
 Help/release/dev/ctest-delphi-coverage.rst         |    4 -
 Help/release/dev/curl-darwinssl.rst                |    9 -
 Help/release/dev/curl-default-cainfo.rst           |    8 -
 Help/release/dev/curl-winssl.rst                   |    9 -
 Help/release/dev/custom-command-byproducts.rst     |    7 -
 Help/release/dev/feature-record-msvc.rst           |    5 -
 Help/release/dev/file-LOCK-command.rst             |    5 -
 Help/release/dev/file-strings-utf-16.rst           |    5 -
 Help/release/dev/find-msmpi.rst                    |    4 -
 .../release/dev/install-EXPORT-absolute-prefix.rst |    9 -
 Help/release/dev/record-GNU-5-features.rst         |    5 -
 Help/release/dev/rpm_multi_prefix.rst              |   11 -
 Help/release/dev/try-run-link-libraries.rst        |    5 -
 Help/release/dev/try_compile-link-flags.rst        |    6 -
 Help/release/dev/unsupported-compilers.rst         |   22 --
 Help/release/dev/vs-nsight-tegra-min-api.rst       |    5 -
 Help/release/dev/vs-shader-flags.rst               |    5 -
 Help/release/dev/windows-utf-8.rst                 |   22 --
 Help/release/dev/xcode-revise-make-program.rst     |    6 -
 Help/release/index.rst                             |    1 +
 53 files changed, 283 insertions(+), 341 deletions(-)
 create mode 100644 Help/release/3.2.0.rst
 delete mode 100644 Help/release/dev/Apple-GNU-compiler-features.rst
 delete mode 100644 Help/release/dev/Apple-compiler-selection.rst
 delete mode 100644 Help/release/dev/CTestCoverageCollectGCOV-refinements.rst
 delete mode 100644 Help/release/dev/ExternalData-custom-download.rst
 delete mode 100644 Help/release/dev/ExternalProject_CMAKE_CACHE_DEFAULT_ARGS.rst
 delete mode 100644 Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
 delete mode 100644 Help/release/dev/ExternalProject_UPDATE_DISCONNECTED.rst
 delete mode 100644 Help/release/dev/ExternalProject_independent-step-targets.rst
 delete mode 100644 Help/release/dev/FindCUDA-cusolver.rst
 delete mode 100644 Help/release/dev/FindGit-local-Github.rst
 delete mode 100644 Help/release/dev/FindLATEX-components.rst
 delete mode 100644 Help/release/dev/FindOpenGL-no-X11.rst
 delete mode 100644 Help/release/dev/FindOpenSSL-separate-libs.rst
 delete mode 100644 Help/release/dev/GNU-4.4-compile-features.rst
 delete mode 100644 Help/release/dev/SolarisStudio-compile-features.rst
 delete mode 100644 Help/release/dev/WCDH-thread_local.rst
 delete mode 100644 Help/release/dev/WriteCompilerDetectionHeader-multi-file-lang.rst
 delete mode 100644 Help/release/dev/Xcode-clang-compile-features.rst
 delete mode 100644 Help/release/dev/add-FindGSL.rst
 delete mode 100644 Help/release/dev/add-FindIntl.rst
 delete mode 100644 Help/release/dev/add-FindJsonCpp.rst
 delete mode 100644 Help/release/dev/add-continue-command.rst
 delete mode 100644 Help/release/dev/add-xz-support.rst
 delete mode 100644 Help/release/dev/add_javascript_coverage_parser.rst
 delete mode 100644 Help/release/dev/break-command-strictness.rst
 delete mode 100644 Help/release/dev/cached-regex-clear-fixed.rst
 delete mode 100644 Help/release/dev/cmake-E-tar-files-from.rst
 delete mode 100644 Help/release/dev/cmake-E-tar-mtime.rst
 delete mode 100644 Help/release/dev/console-pool.rst
 delete mode 100644 Help/release/dev/cpack-rpm-component-descriptions.rst
 delete mode 100644 Help/release/dev/cpack-rpm-pre-post-install.rst
 delete mode 100644 Help/release/dev/ctest-delphi-coverage.rst
 delete mode 100644 Help/release/dev/curl-darwinssl.rst
 delete mode 100644 Help/release/dev/curl-default-cainfo.rst
 delete mode 100644 Help/release/dev/curl-winssl.rst
 delete mode 100644 Help/release/dev/custom-command-byproducts.rst
 delete mode 100644 Help/release/dev/feature-record-msvc.rst
 delete mode 100644 Help/release/dev/file-LOCK-command.rst
 delete mode 100644 Help/release/dev/file-strings-utf-16.rst
 delete mode 100644 Help/release/dev/find-msmpi.rst
 delete mode 100644 Help/release/dev/install-EXPORT-absolute-prefix.rst
 delete mode 100644 Help/release/dev/record-GNU-5-features.rst
 delete mode 100644 Help/release/dev/rpm_multi_prefix.rst
 delete mode 100644 Help/release/dev/try-run-link-libraries.rst
 delete mode 100644 Help/release/dev/try_compile-link-flags.rst
 delete mode 100644 Help/release/dev/unsupported-compilers.rst
 delete mode 100644 Help/release/dev/vs-nsight-tegra-min-api.rst
 delete mode 100644 Help/release/dev/vs-shader-flags.rst
 delete mode 100644 Help/release/dev/windows-utf-8.rst
 delete mode 100644 Help/release/dev/xcode-revise-make-program.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb  5 09:25:37 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 09:25:37 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-2621-gede8021
Message-ID: <20150205142537.06D52AAC70@public.kitware.com>

This is an automated email from 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  ede80217e61c49e2d13ffebf9e9b7fb3335ada3f (commit)
       via  f9e05ea0d47eedda997d024f3ce7bf1be4f812d3 (commit)
       via  02d031827d824e15e902b95f833b77ca7379bde4 (commit)
       via  9042c875dcbd0f4b7150e9050b60fb0d40365e45 (commit)
       via  0ae11b1fb0925a172adcc7cc3c9b804e2ece9ba7 (commit)
       via  5c29e8897223928855eb6af4d95b063565f11202 (commit)
      from  dfb837f667f05c8904fb50d7b132d46c9e8692c0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ede80217e61c49e2d13ffebf9e9b7fb3335ada3f
commit ede80217e61c49e2d13ffebf9e9b7fb3335ada3f
Merge: dfb837f f9e05ea
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 09:25:28 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 5 09:25:28 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb  5 09:52:00 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 09:52:00 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-2623-gfd640be
Message-ID: <20150205145200.A4E82AAA0C@public.kitware.com>

This is an automated email from 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  fd640beba027d3c44bbfcf25e0595f5bd1bafae0 (commit)
       via  af8d1c17e663cf424ce4b5af9351849651bd6fd0 (commit)
      from  ede80217e61c49e2d13ffebf9e9b7fb3335ada3f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd640beba027d3c44bbfcf25e0595f5bd1bafae0
commit fd640beba027d3c44bbfcf25e0595f5bd1bafae0
Merge: ede8021 af8d1c1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 09:51:59 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 09:51:59 2015 -0500

    Merge topic 'rename-release-notes' into next
    
    af8d1c17 Help: Rename 3.x.0 release notes to 3.x


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af8d1c17e663cf424ce4b5af9351849651bd6fd0
commit af8d1c17e663cf424ce4b5af9351849651bd6fd0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 09:47:52 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 5 09:50:56 2015 -0500

    Help: Rename 3.x.0 release notes to 3.x
    
    In commit v3.0.0-rc1~9 (Help: Rename 3.0 release notes to 3.0.0,
    2014-02-19) we anticipated the possibility of bugfix-only release notes.
    However, in practice we have no release notes for bug fix releases
    because we do not cover bug fixes in release notes at all, only new
    features.  Instead we've been updating the feature-level release notes
    document in bug fix releases, treating errors in the document as bugs.
    
    It makes more sense to maintain release notes at the feature-release
    level, so rename the documents accordingly.  Also update the document
    titles and intro text to refer only to feature versions and not bugfix
    versions.

diff --git a/Help/release/3.0.0.rst b/Help/release/3.0.rst
similarity index 99%
rename from Help/release/3.0.0.rst
rename to Help/release/3.0.rst
index e92c293..d02f940 100644
--- a/Help/release/3.0.0.rst
+++ b/Help/release/3.0.rst
@@ -1,11 +1,11 @@
-CMake 3.0.0 Release Notes
-*************************
+CMake 3.0 Release Notes
+***********************
 
 .. only:: html
 
   .. contents::
 
-Changes made since CMake 2.8.12.2 include the following.
+Changes made since CMake 2.8.12 include the following.
 
 Documentation Changes
 =====================
diff --git a/Help/release/3.1.0.rst b/Help/release/3.1.rst
similarity index 99%
rename from Help/release/3.1.0.rst
rename to Help/release/3.1.rst
index 97a63f9..dca42cd 100644
--- a/Help/release/3.1.0.rst
+++ b/Help/release/3.1.rst
@@ -1,11 +1,11 @@
-CMake 3.1.0 Release Notes
-*************************
+CMake 3.1 Release Notes
+***********************
 
 .. only:: html
 
   .. contents::
 
-Changes made since CMake 3.0.0 include the following.
+Changes made since CMake 3.0 include the following.
 
 Documentation Changes
 =====================
diff --git a/Help/release/3.2.0.rst b/Help/release/3.2.rst
similarity index 99%
rename from Help/release/3.2.0.rst
rename to Help/release/3.2.rst
index 5b12163..ddc3d86 100644
--- a/Help/release/3.2.0.rst
+++ b/Help/release/3.2.rst
@@ -1,11 +1,11 @@
-CMake 3.2.0 Release Notes
-*************************
+CMake 3.2 Release Notes
+***********************
 
 .. only:: html
 
   .. contents::
 
-Changes made since CMake 3.1.0 include the following.
+Changes made since CMake 3.1 include the following.
 
 New Features
 ============
diff --git a/Help/release/index.rst b/Help/release/index.rst
index 990accf..45d0a69 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -13,6 +13,6 @@ Releases
 .. toctree::
    :maxdepth: 1
 
-   3.2.0 <3.2.0>
-   3.1.0 <3.1.0>
-   3.0.0 <3.0.0>
+   3.2 <3.2>
+   3.1 <3.1>
+   3.0 <3.0>

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

Summary of changes:
 Help/release/{3.0.0.rst => 3.0.rst} |    6 +++---
 Help/release/{3.1.0.rst => 3.1.rst} |    6 +++---
 Help/release/{3.2.0.rst => 3.2.rst} |    6 +++---
 Help/release/index.rst              |    6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename Help/release/{3.0.0.rst => 3.0.rst} (99%)
 rename Help/release/{3.1.0.rst => 3.1.rst} (99%)
 rename Help/release/{3.2.0.rst => 3.2.rst} (99%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb  5 09:52:06 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 09:52:06 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1014-g78c4418
Message-ID: <20150205145206.88252AAA45@public.kitware.com>

This is an automated email from 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  78c4418fa0a08b63a944ac66821e8bd95fdd73e0 (commit)
       via  af8d1c17e663cf424ce4b5af9351849651bd6fd0 (commit)
      from  f9e05ea0d47eedda997d024f3ce7bf1be4f812d3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78c4418fa0a08b63a944ac66821e8bd95fdd73e0
commit 78c4418fa0a08b63a944ac66821e8bd95fdd73e0
Merge: f9e05ea af8d1c1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 09:52:05 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 09:52:05 2015 -0500

    Merge topic 'rename-release-notes'
    
    af8d1c17 Help: Rename 3.x.0 release notes to 3.x


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

Summary of changes:
 Help/release/{3.0.0.rst => 3.0.rst} |    6 +++---
 Help/release/{3.1.0.rst => 3.1.rst} |    6 +++---
 Help/release/{3.2.0.rst => 3.2.rst} |    6 +++---
 Help/release/index.rst              |    6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename Help/release/{3.0.0.rst => 3.0.rst} (99%)
 rename Help/release/{3.1.0.rst => 3.1.rst} (99%)
 rename Help/release/{3.2.0.rst => 3.2.rst} (99%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb  5 09:52:19 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 09:52:19 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-2625-gbbeb310
Message-ID: <20150205145219.BCBCDAAA54@public.kitware.com>

This is an automated email from 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  bbeb31062cc15744783b3fc303d5ba29f9be67d9 (commit)
       via  78c4418fa0a08b63a944ac66821e8bd95fdd73e0 (commit)
      from  fd640beba027d3c44bbfcf25e0595f5bd1bafae0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bbeb31062cc15744783b3fc303d5ba29f9be67d9
commit bbeb31062cc15744783b3fc303d5ba29f9be67d9
Merge: fd640be 78c4418
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 09:52:12 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 5 09:52:12 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From cmake-commits at cmake.org  Thu Feb  5 10:05:29 2015
From: cmake-commits at cmake.org (cmake-commits at cmake.org)
Date: Thu,  5 Feb 2015 10:05:29 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1018-g098160d
Message-ID: <20150205150529.851F7AAD6D@public.kitware.com>

This is an automated email from 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  098160d5f2a1aa35d2f14c585dd87cefd8f56f41 (commit)
       via  9da936e49d5d5eb3b60b2697eb99f2e4ed9809aa (commit)
       via  cb01f1517051b577d571e8fd21d210ef303f56c9 (commit)
       via  1ac598f53b74009bf161387894796199348747ce (commit)
      from  78c4418fa0a08b63a944ac66821e8bd95fdd73e0 (commit)

Those revisions listed 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 +-
 Utilities/Release/upload_release.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From cmake-commits at cmake.org  Thu Feb  5 10:05:33 2015
From: cmake-commits at cmake.org (cmake-commits at cmake.org)
Date: Thu,  5 Feb 2015 10:05:33 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1019-g15d314c
Message-ID: <20150205150533.18750AAD6E@public.kitware.com>

This is an automated email from 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
  discards  bbeb31062cc15744783b3fc303d5ba29f9be67d9 (commit)
  discards  fd640beba027d3c44bbfcf25e0595f5bd1bafae0 (commit)
  discards  ede80217e61c49e2d13ffebf9e9b7fb3335ada3f (commit)
  discards  dfb837f667f05c8904fb50d7b132d46c9e8692c0 (commit)
  discards  618454549067c02ebfaa8b2fe4640e8016e853bd (commit)
  discards  831d032017740493b3319e18d7cbf627e3f77702 (commit)
  discards  b901131640c66afdfc10f0b9d0f8bd3a59976daf (commit)
  discards  f5d4c0dbf8e2d5182e458504a3fc882e9b83230b (commit)
  discards  103f8137d247fe790caed9b062e199d119e60392 (commit)
  discards  18e30fbaeb6a2c6a7ce66d8748f68ebaacca667a (commit)
  discards  467b7158cb60adca53fbeac2dfe2f5699cba7fb1 (commit)
  discards  9e8ab436e1482b8aadc00951da55fca0e5e485af (commit)
  discards  d41124347b64a473eb1a732fb9690a9712474444 (commit)
  discards  0fd9256c91fed57453b298e19be624c70273b101 (commit)
  discards  37e5f9557dc518b10eed9d8ff6b32ae76c78dd92 (commit)
  discards  d97ada67e5e2753216d6b2b8adb8275b79eb4f9c (commit)
  discards  2ce10a997401f1d978f56f83f3c0baaa241f12dc (commit)
  discards  b23158a63b547abe2ad85f82b4c5109cf3db07d8 (commit)
  discards  7ba8c31e4e0829433a4ee3a852fc6f2b396fcc6e (commit)
  discards  f95cfd91ff382777936cce827596de63718fdbbe (commit)
  discards  977eb5b472d036bfc38abcfdd8eb454a5f606022 (commit)
  discards  fb35d8df9d7263cb417fb4037df768fa40a49ed9 (commit)
  discards  3a3d9fb5810cd408a232df2fcb86599624eb216b (commit)
  discards  43cdef5bbde4616bce8be3144d0cdfa005cece03 (commit)
  discards  572dbfc18ee29474590ca8170074190c074761f5 (commit)
  discards  20dca828e47efc9d01f6f7ead0a0691a142f3175 (commit)
  discards  cd7e6690f95e3fb6c61bf2c0fdbd12880f55bb66 (commit)
  discards  e49ac7e1faccdbcffa88127a92d7184832fbc383 (commit)
  discards  5e2569af959073ff3b91a5ee2a5325ad8c854744 (commit)
  discards  6ed3d551f7caf18b50a4ce6c82323e3cdddd5c62 (commit)
  discards  415151c383e74402d8922cbc1fc2ed8ee7040f0c (commit)
  discards  950f8fe104ee7f45fb1cd2a240bc80ede115e6ad (commit)
  discards  6894b2511b2517091d3383b5a6313467919f1847 (commit)
  discards  2bbbf99d7bd27844dcf157f72bd05eb7d20ce888 (commit)
  discards  ba1989e5609850771ea4291c85fcd0a0620b3c68 (commit)
  discards  9122ca6f7ebaf47cb3d1e27859a5b19f7f84940e (commit)
  discards  3e56e295bc901ff7af64463e2b91cdbcd960d950 (commit)
  discards  60ed7bbb83e8e585865cfca49cf1f26ea0c58295 (commit)
  discards  a64323966805fe0089763f39c92e75529aeffd13 (commit)
  discards  f54e479a42f74753a9052fe0eb822d407d5f2a76 (commit)
  discards  12f30fde379d3bfe6c6302c5d50915a413f2c5af (commit)
  discards  7b53ca2bfc5b2afb722b7438084c1536c31cc789 (commit)
  discards  294d9ad1248020d3ea8e9c5a04dfd7fb6d89bdcb (commit)
  discards  1c5fef6fdc772db6d0f603da9eb44831103aa27f (commit)
  discards  a6db7d2d48faf5a7455b2cca6e310e24fed6e85a (commit)
  discards  8beff487b2f22cb03b78fcc1f6375a63ce04420e (commit)
  discards  5c23ef334f3c5132f24d96dee23bf1a8430951f3 (commit)
  discards  b7225ddb44bf375df320a3c9096ab8dac965c3a8 (commit)
  discards  117176317359cbdaa09afad7168f1d6c923c56b5 (commit)
  discards  9fad1bd5aef1d7c46dff587febd66808781e88ad (commit)
  discards  dc5bd78ae99b4851dbc505ec5a47622c7045ff9e (commit)
  discards  584ba3fe68d49dcb7d0d4d5d826f883548a24e5d (commit)
  discards  ff758672b69e0992e4bf7a7c9d031b3ce4bb5d20 (commit)
  discards  8e8031933929b12fac8b167b542526af045a415a (commit)
  discards  062cb2f5d0c7ab90f04805207bf4bef6469764d3 (commit)
  discards  0539d927c370a25e09b59e8fb90e382cae13a224 (commit)
  discards  23fca4c96912b9a4bd012000f2af6851eb0b02a2 (commit)
  discards  70fd484a81d55b9177b48f460f4d37d12089d0b2 (commit)
  discards  d7b3f1d19326bb0221562d6b4e1006eb40251650 (commit)
  discards  98e6914a157b219ef6b5b70c3ba699a3402e633f (commit)
  discards  f0e2fdd201e3b7b466efb0710d0cbad317bbc8bd (commit)
  discards  fb828b44ebfd0f9a2c74d16efd15d4cc0716cb60 (commit)
  discards  2b24a1129330027717429d0a2be1ce7d7bd4202a (commit)
  discards  4c98de33d71fece4333607225ab030c1c7eee76c (commit)
  discards  951b4a382df85ca097859fdfb81bb3a6b886a0b9 (commit)
  discards  143e6f73a66c7d942c428269c39b6b994d67aa3b (commit)
  discards  e53a6242b570d8dbaeef136a5683f2138860f213 (commit)
  discards  4da6ab0834bac654df245e87ff832afafe8d29f2 (commit)
  discards  59a2f4390a0866d719c9c5a03aba28089cfd6d37 (commit)
  discards  d4e0eee7698f4edda7f91bb7a8d0f5589feea7fd (commit)
  discards  01cd4d7da617553f3f0322c1ab6bb2304e652855 (commit)
  discards  dd8fccdc0f0e64c45f7098da497262454678721f (commit)
  discards  569a549c79b6d8bd349727ad274881f15cdef7c2 (commit)
  discards  95935743d9fbad24925ca9f96b5090786caa3cde (commit)
  discards  e2daec33c651b05933c1b2af000349a9c89e982c (commit)
  discards  f52c5a45dd025d8c30c7505e36b03226e3e0a43a (commit)
  discards  86c4b287dcaec066926c5a637a090857659f6f93 (commit)
  discards  b08ceba40b1c6e3276155c21aa6517f5934be688 (commit)
  discards  5076bed36e119e91b303f328bf6f5e18d3957b8f (commit)
  discards  e0ca5c27ed79a417523904c9571f199439a45b3b (commit)
  discards  b3362a20f5eabd0f373154332612907e5aa1f48a (commit)
  discards  d23ac474f4eecc9b2df70a6205299927253e42fe (commit)
  discards  aa26ab1623e5b412167dbb7e45f065cf78cd148f (commit)
  discards  e19b6e6bc235a94290eb574043488876197fce1a (commit)
  discards  942da844ab9c47660a7353980a52932c37f40ac9 (commit)
  discards  12992551e8100fe99d47e71445af53c2cc06e445 (commit)
  discards  0a278bea71a2927874c95d44710424b87bf7a72d (commit)
  discards  dc6c46b115f19ac02db22d072c07da2df423cd36 (commit)
  discards  a3892efa66657d873c3bf46ddb9fea0db287508a (commit)
  discards  3b12ad4612252eae973f1490328ef916b3cb1fc5 (commit)
  discards  2d55dfd99c3613f0ba915fe958dac77e7b8b997b (commit)
  discards  f6c9f327a3903ec8f7f2b3e301cc97e012472d94 (commit)
  discards  b54ed1b543f429180945adaabebd5a9f35028391 (commit)
  discards  ecc6b91f96be110aed26e2030b599817639d2106 (commit)
  discards  9c0c1ad7924eb773671b605ae3df83b440d3dece (commit)
  discards  83b9ceed00b610060a12818150cdf3b4be7c42c0 (commit)
  discards  9f66c5ec71327920974cbb146459852343469e40 (commit)
  discards  2982298c9ce6cbd7402cc7a189c3382b1743ea51 (commit)
  discards  52b89b09713f03fcf81202a5065b2bf146e42cb2 (commit)
  discards  faeef8432b3bcf7623846de2b1715de3b2acdb13 (commit)
  discards  8037aa78c90c3a356a15efe102b1ee7cfcba3d34 (commit)
  discards  35165bdcdac5a6450b8123a9eaf925f94ad90448 (commit)
  discards  d283f43620dc720d7fbac6095464f9b59c606911 (commit)
  discards  ddc640dc0c8be52607d79328ce68d13aa2625ecc (commit)
  discards  8a0fca5f026b7c0a42564cc666a182784890b807 (commit)
  discards  fc681b4a0e88f65a7875f70a287511f402f307a0 (commit)
  discards  9eaeba8f0bcff213de7a42eebe1c9a46ffe78e65 (commit)
  discards  f3f323044344e250f9235ed820f3b28c5b2b3dde (commit)
  discards  d9a5a1f7e5bdb5960d153a00595a237e4f69e97b (commit)
  discards  1e10b57a9c49cdace423970d14514b3462ce61f4 (commit)
  discards  fcfce76d09ba7d5337ed8e198b9998d7d2f6f5fc (commit)
  discards  2596f95e7338ab22695fed24c26157de5ad76f2d (commit)
  discards  8157b25c9bc92c415f486bb6107d8592571a4954 (commit)
  discards  e61e74513542c2d0a6229b6b4bb4b014a6032de5 (commit)
  discards  190bc8ed4589ee89c3405f8e44c2f7e9fe2ed2de (commit)
  discards  befffb975434b159e82b6c750ede0762a1951672 (commit)
  discards  01bbd07b7c6ae9709dd874e93a96ba26f161b773 (commit)
  discards  e4969c1d6db8765a0a430ab0172e35042821df4d (commit)
  discards  facb1be1b508efc97430a9c2b1523d3a387e8cc5 (commit)
  discards  f4961f916a2d5e323c58c11e8dd3267444f1e8aa (commit)
  discards  db4f91629fc1ad0519713f3af9999ae84cb27b49 (commit)
  discards  4931de8c2666436802ed96a31a8b76f01042b0f2 (commit)
  discards  440242818dd9fc99c5034af5c299dab063c62c8d (commit)
  discards  c4ddc92f912576e1499478abcf178b351b9e07f8 (commit)
  discards  f311a36cf47cf16d704427d59a31f597097d8a24 (commit)
  discards  a0577e5891d64235e211ff38fd4def0b01865cde (commit)
  discards  55ec478171d30dbb8c3f6bfaed8131a8ada29bba (commit)
  discards  af570233d5fe47ee49e67e8e3c8554ad4065830c (commit)
  discards  d9eebde0b025a6b93950e1c197b0f5a50deffa1a (commit)
  discards  6682a9b18838c15070d7aed2be0dc9364910575c (commit)
  discards  319326525a7ecfae55fed4f3e5ce2b2dad2449be (commit)
  discards  ba1bdf72bc7fb34ac897056d5ec0c94e80bac393 (commit)
  discards  d84329c78b043ec77dbfe8130a737e7bddaaab3d (commit)
  discards  9d274b4f3ffba3ad339522375180d2bf568d016c (commit)
  discards  86945954ccf2d3649180c3bd6ea9faedb3a02ddf (commit)
  discards  baf5bfb5725d77368e4b33ffabb9ea8958e8c89a (commit)
  discards  eada43bb220f5f3953874606eb97ba33217091e4 (commit)
  discards  5348b1f86b070d6c4f4402aa09d2bc9c606908ba (commit)
  discards  6eca2590558ae1ad4de989718a496a2f68ab68d4 (commit)
  discards  5257503e78c4d779e41f93643677ae89b1d16022 (commit)
  discards  7f8ae89fd03bf2d31a52a1e9665791e5934b0657 (commit)
  discards  15bc8492469ca587ad24840f73eeb094a779bd9c (commit)
  discards  9bae20cd9565fa3f5b2197d20316d79239f14848 (commit)
  discards  a30dc4776c1c853e26cbb4a819b2471f7b1242e0 (commit)
  discards  37a16068b3fae9304bcc471b6361297ee4c1c534 (commit)
  discards  0fa3dd31464cbccc9bc401eabdfb75d94b5579bd (commit)
  discards  94193f7375b8e3490a71cc8baf0ca42e3e070afe (commit)
  discards  27da8cf2d3ddf34acd9eeccf630d83ccbf89cd38 (commit)
  discards  081c724ccb82ed1bae3f629f4b6f0b3afc79fdfc (commit)
  discards  13530ca17efc81a393effa80efc527eeca28cbe4 (commit)
  discards  8dced126375dba8ba8a4d8718331c77898e0da68 (commit)
  discards  6b9bd82789d918843753e30fd798af89b85c6453 (commit)
  discards  a64545de6ce4da2f2dc50deecc632ccf8e2d4ef8 (commit)
  discards  4457266e0b54b8b0bbe65bb58637b53e4e03a0c2 (commit)
  discards  ba9bd140a68861152734e2371b20793393b4a534 (commit)
  discards  8c27ca48d548abad83d2eae3816e6ef9af8d63bf (commit)
  discards  86a7940fe1fc85caec68f51599a4ec403534e3ad (commit)
  discards  d39e049069f3214ec70117a5f865ff9968914b33 (commit)
  discards  5da1636116edaeda9bf32cd67de2bdfa543e743f (commit)
  discards  f4d53ea06e2b1890ed7736f0cf90339e7f2efc84 (commit)
  discards  3c5ce70fa8c1b4f7e27045a37a4bf9478e466751 (commit)
  discards  050dc316b6668708811311225ad923dc24e77950 (commit)
  discards  d3e921ef87838fff6b8778966fc2fc530638a831 (commit)
  discards  3837f15096592ee85e4a459b11fccf0722a7318f (commit)
  discards  da9cd65f4013ae4ebf7f215594cb5424d79a22d1 (commit)
  discards  ea7edc917464acae53dcf6a82a03abdfa18fd9b2 (commit)
  discards  5f57e8282cb1aec7d34f7ab42cdd6f1fb0fe36b7 (commit)
  discards  ef8dcd30a0d2c3fd43105bdc598ced2115157cd4 (commit)
  discards  a8197c1a4affcaf6021bef8323381d05d155258d (commit)
  discards  0db065f14a128556135b29fc9bde2bd9eac653ff (commit)
  discards  60316739d134a6c76e435746f4c6009220e533a9 (commit)
  discards  b359ee994ea80fccd7eff1b01e33cbcce879a545 (commit)
  discards  4c53670b6444b16e8d39a46aebd39fc166895755 (commit)
  discards  0492ede11b4f4b396a5f2f5ccbcb0a7bcb0e2167 (commit)
  discards  5abead04c62d1ca4ae3dc3436ccbd8049ddd7e0a (commit)
  discards  2ae7b5534897c95a1722e82a0551d8b07ce591b8 (commit)
  discards  8580ac8409d19ba4a2b4b44a3c4933f93b4fb947 (commit)
  discards  0e8952d11f583f72f92b360847a96c012f0c662c (commit)
  discards  7343d054226778bea3899538b074bab8ab33c46a (commit)
  discards  8e5a71296ddb0959b3d55232823eea9495a8a797 (commit)
  discards  768ed74673d56ce22d79fdc2e58ecd2828694ab4 (commit)
  discards  19a24c0387819644e016194ce653946d772762b2 (commit)
  discards  d5604fc8008d0a86046d004914a6531b0cd940b9 (commit)
  discards  f4e833c32a97a87918a463d5e234a76d993fdc42 (commit)
  discards  c350d78f7baf5db77b808f99911bb07a069da1bf (commit)
  discards  d4506d1708d5da92f5ba26b43262db6d8b0077f9 (commit)
  discards  b17d835f7d6047dfb5ec33283eb75c4c5ebdc353 (commit)
  discards  f31d11f635edd36d6ef3d946a475565533b33854 (commit)
  discards  0379c24d878e763ebb5918014fc58380a379ac18 (commit)
  discards  c805a31c2ced7199b2807cecc22213e96c0279c8 (commit)
  discards  a2742925ced9b822a2249aad5982b5d8f07c8c02 (commit)
  discards  909bcad178c51bef0a063ab1d00e9a64c466261c (commit)
  discards  148ad4b304ddc7cd151e022edf71b0fa89e50dcb (commit)
  discards  9dfe97f83ff4472e34e161d978efcfba7ed793a2 (commit)
  discards  dbb73396e7c7172ae58e42dd9840cf7f89f35da4 (commit)
  discards  5dce3cf7343b50d95a87f68ed9ffadd936d74c53 (commit)
  discards  d7f4b5673d4f68a3de0fa5d0dc71322dd575e443 (commit)
  discards  8b0b49061310e2d14c34fe60d41b1082eaa72e77 (commit)
  discards  04344c3f69d61444dca18bc3c4ca6c07c7197fd7 (commit)
  discards  fce896b44813a1babddc2451d26223e7dfdfae45 (commit)
  discards  8bc5b3cfb1b0e7af49b9e0c6a4c269b5be273f5a (commit)
  discards  c4c05f4d6619641c241f90e43301e924013d0e69 (commit)
  discards  82e135908ad68429d857e6439b9e10398b2668d7 (commit)
  discards  5b5d8daf1082dbc0c4c9cdb6097dd6663aea81fb (commit)
  discards  b7a1769bdee9169dbda0d7e46fee9ff0bfa3c0fd (commit)
  discards  f4bd6712fabf24cd78c72c6d6c2d428a828aa97f (commit)
  discards  7bd36637c767f0a8e4dd159d36037b7058ae7b81 (commit)
  discards  3a70f6e34c49ceab09e36bfd5bb623bbc312707b (commit)
  discards  5c306429b25dfd03b8f662bb1189d55c03afdbf9 (commit)
  discards  59f6995bfd214152cf6d66e188e84216b7e7db60 (commit)
  discards  c0130af037373d853ee78465e9f5ef6547991bbd (commit)
  discards  9928a397deee6c6aa148ab27cdd15b5ff732b4e5 (commit)
  discards  c663ec799e1f02efcf192d652e67095da4c134cc (commit)
  discards  57b028dffc1408e39e7112c5fdde4b2efb067280 (commit)
  discards  d1b31254f24c2383c072ab88282abfedfb5ccc40 (commit)
  discards  57e6b1c3eff6a8179e98517081b3258849e75884 (commit)
  discards  0a0c008eb5bc0e6380d5166315f417f5c97cc66f (commit)
  discards  a80a6fc857c5f77840c27caa89b499e22518f68d (commit)
  discards  fe6b4fad790428480b0b7f69b77da12ec795af8d (commit)
  discards  e00d75e25aaa93c38b59df54163ba468adac1c8a (commit)
  discards  3084142a708ce9107e357649bb6323dcca17b87d (commit)
  discards  b358e734b867669fe086be98502f2f4bd1bd7425 (commit)
  discards  852f738c0911975d8f39491f288158fcf3795fe1 (commit)
  discards  a67be306809f9ecf87499fcb6f70f24e428d612f (commit)
  discards  cda6e0784dbc387abf96a9b9ae1e3695aa3e7c17 (commit)
  discards  a1adb3a956ac31b0494eebd69349d3c950e1a5a2 (commit)
  discards  d07f9d28f1d7d552e5a42dd7bdd3a91856375e5c (commit)
  discards  36f93b606c4a14efdccee80b6a6a738f6795408c (commit)
  discards  f682e2a20b69b8bb1113ea25e907b03dd3fe4ba5 (commit)
  discards  444a7331ef2da0270a1c2fef7eb16fbdea4c3976 (commit)
  discards  688d06a039b3c1a3305bd73922e74d3f5eb3c5a2 (commit)
  discards  9ab1060cf6496a63c33f767faa9ae208331fe1fe (commit)
  discards  1cb31f76cf50ca5c734fa86483d8bfdbf984b647 (commit)
  discards  40b69ceab5e3d0eb6dcbd48837af6213290609f5 (commit)
  discards  78831279eade5a1e6490be244fc19b26d34366f1 (commit)
  discards  73637b85b622bda8d327a19be52e4ba0947f5cc6 (commit)
  discards  d12f442c9453cdde4f95f708447bf77a9e87debd (commit)
  discards  5105b55967fd6c58e7fe7f58ec5589eb151d48f4 (commit)
  discards  d3dad494c00f64119c702440670e366a64b82554 (commit)
  discards  dadb104e12a803e1efd435712f59446675e86b6f (commit)
  discards  9ebdc29f1d380cb37aacf99aded77aea76ac0f79 (commit)
  discards  c2a645b74e203c946eafe0f2fd6996989876f24b (commit)
  discards  cdfbe11b7387eeb3594244feace5c99c1d090773 (commit)
  discards  da9ed6be3896a3bdaed9cddfbf2fccc944992451 (commit)
  discards  52a4fe75063d77f2b79ffd9bb93b1e48cd7af3dd (commit)
  discards  2d65931be441528733687bb62f2d111eee659e27 (commit)
  discards  c23c98773d30735743b5a522a6b76a153aef4d3d (commit)
  discards  4f313114bab3ffd41e26178624f4e5dd3eb70e74 (commit)
  discards  515b029dd45712fb347f4889d2c2b261457f4b9d (commit)
  discards  23f546b771106cf97a8e3163a824779c6898797f (commit)
  discards  09bceae5b9df968d8307d898f43963b2bd305c45 (commit)
  discards  b57c2977083e8bf0c8e0ae12f6b2e9db5f4a216c (commit)
  discards  af96f69116e4f00b46028ef709fef898a53972e1 (commit)
  discards  65ebdf17ae3f463dd10862a4f1bec017f2c15cb5 (commit)
  discards  ab1f20025d42a781e4d9d0a446089892f121bde2 (commit)
  discards  1c175147e32341d5a9bf4c54fc8ea7cd9831c31c (commit)
  discards  b6aa7393f5501c658afc1c83001fcecec7a86e7a (commit)
  discards  45049eca97e8931721f4a371e136a012c0473e8d (commit)
  discards  f4b78cf2ac9785ae02e910ac5566718fd8592f10 (commit)
  discards  fe685b92ecffdcb889806b0fc882d3fe75244b59 (commit)
  discards  ae723db5b4b4a4152547eae6166cbcc073767512 (commit)
  discards  42eb85d6c7bfac664fee8df62bf0ccb84b8e4e5c (commit)
  discards  c2650e5588c8ce19ffbc3f861ce19f033c2eede3 (commit)
  discards  c709ebb08e675fc4603187cd8a125a6b8f704436 (commit)
  discards  7f7c996a707e206c8cd87bb97689b77ad249e114 (commit)
  discards  fcf07b5ac180c78f5d88d3aebad2120844a2e841 (commit)
  discards  7589b5fe25daa4fc154ae0ea6999e6e89f7d1bdb (commit)
  discards  d795a3d51274e6398da4ac59ee86943a5138f6d2 (commit)
  discards  a75bb8377e228107917135b06a1af42aec1ecd52 (commit)
  discards  38ad671c4a5ef9e2346893b7dfa37a8a67c16c1e (commit)
  discards  caeffcc6b43df91f09fe3502454119148362a543 (commit)
  discards  6a5da86d1eb53526ad48724cae6ce23151f56e0e (commit)
  discards  0d348d07e683e97fde1e881b18dbca32ed3a66b2 (commit)
  discards  ca646585aa25396915e4ac0411c2e166abe24c6d (commit)
  discards  3c62239543d57cdae883463c73ddcb5f5a31c83c (commit)
  discards  0538b325b4884c8b722ae31ea43b8c8cae113fcf (commit)
  discards  656ddc52c42f8fdfd22d331ceaa669c479124555 (commit)
  discards  ddfe463d8f62641f2e80e0c5cc0cb78203ea63ac (commit)
  discards  850d020125bddf09624713a1c49fd42030b04ab1 (commit)
  discards  65af84b164be876c455e818d4342d6eec93833b5 (commit)
  discards  51917aca1dd43b5ae4239b59380000d920c3cf24 (commit)
  discards  b9c7985c75f183b028feef52a9f86372fd0f4694 (commit)
  discards  bd8bec2c3d863e1030543591bf8586bebeccab59 (commit)
  discards  fa90abc1783d5a65dbf4029aa60a1ec28e68b71e (commit)
  discards  49dbd156c1c4ea2f7a97a6ba7821cba2595fe37c (commit)
  discards  88566c0c4e7d0fd8651794dec4bbdb4506cbdeb3 (commit)
  discards  410710a869259e9b0f390f652e4d4dfc51c7ed41 (commit)
  discards  4fad797618cedabeb601ef458d1bd435ff55aaf8 (commit)
  discards  407677ace703e992163b4d9088d30eca4951f852 (commit)
  discards  6163e7f976039479837c18fa46e36779e83945fe (commit)
  discards  4faa9d39ad49f942c231b60204d9834cf94256ca (commit)
  discards  642dcc7d55072c1de996aa15d40d3673cb444331 (commit)
  discards  28ca22320782278dc423d55a8c426122064ae1d5 (commit)
  discards  8d106ff43bf3e75adcbf2618e50b69e5f0d71029 (commit)
  discards  05765722c40adad41b758855b47a17a74193cddc (commit)
  discards  895bc35c76bd9684e30ef29af5608e497392995a (commit)
  discards  661541c4d9e363c1785299e359588a82b97d16f5 (commit)
  discards  6f4b103b56e280a162ca544a43f47abb3bf3f1ce (commit)
  discards  1f8c14286538290277c81761e7109479d6e563c2 (commit)
  discards  174fad7a7c9546fccd325eae759c32f6fd5faffe (commit)
  discards  71dc34772b46734636a9f83f116908bbc666a131 (commit)
  discards  b4812c7c9e03f46b40a0dfbe9000dc87832cb6ed (commit)
  discards  ee01a24ede9a83c9f72eb1fbcfb3fbb621078bfe (commit)
  discards  7500f92f52b0026a0a56b80acd301e319c36024d (commit)
  discards  355f9563bdbeffe6f552f5f578a6fb2a2239e9d7 (commit)
  discards  0b2ef5281ebbbfb1daad42b5a427ca70431ac095 (commit)
  discards  da8512dc174a42f6b4ac949b27cc789462f7aba3 (commit)
  discards  7634fd7e72e85b5573fc33059fffaaa03da8fd37 (commit)
  discards  59e3569c7280aee1736e141487f506e423c33948 (commit)
  discards  7b307f3eb0a5cbc044370754a6b5883bf22c7e07 (commit)
  discards  d275eb11df7a090b5fb42882690783b5296619c6 (commit)
  discards  9ab6fd968501383f1ab3e54a28ab3c51b84b47ac (commit)
  discards  4bb9d1e3dfe398e2835387cf1dd0b9c753fbf7d1 (commit)
  discards  53a30cbdf04d7f04097473c451d1a5a1bfbba506 (commit)
  discards  b37304eb1acedcd57c40a0eedc6c93e5db21027f (commit)
  discards  b8f3ed834c03bbe4a1eb61041f6c650f31601743 (commit)
  discards  ee51008df2b4120eac0ff072090d528174c3cfd9 (commit)
  discards  73bb00ad863be2e54cce4abe43f3e24ea2c5a720 (commit)
  discards  9b7ab08044e7d024e225efb44835153f53c6c1dd (commit)
  discards  4daddae7099c3faa18c7f7aad8bb363b70e9623d (commit)
  discards  5c02d2be180b8e0b16206cf56ac41324435f0188 (commit)
  discards  44262347099d0de4dd421a15e647a7fdb33f83ab (commit)
  discards  00eaf2acbc37a0e514e94f0180e9edfc6e804f06 (commit)
  discards  41a41e60fdc05c31ce5fafb5b2242fabc207c4db (commit)
  discards  26883b20debd5facab0eb9a2baa08b98a4df1eb0 (commit)
  discards  108f1c46e6ed1e0046dd6176e8a11a3ce582bbf8 (commit)
  discards  700ed02cc88ff28d80330cea7543a7220c5f7409 (commit)
  discards  ecfb1d6137b547f9b3b9fe5517a8aba3c177fb97 (commit)
  discards  7c335f150524a219f44023eeeb353c6ae5bd67b8 (commit)
  discards  adfba79088fa3370fc9d77082e0aaedf045851e6 (commit)
  discards  6351880c2aa815f389e0154ab41b7138a5cbf6b4 (commit)
  discards  d4c1925db5fb501cae4df7dcd2e3fb30df0b26a3 (commit)
  discards  6016a5c7e1b69b9f3160dadce91ee405b9480d1e (commit)
  discards  485812417c68faf3f124a97aaf615b998eaa2288 (commit)
  discards  1ceae33a983c03eebf9d4472ba4261599784d836 (commit)
  discards  de07a7c8103ea39c2ff35c3ee7de29f078c9aa8a (commit)
  discards  b0ef8f0c97b23e65902eb93be9f0724cbdc42ef2 (commit)
  discards  05910c42abf0a3aa5d6c2094714623a0aff1b048 (commit)
  discards  b20ba217545415f7be5d85f12993d1033e54041b (commit)
  discards  85f6c64358e1a1077d01b77b93c09d8d964375c9 (commit)
  discards  bf7096c4adc4e1642353a57bfdec509693586697 (commit)
  discards  941a1dfb85a96e778d666e4d823729d292a64d20 (commit)
  discards  e2aff06b54545512f0b0feee24dd5f9333a53eeb (commit)
  discards  fc44c07b9c0ff06e0810e3547c6fe661e786d4ba (commit)
  discards  54da94ad01f457cfab41c3e479bba083a67ab552 (commit)
  discards  797dc0cf0d3f1fba43a9689499c466f09ba2900d (commit)
  discards  b69437a25d0132cd153d9a037207a440c9fa4815 (commit)
  discards  9a96401774c4afc6bc12cde06cf6d6306b2f5b22 (commit)
  discards  4703cca3e907970b2de37a75c7eac023cf40d61e (commit)
  discards  829bf431cd87375ae774d550a7a1d784b65a24ed (commit)
  discards  5b5e6734955f7f6c948eb7a99af3d6ce82586c83 (commit)
  discards  d695130d0a9f971fa3fb9ccd009b4399cb95de93 (commit)
  discards  721cf69c03495cbea80442561b354bfe5eca70b4 (commit)
  discards  2787738b1af12988e5d6ae1bef68fa7afefc4d40 (commit)
  discards  d703c9bdd288935967fb424535355b1c2cb2024e (commit)
  discards  50c85f8df978c864170024492e19ec68b73e631b (commit)
  discards  f1dfe06fe4997b16024e33d541f23bb06b4734e8 (commit)
  discards  a63d44a18e1b3090f7f6c50d4fbca8fdc779a7cd (commit)
  discards  ed798181b088d99d1e6dd4c29b756af6d6d34b22 (commit)
  discards  ba7b2ef617445a14352f87c9eff9864b2d34a667 (commit)
  discards  7cf7cc664af24a7ca8e74dfad2d655183e0f85e3 (commit)
  discards  eaaf5aab1a9c286a3d7470880e0c1590fd6bb9a7 (commit)
  discards  c8dbde2a28d518a59867d116ebf93ed4a8704a1e (commit)
  discards  aec4a3fa6c2185a166377a27f08aa6a7aea8f13a (commit)
  discards  bc08c11db52548e4ccac239d3204b83256f3fba2 (commit)
  discards  a9a2dbf8dbdc3935ceab3ef560d4185503c98ead (commit)
  discards  62809a37acf2da6d452c49aacf6963aa60214d02 (commit)
  discards  623df63fd4d87bb03cea55a874a3b6cec2deb1e6 (commit)
  discards  d35bb00a0232595417de3f4669dc8380a135ab66 (commit)
  discards  5895f5fe2efb241e2fe12a5327fa193c2dbfce48 (commit)
  discards  e33e646f3cad70b68ec9c47b9da3ce5c991e87eb (commit)
  discards  aed26795976e7c81b15fd89ec23fe0afe8c47593 (commit)
  discards  446f851e1e87e24b0a60601a8fc20b52f58659d7 (commit)
  discards  dc9a621e83c391d80274d6f99f5098500a0bf88e (commit)
  discards  48ff2e8cee3b0f28f2e65b59092682daa3930c45 (commit)
  discards  7650c1b181904927d484fa41c2e80a347639e23d (commit)
  discards  f4ce62450e1952803947eeb8dbcb00ada9d2d3fe (commit)
  discards  6961e240b4b856326ac91ecb37169c71277cd597 (commit)
  discards  feacb0fe45bdb67fa88fd5ee16031b1552e423a2 (commit)
  discards  0ab8227656129842b8458980041c3d11b78a70f1 (commit)
  discards  41b39919f8ec6c50d5a009337d340f2a088a65d9 (commit)
  discards  fec6f0b5b3866451c68bc9da7eda95fef58e25d6 (commit)
  discards  150932e57a7db01bbcf62d5601114d8d5057f3aa (commit)
  discards  8b5991ea9e5da7aea8fd2437bb980cc10dd55e69 (commit)
  discards  04fdcfec6e357be7a17ae0c5e741472fb8a337c4 (commit)
  discards  32eb91fc491e33178c95e7532e9d1987ed0653ba (commit)
  discards  cf9070e1601fed0d2d0a3d286e2c58e731f851bf (commit)
  discards  a785b969514ce61d9298050f8758e7c064cd1feb (commit)
  discards  9fc3a06c31fe89f9ee3cebe9d4f971398a366633 (commit)
  discards  652e4a00e7e0da981915e509baf69c74a93e3225 (commit)
  discards  025fdb46f909cfccb003ac3ae6c69b2e371fc13b (commit)
  discards  9072a6898d628d13518eedec5bf6496d6c1cde78 (commit)
  discards  467662dee413f413049d036446023606e067144d (commit)
  discards  5528f24229ee49e2bb5fab3e7b4e4d117099021f (commit)
  discards  a7cb6054223c6717c1c49378bd7446e12a5000b5 (commit)
  discards  017d7c3c8c666fbb5c43c266e7af9957cf710f6e (commit)
  discards  3ec60de0889433dbbb526f8ff916588a188c5746 (commit)
  discards  c74d1e84a8070c8d0220d3a5eec2df20b0d02af8 (commit)
  discards  990b063d7ccec6e912acd951f4cbca70d31548e1 (commit)
  discards  109d9a8cd63f604fcf0e668c6e3c2426c74ae5da (commit)
  discards  a54d83b3219f774e1382ba038e411b2268ec572e (commit)
  discards  889c683b0315728adb5de3c622863b2111d6f99b (commit)
  discards  8a742485fd29c0db0c0eb975fde6116c8b1e3756 (commit)
  discards  b2b55d49dcd0474b12bdc175d1852301440935c5 (commit)
  discards  98216ea8037650a284adcf4f7c314077ac3346a4 (commit)
  discards  d875307328b9b04481d9e3466449ef31493dfc41 (commit)
  discards  4bff21c3d53e0a8197c0654e9d5e5cbbc9668a69 (commit)
  discards  d7952dc486a91974f61b00248e54ffe7b61afb6c (commit)
  discards  1e893813f96e08ba939b5278af32dc2ffe627534 (commit)
  discards  8a926e6a7877ec1544a277698fc77670fa7c7a88 (commit)
  discards  c705b7f9c498882e42a43670082f96a449c99cbf (commit)
  discards  939b7ce4fb8fff3384edd33d2f993a36320b5b39 (commit)
  discards  f447c3ad1bc5f308f2f8109aec3c3ea45e9c5a26 (commit)
  discards  5883dd856c2c9621d1d542a97b305f25840e176f (commit)
  discards  4f00f245a4edebe5e71c35799cba02bba388e3da (commit)
  discards  e5faa735a4e8350da0eb71566e28c608faee1631 (commit)
  discards  861c7fa5d154f548f881fbe1a91a4b32448d680f (commit)
  discards  487998e19c905bbec06f908e830b0c8a54ed6ecd (commit)
  discards  acba575bef8e7f2f841cdf0a6d0634c4584b2fb2 (commit)
  discards  1c3cf0e98be07bf118f81886c492a7991968bac3 (commit)
  discards  5f6476915690e0c21429f9fb4f0dac05ca0f961a (commit)
  discards  44a0ffb2c5f11f7d3d0b6653de138ae19a1911be (commit)
  discards  7b9e7f815c192d8302592a3c486998f3d0f145dc (commit)
  discards  96ce7525d5f710d3ffed07b9e8d51c0662902a17 (commit)
  discards  17286b875d478719ce52a0e550c58ee86cd7c865 (commit)
  discards  eef78202042c69e102612aa158b4f070fd0e87b4 (commit)
  discards  99835e1e8b96942366275446d67356edc24d3f49 (commit)
  discards  53d1e3a5f07f4cbd977bfaec4b4932eae2a38f97 (commit)
  discards  3c807ed1c137eb01a6475070c9d0811b3fab54de (commit)
  discards  342505665bd8bdc82ae5ceb3429ba5625564669a (commit)
  discards  764b578d06dc02c9a2ff350a231de903933a1b0a (commit)
  discards  cd80dc58e67eacb7e256670cd15962a624f76bd5 (commit)
  discards  3367e6de2c9b36af963b25af2b778828598ec948 (commit)
  discards  af12181cadb48791c21269c2717011ea098dc3c2 (commit)
  discards  335f416f9c80152c6a644a6c208c15cdb6169ecb (commit)
  discards  30e0ff91b34ca2339625d10f9c921a7adb009199 (commit)
  discards  278fc065365dcb78dc851f4a57aeaf73a737986a (commit)
  discards  d1490ccd6a4b7efa10e337e8727fb115e6ff0ebd (commit)
  discards  4dc9ac8e94e6bfae374b98c6afa3efbb6ca76d58 (commit)
  discards  acdab825420512a8bfb5f337faa4a7fe7ded3279 (commit)
  discards  27e9e847d18de8df5ddafa72d6db80e9b657fb45 (commit)
  discards  dd58a786fc59a5248f9061c27db546ea0bb67aef (commit)
  discards  c4b0c12aa0c4745f6995b52c55deb7527a52f43b (commit)
  discards  39c66ed71b96fdbc93215ffd6aee6bd2f3e683cb (commit)
  discards  ea660cfeb3d1f9f0fc85e226563d93162b043f83 (commit)
  discards  57eb391335197a75d92530bfcd67ea4087d98066 (commit)
  discards  135fd90a2a3e1f6a700ed59494ee2b54b9d3662c (commit)
  discards  236d0c878cccdcaf5fd49c790c65340fb89a92a7 (commit)
  discards  ffa49bcc1163e22489e67d4204d6371fd68372e5 (commit)
  discards  b49af13bc15f01dd45f05c331e79d56dbd185d09 (commit)
  discards  fb74a6fbfbbf235ce1c34323825b703ed453af7b (commit)
  discards  97e993b0bd69af48d664aa4e77e535d3a85d4bbc (commit)
  discards  a17fcb54600b756cf8e62aaee55dffe6073fe413 (commit)
  discards  777f74f60c58d0276ea3ac68258b2d51c54b2fe0 (commit)
  discards  dd4098e1f862f2ba054014d12757fe637eb3225c (commit)
  discards  bd1bc930142731cefa249d3df0f87e3cb8ff575c (commit)
  discards  3c0aeb32f79f4255ad28b4263dcab1f2dd755301 (commit)
  discards  edfa7aab959aed803075501633a9a3ae2770f028 (commit)
  discards  1133a57d714ed7ec8fe39c577cd80aed02dc7c4a (commit)
  discards  0be087e620e3993145474bb8ee30cb7811d0f83c (commit)
  discards  ab8bdd3ba8b14092c30e78a72b599f154d3f850d (commit)
  discards  f1c1ed54aa09398e28a04fca7e88b48f15b4283e (commit)
  discards  e75c8ea26cf3c63487877499252dbf3379374578 (commit)
  discards  c776cbd2c1e7a05b852a2989c5b959867b6f6340 (commit)
  discards  13da15ff0ad34ec35039acfd6a1f3b343f38dc87 (commit)
  discards  db5583de060221ed7af339eb1a9101d43794f11a (commit)
  discards  67384cf24f1431e3db942ab10e42eb79276611bd (commit)
  discards  e9ecfbc0de78bda55e0fae8fe3c0fcab63d6a231 (commit)
  discards  ce9f6273812be91e47f61a86b676e17f9b2c30fb (commit)
  discards  cde1bb24e240366fd2c87a4918e1121045ee442e (commit)
  discards  e96d5ccfab7cb87c199f6aaf9c7f41257855f897 (commit)
  discards  34c4e62dc7fd782e916dbe512f3caa863a8735c6 (commit)
  discards  edcbded42e4932285a0a89327dc383704da3fc4c (commit)
  discards  92ad27b0f20fa1bc6e93582b3dad1766f89db627 (commit)
  discards  7668615cfe6db836a6c5b8c6e5971a6063887148 (commit)
  discards  aae70bca34411da0d5f147bb177159497070f834 (commit)
  discards  dabaf75fb5182c34dd8f55497ac02ce4478700c6 (commit)
  discards  c6199c5223bec8fbd36ce3f9809bc341a6e30fe1 (commit)
  discards  b4346c10c6f407b069c5db7ace6d325b83404c1c (commit)
  discards  8de75f13b69b5e3498330e3f0d509bd66e340ed9 (commit)
  discards  a403754fe0761fee9e60e185c003bcef04c719c3 (commit)
  discards  94daeed95bbedf1bf341775eb1f0e0e1def12270 (commit)
  discards  0965a0f01819c0e1d727ab1ee41fbd8123c7925b (commit)
  discards  38802dc00af0ea5ffc8ef224bd42bbb54d410b57 (commit)
  discards  c990a180a963ca8f9df769f84533cb2fb0199750 (commit)
  discards  dda973be563bb45ca65670c4d4115f26f5d6a49e (commit)
  discards  f4b3e6937ee6bd0588295b212a96d8378290c2e3 (commit)
  discards  5cd18731aa5216246cd017372bd45b8877194572 (commit)
  discards  a44294641e27c74657665079147a41b81ceb3372 (commit)
  discards  ff07a15758b434369771229ca2a664496d8d4522 (commit)
  discards  046828185e329b07757141b759e9a38393e64d2b (commit)
  discards  f06bf49a9982f5adc55406b8c510c241489941e5 (commit)
  discards  a382e6004e61ccd56b12f3d4ab3c4c08fdb4d777 (commit)
  discards  d6c55abeac4d100edfa34fa2db5c50822f343705 (commit)
  discards  84fa667ac294544aee9b0baed03f49776d6b1d1e (commit)
  discards  17f2053b9dbe7c23fe56fea0550bd5dd19ba510d (commit)
  discards  261a06e8ed0fd47ceb7d38cd3f64061a6e5ee876 (commit)
  discards  a0b93d7dd06b94731be61a639bcedaecf5fe7192 (commit)
  discards  f85156c9061bde41d50db94fd4f5ba8c520563a2 (commit)
  discards  c20ec207885ed72d331a101ae7e7a37767268a87 (commit)
  discards  28dae13cad1aab10fb7c9f14b1b417038dd0c144 (commit)
  discards  813257d9aa8fa07d261f77e9349c8f2f11fd3efc (commit)
  discards  5370578b13372d26867d41c5e372af4f52a0167a (commit)
  discards  75b8f5923866c9ce9f47a35574dcdd332f24b9dc (commit)
  discards  06bc75835a2fee9dadd6a2c0c0988f97c3316324 (commit)
  discards  ca12a9763d13b8a2ba6dd0cbbff15a277654f120 (commit)
  discards  4c3f5201d75267e4f24d7dd61308457041d3a4a3 (commit)
  discards  bf3deea7a7a709877500743304f7185789234877 (commit)
  discards  3352c05b873c03505d877acf7dbc922319e1f6a2 (commit)
  discards  20bd919dd9d9f4f0f79054f976b50eb0cd272217 (commit)
  discards  c79e901e0f3502bd223a96366919aaf257631881 (commit)
  discards  534c69261080277d213c3e344987266a92501363 (commit)
  discards  71ec1d16980b2ea507536976a098d7c246a663eb (commit)
  discards  12084d6c9159f5efe69d9f600fbeede4b8b150e1 (commit)
  discards  f2243ff0b724e907ba1db2be2130f0cdaabc02e7 (commit)
  discards  0a3e091f3be9f882c6c6ba1255a1cfe52881f589 (commit)
  discards  60218d5e51cc31fb3179434bb1aaefba910458bc (commit)
  discards  8345ddb7ae431c6aeafbd24a368886b70e162bd0 (commit)
  discards  be2c3ac78174ed0a9d5b23e51719cc3ff220ed3a (commit)
  discards  3b39c774d7a62c7e21c40f9b2256c31faa8e3892 (commit)
  discards  cc13bd844230d6cd50d244f0fbb46676d4d2ab0b (commit)
  discards  96608c4fd230f3ca50b0f68eb75c0cedc0507228 (commit)
  discards  8ffd8b702415904a3a90cde5c6aaa06678a17635 (commit)
  discards  122cef7ce4290f4163d56215babf7eafa5142249 (commit)
  discards  137288283063480d7c29ce7d5127a258ad9a67c7 (commit)
  discards  25f91c6450f1bc569465af9183bc9ff58f1a503f (commit)
  discards  87c968015515351aacbee47779194e1df43b512e (commit)
  discards  8bba38161855deaa90fe72057f6cd4564110d551 (commit)
  discards  56db783f0c5e882d45c6f78f5d46dbf3f1c09ae4 (commit)
  discards  9e514a10d87fe26eec2920ef6f5b4ce299b6c8fb (commit)
  discards  40750a723f63a3f638fdfd80f94fb0dcc6db482d (commit)
  discards  d6567095f48bf1f9757114326b70c972333ce320 (commit)
  discards  990175e47f2ef5da5723865f9bf627787a2f0a8d (commit)
  discards  db293e1ca64acb9302b6ca660e94aee305045055 (commit)
  discards  c7e52683d35883c9f7f46574bf357d0c7ed3bb7f (commit)
  discards  3f421206324fc57cfda97ef50e57e0c8c3ce1a40 (commit)
  discards  e571ca8dbfc6f8462e3d9a79b90a3546349b5cde (commit)
  discards  dc17dd894a3f21ffbd9bcb85a86aa42ee7879ebf (commit)
  discards  3a9a73e5844742fbe269e682723c39a15497b740 (commit)
  discards  ec86e2d16bae7fb7e7398f6d5b9d660995cfbb10 (commit)
  discards  258b54be2e083734d08962b84ee30b4e83f02e9f (commit)
  discards  4eb34e13fe4c24ac34330b1926fa045078389070 (commit)
  discards  6f6d630f4aadffa5320381e92fb79a0ed52e177b (commit)
  discards  5ae13355efec27b1acb6e65bd411bb2c012fb952 (commit)
  discards  eda08400439811a938f10bd7a9f662166e78dad6 (commit)
  discards  6de9d59f46094043c358d0cc5aa5a7b532bbecf6 (commit)
  discards  f62af7fd49da2d17954013cc9a6c6f6365e0db8c (commit)
  discards  edb26a9f31cd65f210291d8c230ac05aabfae2d9 (commit)
  discards  fbecece01a35c39504d190af3976b2e861745862 (commit)
  discards  1cc5d81139a9ee92dfbea04eb91cad9abcbe622c (commit)
  discards  3bc2cacc230c3270883eb05d7398f27036ef33ac (commit)
  discards  370dc75e6eaceb724ff5b1a83c832b41f837bfbc (commit)
  discards  88b6e4ba51e263de41888e9b4bc1189462ffe0a8 (commit)
  discards  100bc579214d7775414504a9fd4d1de76ee83b41 (commit)
  discards  cd42577b23fbda05bc2420ffc7050b7dc1dee5d6 (commit)
  discards  0899a4839407960ec19d421ceef03a3dcae42339 (commit)
  discards  183950101b44830bd458201dae0e9c2c7762ed39 (commit)
  discards  bba9705e96ec3f97a25a4f7029f79150785e2003 (commit)
  discards  214d354dcb9a170500a17c2213e4dde7f903ec1d (commit)
  discards  a97c15173c9127b67c0c91626332878f0bce77d7 (commit)
  discards  7e8c54f2d4d98b82f16dd15d02026691e8ae052f (commit)
  discards  be4c0c959ea29d10e321b4801dcb9555e1da3231 (commit)
  discards  6414e0d35afb185d2255f7a55a859ce0ce52f474 (commit)
  discards  05b2bb94d9c908bb2c37bb9cfd74a6baa31c4b5d (commit)
  discards  2d0f1ec2b9b64b3100a80b1592ecc50b5d030395 (commit)
  discards  418bf735232b57a395e8965451620f77472f1087 (commit)
  discards  df37aa761a8904bc228b8567e0628672c6cfada0 (commit)
  discards  591774e3c7f1e566323d9950c0eebbd67902dd11 (commit)
  discards  fbe01e78c7cca2d62f001687b3bf753e957557be (commit)
  discards  1ed4ba2ffb51eeeecfc2696136c2372b9a265577 (commit)
  discards  25cd19afe9a109912c2af3116553833e88aca036 (commit)
  discards  584aaa1c059bb65e72b6f692e98de1b3395f431f (commit)
  discards  9f453984d4ec1537e9a75b8034a682e651b3b9c8 (commit)
  discards  2e978198af1bfa1f32849047bb7c792206fb5208 (commit)
  discards  19ef10a664a003fb0bf12e575e021e15857c7bf4 (commit)
  discards  69f0b6d21e6028fe7d176cf22702a90883aeaf15 (commit)
  discards  1756828f2df84e72da330848896d3e877810093f (commit)
  discards  16e597ec9e3e2e7fee69d8b8a150a413a24d0dc0 (commit)
  discards  dda9962f80194e91ab395859ab9caf8dc7c8523d (commit)
  discards  29755e8b9dec5b7ef9473b0ed17e6b0ac0606df6 (commit)
  discards  78bb45601fe03f041adcac56e98acac7b82213a7 (commit)
  discards  4480092c7b19da6e020c2f893c5b08d9acf1ab81 (commit)
  discards  b594522f7b50d99ce52c2ae40e5604bc59093097 (commit)
  discards  b8441bfcf23ab38367bcda8ca9ea004a02b1bfa5 (commit)
  discards  71372f0784a5c25b21ab070461730781149eb35b (commit)
  discards  5fb5b9a0ad4e346c94e7d90d32eb3b8f95b7d1f7 (commit)
  discards  aa86b9a9e346313dae56c34b662407441c602471 (commit)
  discards  9f5b65e3f0fccfa5749d24a867a1bb3ca7f500d5 (commit)
  discards  070921f6e04ca45aa74ceaf298b3d0155f3ca926 (commit)
  discards  0b5df0345c38624636d3ec29a8efc254b9d28a43 (commit)
  discards  c120afd24eb8d3e07e941480c9d1081f47c77250 (commit)
  discards  900c349fff49949f0380e094913fd3da4b2ebc53 (commit)
  discards  0452db7c106afd86139b90690d205f4f4b066df6 (commit)
  discards  ed8fba843b77d17f5d3b320ef8d31418b97d07d0 (commit)
  discards  a0b2da07794db73b54d370720d4f44a1f607dd18 (commit)
  discards  2bfca5803250de609c158c8f1c5c7db4c86a883d (commit)
  discards  00204d5d621b06ebf5094d8e7636cd5269365698 (commit)
  discards  020324f29f9d58cf5fef7a3c09aac6b81bc6c930 (commit)
  discards  d327bb19f232337a1492638617097e1d19f2d6d7 (commit)
  discards  ac9cfbfcaf1081272fc1f4cc4a90b7b724ea9bcd (commit)
  discards  a9e20794cf660b2d7aef399bccf1b60f5cfeaad7 (commit)
  discards  a5053694a6e81aa78fea96ad4f3d247c71faade4 (commit)
  discards  34a36eafe1aa71a1672e933386622b9c6fd68846 (commit)
  discards  06ba9bf3f9e191daae83735f55c20f269334af6c (commit)
  discards  a7fe9e746dbf363a692ab285cf15e0aad74c44dd (commit)
  discards  2a5d1c4b018df139dec3a99a4fc67ac0a70111a7 (commit)
  discards  b71ecfb867f90c0f29f3ad9e0636b51726419bde (commit)
  discards  3d809d5909d79fb78afb61317e8c2df0ada99d81 (commit)
  discards  18adaaf5f93dbea14c98a77305c876806c6eb326 (commit)
  discards  1e34d70d79927b9ed68111528bdde02cbfd1afa6 (commit)
  discards  9a920b69d548faef12d7cf9a5d1bc2706e1e5e5c (commit)
  discards  6c634a5cb389b9576da94d9e42ca9392651ec22b (commit)
  discards  548c7be76d4c6590175c190ba3b1391bcd5e7861 (commit)
  discards  1b7c74a2abca1d6f09abc7f84c63ad9eed311c54 (commit)
  discards  c7f575ec1d221aba0350fbe92b8bb1a10d1123e3 (commit)
  discards  f726493f91a61c28faa5eb526ab8c7f26dbedff2 (commit)
  discards  a1efdd8d0a65e98833cf3209da378250fa096c3e (commit)
  discards  3452847e1ddb24d36048575d51bb5216af036ace (commit)
  discards  c7fb8d364b6915cd603573fdfb4670c88d728050 (commit)
  discards  c453fb77986632531d7835e4a4e7433edc004206 (commit)
  discards  57e8b86866517c1fdc75b93fdc03b791247f95dd (commit)
  discards  147278046f9f2200de276c84f61cde9ec0a5b2c4 (commit)
  discards  0144470b71bd9c1d0ec138ebda9cb28d8b762009 (commit)
  discards  6eabe4d0f9dd6622c7dafb5d6e8838c227f721d1 (commit)
  discards  f1fa6eb9c12d28f0d5e6afa23e012856238cfc6b (commit)
  discards  aedba1fa998a01fb483062fd393c10145219e7c4 (commit)
  discards  5b47c32a9d7a67fadd904a4f41c4838eb79a04c2 (commit)
  discards  7276bd8fc3bf055c27e34751c3df052a3ba42a8e (commit)
  discards  d388bda78fb01e6a8cebad0464cd7b9eefd91eef (commit)
  discards  97f178f061a21fdc060d85982c68b8be5a088858 (commit)
  discards  56616160de37c1a2cc5fbcf4c9714db3ca1e5422 (commit)
  discards  85045836c29eaa58efdb4c01aeb62d3b44290cac (commit)
  discards  d11a8f8c13225e05ec0bcbca4f174f795fe35a44 (commit)
  discards  761bc9f27850eb9425d8d222a3312007cdc24908 (commit)
  discards  b5061d40e11d93a449736ffa0b363a36bea97898 (commit)
  discards  7cd1b9bf75fcac42b937e5aae4d3f5a6a61fcb4e (commit)
  discards  312ac7257eacbe909f0544a8e9bce3f11f404a26 (commit)
  discards  54df2294ed54b2b6746d94534ff6584371e9d082 (commit)
  discards  5f3322884cc5903d3198f760191e2990c361330d (commit)
  discards  f6de0b5eb61b389758505ccdeb2005b35cfc0a7e (commit)
  discards  0d3deaa1147303b30fc4e5339ecab36f2df62264 (commit)
  discards  a9adf6ad4b1300a805dca29fe8e09d4db3c9fd73 (commit)
  discards  96e332c4324bd7a129ce762062dcb468762e385d (commit)
  discards  76e41f6262ebabcc7e60ecd8112e09fa928e07db (commit)
  discards  2cfa421ac245f83e98783ecb677bbe69def1e1e0 (commit)
  discards  55be5992cf539fd56bf86a0c588d7e98d6be5ac3 (commit)
  discards  3a7edeacb08fdb8f2ab82842b7de528e7f637d36 (commit)
  discards  2319702021e7a5f34bdf2a5267d13c779ee75762 (commit)
  discards  3777c2c7db091f6cfcaf0b6f2a2c212a4a2a4e36 (commit)
  discards  2072cb81f822d5ffc53f9daba83a03d8c4266207 (commit)
  discards  37c5883963d6fc396a6a71081109ab1b47ead9a4 (commit)
  discards  8b355d64de0d1d899a0c58a12285b7514f8d8e18 (commit)
  discards  8833206e35bafa04a2264e3e60061651e4b41c2d (commit)
  discards  f98c15814512d7e111f8ac738cedd39d1bfbd9e2 (commit)
  discards  e0d8912dea950faf8d3ee875896d2ad2197b6e73 (commit)
  discards  e51cf4204b190f9e85186b3552634bb7bc22f76d (commit)
  discards  6c3e3c1fc60759f3818201c63b897babd9884ee7 (commit)
  discards  60c5ab9ac8ae09d2eb65bcde93040b9bc0fc5a78 (commit)
  discards  cf0d9e84916ebbcd14fd3df5fd8b9b856c1edb5b (commit)
  discards  b1dfbc0de54b5721e073d8363aeb4d8f4fa09ed2 (commit)
  discards  7b5da14d074e365b812802b0b8c1be8aedf770fd (commit)
  discards  cbda3a77ec426b6340d705eeb153f53346b53191 (commit)
  discards  def4979cf2be3342b9e46d44da13d2b51670f685 (commit)
  discards  c1f14639867b912787d16f431bb658b93e176a9c (commit)
  discards  dd14c5a9066f47297b48d5b204568362de1880ed (commit)
  discards  b63bca8e0d0e69aa2f936a54d5c7fa65684d2f1f (commit)
  discards  074fc2292eb52f4df17c4b81448e17e4ad3528df (commit)
  discards  28f8d0dd27a6d2cb9bdd743d728d00af1a9830ff (commit)
  discards  9c2cc86733790f2c8a8b585ea33ca9f594c81e27 (commit)
  discards  b9c9643a979378511a4f758afe66b3077ccc7c76 (commit)
  discards  f13b405afe0b591194bdd0c36cb96d4d8dc5bdfb (commit)
  discards  fc5b6913b9abee1e56568f380976c0d89abc4691 (commit)
  discards  51b3fa391ff71b6aa5e5f0ad714f59adfd1d13dc (commit)
  discards  9ee6a717826db91829196a59e02bcf73d216bf87 (commit)
  discards  dd94f7c8233489388b5aea6418bfb8002ab855cc (commit)
  discards  fb08194fa34fa33379de6c01cf72278d1da4bf90 (commit)
  discards  95b3b096474932430f04433fc61a422239333b02 (commit)
  discards  9ec446a86e5049ead95f35208f8844a5b1c817d5 (commit)
  discards  bfc4b17aeb9fa6d2843f655052ac2c1a563bc25f (commit)
  discards  7f218113baea90ff726b2f72be85242d038a60ba (commit)
  discards  94c538fe4db0eec3c5f059f57882d47f8cc4a272 (commit)
  discards  123ee42138f6504467f747a25557127c4abb210f (commit)
  discards  73afe27ebd5bbd8ec0d316e0a951661d566ccc85 (commit)
  discards  21b8306d13ae7325904adccfadcaf60aed79a1ab (commit)
  discards  c3c63f491cbac00a656a3a3e395e6bbbfe0a3434 (commit)
  discards  2a9add9a2b15937160607cd770b1adc93d5594f2 (commit)
  discards  e74ca4050fc64514c0f3bf43027435692afcc9e7 (commit)
  discards  5813172221d7e1c19f458dae00fdfa5b19a7df77 (commit)
  discards  97b312626263f4d1af3769a5cdd93e7f8900668b (commit)
  discards  70afd657ebb9c578502bedce52b450d604eed1c8 (commit)
  discards  5008f9da62218ba204dc0f1161d8ef39307fe061 (commit)
  discards  c669312b305c6a2cff7f914449513a88c0ad5d4f (commit)
  discards  0246f32c2e9f89287b223becf86185ac1488595d (commit)
  discards  2f6a32d4551894eb60107ac93da8db086355a410 (commit)
  discards  e60d07d8987bcfd41aa58cd443ccc56a61543eeb (commit)
  discards  d9747a8a692fd2129cc13a7ce320b5a61bc3d6e8 (commit)
  discards  018444bac72ac1672f9886449cd53745888e9d24 (commit)
  discards  8b10da3c7437e7486b0a2661c9439e58c94b0bca (commit)
  discards  4a844a8df23ed6798884a655942f9ca700800520 (commit)
  discards  1c85c606fd9c5f39ce8ab254cbc7b631bd250271 (commit)
  discards  f2ff942e6346e0e689dec36f440de3beb512f799 (commit)
  discards  fd329307b2ee76abaa41e25a300902a2fb983895 (commit)
  discards  7ece74108e1d0e5dd859943f831794a745a657c9 (commit)
  discards  8de3f22e8fe9e798b63eb00e35eee6404748d3bd (commit)
  discards  b9196b94711e082704fa775db5edc8688644e14a (commit)
  discards  b5f5b58d179e6ce8fcb783ab0d5bcbc2a7dc62ee (commit)
  discards  5d0a04f09487dacac5520c6e963a64cce854d2bd (commit)
  discards  7d6c29fc162f8977700c590f868800779de2594f (commit)
  discards  ff8642df721b583ce27fc20292b536f86844b785 (commit)
  discards  0f76fd1f9d731735044ac68bee8dd8f0339dcf65 (commit)
  discards  58c525941389eba1da655bd70889527ab204912b (commit)
  discards  33afee0d69b63b69469c791c01f23512c0ffe38b (commit)
  discards  5177decb4703b91546819455186f14c9d9e63855 (commit)
  discards  007b0452b5f7e536f1f88b30bcc5331227cbb098 (commit)
  discards  ddb8b42422de110b7124f44adc842d3268e4d1d3 (commit)
  discards  be2007b08096c2ca1323141d07811f8018151e24 (commit)
  discards  c33cbbd852f384883a56a027c6e7b96642559db0 (commit)
  discards  56054b1982748475a350239ae42d99af0554242a (commit)
  discards  52d4ff49d973d77dba480e0b60b08c6c70e94538 (commit)
  discards  9b8ba31802a3e89b8aa1f34b3dfa7521d47c235a (commit)
  discards  6e977a761af4f38ad27dbdbc2e3777c780fb494e (commit)
  discards  4d0a5c05cec02e9b0ed8987621ae3a4f6a3b2428 (commit)
  discards  66c9ae6c7ea88dc65c5923d124970bf8cd6c4f3b (commit)
  discards  abaffb10fb67e3e16937518b307215f44da01051 (commit)
  discards  1ec61b9ae1e107567553ee4fd799a41fb266735a (commit)
  discards  7aba88cc18f2d1b46a210e4132f04798feb5d93e (commit)
  discards  dc834a64ff36cf9f7d8863bcb26862ca00c602e0 (commit)
  discards  eb754045d93a75e290905409071da88c8cdd49b4 (commit)
  discards  2b14fd9b2f2d19fd5f44ce8c3047125233c01943 (commit)
  discards  727980e93918d8df3847a17c608abe49432254c7 (commit)
  discards  65a39f05ac1913daa08173429f76f6df60e07502 (commit)
  discards  5216c48224a24c1c3d59b3535ee9c851c6c19636 (commit)
  discards  3fba119f099cc7d6a1597d5bdc112c8f79ee0bcd (commit)
  discards  c0dec596d1fadce47a9188a2a7f1b53c62852b72 (commit)
  discards  939198a53bb6ad9a2600b357fb69a47f8d344cfd (commit)
  discards  2890d2caa2a4c95518f72371bb57fb959e97419e (commit)
  discards  76532b843f467e936466e30106acb04e5e7859db (commit)
  discards  625dde5e7f890a840160408c4b494a454e61fbae (commit)
  discards  80b31347051db23291ff0d2ba0a4d5075a0f8c50 (commit)
  discards  7272bd3e60e07879f526b3cd42ae965fe047c62f (commit)
  discards  35eaf58f91224691aa0f68bfb61d866f695db936 (commit)
  discards  07fb7d435dd71aea389d9d89ffd4ef5aa14f1750 (commit)
  discards  dd36560b72a7f3bb0325f29d9c4c7df2c8ed3f46 (commit)
  discards  383c5f1b1956818c4c2f5d4fd19c1a7283a8f7f3 (commit)
  discards  51b7afe48fe8b6256a850620764b3ab090af08a5 (commit)
  discards  ef26ddcdf1de2da802a07b483fe36dc840e8e4ff (commit)
  discards  e77371108755670a8f49fac8059796bb61c5abad (commit)
  discards  0a8ad952382a3ee036173480bd0dd946b15a3eb7 (commit)
  discards  af5d9cd265bea1b7fedffdcd38f94bd9e92687ed (commit)
  discards  1b9675850c4df397a517b7c72448f51c9ef717eb (commit)
  discards  1fac2911e1008224c9c0f0676e0e2b90d0cc25d4 (commit)
  discards  03a66cff114687d0d9e71a289b05a66259853d47 (commit)
  discards  c7d7eef21b678a0949a26fb7b12be8f032a51ffd (commit)
  discards  a240682cb7c71fe241945c6fb67c8e55ee032eb7 (commit)
  discards  f26306d36f7fefcbb041587a6e432ceb4eeb6926 (commit)
  discards  11508b1a5d8fe5b7d136d0d75591a1e846cc2ca8 (commit)
  discards  bb00d7cbca6e7a9f75a6c5094487b9c6468213f4 (commit)
  discards  c58350078e22ec7706a0eae99ae2b57950f12328 (commit)
  discards  a1839ec4124605ff90885bdcae3e06de946747cc (commit)
  discards  943791ec6b6166448216d2c12d355be291910948 (commit)
  discards  3406589fe3acfffc5db95f82220f13e8e29eea0d (commit)
  discards  e8b35676db2949443709d1d819f66f3df15d0c2e (commit)
  discards  8ad33e01d2ed27c9ac136fd19516a21449b4c87b (commit)
  discards  b97c86b5009307e6b089bcc2ddef55d77918f765 (commit)
  discards  2c528f860ff8ea458fbf8ab6c85908aeeaa749e0 (commit)
  discards  ff99adb80d59dcbe8cb0d9dc12db657a2f58be7e (commit)
  discards  29b4f5420922a06cafeaf07c13b5d781790e8646 (commit)
  discards  2e1ea034a804cd1ec61ba5b9817452d49b6d0830 (commit)
  discards  7403759846b9bd34bb425f5e90f6e367b80d1d58 (commit)
  discards  59aa8d878e69fd694e44af3778e87615804ad53e (commit)
  discards  6c02a443b92ba189288cbe9f01589e00cabfb994 (commit)
  discards  57969aebfc5bc3589972b497fc5deb30e292230f (commit)
  discards  b162e9871e8fabacf6f565ad1ced05a6d234e25b (commit)
  discards  be77679552dbda01d62b03a85de05ad7e7684862 (commit)
  discards  5e8b4a718169837db825538561ddfd85cf62be43 (commit)
  discards  c908ba3707fcf8cf43df0c5cd90f8ea6d98d7c29 (commit)
  discards  ce73c53c7a64d31432739f434f222cfa904c1aec (commit)
  discards  edcf86ec3a75e89ce3805c6db371b98b1adeb16e (commit)
  discards  a114dfa05df5936c312645171b741ac8279ad1d9 (commit)
  discards  1a6b7625ffdb65ed0433bfab9676df6552e8e0cb (commit)
  discards  f79180f555b3e92b456fde6a5d033128a47c6d4f (commit)
  discards  6c8e8e6db6e38c7e89f1932874ebb73293ca4f56 (commit)
  discards  85c494047afcdc5fa05965ca0dddf6fd5f44d4d0 (commit)
  discards  9dfde24f8fb3ae25da5814168fff4083231f6b85 (commit)
  discards  8cdd0d4208bb8782049cdc750bd516f96d5b5cba (commit)
  discards  ea913ff805b7d54cabc27f4a1d05515cf996c0fc (commit)
  discards  cad7445c492ece031d0521f4dc04ea05bf4770a7 (commit)
  discards  61348b0dcb21da79f2a397899f13b1869e842803 (commit)
  discards  b27b068b6bf968e06e50184b8bae689d52b59f91 (commit)
  discards  a07ece6a437b889d64818333b6ec99da5a1f078c (commit)
  discards  d8f626b35ce1c51de3eca7fbd846e12e121788b4 (commit)
  discards  52685ecbafd9f5a59eb88830dbb6121602ea7dc7 (commit)
  discards  55efb6d191007eef921df832bae9ff014f85cd57 (commit)
  discards  ca4c03f7fef0d4035013e20e34ceb0b0f0839548 (commit)
  discards  c956cd9acf6f30047b4f5e82f19b6d3984e31ba9 (commit)
  discards  d4e069935251bb182498ed2b6ca7a8037897a989 (commit)
  discards  34cda259eb4546e5b863367fd2a7f8b1779bc438 (commit)
  discards  c19c17761099321b530a906a203e7158989e1c38 (commit)
  discards  d4c7b08bf72e733f63b10fa989466e3065cbaca6 (commit)
  discards  889e889a0377d047dd4430cd4e5f7f29d81d274e (commit)
  discards  27890380d37224ab9e63c9854d3f828931a0b0a4 (commit)
  discards  6a680df6aad7710c9aca4b01a16567dd3ca9771e (commit)
  discards  d6c2bbcbae15f45aa58f48beaedb8b03714df018 (commit)
  discards  659c3ac9500c56c2f66302775f2d6a71ba87e943 (commit)
  discards  e0a5d8f871bccbc5bcf4460778fd5bdfbf1957e3 (commit)
  discards  0ea1a975a8c4873be4529c03a6967b9c3e008c9b (commit)
  discards  3b59cec219c58289c47311807734cfce2229e112 (commit)
  discards  c49d23f531be40047bd28d0cc248aa6ac47ef41c (commit)
  discards  f8d5ed133d146f00474fe68e73048c31e8359a83 (commit)
  discards  4da208b7b12d28d6b71cda06158acdb6a64dc2d2 (commit)
  discards  990df2f2a2f3e2b5f41db97636b96add07a282ab (commit)
  discards  2a8f8d925fb30143c1a1f7ca22e125515e8c9c74 (commit)
  discards  86e11c7ecd365d5c1019980ece4056b6d8e4b138 (commit)
  discards  eb2ec05131f8e2a241c02c5fb3e7f03d1d6b54de (commit)
  discards  ed359fefbc80b68c3cdf91daa082cd74997f20e6 (commit)
  discards  f37cc80bffc7f2fabe0ffb0c290cd19384a88b7f (commit)
  discards  6248f5525545334114f2eed43499a415e40977c8 (commit)
  discards  63ee771e798fab869db984914c928efb8d5e5c8f (commit)
  discards  927204b4dad683d7587efb0a855762aa17b3a833 (commit)
  discards  7dcaab52d45fb58610803377c98b60b6fbbb7bc7 (commit)
  discards  d2fca349aee767267411fa3d8316675b93e150ea (commit)
  discards  c70add604d4dce7692c25bfb29c83b0bdc363877 (commit)
  discards  5e6b61862fa0a1bca328c690b0d7a24085688f7d (commit)
  discards  7d315d7e39a710fdf03b07388b4eec105a22e565 (commit)
  discards  b68c4f1dcb517f04d208c892013a35ad562b4955 (commit)
  discards  bf4483a2825783adfd1cbe3fa9256cafe1fac7b8 (commit)
  discards  4da0681a70ac512367d59c93703e91e76cc62192 (commit)
  discards  15162ca3106d95b0f867b9a89d9b3a6dd0008297 (commit)
  discards  bf87becbc3d333ee1902226787aca69142789855 (commit)
  discards  389409be3b5b11e8604429179d4998764268fa24 (commit)
  discards  e7781c6bbdb2074234bb4115fb50ad1c81998255 (commit)
  discards  ac68de2c4e85fc22d468b73c55602896625859c5 (commit)
  discards  be78ca212eeef99c0e4de9edb768750257ff82a4 (commit)
  discards  b00e2bee4eb74ce2153fee23ab7ed052dd5f9541 (commit)
  discards  8f62d6bdc89d15e7382cb41aed23125e0f21844b (commit)
  discards  76ef512f4c3bdce8f6e177d9cf1c958f36966f9b (commit)
  discards  5c643daa6edc597d8a3ffe0fc569fdc6100fd204 (commit)
  discards  9d07d0f2b1fbdbf0033d476ab348b00ee29c0dd5 (commit)
  discards  29b9c996900a876060ca9324a2b4d9454005ea1b (commit)
  discards  64972eddc8caf4663356ae20ad25bb8cc9987147 (commit)
  discards  d4d491ef4c49ce84872f5e7039852de4bdc0628c (commit)
  discards  7e07fc027b8d409a501514a39d0df2c0d11adfd0 (commit)
  discards  b85e9a8b0f69826ff63d2f3658ce5442b32b6896 (commit)
  discards  57d720f763f58ea0ab5127c590d4ce0ad9976567 (commit)
  discards  f248cd4724f062c4821d601bebd9b99fc2ba477a (commit)
  discards  a04d50e5ba6bdc81ce2b09d683afbc6d5e1a1a66 (commit)
  discards  f68ca6cec7956a8a152d03d760517f64d3716f94 (commit)
  discards  d13b3c756347497a626a9964e6e5b8945b00fd6a (commit)
  discards  30b090648301ca9615482838a09cfe1de744a03d (commit)
  discards  b0d35d9e647b105718361b62a5ca230cdec3e782 (commit)
  discards  a5523142c5ecb29c54d5ae45edb7bff62b2a46cb (commit)
  discards  d92c95bc71923f4fcf774fd0cf33d2dbcc7a9174 (commit)
  discards  8a1b7e7f4783873b0ed3bbfaf2a29b33afe86940 (commit)
  discards  8ca0c618392153ed9a908563c7bb97b322ea208e (commit)
  discards  1645a8f6112ede0c970cf179d3b618d3f7091cb5 (commit)
  discards  c41a1f322510eeb486db73a37d115f4162761ce5 (commit)
  discards  9bec0eacdee5b500262d9298dac87ad13586d8a2 (commit)
  discards  15c15fc05ad351f1f14bba92c0642a5737c28b52 (commit)
  discards  8bda2ecb6781d89957e2d4fb65d333bfa1530395 (commit)
  discards  b73a2d2cdc48ca73c4ffa634500edba9d6be47f3 (commit)
  discards  5615032515324d017f9181de515b18f2b8ac22dd (commit)
  discards  267f613f961701bf24bbacf335668d77d5fb06ce (commit)
  discards  193897f7eda7150a4ae8d4de0dec70f2910f934e (commit)
  discards  cea029e066d55935e52e0b6558d8d6c41293c318 (commit)
  discards  7b44de887d93ce747a8afcfbf8ad4a8691895261 (commit)
  discards  feb71a03a8fe6fceade6974d907855cf2b64595a (commit)
  discards  44f02a017d4a1f61488a9116cef24330ec1a10d9 (commit)
  discards  6213867925e250e12d4143dbabc26842a7f2c83e (commit)
  discards  3b2a58f91633c2eb5e52fbaab4055132e4a05cbe (commit)
  discards  6eb86e6d11bbcb7a6eaa38de2f79519c7f0a2ff9 (commit)
  discards  23f6ecadfa7da49b22667e8aca3ad006783b4a94 (commit)
  discards  3220330df6845547d041c37c1d565b382dcc7900 (commit)
  discards  c5d294cd189841cf17c4953e914e30159dc32531 (commit)
  discards  cc2e948d67334f12926d934ec78b5273f0965fea (commit)
  discards  4549f8efd4424ac0d8e8b874d30ac5b25c6f7516 (commit)
  discards  76a39f7a191ec42d90157c7d093b8cc97209c912 (commit)
  discards  dfb74f5255e8a5ef3af799b61fc0721968adbe28 (commit)
  discards  3255ea60adcaf7c083839b1a3d64a2de09d397f3 (commit)
  discards  7c346ae68c4094d1b97f564d86f41c118285c345 (commit)
  discards  df2bed8f4d78e241db1664efe44d5e4b389bd62a (commit)
  discards  db4b106b69e047a6242623a418999d51919b11c6 (commit)
  discards  fb3db9f84cf4c7f847578cde49ef8fcdd572923f (commit)
  discards  c3d032f43de99c6e71dc248666ca8fef53c5ab12 (commit)
  discards  6efd16b3cc70483824229c365f9a966e1e6ee12e (commit)
  discards  86d0e016881d059056724d21a474bd90a92f1b4d (commit)
  discards  ff6f0a122150fa577a2f37c14ddd06c1b8c387b7 (commit)
  discards  c7770933596f56c28d6dc43d618cab994410dea7 (commit)
  discards  bff2f161d5be2a0334339fd155db304127e69533 (commit)
  discards  aecde43f487e84cd72b74713b4f2eabf4afb05c1 (commit)
  discards  01eb6be389e2e57838150f6b1ba73b3f67bd6fa5 (commit)
  discards  eea2973be414d31357a3850b0de6219d652d59b3 (commit)
  discards  1090b107730fac0ae870e6da634fdea6aaec50af (commit)
  discards  82a0307adb897fa9a746d4a297058d34e422e8c9 (commit)
  discards  efb496dcefde4cd2114375cd363ae4580624cff4 (commit)
  discards  f90335ea40766480abe30239d723b58b2a49cdcc (commit)
  discards  7e6d0eed6a86bf798eff158ac3f234b09bbbb0c1 (commit)
  discards  ae1c31fc4276c38cead89663cfd660db89de3d3b (commit)
  discards  9a64b8d559d0123da0c110dd5d13ce5f3a46ecf8 (commit)
  discards  3f59a446c7f7f874f8b223a32eb47397fabebef2 (commit)
  discards  8cff10383e6198df9c1f1d4649049961d7c8f00a (commit)
  discards  f59e83c39f91a4d56f0928366886ddc962c27e53 (commit)
  discards  a455b5672fa1c61183bb8876de727731c22ed4a3 (commit)
  discards  865ed261e6f50705f4db55e7d9a193af08d7f8b9 (commit)
  discards  23fefd0ba3d758fd095b2e662ade88df2350a520 (commit)
  discards  e02814d487a0e8ab58d8358991eada7adca14cb2 (commit)
  discards  d43b20fb1b6c136548bd60acb74df1cc71d3a8fc (commit)
  discards  12c11218568d9e2b9b40198813a058ed577b5577 (commit)
  discards  4a06460d9878b869037bda40dcec1fd7515e0942 (commit)
  discards  947464f337201fffcfd205c0f0ef39c1d2d00dde (commit)
  discards  2177c44cdbced14775ba1525c90f5d322b83dee4 (commit)
  discards  84e0a079c5a03bd6d5c6be186b8c3ba8e443d53c (commit)
  discards  7f64cc5880012743332070bc908fa875ede019e4 (commit)
  discards  cf3ca1fcdd31e7d0cf36e801d8dcd93b85a236f2 (commit)
  discards  ea807b0f7db7e6b7115e97bb9361d5de070798e1 (commit)
  discards  708c33bbcc11707f9ac80829aff2556ca750d089 (commit)
  discards  ca67465742b141af67f7c00db3045af12f4663f1 (commit)
  discards  602f6185809d86bbbb52c6db44092e46ac48475c (commit)
  discards  a6ee00e6ce6a59e07cc89d8502fe3935f18dab09 (commit)
  discards  0e94a59a6227a4c1fc5ebf343147ce6455958278 (commit)
  discards  5d0d71905dc79d422fe5ec22111d1062b7d5e9a7 (commit)
  discards  2123458b2d7eb2c3ab2a7a6275098477de1176a2 (commit)
  discards  ab8daef62e29365988d595dd6bbf47fcd8aacc4e (commit)
  discards  ddf17d549972cb0fa229f62915ebac916cff4ac0 (commit)
  discards  697aa25068fe008008ff7aac934a852774218245 (commit)
  discards  c6aad8356f66067a17d7988bc039a86d37b12927 (commit)
  discards  1bdad220b8ef1b335ab36dbf02987819de471214 (commit)
  discards  de3c9d8c5f3bdda60c0711e04238fd392c46a59f (commit)
  discards  5c1b101320812d9c82025302215a753d50800678 (commit)
  discards  d033f0cc1e5fe673ef3a50e51712c1e7f8de07f0 (commit)
  discards  fdece311757f64d3fb22b214a66cdadccd521a6e (commit)
  discards  a815f790edb4e45aa4bc250bf0b4b89a945c470e (commit)
  discards  d2463278c7760710e1c1913d0332e31fa8f50740 (commit)
  discards  d42fb107b932f29001ba2ac362c2fee319c8c55a (commit)
  discards  0154b576c4d9bcf98d0ee3964110cd684ba95241 (commit)
  discards  9f5d54ee3c08429917803a9e855f936c7265471f (commit)
  discards  d5df32261c864bf3bcff71c63d65324a7229ad63 (commit)
  discards  288909421dc5cc1556c3f51ca497bb87b738f971 (commit)
  discards  9713a191222ae84f75820efff6618778ca7ce0a2 (commit)
  discards  3d00a5ef75bd3626a82a762bcfed2f5b01e95539 (commit)
  discards  73c72935b3eb977539648bd867ec80b09a06458d (commit)
  discards  5dc677feb2df6c3c79e060bf939b8bf10159b429 (commit)
  discards  1ba345dcbfa22e7404acc82238fed14757255fe4 (commit)
  discards  515f2331dc203f56b4c4e7eb2703298ba1116a7d (commit)
  discards  97f3bfd8b9d9b4cb9ef1d85086883b498e6fc21e (commit)
  discards  a3c35b583f53d7d37ad32d92bf216614a425ab2c (commit)
  discards  265a5f4ec38c933cbb7212568ce5a3813e50e42d (commit)
  discards  21d155f0cb279724c595f2ea8fcb0ceda6bce41d (commit)
  discards  a660cdb10ece78f5d19456c07cce628ee47bdf0e (commit)
  discards  0e75a3371daf0bad47d467fd8168c445373c51b5 (commit)
  discards  9a91d8a80855a5db8446f73c527c28aecdf17ee3 (commit)
  discards  9bb68ece44b1aa88e5bb0fbf2f053e96a2fc5a57 (commit)
  discards  c6dcb83b8ea949936ea257b0b7cc0aaab2f2466c (commit)
  discards  c58581c63a990ff54882b61c64249a63a37b9d51 (commit)
  discards  98d9f6e3e107a5c17b03e3003d7ab92ffdc33677 (commit)
  discards  5e666d80cabcae57555df81df15cd2e70177b865 (commit)
  discards  df01a380f0a1586629db9445173650fbac6de31b (commit)
  discards  391654193b2be0815c0a546ca0a9a3d6a092af8e (commit)
  discards  2ac7065953475fdc254e2f64efdf922ca1839229 (commit)
  discards  2bdb47b2c3d2848175cceb4b6adfd88ef8911bac (commit)
  discards  2a7d72c38f023c6a8491f11e9a470fa6a8f7297b (commit)
  discards  c58da28d5cf9bcc4280096493d4fc4361fcb175d (commit)
  discards  6b98d152fa2767eb11528dbec0f5741ac02d2bbe (commit)
  discards  52fe99979c62f63a26c836d2419d40a072710b44 (commit)
  discards  9c32070ac60538282982236ec4c85c4dfab6b3c2 (commit)
  discards  29f92485f1792cccd84077a0c5f5d452ba2a85aa (commit)
  discards  9a6d37950af7a360578102c7d26d93c827e32d4d (commit)
  discards  d8b6a60f55755da95774d796a7712d3e87056e43 (commit)
  discards  a8edbcaec860a4405bb274a089e313f52236959c (commit)
  discards  c8645a323f11242bf71a0c8c99750315721c1d70 (commit)
  discards  82cc543238b2b5735ccbfa6938d98a14634cad19 (commit)
  discards  76b4b594e096249fac2b26678ad2d48985574088 (commit)
  discards  d41c3ecb89233857b92e494d00e89dbd315376ea (commit)
  discards  8f8db003453933a0b468cdf5d58bc6b11cc98b3a (commit)
  discards  a1e587bad3ecbbec1d3b1d559a956dfcbc3b0634 (commit)
  discards  b1b54ed34a6c129445f056bd3ab0ad590f45b774 (commit)
  discards  76a5304936fb32fbafd4de00d74e1434c140b865 (commit)
  discards  aab516bd77dd9922541fa911961a60756f035bd0 (commit)
  discards  4bf555b0f7635afde86a67cd3ef9eb2ab83d4064 (commit)
  discards  67f9fc26bdabee44e94cbaed52f2302f47f9a2d5 (commit)
  discards  230e5355966deb3920f4399010979207cda06a27 (commit)
  discards  6b7cb583a2bf70aa142b3824330e920ecc47861d (commit)
  discards  f414ed162d53df1310ee02a8a8519aaf3eb6243d (commit)
  discards  891a6b335167223820d60dfb9a7b117e6e1077da (commit)
  discards  e6ad59c82112b8e2c9d1e9cf21b2ed62efdcbc39 (commit)
  discards  236f564453e360fdc379d067d5a9734aef84c39b (commit)
  discards  ad137b5af4f40f7c07df7da67684082c5e4a5012 (commit)
  discards  86777356c5ebfc43fbbf5aabceaeea02d6b3f84e (commit)
  discards  f0fcb0b3883272097f98c16d3ae33f13511b5864 (commit)
  discards  3042e27a969b11b13a9e742e0b8d7ec662e0e350 (commit)
  discards  c00ead9f5516d9d84da5bf365bf9d8345e1d347b (commit)
  discards  b2dde0459e93b316d1c9700a466b9fb78c0f1c4f (commit)
  discards  fe1b22fc00e60e37e88eacf31c369018f3eeabe9 (commit)
  discards  f3f7acf67d013c432a610bea29d7d1b3b80a1150 (commit)
  discards  d13e65b3db32a6060b833e96024a1526998b63ea (commit)
  discards  5e9dfe5a8dfb20bea7f219edb7b740b6b9ee6864 (commit)
  discards  677d66d06472560a5c9dedfec73e093ee40db2c6 (commit)
  discards  6fe28452898c3fea0bf021cacfe0885686e517dd (commit)
  discards  3bce2ae4240a701c7e05cd05514d0ae9443ce778 (commit)
  discards  4d674587b102aa008d08ae8575fb42d2963b9ddb (commit)
  discards  da1ba8eb418d6f08b2d21892ee83a82626da4663 (commit)
  discards  e4d4289fad046ad1cab28f6abb144f609c112157 (commit)
  discards  656167c3e0eb06ee69b2e6ffbba82bf0f385618e (commit)
  discards  cdcb21844397efd56862fd4fad67f4b4d8045f6b (commit)
  discards  264d65529e0487d0af19fad578a92a28d18e770b (commit)
  discards  d91dc129c690510c32b10bbcb8efe17ebed72455 (commit)
  discards  2928ab107e096ade189d410433311bab7298740b (commit)
  discards  d08809ae30abab134b1eb375124eb08f1c5b1bde (commit)
  discards  bf94493bde831b47d9f6afed25d7a5b701607f23 (commit)
  discards  466abce5f276f99678137ea06f6a59fdf26d563c (commit)
  discards  5484291dfcc5cc17c97881711d71b5f1cadfde6a (commit)
  discards  480349b681ef2154ea3e4784dbabd47149a7bf95 (commit)
  discards  72edefcf8a04d5ee9404cccd33090dd0d2025005 (commit)
  discards  0bdf24548b2059d9e11520f2de492b4847aefb8f (commit)
  discards  b7f1ba1691b6b49947eaba55bf506ffc63eafa70 (commit)
  discards  d6a34e781a210d3c9794d62ed53bbd99d3559357 (commit)
  discards  3b0e433bd1f4da2e5c4241e6dc6b8a890f27c092 (commit)
  discards  acbb29284941bd549fa9fd713dac9e50ceb6e58c (commit)
  discards  82d7acb3cf014a9760341363a8e652e7a1440d21 (commit)
  discards  a9d6a0926705062ac183f8fab1cfa14b900a70b4 (commit)
  discards  2ddda7bae332030814b8f17cef9f4ff41209c8e6 (commit)
  discards  cd6ee040e9e2aa4de05b7ce7d12be9f51f204e85 (commit)
  discards  3fd185d4c3115ccd87d9117bc89a187a08859c36 (commit)
  discards  719298b41f47721d3efe2a0bc33709db82118ee5 (commit)
  discards  34a3df2f3d59f62be871db543f975c3a44b1cf30 (commit)
  discards  0b074f88f5e152bf8de75eae96982e2ad9cc3b8a (commit)
  discards  8ffd7b931d065c5214d07216c7d478a006a5128b (commit)
  discards  f9daafc39eda5f9e48ec310e902e21f508b03e00 (commit)
  discards  890288592800ea037c0e176329a02492db4df226 (commit)
  discards  90db0ab1f178901caab463d797b262f015407cca (commit)
  discards  47485f0dfa70754c6ff54d297546ab4b9b79fa31 (commit)
  discards  4ba9e0cbf0e93f200535e6c20e71728390d2b8af (commit)
  discards  8dc17dc8b327aff448a1e637177f5c6d51b572f9 (commit)
  discards  7b53ae4cda37d9df6f9653e8203da610be1ea4a7 (commit)
  discards  c9a46aa4a57580841525a231a37ef47c49374491 (commit)
  discards  f877254b91e3a02544999020cd64baa6db8e7e56 (commit)
  discards  63e53d45191fe3ea196112fa7bd2dba6b24e188f (commit)
  discards  f9dbfe2687a96242d86073fbbda18012ceef9d79 (commit)
  discards  d3e89373cca5afb50cdf04f4fba087daa8c70fa4 (commit)
  discards  a8a2fde198926b3bac40f34f510fdc821d51e8a4 (commit)
  discards  65b164123edf4edaa74c7a0fdd6852f49d098f7c (commit)
  discards  6e7305e92f0ddedfe6eedb475d2eafb3f208d26b (commit)
  discards  35bcecc0482cb85d42296afed8f26118721fbbd9 (commit)
  discards  f9a511901132f9adfec51c58097db0aaf26c2098 (commit)
  discards  afed2be65cc751881b1bd24ef998c0d9df35fe75 (commit)
  discards  6ea42d6a63567671bca372b1abfa02d6eb907066 (commit)
  discards  9a73e75b6941f1a2c7c11afb7f2b1ed0445786cd (commit)
  discards  32aad371350c80207c55f72bcc146613f3841020 (commit)
  discards  995835be03b141a2c760d0f66ce1121c80793863 (commit)
  discards  7706df9c17961a41b2318d171b09dae3eafcd93b (commit)
  discards  95a7129893fdf3b70c012969406abfe7455eece0 (commit)
  discards  e159347b18e9b20adbe59723d8e7340c7154b982 (commit)
  discards  4f4eda6f14a3753c392c0addc99b3d12e89e3b51 (commit)
  discards  cf79de9b35c306ee2317c71d14ae8e2a9f7c374e (commit)
  discards  5ab06dcdbddae0b3357fddcbb7682b5af7a3b60e (commit)
  discards  81bd110de4e4e6a503ff348bb16af1700ea9c12c (commit)
  discards  d39df852faa5424913e350b13a53232aafbce1fb (commit)
  discards  a4962595835d0496d7a8fe5ba5f4290a41e07099 (commit)
  discards  46b503d3f72e3ea69609f79f84a94b5dfc868b07 (commit)
  discards  f904dd1e6af8208ab6f931f6580eb9eb094b82fc (commit)
  discards  1b4883412b9a507fc969b9ea3f8f01c54a6eafeb (commit)
  discards  dd92144a268d54a790e4c5fb609d85a2e21c1f4d (commit)
  discards  16ea4be99cf2460abbe432e82971ba14816867a2 (commit)
  discards  6c9d33562560333c123899c8ff3d2cd47fe386a1 (commit)
  discards  14d771da2db3edad9b47c7565de805fab0c50ccc (commit)
  discards  20bff46023c05ee2949aebdd8221c4a4c1289451 (commit)
  discards  1b1987b8d8d572da275cd0d028bfd19e66a7a6f7 (commit)
  discards  0f1aa6e639751f787096e66ea266958ca57a864f (commit)
  discards  7bf67118463e1111560f0c8a62d5064455819365 (commit)
  discards  120e11fe8cde02a574eb972c8f98cfb6d7a67648 (commit)
  discards  ae676e46af6dab626a76c61a7be8ddd158535fa2 (commit)
  discards  21e224e818871f074ba134faed05409c36ad613b (commit)
  discards  ed00a808a96fc7a8af43f84b5308e3efbb30026d (commit)
  discards  fca624ca534f8a86c120106b2f3fa65327817a53 (commit)
  discards  789d893af26dd8ef5e3a7de01b3a66767bb3b811 (commit)
  discards  5121f1186304dc2cbf1b2212415c680d66dff6c8 (commit)
  discards  8a9e9100d40cb42a3c508407afedd2e3ba8534fb (commit)
  discards  433911d990eb0dcfe259c208ec0ba3ceb6d93dd9 (commit)
  discards  93941434b756449fb7711d4aa06f44e11a90be86 (commit)
  discards  28a11146379a6bad5729291def6b80ac678f0f87 (commit)
  discards  e7921fa876e4de60d7e2201d07132cb6e8a61579 (commit)
  discards  d6f7c3e1bb3fdb0eddf0afd1b9ec3d64a173c000 (commit)
  discards  322cbd4becf47836e96bb205a00b49886e97d64e (commit)
  discards  b8b3214f0a3cb78e84c3b3c00547ab0533987fd3 (commit)
  discards  2277af9de5a7cdb3d700746716f88390cadb4fb2 (commit)
  discards  c24ed856f76be6d3c6f41ec220da5a6325e02637 (commit)
  discards  c20f95c88000a5f99c1d3e84bc52d5f5de82cece (commit)
  discards  a9c57286338131f1109bc73a7527c2d1bc19b3c5 (commit)
  discards  251827cc2801b7345239fe77d983371bfde438ff (commit)
  discards  afd97471ab39ab780ae72c8477852ce09df0a2e2 (commit)
  discards  f38d80c6e8252c2f299b7fdab99dc5f20994a219 (commit)
  discards  84f2cba57e2fe3ae13ffba6ea74c0e7faa30504d (commit)
  discards  495ae31f63c65c362d6633942f0f2dff46c68f16 (commit)
  discards  b3b133e2685bb73fd7ec3ed75d88cb05194f57c1 (commit)
  discards  7b85d450e44127590bb7be47f845e2ab5a0cb4c0 (commit)
  discards  d7daa15d2d4713deda0e719fa2418d8595d6177f (commit)
  discards  7a4e3359ba864c7dbfdabd3f18ebee893071d5fd (commit)
  discards  0a8b0e694168715bc9d635aeed97dd14d1440924 (commit)
  discards  d74ea44cfcde02bd8ef9b022ec9713f7e65d0c71 (commit)
  discards  199c9cf26c8bfb36393f1b583a52839ebec011c4 (commit)
  discards  aa2407c8bcc1a014f1b8730b84fa9cd1b1a2cc22 (commit)
  discards  a803eac6cee0e79c96495780b5b0b57515a2af93 (commit)
  discards  76e941e168bfd669ab01c51ccc09eb4ca9750abf (commit)
  discards  e672b002ae71c8225559731b2afd37a166c9d1d8 (commit)
  discards  ea1afd8465047bb9fc5e17525f170c21c1e0a27c (commit)
  discards  1b9bcaabe6e4a190a16271c61d0efa839b6072fd (commit)
  discards  7c3857cb076e3250e364e9fe2fe46bca78be7eed (commit)
  discards  c3a2d5f6aca298c843e9d093897a577c281a899f (commit)
  discards  a9059d65295d391afac105d8ae18ff2223f1e8dc (commit)
  discards  bd37441d5f5f8fef873e84891f973bec731d1c94 (commit)
  discards  853f712744155faced9dd1d4a17028384cc6956a (commit)
  discards  b514d8bcc993d7cf516d2d9f3ebf627555ae29e8 (commit)
  discards  1253f0f9b971ffea3faea2692af5fe12bc9ce648 (commit)
  discards  98d16fa395b87816f24df3eeb29dc12ee9bf49e7 (commit)
  discards  d66028f0df53660e779fdc869e5d3d43368aadb6 (commit)
  discards  bd97df988bb1ec213ef964dc4b90d300d5d74fa6 (commit)
  discards  5589b7d7d5fb7f6c8d39063767fcbe3b99d1f564 (commit)
  discards  ceca5ee4acd180476a12e15fc86608846796c783 (commit)
  discards  c59de1e8cdf53bfa429a53f7875258c7893f4df1 (commit)
  discards  1676d12a7206f87deb4d54d5826315165331c764 (commit)
  discards  0a0cc86ff2ebd8bfcebcefa5d5625e6e7ca6c313 (commit)
  discards  b7d04be946eaff2b61c5b7fbb8d1fbf09cd557e6 (commit)
  discards  1e2d032fed6759b0ffaed25acc966df40a3c410b (commit)
  discards  ca6683c0694bac1ae8a20235c5bf0705f8e0e323 (commit)
  discards  eab6e80949d92bcc3cf78849a2636c1b4f1e613d (commit)
  discards  5f30c95edfb4f761c82d97b885528aa17107665d (commit)
  discards  2d680153c09c3a59346adffa30ee20b284abb3bc (commit)
  discards  2dd8cc44832ee6a3eec230c9cd15eb12a47443a7 (commit)
  discards  c0b0649eeb6fc4f8dcd55fcab140668c2ef61f4b (commit)
  discards  1ea1443cb422c97f989919de5227e9a063500302 (commit)
  discards  c3ae9da0c6588de9abcbdaf5e12ada68f8e3c06f (commit)
  discards  045f424da445eeda2ba392b68b2984cf08ce219a (commit)
  discards  8a4a6907ea782b0ab399a1ec66ed212b44408b6a (commit)
  discards  e26b755bc0a3701cf454613f32da3a209a704290 (commit)
  discards  7b67cdaba183f4ce2c253972d58ebbf27eb7bef2 (commit)
  discards  c41f18c153db0ac14804982a9a61f00134903f25 (commit)
  discards  7b1cdd862f9a01e4a233a618f127899bed6b7ce3 (commit)
  discards  0493da401da8fc6b750a30ff98501b6d48a9ac37 (commit)
  discards  daa01dad7b000b442ff481b16999bb0f4b01e44c (commit)
  discards  c3647c0c9b8b8627b3da7d85c6332f1a0e7138b0 (commit)
  discards  2fb7ce0510c6cd8303d298f7cfc8425e51e46270 (commit)
  discards  71fc22dba746242f93bc6fcebecf4e4c8c4660f8 (commit)
  discards  6171a7abe29e469c8d1cf1c31e21dceda24f172b (commit)
  discards  54be609b1f46e5b4544845e341cda85eb809a8ea (commit)
  discards  b35719e5351d8ba3258b6e1aa8a4f43538e6a01b (commit)
  discards  e215193f0a27d19a2103cab5a19c1681c1257a6b (commit)
  discards  3c36bb3a0efc663bf6b26916c4c51c2b05ee4795 (commit)
  discards  e97304b17147f6be630de6a228cd9b2c4ae83c4a (commit)
  discards  53d0067a5ff6e4f50ce5f165c120e07f3966b878 (commit)
  discards  ec52c467b144c15a046dd90c2bad27b4446b50fc (commit)
  discards  803a3fc2fe8cdbcde6843f7654ce62ce97d0db0a (commit)
  discards  225f267f076cdad47558b06675631fc33d34191d (commit)
  discards  6ce58326b3e4333e531774b6a565e339e2864037 (commit)
  discards  50ab6ce2b58db2326542fcc4aa5f5f2f265394da (commit)
  discards  5fa190ac3ffbdca88993c37409bd69965d835da5 (commit)
  discards  c0795aa3b92fa45327819f4e624b47130c1f278e (commit)
  discards  ecf58bfbfc746ba2ae9e512794ce2e88adef2190 (commit)
  discards  dbf41e4b9e41704ea0c0b40bd61e21c8647f1b28 (commit)
  discards  f39baea8745ddee088dcfdf392966ccecea8d1d9 (commit)
  discards  5c5d83c996d5cbbee6d57b1b09f41a24f7e809b8 (commit)
  discards  7ca9ac40d619d48792f5c2cc35c4c2ca6dd5fef4 (commit)
  discards  d8e425c37bb9c0a3b3bba8651eedc3646c421067 (commit)
  discards  eeb0de0af58f287c5c03a2a2655bdc2af404feb5 (commit)
  discards  7591d9844de80652b56d88a99d1a718c941e7d8b (commit)
  discards  b167bcdd568da5572fa64b1f1aa4f94c424c9073 (commit)
  discards  fef5e64031e1e2834be468df3ec4eacf2b0fc9c9 (commit)
  discards  6b8513cc23433ca3037560b525206aa719aa8ce0 (commit)
  discards  bcbd621366047f40928e8e8245de556cdf57ab0c (commit)
  discards  3a78c6d134e1abd1f456dd8802f6d9de3cf72199 (commit)
  discards  56993e7ab8fd7739bb4d5a57d5118f586a280f46 (commit)
  discards  7e2bff62b95c28721f8d5a558a16f91bfac86ab1 (commit)
  discards  e4db3f81ebd5cb54241849b602395106f674864b (commit)
  discards  bb7a0ad79b00307da073c5c34a92173a92558f2f (commit)
  discards  c5df7d10882203e1b6ef34e1fb6cd1c42036afea (commit)
  discards  82cfc649ad24111fa433813886992ddd807af638 (commit)
  discards  4348fa359a3981c2c5962f14a650ec2eb89421d5 (commit)
  discards  3257a375975e9ddf5719a3f95312a00c6833fce6 (commit)
  discards  58f262804f3db7d2b0b18bddf2825c0e28818382 (commit)
  discards  18643c0e9ce0f9353ae6c8899b22c32394563282 (commit)
  discards  b189110d93a399aacd2b2dbae20d089b152b9807 (commit)
  discards  ed3c5ae3a121e1f7e040edc6309b361a09762e16 (commit)
  discards  000dc4c2141e7bae14b677137b8771b469d00ae1 (commit)
  discards  66fe82a3adaa0c354c9907371f17c9caa0471e85 (commit)
  discards  4226efedb00ae3efe5cdc235f782639133bd5320 (commit)
  discards  d51468737169c6c4b8b988d76692a0f8fc390b26 (commit)
  discards  5ef3702cef49d16c0309bfa6d875970211ed0752 (commit)
  discards  a52d5450516bb2721d807769c9a817ddb14dded5 (commit)
  discards  632289f509672ef9ecc620eeab03a800a0bdba63 (commit)
  discards  462862131af1d46c8c98e321c45352f3e64985da (commit)
  discards  9332aae15258ababc3e796d5d48951d6d2962eb6 (commit)
  discards  808f65de9838ccd778ef4e5dc38f4acc52cc682c (commit)
  discards  1c8cbcfad84ae237c0c149d1b5e0a4db5d7547c8 (commit)
  discards  2a2632293cda2e1b7b8bda64b7d79d36e08b032c (commit)
  discards  9147af1821cb5017db1230e2eda38ffc42ccdd83 (commit)
  discards  ec36e1c2afe7c8258588dd51a9fe75b7fb523206 (commit)
  discards  ef164864bcc990f1c1bbc1ff69e4b8021b0586a7 (commit)
  discards  469b2503bd0c57820542f6a23df58b00252de7b9 (commit)
  discards  4d0bc3222cf91c647a3d9f00e370a9ed1156778e (commit)
  discards  03519a582873578b18afefa74b71a6bab6e4ea02 (commit)
  discards  f889ba21a6d4688ebeff8cf36e4cd6f9f83f7a26 (commit)
  discards  33bc5a0860a8e488f7efe6a891ce8e5161d9ac6f (commit)
  discards  37745c881a2a6f3ffdfffdc0cfc5e079152692d6 (commit)
  discards  9c77dc227a7b1505dada93ad9fba777fabc08f8f (commit)
  discards  7c767fe68dc8270f2e84f59071fc6562734198c7 (commit)
  discards  f0771cbfc800aa2cba5b25f53eaffac54569a2c7 (commit)
  discards  0f0ecd0c41a70e0ffd82ab7f7d15711162adefd5 (commit)
  discards  6c3c6fba6665be00517b42bd88554f528d83c072 (commit)
  discards  29cfa91316a76e6bd5ab5b55bc2d5608bdfa117c (commit)
  discards  ffb74d35ace0902289246bb5cd08341effa34cc2 (commit)
  discards  d44666034be9db8cd76a407ef3b1bd58b706ba10 (commit)
  discards  c2a87deafe277348e7fba5ffc55d67f7624dce9b (commit)
  discards  f77a1b1f89fd74036cb98f1d0ba45e34d8c5f02f (commit)
  discards  04fe52caa011df0276ada5eab6e169a65e103f79 (commit)
  discards  69e3988fa81203c219d0ddb8f34e4ab150e53b0c (commit)
  discards  8b4de518cd3aae71784d8887222b9282ecbdcff8 (commit)
  discards  678e142e233acd0ce2106f44f6d33fa27842abe8 (commit)
  discards  41d742d270e26f75fe45b7286d44740673c2c41a (commit)
  discards  120acb136fc89bd0ac48742e15a07e3bd1fabb91 (commit)
  discards  85a805182e392fd18fa50b69df559812886f0a75 (commit)
  discards  dbe4e8901006400892ce5181f7e723c46a4af260 (commit)
  discards  b1dc690974e1f447ebf7e9e89eafb88eecf7dc8c (commit)
  discards  be2387778e4da19c8c4fd5466c9eb4c3d424fa29 (commit)
  discards  b5723112b788aa93d9af9170a3795d0efdf2d514 (commit)
  discards  eb695ff8a578bca4f114fe9bf9660595863cc737 (commit)
  discards  24234dac3900cd65ede213cf6c34ad671d506fd6 (commit)
  discards  72312c2f406b1b52920089c1c646d299a5d8ed22 (commit)
  discards  020067ab50ad58bd03c73f9badc084047c7ed00b (commit)
  discards  b980eda87c16ab0a88fc499b6b4fb93ec5db2690 (commit)
  discards  8b59dde68050931db8ec4505ca3d996ea501a877 (commit)
  discards  ce2fe7c890188eac6640a03d915e0baf0c37f99e (commit)
  discards  80c5690bc3c3306f438201eb45c62d85c523baca (commit)
  discards  0f0eaf3f5ad7ab11b24f1fa4d4c9b31a4d135337 (commit)
  discards  4897e25e292303eb64b0e37f03d977ad3c78456b (commit)
  discards  d12a844312b3b3878057dce459718c746bb07970 (commit)
  discards  e0218628f30aba33bcc75affe57ad44acb71a120 (commit)
  discards  8a066807d225fc5acf9265b005c9f12443619590 (commit)
  discards  d15bc29276a3131b32931a3223776754e4256234 (commit)
  discards  c70ee23b7708bd0e1749812bac74d92587a9099b (commit)
  discards  5837e3627e52761e34e72103bd37a0ff6ea256ef (commit)
  discards  0f95a67e01c7d4d116b51fde5ef3cef1aa0c0068 (commit)
  discards  e11dab0b6b29192e1a00e439a297c50a98bc3caf (commit)
  discards  77df96c3cf6595b1b4a8559ab20ba706bf6ccfb2 (commit)
  discards  fcf5795ec8f7e733f28e97bdd93a7ab391b9e24e (commit)
  discards  b885491276d2e121ccb72e815792ca142366b857 (commit)
  discards  e544d90343811ef6d48a0e877bd8fc12181ed8df (commit)
  discards  9e15a769d0895dc665e8f28252a589a953c36901 (commit)
  discards  1114d9f305c64bee732bc38bfff945c1ba778150 (commit)
  discards  04d9a117c5e90b8cc2805e7ff29fd61a8437280c (commit)
  discards  a00f4b6820996f47e365d253e7278e12df4542a6 (commit)
  discards  0fc2fc4fab75501e36ea12c78ae1a7723c1e2f3a (commit)
  discards  018f152358e7b27ee82b2b2ff1f4b7327b5f1542 (commit)
  discards  2a5dfeb05822f185c4daf69d6e0bd6686cbb6e3c (commit)
  discards  758386d8e488c3eaf51d7e3ee775a74cb788c3c1 (commit)
  discards  90848be9b04ddc898fc88d7c41bf16d49b57a1e5 (commit)
  discards  ef81b2c85442d16d9e5505448d600593071e21c1 (commit)
  discards  5cc8bff572de2d534d89c0b8cc3ce2dc75487b72 (commit)
  discards  c9b12dc066106bf77318736716463247980ab013 (commit)
  discards  e8d1f0c6c56c4afa5873eaab372dcbf774de93e0 (commit)
  discards  b4d68f8c2bae0e813dde174dec397304697717d8 (commit)
  discards  0a5164d36da4af84059480257adc617ca4681bad (commit)
  discards  5372fb07a7b355f780eb5d7826b0d6e10909c5b3 (commit)
  discards  1f6015911ee8a0487b1c002276e77240133d37ed (commit)
  discards  bc8c579087653af40ee8e6f215f327f3e1ec77a2 (commit)
  discards  310fb4a0aab4b97950f26655c226ed6f938b6e60 (commit)
  discards  2750b1a94cbf38b4fe17b154bd9ec879108c6288 (commit)
  discards  4dac9953188a771eae2f23c0bda041cf1e1ab439 (commit)
  discards  0639b23221a02676e1162f74da0ca7b346b14904 (commit)
  discards  d9ff85bce891ccb19c922e2812f16d58a8394a12 (commit)
  discards  71f43471402ae1939d29f27748f42be88ac8d837 (commit)
  discards  f7974d44f3d5f1900470293f517ee214d21a2670 (commit)
  discards  72b7d4d2bda3ebc53d5d387b22a7b7b03a48d9ac (commit)
  discards  df15a2d74e6e7901b25d042540f4f4a6206c9e07 (commit)
  discards  9d43638bce090b3edb986cdac6501a0bb1e5942e (commit)
  discards  b0b0fe38d9bcfa1f453c0b01390d73d5ddd9bb87 (commit)
  discards  52476c444975b4313ded35391a9c360964273501 (commit)
  discards  5633c9d898682b5a92e5411c205f6a7f888b9e42 (commit)
  discards  fa94cb2ec039960e57f9bdb49827571fc637a8a7 (commit)
  discards  23efd6d2e8de39ebf0932de4dbbe3df193d2a27a (commit)
  discards  1b46357be022c1925a8588e34dfe4ea10f24a14b (commit)
  discards  3c545978e5620059b1c62491aefc185ac1bb8c54 (commit)
  discards  89fa8b58c106a2bb5f57a0ef56842a67c2f28174 (commit)
  discards  4916cff87df8e8bc2e4100f6850886f367ba3c1e (commit)
  discards  4c151f5c862dd8bb968063e4af2357a7a67ae69d (commit)
  discards  8ecefbf3fbd76224f40c3696046280a2df29d7a3 (commit)
  discards  58dcfe0f4860bdc5d2df42912ac03d5ec24d858d (commit)
  discards  d94e19a4c2a80894b7be42005b8d5b5df5209701 (commit)
  discards  a68cdd9fed5697d742b213fc150c447c70c9f9f9 (commit)
  discards  96d7e9b761d6d96b7863f8303cff1ae7e59dc132 (commit)
  discards  701ba9a306b1733ace9b7eface19bf4cdcdf000d (commit)
  discards  4513337a07eac21eae37a8e068e42e117572b640 (commit)
  discards  30cd8dce874e234e57cb2b4006971aa9d8bac2f1 (commit)
  discards  4ba28364d51fbd2cbc752fea14941c059108fe00 (commit)
  discards  b4ef17f26419a00dc6cad0e9c9319d1983235a0b (commit)
  discards  0a0051546bf34d2010b2b4c5f2b3893d25150f53 (commit)
  discards  73c75c5c88f99cfdb1adfd40a8a85e39d6f641a3 (commit)
  discards  736fffcd624efb2c3b95a25d36437ecbf3b03839 (commit)
  discards  e14e822cf2500a9b592279c4a564eff6390787f4 (commit)
  discards  b08923ae4bb0cb8785f379b8684a292e6c9c0b5a (commit)
  discards  b8f5b4bc95f5c553aa4928daa61260203c822aac (commit)
  discards  0dcad03e8c4c1523adb63419cc067ff1b41f2382 (commit)
  discards  44a274634e98739c2e0de7d5b54611a85d871c60 (commit)
  discards  013ebcd957d212d044099513acf6fcbc54a0e0cf (commit)
  discards  f84b904da5b1c295ca8bd414bbb4b80003573de1 (commit)
  discards  f9bc18215774b208b9f9b6d8d41bd67130b86bce (commit)
  discards  a90e3aab36432ce48e957987059f27c9382c6fcf (commit)
  discards  1c5457c3ab2ff705e1992b65932ef261ed5981e9 (commit)
  discards  a0c0287177e9ee3f34a92aec3f70efc9f64b159f (commit)
  discards  a65068240e11dc6f9cc29b0edd018c6a2f4cb560 (commit)
  discards  cdd1d35961dff13c522e72ed4730f4407410f9dd (commit)
  discards  543debd6d2cf63c6f5f5b2bf3b5b5c614bb4bbb5 (commit)
  discards  78c1535a1f54c3a56c22b7118197372a4286b859 (commit)
  discards  4061dcb0e16cc49aa3c51076ed9bfb3981b0002f (commit)
  discards  2c16cd78f168c6e7fdad9e3fa65b551b5fe7d2dc (commit)
  discards  072df0f0ffc41016e39312db0229db059f4680dd (commit)
  discards  5ef5fe30bb63325830f7f97710266abd780b227f (commit)
  discards  fb59b23ad5ef38d258fd0ae76a68791300e278b4 (commit)
  discards  fd94816124c93d886f1c2bf2417d38eecd594ed9 (commit)
  discards  629ccd2d7badafc8c1cbcb89156f953ab532cda3 (commit)
  discards  8bb140b9caa41c5ac5a668e7f8f422eef0f36f19 (commit)
  discards  9d3102ca2bf3623efc64a9d04767be0e8b80932f (commit)
  discards  a8220764822a8374a7fdae62b7357e4fa9380174 (commit)
  discards  462ca60abfa161341ef97c016ac74ed5b2139d51 (commit)
  discards  d2e4161754e8efff6921789948d648462896fe6a (commit)
  discards  7d27a6dc3bc738029c64404e15650d5e6b52dd28 (commit)
  discards  f29c7f550e813748f5de2450ce682f3dcc34386f (commit)
  discards  be93c3fe1b533541d1e7c77b9b8a621653730f26 (commit)
  discards  f0ab53baf27504bdd740379d6634b5f0b555d6db (commit)
  discards  e4483008e5f61b0bfb9f0d7660aae38d2baafe4f (commit)
  discards  d270a23c57dee6f5827cf3cbef64ea223d637cd9 (commit)
  discards  5095e14b20597f1e73bd7d892eecb514a008df88 (commit)
  discards  61a3df10dab68abd2a54070d38f998835ab0d719 (commit)
  discards  79d8534918d16221130115259c3afa51ff97323e (commit)
  discards  32931f681db4ac02b9a25656d2f4fe8d6e4f43c2 (commit)
  discards  a5ac2c8c66194e177ba45ed328c1fcc0fbbda143 (commit)
  discards  af169422fc642a45e32a1b40e09a8ad91615777b (commit)
  discards  47374d622e9f0543875c4dfca4174ed60a19323b (commit)
  discards  bf2b06bad6dd328e707ef15f48d576a5a6cd811f (commit)
  discards  a2ecf91b1c5226b9898757d3689a616f97a7ac6c (commit)
  discards  dfddf17df79aa61b1a305d0480ab8c1b7f95a5c8 (commit)
  discards  b35641b094fd937b773a2d5b32f9fcebddb23561 (commit)
  discards  224ece3d2e7c8b4d5f1b8b0ce7dcd623812597d0 (commit)
  discards  89dcb01ee34bc45f43f34cda1a72fa3abde7a153 (commit)
  discards  472f9204eeb6eaebf3c26e1e6404bc023149cbf8 (commit)
  discards  abf873b4a6c98cbdce4d7ce46ecb78bc53f65e88 (commit)
  discards  78c1ecb2ad1764c1bba0ae7611f5e1fcbdc711b0 (commit)
  discards  81deda391e459e271e14a4759838c9b6dddc37bc (commit)
  discards  ebd81079a5735fafb10f7902720ed88e7dadc84d (commit)
  discards  705f2acf56b79ec0479fb652a143229d954c6769 (commit)
  discards  98bdf4a06ab89ef5d992827f7493902eee38819d (commit)
  discards  8b8211a2f7efd0b8c96b7c44cf99d4d11ad1f8d7 (commit)
  discards  a164662de75029eabb903dde17bb9ce54e367c9f (commit)
  discards  5e10724b877305a5a3c563f375d25937789935bd (commit)
  discards  a4716b6be3027aefa1d539d6f8077137269e30e2 (commit)
  discards  3c3589e1146a91d21fdaeab342886a1701647626 (commit)
  discards  2790ea0e0a6cc4db94497d2e27af32c6d41b2f04 (commit)
  discards  7a3f36116e6ebf5c5cdf18939999ddbbd920ac91 (commit)
  discards  07f0c956c81873d7ab20a8554b96224f71f09084 (commit)
  discards  efe013e51343041062b2f4e1ca43757c8ddd179e (commit)
  discards  692120de6b6fc2a6970cda14424188487c405cb9 (commit)
  discards  45c1f70e6cfac37e5517418c0714e5b5718f6e60 (commit)
  discards  cfae69933d110209c140c35157f4ddef12921b88 (commit)
  discards  f1c38352daec884783d4409f4247a8da8035ceb6 (commit)
  discards  e660fb035c9764bcf315673e12ee088ada44e16a (commit)
  discards  7b07b100947bbf3d30edd4b7d5b3e3a9bc7fd6a0 (commit)
  discards  4fc9c22fc8ba945ab16610d269710f412cb124e2 (commit)
  discards  e9d45cf5bc5553bfc839600d310f9672b1830866 (commit)
  discards  e0f9c5a4bd33bed1c7de8e4956b61cfd13de4c18 (commit)
  discards  d835b5cd6e41ebce97bd23196eb6ec999f822168 (commit)
  discards  019c552cfe459c734264a8b1ae16a759aafe329c (commit)
  discards  624f2a42fa9f119d53e4462b67cc6bda362fecfb (commit)
  discards  b6fbe7e648da01e0a5ac5782c7c15800b1cab8d1 (commit)
  discards  c935e3e56d7fcaa85f04bcc42b1a27010a720ff7 (commit)
  discards  79e64b74686c57e1fc74536a1b3909994c2eaf9a (commit)
  discards  53686e766b2fd0ec2d1d9ef7e2a6313c86b4b3f5 (commit)
  discards  095040877ea8ef3bc7d4342332edd33088ce5746 (commit)
  discards  ad8accdbf187327b4477cc55b8bde7d402800772 (commit)
  discards  578948e3531e17f5a1c49eecef45b02ef8d37a8b (commit)
  discards  22d4b85109a9c5e9b56c73e08d92b5722b52b05c (commit)
  discards  015bbfb551db2dcd11900a60cf268c0b8afe5fdd (commit)
  discards  137dc18dbe0d9e319c0c355f39677fa6639f0863 (commit)
  discards  ec9249e11d1cd7a460d1e14bfb593b0be560f28c (commit)
  discards  c111642e9d01ccca9b41cdbd84b893081c10be47 (commit)
  discards  580b668d275e294f486da1740f8c1891a98923e0 (commit)
  discards  b67cd9793939d61318794583811d4539a2c12b4b (commit)
  discards  67c05f988bde7ff47f1da767a20c1a9f1e771884 (commit)
  discards  e459c5bc57f9ffc784a67ea04d207c1fe0d2f301 (commit)
  discards  4ad38b3086a357647cc172662b9e5a1929d62d13 (commit)
  discards  84af91f9e53e6f0f5a091e357542b5a255650183 (commit)
  discards  74dcab9da0ed21e68082b0aef8b48fe37c6b62ec (commit)
  discards  7cda68d1f7df6b144ade0b7b3011c1e6609b462f (commit)
  discards  a0e58dce45943b079f3ac10dad91b77ccc7dd3ca (commit)
  discards  349e6373ba51ba9280161862e82dcca02d8b5483 (commit)
  discards  9867e1d54931982711fc76b9fe3d6e2cdd481a3f (commit)
  discards  76dad3f5e66a5574693d7f43eca9b3b26833c284 (commit)
  discards  70242203dace52753891f57bc4ca3a48acce900c (commit)
  discards  acc1e1d9662fa132ac1f0f4a5988353dec155a9b (commit)
  discards  06b8c8f9e8b3686b5fc65eaf414d673deb31cc90 (commit)
  discards  4b558b4fcf35d45b0d5996e8e1632b4213554991 (commit)
  discards  6dbb030369553f7ad5f0ca7494d54b3cfb92e9ae (commit)
  discards  4fdbef3baddf9ba53c0cb3d3f0e2436dfd322ba9 (commit)
  discards  a550b6cabe68601bd5e99552bc47b52a92832314 (commit)
  discards  dc7a5dbe375f4361999e3e04f011dce93e2217e6 (commit)
  discards  621450b6b9a67572e9221406fdf5d8fec530f098 (commit)
  discards  0a2d0f095d45ba27a510e2722324b7874541eb52 (commit)
  discards  0f04826ae48f4daf0449383dcf99d1f97d41a6b0 (commit)
  discards  97a535774ed70d522fcb418fb3971b9e2faeba56 (commit)
  discards  846c6354d7bf0a849508600a204cc31b6fdf939e (commit)
  discards  219b4d57f48d9089f2a12a0503218216eebc2749 (commit)
  discards  807ca28ea771abd34d807d718fb72288db52cc4a (commit)
  discards  30eda284766f122a1ae6b413cb051b685cef08e3 (commit)
  discards  7e884bd6b39776622b1f1a405ac0809125d8205b (commit)
  discards  1689752965905373b84d547658877e97469e8031 (commit)
  discards  562a7b835a999921cc395c76fde720f94d0547a6 (commit)
  discards  ebac33c84bb11f9fede15a5fc2d929ab5355331d (commit)
  discards  ae6c76eebc499d8213a991344ac030c90ed6af71 (commit)
  discards  702768c84b8622cf1dd1cf1a8ce526d7c0ba4a3e (commit)
  discards  038749405a410561763fef18fb6e7060ba586bc2 (commit)
  discards  72374d85246e15e99bf4d15936e2d22f977750d5 (commit)
  discards  a811f014940c1f53e3a6210d4be4c54fc6f00175 (commit)
  discards  06f8b429eed846e0cd1786e437e4921fe0dcbe8f (commit)
  discards  9c516edb5426949253d74464d923bf67bc82345e (commit)
  discards  25bae877dbfcd3c37091f32fa1b8ae1bf65125cc (commit)
  discards  bff33bd91319ca7bccb42830968cd8bd884fce73 (commit)
  discards  4f111cd25372b15b7e9f6373d08559edcd7c3792 (commit)
  discards  ce1280163f2d9000376c863f8967c3e31529eba5 (commit)
  discards  294e70c79a1611c0a58e7d82158afa203d57288c (commit)
  discards  06cdab9593119137ab7139a1c9d410063770da1c (commit)
  discards  c15764a69202cf6837dd0332adbba56dfa11bbd7 (commit)
  discards  4a91ac27ebb8d356407c45b92d0e23d845e5ccd8 (commit)
  discards  ccb0048e1f7ded2ec8924fee2cf9875a6e910f98 (commit)
  discards  aa8908efd51c8172fe66af931f35d55c5db61af2 (commit)
  discards  3d872399f7eb537e5c518b3892040fea90bf57db (commit)
  discards  d377a4d709f336104f8f281dcdfd91278a766d76 (commit)
  discards  f030b3070b5be3d274526cca6a0623333a9a407c (commit)
  discards  335e3c86608b67db57ca0567b7d8018c10c24468 (commit)
  discards  d547aa15c3103804818c7f53e6c1695c2b1180f6 (commit)
  discards  f626df6b7ddecb0a981aa083bd3b499e439babd6 (commit)
  discards  0ead59cc37465ae19341fa49691c29d50531bc3f (commit)
  discards  3f54cf9a0dc45d14efe7cdfe3b692b9a62c48efd (commit)
  discards  13aa4e24219c80dd1a3f0a26d8a7e12e5f22332b (commit)
  discards  bd34ac897765254bdab60c8c0a28d968f78b46d3 (commit)
  discards  b778e9d9bc948b30646ec0f2cd2b72b89994b44b (commit)
  discards  c6085fb60cd48c8193f70f347823c1a040d71b86 (commit)
  discards  a2cf4514150d4521593d058c0d23fc963a6bd3fa (commit)
  discards  dd048866a81b6da7c576b76d325bb64dcd65d1ee (commit)
  discards  fe02ec99b20b5acded62d8e516901ff7e565cfd5 (commit)
  discards  99bf0b1ef2d509ead3d2ab7238dced2a3c37f659 (commit)
  discards  df15f0f69436264e9e6160a42a2368369d78b740 (commit)
  discards  0d367b05485e89386f9c60584688b737ba62fc0b (commit)
  discards  ef1dba5e8d56295285bd424e875b4fcdcae6f456 (commit)
  discards  02309bcd679cc46e18df15919fc69402514cbf04 (commit)
  discards  ee2e0b3e765652061c868f27b34787a518002979 (commit)
  discards  f4ec141fdd72f19942322b6ed836f12be3117c7f (commit)
  discards  3c8a4f04e5d80cadf479536a5ab8f65fcf4a872c (commit)
  discards  8d71f4b52946e409c18f2a6a05a66baa5160a3a2 (commit)
  discards  3b27655763a7a0bf37e0683e93f5ffca279eaceb (commit)
  discards  52af5c52f8fc53f53c082b8976bba74dc9bba068 (commit)
  discards  13cbd0344b9f4a3ecf9e19c42f9125093ca9cc95 (commit)
  discards  311227b6d8629e4d6b65c8e57d706ae6fcb07ee0 (commit)
  discards  415cfd789dc86d9c7cbc5fbabd49e1f4e5799c02 (commit)
  discards  188536844cdbffd7be52c2b1b8ff8a9846d20cab (commit)
  discards  1a6b2941020c96a653c51397df3800fc93f50568 (commit)
  discards  9c8d08217cd578e1095254f16ccdaf1f44e25b33 (commit)
  discards  7deb590ad4cc23fee416327d3e785ba1fc506957 (commit)
  discards  752fe56cd3d850f12ed18cb35e1718639603edb8 (commit)
  discards  6d7df4d3346a67eed10085d99773accc954c82dc (commit)
  discards  d09a1e30cc63119df91a8b69761d81cb352d7244 (commit)
  discards  51ef964615855d4fad76bf681b8c1a3f0ddb9882 (commit)
  discards  50ffef22728c91aab4a5013790783f1e6cb1fff2 (commit)
  discards  9a8b76693d2a4af504111234e1bae4cfeab7bd71 (commit)
  discards  0d58a36ede819753219c5f417db001182ade3ff9 (commit)
  discards  2d1d312f9812366f5a84edfc3aecd3566f62b60a (commit)
  discards  fdbfbaaa3297b5a7f32a52822d9d80319ccfe7ff (commit)
  discards  8c951a35da6bc6554e596a6e07d3db1e61cd7877 (commit)
  discards  3563e4d356a96666981576c3894838deabcd4470 (commit)
  discards  f09e8b8efd4d898b974160fa3476b6f6ae29dab0 (commit)
  discards  e05685daf6a178f0ad9c65c8b27e9f9680711bf4 (commit)
  discards  ff7da72d3271cb9d4b1760c9c5a45b326027ee3c (commit)
  discards  b3bd0fb10ce3a449477913278646997bef23a988 (commit)
  discards  d62a6161aeca493054c4c42bab90897d41f505b1 (commit)
  discards  9bbd6210e900046e2dd8f80b6380afa2bca25cd8 (commit)
  discards  cdf2df2b38ba6744bc1fb00f451af286bf25c60b (commit)
  discards  3e00a76c4ee11f3721d602e1bbcd2d4363c03cf6 (commit)
  discards  10387bf9de790b468b93c822d0b6c24a53ac892d (commit)
  discards  f2efb33191d8ff719ae004698c6b6acf2cc0492b (commit)
  discards  5fb80a3cb5df6350fe59608aa25c6e983e57123e (commit)
  discards  ebdb05ed5c9fbaf5c5692b348ed252694dcc6c5e (commit)
  discards  e3562a65a1a99e918969bccc6bbac892416bbdab (commit)
  discards  b1b779ec2e7ae2cee14c0f199828ae956f4d3774 (commit)
  discards  89bca23ba2b5ae5cbd72ed8b1c2f33f9c9dd0ca3 (commit)
  discards  71aff424d34ad5ee5d8f0f223ffad1d978e8398e (commit)
  discards  05cfc8fc2bbb1cbebeead2a811204e3e19eb6621 (commit)
  discards  b102d212d64a6a056023c0517e0ec5f05e3471c8 (commit)
  discards  985b15af7291ed2d24d73d204d5a16c8a00bc52c (commit)
  discards  dba26980d614a72c9bb66a3cacc5a1ab4aceaf0d (commit)
  discards  98e2144e93b37a4175b0e9bf7489044fb0b8ffdd (commit)
  discards  4061f25c52e8c7593808836f2f76031943e43884 (commit)
  discards  51177678a0dea12229af368bfc6bf0f75b6090fc (commit)
  discards  96a701f6b628729dfab23fdad7c54eccb67f5a2d (commit)
  discards  fc22f0fe91b497979da1fa4c754ce4f615a00001 (commit)
  discards  809282e9a42b76d6f197ef8aeaa20363769a7881 (commit)
  discards  3c85babcd9d1ba0f0da9b0818063a0b71dfc18d8 (commit)
  discards  498e0a1ca143eabc0640db512bacbb18ba2b2ba1 (commit)
  discards  4e941134d17a09d87d452315a38a5259f4924b21 (commit)
  discards  ac9c06c41b9f5956cdddad0b872d2902f84bf1a7 (commit)
  discards  dd8d4374dd1f51c634b67ad629d7afe8a12fb18f (commit)
  discards  3155bf4537d145f0f06e679b16b0b6fca338fee6 (commit)
  discards  cf804761f8e0ea2f3faadeed5d373c2d1e2dcbe5 (commit)
  discards  9a0a1ee098f0f1d78ee0b96e018e035da5549248 (commit)
  discards  655c22a07d04ed1e5f9aff6d36b2e07834c835bc (commit)
  discards  014cd12be616724899cb753884e3d808386b9941 (commit)
  discards  e562910dcba4de9de3fe5138d19609092917c881 (commit)
  discards  70f065d1cbaff76b4e55b4fc6f778cc7d0b37775 (commit)
  discards  06763b65cc08f24882a1ee9eecc44b427ee99b3d (commit)
  discards  4a8b6430d970256653729a695b74f73cc2434fde (commit)
  discards  3ecf8efd0fde7480d0eaba58feab133478574371 (commit)
  discards  90f5ad573761bd65962d71d34d31a1beb754b7af (commit)
  discards  7f70ad89ffcef299009131765b497bed8d69766a (commit)
  discards  a7caa9c513fdbdbd4e81be70fce765bd2a6e64a5 (commit)
  discards  04801c2e3a6b2f133f8ec2996fc53435b5d37668 (commit)
  discards  7d049e7cedf462646f2be60f32b312a575f24e13 (commit)
  discards  a02f7296791f3f46a096c8409201c0b6c82461f2 (commit)
  discards  a1273a981c8b1e32a0c7180ca3c23e47f615ad91 (commit)
  discards  e690d0dbf54742881d654f8fa0519719f0119f83 (commit)
  discards  407bc1c646eba9dc40c9d0d95b38602593f210d2 (commit)
  discards  badb5d34778e640d6f7996b19e1c47c9e6055108 (commit)
  discards  c588e6cfc1ddf624134dbcefd9377b3c578f4f60 (commit)
  discards  405cacfba1357412406a03fe794865072392459d (commit)
  discards  7d9961e73a536661aca98cbb0d6f1a81edcb7b47 (commit)
  discards  cb3711876ab72b07fd47352b995de13b90781630 (commit)
  discards  33a603aa5558bd107a5d018daeb78659810a8183 (commit)
  discards  aac38f88d4016191dbddc65a4ad5d1bb3fd8c9dd (commit)
  discards  e3db575e2e29789127fa40b2a7690aabd873a0b4 (commit)
  discards  ab5e5a6292dbf461c3e53f57fe76bf0932dc50b1 (commit)
  discards  d7f72d1f7a85a5622ef081877ec8dd7d1d70258e (commit)
  discards  4d6715e4ed2993b6e9b1753683662e4f3d8907e8 (commit)
  discards  679cb9863aeebbc1072c24704348648c6e2a2710 (commit)
  discards  61032bea1bcf23516fab87221890965263b3b317 (commit)
  discards  e5cde94df65918cf4d51ef7b8747732a02a3bdaf (commit)
  discards  911120284f9d3bd8e9d98e20e5bd0f292a2c958a (commit)
  discards  d770c2f5291fc87c155628e349c39cf2bbee5d00 (commit)
  discards  bf034eac301d0242c5fe673bb062bbea95ac73f5 (commit)
  discards  1de20695659f40387671b10396d3d4b041c4e315 (commit)
  discards  7051b42b6bf090d31f4fd41257e3ba127e1137ce (commit)
  discards  a718b089b0e2ad6734eca170531884ee01c8596a (commit)
  discards  b9c08862c69eb2ffe4bc0751381b864db9607537 (commit)
  discards  84a2866d9f84a7d51378fc2ca725452db430c602 (commit)
  discards  dccb6910c78a338e2b0f7c524aab6a78972bb104 (commit)
  discards  af134fe2c3653881024f3cdc643adf4c5f994821 (commit)
  discards  26b5708919e7784cfa9abd6b5f9eace499e3a5ce (commit)
  discards  531195e9f309632580e4e694413ca863465a9531 (commit)
  discards  1d3c59560e1228cd37d983c02307c0aeebf76801 (commit)
  discards  3835aae6986b6e029771e14f785ca207778c70d2 (commit)
  discards  b02b83eb1312cf923f73128481cee636e7ce6e05 (commit)
  discards  0ba8ebecadb0f27058bab86db8c54ab72a43011f (commit)
  discards  4d72b88f4e7a0658747f84e7fa5fa7fa60fb403d (commit)
  discards  ed80406933935487e0fffd40e2d1943bdf782fa7 (commit)
  discards  453ed23d56f68b925a844227cc22ff8ce447d48a (commit)
  discards  3feb3f0150c0ad3e0b30141662032c4c2cc18a04 (commit)
  discards  3efdce58882651a6d47a9444ac5c91d09361eb11 (commit)
  discards  81df86a3b0cddd775a5173a08ac90e32e1f5c4d9 (commit)
  discards  5e3d631f78a11222f367d9e1f1c2320398d95f50 (commit)
  discards  71a8397f8cc55d23ef221e861664a4c9f4254e0b (commit)
  discards  85d699437bd63249cdd7e7c87b3cf70b5fc677bc (commit)
  discards  9a4eb88fc1afa3011c335641a3b4f20e163eb844 (commit)
  discards  ffa1da029374525f53556253b6e2d83c617991e4 (commit)
  discards  fbe7f4d4aa4c049a5a9449a828f04580a0d33af4 (commit)
  discards  fffc133b68ab4d1169e0dd4ea893e3cb0afd4335 (commit)
  discards  06c13d5d747fb11c34f4249aee6ffce01e503a2c (commit)
  discards  018937405bfde0c2ba6d7f5407041a8e884a6b5b (commit)
  discards  01619b45e17af1f362ddbe9f1872a4984ae22617 (commit)
  discards  6dcdb100fb2a6e7be359c818b03c6bd14dc52893 (commit)
  discards  5ecf990ae8afbfcfc46b50be4680f6439e5e1c2d (commit)
  discards  14f74453d3650c52e69f56c2d088083020719422 (commit)
  discards  237b9b330ee34ee1226bed66e1edaa3b9be332aa (commit)
  discards  7d59c5201a424c43fe76f9962f14f949a4d33bb3 (commit)
  discards  db22abdbf75844ef694ca675440d4d838eae4878 (commit)
  discards  cdbb0c937df588536ad878e94d6c8798bf3dd0c0 (commit)
  discards  4edcc532b3a326a6a673d3631440ed8079bf662b (commit)
  discards  a50fcebe895525035bd7ad8eccf1be2a3facde00 (commit)
  discards  6254fc83ee80504d2c058a2a70198b587e0c3d88 (commit)
  discards  ed766d6ad2b3eeff6493d420297a3c35b07c71ef (commit)
  discards  01a4ca49b8a42da249d1b1eb64dad4d27a85fd2d (commit)
  discards  a8e26f88de9cc5ca38b264a34ce498a1808d8c44 (commit)
  discards  e32877b0f71adca5879f5e04f8f9c6f45d06f52f (commit)
  discards  91731c0eedc11154ac4b32952a78a3cd8a1d8edc (commit)
  discards  997a110a80416d40307eaa2ea6ccb52ba47c9eb2 (commit)
  discards  05ba09fc6e695dcbca39289c756f15c7b02f3e5b (commit)
  discards  28fedb192175668668e02e0bfd47fde337b83899 (commit)
  discards  9dbd3a493b0161893d04737cc3dad30fb8677ab5 (commit)
  discards  522849475e6cac31516e5dd5fa169f2f949a0171 (commit)
  discards  ac8f6bc505a27dc8699068dd8a5cb7dc69a5b93a (commit)
  discards  5ed2c9a236fac1ea9ce747ff0b661e810cfe2ff1 (commit)
  discards  f0040c0691a6f7ae4a15d434ca67caf53d21b9ea (commit)
  discards  876a84d245efb41a2bbe49e4049da5c2a4c1d660 (commit)
  discards  d32c4ee7cecd8a27e20e0ebf8c274ce2c1532088 (commit)
  discards  40dc076bdf6ce81580ecaf3aff25db4b7a8a5dcf (commit)
  discards  236ff08cb78fd3da9bc0a8bab6cfb2c7a43a79d3 (commit)
  discards  b64941dee7f79af5c1a5c006e9171a8de3ad81ce (commit)
  discards  7ea1da1a2f2fe5fe9743190b4c7e2232dd5e81e5 (commit)
  discards  012f70919b847b7644d724ec178e2b3052150901 (commit)
  discards  42be35d542106cb2fef90c8649bd55f11038c453 (commit)
  discards  1e55cff13198c644f6a3c3e31b0552050dd8fb4a (commit)
  discards  0ad175bca3aadbfa7cadd0a09ff839b01f9d681c (commit)
  discards  08a3581f34c1d83ae8aa3f7a73580477c3dfc6c1 (commit)
  discards  8d2487be5758143e5a6b6f9da3bad09db46c46ac (commit)
  discards  b4927726404d5565c573ae355b163f3cdc0421c5 (commit)
  discards  a60ebcff7b3b0fbeaefafdbdeda5f54535423f4b (commit)
  discards  2dc198b221391e33b4c1f204b1d7d4e2347369c8 (commit)
  discards  309ffd8ef0e2da664cb459d06ca20f0838dadec3 (commit)
  discards  a7f55ac9f1b720a3338948f6c6883b3658f9d27b (commit)
  discards  2c8b9f506a6b8bdb2a9f036c1c7566adf5d4c5ab (commit)
       via  15d314cef30f00cf4ef57f625e778a26a0dd6bfb (commit)
       via  098160d5f2a1aa35d2f14c585dd87cefd8f56f41 (commit)
       via  9da936e49d5d5eb3b60b2697eb99f2e4ed9809aa (commit)
       via  cb01f1517051b577d571e8fd21d210ef303f56c9 (commit)
       via  1ac598f53b74009bf161387894796199348747ce (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (bbeb31062cc15744783b3fc303d5ba29f9be67d9)
            \
             N -- N -- N (15d314cef30f00cf4ef57f625e778a26a0dd6bfb)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15d314cef30f00cf4ef57f625e778a26a0dd6bfb
commit 15d314cef30f00cf4ef57f625e778a26a0dd6bfb
Merge: 9da936e 098160d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 10:01:32 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 5 10:01:32 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:
 Source/CMakeVersion.cmake              |    2 +-
 Utilities/Release/upload_release.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From cmake-commits at cmake.org  Thu Feb  5 10:05:35 2015
From: cmake-commits at cmake.org (cmake-commits at cmake.org)
Date: Thu,  5 Feb 2015 10:05:35 -0500 (EST)
Subject: [Cmake-commits] CMake branch, release, updated. v3.1.2-1016-gcb01f15
Message-ID: <20150205150535.77F87AAD6E@public.kitware.com>

This is an automated email from 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  cb01f1517051b577d571e8fd21d210ef303f56c9 (commit)
       via  1ac598f53b74009bf161387894796199348747ce (commit)
       via  78c4418fa0a08b63a944ac66821e8bd95fdd73e0 (commit)
       via  af8d1c17e663cf424ce4b5af9351849651bd6fd0 (commit)
       via  f9e05ea0d47eedda997d024f3ce7bf1be4f812d3 (commit)
       via  02d031827d824e15e902b95f833b77ca7379bde4 (commit)
       via  9042c875dcbd0f4b7150e9050b60fb0d40365e45 (commit)
       via  0ae11b1fb0925a172adcc7cc3c9b804e2ece9ba7 (commit)
       via  5c29e8897223928855eb6af4d95b063565f11202 (commit)
       via  f55a2b2ac208969fea684664c812a368137aac8d (commit)
       via  d81bbc3fcee81bf0538c139637e0344c9fcad40a (commit)
       via  0f38d9c2ad53631185da9aa7d0f50b5816272a55 (commit)
       via  0f580e8e67fd307c21924dd732570937a0db25e2 (commit)
       via  e08a78dc2cf04682010a3d4496b4c454271f194a (commit)
       via  3a4381b6605f593abc9d9364f5ffa3fc9a209854 (commit)
       via  ebe1f4f896a18dc09bda431233a5cfeee5b2327b (commit)
       via  fb3487a9975ed321b48fad5c71dd655d66b68087 (commit)
       via  6027798a30eae02175ce4ad13e1439f4383b6cd3 (commit)
       via  9d767810e1e54eb9233854f0dbf1345a0b5be60f (commit)
       via  72537e4436a17535af5424628adef3b614a61679 (commit)
       via  82c9d6868b87a964214a468cae816642950e70b6 (commit)
       via  219797e4befa19a79d2d94e0b5a2bbe75415606a (commit)
       via  f9839c491ef926b71487345fdcc7054324587168 (commit)
       via  44d6f3ce0839ba0407dc095d1edc1f30e732b719 (commit)
       via  ecaee7caca4e3d4528e643736c0620e785e84153 (commit)
       via  eef9a476179dd91c69d30f937e742ea484436fc6 (commit)
       via  f560fdddd19200f994fb98ba5576bed34938a7a3 (commit)
       via  ff90f49d188b4e700abe31afe66c31f38e315648 (commit)
       via  be072d3fe1872651ce03ad8258bef23e1e3f795c (commit)
       via  8f820043684fa8a11289061297828bccce7ba080 (commit)
       via  809a5a5e2391484966614f11100de956619adda6 (commit)
       via  5f3778571770ccbceca22aa18ad06f1779a3ca5a (commit)
       via  2fed8e173cbd8c897b0cf2fd46ec72fedc3c43ed (commit)
       via  03c0812c41d4db2a48687ce0c053452906dfe69f (commit)
       via  8caa4e72abe4393914f4dcefd1621d3c86a7d139 (commit)
       via  5c828cc89b4f78eceaf0402719cf5693a6627935 (commit)
       via  30cb628ecb31484015136bf6065c9c40f59a9297 (commit)
       via  aec11372a5868694937b1c232af9d7510ad8497e (commit)
       via  99e3650e66399e75efb989322d4b0146c549dbfa (commit)
       via  1acf36241fee134faed4355be2c9b5afa5500714 (commit)
       via  460f7bcb7d11e905ee025c9d9cc9629d597fa91b (commit)
       via  cf38f6868536e8439bc84d57363dcc51f1fea998 (commit)
       via  8d69764d06ba0dca6e1e15bd5efeaac640ece49b (commit)
       via  68b5b23b3bd948ec15f2ebed2154db8ab50f66e9 (commit)
       via  83ae27dcd18a746af35434bede9e3a7ee0aeef9b (commit)
       via  a01f81b9064a31760787bc6a2fb9305ef97117e7 (commit)
       via  18e3771ac7c74986a4f06221a72781ace54b1169 (commit)
       via  36a1ef43daad760136deeb8f9934266550764c58 (commit)
       via  edc9ff9422b7730a11aaa9a36458f16a5800ec17 (commit)
       via  db4b9fe25673c252a93c15040909d328dc83dde9 (commit)
       via  85fe9400cd68805501d2cd98cf7375c8845492f6 (commit)
       via  e62e04f3bbad6c8bad7183c16c966d20f1aa66cb (commit)
       via  fa5f5667763988d7856b98227b5cf74bb42a8203 (commit)
       via  55e68bc99e62430ba2a94410992effd87bea7e33 (commit)
       via  81221b80e2d74d120bfb61c62e07e3f7f1b9929f (commit)
       via  d3489bdb0bc58b36f1e5ff2baa0aee8f4daea734 (commit)
       via  3cec0c75f73cc3d5c68cbb9e03e94ed38d60d0a9 (commit)
       via  dea1631a8f48bebc7402739de58841b8cdf97b8b (commit)
       via  8a93d3ea1806229460f16c447b3d5ebcc80ed29c (commit)
       via  3228fc5049e72e6d7584a6f3cec6055b8a726817 (commit)
       via  500794b0db3d7dfa121069f336b69923839bada1 (commit)
       via  4c5574a15d6458673c410622e501ba682a783781 (commit)
       via  3ec025472735c22cb90b09bc171190005dd28bb1 (commit)
       via  ea7ca139ea4c3c88e432e722c9cfe1dd86a4359f (commit)
       via  326cfe2b30f0223ba676b966dc49a74972e4e4fb (commit)
       via  98659aecfd819eb1e7771f7420933316a628b057 (commit)
       via  983a98e5b8118ff5063400d8ffac7a511ca8002a (commit)
       via  abec4213d61cb74aba5da6f83220b38ef7882209 (commit)
       via  ab9fa54d4841e5b0eff8d241ad8edb47401b0394 (commit)
       via  3526daf5a2667d4bf8aee442d6e73f8b71ea6efc (commit)
       via  5968ad58fd85e9703c36cd9154137f24c55e5413 (commit)
       via  11e2e6cadf7f0ee36b7ccecaa11457949382b75f (commit)
       via  e4055a6144c63c83fe2f39440ecfb9a0bcbfae0d (commit)
       via  de4ccee75a89519f95fcbcca75abc46577bfefea (commit)
       via  b7d7b306541a8ff1a7e8384f5c44baabec3ec94d (commit)
       via  6a0a4079efb032ec993b73358037b9bdd33dcfa5 (commit)
       via  4775c90145da7ec8a5a87ce5b8b88dc4fc8c1925 (commit)
       via  0d59fa3ca4943e1ca5da36573b055a381642332a (commit)
       via  a47b904db242abb903a968bd6109bc8a07d3c39a (commit)
       via  1f77a7001b2e3f8f9224cb603e5acfee45573064 (commit)
       via  c1f5d6e6f54f8b61d223476459970d336098429c (commit)
       via  8eb30339b497a04c4ac2d0879bbeb764a6d51133 (commit)
       via  af9cf04647a14897b4402447c04117d82fc6e39d (commit)
       via  33daec1ae96752817a268fdca2518032cb9453f8 (commit)
       via  34ce0dd22f1c2091c5870e25677b100f753c44a0 (commit)
       via  d1b3370d5210d4262e58a523d19393e9ea9ee782 (commit)
       via  ef6d030c95e813ed368ac28b55110cb0f159df6b (commit)
       via  4ef0f7f62f3944eed29031ab9878f7213c7dd402 (commit)
       via  095fc28a7e077441daf2e3e59fe34f85f3ea6775 (commit)
       via  7f2dc8dc54fa6486423477dd673725bc40d3fdeb (commit)
       via  bf05938b8f186c397c918c1cf8bd9ce853c86123 (commit)
       via  daf95a38277f4c732987933a63143dde77dd0a10 (commit)
       via  bbffaa0e6cf3802644453713e80a84345e96148b (commit)
       via  70c50962fb405cfb89637f24aa38c3e0fd5cbd87 (commit)
       via  43eca4026def688e27c981154a36948273c6497c (commit)
       via  82ba50390f52226bdd4162e4108bc4f5226150d6 (commit)
       via  67e76e82df0fe8466b4bf65265d0c6b7f6046dfb (commit)
       via  3046be77847ce54baae1d432dec224282dedcc16 (commit)
       via  4c49ce96d7dfcf902d1af627a733ba732cb9b6a5 (commit)
       via  44fd71decbca329d9cdfc196a073a62668af53f2 (commit)
       via  8ced6375dfd366a088c681e45c0d8cdb4ea04dde (commit)
       via  b46a15194b7cf1d7aaabf9d0b2a80651ada2e23f (commit)
       via  c19539c594c4099fd4de68c2e386347d1cb0667f (commit)
       via  19e57a48cd1ad562b277c8fb9dc8285ef96acfa0 (commit)
       via  37473374f969f476a7fec87cdc3465c9ab8f99ef (commit)
       via  8def82585c8fe81de8ee4c852f8065e19435532e (commit)
       via  d0adcccbf4321437f5ecb677c7f88b3e4af484ed (commit)
       via  223c5cb70b30b6a790fd916321f60c86d459e15e (commit)
       via  e2b1f0583f7293bce280dfab397e96acf8a5b26e (commit)
       via  7fefb97ed770e8ac32729cf50be52e5c913bd7b7 (commit)
       via  a65f7944a018f255d50e80ee45a6cef965f9b508 (commit)
       via  cb243cce13e23882ca5d39b860cc747812874f04 (commit)
       via  dfdcc42c60c723200a0ec9dc0c49e9765384733a (commit)
       via  1337576b24feef973fca7cc45c695b495b3f8a5e (commit)
       via  6cc0f6b512d08caabf088d22f3f25432e6307b6a (commit)
       via  539c5c252ef679d15f3af828da304ad9313640e2 (commit)
       via  e71c35ff26df370121871dc7cc7fe9b585dac570 (commit)
       via  494f6e8d5b9f2e556a2b2db2c165a56c01fd1827 (commit)
       via  5a9d54a67a90aeaad87b7366d6f41211529e6c41 (commit)
       via  391748d57e090c53f6c55ea265e038fde1bca032 (commit)
       via  0b9aad7568bc5f1cf56e01fe2b3dc57f5dff5133 (commit)
       via  23bf98fc04eccc85f216fdab4166107c3d958d43 (commit)
       via  97502ba77b6d589e2ff48a22b703f6908d5b5fdc (commit)
       via  a4605973ff116d11ca96c7b06aa6516bd638429a (commit)
       via  d5d3d0c9e43004d139939fa71bf3901fa96ce756 (commit)
       via  097e26f4908b3099f112c3fdc5e043234f9adc53 (commit)
       via  154bf8da991a6cbc82e5ef89979549b10d19f561 (commit)
       via  103f77e5122edf60b51e5c49af9231b657eed300 (commit)
       via  7961171db522619ea2a46c378359108e7a2a8bb8 (commit)
       via  29ef8fb5be529f87b7e18a728604268cc008a9f6 (commit)
       via  9f559a26080a7c76210277999385e50a9412300c (commit)
       via  0bda22f247bffa75abc184e96451835f4450145c (commit)
       via  6e66fb6e88305e7b906f60882610bac48fd7146f (commit)
       via  0abd3e538eb92259e52c3d330e46dac7aa0be332 (commit)
       via  6ce346c53c67ba970cd04f0d8436aab006dbec71 (commit)
       via  c99e19a4ac7e6e55345a073b13c36befaa8702d8 (commit)
       via  85857e6d1c1859bdc8ab4206e0329e846b6ef020 (commit)
       via  ee38062be8ccdb7f4c53156ef00db0d42a41a6a7 (commit)
       via  560b3e9f1df04808593997e7d1f6ac43c7b0c141 (commit)
       via  98bf613cd09e2187fa5002dac06e63d5450dbcf0 (commit)
       via  005b409d6acc5b681b0614b778c1c3e76a2227c9 (commit)
       via  c0298947ff664d200b7b2a86ac6e84c1c76e2fb1 (commit)
       via  f3e0b6f1eb8deba06e6072156bd9b247a559c9be (commit)
       via  53df9bce19586858ad7c9b0e80d660433be757ed (commit)
       via  57f4c8346206d129d2ec6576b3fb0b7862566311 (commit)
       via  3eda92df914f9e07775f5026ebc32580e743ea70 (commit)
       via  529293e344106a7132983a8f166a36e835fcce87 (commit)
       via  be2a74dbcbbc3a6d6af8ccb0a70688e4db0f6901 (commit)
       via  374a66b58ced947d9713dfd6f439a52b6646e923 (commit)
       via  afe99212d2a872da63bf027766c1ab00ec841680 (commit)
       via  40c11f0f62af1365cee44111429946862b5cf93f (commit)
       via  afd998373da0d0c39266b5c7a078ee48aa939554 (commit)
       via  ef97cd8587e7f8d4017b18147aaaca0ec5cb9f0c (commit)
       via  e56c93279523701d8f044372fcc451ce50369b93 (commit)
       via  bebdb4540b94aae3f213af586dbd7d1445ef25e5 (commit)
       via  965a50dceaa0abe2ec5870efcbc8ac0becd9615d (commit)
       via  7f4154a4aa4bb121bad05884f48466489e346821 (commit)
       via  f40c19b5433aa601cd98fabd9491edc9aaf703b7 (commit)
       via  7e468cd8f99daecfc1197883a0fd87bde771309b (commit)
       via  77444a7d486c415508a9c754fd4cc29cbb33f12f (commit)
       via  f709776864bbd94c7aa839248adfbfe7d4f5cae6 (commit)
       via  9b4d4344c67bece5b8074f6fc711feb6a169121b (commit)
       via  27c6da933ec1dd4028bb80e4adf2fa7309ef4a04 (commit)
       via  6dd980e0ef1254a6c3098488e6677f5eb4f40a86 (commit)
       via  5dc33f89b5405f1fbcefb9783ea2050a3686d7de (commit)
       via  17cfa09eb2a78349a6471e4719bc933dd0625d9e (commit)
       via  0238d0c397e52a82f20a0b7bf5aad9a07f36133c (commit)
       via  bda4f0b661018b32aefdb14887d8137e7a4fd118 (commit)
       via  a02fbec5f3eabf7847583a7f45c092ef6c066546 (commit)
       via  1ef4e3ab4534d0b24031045a476ff223574c38ec (commit)
       via  770131c9731b3bb6276816195ac6a22f63847516 (commit)
       via  86b6cbeaad642f4479b1b089edec4837ce0da48d (commit)
       via  481c5fd31e99b4aa0277dc76c7a201c627f3db79 (commit)
       via  4970ac3d5fe1b0bc3519753fe50e4397c074353e (commit)
       via  cf17d41535962f4b94ac45a3d5870c59b63641d1 (commit)
       via  70eb44b7dcf86e23716dc0e036941abe887bc756 (commit)
       via  a6a1adb59fc0003cbd520e7994c3cf1d05df54db (commit)
       via  3a60c899fce77f221cba670b62c90fe2d2daffed (commit)
       via  90f9c42732a18e53943c3aa27de76c2511c5a0c6 (commit)
       via  3c0996c135198fbcaf8951cffc98e3a1570e756d (commit)
       via  8dc0c976661ff048c346d6c68666bd7056ed84a5 (commit)
       via  813ace90e4d02a782176ea13bcec15a3e9338210 (commit)
       via  137a15bf1da72c795d8eeded4ad3848a5692dce6 (commit)
       via  0898de99cc085fee8534369aea27e9333b53d694 (commit)
       via  00194ea752ed02dbe70a808b337cf630735f2894 (commit)
       via  48984958192029f57338f511885eed85d1963f94 (commit)
       via  2e71d92ef270c4234368fd2e88259c0defbfb650 (commit)
       via  fc9204efcb7cd77562cf8cc76baa58df9841649f (commit)
       via  76f7eb2e4a359a7c978efa19fdf71fe1ea46b971 (commit)
       via  352de1d74960dea4db66ac560ad7e4489546f2dd (commit)
       via  9de2ab7fcefba2bc9ce7b483f1643b1d97d58e43 (commit)
       via  a6bbbd0f4a9ca9d683000f3302842bc25615e57a (commit)
       via  95d42840e88599ab1959f7531668e320a7c20fdf (commit)
       via  a1fea841a92568c0bdc35e1c8c7a400b20459a96 (commit)
       via  a5be8e3111ff0b6c656facd603c2e2d972d61671 (commit)
       via  953272b725ba98358f262588d89c75bdd3429367 (commit)
       via  e320640bcf2323e54add8a7c920b406c4a652816 (commit)
       via  5803ae3e88e922c06ce835eb7bdcb5c584420453 (commit)
       via  373199b1c922c6897e007fc1c8fa684aa1a8f707 (commit)
       via  0aebeb9c84086b19c56a3ced5c95c60063ab37e2 (commit)
       via  6164f7cef637a226fe1c08cc0cce428a8931ccb1 (commit)
       via  fa889c4d2f49ed4b3edc8e7820b4d9bbfeeeb2a3 (commit)
       via  8211010c3f0d262cd7d300856f34a3af01f766b3 (commit)
       via  b54225732f6b46c8f2ab0b2dd76ffa04d173b2f0 (commit)
       via  92a37f92791f801d378b49fd86f097391facd02e (commit)
       via  aac44e71e6a6c2630f1c1e61b34cf91aa775dc02 (commit)
       via  004e1540e0870e9b3bde19ad16c4f50b7d22df73 (commit)
       via  2a5ca650c9f973c83fe3d5b070f6313e1bd536c1 (commit)
       via  1ae2c6b2c9def9f0d0db3a808290d485eccf062c (commit)
       via  c66e3317492709ab3b830024f67021dde67a7fe5 (commit)
       via  c43a6dc5ec2ac57d8334beeabf90de43e8ddb829 (commit)
       via  5f69314ea65ebd0de23484e7c91bd12a8bf861f6 (commit)
       via  fd0c036c0c3e5e6be685e64caecdcbad4b3e744c (commit)
       via  f09fde2d21ef0c97f0ed1b8c6849f0d7055bc24e (commit)
       via  86b5bdfa0874a0eb97d726fa9dc2f534e5a67c7e (commit)
       via  fd7b37129360364531ddfeda7edb6e34ba773d00 (commit)
       via  aa773035b7f4a1aefd860d0b9e80f134bd4a4547 (commit)
       via  64592633773004df83cdd790b9cb1838503ca854 (commit)
       via  607e19384f19fcf8713ccf0377e0255084ede785 (commit)
       via  930bd4781694ea85a876c08c34a2dd8243688920 (commit)
       via  d92887efabad6a91e221588d0dc7a0bffd91a9f7 (commit)
       via  f3e92d281682ee482b1425675b9fccd372cd01f3 (commit)
       via  681d965df18fa55a9eaa615515015ac088ea0805 (commit)
       via  4dc0c488f94a5f0c7ae04fd15b46a92c20fb03fa (commit)
       via  782591350ced90d4289d220f91bdbdb4acec2ba6 (commit)
       via  7b9fc88b045fd34df73e3cc864c9ac924a449cd3 (commit)
       via  e11f8d6446badeb0f1af99f567e4cd9c5c65783f (commit)
       via  59e6e15cde911e182e471df5b99746e0e203ba43 (commit)
       via  bcb04783f7abd1e7781eda7499b53118fdbe8000 (commit)
       via  54156d723a3fde678ed7f884364ad0449d23ad2b (commit)
       via  536c535cb0cf245a1785d436b0662f7fe59ef1e4 (commit)
       via  d84d6ed409c663573a02efa7d2692b6829d27c46 (commit)
       via  5d57970dd9ddea70163bdd3c64fbf365a15af9fb (commit)
       via  7dcdfec97fdefa90bded7868a638277d7c9903f1 (commit)
       via  69182ce4ed95c62d51e208c8620ff4e6599dee2e (commit)
       via  f8c416f00c9d263556cca9d9dfc0c71913bdd7f3 (commit)
       via  8b7db43bc694c2b89b1309fc875bbdb907a90ceb (commit)
       via  ba7227a0affed01c67f7a8994bd9373b212314ea (commit)
       via  770ba876997d1038acdc1d54419152abd0970312 (commit)
       via  287070ceb8eda82cf58595c9ea2dde57b0d6d45e (commit)
       via  36428fc5273fcdc4a4c227a932de9e07c8f9d2c8 (commit)
       via  c15a2fdd2ee3552024c3892bb798bb956b4677d9 (commit)
       via  3cca39b46db715bcfdc7fc4a02210c8ab4cf572f (commit)
       via  9d4ef584626c4efc882f362e7d46e9b2d8c66045 (commit)
       via  cc475e812949b1824ba7bbf7dd1a417a0962b77b (commit)
       via  ed4b95e12fc9c9bade9b25d117254863dbad9e2f (commit)
       via  cdc29c36084ccfa447f171a25de2336b0bd74edd (commit)
       via  fb354cc59c3fdd358f77b2bd97b11db0480c521d (commit)
       via  b15c008fac22720ccd793b18c235046bc84ecc86 (commit)
       via  f13a2eb118d8b152a897e09fdcf43793f8e1bcca (commit)
       via  1f19ac4da5af812891be305721f3e3b7eed62cc3 (commit)
       via  0798d1e5b0a09564b127ae7d26d8c1ea1bc9adad (commit)
       via  938bd94eb0b34e1b5be12dcceaab641efc8a7e43 (commit)
       via  462c630b8a6d832dd37562fcd7b00a75e1ec6e82 (commit)
       via  222ec86f7d9ae838d2e460b89985c797c7c90373 (commit)
       via  6e909035af73d3ee0ca3e5adef39b4541f0c8be9 (commit)
       via  bfc995cc3b8834281ee86ea2ed248b041d5ad1be (commit)
       via  1532b9214f79517fe74dc674939601c75f4af300 (commit)
       via  1f4649e62f6394a6e9af67486e4c41f3e286de47 (commit)
       via  a60027a642f887179513496ef61552db44829652 (commit)
       via  06ff525492b32cd3182c185c908c526379766912 (commit)
       via  6c121924ada1f26c485c628279d6501406d9e3ac (commit)
       via  6b9a0e17970391d2f7143ed9c600d5ea50dd6b98 (commit)
       via  89cd3d273deadf0b6a1c6b0dc8db153572e75845 (commit)
       via  7e310624b0973b8f0c529837010f164e486e784e (commit)
       via  4c49606598ab3089f0cec9be724ae2f3ab4c1ba3 (commit)
       via  50032bc847a79dc209e6e1ae4dd77a2ec2d52be9 (commit)
       via  ad94b0521eb3a0e05c120b510d047dd18b27c9df (commit)
       via  7eba04fda156f670f8c84f3d6a9d9b44a472a04a (commit)
       via  06f41e986c25fc2fd68074fce314a55f5c1d003d (commit)
       via  1fc556536e0c0475d401e8b5747b46e9f7c32287 (commit)
       via  84d5674d4e0cfe30f28db2893ad00937deece57c (commit)
       via  829fc5ad791d6f292d87db5e98c8d5ed2ca9123b (commit)
       via  0fe4d8bb3b9e8074f7efd95ae92fa32fe29a2c02 (commit)
       via  945571db747fd09036d0efd55b538dd4b3c8b874 (commit)
       via  a32b2245ca8d77da5b8218bcdcc6958016cdbb48 (commit)
       via  531e75e0b73f921fc02983f19a07141c867a752a (commit)
       via  f3884b47ec64b80ad31da93192188f05f60ae5d8 (commit)
       via  4ab5c652b663377afcdcaf7cda05ac8746b7d21d (commit)
       via  811a29c9507054e3301d90d5d376d0c6d6caded1 (commit)
       via  80a6c38d98d12f4b5d6411a93e67863f163f0da0 (commit)
       via  e7c1836e044689c0a55d9fcacd94d88ef8b9ec19 (commit)
       via  ff1727af778301c2a53007098bd31fe7b9af6c40 (commit)
       via  b4263abdea04bf445c3e99be3be627dfb6c3047d (commit)
       via  9cdc2f38edea4b2d1b4421587bbe9b2a83999d4f (commit)
       via  4ecc392b42e999e3e103eac0c0e28fa63c39167c (commit)
       via  6418eef222304db9a884a3cf101f86c2eabfb503 (commit)
       via  44612e74075f751b01950dd0f00e86d61f9ba05a (commit)
       via  fa636e19ce42c7523c4858ea697376fe94080097 (commit)
       via  526a80b32a28bf3a1601ed086bba10f9059d5940 (commit)
       via  1720869a7e287786e5d4f5c85d07bf418dd81782 (commit)
       via  49bfaf2bda8368cb8398313bed8f91e3aa8ada14 (commit)
       via  101a62aacbcc812263439ca42faaf4f2419b6119 (commit)
       via  509f2713bfa0a289851dfd8d6e45a356adf233b7 (commit)
       via  23c02d245425ab15d6d0a99941355488ddee8cf5 (commit)
       via  da928d305b10445c2a736597d87fb2a8c4409eb7 (commit)
       via  1f085e11e40a20f8e8702da7920e950e47deb27c (commit)
       via  85d3173590e4bae63e8422ac8083a77806491b92 (commit)
       via  eb7b060dc4b8e5e15d4f612db5558966c22d2315 (commit)
       via  a985f1b1f64c4c5e515e1859fac7a1281add254d (commit)
       via  28f44670c807e4098d71504d9f5204c6ffedc676 (commit)
       via  ff880ecea13537a45b914fab05ac4a3c26287f2d (commit)
       via  dcd72a740573392b2074bbea3d9d992bcd8959f8 (commit)
       via  31cbfd41dabebd632c66c997565eb4a3f9fe6533 (commit)
       via  f121b6b12856d9b0f6f7131f492d70602a023ebd (commit)
       via  4ce110bbbac36362d8f3fbddb0b405320695ed36 (commit)
       via  0b7e7e277c111d274d7dba378273f77d5b2a4fd7 (commit)
       via  0d7176b2f7298fc818a67d004e3a3e5d392a68d4 (commit)
       via  a3513ceea9909eda524863ca2024621cba65003f (commit)
       via  68857ccd823088caf240318f2a7b39522fc383da (commit)
       via  74b8f7862291d795eba525f3103f1370b8ec7518 (commit)
       via  37fd5b87f867351517f469ce02b76bef984dc2c3 (commit)
       via  2ece34516a6c4f99d27c42018b3548d0cb75e72e (commit)
       via  65b81da458614c6a4652ea2e4fc933893c671281 (commit)
       via  30d2de9aa82196a12f47930e736181c48c568585 (commit)
       via  4a6e795b0c5cdafbc78f12389ec20d6bc4f9ca34 (commit)
       via  abb4a6781f96b28e4c30014915f566dee9130db7 (commit)
       via  e4fd66b1922c10e6487362c8921669925742309a (commit)
       via  a263d519fffab082fc31f8e3f454726e3fbd8363 (commit)
       via  53f6ccb0ee76a2b9ac40abd5ec5e07aa55fbb393 (commit)
       via  32fd56b066c28758e31ae97d4b16216b3633a843 (commit)
       via  546906243d21727ac6c1bab0210fc028ff80c3c0 (commit)
       via  d61c6df2fa9161d784a71b05e584cb1e944a182a (commit)
       via  3dec4a2bfbad7b519cb1e7c9aa72dd2ee3c4e669 (commit)
       via  dd6c596c12070c0fdc71cb11ac154e99111fb6e0 (commit)
       via  d9a6ea4599eb3b736b4e695a9ffd5d8a51eac059 (commit)
       via  212bf1f82a522b7ee779b008a14c2e51fd104e5b (commit)
       via  4035ef786de80d4d2fc27cd5f03c629702f54762 (commit)
       via  d811d238abe2dcd04cebd7ee4c3f07f4b6da093f (commit)
       via  ab74553db49dba6a1d2219f8ff8545650ebfb5a5 (commit)
       via  cdc688eab0f6b1d5131b0b188c5ba1860775af1a (commit)
       via  c59cf4f96ce276353263f2d06a54c4e1da1ba27d (commit)
       via  b4f62b875b135f94ccc587f1937db3347fd62198 (commit)
       via  af0ee419553c501cb81f6210b9b1f724844c3dcd (commit)
       via  7f5b4940e1e1d1c40a37c9d9516a5df397234c21 (commit)
       via  c9f3e829e70502f0cbfc9616d019950ef81ef9df (commit)
       via  63412a85e0e2431895bf4f2122d901e17f4c51b0 (commit)
       via  b5a467262b61065ed5d1b8d545cc2ade548b9d0b (commit)
       via  6c61ffaf9b1616e6938b78ca19f17f9a9f87f3ec (commit)
       via  9fced518582afcb0875648a278821f7b82f536f4 (commit)
       via  89e08de8c2e7833461032c9309e1a6416ba35438 (commit)
       via  c32f691944b6b7629de7e6c1366d269a6b54fd8d (commit)
       via  222ee2c05932489f6b5879e423c3f07fd7f67996 (commit)
       via  99b13820715ff3b98c2c0cb114b38620b6da4466 (commit)
       via  16d68daccb41ca97b42c0074f0de35a53448d8b7 (commit)
       via  00f66a045144a363b497874613457fe0cf80683f (commit)
       via  30289e07ce138598e813ae24d37d7191b2eb9935 (commit)
       via  68f9e6724275e2b0fc05604163c315e3392f8d93 (commit)
       via  56324568cf24263f23523caf4dc6a85323c0d56d (commit)
       via  20d60c636116c55bfeaa7ebd02045fafe0b96808 (commit)
       via  775fb2e0b03772f08b5740ad5463f849109f0c7f (commit)
       via  1c0d6a7cb5c51fef3ee8804ed298da95e2c1ca1a (commit)
       via  cb5fc7b993866e7398922d34a1b1807ad061d4b0 (commit)
       via  f098e0e22bedbaf7aa41ef5f8fb9e10478b6672e (commit)
       via  4a549e7e0eb769780c76e94c9fac69a8a2e693ed (commit)
       via  2d738ce37acda92b344b1d3f2be2d3b6df63763c (commit)
       via  f73718c9b893e1489f904cf30392742cb456c341 (commit)
       via  0f7bdd61da51ea8609246fe6fd05a13235fe75db (commit)
       via  5e92c82655e7430bef6604c90b3389f6609c2bdf (commit)
       via  15e42bb27c75e90da8163b89ad8fdc0a8fd70d7a (commit)
       via  931e055d8c2e113b9cabb9282d9742ae78c4d802 (commit)
       via  3660d063bc005aa13e7ee4836aef842a91cc87f1 (commit)
       via  5c28495fba56ea488a5a1df323f3c89ff7d28a7e (commit)
       via  ac3d38292035a470affdd0ca9df88992916bfeee (commit)
       via  238dd2fbab1bd4fb53a25dcd07c1ee41da46d451 (commit)
       via  36b8de563cab1933fb332c42bca68125dd13f35a (commit)
       via  2f7ef7e38d7aad93f5d25efb4fd7f61468cf06a2 (commit)
       via  6162c9194bfb416ac43f52f281db442a4d484aff (commit)
       via  4c69ec6f121f303113d2f8a158d2e53b7d93d6b4 (commit)
       via  3ad893b5c23566184bc78eafb1446c05bd39a643 (commit)
       via  98965fb12d0d07deb6d953624529f8b8151dce13 (commit)
       via  a15675efc3d96906d4e803def2e83fd3bd1cf812 (commit)
       via  64c30bdc48d0a3e1da48fdbfeb200740fa5dac43 (commit)
       via  07d1f6fca1d6ea21dea64b32639c44d5eecf98a6 (commit)
       via  225c0ef88bf21c39694b51798390b87328a163de (commit)
       via  7e5e8a37b56dd7c858d54c49e7fa6697cc72395b (commit)
       via  bc045555b54734fa20a69d87d64ae9152639654d (commit)
       via  427d9324983ddd02d5afff780c6b23ab5081c8df (commit)
       via  e5b914209742a70c72c6cf8a8e6e1e005d8830f2 (commit)
       via  54d83caecfc1e0b8f047037ea6aaa7d54b64d8b3 (commit)
       via  4729547a5b2596d6997e9b9131751995dbc4695d (commit)
       via  ccd004666750248ba0fc5193ebefd45f93c12693 (commit)
       via  df16dcfb4478bb05932a1abb0e42433e60f1a565 (commit)
       via  4aa9c64511adb6e3aa1b686d07f8cbdf92dedbab (commit)
       via  9a8ab86645b0ea1fcbd1b069694d0cbb4fa2621a (commit)
       via  b0a5d3932d2a6633d05eca3eb7fd632f433dca05 (commit)
       via  55a73e6b1f70b3c8a783b130dff4c4689cea5ba2 (commit)
       via  8dc8d756bc278cd02f329b31218c2459908dc0bb (commit)
       via  b5813ceeb5b5f78351dd9f9c6af904db2f4451c9 (commit)
       via  f194a009c8efeb6f2fd1f212dee678c54d4ef48d (commit)
       via  3ec1bb1537c41f58da2dc6715e4964a38d1b1043 (commit)
       via  bb3bce706a2d41efa034f5b8e71ad701982acf5d (commit)
       via  28fa4923c3299f81659ad3ee644509ea3530fb14 (commit)
       via  837a8a6312d543f1c46efa532f7d5b5dfb334bc9 (commit)
       via  4030ddfda8c715601e60e8f0322554f464497807 (commit)
       via  17d6a6fd59efd98b1644d6f5441bbd36c19e1ffa (commit)
       via  26fb50114f37366c5c72ec76a1c09bfb2f94d19c (commit)
       via  7ecbade8877522d9d565bcb2216f71426873f564 (commit)
       via  44b2dcb2e0c945339947c2e71b32f6da2fc4f610 (commit)
       via  0042ad97480a236cd748f7d5aebc70ff21e75513 (commit)
       via  c1c1fcb17cb2a4dbd408ac7f1b9a962966eb3939 (commit)
       via  f1b0340d6c57af3ca2799c344b866d9cc5c5cbbc (commit)
       via  038caf38b2c72577f2ad74b5a24c522e5537fb96 (commit)
       via  35ea14050ee41f9ea1c540ef2f582607b3d50925 (commit)
       via  04e880fd33ca8a95ef15354f1791f151fe7a54e5 (commit)
       via  3fb174dd0b1e6bfb34c6ab82d9b22becd4181be4 (commit)
       via  dcd2e38b992eb327f5387fa9a7a9195c70b24593 (commit)
       via  dc451574c67da688024d5f3686c7c2aa4c5040ba (commit)
       via  9bb7f8f8982d1d73ca4d4ee108f3f2505e01ee7e (commit)
       via  46f87655c973a7bed523fcff76b59a465b751df5 (commit)
       via  8c4b7c567bbb47ed9555da2bd50b672304ccb858 (commit)
       via  b4e54f9b8c748f78d16e9da055a7e0436d7654ef (commit)
       via  ab4d1d07e44b42d963aaec8b8b4cdd57c938ea9d (commit)
       via  827243942c3568bbb621c4009c8f03fdd0ba71f7 (commit)
       via  73144c098d8b176bb99b762450b9b231687011b8 (commit)
       via  c4e743674f3f7c576ff90cacae6465e7e171faed (commit)
       via  4b70635c9fe9b4425db275c2ed3be1b5223ebe4b (commit)
       via  592dd355705ba0b22f33d48c2e0b5ff0e2a471d8 (commit)
       via  6296192defaaaa4c18b1821614c20b95ad94f806 (commit)
       via  c13656e7173a517961349a5fe20ce0f727d37568 (commit)
       via  3e34e8331a72f227248a235595e3cfeabf65312e (commit)
       via  b3e86f4e976562913bbe322bd2856a75a1542b27 (commit)
       via  472553b4c152e741cfafc11cdca48a5bfeae4206 (commit)
       via  f89e41c3e7c6d47dd26a47e3543ada2301db7521 (commit)
       via  24dfa74214bba9ac80e675e0cf7d13d72474f652 (commit)
       via  998ed4ca0a922faf08c7ee3e95f337ff9e8f02c1 (commit)
       via  07cbe3640e3afc879a07b6510de4c6e437f43f3e (commit)
       via  998e9c10943ef361785e6f15cab1fa61172b1c24 (commit)
       via  f07d96ccf4c0b09b544efadaac47cd79f9298b89 (commit)
       via  5a8b9437c24e1548ad15ed816e0f252e912812e1 (commit)
       via  ec31926d24ac2cf9a8aef4cfbcbeaaca0c99b717 (commit)
       via  f881c6bafaab2c62617259c86f044b05cefe21c2 (commit)
       via  73ae888506c89b8c0619905f4c19b79116afb514 (commit)
       via  c2445d3dfd837cd2e372061f5545054317be110a (commit)
       via  3b62cb7244716e0bd486d7023bec15d922572ad1 (commit)
       via  ca3d08e6b598a7f7d46b3125a0d7ddddf8be8dcd (commit)
       via  8e6114017873e50817c6961ffcedb3c52a2ed1f1 (commit)
       via  028cdfb3deaddef510537bbeb1a4202924c1a80b (commit)
       via  61cf781a6216c55a60fb73d4fb5fab76b1e7fc34 (commit)
       via  0bdd4ebfb8303cc46e4a8bbe16f6c7bcc7108e2a (commit)
       via  a9fae8ac1d952ffd3b54de6082f9729466101bb0 (commit)
       via  2b28e07c02d9f13867d0f518b8341e77f006faa4 (commit)
       via  05105d5c13f6662907cfb63fb6723f9f34f4558d (commit)
       via  52ee1946b9f25e8cc7befec9276b2d5379ebf92d (commit)
       via  2a9f3dc6c7aed366d8dda71038bdc2b62e4fa78a (commit)
       via  661622f011810093433afa5c9a4795b3d2f19070 (commit)
       via  c20d3d319cb97da5793beebe42a80361b2d247c4 (commit)
       via  279a2bcd654b35591e4728e2c2a66cbe1ae2a767 (commit)
       via  be1109d811a637f03328d97a3cacfb9dad273744 (commit)
       via  07a3f9ad17194eda4a8df48351f25682aab50345 (commit)
       via  098fc4a862d51ad7cca154cdd5f0a2a8ff0763c7 (commit)
       via  1a9ba38174578e56a277cc0d0dfa2b3f8340ea74 (commit)
       via  99f682b0fd2d01c57a365442b472ed628bdb7a9b (commit)
       via  cca8c3bb60ae156e3b14ca3d158a83b819b30d37 (commit)
       via  90b015a0bacdbc066670becf0e16843c104cce8c (commit)
       via  23e9bc55f38665adab6406980edfaa26f5b14d88 (commit)
       via  3b3da0d39e36b88db521c8f7eec31ede82596ba1 (commit)
       via  396a008ff0ffed5d4f07f0cb66de5d2523772184 (commit)
       via  656af73bca01e4d0834b398685513be2a30c2c7d (commit)
       via  a19a43a930a577edb7f2aa2fc11e28faf7134d9c (commit)
       via  400af305efb009e5274f1122dc0d596fb6781f69 (commit)
       via  1819d4ad1fb0016c20a46a0b66274b53d2b0f010 (commit)
       via  6ed23ff4e9bbf848a77865e6d08c1e8e6074de92 (commit)
       via  bb83cdaab67196c0ddcc0a0dbbd6f73f2e98938a (commit)
       via  7a2d1cd6d4c1c8759078d2f9e26a930d5e353c88 (commit)
       via  82fbf490b56e0b070cbcfaf1568c496340cd6e8a (commit)
       via  66977652309f4d754bc1b4603475569db40e4f77 (commit)
       via  6c39bc5520aca779a69ad31c0646777e99c2aaa5 (commit)
       via  c294a115f2a44b60eb6343324e15933ef8a4593d (commit)
       via  e42da30782785a02f0fabc385d14ac8f561af602 (commit)
       via  bd6b42c1864dc1915e5c86cceb609e87f72f93b6 (commit)
       via  b341799e53e468a02bca78e3270e60ddccf8b4f3 (commit)
       via  99ca7a0391dc8363c372aa8717c1217431c829fb (commit)
       via  594db49e567d705bd66501a5444a279b5b3eb0bd (commit)
       via  d760c3cbe8ad5c63cef309ee7a182acdef79def7 (commit)
       via  9c4984b4e50b3ab9c09349240c532957c3189116 (commit)
       via  42ed76bc994ccdad56392ae5ed6213fb307651da (commit)
       via  202056cdb89da39e35d8af745c1ff0852a9be75d (commit)
       via  d64caa5372b182ce48f752c9afb9141d56055bd2 (commit)
       via  d63609ed2a5f707b0e72adef2a1804cae611caa9 (commit)
       via  2c76f6f4da4f0fe9e94d70ec3ba9d3976dc43829 (commit)
       via  5bb0ae03ef00b35d443269eef0d589d307306bb2 (commit)
       via  852242b60d09d505ea59dc4eaccc149df87ce7fc (commit)
       via  bf731becfacfcbc1512644c60a706d385850a2e1 (commit)
       via  ccd5822a8322155a491ad871fa135cfce1ef9a88 (commit)
       via  1ac8523c3bd4f404d8306b3d5fe905e1d988461c (commit)
       via  b189c5994d94b8dd0afdf14844db4a4be28cf4b1 (commit)
       via  d48ccbe458b796ec7c263bbe2efb28fbb8b10147 (commit)
       via  e2a489c76aed54e96e85627a66692a11784e9824 (commit)
       via  0f99feec04193504a5a9ffc05e2132619ecf7dfe (commit)
       via  722f1a71e397d1ebfad439fcaae6e199c8976289 (commit)
       via  2e9acb6d4335064f5c742e5f96eac604f1abfa23 (commit)
       via  1f7de54346142f05aef5814ee16754fba017b521 (commit)
       via  cd7bde80bf3c3e141a92058ad033833066da509b (commit)
       via  45b1e31451dc9e393703380282434a2456284954 (commit)
       via  a39e65a8172097f8b2545610188a2bdc69598497 (commit)
       via  e7f26687abb54b2f4251c809f7499d238f08d430 (commit)
       via  0549694718237430b349e07f3ca34e3ef91e3c18 (commit)
       via  bdf278ad5f9029dc7b63469106db808e20a8ca8c (commit)
       via  7ca6bdf0355157da9f85f6bbf039a632ffdf66b7 (commit)
       via  1651dc96683282c0af8ef47973db9afa950d6bde (commit)
       via  e4563257ba66266017fadf24c1b97fd103a138e4 (commit)
       via  2a45da6ea4ea2548258ef550afb3dd3cf1475b4f (commit)
       via  3470704f5a68310a063d928e290a41be5e49620f (commit)
       via  6a5ab894fbb1683ed24bfa5d603eff6ff3f40039 (commit)
       via  9c7c6e434a1483ad5a188136a1cfb7bbf9cf5d61 (commit)
       via  70ffd71db1dff3973f93edb9a6120cec0023f89f (commit)
       via  f408667d1926167fcafbd4f4f16d117a5dbd2823 (commit)
       via  4e61edc4577b5e01dd6bd802b9b4779e1985f77d (commit)
       via  bd62c5211576d626d19a27d389d1fa7b42390576 (commit)
       via  1dc6f6f8a18be8e9eaaf7e114c47c9d30c352ffd (commit)
       via  d4d2d72f5d28e044d18ff5479ee55d872c9c5746 (commit)
       via  3a605693a5349a252bb9c3eb472d02b1c23886e3 (commit)
       via  207b7af00be53f0779c4896f311f130455d3aadd (commit)
       via  eeaa25e52144626dc76717dea37af3b8d20cb171 (commit)
       via  1b28e3b28b86de40ceb6d402b6f41f30eb0c8b59 (commit)
       via  ddd193fcddbf7e81ffcd51a6e51227342a78cc4e (commit)
       via  2a3e263173e10de4a067a9de61318f6d6e0f0f17 (commit)
       via  1c8129795ac482b36a67d0b7131f2bbd6ad04a54 (commit)
       via  29533380ea887e3f5eab44260bbd77933cf91ca9 (commit)
       via  953d34fd1fd004459704d4625aff54a9dcf9141b (commit)
       via  9859042c0501f444fbb9d5f2b78b5e563a97f71d (commit)
       via  f30bac5eb47b06d90be57d9aa8f176eeba1c9152 (commit)
       via  a85ee8b8cf4fb4be5f5ebd6e88e2753d1ec654ae (commit)
       via  da7155f5bc70440ccb1238e73194c2a454442f8d (commit)
       via  0622f92d23771126b2ff5470faea58a76326c413 (commit)
       via  dd089e08b578f20b7dc7d2ce658e3df05e346e35 (commit)
       via  1b3ab3318dcdabe074da3c95b54f9483d47f95be (commit)
       via  b9e0babea92829e622eab9415ea64e43ec41bacf (commit)
       via  ab09122717ff8138086cd46787f0badbba0f5669 (commit)
       via  872ad7a26d9cfeec877d148a49e10d18e29141bf (commit)
       via  526c34b240638bea90cce4162a95f0c8c7ea8a88 (commit)
       via  6da3f173093ed5b6b2b1944c9c561fcd62d07eee (commit)
       via  4d2c6290453e00f0b1060788cf52a5a01963b864 (commit)
       via  bbabb9d810b52df303980a2271ad538637c077d5 (commit)
       via  18817e07d61beea11fa5d52bbb26db715b7f8b1d (commit)
       via  fef31f1f21fe642b9c2893544a330144982c7449 (commit)
       via  480e60298f862e0c1942b6e028e509f81b9ab71e (commit)
       via  a300d0ff0fbec17360113f9bb1c09e9efab19792 (commit)
       via  f53a3340bbb6ca4fa57c21187206df8160221d4d (commit)
       via  2e92570bdaacfd5791c37e0fc302e05f095c3901 (commit)
       via  ba8c6632194256a6a3370713d8e0423ad516361a (commit)
       via  a829f09bdd5cf28c59eeebd39d1652be2bd23283 (commit)
       via  3cc84d18d428934076baa16e1dddf6d414f09622 (commit)
       via  9f41c45f4325271a24c96e17853aadac3a081fe8 (commit)
       via  f6c8d3d82fca676b127a601db97e6c0d5b7342e4 (commit)
       via  9c4ef206c7d13da0cd4314f4efea6452ae183fbb (commit)
       via  ccbdac21df01b3e084bd70dd3b5b4ea7337c23d0 (commit)
       via  97b65f8156734db2adc367b27c822a5fe332d740 (commit)
       via  a0792c48513fd76d8eb00a52f551f0f6fe1b71dc (commit)
       via  17f638a4c923bdf96376e8ecfe365337906a6bcc (commit)
       via  17a846ac3e8d0fab4bb99e238dbe867941594465 (commit)
       via  111be1801fcf50412e702be2d5966dbf52926b94 (commit)
       via  3171fe0afa7169c1e814a5c0e08b115002f0d3c3 (commit)
       via  d8589e6437451ef174fc480d0dfc4e83e49b1b30 (commit)
       via  a7d8345d8c2f319d44576b70481c7cf2e3528226 (commit)
       via  66f587e7dcd127bf82bb175a8c7e9cc8cecb7a97 (commit)
       via  3b9477231d2947fa6281a1e29b4459d3f66d4a49 (commit)
       via  92eaa4707785ccdcbd4b6203a7e0a62b990211cc (commit)
       via  009c1865dcc967a349be63a713c46ac88d297250 (commit)
       via  3fb33e01a1c7a55f35c44a489273f780b21bbca6 (commit)
       via  8235effe482308b640e91ca44f0ffe21546522d0 (commit)
       via  2372cdaa3aa2c8b6fb0da1e6c74c10695a1b1ae8 (commit)
       via  ce331bab929c5a38e048ba15d7393dcf96fad9e1 (commit)
       via  95655dc730118202464f5ac8289af89c29c4a4a7 (commit)
       via  09498b2ead29a64816e5c301b7465164cec25c1c (commit)
       via  e72987dc11b17a9c0630ba053dc4d6488f751002 (commit)
       via  cf54d8597d23141273f6e2a07f00ece959bb06e3 (commit)
       via  47c41d902c00acd39c0af668e15bdafb591c8c43 (commit)
       via  79d1e1347a63aef89441b43ad61303109062a55c (commit)
       via  413ce0289599741b06fe14f7f8552c83277fa5bf (commit)
       via  b61994d0a73df7d89373f1c3cc72610c655f9e56 (commit)
       via  c2b88742891da193b74aa733bce1daafc24a1557 (commit)
       via  90070a65d217935b71da8b4ac361f78b608648b0 (commit)
       via  cfe666f1a2c13e6d8093dff87b362b5e4ed64114 (commit)
       via  9e6e6801d05450d7895fcab5bbb4dc15f0d11657 (commit)
       via  6c67b8168cd44e5900982ca3e36049792934d83d (commit)
       via  bec5b3df0148bc8ae9c9c777367386fb1a38ad04 (commit)
       via  e01040636d3c8028019f00c2f226dd2f6d552732 (commit)
       via  de022e8908cc5b3a6e0f179a81482fad4cfb6072 (commit)
       via  ce28da6c64aba359b4399bca56ec60707a3d6073 (commit)
       via  fad59f2dd12b72ec1b23b08a8bff7f0b296bb4b1 (commit)
       via  03db9a061aa62eb2b373010a6a38d5707749a6d7 (commit)
       via  97841dad2ba5a79acb0b22db9a01ae45f7b2e80b (commit)
       via  29b0c8c3606f07f3baee245138552c3c0256ded6 (commit)
       via  356f7cf4457271ee85a71face453ea9579f05da3 (commit)
       via  65ea5eb721d820551653bf6471e83ed5f4a5ba13 (commit)
       via  644b4688d71cc52f8499d6103495de0909319557 (commit)
       via  8a4c6d2d2e66d210e5c2d59c86b3f1bff2582867 (commit)
       via  636f0c1d4fa3f003fff406b27306cd6883bcec75 (commit)
       via  c90633df9eacb3063669ac0aad9506cea1885582 (commit)
       via  67cb50abd77dddc3cc74597efe38285f9bc9e4cf (commit)
       via  e18e21aeb52923d470680aa171f722b4d3b5d01d (commit)
       via  f0d0d761b2150e41397af8cfce2b846107cf8921 (commit)
       via  31452416ba1be692b55ed09f8cf39fa2914ad349 (commit)
       via  b96b025b2a337d7b09157f8b24cf9ca77a825863 (commit)
       via  169f116632321e99701986f48a19e836d2b9e710 (commit)
       via  f545eb0b0b00cb02f540636549f63189f43b4870 (commit)
       via  7626c8dcf632a4589c2a9008f083f7777cee946a (commit)
       via  f5ede30006f61ef5bb78d6602ebd9083cd7f9869 (commit)
       via  470c549c622ddddd0be3ae63945e40a1cad85923 (commit)
       via  c7bd2753932d1f2bec0b66c042b999a95d5bb713 (commit)
       via  e4665171f45f6f06bb75f677a29d65015a4f5d0d (commit)
       via  09f797c19ccf8fb5e4241008e9845ba9ab7200bf (commit)
       via  13fc2ed4c47962734ef0bf4bfb093ab52d20d8fa (commit)
       via  44f9a69d3402c22526274d38837104b5cb9500c5 (commit)
       via  ba98442610024cf50cb407a5cc09f25096a7c79a (commit)
       via  0f381ad5218758aadf92bbd4e5d68347a06cc3ab (commit)
       via  88eb5824da12940e78d57fe254f17f64cdacd659 (commit)
       via  a4f9b6f0ca9248530b9749b7fa9628053a3f8f98 (commit)
       via  955fbf29c748209c696a59effc39d19099e52095 (commit)
       via  ceecd7902fe80baabfad0235c54719e19a3df06b (commit)
       via  7878d06189e6ee11646fcad9851d5bc4d19a16e6 (commit)
       via  ff50046b78e23f8d8f23ea8b44dc1012edb0d792 (commit)
       via  dc3b222143d16ef0af6e6450f7869ec418b911d7 (commit)
       via  d90e288b7babf6cd493383e425c9e4d21905fa25 (commit)
       via  d91feda4136b8fb9bc3002b38ba8c08fca9cd62c (commit)
       via  9843dfab4486f76cab567862e504a71d1ecc58a5 (commit)
       via  cebce135c083807ac354e95278a5992f7feee3a2 (commit)
       via  beb75b378f156eed1caa882245278c4aadea6f63 (commit)
       via  eccc5e34cda8f4c784cffe4a255db82f5b20f832 (commit)
       via  03b3ee7de25acac71fa37c2add32f6d431e82a41 (commit)
       via  72c4128176e11fbbf05a0d93bd5bda6a4f90e1b5 (commit)
       via  b9eac05fb65198f1522ecec756f3fb4ae253e34b (commit)
       via  f773e28a8e6033ca128e1dd223fc2345a97efba5 (commit)
       via  53fa072e6a63477916f38028c5f5d818c47f6980 (commit)
       via  cf63779f353ce95434f8dc6926b3047217b78f72 (commit)
       via  930178283a749c4020265259ea3f828552affba2 (commit)
       via  e6db4c5a4ede8039ed525e3facebd7e0eb7ec1b7 (commit)
       via  05d6531c7a8ecfad513a0e76b44b273b70fa919b (commit)
       via  bd360ee329e74487dba526d7847794bc66b55494 (commit)
       via  0e466f89fdceec50cbc3c21a0d1e0773271b166b (commit)
       via  7fe6bb0d62ac6a056bbf52cd87b44a49d7b6441d (commit)
       via  b7d760aea20f70b221fcba7ecb2c7edf7751ffc2 (commit)
       via  48f78f5f9ed3a7e0717359720ecc157418f55155 (commit)
       via  722178fc7ef47020323af4a97dc5600e43652a2b (commit)
       via  c3c251ce0ae9ed6432bf1abc887309f01d498d38 (commit)
       via  5bc82828987e8b59dca6d348294282356eeb1a66 (commit)
       via  3e33feaae23991557aa39f53804739e7e1a36726 (commit)
       via  983e434b006bd46206a6d04ef0f04e37b652668e (commit)
       via  f39d713af62b4087f059ac0cd861c363d3f45bd3 (commit)
       via  0d757166fef0f258d1e69f1d63c64612d9f7ecc7 (commit)
       via  d051cbda5d9d4456619fac5d49f24c8827228aa9 (commit)
       via  3350e4d209b6a7ff758ca371af4d62844a66ab36 (commit)
       via  067b49a6569422c4687209c5bc57043630705523 (commit)
       via  0de867dde282670461e56ce61e9c33fc6044d9a4 (commit)
       via  be9bec5df2660661984e080dad9ae7561aa1fe83 (commit)
       via  8e75f1d2fa3049ac31f4ebdbc255fca3e6414802 (commit)
       via  2a92231630b6aee671c7f4e8b64f69cfd172b9e3 (commit)
       via  8b5591f93ed85c6f84f2b4c076be98c57b871d1c (commit)
       via  22b72b189400c1a50030b59c378ebb68460ac7db (commit)
       via  9f59caa9bd1aba3de27aa2fbab89b56c6b99d9b9 (commit)
       via  d724640fa22e315b28f994fbcda43ad006b4f57f (commit)
       via  75a9f2fb6bb263a717be7c30b0c512d2387aa514 (commit)
       via  4d9fec4fb327b886c66a12a657864cb3fac69250 (commit)
       via  b9d437a2921cd808cff27ccdd4d39cabcd87bf5a (commit)
       via  9e4e0a2307325047d9334081915aa5fc0de2090e (commit)
       via  584d625a04a65c89b867f15ceef5fbfdaddd633d (commit)
       via  0963fb64c62a7cd336c68e95c6935d084cfa114f (commit)
       via  3fae1f9265163d5570078ce01141de06ec55e611 (commit)
       via  808c77e2319a4a81a86b2df3bf8fbba6bdbac7ac (commit)
       via  82582c96bd86969ee5e1cc6f7bc4e5b12e1717e1 (commit)
       via  106c769f1d46a2410ff62c3dd4cd02cd1da7fd37 (commit)
       via  ac5c4487d899330af0681b1cf3e950b3d016a986 (commit)
       via  43c93acf274d5ce6db7d9a871b983625426942bc (commit)
       via  57a77fbe6934f13105f5c721ca6e5dec00002284 (commit)
       via  6b939536154421b5e18bc8e908b1bd5f7212a536 (commit)
       via  5a611495c220af559e93aa29d5bfc786ff40d440 (commit)
       via  94c7ff9fef395a2f970ea9ae9076549b8943f566 (commit)
       via  d124c41168cb509e32a31d09c1008bcb6a3d1d7d (commit)
       via  d54617d0068fc5acfa2079d1e8de8f38365564ab (commit)
       via  bae604d9a80d5d97c676c85848e37783a153ff19 (commit)
       via  beaea609a04848e3596afe6f0e8340e923fbfe28 (commit)
       via  6b045c3ba8be63fbb3cd8dc026e984184696730c (commit)
       via  66ba7ea831ca8d44b137e59e8271de3c7756cfe3 (commit)
       via  d52cfd129cc63708c6b2b9e561eb02c465c8cdc0 (commit)
       via  c2af447d445d87bf4b09a051b2cf78d39667dce7 (commit)
       via  c7b9fad117a8036bb1a1bece633bacff426d30fb (commit)
       via  a11dda1c4883eddf763ba1eb2979b45220886b01 (commit)
       via  1f4f2aabc7fd683874e7df14cebc8c8e0b9a74a7 (commit)
       via  e993c384d93335aae3535c73dd533e657c11da7a (commit)
       via  90cfed51f6aa56bda5b75af909b8ca565fc7b774 (commit)
       via  4987b3716583504442bb737c9d1f170ba99feed8 (commit)
       via  623a06a6f3bb2ce4a55f319207116271eb054c72 (commit)
       via  2fefe9e5753a52cb229e52bbd987ab4ea1462a4a (commit)
       via  47f1020b5446b9913198995cbcc21247896670d0 (commit)
       via  cbec5c0445eb48d88d70abae77c0c0a8debd6a41 (commit)
       via  ce64e3607f0bccb4b1239d28510c92bc264904ea (commit)
       via  0ff35425d7d26c3c5448d4232e32a14d43395e86 (commit)
       via  6a2c7e1e0ddcf8e14998c487b59afaf80a514279 (commit)
       via  c8da86a094f48830fcbcb0d2e68c063cae3da27b (commit)
       via  a5531950cc8a68692281c24ec2241011a3f14062 (commit)
       via  61a987c2296576ce4d17cb32deda192a01d6fc89 (commit)
       via  0f192080761529518128ee697d477ab5ec2e7ea8 (commit)
       via  d1903de8c5bac7b134d5f77359be48aa4386afa9 (commit)
       via  c9e32b0b122cb8d051c90bcc872244614ec40a39 (commit)
       via  bb1111eaa220eb534338410e2d1ffcf696f9ae44 (commit)
       via  c5ac0fce5cf1020f661418eb1dc1f35c8f3207ed (commit)
       via  4cf5179c77237f3eb56f85eddebc43895691694c (commit)
       via  7e8fe68e9c4b34796982604dd5fcdb246dc5a557 (commit)
       via  5eb4d7590e0e721b56fc735ab6da35d55ad339d0 (commit)
       via  2a0c65485854bb6e6a33a7d5acd99c936adacec6 (commit)
       via  96691d126bb1d1e3a9c7fc049429a36032a98346 (commit)
       via  f8f02451ad2f4a595a71c6a85f9fe5122fa83d6c (commit)
       via  8609a884a2e0a7518180b11b6b6ef9baa6200424 (commit)
       via  bcface3932edb879bb71b90f65b628c5d9a11190 (commit)
       via  e12926e7932212d9b84bb7f456b168437c7ba863 (commit)
       via  c8540e94661ba286c2b6e35bb77f4e8b5efb60f3 (commit)
       via  2ed0088b2abc591bb5ba6b4a13ee9997231883eb (commit)
       via  17b0fe03052bcbc45293139d408e008371f1ffe0 (commit)
       via  a075777ca1fd66cb0135705510185e7a5277e27a (commit)
       via  12cb0b868c462ec64f1578f5450e64246986c58d (commit)
       via  ba74465fbcd2509415397c1df93b1c86e70a45ab (commit)
       via  41363c0c615848e9708c9105b0daeeef98f1f427 (commit)
       via  4efcfe52f491a6cd43809d5a182192060d77c5e8 (commit)
       via  5f4695cd06a124236520c8a28d8b65929f83bd3f (commit)
       via  7a0643379be273e64a6454be4be51e652ff093c4 (commit)
       via  fdb73547220ed9e9bee0806abf388b830ac79bd5 (commit)
       via  f327a9fd26a24b2aaf609a9b3d34258c7a992bb3 (commit)
       via  32a191ce4bfb75765e9d5d5117d6fd6882c453d4 (commit)
       via  3a20cef3d71ab55c77aa85b05217e13afabb35b4 (commit)
       via  3749ad49e3251dad7b392317a50ef3b1194ee63b (commit)
       via  b6f6b0a983871d4eba677c3a760c0f72bb4404ce (commit)
       via  fa1a066af1a7c7e0db5661e69fc576ea28a08e91 (commit)
       via  4d52cd36ada014bc3e9a65be06b30966cf29f9a8 (commit)
       via  f7b6f3d967b9bebc720ba981bb0f4d8b706bc74c (commit)
       via  d49f1c5e9400c6b5d6dc205b4dadad2fa21f6eb0 (commit)
       via  26e98c34dc2a1414f79b6a12de3c4ca060af7578 (commit)
       via  3bd59b6014c13a3f980b9988ebfca91e0a2936c0 (commit)
       via  bf00f5287b2d0cc2dbd175ab25e7cafbda944f23 (commit)
       via  7a68729223c05d779188de89066de414d131dbcb (commit)
       via  44f02b42fb3b2278fdf8e9bd450c3f01573d1e3e (commit)
       via  ee3d06a41ec6b5355083a3eba36cf73a5438c1c5 (commit)
       via  51a60973eb67b33e857473f2fe98ae25943f7648 (commit)
       via  d526ebc603b0a83a7a1602ed4ddcf1b483077cf4 (commit)
       via  7a39d32f05ecb77227d304e5fe055cccbabd2739 (commit)
       via  ecdea34fcc3bc99f9fb09bcb16f57d7d56c8328f (commit)
       via  397c762da4720be6f65eb19f0ab8d260f6d30043 (commit)
       via  52fd5775d1e90cc5beff0fbd6c9751caecd5833a (commit)
       via  d903f7ce910879ad5439d642488e508aafd4b049 (commit)
       via  3609fceee75b4f3751a702ac0a7f21e5cbd67a0a (commit)
       via  d931ba60216dfcb5f94ffc3b8e6d977b1e4dc22f (commit)
       via  46bbf947837f408cb7d5bd147e078e86541a3103 (commit)
       via  a42c51b5ab54d8d318f00cf9938ce9fb1e2ac274 (commit)
       via  350223141073a91c272d303ee45c0d67e15562d3 (commit)
       via  85bafee7eb9a8c9cde16ba5b5cccc099cf33d22d (commit)
       via  afc557d10e8d36db190bab45948f0fa74c8a0a67 (commit)
       via  c5fcbe00afb27fc758e8877efa955e86109a0c67 (commit)
       via  444f61e044bb2943ccde07e42972d9b2720acd4f (commit)
       via  033ed9a5942e789c11130c325db487831dc417a9 (commit)
       via  e943fa8a19a1fbe190e6fe0591d2b509e07b9878 (commit)
       via  c61efbd684337bafc6388a3e4daff23492d9992d (commit)
       via  ba007d3f07acb18f41d48575ca0b8700cd4a6e8e (commit)
       via  545d10cc6793555ab881d27207e4ae378f3caade (commit)
       via  557aef0b94c86d13e802e6e8e34a491304d7be2f (commit)
       via  d42e3149005eea81458a5104d3053928da395918 (commit)
       via  f1cd1434a4da9c26d3b546d61349a6296328a0d8 (commit)
       via  08348aec485a3b4731e4551af6522c68e0594547 (commit)
       via  67bd514adce689f4c7f537cdc446c01f7373f5a5 (commit)
       via  e15a7075b58aef6fe7b6eb56f810d0f33bc31feb (commit)
       via  ef42e57d470db499a41c8bca695391c3e3e5cb86 (commit)
       via  592644c42c58312aadf1fd1b28e95c7f0fbbb2f8 (commit)
       via  fce1d9c2482fe6dd6c7c06d7dc10b9bef2d99626 (commit)
       via  5cc8169bf9c0d04d74fb82e3bcb586095635fba1 (commit)
       via  2d75d7e56bc00c9abe51d39c4306084b24fe8cd5 (commit)
       via  f42d86f0b834c73b28a919ef1b4279753a6ec1bd (commit)
       via  f281ae01a2b89d8a7d327b3f6e73b727195d8dfd (commit)
       via  d5eae5563f99fb28c99695fb4886f1bd40d98414 (commit)
       via  4d1fedf46e9cbdb388728c9a986cbf89db810c73 (commit)
       via  fe5d6e8c0f2e37bac0621a3b976d95c471891f38 (commit)
       via  ad6ee426278ebaa9518af4573362a96b0544f4f7 (commit)
       via  39baf728b78bfc5ae99258fc8db1c467f01b9ae4 (commit)
       via  0b3b54e21f5ab827d8073ad58de92e73d8688e6b (commit)
       via  fbefaaba2091c573aaa67567a05d5da36da8686e (commit)
       via  8fddbaa3fa78185772922af9cbf6a31358153796 (commit)
       via  810ef59a423704bea0804ef97c5ce5c420b38025 (commit)
       via  2531c0aa09522c7f6c07bcdc33d0dc8e778a219d (commit)
       via  0cacf73959a999e7b79d4e9c2f0d2f8ad49efa5f (commit)
       via  0700f2ef1918a4bf9de197e1b25f1e2a00eb82f5 (commit)
       via  b138be07b4b2258a3c64245cdf13a4d7cc05b977 (commit)
       via  8d379cd7ac25481ef3b43da12aade24b1e47ccdf (commit)
       via  66ea634b4c4ed75e3c5a56acd7d312f8ad764c49 (commit)
       via  e7bd9e9b08ef3cceada5110c6670825ee2f7375d (commit)
       via  b821f5d314503f0117b9a10f7c8f4ae69e8720a1 (commit)
       via  474bbb9dbcd6c257e68874e6966c145b3b82dbdd (commit)
       via  184154e3e6cad37e234f31be2ebaeaa255d8834e (commit)
       via  b015b4698e43758aafbede3f1dc4c8c1256ff79e (commit)
       via  a9a040e1698a7caf9518c27d3394293e7fe11d59 (commit)
       via  307570aee1fec8c7b3374571eb7b4de9d2be11b3 (commit)
       via  cddb5002b5c28c0cc5fe9c1e41a5e0f556b3e3a8 (commit)
       via  f4e652b5633c14d3602be8805a2f0c49bb524147 (commit)
       via  dd89506c1ea85240b81867db5a467e6632a7ec7a (commit)
       via  8abba9247230b072996213d008a69a4a64456c06 (commit)
       via  2c71fe6d62c3095b40ab5778ac4482dc99c0bc61 (commit)
       via  3c497f1129c15bd5857cc6651db13b4eaab112ea (commit)
       via  0854d45bbbf2e0ddfb80fc9856a3b7b7c189e175 (commit)
       via  e41799d574e6fbcc28882c54de55931d546f86f8 (commit)
       via  32b91b9e019774365029f98026ed0676708ce318 (commit)
       via  82c283f914c23df9e11cdc50f764bfa054540f54 (commit)
       via  b18155b7885705f794af5025173b2d1e45154d67 (commit)
       via  b80557c7bdf12f9e924ac8b010d547ce4561848e (commit)
       via  990cbf087b74b8dbe286492e512f30f0daa077ec (commit)
       via  1b0b040bed900fb974ef9de719632118c56e6212 (commit)
       via  03dad03a54c86b2ea6b355c1f29354b7843da6a5 (commit)
       via  7d9611433b2d28ab4b183f4734065867c8887926 (commit)
       via  9a4afc1f9f3c31923317995c1ed90bb4668596bc (commit)
       via  b4f520409722c8e613d9e1c720a57624c81b8269 (commit)
       via  ac9e4f9979eaa3832f228b64b2f4794b52506e63 (commit)
       via  44a6b6e44dfcf5085757664176d0c4856c53b454 (commit)
       via  75009e4bcd96dccc4ecfc12981ca89c330ea1765 (commit)
       via  35ecc3553e5732ddfa8039ead56d02f002df76cf (commit)
       via  1abd7cd930022ba045c3c0cd34406cbe19db84d3 (commit)
       via  3fdaf78afeb5faa06883186e001f8a0d284b87dc (commit)
       via  e68d5c6000e25d837079c673316d9deeba3b8913 (commit)
       via  0019d54b6e4bfde7ef1c211a1c5e5bab194381b2 (commit)
       via  2a9ac4bd83f7247539616545ef0772fea1f4a1fc (commit)
       via  32922840e7ea8a0536fec393352ede5b75087543 (commit)
       via  c5e797dbb8b2b507431c665e924a41ed0def879e (commit)
       via  f476b41fd8a92c7784a84059f615fdf8155d687e (commit)
       via  8049114bac1fa943a3f983b1725058d1a51602dd (commit)
       via  70c2432887da232d65bdc56e34ff046656e19703 (commit)
       via  3dd26463d47d5dd118f85ff5e96184feaa19c987 (commit)
       via  3a6c3599063dcaf1a19e7987d0486c5e8edf28a1 (commit)
       via  dd563e1eb3002578fcc28f9cc4ef9d2326043a23 (commit)
       via  861b0df4d1b11e6fbdc26c07fe6101f02a38b3f6 (commit)
       via  75f3a282b76baf615b17767d3768b781bfc463a7 (commit)
       via  a1f964ef6897343cd47f904b7cf7ad94b2b65e70 (commit)
       via  742e6f8f06a635bbc0cb10a36ce68d5b9987f1f5 (commit)
       via  8532a4f9a061883dea639b2f7942c93a6682bc49 (commit)
       via  6431cc641bf42551ef6b5d7019fe857909d593fc (commit)
       via  ee6c79d1a34fba29d321ff00b19e79bda472c0d7 (commit)
       via  f62e476990df9814b6be61a231b6b4e3ff140547 (commit)
       via  b6b37e303786e48c305cb83011ce5fa6cf71e359 (commit)
       via  c02c747b85cf7bba8e81a955722122e844688d4c (commit)
       via  a427ed0cb86f56ebd84820cb0c6f3cfd2ccfa851 (commit)
       via  17b24d552baa2bed05a277e3df11fe81d571a6f3 (commit)
       via  4c3bd340804117c810c38273eee617911d475a36 (commit)
       via  54cb23c657045c339a1a6060ea19d3a74a1c817b (commit)
       via  c50f03275481e3e1434b5c3153d8668dde6cefd8 (commit)
       via  681693c99380467de6db0954e37903b527225886 (commit)
       via  10d80b68e426abbe43c200bc3f29e05c12e01964 (commit)
       via  19593042959274fab45f6bc0ef77d6ddc4532a0f (commit)
       via  cf54aebb968aa66b0990174db8b73c405f6e9c98 (commit)
       via  c17e3207fb49fe0c165167873fd608bae3ca19f2 (commit)
       via  1f7cb7e27bac9b18834402ccff30685f69dd838c (commit)
       via  b18c9044122b0fbe7cc6c81efb48d0be8e065a23 (commit)
       via  860f0a2ddc4b586d639caea1f9c7c10b381224e6 (commit)
       via  5a3b55ed7c0419aa09adba38db41a258118dd580 (commit)
       via  a82dde2d3ffa850bc7c3be80d5eae8a2607ba669 (commit)
       via  13fb4fd1676e309efb794241eb1ca2f758671000 (commit)
       via  5bdb9b618942bd506a9b7ee87130e6a97c415a06 (commit)
       via  ac4bb0054db5d8ce474c4b1e5083a64f798ec546 (commit)
       via  0f836cb0ef1acd6e2e67060177759e65c8c5d7fe (commit)
       via  8b14b4eaa33247e57c865c38fc710f4fe46836d4 (commit)
       via  70105facd68819c28b9a1ca5ee9062209cbba474 (commit)
       via  0ef2d5f805a52eaac018a8693166a1d6075f1217 (commit)
       via  f49e4c69b3af39fb29065636b911718e793b8f66 (commit)
       via  bd0bc879c1cb4bf1ada673a40c1d71a0345e43c6 (commit)
       via  c60a5f83cecc02f89410a80bb4137af9c6996733 (commit)
       via  67c4be51a34f86d4c26fa9f1f2f79f5539493eee (commit)
       via  aba5cec6b262c392bfd9f94176a80113d1315917 (commit)
       via  3f606fa7d06a209cc2cd3a97afb84951d1c4c033 (commit)
       via  c0b749cf62a2e985c2b1f94ff919107dbd697b2c (commit)
       via  917da5d02766e875ec63eca09eb52b789114674c (commit)
       via  0842b08463d14d6c7e27dcb4cda278805cce6e5f (commit)
       via  e63dcb1378bb6bd6b0a76c1760c4c24c27f221e5 (commit)
       via  d5a373a10d530c797a00b3f7b815fa68cca24510 (commit)
       via  81afbbc09bac6913e2b83f7eb68923ff5b1911d5 (commit)
       via  f45cefde59f9be7a021ff3f183b785f20ac62d1a (commit)
       via  db3cfc3376f2021f7c80ba220ecada64832b5ee1 (commit)
       via  ac88ce2536e1522052ee7bf330ae06a0ce3e1a87 (commit)
       via  eb505ef32b09552bc6e4445f193ae3823025aab8 (commit)
       via  190fdec8572ad6d2398e06954d4b7bdf0f212929 (commit)
       via  5204329315453687e6d1b0fa4b802871cf4534dd (commit)
       via  34c16c55580a2f03f0b180304801b8306e9cc23e (commit)
       via  8640dc54d190e44a41bed9fbc05267e4f4ff887a (commit)
       via  092dfdd238503de5579f5559ed5d8d1ed7072d4e (commit)
       via  f81af6f52618e1220a20c63b7841114493f2fbe3 (commit)
       via  66158b6753fe55a42da4a58d8cac90210604fccd (commit)
       via  32b48579b637eb396a88fbb7943759e900a49d80 (commit)
       via  56f4949cbbdd2e10a9878c593e9d5fda2c4eba49 (commit)
       via  c236b1605056d76d19b2bba7288ebdf7b67c7fbe (commit)
       via  6e927fafffebccd5e7675154db805f104059996c (commit)
       via  cfb3a869500209d1afd17b3d517ad968b226fc63 (commit)
       via  df720de23415e9df29faf3b26b55a9d0f2c98f8a (commit)
       via  468fb734b4462c2c338abff8140f90a3c9d213a5 (commit)
       via  38be87caa4c1470151d012e46c70f09bcbe7d334 (commit)
       via  996f822930b02fbf6f7b1bc2fa21ad52b10ebdcd (commit)
       via  67cfbf8eb7cb2ad0e177b68aa134bc65297929fb (commit)
       via  f598f1aa836f7c9a60bc59b53ebbc2faae24f5a4 (commit)
       via  4ae133e09c763beb5a55302fdc1502abff6ff8d3 (commit)
       via  40bab8d17b18ca5e6864bf282326507c59826021 (commit)
       via  eaf6f67f67e12c4e137c8e875ac277072bf910b6 (commit)
       via  45a25d63ba738e8b0ce690f8f02469a82815b5f4 (commit)
       via  6aa2d4773701d5b491c44e2c0eda202b46b36521 (commit)
       via  44853be608a18c94a1ce4000446ec7f29b8f0ee3 (commit)
       via  5755d0059a386324c89e03f279d875496b26ea04 (commit)
       via  b25a200204c1d72df6f97b6362a54f0914c3b0a7 (commit)
       via  1531df2b866df9aa52dc54219a4552e94f47b622 (commit)
       via  5868b4e2fb7aa7de34403cae7dbc7a827d70a8e8 (commit)
       via  72b5b48040ed65fdb54b8ffeb3326b456586b8c8 (commit)
       via  8b16e62c7a10c246744327cde38b0b1d70eb8c48 (commit)
       via  0b8db9ced19bf6ef3fa8a23625b47a7f9bdfdd4e (commit)
       via  f2805bd01b011604f95f384ce1759c15503d32cc (commit)
       via  14a983cce69610a1ed1b57e666d29fdbef4f7cd4 (commit)
       via  81441f328b8f09784afdccebab2e134b1de16919 (commit)
       via  163868b311158618184a98560ad8cffe3a1a9164 (commit)
       via  609037f4821c45ed13029074c8669d52c6dc9d71 (commit)
       via  98cdb658e481a23c48ad894bec102ec5f060d72e (commit)
       via  36cf8a1eb9eaa6d01a434d007f707be972e6e383 (commit)
       via  ef09df646a480f4f879f19222a1dfb24316c1d6d (commit)
       via  820e95d000911aae2ca0480ccb92e627f4ad0c48 (commit)
       via  f274597abba00d4ae7947a9212e1db56ee801c4c (commit)
       via  8d6ba35827bc4025a39acace8b65f2de96613a8a (commit)
       via  f2746f2ebec8f929986f5a7abc5e9285a7553097 (commit)
       via  5e27e6f896976e1d167548f740f46d1477c8c48c (commit)
       via  b233a09f6e9bed46b65079a2d78d865b816b79c7 (commit)
       via  927b59403fe522d02308c7c5cc14d0c9d14f5b21 (commit)
       via  6e1e7dd01499d11ae949f73b061dedf3bae7b6a9 (commit)
       via  89fd4b82d17b1072c6c4852087a2f01b66600e8d (commit)
       via  2e953c76573b5e146ce77ee807e4b1d2f4f60ed3 (commit)
       via  59242702739b92f1a152e2a2bb32772638fdf5be (commit)
       via  5c5c1e3c7dee614ab108a8809507a907a629a9d3 (commit)
       via  8d311a813c8807a518631ae63cff55c537d3eb7e (commit)
       via  4063f26b6502685fe7dfbd65ea517f3ee15d8bea (commit)
       via  53b8df596f4b9c6ddbff408a1c00010a0c618f72 (commit)
       via  392a318862b49d9715de76108209558d2a60ce83 (commit)
       via  1107eb3df8ed7beca97a01dd6615dbe253aaff7f (commit)
       via  6db59302d07f985b9e50f8bd01a1cb7db807bd67 (commit)
       via  80c881f7938969dab169f4fc4fbf8bc3d4355fc2 (commit)
       via  ff67d2b57946a29e18d1947efe71f26ece9e1747 (commit)
       via  a636de1e2b12bcbc09f18c4a34c22c08cc54edaf (commit)
       via  661fa7c917f64231200c8ae90b59fe9146dfa958 (commit)
       via  9cf069f88ba43931c46b245f567b0f8371a6067c (commit)
       via  15c994ebdc9674bb057567370333ee0330a60ad2 (commit)
       via  667560c88a707ca7eeaad129e253cce371beed1d (commit)
       via  f04e0a2b178ec95138a2fbb7d4f5623ca41385e2 (commit)
       via  fb13502fca5a344dd35be6fc919ae7e89ce9c6ea (commit)
       via  ca83c39ce0732237c175f60e6d5b204ce5f907e7 (commit)
       via  fcb4541a05ea068715c8815c0294d2638721b071 (commit)
       via  3942cf68b2e3b808b87c0127b1aa7bf52c59696c (commit)
       via  e51cd32de34d9a2376594f80a6f31b4fb09c4e13 (commit)
       via  0d6cdce5b5542250c067d846f037dfeca1bcc8e4 (commit)
       via  220e81345b68ed3ad15ef294f6de653fcd1a874c (commit)
       via  5bd29b8889995089242f0f9f80fdb70e1e9ae88c (commit)
       via  8451f123503effc219fb1fb816b9659b7e156653 (commit)
       via  bd3fbf36b4da6a160d13eac37732377a9b123c6f (commit)
       via  d9c2c17b29467367ddefbc86cf7e1759c7df27cc (commit)
       via  98936ae3e0bd92faf282f78a53c9a177f96294ab (commit)
       via  fddb3ca4432b2db003e89c570dad6fb5a770296b (commit)
       via  9eb385edd9df75ff9b545a375ac1104ce3ad22a1 (commit)
       via  78c0f514be69ee761d2b64943d3df37754843be7 (commit)
       via  c752f8f165e9b8db7bc645cc55301277cd7773be (commit)
       via  f1ac5ba5e8881d1cb88bdc94f2b3064c1007440b (commit)
       via  197a026cfb650939a5c1054783fbe0e83802c9e6 (commit)
       via  9ed546ff499b452a0266ab6c1c53e3131a67fd9b (commit)
       via  add4e50dea4afffd53853dfa5cbbcb172f86a99b (commit)
       via  a2456e157223255f0e2a71f2ddd510510e42b9e4 (commit)
       via  4fc3367fcdfb9156ddda253b3af213b0cd585035 (commit)
       via  0f068c177c3834aacc1b27e32c318b53adad06f9 (commit)
       via  c5e72de1949ded9954b456f1e3cf12f95c289b9b (commit)
       via  8eb64831bec333914aab3af54e2d1deded02eb90 (commit)
       via  21cf9364f092004a027f11b5bf574804cc8cfded (commit)
       via  43b8bfb213188b1017949b5c29f3071e455121e3 (commit)
       via  373b625e4f6275b850f5531a0515436ac4d6a0ff (commit)
       via  22362c65e1a0e4bc43fb49174cb597b9dfb6227e (commit)
       via  97eb511672a8d5804f98942791c7bad9ac73e6df (commit)
       via  6e1c359fe9bee71c421a671108176d47fb415d93 (commit)
       via  fbc2a384d8d137f2332d0f8de7a23edfac84a361 (commit)
       via  a29953180c21ba0d56fb236eb58bafd40ae68961 (commit)
       via  506151af519aa50594000d22c66c0620f026878f (commit)
       via  21c2dd842b4323ac754c3bc76c6b8af25aa26fcc (commit)
       via  b2a7f60a4660ced5892e47eb1e7dd560313c340c (commit)
       via  2a668e20da7ba6ae380eb44219f285f13fd34981 (commit)
       via  0213e6944ef471d7341eb1ac969656c68852f153 (commit)
       via  f2cbbb72fa9bac75bd753c7b8fefbe86c18a6a73 (commit)
       via  6fe3ef26c6c55256bc6e2b211a5c85872fcdbd16 (commit)
       via  0a5eca07ec0bb16804b8d9946a34107f46b50e3c (commit)
       via  44c4fe9ebfbb8eaa5a4a2386973f50b744c91edf (commit)
       via  b816563220ef58a1a7cafd04a50319df65cb2f8e (commit)
       via  1271a93434b6c32d0274cfad5e79cabeac80fc32 (commit)
       via  513369421602f0e102453779acfd2a58db70f2a9 (commit)
       via  e5feae98383ef72ce2ae0e849fbd6ca47172a9f3 (commit)
       via  fc9041d0249c113cb812d69ee0b8f1411f1eea15 (commit)
       via  95d84f76d9a8e27eb974fce7d06b7f2e312a05e6 (commit)
       via  c8ba39719409dc106f76c0b67f805158be01b3b4 (commit)
       via  210230e216764144b9a0112799d4c9046c3a8dd9 (commit)
       via  ae5686f8d0e4f153991d5a7c0cf7406fa7d3468c (commit)
       via  4f9fcd356b07143a570b39cb5be72d4e3a4e83dc (commit)
       via  4db483f89b54b261caa08b81c64d82ef7b86a6fe (commit)
       via  6dc0bbbd56fc28a6d24c8d8603ccc890310406fe (commit)
       via  43cb7fadb4b0c3c34478b6fc2e33b12258d1dd22 (commit)
       via  5c31c3e4eb36cccaaf72d0f0582beed98f6665e0 (commit)
       via  c8616203889269830b4f4e0ab087bfc722e6fc62 (commit)
       via  603ef7fd9d87f55da803b13ddad8f093c6fba3d7 (commit)
       via  ef6ce1f87ec2ba47694c470fbf5787a9ede0644b (commit)
       via  cd4fa896b1d11c26edf07bae19d262c971901827 (commit)
       via  aee7e4a03b8b410212e2eae23d1ecc182c8da817 (commit)
       via  368e8de4cd5a5d97c9b5e81489bf014579211bda (commit)
       via  29c3edb87adedd82e816552d958f4c3540a1511b (commit)
       via  a3eeaa63ae9900123cf88e4155d748bf37b93cce (commit)
       via  a14c449a9085375d313c44f67152fd1481a7a58a (commit)
       via  d4525d7288ef935ee8b9d8cf338763498850364f (commit)
       via  6b698bd29fb23d6d1451c6aea86f227a237295ab (commit)
       via  1d86036df86c3b2584b7d70ae83c14a34be113cc (commit)
       via  2db55ffa56a69c4b55410afb9b40ab20f4025837 (commit)
       via  cc1139cc304b6bd4c8403d437cf08f73e06e243a (commit)
       via  1b3495d32e1523648da08e138482a654f8765333 (commit)
       via  659605fbee9e9efc22cdd5050bacd1c094970604 (commit)
       via  4871885b9ce79c5d257ba0c2b879405631cd0bb8 (commit)
       via  7a373d5e55d6eec9448da7d3de145c0165f88577 (commit)
       via  9de113a943ae273b76c1b3cb648ac051aaa87f10 (commit)
       via  a7596fef6e8d6938ce0d7fcba47e896f288b12b4 (commit)
       via  08f29c600877a445ef2f5b4e6125563febeb1e38 (commit)
       via  3fe5d9bff98b4716e219516c30d71462495324f4 (commit)
       via  f086cb372e41035260fcd9b4ed3d2cfb272f138f (commit)
      from  44100adc6c7f7db7bfd4ccf0d8bd18de8ab195c0 (commit)

Those revisions listed 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:
 CMakeLists.txt                                     |   60 +-
 CompileFlags.cmake                                 |   15 +-
 Help/command/add_custom_command.rst                |   39 +-
 Help/command/add_custom_target.rst                 |  126 +-
 Help/command/break.rst                             |    2 +
 Help/command/continue.rst                          |   12 +
 Help/command/ctest_submit.rst                      |   13 +
 Help/command/file.rst                              |   35 +-
 Help/command/string.rst                            |    7 +-
 Help/command/target_include_directories.rst        |    3 +
 Help/command/target_link_libraries.rst             |    3 +
 Help/command/try_compile.rst                       |  126 +-
 Help/command/try_run.rst                           |  121 +-
 .../INTERFACE_INCLUDE_DIRECTORIES_WARNING.txt      |   30 +
 Help/include/INTERFACE_LINK_LIBRARIES_WARNING.txt  |   23 +
 Help/manual/cmake-buildsystem.7.rst                |    6 +-
 Help/manual/cmake-commands.7.rst                   |    1 +
 Help/manual/cmake-developer.7.rst                  |  207 +-
 Help/manual/cmake-language.7.rst                   |   16 +-
 Help/manual/cmake-modules.7.rst                    |    4 +
 Help/manual/cmake-packages.7.rst                   |   38 +-
 Help/manual/cmake-policies.7.rst                   |    8 +
 Help/manual/cmake-properties.7.rst                 |    2 +
 Help/manual/cmake-toolchains.7.rst                 |    5 +-
 Help/manual/cmake-variables.7.rst                  |    3 +
 Help/manual/cmake.1.rst                            |  120 +-
 Help/module/CTestCoverageCollectGCOV.rst           |    1 +
 Help/module/FindGSL.rst                            |    1 +
 Help/module/FindIntl.rst                           |    1 +
 Help/module/FindJsonCpp.rst                        |    1 +
 Help/policy/CMP0055.rst                            |   17 +
 Help/policy/CMP0056.rst                            |   32 +
 Help/prop_gbl/JOB_POOLS.rst                        |    3 +
 Help/prop_sf/VS_SHADER_FLAGS.rst                   |    4 +
 Help/prop_tgt/ANDROID_API_MIN.rst                  |    7 +
 Help/prop_tgt/CXX_STANDARD.rst                     |    3 +-
 Help/prop_tgt/CXX_STANDARD_REQUIRED.rst            |    3 +-
 Help/prop_tgt/C_STANDARD.rst                       |    3 +-
 Help/prop_tgt/C_STANDARD_REQUIRED.rst              |    3 +-
 Help/prop_tgt/INTERFACE_BUILD_PROPERTY.txt         |   16 +
 Help/prop_tgt/INTERFACE_COMPILE_DEFINITIONS.rst    |   18 +-
 Help/prop_tgt/INTERFACE_COMPILE_FEATURES.rst       |   18 +-
 Help/prop_tgt/INTERFACE_COMPILE_OPTIONS.rst        |   18 +-
 Help/prop_tgt/INTERFACE_INCLUDE_DIRECTORIES.rst    |   29 +-
 Help/prop_tgt/INTERFACE_LINK_LIBRARIES.rst         |    6 +-
 Help/prop_tgt/INTERFACE_SOURCES.rst                |   13 +-
 .../INTERFACE_SYSTEM_INCLUDE_DIRECTORIES.rst       |   17 +-
 Help/prop_tgt/LINK_INTERFACE_LIBRARIES.rst         |   22 +-
 Help/prop_tgt/LINK_INTERFACE_LIBRARIES_CONFIG.rst  |   14 +-
 Help/release/3.0.0.rst                             |  473 --
 Help/release/3.0.rst                               |  473 ++
 Help/release/3.1.0.rst                             |  425 --
 Help/release/3.1.rst                               |  425 ++
 Help/release/3.2.rst                               |  280 +
 Help/release/index.rst                             |    5 +-
 Help/variable/CMAKE_ANDROID_API_MIN.rst            |    5 +
 Help/variable/CMAKE_MAKE_PROGRAM.rst               |   11 +-
 Help/variable/CMAKE_MATCH_COUNT.rst                |    8 +
 Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst     |    2 +
 Help/variable/MINGW.rst                            |    6 +
 Modules/AutogenInfo.cmake.in                       |    1 +
 Modules/CMakeDetermineCCompiler.cmake              |    8 +-
 Modules/CMakeDetermineCompiler.cmake               |   31 +-
 Modules/CMakeDetermineCompilerABI.cmake            |    2 +-
 Modules/CMakeDetermineCompilerId.cmake             |    2 +-
 Modules/CMakeDetermineFortranCompiler.cmake        |    8 +-
 ...atorDetermineCompilerMacrosAndIncludeDirs.cmake |   11 +-
 Modules/CMakeFindPackageMode.cmake                 |    7 +-
 Modules/CMakeFindXCode.cmake                       |    8 +-
 Modules/CMakeForceCompiler.cmake                   |    4 +-
 Modules/CMakeNinjaFindMake.cmake                   |    3 +-
 Modules/CPack.cmake                                |   11 +-
 Modules/CPackBundle.cmake                          |   25 +
 Modules/CPackRPM.cmake                             |  270 +-
 Modules/CTestCoverageCollectGCOV.cmake             |  159 +
 Modules/CTestTargets.cmake                         |    3 +
 Modules/CheckStructHasMember.cmake                 |    3 +-
 Modules/Compiler/AppleClang-C-FeatureTests.cmake   |   11 +
 Modules/Compiler/AppleClang-C.cmake                |   32 +
 Modules/Compiler/AppleClang-CXX-FeatureTests.cmake |   52 +
 Modules/Compiler/AppleClang-CXX.cmake              |   38 +
 Modules/Compiler/Clang-C-FeatureTests.cmake        |    2 +-
 Modules/Compiler/Clang-C.cmake                     |   11 +-
 Modules/Compiler/Clang-CXX-FeatureTests.cmake      |   54 +-
 Modules/Compiler/Clang-CXX-TestableFeatures.cmake  |   54 +
 Modules/Compiler/Clang-CXX.cmake                   |   15 +-
 Modules/Compiler/GNU-C-FeatureTests.cmake          |   13 +-
 Modules/Compiler/GNU-C.cmake                       |   29 +-
 Modules/Compiler/GNU-CXX-FeatureTests.cmake        |   37 +-
 Modules/Compiler/GNU-CXX.cmake                     |   28 +-
 Modules/Compiler/GNU-Fortran.cmake                 |    5 -
 Modules/Compiler/HP-Fortran.cmake                  |    3 +
 Modules/Compiler/Intel-Fortran.cmake               |    3 +
 Modules/Compiler/MSVC-CXX-FeatureTests.cmake       |  106 +
 Modules/Compiler/MSVC-CXX.cmake                    |    9 +
 Modules/Compiler/PGI-Fortran.cmake                 |    5 -
 Modules/Compiler/SunPro-CXX-FeatureTests.cmake     |   52 +
 Modules/Compiler/SunPro-CXX.cmake                  |   23 +
 Modules/Compiler/SunPro-Fortran.cmake              |    3 +
 Modules/Compiler/XL-Fortran.cmake                  |    2 +-
 Modules/ExternalData.cmake                         |  541 +-
 Modules/ExternalData_config.cmake.in               |    1 +
 Modules/ExternalProject.cmake                      |  745 ++-
 Modules/FindBoost.cmake                            |    4 +-
 Modules/FindCUDA.cmake                             |   21 +-
 Modules/FindCurses.cmake                           |    5 -
 Modules/FindGSL.cmake                              |  238 +
 Modules/FindGettext.cmake                          |    3 +
 Modules/FindGit.cmake                              |    4 +
 Modules/FindIntl.cmake                             |   69 +
 Modules/FindJsonCpp.cmake                          |  117 +
 Modules/FindLATEX.cmake                            |  173 +-
 Modules/FindMPI.cmake                              |   59 +-
 Modules/FindOpenGL.cmake                           |   13 -
 Modules/FindOpenSSL.cmake                          |   20 +-
 Modules/FindPackageHandleStandardArgs.cmake        |    4 +-
 Modules/FindQt4.cmake                              |    2 +-
 Modules/FindUnixCommands.cmake                     |   12 +-
 Modules/FortranCInterface/CMakeLists.txt           |    2 +-
 Modules/GetPrerequisites.cmake                     |   46 +-
 Modules/Platform/Darwin-GNU-Fortran.cmake          |    2 +
 Modules/Platform/HP-UX-HP-Fortran.cmake            |    3 +
 Modules/Platform/IRIX.cmake                        |    8 +
 Modules/Platform/eCos.cmake                        |    2 +-
 Modules/UseJava.cmake                              |    2 +-
 Modules/UseSWIG.cmake                              |    2 +
 Modules/WriteCompilerDetectionHeader.cmake         |  149 +-
 Source/CMakeLists.txt                              |   36 +-
 Source/CMakeVersion.cmake                          |    6 +-
 Source/CPack/IFW/cmCPackIFWInstaller.cxx           |    2 +-
 Source/CPack/IFW/cmCPackIFWPackage.cxx             |    2 +-
 Source/CPack/WiX/cmCPackWIXGenerator.cxx           |    7 +-
 Source/CPack/cmCPackArchiveGenerator.cxx           |    8 +-
 Source/CPack/cmCPackBundleGenerator.cxx            |  146 +-
 Source/CPack/cmCPackBundleGenerator.h              |    2 +
 Source/CPack/cmCPackComponentGroup.cxx             |    2 +-
 Source/CPack/cmCPackDebGenerator.cxx               |    8 +-
 Source/CPack/cmCPackDragNDropGenerator.cxx         |   44 +-
 Source/CPack/cmCPackDragNDropGenerator.h           |    4 +-
 Source/CPack/cmCPackGenerator.cxx                  |   26 +-
 Source/CPack/cmCPackGenerator.h                    |    2 +-
 Source/CPack/cmCPackGeneratorFactory.cxx           |    9 +-
 Source/CPack/cmCPackLog.cxx                        |   10 +-
 Source/CPack/cmCPackLog.h                          |    2 +-
 Source/CPack/cmCPackNSISGenerator.cxx              |   36 +-
 Source/CPack/cmCPackNSISGenerator.h                |    8 +-
 Source/CPack/cmCPackOSXX11Generator.cxx            |    6 +-
 Source/CPack/cmCPackPackageMakerGenerator.cxx      |   22 +-
 Source/CPack/cmCPackPackageMakerGenerator.h        |   10 +-
 Source/CPack/cmCPackRPMGenerator.cxx               |    4 +-
 Source/CPack/cmCPackSTGZGenerator.cxx              |    2 -
 Source/CPack/cpack.cxx                             |    6 +-
 Source/CTest/cmCTestBatchTestHandler.cxx           |    2 +-
 Source/CTest/cmCTestBuildAndTestHandler.cxx        |   44 +-
 Source/CTest/cmCTestBuildAndTestHandler.h          |    2 +-
 Source/CTest/cmCTestBuildCommand.cxx               |    6 +-
 Source/CTest/cmCTestBuildHandler.cxx               |   30 +-
 Source/CTest/cmCTestConfigureCommand.cxx           |    2 +-
 Source/CTest/cmCTestConfigureHandler.cxx           |    4 +-
 Source/CTest/cmCTestCoverageHandler.cxx            |  184 +-
 Source/CTest/cmCTestCoverageHandler.h              |    6 +
 Source/CTest/cmCTestCurl.cxx                       |  282 +
 Source/CTest/cmCTestCurl.h                         |   54 +
 .../CTest/cmCTestEmptyBinaryDirectoryCommand.cxx   |    2 +-
 Source/CTest/cmCTestGIT.cxx                        |    2 +-
 Source/CTest/cmCTestGenericHandler.cxx             |    4 +-
 Source/CTest/cmCTestHandlerCommand.cxx             |   10 +-
 Source/CTest/cmCTestLaunch.cxx                     |   23 +-
 Source/CTest/cmCTestMemCheckHandler.cxx            |   36 +-
 Source/CTest/cmCTestMultiProcessHandler.cxx        |   52 +-
 Source/CTest/cmCTestP4.cxx                         |   10 +-
 Source/CTest/cmCTestRunScriptCommand.cxx           |    2 +-
 Source/CTest/cmCTestRunTest.cxx                    |   18 +-
 Source/CTest/cmCTestScriptHandler.cxx              |   36 +-
 Source/CTest/cmCTestStartCommand.cxx               |    4 +-
 Source/CTest/cmCTestSubmitCommand.cxx              |  122 +-
 Source/CTest/cmCTestSubmitCommand.h                |    9 +
 Source/CTest/cmCTestSubmitHandler.cxx              |  269 +-
 Source/CTest/cmCTestSubmitHandler.h                |    5 +
 Source/CTest/cmCTestTestCommand.cxx                |    2 +-
 Source/CTest/cmCTestTestHandler.cxx                |  142 +-
 Source/CTest/cmCTestUpdateHandler.cxx              |    6 +-
 Source/CTest/cmCTestUpdateHandler.h                |    8 -
 Source/CTest/cmCTestUploadCommand.cxx              |    2 +-
 Source/CTest/cmCTestVC.cxx                         |    2 +-
 Source/CTest/cmParseBlanketJSCoverage.cxx          |  164 +
 Source/CTest/cmParseBlanketJSCoverage.h            |   48 +
 Source/CTest/cmParseCacheCoverage.cxx              |    6 +-
 Source/CTest/cmParseCoberturaCoverage.cxx          |   48 +-
 Source/CTest/cmParseDelphiCoverage.cxx             |  251 +
 Source/CTest/cmParseDelphiCoverage.h               |   46 +
 Source/CTest/cmParseGTMCoverage.cxx                |    4 +-
 Source/CTest/cmParseJacocoCoverage.cxx             |    2 +-
 Source/CTest/cmParsePHPCoverage.cxx                |    2 +-
 Source/CTest/cmProcess.cxx                         |    4 +-
 Source/CursesDialog/CMakeLists.txt                 |   18 +-
 Source/CursesDialog/cmCursesBoolWidget.h           |    6 +-
 Source/CursesDialog/cmCursesCacheEntryComposite.h  |    6 +-
 Source/CursesDialog/cmCursesDummyWidget.h          |    6 +-
 Source/CursesDialog/cmCursesFilePathWidget.h       |    6 +-
 Source/CursesDialog/cmCursesForm.h                 |    6 +-
 Source/CursesDialog/cmCursesLabelWidget.h          |    6 +-
 Source/CursesDialog/cmCursesLongMessageForm.h      |    6 +-
 Source/CursesDialog/cmCursesMainForm.cxx           |   23 +-
 Source/CursesDialog/cmCursesMainForm.h             |    6 +-
 Source/CursesDialog/cmCursesOptionsWidget.h        |    6 +-
 Source/CursesDialog/cmCursesPathWidget.cxx         |    2 +-
 Source/CursesDialog/cmCursesPathWidget.h           |    6 +-
 Source/CursesDialog/cmCursesStandardIncludes.h     |   42 +-
 Source/CursesDialog/cmCursesStringWidget.h         |    6 +-
 Source/CursesDialog/cmCursesWidget.h               |    6 +-
 Source/CursesDialog/form/fld_attr.c                |    8 +-
 Source/CursesDialog/form/form.h                    |   10 +
 Source/CursesDialog/form/form.priv.h               |    6 -
 Source/CursesDialog/form/frm_driver.c              |   19 +-
 Source/CursesDialog/form/frm_post.c                |    5 -
 Source/CursesDialog/form/frm_req_name.c            |    6 -
 Source/QtDialog/CMake.desktop                      |    2 +-
 Source/QtDialog/CMakeLists.txt                     |   10 +-
 Source/QtDialog/CMakeSetupDialog.cxx               |    2 +-
 Source/QtDialog/CMakeSetupDialog.ui                |    2 +-
 Source/QtDialog/QCMake.h                           |    6 +-
 Source/QtDialog/QMacInstallDialog.cxx              |    6 +-
 Source/cmAddCustomCommandCommand.cxx               |   50 +-
 Source/cmAddCustomTargetCommand.cxx                |   57 +-
 Source/cmAddDependenciesCommand.cxx                |    6 +-
 Source/cmAddExecutableCommand.cxx                  |   14 +-
 Source/cmAddLibraryCommand.cxx                     |   51 +-
 Source/cmAddSubDirectoryCommand.cxx                |   12 +-
 Source/cmAddTestCommand.cxx                        |   12 +-
 Source/cmArchiveWrite.cxx                          |   19 +-
 Source/cmArchiveWrite.h                            |    2 +
 Source/cmAuxSourceDirectoryCommand.cxx             |    2 +-
 Source/cmBootstrapCommands1.cxx                    |    4 +
 Source/cmBreakCommand.cxx                          |   68 +-
 Source/cmBuildCommand.cxx                          |    2 +-
 Source/cmBuildNameCommand.cxx                      |    2 +-
 Source/cmCMakeMinimumRequired.cxx                  |   22 +-
 Source/cmCMakePolicyCommand.cxx                    |    8 +-
 Source/cmCPluginAPI.cxx                            |    5 +-
 Source/cmCTest.cxx                                 |   91 +-
 Source/cmCTest.h                                   |    2 +-
 Source/cmCacheManager.cxx                          |   14 +-
 Source/cmCallVisualStudioMacro.cxx                 |   19 +-
 Source/cmCommand.h                                 |    2 +-
 Source/cmCommandArgumentParser.cxx                 |    6 -
 Source/cmCommandArgumentParser.y                   |    6 -
 Source/cmCommandArgumentParserHelper.cxx           |   10 +-
 Source/cmCommandArgumentsHelper.cxx                |    9 +-
 Source/cmComputeLinkDepends.cxx                    |   21 +-
 Source/cmComputeLinkInformation.cxx                |   67 +-
 Source/cmComputeTargetDepends.cxx                  |    4 +-
 Source/cmConditionEvaluator.cxx                    |   21 +-
 Source/cmConfigure.cmake.h.in                      |    5 +-
 Source/cmConfigureFileCommand.cxx                  |   19 +-
 Source/cmContinueCommand.cxx                       |   39 +
 Source/cmContinueCommand.h                         |   55 +
 Source/cmCoreTryCompile.cxx                        |   76 +-
 Source/cmCreateTestSourceList.cxx                  |    8 +-
 Source/cmCurl.cxx                                  |   64 +
 Source/cmCurl.h                                    |   21 +
 Source/cmCustomCommand.cxx                         |   40 +-
 Source/cmCustomCommand.h                           |   11 +
 Source/cmCustomCommandGenerator.cxx                |    6 +
 Source/cmCustomCommandGenerator.h                  |    1 +
 Source/cmDefinePropertyCommand.cxx                 |    4 +-
 Source/cmDepends.cxx                               |   12 +-
 Source/cmDependsC.cxx                              |   17 +-
 Source/cmDependsFortran.cxx                        |   14 +-
 Source/cmDependsFortranParser.cxx                  |    6 -
 Source/cmDependsFortranParser.y                    |    6 -
 Source/cmDependsJavaParser.cxx                     |    6 -
 Source/cmDependsJavaParser.y                       |    6 -
 Source/cmDependsJavaParserHelper.cxx               |   10 +-
 Source/cmDocumentation.cxx                         |   11 +-
 Source/cmDocumentationFormatter.cxx                |    6 +-
 Source/cmDynamicLoader.h                           |    4 +-
 Source/cmELF.cxx                                   |    2 +-
 Source/cmExecProgramCommand.cxx                    |   12 +-
 Source/cmExecuteProcessCommand.cxx                 |    6 +-
 Source/cmExecutionStatus.h                         |    7 +
 Source/cmExportBuildFileGenerator.cxx              |    6 +-
 Source/cmExportCommand.cxx                         |   26 +-
 Source/cmExportFileGenerator.cxx                   |   20 +-
 Source/cmExportInstallFileGenerator.cxx            |   65 +-
 Source/cmExportInstallFileGenerator.h              |    4 -
 Source/cmExportSet.cxx                             |    5 +-
 Source/cmExportSetMap.cxx                          |    7 +-
 Source/cmExprParser.cxx                            |    6 -
 Source/cmExprParser.y                              |    6 -
 Source/cmExprParserHelper.cxx                      |    2 +-
 Source/cmExtraCodeBlocksGenerator.cxx              |   24 +-
 Source/cmExtraCodeLiteGenerator.cxx                |    4 +-
 Source/cmExtraEclipseCDT4Generator.cxx             |   20 +-
 Source/cmExtraKateGenerator.cxx                    |    2 +-
 Source/cmFileCommand.cxx                           |  453 +-
 Source/cmFileCommand.h                             |    1 +
 Source/cmFileLock.cxx                              |   78 +
 Source/cmFileLock.h                                |   74 +
 Source/cmFileLockPool.cxx                          |  187 +
 Source/cmFileLockPool.h                            |  102 +
 Source/cmFileLockResult.cxx                        |  111 +
 Source/cmFileLockResult.h                          |   85 +
 Source/cmFileLockUnix.cxx                          |  102 +
 Source/cmFileLockWin32.cxx                         |  126 +
 Source/cmFindBase.cxx                              |  282 +-
 Source/cmFindBase.h                                |   19 +-
 Source/cmFindCommon.cxx                            |  206 +-
 Source/cmFindCommon.h                              |   66 +-
 Source/cmFindLibraryCommand.cxx                    |   22 +-
 Source/cmFindPackageCommand.cxx                    |  322 +-
 Source/cmFindPackageCommand.h                      |   41 +-
 Source/cmFindPathCommand.cxx                       |    8 +-
 Source/cmFindProgramCommand.cxx                    |    4 +-
 Source/cmForEachCommand.cxx                        |   16 +-
 Source/cmFunctionCommand.cxx                       |   14 +-
 Source/cmGeneratedFileStream.cxx                   |    8 +-
 Source/cmGeneratedFileStream.h                     |    8 -
 Source/cmGeneratorExpression.cxx                   |   32 +-
 Source/cmGeneratorExpression.h                     |    5 +
 Source/cmGeneratorExpressionDAGChecker.cxx         |   10 +-
 Source/cmGeneratorExpressionEvaluationFile.cxx     |   35 +-
 Source/cmGeneratorExpressionEvaluationFile.h       |    4 +-
 Source/cmGeneratorExpressionEvaluator.cxx          |   83 +-
 Source/cmGeneratorExpressionEvaluator.h            |    1 +
 Source/cmGeneratorExpressionParser.cxx             |   10 +-
 Source/cmGeneratorTarget.cxx                       |   49 +-
 Source/cmGetCMakePropertyCommand.cxx               |    2 +-
 Source/cmGetDirectoryPropertyCommand.cxx           |    2 +-
 Source/cmGetFilenameComponentCommand.cxx           |   10 +-
 Source/cmGetPropertyCommand.cxx                    |   14 +-
 Source/cmGetTargetPropertyCommand.cxx              |    2 +-
 Source/cmGlobalBorlandMakefileGenerator.cxx        |    1 +
 Source/cmGlobalGenerator.cxx                       |  251 +-
 Source/cmGlobalGenerator.h                         |   40 +-
 Source/cmGlobalKdevelopGenerator.cxx               |    8 +-
 Source/cmGlobalNinjaGenerator.cxx                  |   73 +-
 Source/cmGlobalNinjaGenerator.h                    |    8 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx          |   10 +-
 Source/cmGlobalVisualStudio10Generator.cxx         |   16 +-
 Source/cmGlobalVisualStudio11Generator.cxx         |    4 +-
 Source/cmGlobalVisualStudio12Generator.cxx         |    4 +-
 Source/cmGlobalVisualStudio71Generator.cxx         |    5 +
 Source/cmGlobalVisualStudio7Generator.cxx          |    5 +
 Source/cmGlobalVisualStudio8Generator.cxx          |    3 +-
 Source/cmGlobalVisualStudioGenerator.cxx           |   12 +-
 Source/cmGlobalXCodeGenerator.cxx                  |  139 +-
 Source/cmGlobalXCodeGenerator.h                    |   11 +-
 Source/cmGraphVizWriter.cxx                        |    6 +-
 Source/cmIfCommand.cxx                             |   11 +-
 Source/cmIncludeCommand.cxx                        |   10 +-
 Source/cmIncludeDirectoryCommand.cxx               |    8 +-
 Source/cmInstallCommand.cxx                        |  103 +-
 Source/cmInstallExportGenerator.cxx                |    2 +-
 Source/cmInstallFilesCommand.cxx                   |    9 +-
 Source/cmInstallProgramsCommand.cxx                |    6 +-
 Source/cmInstallTargetGenerator.cxx                |   12 +-
 Source/cmInstalledFile.h                           |    6 +-
 Source/cmLinkDirectoriesCommand.cxx                |    2 +-
 Source/cmListCommand.cxx                           |   56 +-
 Source/cmListFileCache.cxx                         |   19 +-
 Source/cmLoadCacheCommand.cxx                      |    9 +-
 Source/cmLoadCommandCommand.cxx                    |    2 +-
 Source/cmLocalGenerator.cxx                        |  152 +-
 Source/cmLocalNinjaGenerator.cxx                   |   17 +-
 Source/cmLocalNinjaGenerator.h                     |    2 +-
 Source/cmLocalUnixMakefileGenerator3.cxx           |  133 +-
 Source/cmLocalUnixMakefileGenerator3.h             |   11 +
 Source/cmLocalVisualStudio6Generator.cxx           |    8 +-
 Source/cmLocalVisualStudio7Generator.cxx           |   22 +-
 Source/cmLocalVisualStudioGenerator.cxx            |    4 +-
 Source/cmMachO.cxx                                 |  419 ++
 Source/cmMachO.h                                   |   51 +
 Source/cmMacroCommand.cxx                          |   14 +-
 Source/cmMakeDepend.cxx                            |   21 +-
 Source/cmMakefile.cxx                              |  441 +-
 Source/cmMakefile.h                                |   51 +-
 Source/cmMakefileExecutableTargetGenerator.cxx     |    4 +-
 Source/cmMakefileLibraryTargetGenerator.cxx        |   27 +-
 Source/cmMakefileTargetGenerator.cxx               |  161 +-
 Source/cmMakefileTargetGenerator.h                 |   12 -
 Source/cmNinjaNormalTargetGenerator.cxx            |  101 +-
 Source/cmNinjaTargetGenerator.cxx                  |   87 +-
 Source/cmNinjaTargetGenerator.h                    |    3 +-
 Source/cmNinjaUtilityTargetGenerator.cxx           |   26 +-
 Source/cmOSXBundleGenerator.cxx                    |   20 +-
 Source/cmOrderDirectories.cxx                      |   24 +-
 Source/cmPathLabel.cxx                             |   41 +
 Source/cmPathLabel.h                               |   44 +
 Source/cmPolicies.cxx                              |   34 +-
 Source/cmPolicies.h                                |    2 +
 Source/cmProjectCommand.cxx                        |    2 +-
 Source/cmQtAutoGenerators.cxx                      |  459 +-
 Source/cmQtAutoGenerators.h                        |   14 +-
 Source/cmRST.cxx                                   |    9 +-
 Source/cmRemoveCommand.cxx                         |    7 +-
 Source/cmSearchPath.cxx                            |  251 +
 Source/cmSearchPath.h                              |   57 +
 Source/cmSeparateArgumentsCommand.cxx              |    2 +-
 Source/cmSetCommand.cxx                            |    6 +-
 Source/cmSetPropertyCommand.cxx                    |   22 +-
 Source/cmSetTargetPropertiesCommand.cxx            |    2 +-
 Source/cmSetTestsPropertiesCommand.cxx             |    2 +-
 Source/cmSiteNameCommand.cxx                       |    4 +-
 Source/cmSourceFile.cxx                            |    4 +-
 Source/cmSourceFileLocation.cxx                    |   14 +-
 Source/cmSourceGroupCommand.cxx                    |    2 +-
 Source/cmStandardIncludes.cxx                      |   16 -
 Source/cmStandardIncludes.h                        |  333 +-
 Source/cmStandardLexer.h                           |   25 -
 Source/cmStringCommand.cxx                         |   70 +-
 Source/cmStringCommand.h                           |    2 -
 Source/cmSubdirCommand.cxx                         |    4 +-
 Source/cmSystemTools.cxx                           |  177 +-
 Source/cmSystemTools.h                             |   20 +-
 Source/cmTarget.cxx                                |  231 +-
 Source/cmTarget.h                                  |    2 +-
 Source/cmTargetCompileDefinitionsCommand.cxx       |    4 +-
 Source/cmTargetCompileFeaturesCommand.cxx          |   14 +-
 Source/cmTargetCompileOptionsCommand.cxx           |   14 +-
 Source/cmTargetIncludeDirectoriesCommand.cxx       |   14 +-
 Source/cmTargetLinkLibrariesCommand.cxx            |   12 +-
 Source/cmTargetSourcesCommand.cxx                  |   14 +-
 Source/cmTryRunCommand.cxx                         |   23 +-
 Source/cmUseMangledMesaCommand.cxx                 |    2 +-
 Source/cmUtilitySourceCommand.cxx                  |    2 +-
 Source/cmUuid.cxx                                  |    2 +-
 Source/cmVariableWatch.cxx                         |   21 +-
 Source/cmVariableWatchCommand.cxx                  |    6 +-
 Source/cmVisualStudio10TargetGenerator.cxx         |   36 +-
 Source/cmVisualStudioGeneratorOptions.cxx          |   41 +-
 Source/cmVisualStudioGeneratorOptions.h            |    7 +
 Source/cmWhileCommand.cxx                          |   12 +-
 Source/cmWriteFileCommand.cxx                      |    2 -
 Source/cmXMLParser.cxx                             |    2 +-
 Source/cm_get_date.c                               |   16 +
 Source/cm_get_date.h                               |   28 +
 Source/cm_sha2.c                                   |   27 +-
 Source/cmake.cxx                                   |  119 +-
 Source/cmakemain.cxx                               |   14 +-
 Source/cmcmd.cxx                                   |  159 +-
 Source/ctest.cxx                                   |    2 +-
 Source/kwsys/Base64.c                              |   24 +-
 Source/kwsys/Base64.h.in                           |   18 +-
 Source/kwsys/CMakeLists.txt                        |  226 +-
 Source/kwsys/CONTRIBUTING.rst                      |   35 +
 Source/kwsys/Directory.cxx                         |   23 +-
 Source/kwsys/Directory.hxx.in                      |    2 -
 Source/kwsys/DynamicLoader.cxx                     |   66 +-
 Source/kwsys/DynamicLoader.hxx.in                  |   15 +-
 Source/kwsys/EncodingC.c                           |    4 +-
 Source/kwsys/FStream.hxx.in                        |   10 +-
 Source/kwsys/Glob.cxx                              |    2 +-
 Source/kwsys/ProcessUNIX.c                         |    4 +-
 Source/kwsys/ProcessWin32.c                        |   12 +-
 Source/kwsys/README.txt                            |    2 +
 Source/kwsys/SharedForward.h.in                    |   16 +
 Source/kwsys/SystemInformation.cxx                 |   25 +-
 Source/kwsys/SystemTools.cxx                       |  250 +-
 Source/kwsys/SystemTools.hxx.in                    |   51 +-
 Source/kwsys/kwsysPlatformTests.cmake              |   88 +-
 Source/kwsys/kwsysPlatformTestsCXX.cxx             |    4 +
 Source/kwsys/testSystemTools.cxx                   |    4 +-
 Tests/Assembler/CMakeLists.txt                     |    2 +-
 Tests/BuildDepends/CMakeLists.txt                  |   34 +-
 Tests/BuildDepends/Project/CMakeLists.txt          |   13 +
 Tests/CFBundleTest/VerifyResult.cmake              |    9 +-
 Tests/CMakeLib/CMakeLists.txt                      |    2 +
 Tests/CMakeLib/PseudoMemcheck/CMakeLists.txt       |   41 +
 .../PseudoMemcheck/NoLog}/CMakeLists.txt           |    0
 .../PseudoMemcheck}/memtester.cxx.in               |    0
 Tests/CMakeLib/testXMLSafe.cxx                     |    2 +-
 Tests/CMakeLists.txt                               |  136 +-
 Tests/CMakeTests/CheckSourceTreeTest.cmake.in      |    4 +-
 Tests/CMakeTests/StringTest.cmake.in               |    4 +-
 Tests/CMakeTests/StringTestScript.cmake            |   11 +-
 Tests/CMakeTests/VersionTest.cmake.in              |   88 +-
 Tests/CPackComponentsForAll/CMakeLists.txt         |    6 +
 .../MyLibCPackConfig-IgnoreGroup.cmake.in          |   15 +-
 .../RunCPackVerifyResult.cmake                     |   85 +
 Tests/CTestCoverageCollectGCOV/fakegcov.cmake      |    8 +
 Tests/CTestCoverageCollectGCOV/test.cmake.in       |   39 +
 Tests/CTestTestMemcheck/CMakeLists.txt             |  290 -
 Tests/CTestTestMemcheck/test.cmake.in              |   26 -
 Tests/CompileDefinitions/CMakeLists.txt            |    6 +-
 .../CompileDefinitions/add_def_cmd/CMakeLists.txt  |   12 +
 .../add_def_cmd_tprop/CMakeLists.txt               |   16 +
 .../add_definitions_command/CMakeLists.txt         |   15 -
 .../CMakeLists.txt                                 |   19 -
 Tests/CompileFeatures/CMakeLists.txt               |  259 +-
 Tests/CompileFeatures/cxx_auto_type.cpp            |    9 +-
 .../cxx_generalized_initializers.cpp               |    1 +
 .../cxx_inheriting_constructors.cpp                |    2 +-
 Tests/CompileFeatures/cxx_variadic_templates.cpp   |   23 +-
 Tests/CompileFeatures/default_dialect.cpp          |    2 +-
 Tests/CompileFeatures/feature_test.c               |   10 +
 Tests/CompileFeatures/genex_test.c                 |   38 +
 Tests/CompileFeatures/genex_test.cpp               |   51 +
 Tests/Complex/Executable/CMakeLists.txt            |   16 +-
 Tests/Complex/Executable/complex.cxx               |   22 +-
 Tests/ComplexOneConfig/Executable/CMakeLists.txt   |   16 +-
 Tests/ComplexOneConfig/Executable/complex.cxx      |   22 +-
 Tests/CustomCommand/CMakeLists.txt                 |   31 +-
 Tests/CustomCommand/config.h.in                    |    1 -
 Tests/CustomCommand/foo.in                         |    3 +-
 Tests/CustomCommandByproducts/CMakeLists.txt       |  127 +
 .../CustomCommandByproducts.c                      |   23 +
 .../External/CMakeLists.txt                        |    4 +
 .../External/ExternalLibrary.c                     |    1 +
 .../ProducerExe.c}                                 |    0
 Tests/CustomCommandByproducts/byproduct1.c.in      |    1 +
 Tests/CustomCommandByproducts/byproduct2.c.in      |    1 +
 Tests/CustomCommandByproducts/byproduct3.c.in      |    1 +
 Tests/CustomCommandByproducts/byproduct4.c.in      |    1 +
 Tests/CustomCommandByproducts/byproduct5.c.in      |    1 +
 Tests/CustomCommandByproducts/byproduct6.c.in      |    1 +
 Tests/CustomCommandByproducts/byproduct7.c.in      |    1 +
 Tests/CustomCommandByproducts/byproduct8.c.in      |    1 +
 Tests/CustomCommandByproducts/ninja-check.cmake    |   20 +
 Tests/DelphiCoverage/DartConfiguration.tcl.in      |    8 +
 Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html |  117 +
 Tests/DelphiCoverage/src/UTCovTest.pas             |   75 +
 Tests/ExportImport/Export/CMakeLists.txt           |   15 +
 .../Export/include/abs/1a/testLibAbs1a.h           |    1 +
 .../Export/include/abs/1b/testLibAbs1b.h           |    1 +
 .../ExportImport/Export/include/abs/testLibAbs1.h  |    1 +
 Tests/ExportImport/Export/testLibAbs1.c            |    1 +
 Tests/ExportImport/Import/A/CMakeLists.txt         |   40 +
 Tests/ExportImport/Import/A/imp_testExeAbs1.c      |   15 +
 Tests/ExternalProjectLocal/CMakeLists.txt          |   28 +-
 Tests/ExternalProjectUpdate/CMakeLists.txt         |   15 +-
 .../ExternalProjectUpdateTest.cmake                |   96 +
 Tests/FindGSL/CMakeLists.txt                       |    9 +
 Tests/FindGSL/rng/CMakeLists.txt                   |   14 +
 Tests/FindGSL/rng/main.cc                          |   24 +
 Tests/FindJsonCpp/CMakeLists.txt                   |   10 +
 Tests/FindJsonCpp/Test/CMakeLists.txt              |   14 +
 Tests/FindJsonCpp/Test/main.cxx                    |    8 +
 Tests/ForceInclude/CMakeLists.txt                  |    2 +-
 Tests/Fortran/CMakeLists.txt                       |   18 +-
 Tests/FortranC/CMakeLists.txt                      |    2 +-
 Tests/FortranOnly/CMakeLists.txt                   |   26 +
 Tests/FortranOnly/preprocess.F                     |    5 +
 Tests/FortranOnly/test_preprocess.cmake            |    7 +
 .../SystemIncludeDirectories/CMakeLists.txt        |    8 +-
 .../config_specific/config_iface.h                 |   14 +
 .../SystemIncludeDirectories/consumer.cpp          |    2 +
 Tests/JavascriptCoverage/DartConfiguration.tcl.in  |    8 +
 Tests/JavascriptCoverage/output.json.in            |  448 ++
 Tests/JavascriptCoverage/test.js                   |   53 +
 Tests/JavascriptCoverage/test3.js                  |   37 +
 Tests/LinkStatic/CMakeLists.txt                    |    2 +-
 Tests/Module/ExternalData/CMakeLists.txt           |    3 +
 Tests/Module/ExternalData/Data1Check.cmake         |    4 +
 Tests/Module/ExternalData/DataScript.dat.md5       |    1 +
 Tests/Module/ExternalData/MyScript1.cmake          |    5 +
 .../WriteCompilerDetectionHeader/CMakeLists.txt    |   85 +-
 .../WriteCompilerDetectionHeader/compile_tests.h   |   25 +
 Tests/Module/WriteCompilerDetectionHeader/main.c   |   29 +
 Tests/Module/WriteCompilerDetectionHeader/main.cpp |   25 +-
 .../WriteCompilerDetectionHeader/main_multi.c      |   29 +
 .../WriteCompilerDetectionHeader/multi_files.cpp   |   14 +
 Tests/ModuleDefinition/CMakeLists.txt              |    2 +-
 Tests/OutDir/OutDir.cmake                          |   10 +-
 Tests/PDBDirectoryAndName/CMakeLists.txt           |    2 +-
 Tests/PrecompiledHeader/CMakeLists.txt             |    2 +-
 Tests/Preprocess/CMakeLists.txt                    |    2 +-
 Tests/QtAutogen/CMakeLists.txt                     |   32 +
 Tests/QtAutogen/autorcc_depends/CMakeLists.txt     |   24 +
 Tests/QtAutogen/autorcc_depends/res1.qrc           |    5 +
 Tests/QtAutogen/autorcc_depends/res1_input.txt     |    1 +
 .../autorcc_depends/test_res1.cpp}                 |    0
 Tests/RunCMake/CMP0019/CMakeLists.txt              |    2 +-
 .../CMP0055-NEW-Out-of-Scope-result.txt}           |    0
 .../CMP0055/CMP0055-NEW-Out-of-Scope-stderr.txt    |    4 +
 .../CMP0055/CMP0055-NEW-Out-of-Scope.cmake         |    4 +
 .../CMP0055-NEW-Reject-Arguments-result.txt}       |    0
 .../CMP0055-NEW-Reject-Arguments-stderr.txt        |    4 +
 .../CMP0055/CMP0055-NEW-Reject-Arguments.cmake     |    6 +
 .../CMP0055-OLD-Out-of-Scope-result.txt}           |    0
 .../CMP0055-OLD-Out-of-Scope-stderr.txt}           |    0
 .../CMP0055/CMP0055-OLD-Out-of-Scope.cmake         |    4 +
 .../CMP0055-OLD-Reject-Arguments-result.txt}       |    0
 .../CMP0055-OLD-Reject-Arguments-stderr.txt}       |    0
 .../CMP0055/CMP0055-OLD-Reject-Arguments.cmake     |    6 +
 .../CMP0055-WARN-Out-of-Scope-result.txt}          |    0
 .../CMP0055/CMP0055-WARN-Out-of-Scope-stderr.txt   |    9 +
 .../CMP0055/CMP0055-WARN-Out-of-Scope.cmake        |    2 +
 .../CMP0055-WARN-Reject-Arguments-result.txt}      |    0
 .../CMP0055-WARN-Reject-Arguments-stderr.txt       |    9 +
 .../CMP0055/CMP0055-WARN-Reject-Arguments.cmake    |    4 +
 Tests/RunCMake/CMP0055/CMakeLists.txt              |    3 +
 Tests/RunCMake/CMP0055/RunCMakeTest.cmake          |    9 +
 Tests/RunCMake/CMakeLists.txt                      |   33 +-
 Tests/RunCMake/CPackRPM/CMakeLists.txt             |    7 +
 ...ackRPM_PARTIALLY_RELOCATABLE_WARNING-stderr.txt |    1 +
 .../CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake   |    7 +
 Tests/RunCMake/CPackRPM/RunCMakeTest.cmake         |   17 +
 .../CTestMemcheck}/CMakeLists.txt.in               |    0
 .../CTestMemcheck}/CTestConfig.cmake.in            |    0
 .../CTestMemcheck/DummyAddressSanitizer-result.txt |    1 +
 .../CTestMemcheck/DummyAddressSanitizer-stderr.txt |    2 +
 .../CTestMemcheck/DummyAddressSanitizer-stdout.txt |    2 +
 Tests/RunCMake/CTestMemcheck/DummyBC-result.txt    |    1 +
 Tests/RunCMake/CTestMemcheck/DummyBC-stderr.txt    |    1 +
 Tests/RunCMake/CTestMemcheck/DummyBC-stdout.txt    |    3 +
 .../CTestMemcheck/DummyBCNoLogFile-result.txt      |    1 +
 .../CTestMemcheck/DummyBCNoLogFile-stderr.txt      |    3 +
 .../CTestMemcheck/DummyBCNoLogFile-stdout.txt      |    3 +
 .../CTestMemcheck/DummyLeakSanitizer-result.txt    |    1 +
 .../CTestMemcheck/DummyLeakSanitizer-stderr.txt    |    2 +
 .../CTestMemcheck/DummyLeakSanitizer-stdout.txt    |    3 +
 .../CTestMemcheck/DummyMemorySanitizer-result.txt  |    1 +
 .../CTestMemcheck/DummyMemorySanitizer-stderr.txt  |    2 +
 .../CTestMemcheck/DummyMemorySanitizer-stdout.txt  |    2 +
 .../DummyPurify-result.txt}                        |    0
 .../RunCMake/CTestMemcheck/DummyPurify-stderr.txt  |    3 +
 .../RunCMake/CTestMemcheck/DummyPurify-stdout.txt  |    6 +
 .../CTestMemcheck/DummyPurifyNoLogFile-result.txt  |    1 +
 .../CTestMemcheck/DummyPurifyNoLogFile-stderr.txt  |    2 +
 .../CTestMemcheck/DummyPurifyNoLogFile-stdout.txt  |    3 +
 .../CTestMemcheck/DummyThreadSanitizer-result.txt  |    1 +
 .../CTestMemcheck/DummyThreadSanitizer-stderr.txt  |    2 +
 .../CTestMemcheck/DummyThreadSanitizer-stdout.txt  |   13 +
 .../DummyUndefinedBehaviorSanitizer-result.txt     |    1 +
 .../DummyUndefinedBehaviorSanitizer-stderr.txt     |    2 +
 .../DummyUndefinedBehaviorSanitizer-stdout.txt     |    2 +
 .../DummyValgrind-result.txt}                      |    0
 .../CTestMemcheck/DummyValgrind-stderr.txt         |    3 +
 .../CTestMemcheck/DummyValgrind-stdout.txt         |    6 +
 .../DummyValgrindCustomOptions-result.txt          |    1 +
 .../DummyValgrindCustomOptions-stderr.txt          |    2 +
 .../DummyValgrindCustomOptions-stdout.txt          |    6 +
 .../CTestMemcheck/DummyValgrindFailPost-result.txt |    1 +
 .../CTestMemcheck/DummyValgrindFailPost-stderr.txt |    3 +
 .../CTestMemcheck/DummyValgrindFailPost-stdout.txt |    6 +
 .../CTestMemcheck/DummyValgrindFailPre-result.txt  |    1 +
 .../CTestMemcheck/DummyValgrindFailPre-stderr.txt  |    3 +
 .../CTestMemcheck/DummyValgrindFailPre-stdout.txt  |    1 +
 .../DummyValgrindIgnoreMemcheck-result.txt}        |    0
 .../DummyValgrindIgnoreMemcheck-stderr.txt         |    3 +
 .../DummyValgrindIgnoreMemcheck-stdout.txt         |    7 +
 .../DummyValgrindInvalidSupFile-result.txt         |    1 +
 .../DummyValgrindInvalidSupFile-stderr.txt         |    2 +
 .../DummyValgrindInvalidSupFile-stdout.txt         |    1 +
 .../DummyValgrindNoLogFile-result.txt              |    1 +
 .../DummyValgrindNoLogFile-stderr.txt              |    2 +
 .../DummyValgrindNoLogFile-stdout.txt              |    3 +
 .../DummyValgrindPrePost-result.txt}               |    0
 .../CTestMemcheck/DummyValgrindPrePost-stderr.txt  |    3 +
 .../CTestMemcheck/DummyValgrindPrePost-stdout.txt  |    6 +
 .../DummyValgrindTwoTargets-result.txt}            |    0
 .../DummyValgrindTwoTargets-stderr.txt             |    3 +
 .../DummyValgrindTwoTargets-stdout.txt             |    8 +
 .../NotExist-result.txt}                           |    0
 Tests/RunCMake/CTestMemcheck/NotExist-stderr.txt   |    1 +
 Tests/RunCMake/CTestMemcheck/NotExist-stdout.txt   |    1 +
 Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake    |  144 +
 Tests/RunCMake/CTestMemcheck/Unknown-result.txt    |    1 +
 Tests/RunCMake/CTestMemcheck/Unknown-stderr.txt    |    2 +
 Tests/RunCMake/CTestMemcheck/Unknown-stdout.txt    |    1 +
 Tests/RunCMake/CTestMemcheck/test.cmake.in         |   24 +
 .../CTestMemcheck}/testAddressSanitizer.cmake      |    0
 .../CTestMemcheck}/testLeakSanitizer.cmake         |    0
 .../CTestMemcheck}/testMemorySanitizer.cmake       |    0
 .../CTestMemcheck}/testThreadSanitizer.cmake       |    0
 .../testUndefinedBehaviorSanitizer.cmake           |    0
 Tests/RunCMake/CTestSubmit/BadArg-result.txt       |    1 +
 Tests/RunCMake/CTestSubmit/BadArg-stderr.txt       |    2 +
 Tests/RunCMake/CTestSubmit/BadFILES-result.txt     |    1 +
 Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt     |    2 +
 Tests/RunCMake/CTestSubmit/BadPARTS-result.txt     |    1 +
 Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt     |    2 +
 .../CTestSubmit/CDashUploadFILES-result.txt        |    1 +
 .../CTestSubmit/CDashUploadFILES-stderr.txt        |    2 +
 .../RunCMake/CTestSubmit/CDashUploadFTP-result.txt |    1 +
 .../RunCMake/CTestSubmit/CDashUploadFTP-stderr.txt |    1 +
 .../CTestSubmit/CDashUploadNone-result.txt         |    1 +
 .../CTestSubmit/CDashUploadNone-stderr.txt         |    1 +
 .../CTestSubmit/CDashUploadPARTS-result.txt        |    1 +
 .../CTestSubmit/CDashUploadPARTS-stderr.txt        |    2 +
 .../CTestSubmit/CDashUploadRETRY_COUNT-result.txt  |    1 +
 .../CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt  |    2 +
 .../CTestSubmit/CDashUploadRETRY_DELAY-result.txt  |    1 +
 .../CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt  |    2 +
 Tests/RunCMake/CTestSubmit/CMakeLists.txt.in       |    4 +
 Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in    |    6 +
 Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt  |    1 +
 Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt  |    4 +
 Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt  |    1 +
 Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt |    1 +
 Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt |    3 +
 Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt |    3 +
 .../RunCMake/CTestSubmit/FailDrop-http-result.txt  |    1 +
 .../RunCMake/CTestSubmit/FailDrop-http-stderr.txt  |    3 +
 .../RunCMake/CTestSubmit/FailDrop-http-stdout.txt  |    3 +
 .../RunCMake/CTestSubmit/FailDrop-https-result.txt |    1 +
 .../RunCMake/CTestSubmit/FailDrop-https-stderr.txt |    3 +
 .../RunCMake/CTestSubmit/FailDrop-https-stdout.txt |    3 +
 Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt |    1 +
 Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt |    2 +
 Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt |    1 +
 .../CTestSubmit/FailDrop-xmlrpc-result.txt         |    1 +
 .../CTestSubmit/FailDrop-xmlrpc-stderr.txt         |    2 +
 .../CTestSubmit/FailDrop-xmlrpc-stdout.txt         |    1 +
 .../CTestSubmit/PARTSCDashUpload-result.txt        |    1 +
 .../CTestSubmit/PARTSCDashUpload-stderr.txt        |    2 +
 .../CTestSubmit/PARTSCDashUploadType-result.txt    |    1 +
 .../CTestSubmit/PARTSCDashUploadType-stderr.txt    |    2 +
 .../CTestSubmit/RepeatRETURN_VALUE-result.txt      |    1 +
 .../CTestSubmit/RepeatRETURN_VALUE-stderr.txt      |    2 +
 Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake      |   62 +
 Tests/RunCMake/CTestSubmit/test.cmake.in           |   16 +
 Tests/RunCMake/CheckModules/CMakeLists.txt         |    1 +
 .../{CMP0054 => CommandLine}/CMakeLists.txt        |    0
 .../RunCMake/CommandLine/D_nested_cache-stderr.txt |    1 +
 Tests/RunCMake/CommandLine/D_nested_cache.cmake    |    1 +
 .../CommandLine/D_typed_nested_cache-stderr.txt    |    1 +
 .../CommandLine/D_typed_nested_cache.cmake         |    1 +
 .../E_tar-bad-from1-result.txt}                    |    0
 .../CommandLine/E_tar-bad-from1-stderr.txt         |    1 +
 .../E_tar-bad-from2-result.txt}                    |    0
 .../CommandLine/E_tar-bad-from2-stderr.txt         |    1 +
 .../E_tar-bad-from3-result.txt}                    |    0
 .../CommandLine/E_tar-bad-from3-stderr.txt         |    2 +
 Tests/RunCMake/CommandLine/E_tar-bad-from3.txt     |    1 +
 .../E_tar-bad-from4-result.txt}                    |    0
 .../CommandLine/E_tar-bad-from4-stderr.txt         |    2 +
 Tests/RunCMake/CommandLine/E_tar-bad-from4.txt     |    2 +
 .../E_tar-bad-from5-result.txt}                    |    0
 .../CommandLine/E_tar-bad-from5-stderr.txt         |    2 +
 Tests/RunCMake/CommandLine/E_tar-bad-from5.txt     |    2 +
 .../E_tar-bad-mtime1-result.txt}                   |    0
 .../CommandLine/E_tar-bad-mtime1-stderr.txt        |    2 +
 .../E_tar-bad-opt1-result.txt}                     |    0
 .../RunCMake/CommandLine/E_tar-bad-opt1-stderr.txt |    1 +
 .../E_tar-end-opt1-result.txt}                     |    0
 .../RunCMake/CommandLine/E_tar-end-opt1-stderr.txt |    2 +
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake      |   21 +
 .../LinkImplementationFeatureCycle.cmake           |    8 +-
 .../LinkImplementationFeatureCycleSolved.cmake     |    6 +-
 .../RunCMake/CompileFeatures/NonValidTarget1.cmake |    2 +-
 .../RunCMake/CompileFeatures/NonValidTarget2.cmake |    2 +
 .../NotAFeature_OriginDebugCommand-result.txt}     |    0
 .../NotAFeature_OriginDebugCommand-stderr.txt      |    5 +
 ....cmake => NotAFeature_OriginDebugCommand.cmake} |    0
 ..._OriginDebug_target_compile_features-stderr.txt |    5 -
 Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake  |   38 +-
 .../CompileFeatures/generate_feature_list.cmake    |   14 +
 .../BadCustom1-result.txt}                         |    0
 Tests/RunCMake/ExternalData/BadCustom1-stderr.txt  |    9 +
 Tests/RunCMake/ExternalData/BadCustom1.cmake       |    5 +
 .../BadCustom2-result.txt}                         |    0
 Tests/RunCMake/ExternalData/BadCustom2-stderr.txt  |    9 +
 Tests/RunCMake/ExternalData/BadCustom2.cmake       |    5 +
 .../BadCustom3-result.txt}                         |    0
 Tests/RunCMake/ExternalData/BadCustom3-stderr.txt  |    7 +
 Tests/RunCMake/ExternalData/BadCustom3.cmake       |    5 +
 .../BadCustom4-result.txt}                         |    0
 Tests/RunCMake/ExternalData/BadCustom4-stderr.txt  |    7 +
 Tests/RunCMake/ExternalData/BadCustom4.cmake       |    6 +
 Tests/RunCMake/ExternalData/RunCMakeTest.cmake     |    4 +
 .../ExternalProject/Add_StepDependencies.cmake     |   20 +
 .../Add_StepDependencies_no_target.cmake           |   10 +
 .../ExternalProject/CMAKE_CACHE_ARGS.cmake         |   21 +
 .../ExternalProject/CMAKE_CACHE_DEFAULT_ARGS.cmake |   21 +
 .../RunCMake/ExternalProject/CMAKE_CACHE_mix.cmake |   29 +
 Tests/RunCMake/ExternalProject/CMakeLists.txt      |    3 +
 .../RunCMake/ExternalProject/NO_DEPENDS-stderr.txt |   36 +
 Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake    |   18 +
 Tests/RunCMake/ExternalProject/RunCMakeTest.cmake  |    8 +
 Tests/RunCMake/FPHSA/RunCMakeTest.cmake            |    2 +
 .../CarryPermissions-result.txt}                   |    0
 .../CarryPermissions-stderr.txt}                   |    0
 .../RunCMake/File_Generate/CarryPermissions.cmake  |    5 +
 .../GenerateSource-result.txt}                     |    0
 .../GenerateSource-stderr.txt}                     |    0
 Tests/RunCMake/File_Generate/GenerateSource.cmake  |   12 +
 .../OutputNameMatchesObjects-result.txt}           |    0
 .../OutputNameMatchesObjects-stderr.txt            |    9 +
 .../File_Generate/OutputNameMatchesObjects.cmake   |   10 +
 .../OutputNameMatchesOtherSources-result.txt}      |    0
 .../OutputNameMatchesOtherSources-stderr.txt}      |    0
 .../OutputNameMatchesOtherSources.cmake            |   14 +
 .../OutputNameMatchesSources-result.txt}           |    0
 .../OutputNameMatchesSources-stderr.txt            |    7 +
 .../File_Generate/OutputNameMatchesSources.cmake   |   12 +
 .../ReRunCMake-result.txt}                         |    0
 .../ReRunCMake-stderr.txt}                         |    0
 Tests/RunCMake/File_Generate/ReRunCMake.cmake      |    5 +
 Tests/RunCMake/File_Generate/RunCMakeTest.cmake    |   57 +
 .../RunCMake/{CMP0022 => File_Generate}/empty.cpp  |    0
 Tests/RunCMake/File_Generate/input_script.sh       |    3 +
 .../ValidTarget-TARGET_PDB_FILE-check.cmake        |    2 +-
 Tests/RunCMake/Languages/CMakeLists.txt            |    1 +
 .../Languages/LINK_LANGUAGE-genex-stderr.txt       |    2 +-
 .../link-libraries-TARGET_FILE-genex-stderr.txt    |    2 +-
 Tests/RunCMake/README.rst                          |    2 +-
 Tests/RunCMake/RunCMake.cmake                      |   17 +-
 .../MultiBadOutDir-result.txt}                     |    0
 .../MultiBadOutDir-stderr.txt                      |    6 +
 .../MultiBadOutDir.cmake                           |   12 +
 .../MultiNoOutFileVar-result.txt}                  |    0
 .../MultiNoOutFileVar-stderr.txt                   |    5 +
 .../MultiNoOutFileVar.cmake                        |   11 +
 .../MultiNoOutdir-result.txt}                      |    0
 .../MultiNoOutdir-stderr.txt                       |    5 +
 .../MultiNoOutdir.cmake                            |   11 +
 .../RunCMakeTest.cmake                             |    4 +
 .../AppendNoOutput-result.txt}                     |    0
 .../add_custom_command/AppendNoOutput-stderr.txt   |    4 +
 .../add_custom_command/AppendNoOutput.cmake        |    1 +
 .../AppendNotOutput-result.txt}                    |    0
 .../add_custom_command/AppendNotOutput-stderr.txt  |    5 +
 .../add_custom_command/AppendNotOutput.cmake       |    1 +
 .../BadArgument-result.txt}                        |    0
 .../add_custom_command/BadArgument-stderr.txt      |    4 +
 .../RunCMake/add_custom_command/BadArgument.cmake  |    1 +
 Tests/RunCMake/add_custom_command/CMakeLists.txt   |    3 +
 .../NoArguments-result.txt}                        |    0
 .../add_custom_command/NoArguments-stderr.txt      |    4 +
 .../RunCMake/add_custom_command/NoArguments.cmake  |    1 +
 .../NoOutputOrTarget-result.txt}                   |    0
 .../add_custom_command/NoOutputOrTarget-stderr.txt |    4 +
 .../add_custom_command/NoOutputOrTarget.cmake      |    1 +
 .../OutputAndTarget-result.txt}                    |    0
 .../add_custom_command/OutputAndTarget-stderr.txt  |    5 +
 .../add_custom_command/OutputAndTarget.cmake       |    1 +
 .../RunCMake/add_custom_command/RunCMakeTest.cmake |   10 +
 .../SourceByproducts-result.txt}                   |    0
 .../add_custom_command/SourceByproducts-stderr.txt |    4 +
 .../add_custom_command/SourceByproducts.cmake      |    1 +
 .../SourceUsesTerminal-result.txt}                 |    0
 .../SourceUsesTerminal-stderr.txt                  |    4 +
 .../add_custom_command/SourceUsesTerminal.cmake    |    1 +
 .../BadTargetName-result.txt}                      |    0
 .../add_custom_target/BadTargetName-stderr.txt     |   17 +
 .../RunCMake/add_custom_target/BadTargetName.cmake |    3 +
 .../ByproductsNoCommand-result.txt}                |    0
 .../ByproductsNoCommand-stderr.txt                 |    4 +
 .../add_custom_target/ByproductsNoCommand.cmake    |    1 +
 Tests/RunCMake/add_custom_target/CMakeLists.txt    |    3 +
 .../NoArguments-result.txt}                        |    0
 .../add_custom_target/NoArguments-stderr.txt       |    4 +
 Tests/RunCMake/add_custom_target/NoArguments.cmake |    1 +
 .../RunCMake/add_custom_target/RunCMakeTest.cmake  |    6 +
 .../UsesTerminalNoCommand-result.txt}              |    0
 .../UsesTerminalNoCommand-stderr.txt               |    4 +
 .../add_custom_target/UsesTerminalNoCommand.cmake  |    1 +
 .../configure_file/RerunCMake-rerun-stderr.txt     |    1 +
 .../configure_file/RerunCMake-rerun-stdout.txt     |    3 +
 .../RunCMake/configure_file/RerunCMake-stderr.txt  |    1 +
 .../RunCMake/configure_file/RerunCMake-stdout.txt  |    3 +
 Tests/RunCMake/configure_file/RerunCMake.cmake     |    8 +
 Tests/RunCMake/configure_file/RunCMakeTest.cmake   |   35 +
 .../RunCMake/configure_file/UnknownArg-stderr.txt  |   10 +
 Tests/RunCMake/configure_file/UnknownArg.cmake     |    2 +
 Tests/RunCMake/continue/CMakeLists.txt             |    3 +
 .../RunCMake/continue/ContinueForEachInLists.cmake |   10 +
 Tests/RunCMake/continue/ContinueForeach-stdout.txt |    4 +
 Tests/RunCMake/continue/ContinueForeach.cmake      |    8 +
 .../continue/ContinueNestedForeach-stdout.txt      |    6 +
 .../RunCMake/continue/ContinueNestedForeach.cmake  |   13 +
 Tests/RunCMake/continue/ContinueWhile-stdout.txt   |    6 +
 Tests/RunCMake/continue/ContinueWhile.cmake        |   10 +
 .../NoArgumentsToContinue-result.txt}              |    0
 .../continue/NoArgumentsToContinue-stderr.txt      |    4 +
 .../RunCMake/continue/NoArgumentsToContinue.cmake  |    3 +
 .../NoEnclosingBlock-result.txt}                   |    0
 .../RunCMake/continue/NoEnclosingBlock-stderr.txt  |    5 +
 Tests/RunCMake/continue/NoEnclosingBlock.cmake     |    1 +
 .../NoEnclosingBlockInFunction-result.txt}         |    0
 .../continue/NoEnclosingBlockInFunction-stderr.txt |    6 +
 .../continue/NoEnclosingBlockInFunction.cmake      |    8 +
 Tests/RunCMake/continue/RunCMakeTest.cmake         |    9 +
 .../LOCK-error-file-create-fail-result.txt}        |    0
 .../file/LOCK-error-file-create-fail-stderr.txt    |    8 +
 .../file/LOCK-error-file-create-fail.cmake         |    3 +
 .../LOCK-error-guard-incorrect-result.txt}         |    0
 .../file/LOCK-error-guard-incorrect-stderr.txt     |    6 +
 .../RunCMake/file/LOCK-error-guard-incorrect.cmake |    1 +
 .../LOCK-error-incorrect-timeout-result.txt}       |    0
 .../file/LOCK-error-incorrect-timeout-stderr.txt   |    4 +
 .../LOCK-error-incorrect-timeout-trail-result.txt} |    0
 .../LOCK-error-incorrect-timeout-trail-stderr.txt  |    4 +
 .../file/LOCK-error-incorrect-timeout-trail.cmake  |    1 +
 .../file/LOCK-error-incorrect-timeout.cmake        |    1 +
 .../LOCK-error-lock-fail-result.txt}               |    0
 .../RunCMake/file/LOCK-error-lock-fail-stderr.txt  |    6 +
 Tests/RunCMake/file/LOCK-error-lock-fail.cmake     |    6 +
 .../LOCK-error-negative-timeout-result.txt}        |    0
 .../file/LOCK-error-negative-timeout-stderr.txt    |    4 +
 .../file/LOCK-error-negative-timeout.cmake         |    1 +
 .../LOCK-error-no-function-result.txt}             |    0
 .../file/LOCK-error-no-function-stderr.txt         |    8 +
 Tests/RunCMake/file/LOCK-error-no-function.cmake   |    1 +
 .../LOCK-error-no-guard-result.txt}                |    0
 Tests/RunCMake/file/LOCK-error-no-guard-stderr.txt |    4 +
 Tests/RunCMake/file/LOCK-error-no-guard.cmake      |    1 +
 .../LOCK-error-no-path-result.txt}                 |    0
 Tests/RunCMake/file/LOCK-error-no-path-stderr.txt  |    4 +
 Tests/RunCMake/file/LOCK-error-no-path.cmake       |    1 +
 .../LOCK-error-no-result-variable-result.txt}      |    0
 .../file/LOCK-error-no-result-variable-stderr.txt  |    4 +
 .../file/LOCK-error-no-result-variable.cmake       |    1 +
 .../LOCK-error-no-timeout-result.txt}              |    0
 .../RunCMake/file/LOCK-error-no-timeout-stderr.txt |    4 +
 Tests/RunCMake/file/LOCK-error-no-timeout.cmake    |    1 +
 .../LOCK-error-timeout-result.txt}                 |    0
 Tests/RunCMake/file/LOCK-error-timeout-stderr.txt  |   12 +
 Tests/RunCMake/file/LOCK-error-timeout-stdout.txt  |    1 +
 Tests/RunCMake/file/LOCK-error-timeout.cmake       |   17 +
 .../LOCK-error-unknown-option-result.txt}          |    0
 .../file/LOCK-error-unknown-option-stderr.txt      |    6 +
 .../RunCMake/file/LOCK-error-unknown-option.cmake  |    1 +
 Tests/RunCMake/file/LOCK-stdout.txt                |   11 +
 Tests/RunCMake/file/LOCK.cmake                     |   40 +
 Tests/RunCMake/file/RunCMakeTest.cmake             |   14 +
 .../file/subdir_test_unlock/CMakeLists.txt         |    2 +
 Tests/RunCMake/file/timeout-script.cmake           |    5 +
 Tests/RunCMake/find_library/CMakeLists.txt         |    3 +
 Tests/RunCMake/find_library/Created-stderr.txt     |    2 +
 Tests/RunCMake/find_library/Created.cmake          |   16 +
 Tests/RunCMake/find_library/RunCMakeTest.cmake     |    3 +
 Tests/RunCMake/return/CMakeLists.txt               |    3 +
 .../ReturnFromForeach-result.txt}                  |    0
 Tests/RunCMake/return/ReturnFromForeach.cmake      |   10 +
 Tests/RunCMake/return/RunCMakeTest.cmake           |    3 +
 Tests/RunCMake/string/RegexClear-stderr.txt        |   54 +
 Tests/RunCMake/string/RegexClear.cmake             |   54 +
 Tests/RunCMake/string/RunCMakeTest.cmake           |    7 +
 Tests/RunCMake/string/UTF-16BE-stderr.txt          |    2 +
 Tests/RunCMake/string/UTF-16BE.cmake               |    4 +
 Tests/RunCMake/string/UTF-16BE.txt                 |  Bin 0 -> 83 bytes
 Tests/RunCMake/string/UTF-16LE-stderr.txt          |    2 +
 Tests/RunCMake/string/UTF-16LE.cmake               |    4 +
 Tests/RunCMake/string/UTF-16LE.txt                 |  Bin 0 -> 83 bytes
 Tests/RunCMake/string/UTF-32BE-stderr.txt          |    2 +
 Tests/RunCMake/string/UTF-32BE.cmake               |    4 +
 Tests/RunCMake/string/UTF-32BE.txt                 |  Bin 0 -> 165 bytes
 Tests/RunCMake/string/UTF-32LE-stderr.txt          |    2 +
 Tests/RunCMake/string/UTF-32LE.cmake               |    4 +
 Tests/RunCMake/string/UTF-32LE.txt                 |  Bin 0 -> 165 bytes
 Tests/RunCMake/string/cmake/Finddummy.cmake        |    4 +
 Tests/RunCMake/string/subdir/CMakeLists.txt        |    2 +
 .../try_compile/BadLinkLibraries-stderr.txt        |    4 +-
 Tests/RunCMake/try_compile/CMP0056-stderr.txt      |   13 +
 Tests/RunCMake/try_compile/CMP0056-stdout.txt      |    4 +
 Tests/RunCMake/try_compile/CMP0056.cmake           |   67 +
 .../RerunCMake-nowork-ninja-no-console-stdout.txt  |    1 +
 .../RerunCMake-rerun-ninja-no-console-stdout.txt   |    5 +
 .../try_compile/RerunCMake-rerun-stderr.txt        |    2 +
 .../try_compile/RerunCMake-rerun-stdout.txt        |    3 +
 Tests/RunCMake/try_compile/RerunCMake-stderr.txt   |    2 +
 Tests/RunCMake/try_compile/RerunCMake-stdout.txt   |    3 +
 Tests/RunCMake/try_compile/RerunCMake.cmake        |    7 +
 Tests/RunCMake/try_compile/RunCMakeTest.cmake      |   35 +
 .../BadLinkLibraries-result.txt}                   |    0
 Tests/RunCMake/try_run/BadLinkLibraries-stderr.txt |    5 +
 Tests/RunCMake/try_run/BadLinkLibraries.cmake      |    4 +
 Tests/RunCMake/try_run/CMakeLists.txt              |    3 +
 Tests/RunCMake/try_run/RunCMakeTest.cmake          |    3 +
 Tests/RunCMake/{try_compile => try_run}/src.c      |    0
 Tests/SourceFileProperty/CMakeLists.txt            |   19 +
 Tests/SourceFileProperty/ICaseTest.c               |    7 +
 Tests/SourceFileProperty/main.c                    |   13 +
 Tests/StringFileTest/CMakeLists.txt                |    2 +-
 Tests/TryCompile/CMakeLists.txt                    |    4 +-
 Tests/Tutorial/Step2/tutorial.cxx                  |    8 +-
 Tests/Tutorial/Step3/tutorial.cxx                  |    8 +-
 Tests/Tutorial/Step4/tutorial.cxx                  |    8 +-
 Tests/Tutorial/Step5/tutorial.cxx                  |    8 +-
 Tests/Tutorial/Step6/tutorial.cxx                  |    8 +-
 Tests/Tutorial/Step7/tutorial.cxx                  |    8 +-
 Tests/VSNsightTegra/CMakeLists.txt                 |    1 +
 Tests/VSWinStorePhone/CMakeLists.txt               |    2 +
 .../Direct3DApp1/SimplePixelShader.hlsl            |    4 +
 .../Direct3DApp1/SimpleVertexShader.hlsl           |    4 +
 Utilities/KWIML/test/CMakeLists.txt                |    2 +-
 Utilities/Release/create-cmake-release.cmake       |    1 +
 Utilities/Release/dash2win64_release.cmake         |    7 +-
 Utilities/Release/dashmacmini5_release.cmake       |   11 +-
 Utilities/Release/linux64_release.cmake            |   23 +
 Utilities/Release/upload_release.cmake             |    2 +-
 Utilities/cmThirdParty.h.in                        |    6 +-
 Utilities/cm_bzlib.h                               |    4 +-
 Utilities/cm_curl.h                                |    6 +-
 Utilities/cm_expat.h                               |    4 +-
 Utilities/cm_jsoncpp_reader.h                      |   23 +
 Utilities/cm_jsoncpp_value.h                       |   23 +
 Utilities/cm_jsoncpp_writer.h                      |   23 +
 Utilities/cm_libarchive.h                          |    4 +-
 Utilities/cm_lzma.h                                |    4 +-
 Utilities/cm_xmlrpc.h                              |    4 +-
 Utilities/cm_zlib.h                                |    4 +-
 Utilities/cmcompress/cmcompress.h                  |    6 +-
 Utilities/{cmlibarchive => cmcurl}/.gitattributes  |    0
 .../cmcurl/CMake/CurlCheckCSourceCompiles.cmake    |   79 +-
 Utilities/cmcurl/CMake/CurlCheckCSourceRuns.cmake  |   91 +-
 Utilities/cmcurl/CMake/CurlTests.c                 |  257 +-
 Utilities/cmcurl/CMake/FindCARES.cmake             |   42 +
 Utilities/cmcurl/CMake/FindLibSSH2.cmake           |   35 +
 Utilities/cmcurl/CMake/Macros.cmake                |   89 +
 Utilities/cmcurl/CMake/OtherTests.cmake            |  359 +-
 .../cmcurl/CMake/Platforms/WindowsCache.cmake      |  122 +
 Utilities/cmcurl/CMake/Utilities.cmake             |   31 +
 Utilities/cmcurl/CMakeLists.txt                    | 1561 ++---
 Utilities/cmcurl/COPYING                           |    2 +-
 Utilities/cmcurl/Platforms/WindowsCache.cmake      |  120 -
 Utilities/cmcurl/Platforms/config-aix.h            |  483 --
 Utilities/cmcurl/README-CMake.txt                  |   66 +
 Utilities/cmcurl/Testing/CMakeLists.txt            |   19 -
 Utilities/cmcurl/Testing/curlgtk.c                 |   95 -
 Utilities/cmcurl/Testing/ftpget.c                  |   84 -
 Utilities/cmcurl/Testing/ftpgetresp.c              |   64 -
 Utilities/cmcurl/Testing/ftpupload.c               |   93 -
 Utilities/cmcurl/Testing/getinmemory.c             |   83 -
 Utilities/cmcurl/Testing/http-post.c               |   35 -
 Utilities/cmcurl/Testing/httpput.c                 |  100 -
 Utilities/cmcurl/Testing/multithread.c             |   70 -
 Utilities/cmcurl/Testing/persistant.c              |   53 -
 Utilities/cmcurl/Testing/postit2.c                 |   92 -
 Utilities/cmcurl/Testing/sepheaders.c              |   80 -
 Utilities/cmcurl/Testing/simple.c                  |   28 -
 Utilities/cmcurl/Testing/simplessl.c               |  120 -
 Utilities/cmcurl/Testing/testconfig.h.in           |    7 -
 Utilities/cmcurl/Testing/win32sockets.c            |   49 -
 Utilities/cmcurl/amigaos.c                         |   74 -
 Utilities/cmcurl/amigaos.h                         |   58 -
 Utilities/cmcurl/arpa_telnet.h                     |  101 -
 Utilities/cmcurl/base64.c                          |  366 --
 Utilities/cmcurl/base64.h                          |   28 -
 Utilities/cmcurl/ca-bundle.h                       |    1 -
 Utilities/cmcurl/config.h.in                       |  720 ---
 Utilities/cmcurl/connect.c                         |  905 ---
 Utilities/cmcurl/connect.h                         |   46 -
 Utilities/cmcurl/content_encoding.c                |  424 --
 Utilities/cmcurl/content_encoding.h                |   41 -
 Utilities/cmcurl/cookie.c                          | 1019 ----
 Utilities/cmcurl/cookie.h                          |  107 -
 Utilities/cmcurl/curl/curl.h                       | 1644 ------
 Utilities/cmcurl/curl/curlver.h                    |   56 -
 Utilities/cmcurl/curl/easy.h                       |   81 -
 Utilities/cmcurl/curl/mprintf.h                    |   80 -
 Utilities/cmcurl/curl/multi.h                      |  327 --
 Utilities/cmcurl/curl/stdcheaders.h                |   34 -
 Utilities/cmcurl/curl/types.h                      |    1 -
 Utilities/cmcurl/{Testing => }/curltest.c          |    0
 Utilities/cmcurl/curlx.h                           |  107 -
 Utilities/cmcurl/dict.c                            |  280 -
 Utilities/cmcurl/dict.h                            |   30 -
 Utilities/cmcurl/easy.c                            |  895 ---
 Utilities/cmcurl/easyif.h                          |   40 -
 Utilities/cmcurl/escape.c                          |  181 -
 Utilities/cmcurl/escape.h                          |   30 -
 Utilities/cmcurl/file.c                            |  407 --
 Utilities/cmcurl/file.h                            |   31 -
 Utilities/cmcurl/formdata.c                        | 1694 ------
 Utilities/cmcurl/formdata.h                        |   97 -
 Utilities/cmcurl/ftp.c                             | 3865 -------------
 Utilities/cmcurl/ftp.h                             |   43 -
 Utilities/cmcurl/getenv.c                          |   69 -
 Utilities/cmcurl/getinfo.c                         |  234 -
 Utilities/cmcurl/getinfo.h                         |   28 -
 Utilities/cmcurl/gtls.c                            |  640 ---
 Utilities/cmcurl/gtls.h                            |   46 -
 Utilities/cmcurl/hash.c                            |  315 -
 Utilities/cmcurl/hash.h                            |   61 -
 Utilities/cmcurl/hostares.c                        |  307 -
 Utilities/cmcurl/hostasyn.c                        |  174 -
 Utilities/cmcurl/hostip.c                          |  636 ---
 Utilities/cmcurl/hostip.h                          |  271 -
 Utilities/cmcurl/hostip4.c                         |  389 --
 Utilities/cmcurl/hostip6.c                         |  306 -
 Utilities/cmcurl/hostsyn.c                         |  138 -
 Utilities/cmcurl/hostthre.c                        |  840 ---
 Utilities/cmcurl/http.c                            | 2422 --------
 Utilities/cmcurl/http.h                            |   85 -
 Utilities/cmcurl/http_chunks.c                     |  360 --
 Utilities/cmcurl/http_chunks.h                     |  104 -
 Utilities/cmcurl/http_digest.c                     |  504 --
 Utilities/cmcurl/http_digest.h                     |   58 -
 Utilities/cmcurl/http_negotiate.c                  |  327 --
 Utilities/cmcurl/http_negotiate.h                  |   39 -
 Utilities/cmcurl/http_ntlm.c                       | 1111 ----
 Utilities/cmcurl/http_ntlm.h                       |  146 -
 Utilities/cmcurl/if2ip.c                           |  134 -
 Utilities/cmcurl/if2ip.h                           |   67 -
 Utilities/cmcurl/include/curl/curl.h               | 2338 ++++++++
 Utilities/cmcurl/include/curl/curlbuild.h.cmake    |  218 +
 Utilities/cmcurl/include/curl/curlrules.h          |  262 +
 Utilities/cmcurl/include/curl/curlver.h            |   69 +
 Utilities/cmcurl/include/curl/easy.h               |  102 +
 Utilities/cmcurl/include/curl/mprintf.h            |   81 +
 Utilities/cmcurl/include/curl/multi.h              |  399 ++
 Utilities/cmcurl/include/curl/stdcheaders.h        |   33 +
 Utilities/cmcurl/include/curl/typecheck-gcc.h      |  610 ++
 Utilities/cmcurl/inet_ntoa_r.h                     |   44 -
 Utilities/cmcurl/inet_ntop.c                       |  224 -
 Utilities/cmcurl/inet_ntop.h                       |   37 -
 Utilities/cmcurl/inet_pton.c                       |  241 -
 Utilities/cmcurl/inet_pton.h                       |   42 -
 Utilities/cmcurl/krb4.c                            |  425 --
 Utilities/cmcurl/krb4.h                            |   70 -
 Utilities/cmcurl/ldap.c                            |  702 ---
 Utilities/cmcurl/ldap.h                            |   29 -
 Utilities/cmcurl/lib/CMakeLists.txt                |  147 +
 Utilities/cmcurl/lib/Makefile.inc                  |   71 +
 Utilities/cmcurl/lib/amigaos.c                     |   77 +
 Utilities/cmcurl/lib/amigaos.h                     |   39 +
 Utilities/cmcurl/lib/arpa_telnet.h                 |  104 +
 Utilities/cmcurl/lib/asyn-ares.c                   |  694 +++
 Utilities/cmcurl/lib/asyn-thread.c                 |  701 +++
 Utilities/cmcurl/lib/asyn.h                        |  168 +
 Utilities/cmcurl/lib/base64.c                      |  314 +
 Utilities/cmcurl/lib/bundles.c                     |  110 +
 Utilities/cmcurl/lib/bundles.h                     |   45 +
 Utilities/cmcurl/lib/conncache.c                   |  283 +
 Utilities/cmcurl/lib/conncache.h                   |   55 +
 Utilities/cmcurl/lib/connect.c                     | 1340 +++++
 Utilities/cmcurl/lib/connect.h                     |  122 +
 Utilities/cmcurl/lib/content_encoding.c            |  435 ++
 Utilities/cmcurl/lib/content_encoding.h            |   48 +
 Utilities/cmcurl/lib/cookie.c                      | 1365 +++++
 Utilities/cmcurl/lib/cookie.h                      |  104 +
 Utilities/cmcurl/lib/curl_addrinfo.c               |  527 ++
 Utilities/cmcurl/lib/curl_addrinfo.h               |   97 +
 Utilities/cmcurl/lib/curl_base64.h                 |   35 +
 Utilities/cmcurl/lib/curl_config.h.cmake           |  955 ++++
 Utilities/cmcurl/lib/curl_fnmatch.c                |  427 ++
 Utilities/cmcurl/lib/curl_fnmatch.h                |   44 +
 Utilities/cmcurl/lib/curl_gethostname.c            |  100 +
 Utilities/cmcurl/lib/curl_gethostname.h            |   31 +
 Utilities/cmcurl/lib/curl_gssapi.c                 |   75 +
 Utilities/cmcurl/lib/curl_gssapi.h                 |   60 +
 Utilities/cmcurl/lib/curl_hmac.h                   |   67 +
 Utilities/cmcurl/lib/curl_ldap.h                   |   35 +
 Utilities/cmcurl/lib/curl_md4.h                    |   33 +
 Utilities/cmcurl/lib/curl_md5.h                    |   63 +
 Utilities/cmcurl/lib/curl_memory.h                 |  140 +
 Utilities/cmcurl/lib/curl_memrchr.c                |   62 +
 Utilities/cmcurl/lib/curl_memrchr.h                |   44 +
 Utilities/cmcurl/lib/curl_multibyte.c              |   82 +
 Utilities/cmcurl/lib/curl_multibyte.h              |   90 +
 Utilities/cmcurl/lib/curl_ntlm.c                   |  248 +
 Utilities/cmcurl/lib/curl_ntlm.h                   |   44 +
 Utilities/cmcurl/lib/curl_ntlm_core.c              |  651 +++
 Utilities/cmcurl/lib/curl_ntlm_core.h              |   89 +
 Utilities/cmcurl/lib/curl_ntlm_msgs.c              | 1010 ++++
 Utilities/cmcurl/lib/curl_ntlm_msgs.h              |  177 +
 Utilities/cmcurl/lib/curl_ntlm_wb.c                |  435 ++
 Utilities/cmcurl/lib/curl_ntlm_wb.h                |   37 +
 Utilities/cmcurl/lib/curl_rtmp.c                   |  311 +
 Utilities/cmcurl/lib/curl_rtmp.h                   |   33 +
 Utilities/cmcurl/lib/curl_sasl.c                   |  741 +++
 Utilities/cmcurl/lib/curl_sasl.h                   |  158 +
 Utilities/cmcurl/lib/curl_sasl_sspi.c              |  696 +++
 Utilities/cmcurl/lib/curl_sec.h                    |   51 +
 Utilities/cmcurl/lib/curl_setup.h                  |  708 +++
 Utilities/cmcurl/lib/curl_setup_once.h             |  551 ++
 Utilities/cmcurl/lib/curl_sspi.c                   |  257 +
 Utilities/cmcurl/lib/curl_sspi.h                   |  315 +
 Utilities/cmcurl/lib/curl_threads.c                |  135 +
 Utilities/cmcurl/lib/curl_threads.h                |   57 +
 Utilities/cmcurl/lib/curlx.h                       |  119 +
 Utilities/cmcurl/lib/dict.c                        |  283 +
 Utilities/cmcurl/lib/dict.h                        |   29 +
 Utilities/cmcurl/lib/dotdot.c                      |  170 +
 Utilities/cmcurl/lib/dotdot.h                      |   25 +
 Utilities/cmcurl/lib/easy.c                        | 1182 ++++
 Utilities/cmcurl/lib/easyif.h                      |   33 +
 Utilities/cmcurl/lib/escape.c                      |  233 +
 Utilities/cmcurl/lib/escape.h                      |   33 +
 Utilities/cmcurl/lib/file.c                        |  583 ++
 Utilities/cmcurl/lib/file.h                        |   41 +
 Utilities/cmcurl/lib/fileinfo.c                    |   54 +
 Utilities/cmcurl/lib/fileinfo.h                    |   33 +
 Utilities/cmcurl/lib/formdata.c                    | 1596 ++++++
 Utilities/cmcurl/lib/formdata.h                    |   98 +
 Utilities/cmcurl/lib/ftp.c                         | 4586 +++++++++++++++
 Utilities/cmcurl/lib/ftp.h                         |  160 +
 Utilities/cmcurl/lib/ftplistparser.c               | 1053 ++++
 Utilities/cmcurl/lib/ftplistparser.h               |   41 +
 Utilities/cmcurl/lib/getenv.c                      |   53 +
 Utilities/cmcurl/lib/getinfo.c                     |  381 ++
 Utilities/cmcurl/lib/getinfo.h                     |   27 +
 Utilities/cmcurl/lib/gopher.c                      |  169 +
 Utilities/cmcurl/lib/gopher.h                      |   29 +
 Utilities/cmcurl/lib/hash.c                        |  400 ++
 Utilities/cmcurl/lib/hash.h                        |  106 +
 Utilities/cmcurl/lib/hmac.c                        |  133 +
 Utilities/cmcurl/lib/hostasyn.c                    |  157 +
 Utilities/cmcurl/lib/hostcheck.c                   |  148 +
 Utilities/cmcurl/lib/hostcheck.h                   |   32 +
 Utilities/cmcurl/lib/hostip.c                      |  857 +++
 Utilities/cmcurl/lib/hostip.h                      |  250 +
 Utilities/cmcurl/lib/hostip4.c                     |  310 +
 Utilities/cmcurl/lib/hostip6.c                     |  224 +
 Utilities/cmcurl/lib/hostsyn.c                     |  111 +
 Utilities/cmcurl/lib/http.c                        | 3664 ++++++++++++
 Utilities/cmcurl/lib/http.h                        |  223 +
 Utilities/cmcurl/lib/http2.c                       | 1036 ++++
 Utilities/cmcurl/lib/http2.h                       |   50 +
 Utilities/cmcurl/lib/http_chunks.c                 |  385 ++
 Utilities/cmcurl/lib/http_chunks.h                 |   91 +
 Utilities/cmcurl/lib/http_digest.c                 |  598 ++
 Utilities/cmcurl/lib/http_digest.h                 |   57 +
 Utilities/cmcurl/lib/http_negotiate.c              |  243 +
 Utilities/cmcurl/lib/http_negotiate.h              |   42 +
 Utilities/cmcurl/lib/http_negotiate_sspi.c         |  290 +
 Utilities/cmcurl/lib/http_proxy.c                  |  598 ++
 Utilities/cmcurl/lib/http_proxy.h                  |   41 +
 Utilities/cmcurl/lib/idn_win32.c                   |   85 +
 Utilities/cmcurl/lib/if2ip.c                       |  218 +
 Utilities/cmcurl/lib/if2ip.h                       |   74 +
 Utilities/cmcurl/lib/imap.c                        | 2893 ++++++++++
 Utilities/cmcurl/lib/imap.h                        |  111 +
 Utilities/cmcurl/lib/inet_ntop.c                   |  199 +
 Utilities/cmcurl/lib/inet_ntop.h                   |   38 +
 Utilities/cmcurl/lib/inet_pton.c                   |  234 +
 Utilities/cmcurl/lib/inet_pton.h                   |   37 +
 Utilities/cmcurl/lib/krb5.c                        |  342 ++
 Utilities/cmcurl/lib/ldap.c                        |  709 +++
 Utilities/cmcurl/lib/libcurl.rc                    |   63 +
 Utilities/cmcurl/lib/llist.c                       |  212 +
 Utilities/cmcurl/lib/llist.h                       |   57 +
 Utilities/cmcurl/lib/md4.c                         |  282 +
 Utilities/cmcurl/lib/md5.c                         |  541 ++
 Utilities/cmcurl/lib/memdebug.c                    |  490 ++
 Utilities/cmcurl/lib/memdebug.h                    |  176 +
 Utilities/cmcurl/lib/mprintf.c                     | 1138 ++++
 Utilities/cmcurl/lib/multi.c                       | 2835 +++++++++
 Utilities/cmcurl/lib/multihandle.h                 |  142 +
 Utilities/cmcurl/lib/multiif.h                     |   97 +
 Utilities/cmcurl/lib/netrc.c                       |  201 +
 Utilities/cmcurl/lib/netrc.h                       |   36 +
 Utilities/cmcurl/lib/non-ascii.c                   |  343 ++
 Utilities/cmcurl/lib/non-ascii.h                   |   63 +
 Utilities/cmcurl/lib/nonblock.c                    |   91 +
 Utilities/cmcurl/lib/nonblock.h                    |   31 +
 Utilities/cmcurl/lib/nwlib.c                       |  329 ++
 Utilities/cmcurl/lib/nwos.c                        |   88 +
 Utilities/cmcurl/lib/openldap.c                    |  640 +++
 Utilities/cmcurl/lib/parsedate.c                   |  583 ++
 Utilities/cmcurl/lib/parsedate.h                   |   31 +
 Utilities/cmcurl/lib/pingpong.c                    |  517 ++
 Utilities/cmcurl/lib/pingpong.h                    |  150 +
 Utilities/cmcurl/lib/pipeline.c                    |  340 ++
 Utilities/cmcurl/lib/pipeline.h                    |   44 +
 Utilities/cmcurl/lib/pop3.c                        | 2339 ++++++++
 Utilities/cmcurl/lib/pop3.h                        |  110 +
 Utilities/cmcurl/lib/progress.c                    |  494 ++
 Utilities/cmcurl/lib/progress.h                    |   73 +
 Utilities/cmcurl/lib/rawstr.c                      |  142 +
 Utilities/cmcurl/lib/rawstr.h                      |   47 +
 Utilities/cmcurl/lib/rtsp.c                        |  809 +++
 Utilities/cmcurl/lib/rtsp.h                        |   69 +
 Utilities/cmcurl/lib/security.c                    |  601 ++
 Utilities/cmcurl/lib/select.c                      |  574 ++
 Utilities/cmcurl/lib/select.h                      |  114 +
 Utilities/cmcurl/lib/sendf.c                       |  686 +++
 Utilities/cmcurl/lib/sendf.h                       |   90 +
 Utilities/cmcurl/lib/setup-os400.h                 |  239 +
 Utilities/cmcurl/lib/setup-vms.h                   |  399 ++
 Utilities/cmcurl/lib/share.c                       |  254 +
 Utilities/cmcurl/lib/share.h                       |   61 +
 Utilities/cmcurl/lib/sigpipe.h                     |   78 +
 Utilities/cmcurl/lib/slist.c                       |  143 +
 Utilities/cmcurl/lib/slist.h                       |   40 +
 Utilities/cmcurl/lib/smtp.c                        | 2378 ++++++++
 Utilities/cmcurl/lib/smtp.h                        |  106 +
 Utilities/cmcurl/lib/sockaddr.h                    |   43 +
 Utilities/cmcurl/lib/socks.c                       |  755 +++
 Utilities/cmcurl/lib/socks.h                       |   77 +
 Utilities/cmcurl/lib/socks_gssapi.c                |  534 ++
 Utilities/cmcurl/lib/socks_sspi.c                  |  604 ++
 Utilities/cmcurl/lib/speedcheck.c                  |   74 +
 Utilities/cmcurl/lib/speedcheck.h                  |   33 +
 Utilities/cmcurl/lib/splay.c                       |  288 +
 Utilities/cmcurl/lib/splay.h                       |   66 +
 Utilities/cmcurl/lib/ssh.c                         | 3302 +++++++++++
 Utilities/cmcurl/lib/ssh.h                         |  183 +
 Utilities/cmcurl/lib/strdup.c                      |   52 +
 Utilities/cmcurl/lib/strdup.h                      |   30 +
 Utilities/cmcurl/lib/strequal.c                    |   79 +
 Utilities/cmcurl/lib/strequal.h                    |   31 +
 Utilities/cmcurl/lib/strerror.c                    | 1127 ++++
 Utilities/cmcurl/lib/strerror.h                    |   37 +
 Utilities/cmcurl/lib/strtok.c                      |   66 +
 Utilities/cmcurl/lib/strtok.h                      |   34 +
 Utilities/cmcurl/lib/strtoofft.c                   |  188 +
 Utilities/cmcurl/lib/strtoofft.h                   |   68 +
 Utilities/cmcurl/lib/telnet.c                      | 1680 ++++++
 Utilities/cmcurl/lib/telnet.h                      |   29 +
 Utilities/cmcurl/lib/tftp.c                        | 1375 +++++
 Utilities/cmcurl/lib/tftp.h                        |   29 +
 Utilities/cmcurl/lib/timeval.c                     |  134 +
 Utilities/cmcurl/lib/timeval.h                     |   58 +
 Utilities/cmcurl/lib/transfer.c                    | 1993 +++++++
 Utilities/cmcurl/lib/transfer.h                    |   70 +
 Utilities/cmcurl/lib/url.c                         | 6032 ++++++++++++++++++++
 Utilities/cmcurl/lib/url.h                         |   82 +
 Utilities/cmcurl/lib/urldata.h                     | 1705 ++++++
 Utilities/cmcurl/lib/version.c                     |  349 ++
 Utilities/cmcurl/lib/vtls/axtls.c                  |  684 +++
 Utilities/cmcurl/lib/vtls/axtls.h                  |   72 +
 Utilities/cmcurl/lib/vtls/curl_darwinssl.c         | 2485 ++++++++
 Utilities/cmcurl/lib/vtls/curl_darwinssl.h         |   77 +
 Utilities/cmcurl/lib/vtls/curl_schannel.c          | 1346 +++++
 Utilities/cmcurl/lib/vtls/curl_schannel.h          |  137 +
 Utilities/cmcurl/lib/vtls/cyassl.c                 |  655 +++
 Utilities/cmcurl/lib/vtls/cyassl.h                 |   69 +
 Utilities/cmcurl/lib/vtls/gskit.c                  | 1053 ++++
 Utilities/cmcurl/lib/vtls/gskit.h                  |   65 +
 Utilities/cmcurl/lib/vtls/gtls.c                   | 1323 +++++
 Utilities/cmcurl/lib/vtls/gtls.h                   |   79 +
 Utilities/cmcurl/lib/vtls/nss.c                    | 1943 +++++++
 Utilities/cmcurl/lib/vtls/nssg.h                   |   89 +
 Utilities/cmcurl/lib/vtls/openssl.c                | 2918 ++++++++++
 Utilities/cmcurl/lib/vtls/openssl.h                |  101 +
 Utilities/cmcurl/lib/vtls/polarssl.c               |  746 +++
 Utilities/cmcurl/lib/vtls/polarssl.h               |   73 +
 Utilities/cmcurl/lib/vtls/polarssl_threadlock.c    |  156 +
 Utilities/cmcurl/lib/vtls/polarssl_threadlock.h    |   53 +
 Utilities/cmcurl/lib/vtls/qssl.c                   |  527 ++
 Utilities/cmcurl/lib/vtls/qssl.h                   |   62 +
 Utilities/cmcurl/lib/vtls/vtls.c                   |  705 +++
 Utilities/cmcurl/lib/vtls/vtls.h                   |  132 +
 Utilities/cmcurl/lib/warnless.c                    |  486 ++
 Utilities/cmcurl/lib/warnless.h                    |  107 +
 Utilities/cmcurl/lib/wildcard.c                    |   77 +
 Utilities/cmcurl/lib/wildcard.h                    |   58 +
 Utilities/cmcurl/lib/x509asn1.c                    | 1183 ++++
 Utilities/cmcurl/lib/x509asn1.h                    |  129 +
 Utilities/cmcurl/llist.c                           |  138 -
 Utilities/cmcurl/llist.h                           |   60 -
 Utilities/cmcurl/md5.c                             |  352 --
 Utilities/cmcurl/md5.h                             |   29 -
 Utilities/cmcurl/memdebug.c                        |  298 -
 Utilities/cmcurl/memdebug.h                        |  125 -
 Utilities/cmcurl/memory.h                          |   50 -
 Utilities/cmcurl/mprintf.c                         | 1218 ----
 Utilities/cmcurl/multi.c                           | 1988 -------
 Utilities/cmcurl/multiif.h                         |   46 -
 Utilities/cmcurl/netrc.c                           |  247 -
 Utilities/cmcurl/netrc.h                           |   34 -
 Utilities/cmcurl/nwlib.c                           |  300 -
 Utilities/cmcurl/parsedate.c                       |  425 --
 Utilities/cmcurl/parsedate.h                       |   28 -
 Utilities/cmcurl/progress.c                        |  424 --
 Utilities/cmcurl/progress.h                        |   70 -
 Utilities/cmcurl/security.c                        |  493 --
 Utilities/cmcurl/select.c                          |  315 -
 Utilities/cmcurl/select.h                          |   60 -
 Utilities/cmcurl/sendf.c                           |  663 ---
 Utilities/cmcurl/sendf.h                           |   72 -
 Utilities/cmcurl/setup.h                           |  390 --
 Utilities/cmcurl/setup_once.h                      |  153 -
 Utilities/cmcurl/share.c                           |  219 -
 Utilities/cmcurl/share.h                           |   56 -
 Utilities/cmcurl/sockaddr.h                        |   38 -
 Utilities/cmcurl/socks.c                           |  592 --
 Utilities/cmcurl/socks.h                           |   41 -
 Utilities/cmcurl/speedcheck.c                      |   75 -
 Utilities/cmcurl/speedcheck.h                      |   34 -
 Utilities/cmcurl/splay.c                           |  425 --
 Utilities/cmcurl/splay.h                           |   54 -
 Utilities/cmcurl/ssh.c                             |  979 ----
 Utilities/cmcurl/ssh.h                             |   49 -
 Utilities/cmcurl/sslgen.c                          |  618 --
 Utilities/cmcurl/sslgen.h                          |   84 -
 Utilities/cmcurl/ssluse.c                          | 1950 -------
 Utilities/cmcurl/ssluse.h                          |   71 -
 Utilities/cmcurl/strdup.c                          |   46 -
 Utilities/cmcurl/strdup.h                          |   34 -
 Utilities/cmcurl/strequal.c                        |  101 -
 Utilities/cmcurl/strequal.h                        |   38 -
 Utilities/cmcurl/strerror.c                        |  751 ---
 Utilities/cmcurl/strerror.h                        |   34 -
 Utilities/cmcurl/strtok.c                          |   68 -
 Utilities/cmcurl/strtok.h                          |   38 -
 Utilities/cmcurl/strtoofft.c                       |  165 -
 Utilities/cmcurl/strtoofft.h                       |   73 -
 Utilities/cmcurl/telnet.c                          | 1403 -----
 Utilities/cmcurl/telnet.h                          |   30 -
 Utilities/cmcurl/tftp.c                            |  816 ---
 Utilities/cmcurl/tftp.h                            |   31 -
 Utilities/cmcurl/timeval.c                         |  116 -
 Utilities/cmcurl/timeval.h                         |   76 -
 Utilities/cmcurl/transfer.c                        | 2494 --------
 Utilities/cmcurl/transfer.h                        |   51 -
 Utilities/cmcurl/url.c                             | 4252 --------------
 Utilities/cmcurl/url.h                             |   85 -
 Utilities/cmcurl/urldata.h                         | 1340 -----
 Utilities/cmcurl/version.c                         |  249 -
 .../{cmlibarchive => cmjsoncpp}/.gitattributes     |    0
 Utilities/cmjsoncpp/CMakeLists.txt                 |   25 +
 Utilities/cmjsoncpp/LICENSE                        |   55 +
 Utilities/cmjsoncpp/README-CMake.txt               |   66 +
 Utilities/cmjsoncpp/include/json/assertions.h      |   41 +
 Utilities/cmjsoncpp/include/json/config.h          |  119 +
 Utilities/cmjsoncpp/include/json/features.h        |   57 +
 Utilities/cmjsoncpp/include/json/forwards.h        |   43 +
 Utilities/cmjsoncpp/include/json/json.h            |   14 +
 Utilities/cmjsoncpp/include/json/reader.h          |  274 +
 Utilities/cmjsoncpp/include/json/value.h           | 1088 ++++
 Utilities/cmjsoncpp/include/json/version.h         |   14 +
 Utilities/cmjsoncpp/include/json/writer.h          |  213 +
 .../cmjsoncpp/src/lib_json/json_batchallocator.h   |  121 +
 .../cmjsoncpp/src/lib_json/json_internalarray.inl  |  360 ++
 .../cmjsoncpp/src/lib_json/json_internalmap.inl    |  473 ++
 Utilities/cmjsoncpp/src/lib_json/json_reader.cpp   |  885 +++
 Utilities/cmjsoncpp/src/lib_json/json_tool.h       |   87 +
 Utilities/cmjsoncpp/src/lib_json/json_value.cpp    | 1482 +++++
 .../cmjsoncpp/src/lib_json/json_valueiterator.inl  |  241 +
 Utilities/cmjsoncpp/src/lib_json/json_writer.cpp   |  703 +++
 Utilities/cmlibarchive/CMakeLists.txt              |   10 +-
 .../cmlibarchive/libarchive/archive_getdate.c      |    8 +-
 Utilities/cmliblzma/CMakeLists.txt                 |    7 +-
 Utilities/cmliblzma/common/sysdefs.h               |    4 +-
 Utilities/cmliblzma/config.h.in                    |    4 +-
 Utilities/cmzlib/CMakeLists.txt                    |   18 +-
 bootstrap                                          |   59 +-
 1423 files changed, 129945 insertions(+), 60549 deletions(-)
 create mode 100644 Help/command/continue.rst
 create mode 100644 Help/include/INTERFACE_INCLUDE_DIRECTORIES_WARNING.txt
 create mode 100644 Help/include/INTERFACE_LINK_LIBRARIES_WARNING.txt
 create mode 100644 Help/module/CTestCoverageCollectGCOV.rst
 create mode 100644 Help/module/FindGSL.rst
 create mode 100644 Help/module/FindIntl.rst
 create mode 100644 Help/module/FindJsonCpp.rst
 create mode 100644 Help/policy/CMP0055.rst
 create mode 100644 Help/policy/CMP0056.rst
 create mode 100644 Help/prop_sf/VS_SHADER_FLAGS.rst
 create mode 100644 Help/prop_tgt/ANDROID_API_MIN.rst
 create mode 100644 Help/prop_tgt/INTERFACE_BUILD_PROPERTY.txt
 delete mode 100644 Help/release/3.0.0.rst
 create mode 100644 Help/release/3.0.rst
 delete mode 100644 Help/release/3.1.0.rst
 create mode 100644 Help/release/3.1.rst
 create mode 100644 Help/release/3.2.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_API_MIN.rst
 create mode 100644 Help/variable/CMAKE_MATCH_COUNT.rst
 create mode 100644 Help/variable/MINGW.rst
 create mode 100644 Modules/CTestCoverageCollectGCOV.cmake
 create mode 100644 Modules/Compiler/AppleClang-C-FeatureTests.cmake
 create mode 100644 Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
 create mode 100644 Modules/Compiler/Clang-CXX-TestableFeatures.cmake
 create mode 100644 Modules/Compiler/MSVC-CXX-FeatureTests.cmake
 create mode 100644 Modules/Compiler/MSVC-CXX.cmake
 create mode 100644 Modules/Compiler/SunPro-CXX-FeatureTests.cmake
 create mode 100644 Modules/FindGSL.cmake
 create mode 100644 Modules/FindIntl.cmake
 create mode 100644 Modules/FindJsonCpp.cmake
 create mode 100644 Source/CTest/cmCTestCurl.cxx
 create mode 100644 Source/CTest/cmCTestCurl.h
 create mode 100644 Source/CTest/cmParseBlanketJSCoverage.cxx
 create mode 100644 Source/CTest/cmParseBlanketJSCoverage.h
 create mode 100644 Source/CTest/cmParseDelphiCoverage.cxx
 create mode 100644 Source/CTest/cmParseDelphiCoverage.h
 create mode 100644 Source/cmContinueCommand.cxx
 create mode 100644 Source/cmContinueCommand.h
 create mode 100644 Source/cmCurl.cxx
 create mode 100644 Source/cmCurl.h
 create mode 100644 Source/cmFileLock.cxx
 create mode 100644 Source/cmFileLock.h
 create mode 100644 Source/cmFileLockPool.cxx
 create mode 100644 Source/cmFileLockPool.h
 create mode 100644 Source/cmFileLockResult.cxx
 create mode 100644 Source/cmFileLockResult.h
 create mode 100644 Source/cmFileLockUnix.cxx
 create mode 100644 Source/cmFileLockWin32.cxx
 create mode 100644 Source/cmMachO.cxx
 create mode 100644 Source/cmMachO.h
 create mode 100644 Source/cmPathLabel.cxx
 create mode 100644 Source/cmPathLabel.h
 create mode 100644 Source/cmSearchPath.cxx
 create mode 100644 Source/cmSearchPath.h
 delete mode 100644 Source/cmStandardIncludes.cxx
 create mode 100644 Source/cm_get_date.c
 create mode 100644 Source/cm_get_date.h
 create mode 100644 Source/kwsys/CONTRIBUTING.rst
 create mode 100644 Tests/CMakeLib/PseudoMemcheck/CMakeLists.txt
 rename Tests/{CTestTestMemcheck/NoLogDummyChecker => CMakeLib/PseudoMemcheck/NoLog}/CMakeLists.txt (100%)
 rename Tests/{CTestTestMemcheck => CMakeLib/PseudoMemcheck}/memtester.cxx.in (100%)
 create mode 100644 Tests/CTestCoverageCollectGCOV/fakegcov.cmake
 create mode 100644 Tests/CTestCoverageCollectGCOV/test.cmake.in
 delete mode 100644 Tests/CTestTestMemcheck/CMakeLists.txt
 delete mode 100644 Tests/CTestTestMemcheck/test.cmake.in
 create mode 100644 Tests/CompileDefinitions/add_def_cmd/CMakeLists.txt
 create mode 100644 Tests/CompileDefinitions/add_def_cmd_tprop/CMakeLists.txt
 delete mode 100644 Tests/CompileDefinitions/add_definitions_command/CMakeLists.txt
 delete mode 100644 Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt
 create mode 100644 Tests/CompileFeatures/feature_test.c
 create mode 100644 Tests/CompileFeatures/genex_test.c
 delete mode 100644 Tests/CustomCommand/config.h.in
 create mode 100644 Tests/CustomCommandByproducts/CMakeLists.txt
 create mode 100644 Tests/CustomCommandByproducts/CustomCommandByproducts.c
 create mode 100644 Tests/CustomCommandByproducts/External/CMakeLists.txt
 create mode 100644 Tests/CustomCommandByproducts/External/ExternalLibrary.c
 copy Tests/{CMakeOnly/LinkInterfaceLoop/main.c => CustomCommandByproducts/ProducerExe.c} (100%)
 create mode 100644 Tests/CustomCommandByproducts/byproduct1.c.in
 create mode 100644 Tests/CustomCommandByproducts/byproduct2.c.in
 create mode 100644 Tests/CustomCommandByproducts/byproduct3.c.in
 create mode 100644 Tests/CustomCommandByproducts/byproduct4.c.in
 create mode 100644 Tests/CustomCommandByproducts/byproduct5.c.in
 create mode 100644 Tests/CustomCommandByproducts/byproduct6.c.in
 create mode 100644 Tests/CustomCommandByproducts/byproduct7.c.in
 create mode 100644 Tests/CustomCommandByproducts/byproduct8.c.in
 create mode 100644 Tests/CustomCommandByproducts/ninja-check.cmake
 create mode 100644 Tests/DelphiCoverage/DartConfiguration.tcl.in
 create mode 100644 Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html
 create mode 100644 Tests/DelphiCoverage/src/UTCovTest.pas
 create mode 100644 Tests/ExportImport/Export/include/abs/1a/testLibAbs1a.h
 create mode 100644 Tests/ExportImport/Export/include/abs/1b/testLibAbs1b.h
 create mode 100644 Tests/ExportImport/Export/include/abs/testLibAbs1.h
 create mode 100644 Tests/ExportImport/Export/testLibAbs1.c
 create mode 100644 Tests/ExportImport/Import/A/imp_testExeAbs1.c
 create mode 100644 Tests/FindGSL/CMakeLists.txt
 create mode 100644 Tests/FindGSL/rng/CMakeLists.txt
 create mode 100644 Tests/FindGSL/rng/main.cc
 create mode 100644 Tests/FindJsonCpp/CMakeLists.txt
 create mode 100644 Tests/FindJsonCpp/Test/CMakeLists.txt
 create mode 100644 Tests/FindJsonCpp/Test/main.cxx
 create mode 100644 Tests/FortranOnly/preprocess.F
 create mode 100644 Tests/FortranOnly/test_preprocess.cmake
 create mode 100644 Tests/IncludeDirectories/SystemIncludeDirectories/config_specific/config_iface.h
 create mode 100644 Tests/JavascriptCoverage/DartConfiguration.tcl.in
 create mode 100644 Tests/JavascriptCoverage/output.json.in
 create mode 100644 Tests/JavascriptCoverage/test.js
 create mode 100644 Tests/JavascriptCoverage/test3.js
 create mode 100644 Tests/Module/ExternalData/DataScript.dat.md5
 create mode 100644 Tests/Module/ExternalData/MyScript1.cmake
 create mode 100644 Tests/Module/WriteCompilerDetectionHeader/compile_tests.h
 create mode 100644 Tests/Module/WriteCompilerDetectionHeader/main.c
 create mode 100644 Tests/Module/WriteCompilerDetectionHeader/main_multi.c
 create mode 100644 Tests/Module/WriteCompilerDetectionHeader/multi_files.cpp
 create mode 100644 Tests/QtAutogen/autorcc_depends/CMakeLists.txt
 create mode 100644 Tests/QtAutogen/autorcc_depends/res1.qrc
 create mode 100644 Tests/QtAutogen/autorcc_depends/res1_input.txt
 copy Tests/{CTestTestCycle/simple.cxx => QtAutogen/autorcc_depends/test_res1.cpp} (100%)
 rename Tests/RunCMake/{CompileFeatures/NotAFeature_OriginDebug_target_compile_features-result.txt => CMP0055/CMP0055-NEW-Out-of-Scope-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CMP0055/CMP0055-NEW-Out-of-Scope-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0055/CMP0055-NEW-Out-of-Scope.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CMP0055/CMP0055-NEW-Reject-Arguments-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CMP0055/CMP0055-NEW-Reject-Arguments-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0055/CMP0055-NEW-Reject-Arguments.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0055/CMP0055-OLD-Out-of-Scope-result.txt} (100%)
 copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0055/CMP0055-OLD-Reject-Arguments-result.txt} (100%)
 copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0055/CMP0055-WARN-Out-of-Scope-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CMP0055/CMP0055-WARN-Out-of-Scope-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0055/CMP0055-WARN-Out-of-Scope.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0055/CMP0055-WARN-Reject-Arguments-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CMP0055/CMP0055-WARN-Reject-Arguments-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0055/CMP0055-WARN-Reject-Arguments.cmake
 create mode 100644 Tests/RunCMake/CMP0055/CMakeLists.txt
 create mode 100644 Tests/RunCMake/CMP0055/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/CPackRPM/CMakeLists.txt
 create mode 100644 Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING-stderr.txt
 create mode 100644 Tests/RunCMake/CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake
 create mode 100644 Tests/RunCMake/CPackRPM/RunCMakeTest.cmake
 rename Tests/{CTestTestMemcheck => RunCMake/CTestMemcheck}/CMakeLists.txt.in (100%)
 rename Tests/{CTestTestMemcheck => RunCMake/CTestMemcheck}/CTestConfig.cmake.in (100%)
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-result.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-stdout.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyBC-result.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyBC-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyBC-stdout.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-result.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stdout.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-result.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-stdout.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-result.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-stdout.txt
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CTestMemcheck/DummyPurify-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyPurify-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyPurify-stdout.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-result.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stdout.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-result.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-stdout.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-result.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-stdout.txt
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CTestMemcheck/DummyValgrind-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrind-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrind-stdout.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-result.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stdout.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-result.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stdout.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-result.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stdout.txt
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CTestMemcheck/DummyValgrindIgnoreMemcheck-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stdout.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-result.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stdout.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-result.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stdout.txt
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CTestMemcheck/DummyValgrindPrePost-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stdout.txt
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CTestMemcheck/DummyValgrindTwoTargets-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stdout.txt
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CTestMemcheck/NotExist-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CTestMemcheck/NotExist-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/NotExist-stdout.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/CTestMemcheck/Unknown-result.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/Unknown-stderr.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/Unknown-stdout.txt
 create mode 100644 Tests/RunCMake/CTestMemcheck/test.cmake.in
 rename Tests/{CTestTestMemcheck => RunCMake/CTestMemcheck}/testAddressSanitizer.cmake (100%)
 rename Tests/{CTestTestMemcheck => RunCMake/CTestMemcheck}/testLeakSanitizer.cmake (100%)
 rename Tests/{CTestTestMemcheck => RunCMake/CTestMemcheck}/testMemorySanitizer.cmake (100%)
 rename Tests/{CTestTestMemcheck => RunCMake/CTestMemcheck}/testThreadSanitizer.cmake (100%)
 rename Tests/{CTestTestMemcheck => RunCMake/CTestMemcheck}/testUndefinedBehaviorSanitizer.cmake (100%)
 create mode 100644 Tests/RunCMake/CTestSubmit/BadArg-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/BadArg-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/BadFILES-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/BadPARTS-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadFILES-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadFILES-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadFTP-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadFTP-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadNone-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadNone-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadPARTS-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadPARTS-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/CMakeLists.txt.in
 create mode 100644 Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-http-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-https-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/PARTSCDashUpload-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/PARTSCDashUpload-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-result.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-stderr.txt
 create mode 100644 Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/CTestSubmit/test.cmake.in
 copy Tests/RunCMake/{CMP0054 => CommandLine}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/CommandLine/D_nested_cache-stderr.txt
 create mode 100644 Tests/RunCMake/CommandLine/D_nested_cache.cmake
 create mode 100644 Tests/RunCMake/CommandLine/D_typed_nested_cache-stderr.txt
 create mode 100644 Tests/RunCMake/CommandLine/D_typed_nested_cache.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/E_tar-bad-from1-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/E_tar-bad-from1-stderr.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/E_tar-bad-from2-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/E_tar-bad-from2-stderr.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/E_tar-bad-from3-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/E_tar-bad-from3-stderr.txt
 create mode 100644 Tests/RunCMake/CommandLine/E_tar-bad-from3.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/E_tar-bad-from4-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/E_tar-bad-from4-stderr.txt
 create mode 100644 Tests/RunCMake/CommandLine/E_tar-bad-from4.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/E_tar-bad-from5-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/E_tar-bad-from5-stderr.txt
 create mode 100644 Tests/RunCMake/CommandLine/E_tar-bad-from5.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/E_tar-bad-mtime1-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/E_tar-bad-mtime1-stderr.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/E_tar-bad-opt1-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/E_tar-bad-opt1-stderr.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/E_tar-end-opt1-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/E_tar-end-opt1-stderr.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CompileFeatures/NotAFeature_OriginDebugCommand-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-stderr.txt
 rename Tests/RunCMake/CompileFeatures/{NotAFeature_OriginDebug_target_compile_features.cmake => NotAFeature_OriginDebugCommand.cmake} (100%)
 delete mode 100644 Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-stderr.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => ExternalData/BadCustom1-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ExternalData/BadCustom1-stderr.txt
 create mode 100644 Tests/RunCMake/ExternalData/BadCustom1.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => ExternalData/BadCustom2-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ExternalData/BadCustom2-stderr.txt
 create mode 100644 Tests/RunCMake/ExternalData/BadCustom2.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => ExternalData/BadCustom3-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ExternalData/BadCustom3-stderr.txt
 create mode 100644 Tests/RunCMake/ExternalData/BadCustom3.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => ExternalData/BadCustom4-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ExternalData/BadCustom4-stderr.txt
 create mode 100644 Tests/RunCMake/ExternalData/BadCustom4.cmake
 create mode 100644 Tests/RunCMake/ExternalProject/Add_StepDependencies.cmake
 create mode 100644 Tests/RunCMake/ExternalProject/Add_StepDependencies_no_target.cmake
 create mode 100644 Tests/RunCMake/ExternalProject/CMAKE_CACHE_ARGS.cmake
 create mode 100644 Tests/RunCMake/ExternalProject/CMAKE_CACHE_DEFAULT_ARGS.cmake
 create mode 100644 Tests/RunCMake/ExternalProject/CMAKE_CACHE_mix.cmake
 create mode 100644 Tests/RunCMake/ExternalProject/CMakeLists.txt
 create mode 100644 Tests/RunCMake/ExternalProject/NO_DEPENDS-stderr.txt
 create mode 100644 Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake
 create mode 100644 Tests/RunCMake/ExternalProject/RunCMakeTest.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => File_Generate/CarryPermissions-result.txt} (100%)
 copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => File_Generate/CarryPermissions-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/File_Generate/CarryPermissions.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => File_Generate/GenerateSource-result.txt} (100%)
 copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => File_Generate/GenerateSource-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/File_Generate/GenerateSource.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => File_Generate/OutputNameMatchesObjects-result.txt} (100%)
 create mode 100644 Tests/RunCMake/File_Generate/OutputNameMatchesObjects-stderr.txt
 create mode 100644 Tests/RunCMake/File_Generate/OutputNameMatchesObjects.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => File_Generate/OutputNameMatchesOtherSources-result.txt} (100%)
 copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => File_Generate/OutputNameMatchesOtherSources-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => File_Generate/OutputNameMatchesSources-result.txt} (100%)
 create mode 100644 Tests/RunCMake/File_Generate/OutputNameMatchesSources-stderr.txt
 create mode 100644 Tests/RunCMake/File_Generate/OutputNameMatchesSources.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => File_Generate/ReRunCMake-result.txt} (100%)
 copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => File_Generate/ReRunCMake-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/File_Generate/ReRunCMake.cmake
 copy Tests/RunCMake/{CMP0022 => File_Generate}/empty.cpp (100%)
 create mode 100755 Tests/RunCMake/File_Generate/input_script.sh
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => WriteCompilerDetectionHeader/MultiBadOutDir-result.txt} (100%)
 create mode 100644 Tests/RunCMake/WriteCompilerDetectionHeader/MultiBadOutDir-stderr.txt
 create mode 100644 Tests/RunCMake/WriteCompilerDetectionHeader/MultiBadOutDir.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => WriteCompilerDetectionHeader/MultiNoOutFileVar-result.txt} (100%)
 create mode 100644 Tests/RunCMake/WriteCompilerDetectionHeader/MultiNoOutFileVar-stderr.txt
 create mode 100644 Tests/RunCMake/WriteCompilerDetectionHeader/MultiNoOutFileVar.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => WriteCompilerDetectionHeader/MultiNoOutdir-result.txt} (100%)
 create mode 100644 Tests/RunCMake/WriteCompilerDetectionHeader/MultiNoOutdir-stderr.txt
 create mode 100644 Tests/RunCMake/WriteCompilerDetectionHeader/MultiNoOutdir.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_command/AppendNoOutput-result.txt} (100%)
 create mode 100644 Tests/RunCMake/add_custom_command/AppendNoOutput-stderr.txt
 create mode 100644 Tests/RunCMake/add_custom_command/AppendNoOutput.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_command/AppendNotOutput-result.txt} (100%)
 create mode 100644 Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt
 create mode 100644 Tests/RunCMake/add_custom_command/AppendNotOutput.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_command/BadArgument-result.txt} (100%)
 create mode 100644 Tests/RunCMake/add_custom_command/BadArgument-stderr.txt
 create mode 100644 Tests/RunCMake/add_custom_command/BadArgument.cmake
 create mode 100644 Tests/RunCMake/add_custom_command/CMakeLists.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_command/NoArguments-result.txt} (100%)
 create mode 100644 Tests/RunCMake/add_custom_command/NoArguments-stderr.txt
 create mode 100644 Tests/RunCMake/add_custom_command/NoArguments.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_command/NoOutputOrTarget-result.txt} (100%)
 create mode 100644 Tests/RunCMake/add_custom_command/NoOutputOrTarget-stderr.txt
 create mode 100644 Tests/RunCMake/add_custom_command/NoOutputOrTarget.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_command/OutputAndTarget-result.txt} (100%)
 create mode 100644 Tests/RunCMake/add_custom_command/OutputAndTarget-stderr.txt
 create mode 100644 Tests/RunCMake/add_custom_command/OutputAndTarget.cmake
 create mode 100644 Tests/RunCMake/add_custom_command/RunCMakeTest.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_command/SourceByproducts-result.txt} (100%)
 create mode 100644 Tests/RunCMake/add_custom_command/SourceByproducts-stderr.txt
 create mode 100644 Tests/RunCMake/add_custom_command/SourceByproducts.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_command/SourceUsesTerminal-result.txt} (100%)
 create mode 100644 Tests/RunCMake/add_custom_command/SourceUsesTerminal-stderr.txt
 create mode 100644 Tests/RunCMake/add_custom_command/SourceUsesTerminal.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_target/BadTargetName-result.txt} (100%)
 create mode 100644 Tests/RunCMake/add_custom_target/BadTargetName-stderr.txt
 create mode 100644 Tests/RunCMake/add_custom_target/BadTargetName.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_target/ByproductsNoCommand-result.txt} (100%)
 create mode 100644 Tests/RunCMake/add_custom_target/ByproductsNoCommand-stderr.txt
 create mode 100644 Tests/RunCMake/add_custom_target/ByproductsNoCommand.cmake
 create mode 100644 Tests/RunCMake/add_custom_target/CMakeLists.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_target/NoArguments-result.txt} (100%)
 create mode 100644 Tests/RunCMake/add_custom_target/NoArguments-stderr.txt
 create mode 100644 Tests/RunCMake/add_custom_target/NoArguments.cmake
 create mode 100644 Tests/RunCMake/add_custom_target/RunCMakeTest.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_target/UsesTerminalNoCommand-result.txt} (100%)
 create mode 100644 Tests/RunCMake/add_custom_target/UsesTerminalNoCommand-stderr.txt
 create mode 100644 Tests/RunCMake/add_custom_target/UsesTerminalNoCommand.cmake
 create mode 100644 Tests/RunCMake/configure_file/RerunCMake-rerun-stderr.txt
 create mode 100644 Tests/RunCMake/configure_file/RerunCMake-rerun-stdout.txt
 create mode 100644 Tests/RunCMake/configure_file/RerunCMake-stderr.txt
 create mode 100644 Tests/RunCMake/configure_file/RerunCMake-stdout.txt
 create mode 100644 Tests/RunCMake/configure_file/RerunCMake.cmake
 create mode 100644 Tests/RunCMake/configure_file/UnknownArg-stderr.txt
 create mode 100644 Tests/RunCMake/configure_file/UnknownArg.cmake
 create mode 100644 Tests/RunCMake/continue/CMakeLists.txt
 create mode 100644 Tests/RunCMake/continue/ContinueForEachInLists.cmake
 create mode 100644 Tests/RunCMake/continue/ContinueForeach-stdout.txt
 create mode 100644 Tests/RunCMake/continue/ContinueForeach.cmake
 create mode 100644 Tests/RunCMake/continue/ContinueNestedForeach-stdout.txt
 create mode 100644 Tests/RunCMake/continue/ContinueNestedForeach.cmake
 create mode 100644 Tests/RunCMake/continue/ContinueWhile-stdout.txt
 create mode 100644 Tests/RunCMake/continue/ContinueWhile.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => continue/NoArgumentsToContinue-result.txt} (100%)
 create mode 100644 Tests/RunCMake/continue/NoArgumentsToContinue-stderr.txt
 create mode 100644 Tests/RunCMake/continue/NoArgumentsToContinue.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => continue/NoEnclosingBlock-result.txt} (100%)
 create mode 100644 Tests/RunCMake/continue/NoEnclosingBlock-stderr.txt
 create mode 100644 Tests/RunCMake/continue/NoEnclosingBlock.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => continue/NoEnclosingBlockInFunction-result.txt} (100%)
 create mode 100644 Tests/RunCMake/continue/NoEnclosingBlockInFunction-stderr.txt
 create mode 100644 Tests/RunCMake/continue/NoEnclosingBlockInFunction.cmake
 create mode 100644 Tests/RunCMake/continue/RunCMakeTest.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => file/LOCK-error-file-create-fail-result.txt} (100%)
 create mode 100644 Tests/RunCMake/file/LOCK-error-file-create-fail-stderr.txt
 create mode 100644 Tests/RunCMake/file/LOCK-error-file-create-fail.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => file/LOCK-error-guard-incorrect-result.txt} (100%)
 create mode 100644 Tests/RunCMake/file/LOCK-error-guard-incorrect-stderr.txt
 create mode 100644 Tests/RunCMake/file/LOCK-error-guard-incorrect.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => file/LOCK-error-incorrect-timeout-result.txt} (100%)
 create mode 100644 Tests/RunCMake/file/LOCK-error-incorrect-timeout-stderr.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => file/LOCK-error-incorrect-timeout-trail-result.txt} (100%)
 create mode 100644 Tests/RunCMake/file/LOCK-error-incorrect-timeout-trail-stderr.txt
 create mode 100644 Tests/RunCMake/file/LOCK-error-incorrect-timeout-trail.cmake
 create mode 100644 Tests/RunCMake/file/LOCK-error-incorrect-timeout.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => file/LOCK-error-lock-fail-result.txt} (100%)
 create mode 100644 Tests/RunCMake/file/LOCK-error-lock-fail-stderr.txt
 create mode 100644 Tests/RunCMake/file/LOCK-error-lock-fail.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => file/LOCK-error-negative-timeout-result.txt} (100%)
 create mode 100644 Tests/RunCMake/file/LOCK-error-negative-timeout-stderr.txt
 create mode 100644 Tests/RunCMake/file/LOCK-error-negative-timeout.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => file/LOCK-error-no-function-result.txt} (100%)
 create mode 100644 Tests/RunCMake/file/LOCK-error-no-function-stderr.txt
 create mode 100644 Tests/RunCMake/file/LOCK-error-no-function.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => file/LOCK-error-no-guard-result.txt} (100%)
 create mode 100644 Tests/RunCMake/file/LOCK-error-no-guard-stderr.txt
 create mode 100644 Tests/RunCMake/file/LOCK-error-no-guard.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => file/LOCK-error-no-path-result.txt} (100%)
 create mode 100644 Tests/RunCMake/file/LOCK-error-no-path-stderr.txt
 create mode 100644 Tests/RunCMake/file/LOCK-error-no-path.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => file/LOCK-error-no-result-variable-result.txt} (100%)
 create mode 100644 Tests/RunCMake/file/LOCK-error-no-result-variable-stderr.txt
 create mode 100644 Tests/RunCMake/file/LOCK-error-no-result-variable.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => file/LOCK-error-no-timeout-result.txt} (100%)
 create mode 100644 Tests/RunCMake/file/LOCK-error-no-timeout-stderr.txt
 create mode 100644 Tests/RunCMake/file/LOCK-error-no-timeout.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => file/LOCK-error-timeout-result.txt} (100%)
 create mode 100644 Tests/RunCMake/file/LOCK-error-timeout-stderr.txt
 create mode 100644 Tests/RunCMake/file/LOCK-error-timeout-stdout.txt
 create mode 100644 Tests/RunCMake/file/LOCK-error-timeout.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => file/LOCK-error-unknown-option-result.txt} (100%)
 create mode 100644 Tests/RunCMake/file/LOCK-error-unknown-option-stderr.txt
 create mode 100644 Tests/RunCMake/file/LOCK-error-unknown-option.cmake
 create mode 100644 Tests/RunCMake/file/LOCK-stdout.txt
 create mode 100644 Tests/RunCMake/file/LOCK.cmake
 create mode 100644 Tests/RunCMake/file/subdir_test_unlock/CMakeLists.txt
 create mode 100644 Tests/RunCMake/file/timeout-script.cmake
 create mode 100644 Tests/RunCMake/find_library/CMakeLists.txt
 create mode 100644 Tests/RunCMake/find_library/Created-stderr.txt
 create mode 100644 Tests/RunCMake/find_library/Created.cmake
 create mode 100644 Tests/RunCMake/find_library/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/return/CMakeLists.txt
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => return/ReturnFromForeach-result.txt} (100%)
 create mode 100644 Tests/RunCMake/return/ReturnFromForeach.cmake
 create mode 100644 Tests/RunCMake/return/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/string/RegexClear-stderr.txt
 create mode 100644 Tests/RunCMake/string/RegexClear.cmake
 create mode 100644 Tests/RunCMake/string/UTF-16BE-stderr.txt
 create mode 100644 Tests/RunCMake/string/UTF-16BE.cmake
 create mode 100644 Tests/RunCMake/string/UTF-16BE.txt
 create mode 100644 Tests/RunCMake/string/UTF-16LE-stderr.txt
 create mode 100644 Tests/RunCMake/string/UTF-16LE.cmake
 create mode 100644 Tests/RunCMake/string/UTF-16LE.txt
 create mode 100644 Tests/RunCMake/string/UTF-32BE-stderr.txt
 create mode 100644 Tests/RunCMake/string/UTF-32BE.cmake
 create mode 100644 Tests/RunCMake/string/UTF-32BE.txt
 create mode 100644 Tests/RunCMake/string/UTF-32LE-stderr.txt
 create mode 100644 Tests/RunCMake/string/UTF-32LE.cmake
 create mode 100644 Tests/RunCMake/string/UTF-32LE.txt
 create mode 100644 Tests/RunCMake/string/cmake/Finddummy.cmake
 create mode 100644 Tests/RunCMake/string/subdir/CMakeLists.txt
 create mode 100644 Tests/RunCMake/try_compile/CMP0056-stderr.txt
 create mode 100644 Tests/RunCMake/try_compile/CMP0056-stdout.txt
 create mode 100644 Tests/RunCMake/try_compile/CMP0056.cmake
 create mode 100644 Tests/RunCMake/try_compile/RerunCMake-nowork-ninja-no-console-stdout.txt
 create mode 100644 Tests/RunCMake/try_compile/RerunCMake-rerun-ninja-no-console-stdout.txt
 create mode 100644 Tests/RunCMake/try_compile/RerunCMake-rerun-stderr.txt
 create mode 100644 Tests/RunCMake/try_compile/RerunCMake-rerun-stdout.txt
 create mode 100644 Tests/RunCMake/try_compile/RerunCMake-stderr.txt
 create mode 100644 Tests/RunCMake/try_compile/RerunCMake-stdout.txt
 create mode 100644 Tests/RunCMake/try_compile/RerunCMake.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => try_run/BadLinkLibraries-result.txt} (100%)
 create mode 100644 Tests/RunCMake/try_run/BadLinkLibraries-stderr.txt
 create mode 100644 Tests/RunCMake/try_run/BadLinkLibraries.cmake
 create mode 100644 Tests/RunCMake/try_run/CMakeLists.txt
 create mode 100644 Tests/RunCMake/try_run/RunCMakeTest.cmake
 copy Tests/RunCMake/{try_compile => try_run}/src.c (100%)
 create mode 100644 Tests/SourceFileProperty/CMakeLists.txt
 create mode 100644 Tests/SourceFileProperty/ICaseTest.c
 create mode 100644 Tests/SourceFileProperty/main.c
 create mode 100644 Utilities/Release/linux64_release.cmake
 create mode 100644 Utilities/cm_jsoncpp_reader.h
 create mode 100644 Utilities/cm_jsoncpp_value.h
 create mode 100644 Utilities/cm_jsoncpp_writer.h
 copy Utilities/{cmlibarchive => cmcurl}/.gitattributes (100%)
 create mode 100644 Utilities/cmcurl/CMake/FindCARES.cmake
 create mode 100644 Utilities/cmcurl/CMake/FindLibSSH2.cmake
 create mode 100644 Utilities/cmcurl/CMake/Macros.cmake
 create mode 100644 Utilities/cmcurl/CMake/Platforms/WindowsCache.cmake
 create mode 100644 Utilities/cmcurl/CMake/Utilities.cmake
 delete mode 100644 Utilities/cmcurl/Platforms/WindowsCache.cmake
 delete mode 100644 Utilities/cmcurl/Platforms/config-aix.h
 create mode 100644 Utilities/cmcurl/README-CMake.txt
 delete mode 100644 Utilities/cmcurl/Testing/CMakeLists.txt
 delete mode 100644 Utilities/cmcurl/Testing/curlgtk.c
 delete mode 100644 Utilities/cmcurl/Testing/ftpget.c
 delete mode 100644 Utilities/cmcurl/Testing/ftpgetresp.c
 delete mode 100644 Utilities/cmcurl/Testing/ftpupload.c
 delete mode 100644 Utilities/cmcurl/Testing/getinmemory.c
 delete mode 100644 Utilities/cmcurl/Testing/http-post.c
 delete mode 100644 Utilities/cmcurl/Testing/httpput.c
 delete mode 100644 Utilities/cmcurl/Testing/multithread.c
 delete mode 100644 Utilities/cmcurl/Testing/persistant.c
 delete mode 100644 Utilities/cmcurl/Testing/postit2.c
 delete mode 100644 Utilities/cmcurl/Testing/sepheaders.c
 delete mode 100644 Utilities/cmcurl/Testing/simple.c
 delete mode 100644 Utilities/cmcurl/Testing/simplessl.c
 delete mode 100644 Utilities/cmcurl/Testing/testconfig.h.in
 delete mode 100644 Utilities/cmcurl/Testing/win32sockets.c
 delete mode 100644 Utilities/cmcurl/amigaos.c
 delete mode 100644 Utilities/cmcurl/amigaos.h
 delete mode 100644 Utilities/cmcurl/arpa_telnet.h
 delete mode 100644 Utilities/cmcurl/base64.c
 delete mode 100644 Utilities/cmcurl/base64.h
 delete mode 100644 Utilities/cmcurl/ca-bundle.h
 delete mode 100644 Utilities/cmcurl/config.h.in
 delete mode 100644 Utilities/cmcurl/connect.c
 delete mode 100644 Utilities/cmcurl/connect.h
 delete mode 100644 Utilities/cmcurl/content_encoding.c
 delete mode 100644 Utilities/cmcurl/content_encoding.h
 delete mode 100644 Utilities/cmcurl/cookie.c
 delete mode 100644 Utilities/cmcurl/cookie.h
 delete mode 100644 Utilities/cmcurl/curl/curl.h
 delete mode 100644 Utilities/cmcurl/curl/curlver.h
 delete mode 100644 Utilities/cmcurl/curl/easy.h
 delete mode 100644 Utilities/cmcurl/curl/mprintf.h
 delete mode 100644 Utilities/cmcurl/curl/multi.h
 delete mode 100644 Utilities/cmcurl/curl/stdcheaders.h
 delete mode 100644 Utilities/cmcurl/curl/types.h
 rename Utilities/cmcurl/{Testing => }/curltest.c (100%)
 delete mode 100644 Utilities/cmcurl/curlx.h
 delete mode 100644 Utilities/cmcurl/dict.c
 delete mode 100644 Utilities/cmcurl/dict.h
 delete mode 100644 Utilities/cmcurl/easy.c
 delete mode 100644 Utilities/cmcurl/easyif.h
 delete mode 100644 Utilities/cmcurl/escape.c
 delete mode 100644 Utilities/cmcurl/escape.h
 delete mode 100644 Utilities/cmcurl/file.c
 delete mode 100644 Utilities/cmcurl/file.h
 delete mode 100644 Utilities/cmcurl/formdata.c
 delete mode 100644 Utilities/cmcurl/formdata.h
 delete mode 100644 Utilities/cmcurl/ftp.c
 delete mode 100644 Utilities/cmcurl/ftp.h
 delete mode 100644 Utilities/cmcurl/getenv.c
 delete mode 100644 Utilities/cmcurl/getinfo.c
 delete mode 100644 Utilities/cmcurl/getinfo.h
 delete mode 100644 Utilities/cmcurl/gtls.c
 delete mode 100644 Utilities/cmcurl/gtls.h
 delete mode 100644 Utilities/cmcurl/hash.c
 delete mode 100644 Utilities/cmcurl/hash.h
 delete mode 100644 Utilities/cmcurl/hostares.c
 delete mode 100644 Utilities/cmcurl/hostasyn.c
 delete mode 100644 Utilities/cmcurl/hostip.c
 delete mode 100644 Utilities/cmcurl/hostip.h
 delete mode 100644 Utilities/cmcurl/hostip4.c
 delete mode 100644 Utilities/cmcurl/hostip6.c
 delete mode 100644 Utilities/cmcurl/hostsyn.c
 delete mode 100644 Utilities/cmcurl/hostthre.c
 delete mode 100644 Utilities/cmcurl/http.c
 delete mode 100644 Utilities/cmcurl/http.h
 delete mode 100644 Utilities/cmcurl/http_chunks.c
 delete mode 100644 Utilities/cmcurl/http_chunks.h
 delete mode 100644 Utilities/cmcurl/http_digest.c
 delete mode 100644 Utilities/cmcurl/http_digest.h
 delete mode 100644 Utilities/cmcurl/http_negotiate.c
 delete mode 100644 Utilities/cmcurl/http_negotiate.h
 delete mode 100644 Utilities/cmcurl/http_ntlm.c
 delete mode 100644 Utilities/cmcurl/http_ntlm.h
 delete mode 100644 Utilities/cmcurl/if2ip.c
 delete mode 100644 Utilities/cmcurl/if2ip.h
 create mode 100644 Utilities/cmcurl/include/curl/curl.h
 create mode 100644 Utilities/cmcurl/include/curl/curlbuild.h.cmake
 create mode 100644 Utilities/cmcurl/include/curl/curlrules.h
 create mode 100644 Utilities/cmcurl/include/curl/curlver.h
 create mode 100644 Utilities/cmcurl/include/curl/easy.h
 create mode 100644 Utilities/cmcurl/include/curl/mprintf.h
 create mode 100644 Utilities/cmcurl/include/curl/multi.h
 create mode 100644 Utilities/cmcurl/include/curl/stdcheaders.h
 create mode 100644 Utilities/cmcurl/include/curl/typecheck-gcc.h
 delete mode 100644 Utilities/cmcurl/inet_ntoa_r.h
 delete mode 100644 Utilities/cmcurl/inet_ntop.c
 delete mode 100644 Utilities/cmcurl/inet_ntop.h
 delete mode 100644 Utilities/cmcurl/inet_pton.c
 delete mode 100644 Utilities/cmcurl/inet_pton.h
 delete mode 100644 Utilities/cmcurl/krb4.c
 delete mode 100644 Utilities/cmcurl/krb4.h
 delete mode 100644 Utilities/cmcurl/ldap.c
 delete mode 100644 Utilities/cmcurl/ldap.h
 create mode 100644 Utilities/cmcurl/lib/CMakeLists.txt
 create mode 100644 Utilities/cmcurl/lib/Makefile.inc
 create mode 100644 Utilities/cmcurl/lib/amigaos.c
 create mode 100644 Utilities/cmcurl/lib/amigaos.h
 create mode 100644 Utilities/cmcurl/lib/arpa_telnet.h
 create mode 100644 Utilities/cmcurl/lib/asyn-ares.c
 create mode 100644 Utilities/cmcurl/lib/asyn-thread.c
 create mode 100644 Utilities/cmcurl/lib/asyn.h
 create mode 100644 Utilities/cmcurl/lib/base64.c
 create mode 100644 Utilities/cmcurl/lib/bundles.c
 create mode 100644 Utilities/cmcurl/lib/bundles.h
 create mode 100644 Utilities/cmcurl/lib/conncache.c
 create mode 100644 Utilities/cmcurl/lib/conncache.h
 create mode 100644 Utilities/cmcurl/lib/connect.c
 create mode 100644 Utilities/cmcurl/lib/connect.h
 create mode 100644 Utilities/cmcurl/lib/content_encoding.c
 create mode 100644 Utilities/cmcurl/lib/content_encoding.h
 create mode 100644 Utilities/cmcurl/lib/cookie.c
 create mode 100644 Utilities/cmcurl/lib/cookie.h
 create mode 100644 Utilities/cmcurl/lib/curl_addrinfo.c
 create mode 100644 Utilities/cmcurl/lib/curl_addrinfo.h
 create mode 100644 Utilities/cmcurl/lib/curl_base64.h
 create mode 100644 Utilities/cmcurl/lib/curl_config.h.cmake
 create mode 100644 Utilities/cmcurl/lib/curl_fnmatch.c
 create mode 100644 Utilities/cmcurl/lib/curl_fnmatch.h
 create mode 100644 Utilities/cmcurl/lib/curl_gethostname.c
 create mode 100644 Utilities/cmcurl/lib/curl_gethostname.h
 create mode 100644 Utilities/cmcurl/lib/curl_gssapi.c
 create mode 100644 Utilities/cmcurl/lib/curl_gssapi.h
 create mode 100644 Utilities/cmcurl/lib/curl_hmac.h
 create mode 100644 Utilities/cmcurl/lib/curl_ldap.h
 create mode 100644 Utilities/cmcurl/lib/curl_md4.h
 create mode 100644 Utilities/cmcurl/lib/curl_md5.h
 create mode 100644 Utilities/cmcurl/lib/curl_memory.h
 create mode 100644 Utilities/cmcurl/lib/curl_memrchr.c
 create mode 100644 Utilities/cmcurl/lib/curl_memrchr.h
 create mode 100644 Utilities/cmcurl/lib/curl_multibyte.c
 create mode 100644 Utilities/cmcurl/lib/curl_multibyte.h
 create mode 100644 Utilities/cmcurl/lib/curl_ntlm.c
 create mode 100644 Utilities/cmcurl/lib/curl_ntlm.h
 create mode 100644 Utilities/cmcurl/lib/curl_ntlm_core.c
 create mode 100644 Utilities/cmcurl/lib/curl_ntlm_core.h
 create mode 100644 Utilities/cmcurl/lib/curl_ntlm_msgs.c
 create mode 100644 Utilities/cmcurl/lib/curl_ntlm_msgs.h
 create mode 100644 Utilities/cmcurl/lib/curl_ntlm_wb.c
 create mode 100644 Utilities/cmcurl/lib/curl_ntlm_wb.h
 create mode 100644 Utilities/cmcurl/lib/curl_rtmp.c
 create mode 100644 Utilities/cmcurl/lib/curl_rtmp.h
 create mode 100644 Utilities/cmcurl/lib/curl_sasl.c
 create mode 100644 Utilities/cmcurl/lib/curl_sasl.h
 create mode 100644 Utilities/cmcurl/lib/curl_sasl_sspi.c
 create mode 100644 Utilities/cmcurl/lib/curl_sec.h
 create mode 100644 Utilities/cmcurl/lib/curl_setup.h
 create mode 100644 Utilities/cmcurl/lib/curl_setup_once.h
 create mode 100644 Utilities/cmcurl/lib/curl_sspi.c
 create mode 100644 Utilities/cmcurl/lib/curl_sspi.h
 create mode 100644 Utilities/cmcurl/lib/curl_threads.c
 create mode 100644 Utilities/cmcurl/lib/curl_threads.h
 create mode 100644 Utilities/cmcurl/lib/curlx.h
 create mode 100644 Utilities/cmcurl/lib/dict.c
 create mode 100644 Utilities/cmcurl/lib/dict.h
 create mode 100644 Utilities/cmcurl/lib/dotdot.c
 create mode 100644 Utilities/cmcurl/lib/dotdot.h
 create mode 100644 Utilities/cmcurl/lib/easy.c
 create mode 100644 Utilities/cmcurl/lib/easyif.h
 create mode 100644 Utilities/cmcurl/lib/escape.c
 create mode 100644 Utilities/cmcurl/lib/escape.h
 create mode 100644 Utilities/cmcurl/lib/file.c
 create mode 100644 Utilities/cmcurl/lib/file.h
 create mode 100644 Utilities/cmcurl/lib/fileinfo.c
 create mode 100644 Utilities/cmcurl/lib/fileinfo.h
 create mode 100644 Utilities/cmcurl/lib/formdata.c
 create mode 100644 Utilities/cmcurl/lib/formdata.h
 create mode 100644 Utilities/cmcurl/lib/ftp.c
 create mode 100644 Utilities/cmcurl/lib/ftp.h
 create mode 100644 Utilities/cmcurl/lib/ftplistparser.c
 create mode 100644 Utilities/cmcurl/lib/ftplistparser.h
 create mode 100644 Utilities/cmcurl/lib/getenv.c
 create mode 100644 Utilities/cmcurl/lib/getinfo.c
 create mode 100644 Utilities/cmcurl/lib/getinfo.h
 create mode 100644 Utilities/cmcurl/lib/gopher.c
 create mode 100644 Utilities/cmcurl/lib/gopher.h
 create mode 100644 Utilities/cmcurl/lib/hash.c
 create mode 100644 Utilities/cmcurl/lib/hash.h
 create mode 100644 Utilities/cmcurl/lib/hmac.c
 create mode 100644 Utilities/cmcurl/lib/hostasyn.c
 create mode 100644 Utilities/cmcurl/lib/hostcheck.c
 create mode 100644 Utilities/cmcurl/lib/hostcheck.h
 create mode 100644 Utilities/cmcurl/lib/hostip.c
 create mode 100644 Utilities/cmcurl/lib/hostip.h
 create mode 100644 Utilities/cmcurl/lib/hostip4.c
 create mode 100644 Utilities/cmcurl/lib/hostip6.c
 create mode 100644 Utilities/cmcurl/lib/hostsyn.c
 create mode 100644 Utilities/cmcurl/lib/http.c
 create mode 100644 Utilities/cmcurl/lib/http.h
 create mode 100644 Utilities/cmcurl/lib/http2.c
 create mode 100644 Utilities/cmcurl/lib/http2.h
 create mode 100644 Utilities/cmcurl/lib/http_chunks.c
 create mode 100644 Utilities/cmcurl/lib/http_chunks.h
 create mode 100644 Utilities/cmcurl/lib/http_digest.c
 create mode 100644 Utilities/cmcurl/lib/http_digest.h
 create mode 100644 Utilities/cmcurl/lib/http_negotiate.c
 create mode 100644 Utilities/cmcurl/lib/http_negotiate.h
 create mode 100644 Utilities/cmcurl/lib/http_negotiate_sspi.c
 create mode 100644 Utilities/cmcurl/lib/http_proxy.c
 create mode 100644 Utilities/cmcurl/lib/http_proxy.h
 create mode 100644 Utilities/cmcurl/lib/idn_win32.c
 create mode 100644 Utilities/cmcurl/lib/if2ip.c
 create mode 100644 Utilities/cmcurl/lib/if2ip.h
 create mode 100644 Utilities/cmcurl/lib/imap.c
 create mode 100644 Utilities/cmcurl/lib/imap.h
 create mode 100644 Utilities/cmcurl/lib/inet_ntop.c
 create mode 100644 Utilities/cmcurl/lib/inet_ntop.h
 create mode 100644 Utilities/cmcurl/lib/inet_pton.c
 create mode 100644 Utilities/cmcurl/lib/inet_pton.h
 create mode 100644 Utilities/cmcurl/lib/krb5.c
 create mode 100644 Utilities/cmcurl/lib/ldap.c
 create mode 100644 Utilities/cmcurl/lib/libcurl.rc
 create mode 100644 Utilities/cmcurl/lib/llist.c
 create mode 100644 Utilities/cmcurl/lib/llist.h
 create mode 100644 Utilities/cmcurl/lib/md4.c
 create mode 100644 Utilities/cmcurl/lib/md5.c
 create mode 100644 Utilities/cmcurl/lib/memdebug.c
 create mode 100644 Utilities/cmcurl/lib/memdebug.h
 create mode 100644 Utilities/cmcurl/lib/mprintf.c
 create mode 100644 Utilities/cmcurl/lib/multi.c
 create mode 100644 Utilities/cmcurl/lib/multihandle.h
 create mode 100644 Utilities/cmcurl/lib/multiif.h
 create mode 100644 Utilities/cmcurl/lib/netrc.c
 create mode 100644 Utilities/cmcurl/lib/netrc.h
 create mode 100644 Utilities/cmcurl/lib/non-ascii.c
 create mode 100644 Utilities/cmcurl/lib/non-ascii.h
 create mode 100644 Utilities/cmcurl/lib/nonblock.c
 create mode 100644 Utilities/cmcurl/lib/nonblock.h
 create mode 100644 Utilities/cmcurl/lib/nwlib.c
 create mode 100644 Utilities/cmcurl/lib/nwos.c
 create mode 100644 Utilities/cmcurl/lib/openldap.c
 create mode 100644 Utilities/cmcurl/lib/parsedate.c
 create mode 100644 Utilities/cmcurl/lib/parsedate.h
 create mode 100644 Utilities/cmcurl/lib/pingpong.c
 create mode 100644 Utilities/cmcurl/lib/pingpong.h
 create mode 100644 Utilities/cmcurl/lib/pipeline.c
 create mode 100644 Utilities/cmcurl/lib/pipeline.h
 create mode 100644 Utilities/cmcurl/lib/pop3.c
 create mode 100644 Utilities/cmcurl/lib/pop3.h
 create mode 100644 Utilities/cmcurl/lib/progress.c
 create mode 100644 Utilities/cmcurl/lib/progress.h
 create mode 100644 Utilities/cmcurl/lib/rawstr.c
 create mode 100644 Utilities/cmcurl/lib/rawstr.h
 create mode 100644 Utilities/cmcurl/lib/rtsp.c
 create mode 100644 Utilities/cmcurl/lib/rtsp.h
 create mode 100644 Utilities/cmcurl/lib/security.c
 create mode 100644 Utilities/cmcurl/lib/select.c
 create mode 100644 Utilities/cmcurl/lib/select.h
 create mode 100644 Utilities/cmcurl/lib/sendf.c
 create mode 100644 Utilities/cmcurl/lib/sendf.h
 create mode 100644 Utilities/cmcurl/lib/setup-os400.h
 create mode 100644 Utilities/cmcurl/lib/setup-vms.h
 create mode 100644 Utilities/cmcurl/lib/share.c
 create mode 100644 Utilities/cmcurl/lib/share.h
 create mode 100644 Utilities/cmcurl/lib/sigpipe.h
 create mode 100644 Utilities/cmcurl/lib/slist.c
 create mode 100644 Utilities/cmcurl/lib/slist.h
 create mode 100644 Utilities/cmcurl/lib/smtp.c
 create mode 100644 Utilities/cmcurl/lib/smtp.h
 create mode 100644 Utilities/cmcurl/lib/sockaddr.h
 create mode 100644 Utilities/cmcurl/lib/socks.c
 create mode 100644 Utilities/cmcurl/lib/socks.h
 create mode 100644 Utilities/cmcurl/lib/socks_gssapi.c
 create mode 100644 Utilities/cmcurl/lib/socks_sspi.c
 create mode 100644 Utilities/cmcurl/lib/speedcheck.c
 create mode 100644 Utilities/cmcurl/lib/speedcheck.h
 create mode 100644 Utilities/cmcurl/lib/splay.c
 create mode 100644 Utilities/cmcurl/lib/splay.h
 create mode 100644 Utilities/cmcurl/lib/ssh.c
 create mode 100644 Utilities/cmcurl/lib/ssh.h
 create mode 100644 Utilities/cmcurl/lib/strdup.c
 create mode 100644 Utilities/cmcurl/lib/strdup.h
 create mode 100644 Utilities/cmcurl/lib/strequal.c
 create mode 100644 Utilities/cmcurl/lib/strequal.h
 create mode 100644 Utilities/cmcurl/lib/strerror.c
 create mode 100644 Utilities/cmcurl/lib/strerror.h
 create mode 100644 Utilities/cmcurl/lib/strtok.c
 create mode 100644 Utilities/cmcurl/lib/strtok.h
 create mode 100644 Utilities/cmcurl/lib/strtoofft.c
 create mode 100644 Utilities/cmcurl/lib/strtoofft.h
 create mode 100644 Utilities/cmcurl/lib/telnet.c
 create mode 100644 Utilities/cmcurl/lib/telnet.h
 create mode 100644 Utilities/cmcurl/lib/tftp.c
 create mode 100644 Utilities/cmcurl/lib/tftp.h
 create mode 100644 Utilities/cmcurl/lib/timeval.c
 create mode 100644 Utilities/cmcurl/lib/timeval.h
 create mode 100644 Utilities/cmcurl/lib/transfer.c
 create mode 100644 Utilities/cmcurl/lib/transfer.h
 create mode 100644 Utilities/cmcurl/lib/url.c
 create mode 100644 Utilities/cmcurl/lib/url.h
 create mode 100644 Utilities/cmcurl/lib/urldata.h
 create mode 100644 Utilities/cmcurl/lib/version.c
 create mode 100644 Utilities/cmcurl/lib/vtls/axtls.c
 create mode 100644 Utilities/cmcurl/lib/vtls/axtls.h
 create mode 100644 Utilities/cmcurl/lib/vtls/curl_darwinssl.c
 create mode 100644 Utilities/cmcurl/lib/vtls/curl_darwinssl.h
 create mode 100644 Utilities/cmcurl/lib/vtls/curl_schannel.c
 create mode 100644 Utilities/cmcurl/lib/vtls/curl_schannel.h
 create mode 100644 Utilities/cmcurl/lib/vtls/cyassl.c
 create mode 100644 Utilities/cmcurl/lib/vtls/cyassl.h
 create mode 100644 Utilities/cmcurl/lib/vtls/gskit.c
 create mode 100644 Utilities/cmcurl/lib/vtls/gskit.h
 create mode 100644 Utilities/cmcurl/lib/vtls/gtls.c
 create mode 100644 Utilities/cmcurl/lib/vtls/gtls.h
 create mode 100644 Utilities/cmcurl/lib/vtls/nss.c
 create mode 100644 Utilities/cmcurl/lib/vtls/nssg.h
 create mode 100644 Utilities/cmcurl/lib/vtls/openssl.c
 create mode 100644 Utilities/cmcurl/lib/vtls/openssl.h
 create mode 100644 Utilities/cmcurl/lib/vtls/polarssl.c
 create mode 100644 Utilities/cmcurl/lib/vtls/polarssl.h
 create mode 100644 Utilities/cmcurl/lib/vtls/polarssl_threadlock.c
 create mode 100644 Utilities/cmcurl/lib/vtls/polarssl_threadlock.h
 create mode 100644 Utilities/cmcurl/lib/vtls/qssl.c
 create mode 100644 Utilities/cmcurl/lib/vtls/qssl.h
 create mode 100644 Utilities/cmcurl/lib/vtls/vtls.c
 create mode 100644 Utilities/cmcurl/lib/vtls/vtls.h
 create mode 100644 Utilities/cmcurl/lib/warnless.c
 create mode 100644 Utilities/cmcurl/lib/warnless.h
 create mode 100644 Utilities/cmcurl/lib/wildcard.c
 create mode 100644 Utilities/cmcurl/lib/wildcard.h
 create mode 100644 Utilities/cmcurl/lib/x509asn1.c
 create mode 100644 Utilities/cmcurl/lib/x509asn1.h
 delete mode 100644 Utilities/cmcurl/llist.c
 delete mode 100644 Utilities/cmcurl/llist.h
 delete mode 100644 Utilities/cmcurl/md5.c
 delete mode 100644 Utilities/cmcurl/md5.h
 delete mode 100644 Utilities/cmcurl/memdebug.c
 delete mode 100644 Utilities/cmcurl/memdebug.h
 delete mode 100644 Utilities/cmcurl/memory.h
 delete mode 100644 Utilities/cmcurl/mprintf.c
 delete mode 100644 Utilities/cmcurl/multi.c
 delete mode 100644 Utilities/cmcurl/multiif.h
 delete mode 100644 Utilities/cmcurl/netrc.c
 delete mode 100644 Utilities/cmcurl/netrc.h
 delete mode 100644 Utilities/cmcurl/nwlib.c
 delete mode 100644 Utilities/cmcurl/parsedate.c
 delete mode 100644 Utilities/cmcurl/parsedate.h
 delete mode 100644 Utilities/cmcurl/progress.c
 delete mode 100644 Utilities/cmcurl/progress.h
 delete mode 100644 Utilities/cmcurl/security.c
 delete mode 100644 Utilities/cmcurl/select.c
 delete mode 100644 Utilities/cmcurl/select.h
 delete mode 100644 Utilities/cmcurl/sendf.c
 delete mode 100644 Utilities/cmcurl/sendf.h
 delete mode 100644 Utilities/cmcurl/setup.h
 delete mode 100644 Utilities/cmcurl/setup_once.h
 delete mode 100644 Utilities/cmcurl/share.c
 delete mode 100644 Utilities/cmcurl/share.h
 delete mode 100644 Utilities/cmcurl/sockaddr.h
 delete mode 100644 Utilities/cmcurl/socks.c
 delete mode 100644 Utilities/cmcurl/socks.h
 delete mode 100644 Utilities/cmcurl/speedcheck.c
 delete mode 100644 Utilities/cmcurl/speedcheck.h
 delete mode 100644 Utilities/cmcurl/splay.c
 delete mode 100644 Utilities/cmcurl/splay.h
 delete mode 100644 Utilities/cmcurl/ssh.c
 delete mode 100644 Utilities/cmcurl/ssh.h
 delete mode 100644 Utilities/cmcurl/sslgen.c
 delete mode 100644 Utilities/cmcurl/sslgen.h
 delete mode 100644 Utilities/cmcurl/ssluse.c
 delete mode 100644 Utilities/cmcurl/ssluse.h
 delete mode 100644 Utilities/cmcurl/strdup.c
 delete mode 100644 Utilities/cmcurl/strdup.h
 delete mode 100644 Utilities/cmcurl/strequal.c
 delete mode 100644 Utilities/cmcurl/strequal.h
 delete mode 100644 Utilities/cmcurl/strerror.c
 delete mode 100644 Utilities/cmcurl/strerror.h
 delete mode 100644 Utilities/cmcurl/strtok.c
 delete mode 100644 Utilities/cmcurl/strtok.h
 delete mode 100644 Utilities/cmcurl/strtoofft.c
 delete mode 100644 Utilities/cmcurl/strtoofft.h
 delete mode 100644 Utilities/cmcurl/telnet.c
 delete mode 100644 Utilities/cmcurl/telnet.h
 delete mode 100644 Utilities/cmcurl/tftp.c
 delete mode 100644 Utilities/cmcurl/tftp.h
 delete mode 100644 Utilities/cmcurl/timeval.c
 delete mode 100644 Utilities/cmcurl/timeval.h
 delete mode 100644 Utilities/cmcurl/transfer.c
 delete mode 100644 Utilities/cmcurl/transfer.h
 delete mode 100644 Utilities/cmcurl/url.c
 delete mode 100644 Utilities/cmcurl/url.h
 delete mode 100644 Utilities/cmcurl/urldata.h
 delete mode 100644 Utilities/cmcurl/version.c
 copy Utilities/{cmlibarchive => cmjsoncpp}/.gitattributes (100%)
 create mode 100644 Utilities/cmjsoncpp/CMakeLists.txt
 create mode 100644 Utilities/cmjsoncpp/LICENSE
 create mode 100644 Utilities/cmjsoncpp/README-CMake.txt
 create mode 100644 Utilities/cmjsoncpp/include/json/assertions.h
 create mode 100644 Utilities/cmjsoncpp/include/json/config.h
 create mode 100644 Utilities/cmjsoncpp/include/json/features.h
 create mode 100644 Utilities/cmjsoncpp/include/json/forwards.h
 create mode 100644 Utilities/cmjsoncpp/include/json/json.h
 create mode 100644 Utilities/cmjsoncpp/include/json/reader.h
 create mode 100644 Utilities/cmjsoncpp/include/json/value.h
 create mode 100644 Utilities/cmjsoncpp/include/json/version.h
 create mode 100644 Utilities/cmjsoncpp/include/json/writer.h
 create mode 100644 Utilities/cmjsoncpp/src/lib_json/json_batchallocator.h
 create mode 100644 Utilities/cmjsoncpp/src/lib_json/json_internalarray.inl
 create mode 100644 Utilities/cmjsoncpp/src/lib_json/json_internalmap.inl
 create mode 100644 Utilities/cmjsoncpp/src/lib_json/json_reader.cpp
 create mode 100644 Utilities/cmjsoncpp/src/lib_json/json_tool.h
 create mode 100644 Utilities/cmjsoncpp/src/lib_json/json_value.cpp
 create mode 100644 Utilities/cmjsoncpp/src/lib_json/json_valueiterator.inl
 create mode 100644 Utilities/cmjsoncpp/src/lib_json/json_writer.cpp


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb  5 10:54:24 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 10:54:24 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1021-gd045ee3
Message-ID: <20150205155424.4DF09AA941@public.kitware.com>

This is an automated email from 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  d045ee3b5288d8bb5596141bf20a1fb0d4e2a14c (commit)
       via  892b854f57f48381751b79bfc52048ea57bb0376 (commit)
      from  15d314cef30f00cf4ef57f625e778a26a0dd6bfb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d045ee3b5288d8bb5596141bf20a1fb0d4e2a14c
commit d045ee3b5288d8bb5596141bf20a1fb0d4e2a14c
Merge: 15d314c 892b854
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 10:54:23 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 10:54:23 2015 -0500

    Merge topic 'FindBoost-per-config-libraries' into next
    
    892b854f FindBoost: Search for debug and release libraries separately (#15364)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=892b854f57f48381751b79bfc52048ea57bb0376
commit 892b854f57f48381751b79bfc52048ea57bb0376
Author:     Gunther Laure <gunther.laure at gmail.com>
AuthorDate: Mon Jan 26 18:13:44 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 5 10:50:49 2015 -0500

    FindBoost: Search for debug and release libraries separately (#15364)
    
    Split Boost_LIBRARY_DIR into Boost_LIBRARY_DIR_[RELEASE,DEBUG] to allow
    libraries to be grouped into per-config directories.

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 99293c1..466090b 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -49,7 +49,8 @@
 # and saves search results persistently in CMake cache entries::
 #
 #   Boost_INCLUDE_DIR         - Directory containing Boost headers
-#   Boost_LIBRARY_DIR         - Directory containing Boost libraries
+#   Boost_LIBRARY_DIR_RELEASE - Directory containing release Boost libraries
+#   Boost_LIBRARY_DIR_DEBUG   - Directory containing debug Boost libraries
 #   Boost_<C>_LIBRARY_DEBUG   - Component <C> library debug variant
 #   Boost_<C>_LIBRARY_RELEASE - Component <C> library release variant
 #
@@ -65,7 +66,8 @@
 # using the above hints (excluding BOOST_INCLUDEDIR and
 # Boost_ADDITIONAL_VERSIONS), "lib" directories near Boost_INCLUDE_DIR,
 # and the library name configuration settings below.  It saves the
-# library directory in Boost_LIBRARY_DIR and individual library
+# library directories in Boost_LIBRARY_DIR_DEBUG and
+# Boost_LIBRARY_DIR_RELEASE and individual library
 # locations in Boost_<C>_LIBRARY_DEBUG and Boost_<C>_LIBRARY_RELEASE.
 # When one changes settings used by previous searches in the same build
 # tree (excluding environment variables) this module discards previous
@@ -118,6 +120,8 @@
 #                              "/usr/lib/libboost_system.so".  This does not
 #                              affect linking and should not be enabled unless
 #                              the user needs this information.
+#   Boost_LIBRARY_DIR        - Default value for Boost_LIBRARY_DIR_RELEASE and
+#                              Boost_LIBRARY_DIR_DEBUG.
 #
 # On Visual Studio and Borland compilers Boost headers request automatic
 # linking to corresponding libraries.  This requires matching libraries
@@ -283,6 +287,14 @@ macro(_Boost_ADJUST_LIB_VARS basename)
   )
 endmacro()
 
+# Detect changes in used variables.
+# Compares the current variable value with the last one.
+# In short form:
+# v != v_LAST                      -> CHANGED = 1
+# v is defined, v_LAST not         -> CHANGED = 1
+# v is not defined, but v_LAST is  -> CHANGED = 1
+# otherwise                        -> CHANGED = 0
+# CHANGED is returned in variable named ${changed_var}
 macro(_Boost_CHANGE_DETECT changed_var)
   set(${changed_var} 0)
   foreach(v ${ARGN})
@@ -305,23 +317,33 @@ macro(_Boost_CHANGE_DETECT changed_var)
   endforeach()
 endmacro()
 
-macro(_Boost_FIND_LIBRARY var)
+#
+# Find the given library (var).
+# Use 'build_type' to support different lib paths for RELEASE or DEBUG builds
+#
+macro(_Boost_FIND_LIBRARY var build_type)
+
   find_library(${var} ${ARGN})
 
   if(${var})
-    # If this is the first library found then save Boost_LIBRARY_DIR.
-    if(NOT Boost_LIBRARY_DIR)
+    # If this is the first library found then save Boost_LIBRARY_DIR_[RELEASE,DEBUG].
+    if(NOT Boost_LIBRARY_DIR_${build_type})
       get_filename_component(_dir "${${var}}" PATH)
-      set(Boost_LIBRARY_DIR "${_dir}" CACHE PATH "Boost library directory" FORCE)
+      set(Boost_LIBRARY_DIR_${build_type} "${_dir}" CACHE PATH "Boost library directory ${build_type}" FORCE)
     endif()
   elseif(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT)
-    # Try component-specific hints but do not save Boost_LIBRARY_DIR.
+    # Try component-specific hints but do not save Boost_LIBRARY_DIR_[RELEASE,DEBUG].
     find_library(${var} HINTS ${_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT} ${ARGN})
   endif()
 
-  # If Boost_LIBRARY_DIR is known then search only there.
-  if(Boost_LIBRARY_DIR)
-    set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+  # If Boost_LIBRARY_DIR_[RELEASE,DEBUG] is known then search only there.
+  if(Boost_LIBRARY_DIR_${build_type})
+    set(_boost_LIBRARY_SEARCH_DIRS_${build_type} ${Boost_LIBRARY_DIR_${build_type}} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+    if(Boost_DEBUG)
+      message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+        " Boost_LIBRARY_DIR_${build_type} = ${Boost_LIBRARY_DIR_${build_type}}"
+        " _boost_LIBRARY_SEARCH_DIRS_${build_type} = ${_boost_LIBRARY_SEARCH_DIRS_${build_type}}")
+    endif()
   endif()
 endmacro()
 
@@ -456,6 +478,16 @@ endfunction()
 # main.
 #-------------------------------------------------------------------------------
 
+
+# If the user sets Boost_LIBRARY_DIR, use it as the default for both
+# configurations.
+if(NOT Boost_LIBRARY_DIR_RELEASE AND Boost_LIBRARY_DIR)
+  set(Boost_LIBRARY_DIR_RELEASE "${Boost_LIBRARY_DIR}")
+endif()
+if(NOT Boost_LIBRARY_DIR_DEBUG AND Boost_LIBRARY_DIR)
+  set(Boost_LIBRARY_DIR_DEBUG   "${Boost_LIBRARY_DIR}")
+endif()
+
 if(NOT DEFINED Boost_USE_MULTITHREADED)
     set(Boost_USE_MULTITHREADED TRUE)
 endif()
@@ -846,49 +878,54 @@ endif()
 # ------------------------------------------------------------------------
 #  Begin finding boost libraries
 # ------------------------------------------------------------------------
-set(_Boost_VARS_LIB BOOST_LIBRARYDIR Boost_LIBRARY_DIR)
-_Boost_CHANGE_DETECT(_Boost_CHANGE_LIBDIR ${_Boost_VARS_DIR} ${_Boost_VARS_LIB} Boost_INCLUDE_DIR)
-# Clear Boost_LIBRARY_DIR if it did not change but other input affecting the
-# location did.  We will find a new one based on the new inputs.
-if(_Boost_CHANGE_LIBDIR AND NOT _Boost_LIBRARY_DIR_CHANGED)
-  unset(Boost_LIBRARY_DIR CACHE)
-endif()
 
-if(Boost_LIBRARY_DIR)
-  set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-else()
-  set(_boost_LIBRARY_SEARCH_DIRS "")
-  if(BOOST_LIBRARYDIR)
-    list(APPEND _boost_LIBRARY_SEARCH_DIRS ${BOOST_LIBRARYDIR})
-  elseif(_ENV_BOOST_LIBRARYDIR)
-    list(APPEND _boost_LIBRARY_SEARCH_DIRS ${_ENV_BOOST_LIBRARYDIR})
-  endif()
-
-  if(BOOST_ROOT)
-    list(APPEND _boost_LIBRARY_SEARCH_DIRS ${BOOST_ROOT}/lib ${BOOST_ROOT}/stage/lib)
-  elseif(_ENV_BOOST_ROOT)
-    list(APPEND _boost_LIBRARY_SEARCH_DIRS ${_ENV_BOOST_ROOT}/lib ${_ENV_BOOST_ROOT}/stage/lib)
+foreach(c DEBUG RELEASE)
+  set(_Boost_VARS_LIB_${c} BOOST_LIBRARYDIR Boost_LIBRARY_DIR_${c})
+  _Boost_CHANGE_DETECT(_Boost_CHANGE_LIBDIR_${c} ${_Boost_VARS_DIR} ${_Boost_VARS_LIB_${c}} Boost_INCLUDE_DIR)
+  # Clear Boost_LIBRARY_DIR_${c} if it did not change but other input affecting the
+  # location did.  We will find a new one based on the new inputs.
+  if(_Boost_CHANGE_LIBDIR_${c} AND NOT _Boost_LIBRARY_DIR_${c}_CHANGED)
+    unset(Boost_LIBRARY_DIR_${c} CACHE)
   endif()
 
-  list(APPEND _boost_LIBRARY_SEARCH_DIRS
-    ${Boost_INCLUDE_DIR}/lib
-    ${Boost_INCLUDE_DIR}/../lib
-    ${Boost_INCLUDE_DIR}/stage/lib
-    )
-  if( Boost_NO_SYSTEM_PATHS )
-    list(APPEND _boost_LIBRARY_SEARCH_DIRS NO_CMAKE_SYSTEM_PATH)
+  # If Boost_LIBRARY_DIR_[RELEASE,DEBUG] is set, prefer its value.
+  if(Boost_LIBRARY_DIR_${c})
+    set(_boost_LIBRARY_SEARCH_DIRS_${c} ${Boost_LIBRARY_DIR_${c}} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
   else()
-    list(APPEND _boost_LIBRARY_SEARCH_DIRS PATHS
-      C:/boost/lib
-      C:/boost
-      /sw/local/lib
+    set(_boost_LIBRARY_SEARCH_DIRS_${c} "")
+    if(BOOST_LIBRARYDIR)
+      list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} ${BOOST_LIBRARYDIR})
+    elseif(_ENV_BOOST_LIBRARYDIR)
+      list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} ${_ENV_BOOST_LIBRARYDIR})
+    endif()
+
+    if(BOOST_ROOT)
+      list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} ${BOOST_ROOT}/lib ${BOOST_ROOT}/stage/lib)
+    elseif(_ENV_BOOST_ROOT)
+      list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} ${_ENV_BOOST_ROOT}/lib ${_ENV_BOOST_ROOT}/stage/lib)
+    endif()
+
+    list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c}
+      ${Boost_INCLUDE_DIR}/lib
+      ${Boost_INCLUDE_DIR}/../lib
+      ${Boost_INCLUDE_DIR}/stage/lib
       )
+    if( Boost_NO_SYSTEM_PATHS )
+      list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} NO_CMAKE_SYSTEM_PATH)
+    else()
+      list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} PATHS
+        C:/boost/lib
+        C:/boost
+        /sw/local/lib
+        )
+    endif()
   endif()
-endif()
+endforeach()
 
 if(Boost_DEBUG)
   message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-    "_boost_LIBRARY_SEARCH_DIRS = ${_boost_LIBRARY_SEARCH_DIRS}")
+    "_boost_LIBRARY_SEARCH_DIRS_RELEASE = ${_boost_LIBRARY_SEARCH_DIRS_RELEASE}"
+    "_boost_LIBRARY_SEARCH_DIRS_DEBUG   = ${_boost_LIBRARY_SEARCH_DIRS_DEBUG}")
 endif()
 
 # Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
@@ -1002,10 +1039,16 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
                    "Searching for ${UPPERCOMPONENT}_LIBRARY_RELEASE: ${_boost_RELEASE_NAMES}")
   endif()
 
+  # if Boost_LIBRARY_DIR_RELEASE is not defined,
+  # but Boost_LIBRARY_DIR_DEBUG is, look there first for RELEASE libs
+  if(NOT Boost_LIBRARY_DIR_RELEASE AND Boost_LIBRARY_DIR_DEBUG)
+    list(INSERT _boost_LIBRARY_SEARCH_DIRS_RELEASE 0 ${Boost_LIBRARY_DIR_DEBUG})
+  endif()
+
   # Avoid passing backslashes to _Boost_FIND_LIBRARY due to macro re-parsing.
-  string(REPLACE "\\" "/" _boost_LIBRARY_SEARCH_DIRS_tmp "${_boost_LIBRARY_SEARCH_DIRS}")
+  string(REPLACE "\\" "/" _boost_LIBRARY_SEARCH_DIRS_tmp "${_boost_LIBRARY_SEARCH_DIRS_RELEASE}")
 
-  _Boost_FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE
+  _Boost_FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE RELEASE
     NAMES ${_boost_RELEASE_NAMES}
     HINTS ${_boost_LIBRARY_SEARCH_DIRS_tmp}
     NAMES_PER_DIR
@@ -1038,10 +1081,16 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
                    "Searching for ${UPPERCOMPONENT}_LIBRARY_DEBUG: ${_boost_DEBUG_NAMES}")
   endif()
 
+  # if Boost_LIBRARY_DIR_DEBUG is not defined,
+  # but Boost_LIBRARY_DIR_RELEASE is, look there first for DEBUG libs
+  if(NOT Boost_LIBRARY_DIR_DEBUG AND Boost_LIBRARY_DIR_RELEASE)
+    list(INSERT _boost_LIBRARY_SEARCH_DIRS_DEBUG 0 ${Boost_LIBRARY_DIR_RELEASE})
+  endif()
+
   # Avoid passing backslashes to _Boost_FIND_LIBRARY due to macro re-parsing.
-  string(REPLACE "\\" "/" _boost_LIBRARY_SEARCH_DIRS_tmp "${_boost_LIBRARY_SEARCH_DIRS}")
+  string(REPLACE "\\" "/" _boost_LIBRARY_SEARCH_DIRS_tmp "${_boost_LIBRARY_SEARCH_DIRS_DEBUG}")
 
-  _Boost_FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG
+  _Boost_FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG DEBUG
     NAMES ${_boost_DEBUG_NAMES}
     HINTS ${_boost_LIBRARY_SEARCH_DIRS_tmp}
     NAMES_PER_DIR
@@ -1067,7 +1116,16 @@ endif()
 # ------------------------------------------------------------------------
 
 set(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
-set(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIR})
+set(Boost_LIBRARY_DIRS)
+if(Boost_LIBRARY_DIR_RELEASE)
+  list(APPEND Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIR_RELEASE})
+endif()
+if(Boost_LIBRARY_DIR_DEBUG)
+  list(APPEND Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIR_DEBUG})
+endif()
+if(Boost_LIBRARY_DIRS)
+  list(REMOVE_DUPLICATES Boost_LIBRARY_DIRS)
+endif()
 
 # The above setting of Boost_FOUND was based only on the header files.
 # Update it for the requested component libraries.

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

Summary of changes:
 Modules/FindBoost.cmake |  156 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 107 insertions(+), 49 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb  5 10:57:46 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 10:57:46 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1023-ge3c8a3a
Message-ID: <20150205155746.11240AA9F0@public.kitware.com>

This is an automated email from 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  e3c8a3a0ff84d1b4eaf2b9089eeb67d51f6c4cbd (commit)
       via  39e0aa5390964953e1462f0efed0058c172a0a26 (commit)
      from  d045ee3b5288d8bb5596141bf20a1fb0d4e2a14c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3c8a3a0ff84d1b4eaf2b9089eeb67d51f6c4cbd
commit e3c8a3a0ff84d1b4eaf2b9089eeb67d51f6c4cbd
Merge: d045ee3 39e0aa5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 10:57:45 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 10:57:45 2015 -0500

    Merge topic 'FindBoost-per-config-libraries' into next
    
    39e0aa53 Help: Add notes for topic 'FindBoost-per-config-libraries'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39e0aa5390964953e1462f0efed0058c172a0a26
commit 39e0aa5390964953e1462f0efed0058c172a0a26
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 10:57:34 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 5 10:57:34 2015 -0500

    Help: Add notes for topic 'FindBoost-per-config-libraries'

diff --git a/Help/release/dev/FindBoost-per-config-libraries.rst b/Help/release/dev/FindBoost-per-config-libraries.rst
new file mode 100644
index 0000000..e6ef70f
--- /dev/null
+++ b/Help/release/dev/FindBoost-per-config-libraries.rst
@@ -0,0 +1,5 @@
+FindBoost-per-config-libraries
+------------------------------
+
+* The :module:`FindBoost` module now tracks the directories containing
+  libraries separately for RELEASE and DEBUG configurations.

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

Summary of changes:
 Help/release/dev/FindBoost-per-config-libraries.rst |    5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 Help/release/dev/FindBoost-per-config-libraries.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb  5 11:20:49 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  5 Feb 2015 11:20:49 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1027-g8918fa8
Message-ID: <20150205162050.5088CAA7E8@public.kitware.com>

This is an automated email from 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  8918fa8bac9d8a9ce83f7f970a55c184da23d25e (commit)
       via  1814cf744ce69ab97ce4a8fe8183b4d4f7f75cf4 (commit)
       via  54e900abfbbddde560a853355b448e1b86681741 (commit)
       via  393a45e2e1fa2f0d9657d4a686257d828cd918e4 (commit)
      from  e3c8a3a0ff84d1b4eaf2b9089eeb67d51f6c4cbd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8918fa8bac9d8a9ce83f7f970a55c184da23d25e
commit 8918fa8bac9d8a9ce83f7f970a55c184da23d25e
Merge: e3c8a3a 1814cf7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 11:20:41 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 11:20:41 2015 -0500

    Merge topic 'add-CheckFortranCompilerFlag' into next
    
    1814cf74 Help: Add notes for topic 'add-CheckFortranCompilerFlag'
    54e900ab CheckFortranCompilerFlag: Add test case
    393a45e2 CheckFortranCompilerFlag: Add module to check Fortran flag existence


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1814cf744ce69ab97ce4a8fe8183b4d4f7f75cf4
commit 1814cf744ce69ab97ce4a8fe8183b4d4f7f75cf4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 11:18:41 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 5 11:18:41 2015 -0500

    Help: Add notes for topic 'add-CheckFortranCompilerFlag'

diff --git a/Help/release/dev/add-CheckFortranCompilerFlag.rst b/Help/release/dev/add-CheckFortranCompilerFlag.rst
new file mode 100644
index 0000000..718b53e
--- /dev/null
+++ b/Help/release/dev/add-CheckFortranCompilerFlag.rst
@@ -0,0 +1,6 @@
+add-CheckFortranCompilerFlag
+----------------------------
+
+* The :module:`CheckFortranCompilerFlag` module was introduced
+  to check ``Fortran`` compiler flags, much like the
+  :module:`CheckCCompilerFlag` module already does for ``C``.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54e900abfbbddde560a853355b448e1b86681741
commit 54e900abfbbddde560a853355b448e1b86681741
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 11:18:13 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 5 11:18:13 2015 -0500

    CheckFortranCompilerFlag: Add test case
    
    Extend the FortranOnly test with a case covering this module.

diff --git a/Tests/FortranOnly/CMakeLists.txt b/Tests/FortranOnly/CMakeLists.txt
index 1b2651d..9bf0303 100644
--- a/Tests/FortranOnly/CMakeLists.txt
+++ b/Tests/FortranOnly/CMakeLists.txt
@@ -65,6 +65,13 @@ if(NOT CMAKE_Fortran_COMPILER_ID STREQUAL XL)
     message(SEND_ERROR "CHECK_Fortran_SOURCE_COMPILES for HAVE_PRINT failed:\n"
       "${err}")
   endif()
+
+  unset(Fortran_BOGUS_FLAG CACHE)
+  include(CheckFortranCompilerFlag)
+  CHECK_Fortran_COMPILER_FLAG(-_this_is_not_a_flag_ Fortran_BOGUS_FLAG)
+  if (Fortran_BOGUS_FLAG)
+    message (SEND_ERROR "CHECK_Fortran_COMPILER_FLAG() succeeded, but should have failed")
+  endif ()
 endif()
 
 # Test generation of preprocessed sources.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=393a45e2e1fa2f0d9657d4a686257d828cd918e4
commit 393a45e2e1fa2f0d9657d4a686257d828cd918e4
Author:     Nicolas Bock <nicolasbock at gmail.com>
AuthorDate: Mon Feb 2 17:07:04 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 5 11:16:59 2015 -0500

    CheckFortranCompilerFlag: Add module to check Fortran flag existence
    
    Copy the CheckCCompilerFlag module and replace 'C' with 'Fortran'.
    Also update the common patterns module to match some Fortran compiler
    messages.

diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index db56010..76058f9 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -22,6 +22,7 @@ All Modules
    /module/CheckCXXSourceCompiles
    /module/CheckCXXSourceRuns
    /module/CheckCXXSymbolExists
+   /module/CheckFortranCompilerFlag
    /module/CheckFortranFunctionExists
    /module/CheckFortranSourceCompiles
    /module/CheckFunctionExists
diff --git a/Help/module/CheckFortranCompilerFlag.rst b/Help/module/CheckFortranCompilerFlag.rst
new file mode 100644
index 0000000..58bf6ec
--- /dev/null
+++ b/Help/module/CheckFortranCompilerFlag.rst
@@ -0,0 +1 @@
+.. cmake-module:: ../../Modules/CheckFortranCompilerFlag.cmake
diff --git a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
index 19b2bbc..3141d60 100644
--- a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
+++ b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
@@ -21,9 +21,9 @@
 
 macro (CHECK_COMPILER_FLAG_COMMON_PATTERNS _VAR)
    set(${_VAR}
-     FAIL_REGEX "unrecognized .*option"                     # GNU
+     FAIL_REGEX "[Uu]nrecogni[sz]ed .*option"               # GNU, NAG
      FAIL_REGEX "unknown .*option"                          # Clang
-     FAIL_REGEX "ignoring unknown option"                   # MSVC
+     FAIL_REGEX "ignoring unknown option"                   # MSVC, Intel
      FAIL_REGEX "warning D9002"                             # MSVC, any lang
      FAIL_REGEX "option.*not supported"                     # Intel
      FAIL_REGEX "invalid argument .*option"                 # Intel
@@ -35,6 +35,7 @@ macro (CHECK_COMPILER_FLAG_COMMON_PATTERNS _VAR)
      FAIL_REGEX "command option .* contains an incorrect subargument" # XL
      FAIL_REGEX "not supported in this configuration. ignored"       # AIX
      FAIL_REGEX "File with unknown suffix passed to linker" # PGI
+     FAIL_REGEX "[Uu]nknown switch"                         # PGI
      FAIL_REGEX "WARNING: unknown flag:"                    # Open64
      FAIL_REGEX "Incorrect command line option:"            # Borland
      FAIL_REGEX "Warning: illegal option"                   # SunStudio 12
diff --git a/Modules/CheckFortranCompilerFlag.cmake b/Modules/CheckFortranCompilerFlag.cmake
new file mode 100644
index 0000000..53fd8d6
--- /dev/null
+++ b/Modules/CheckFortranCompilerFlag.cmake
@@ -0,0 +1,66 @@
+#.rst:
+# CheckFortranCompilerFlag
+# ------------------------
+#
+# Check whether the Fortran compiler supports a given flag.
+#
+# CHECK_Fortran_COMPILER_FLAG(<flag> <var>)
+#
+# ::
+#
+#   <flag> - the compiler flag
+#   <var>  - variable to store the result
+#            Will be created as an internal cache variable.
+#
+# This internally calls the check_fortran_source_compiles macro and
+# sets CMAKE_REQUIRED_DEFINITIONS to <flag>.  See help for
+# CheckFortranSourceCompiles for a listing of variables that can
+# otherwise modify the build.  The result only tells that the compiler
+# does not give an error message when it encounters the flag.  If the
+# flag has any effect or even a specific one is beyond the scope of
+# this module.
+
+#=============================================================================
+# Copyright 2015 Nicolas Bock <nicolasbock at gmail.com>
+# Copyright 2006-2011 Kitware, Inc.
+# Copyright 2006 Alexander Neundorf <neundorf at kde.org>
+# Copyright 2011 Matthias Kretz <kretz at kde.org>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+include(CheckFortranSourceCompiles)
+include(CMakeCheckCompilerFlagCommonPatterns)
+
+macro (CHECK_Fortran_COMPILER_FLAG _FLAG _RESULT)
+  set(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
+  set(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
+
+  # Normalize locale during test compilation.
+  set(_CheckFortranCompilerFlag_LOCALE_VARS LC_ALL LC_MESSAGES LANG)
+  foreach(v ${_CheckFortranCompilerFlag_LOCALE_VARS})
+    set(_CheckFortranCompilerFlag_SAVED_${v} "$ENV{${v}}")
+    set(ENV{${v}} C)
+  endforeach()
+  CHECK_COMPILER_FLAG_COMMON_PATTERNS(_CheckFortranCompilerFlag_COMMON_PATTERNS)
+  CHECK_Fortran_SOURCE_COMPILES("       program test\n       stop\n       end program" ${_RESULT}
+    # Some compilers do not fail with a bad flag
+    FAIL_REGEX "command line option .* is valid for .* but not for Fortran" # GNU
+    ${_CheckFortranCompilerFlag_COMMON_PATTERNS}
+    )
+  foreach(v ${_CheckFortranCompilerFlag_LOCALE_VARS})
+    set(ENV{${v}} ${_CheckFortranCompilerFlag_SAVED_${v}})
+    unset(_CheckFortranCompilerFlag_SAVED_${v})
+  endforeach()
+  unset(_CheckFortranCompilerFlag_LOCALE_VARS)
+  unset(_CheckFortranCompilerFlag_COMMON_PATTERNS)
+
+  set (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
+endmacro ()

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

Summary of changes:
 Help/manual/cmake-modules.7.rst                    |    1 +
 Help/module/CheckFortranCompilerFlag.rst           |    1 +
 Help/release/dev/add-CheckFortranCompilerFlag.rst  |    6 ++
 Modules/CMakeCheckCompilerFlagCommonPatterns.cmake |    5 +-
 Modules/CheckFortranCompilerFlag.cmake             |   66 ++++++++++++++++++++
 Tests/FortranOnly/CMakeLists.txt                   |    7 +++
 6 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 Help/module/CheckFortranCompilerFlag.rst
 create mode 100644 Help/release/dev/add-CheckFortranCompilerFlag.rst
 create mode 100644 Modules/CheckFortranCompilerFlag.cmake


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Feb  5 14:41:37 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu,  5 Feb 2015 14:41:37 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1034-g72bef67
Message-ID: <20150205194139.03CD925ED@public.kitware.com>

This is an automated email from 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  72bef67dd5494a872e34131f0cb194a9ede3edd9 (commit)
       via  25494fff607913d74d6d0b8b18b1a146c116d9a5 (commit)
       via  4af6da7c5346707d93a35e124c4d56bfb63906d4 (commit)
       via  aecbd1b4d41fccb3266d43484df6ad460d59a4af (commit)
       via  41c5bce7dbc60d427229a719ff3ae307d2b3d1e9 (commit)
       via  33d6cc7ef3c4df40ac33570e60f2d478001ee70a (commit)
       via  aae86094c63ddb5f312c23670d4e7a19ba84ad45 (commit)
      from  8918fa8bac9d8a9ce83f7f970a55c184da23d25e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72bef67dd5494a872e34131f0cb194a9ede3edd9
commit 72bef67dd5494a872e34131f0cb194a9ede3edd9
Merge: 8918fa8 25494ff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 5 14:41:30 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 14:41:30 2015 -0500

    Merge topic 'export-interface-source-files' into next
    
    25494fff Add release notes for export-interface-source-files.
    4af6da7c Allow export of targets with INTERFACE_SOURCES.
    aecbd1b4 Tests: Move build-property-paths test stderr files.
    41c5bce7 Tests: Run build-property-paths tests with a parameter.
    33d6cc7e Tests: Split part of include_directories test to a generic location.
    aae86094 RunCMake: Remove unneeded files.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25494fff607913d74d6d0b8b18b1a146c116d9a5
commit 25494fff607913d74d6d0b8b18b1a146c116d9a5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 5 20:40:51 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:40:51 2015 +0100

    Add release notes for export-interface-source-files.

diff --git a/Help/release/dev/export-interface-source-files.rst b/Help/release/dev/export-interface-source-files.rst
new file mode 100644
index 0000000..a26092a
--- /dev/null
+++ b/Help/release/dev/export-interface-source-files.rst
@@ -0,0 +1,6 @@
+export-interface-source-files
+-----------------------------
+
+* It is now possible to export targets which populate the
+  :prop_tgt:`TARGET_SOURCES` target property using the
+  :command:`install(EXPORT)` and :command:`export()` commands.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4af6da7c5346707d93a35e124c4d56bfb63906d4
commit 4af6da7c5346707d93a35e124c4d56bfb63906d4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 28 18:58:38 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:20:02 2015 +0100

    Allow export of targets with INTERFACE_SOURCES.
    
    Use the same rules for paths in source and binary dirs in
    installed INTERFACE_SOURCES as are used for
    INTERFACE_INCLUDE_DIRECTORIES.

diff --git a/Help/command/target_sources.rst b/Help/command/target_sources.rst
index 832240a..d6f148d 100644
--- a/Help/command/target_sources.rst
+++ b/Help/command/target_sources.rst
@@ -22,10 +22,6 @@ items will populate the :prop_tgt:`SOURCES` property of
 following arguments specify sources.  Repeated calls for the same
 ``<target>`` append items in the order called.
 
-Targets with :prop_tgt:`INTERFACE_SOURCES` may not be exported with the
-:command:`export` or :command:`install(EXPORT)` commands. This limitation may be
-lifted in a future version of CMake.
-
 Arguments to ``target_sources`` may use "generator expressions"
 with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)`
 manual for available expressions.  See the :manual:`cmake-buildsystem(7)`
diff --git a/Help/prop_tgt/INTERFACE_SOURCES.rst b/Help/prop_tgt/INTERFACE_SOURCES.rst
index 696ee95..a224b68 100644
--- a/Help/prop_tgt/INTERFACE_SOURCES.rst
+++ b/Help/prop_tgt/INTERFACE_SOURCES.rst
@@ -12,10 +12,6 @@ When target dependencies are specified using :command:`target_link_libraries`,
 CMake will read this property from all target dependencies to determine the
 sources of the consumer.
 
-Targets with ``INTERFACE_SOURCES`` may not be exported with the
-:command:`export` or :command:`install(EXPORT)` commands. This limitation may be
-lifted in a future version of CMake.
-
 Contents of ``INTERFACE_SOURCES`` may use "generator expressions"
 with the syntax ``$<...>``.  See the :manual:`cmake-generator-expressions(7)`
 manual for available expressions.  See the :manual:`cmake-buildsystem(7)`
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index a28ec48..b1203dd 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -68,16 +68,6 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
       tei != this->Exports.end(); ++tei)
     {
     cmTarget* te = *tei;
-    if (te->GetProperty("INTERFACE_SOURCES"))
-      {
-      std::ostringstream e;
-      e << "Target \""
-        << te->GetName()
-        << "\" has a populated INTERFACE_SOURCES property.  This is not "
-          "currently supported.";
-      cmSystemTools::Error(e.str().c_str());
-      return false;
-      }
     this->GenerateImportTargetCode(os, te);
 
     te->AppendBuildInterfaceIncludes();
@@ -87,6 +77,9 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
     this->PopulateInterfaceProperty("INTERFACE_INCLUDE_DIRECTORIES", te,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
+    this->PopulateInterfaceProperty("INTERFACE_SOURCES", te,
+                                    cmGeneratorExpression::BuildInterface,
+                                    properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS", te,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index af4ce8b..71728be 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -224,7 +224,7 @@ static bool isSubDirectory(const char* a, const char* b)
 
 //----------------------------------------------------------------------------
 static bool checkInterfaceDirs(const std::string &prepro,
-                      cmTarget *target)
+                      cmTarget *target, const std::string& prop)
 {
   const char* installDir =
             target->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
@@ -250,20 +250,27 @@ static bool checkInterfaceDirs(const std::string &prepro,
     std::ostringstream e;
     if (genexPos != std::string::npos)
       {
-      switch (target->GetPolicyStatusCMP0041())
+      if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
         {
-        case cmPolicies::WARN:
-          messageType = cmake::WARNING;
-          e << target->GetMakefile()->GetPolicies()
-                      ->GetPolicyWarning(cmPolicies::CMP0041) << "\n";
-          break;
-        case cmPolicies::OLD:
-          continue;
-        case cmPolicies::REQUIRED_IF_USED:
-        case cmPolicies::REQUIRED_ALWAYS:
-        case cmPolicies::NEW:
-          hadFatalError = true;
-          break; // Issue fatal message.
+        switch (target->GetPolicyStatusCMP0041())
+          {
+          case cmPolicies::WARN:
+            messageType = cmake::WARNING;
+            e << target->GetMakefile()->GetPolicies()
+                        ->GetPolicyWarning(cmPolicies::CMP0041) << "\n";
+            break;
+          case cmPolicies::OLD:
+            continue;
+          case cmPolicies::REQUIRED_IF_USED:
+          case cmPolicies::REQUIRED_ALWAYS:
+          case cmPolicies::NEW:
+            hadFatalError = true;
+            break; // Issue fatal message.
+          }
+        }
+      else
+        {
+        hadFatalError = true;
         }
       }
     if (cmHasLiteralPrefix(li->c_str(), "${_IMPORT_PREFIX}"))
@@ -272,8 +279,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       }
     if (!cmSystemTools::FileIsFullPath(li->c_str()))
       {
-      e << "Target \"" << target->GetName() << "\" "
-           "INTERFACE_INCLUDE_DIRECTORIES property contains relative path:\n"
+      e << "Target \"" << target->GetName() << "\" " << prop <<
+           " property contains relative path:\n"
            "  \"" << *li << "\"";
       target->GetMakefile()->IssueMessage(messageType, e.str());
       }
@@ -289,32 +296,35 @@ static bool checkInterfaceDirs(const std::string &prepro,
         (!inBinary || isSubDirectory(installDir, topBinaryDir)) &&
         (!inSource || isSubDirectory(installDir, topSourceDir));
 
-      if (!shouldContinue)
+      if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
         {
-        switch(target->GetPolicyStatusCMP0052())
+        if (!shouldContinue)
           {
-          case cmPolicies::WARN:
+          switch(target->GetPolicyStatusCMP0052())
             {
-            std::ostringstream s;
-            s << target->GetMakefile()->GetPolicies()
-                      ->GetPolicyWarning(cmPolicies::CMP0052) << "\n";
-            s << "Directory:\n    \"" << *li << "\"\nin "
-              "INTERFACE_INCLUDE_DIRECTORIES of target \""
-              << target->GetName() << "\" is a subdirectory of the install "
-              "directory:\n    \"" << installDir << "\"\nhowever it is also "
-              "a subdirectory of the " << (inBinary ? "build" : "source")
-              << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
-              << "\"" << std::endl;
-            target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
-                                                s.str());
+            case cmPolicies::WARN:
+              {
+              std::ostringstream s;
+              s << target->GetMakefile()->GetPolicies()
+                        ->GetPolicyWarning(cmPolicies::CMP0052) << "\n";
+              s << "Directory:\n    \"" << *li << "\"\nin "
+                "INTERFACE_INCLUDE_DIRECTORIES of target \""
+                << target->GetName() << "\" is a subdirectory of the install "
+                "directory:\n    \"" << installDir << "\"\nhowever it is also "
+                "a subdirectory of the " << (inBinary ? "build" : "source")
+                << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
+                << "\"" << std::endl;
+              target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
+                                                  s.str());
+              }
+            case cmPolicies::OLD:
+              shouldContinue = true;
+              break;
+            case cmPolicies::REQUIRED_ALWAYS:
+            case cmPolicies::REQUIRED_IF_USED:
+            case cmPolicies::NEW:
+              break;
             }
-          case cmPolicies::OLD:
-            shouldContinue = true;
-            break;
-          case cmPolicies::REQUIRED_ALWAYS:
-          case cmPolicies::REQUIRED_IF_USED:
-          case cmPolicies::NEW:
-            break;
           }
         }
       if (shouldContinue)
@@ -324,8 +334,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       }
     if (inBinary)
       {
-      e << "Target \"" << target->GetName() << "\" "
-           "INTERFACE_INCLUDE_DIRECTORIES property contains path:\n"
+      e << "Target \"" << target->GetName() << "\" " << prop <<
+           " property contains path:\n"
            "  \"" << *li << "\"\nwhich is prefixed in the build directory.";
       target->GetMakefile()->IssueMessage(messageType, e.str());
       }
@@ -333,8 +343,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       {
       if (inSource)
         {
-        e << "Target \"" << target->GetName() << "\" "
-            "INTERFACE_INCLUDE_DIRECTORIES property contains path:\n"
+        e << "Target \"" << target->GetName() << "\" " << prop <<
+            " property contains path:\n"
             "  \"" << *li << "\"\nwhich is prefixed in the source directory.";
         target->GetMakefile()->IssueMessage(messageType, e.str());
         }
@@ -365,6 +375,46 @@ static void prefixItems(std::string &exportDirs)
 }
 
 //----------------------------------------------------------------------------
+void cmExportFileGenerator::PopulateSourcesInterface(
+                      cmTargetExport *tei,
+                      cmGeneratorExpression::PreprocessContext preprocessRule,
+                      ImportPropertyMap &properties,
+                      std::vector<std::string> &missingTargets)
+{
+  cmTarget *target = tei->Target;
+  assert(preprocessRule == cmGeneratorExpression::InstallInterface);
+
+  const char *propName = "INTERFACE_SOURCES";
+  const char *input = target->GetProperty(propName);
+
+  if (!input)
+    {
+    return;
+    }
+
+  if (!*input)
+    {
+    properties[propName] = "";
+    return;
+    }
+
+  std::string prepro = cmGeneratorExpression::Preprocess(input,
+                                                         preprocessRule,
+                                                         true);
+  if (!prepro.empty())
+    {
+    this->ResolveTargetsInGeneratorExpressions(prepro, target,
+                                                missingTargets);
+
+    if (!checkInterfaceDirs(prepro, target, propName))
+      {
+      return;
+      }
+    properties[propName] = prepro;
+    }
+}
+
+//----------------------------------------------------------------------------
 void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                       cmTargetExport *tei,
                       cmGeneratorExpression::PreprocessContext preprocessRule,
@@ -424,7 +474,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target))
+    if (!checkInterfaceDirs(prepro, target, propName))
       {
       return;
       }
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index 919924e..b6f4166 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -139,6 +139,11 @@ protected:
                       cmGeneratorExpression::PreprocessContext preprocessRule,
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets);
+  void PopulateSourcesInterface(
+                      cmTargetExport *target,
+                      cmGeneratorExpression::PreprocessContext preprocessRule,
+                      ImportPropertyMap &properties,
+                      std::vector<std::string> &missingTargets);
 
   void SetImportLinkInterface(const std::string& config,
                     std::string const& suffix,
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 98ed818..a0d9013 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -123,6 +123,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
 
   bool require2_8_12 = false;
   bool require3_0_0 = false;
+  bool require3_1_0 = false;
   bool requiresConfigFiles = false;
   // Create all the imported targets.
   for(std::vector<cmTargetExport*>::const_iterator
@@ -131,17 +132,6 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     {
     cmTarget* te = (*tei)->Target;
 
-    if (te->GetProperty("INTERFACE_SOURCES"))
-      {
-      std::ostringstream e;
-      e << "Target \""
-        << te->GetName()
-        << "\" has a populated INTERFACE_SOURCES property.  This is not "
-          "currently supported.";
-      cmSystemTools::Error(e.str().c_str());
-      return false;
-      }
-
     requiresConfigFiles = requiresConfigFiles
                               || te->GetType() != cmTarget::INTERFACE_LIBRARY;
 
@@ -152,6 +142,9 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     this->PopulateIncludeDirectoriesInterface(*tei,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
+    this->PopulateSourcesInterface(*tei,
+                                  cmGeneratorExpression::InstallInterface,
+                                  properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_SYSTEM_INCLUDE_DIRECTORIES",
                                   te,
                                   cmGeneratorExpression::InstallInterface,
@@ -190,6 +183,13 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
       {
       require3_0_0 = true;
       }
+    if(te->GetProperty("INTERFACE_SOURCES"))
+      {
+      // We can only generate INTERFACE_SOURCES in CMake 3.3, but CMake 3.1
+      // can consume them.
+      require3_1_0 = true;
+      }
+
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
                                   te, properties);
     this->PopulateCompatibleInterfaceProperties(te, properties);
@@ -197,7 +197,11 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     this->GenerateInterfaceProperties(te, os, properties);
     }
 
-  if (require3_0_0)
+  if (require3_1_0)
+    {
+    this->GenerateRequiredCMakeVersion(os, "3.1.0");
+    }
+  else if (require3_0_0)
     {
     this->GenerateRequiredCMakeVersion(os, "3.0.0");
     }
diff --git a/Tests/ExportImport/Export/Interface/CMakeLists.txt b/Tests/ExportImport/Export/Interface/CMakeLists.txt
index 523fc29..00a5375 100644
--- a/Tests/ExportImport/Export/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Export/Interface/CMakeLists.txt
@@ -29,7 +29,17 @@ target_compile_features(use_auto_type INTERFACE cxx_auto_type)
 add_library(use_c_restrict INTERFACE)
 target_compile_features(use_c_restrict INTERFACE c_restrict)
 
-install(TARGETS headeronly sharediface use_auto_type use_c_restrict
+add_library(source_target INTERFACE)
+target_sources(source_target INTERFACE
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/source_target.cpp>
+  $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/src/source_target_for_install.cpp>
+)
+install(FILES
+  source_target_for_install.cpp
+  DESTINATION src
+)
+
+install(TARGETS headeronly sharediface use_auto_type use_c_restrict source_target
   EXPORT expInterface
 )
 install(TARGETS sharedlib
diff --git a/Tests/ExportImport/Export/Interface/source_target.cpp b/Tests/ExportImport/Export/Interface/source_target.cpp
new file mode 100644
index 0000000..037191c
--- /dev/null
+++ b/Tests/ExportImport/Export/Interface/source_target.cpp
@@ -0,0 +1,13 @@
+
+#ifndef USE_FROM_BUILD_DIR
+#error Expected define USE_FROM_BUILD_DIR
+#endif
+
+#ifdef USE_FROM_INSTALL_DIR
+#error Unexpected define USE_FROM_INSTALL_DIR
+#endif
+
+int source_symbol()
+{
+  return 42;
+}
diff --git a/Tests/ExportImport/Export/Interface/source_target_for_install.cpp b/Tests/ExportImport/Export/Interface/source_target_for_install.cpp
new file mode 100644
index 0000000..64514ed
--- /dev/null
+++ b/Tests/ExportImport/Export/Interface/source_target_for_install.cpp
@@ -0,0 +1,13 @@
+
+#ifdef USE_FROM_BUILD_DIR
+#error Unexpected define USE_FROM_BUILD_DIR
+#endif
+
+#ifndef USE_FROM_INSTALL_DIR
+#error Expected define USE_FROM_INSTALL_DIR
+#endif
+
+int source_symbol()
+{
+  return 42;
+}
diff --git a/Tests/ExportImport/Import/Interface/CMakeLists.txt b/Tests/ExportImport/Import/Interface/CMakeLists.txt
index 4028405..51d518e 100644
--- a/Tests/ExportImport/Import/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Import/Interface/CMakeLists.txt
@@ -82,6 +82,14 @@ endmacro()
 
 do_try_compile(bld)
 
+add_executable(source_target_test_bld source_target_test.cpp)
+target_link_libraries(source_target_test_bld bld::source_target)
+target_compile_definitions(source_target_test_bld PRIVATE USE_FROM_BUILD_DIR)
+
+add_executable(source_target_test_exp source_target_test.cpp)
+target_link_libraries(source_target_test_exp exp::source_target)
+target_compile_definitions(source_target_test_exp PRIVATE USE_FROM_INSTALL_DIR)
+
 add_executable(headeronlytest_exp headeronlytest.cpp)
 target_link_libraries(headeronlytest_exp exp::headeronly)
 
diff --git a/Tests/ExportImport/Import/Interface/source_target_test.cpp b/Tests/ExportImport/Import/Interface/source_target_test.cpp
new file mode 100644
index 0000000..0e8ec5f
--- /dev/null
+++ b/Tests/ExportImport/Import/Interface/source_target_test.cpp
@@ -0,0 +1,7 @@
+
+extern int source_symbol();
+
+int main()
+{
+  return source_symbol() - 42;
+}
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 7a09a2c..c7bef67 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -193,6 +193,9 @@ add_RunCMake_test(ExternalProject)
 set(build-property-paths_INCLUDE_DIRECTORIES_ARGS -DTEST_PROP=INCLUDE_DIRECTORIES)
 add_RunCMake_test(build-property-paths_INCLUDE_DIRECTORIES TEST_DIR build-property-paths)
 
+set(build-property-paths_SOURCES_ARGS -DTEST_PROP=SOURCES)
+add_RunCMake_test(build-property-paths_SOURCES TEST_DIR build-property-paths)
+
 if(RPMBUILD)
   add_RunCMake_test(CPackRPM)
 endif()
diff --git a/Tests/RunCMake/TargetSources/ExportBuild-result.txt b/Tests/RunCMake/TargetSources/ExportBuild-result.txt
index d00491f..573541a 100644
--- a/Tests/RunCMake/TargetSources/ExportBuild-result.txt
+++ b/Tests/RunCMake/TargetSources/ExportBuild-result.txt
@@ -1 +1 @@
-1
+0
diff --git a/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt b/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
deleted file mode 100644
index 0d65a55..0000000
--- a/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-CMake Error: Target "iface" has a populated INTERFACE_SOURCES property.  This is not currently supported.
diff --git a/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt b/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
deleted file mode 100644
index 0d65a55..0000000
--- a/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-CMake Error: Target "iface" has a populated INTERFACE_SOURCES property.  This is not currently supported.
diff --git a/Tests/RunCMake/TargetSources/ExportInstall.cmake b/Tests/RunCMake/TargetSources/ExportInstall.cmake
deleted file mode 100644
index 8e7c9f9..0000000
--- a/Tests/RunCMake/TargetSources/ExportInstall.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-
-add_library(iface INTERFACE)
-target_sources(iface INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/empty_1.cpp")
-
-install(TARGETS iface EXPORT exp)
-install(EXPORT exp DESTINATION cmake)
diff --git a/Tests/RunCMake/TargetSources/RunCMakeTest.cmake b/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
index 1b4ef0b..4416ef9 100644
--- a/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
+++ b/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
@@ -10,4 +10,3 @@ endif()
 run_cmake(CMP0026-LOCATION)
 run_cmake(RelativePathInInterface)
 run_cmake(ExportBuild)
-run_cmake(ExportInstall)
diff --git a/Tests/RunCMake/CMP0004/CMP0004-NEW-result.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-result.txt
similarity index 100%
rename from Tests/RunCMake/CMP0004/CMP0004-NEW-result.txt
rename to Tests/RunCMake/build-property-paths/BinInInstallPrefix-result.txt
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-stderr_SOURCES.txt
new file mode 100644
index 0000000..fa39ff8
--- /dev/null
+++ b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/build-property-paths_SOURCES/prefix/BinInInstallPrefix-build/empty.cpp"
+
+  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_SOURCES.txt
new file mode 100644
index 0000000..bed2424
--- /dev/null
+++ b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/build-property-paths_SOURCES/BinaryDirectoryInInterface-build/empty.cpp"
+
+  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake
index 67ee7de..7001f3f 100644
--- a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake
+++ b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake
@@ -2,7 +2,11 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/foo")
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/foo")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/empty.cpp")
+endif()
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake b/Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake
index fab7717..f5f3005 100644
--- a/Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake
+++ b/Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake
@@ -1,6 +1,11 @@
 enable_language(CXX)
 add_library(testTarget empty.cpp)
-target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/dir")
+
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/dir")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_INSTALL_PREFIX}/empty.cpp")
+endif()
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_SOURCES.txt
new file mode 100644
index 0000000..02a8198
--- /dev/null
+++ b/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/build-property-paths_SOURCES/InstallInBinDir-build/empty.cpp"
+
+  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_SOURCES.txt
new file mode 100644
index 0000000..aece1ab
--- /dev/null
+++ b/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/build-property-paths_SOURCES/copy/empty.cpp"
+
+  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_SOURCES.txt
new file mode 100644
index 0000000..2311af9
--- /dev/null
+++ b/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_SOURCES.txt
@@ -0,0 +1,4 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" contains relative path in its INTERFACE_SOURCES:
+
+    "empty.cpp"
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake b/Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake
index 070a381..489c3a1 100644
--- a/Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake
+++ b/Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake
@@ -2,7 +2,12 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<1:foo>")
+
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<1:foo>")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "$<1:empty.cpp>")
+endif()
 
 add_library(userTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
 target_link_libraries(userTarget testTarget)
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_SOURCES.txt
new file mode 100644
index 0000000..f0f002c
--- /dev/null
+++ b/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_SOURCES.txt
@@ -0,0 +1,4 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains relative path:
+
+    "empty.cpp"
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake b/Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake
index 4c4727d..e974aac 100644
--- a/Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake
+++ b/Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake
@@ -2,8 +2,11 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "foo")
-
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "foo")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "empty.cpp")
+endif()
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
 )
diff --git a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_SOURCES.txt
new file mode 100644
index 0000000..187ccdf
--- /dev/null
+++ b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/build-property-paths/empty.cpp"
+
+  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake
index f814a3c..d80cbec 100644
--- a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake
+++ b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake
@@ -2,7 +2,11 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/foo")
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/foo")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
+endif()
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/TargetSources/ExportInstall-result.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-result.txt
similarity index 100%
rename from Tests/RunCMake/TargetSources/ExportInstall-result.txt
rename to Tests/RunCMake/build-property-paths/SrcInInstallPrefix-result.txt
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-stderr_SOURCES.txt
new file mode 100644
index 0000000..6a123f7
--- /dev/null
+++ b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/build-property-paths_SOURCES/prefix/src/empty.cpp"
+
+  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/export-NOWARN.cmake b/Tests/RunCMake/build-property-paths/export-NOWARN.cmake
index 50720a0..592572c 100644
--- a/Tests/RunCMake/build-property-paths/export-NOWARN.cmake
+++ b/Tests/RunCMake/build-property-paths/export-NOWARN.cmake
@@ -1,19 +1,34 @@
 enable_language(CXX)
 add_library(foo empty.cpp)
+
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<0:>/include/subdir)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_PREFIX>/include/subdir)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<0:>/include/subdir/empty.cpp)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_PREFIX>/include/subdir/empty.cpp)
 
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/subdir>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include/subdir>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include/$<0:>>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:$<0:>/include>)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/subdir/empty.cpp>)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:include/subdir/empty.cpp>)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:include/subdir/empty.cpp$<0:>>)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:$<0:>/include/subdir/empty.cpp>)
 
 # target_include_directories(foo INTERFACE include/subdir) # Does and should warn. INSTALL_INTERFACE must not list src dir paths.
 target_include_directories(foo INTERFACE $<0:>/include/subdir) # Does not and should not should warn, because it starts with a genex.
 target_include_directories(foo INTERFACE $<INSTALL_PREFIX>/include/subdir)
+target_sources(foo INTERFACE $<0:>/include/subdir/empty.cpp)
+target_sources(foo INTERFACE $<INSTALL_PREFIX>/include/subdir/empty.cpp)
 
 target_include_directories(foo INTERFACE $<INSTALL_INTERFACE:include/subdir>)
 target_include_directories(foo INTERFACE $<INSTALL_INTERFACE:include/$<0:>>)
+target_sources(foo INTERFACE $<INSTALL_INTERFACE:include/subdir/empty.cpp>)
+target_sources(foo INTERFACE $<INSTALL_INTERFACE:include/subdir/empty.cpp$<0:>>)
+
+install(FILES include/subdir/empty.cpp
+  DESTINATION include/subdir
+)
 
 install(TARGETS foo EXPORT FooTargets DESTINATION lib)
 install(EXPORT FooTargets DESTINATION lib/cmake)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aecbd1b4d41fccb3266d43484df6ad460d59a4af
commit aecbd1b4d41fccb3266d43484df6ad460d59a4af
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 30 13:54:18 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:19:48 2015 +0100

    Tests: Move build-property-paths test stderr files.
    
    Rename the files with a property-specific name, so that additional
    properties can be easily tested.
    
    Extend the RunCMake infrastructure to allow specifying a non-uniform
    stderr file location.

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 33b745d..6389ef4 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -18,7 +18,10 @@ function(run_cmake test)
     set(expect_result 0)
   endif()
   foreach(o out err)
-    if(EXISTS ${top_src}/${test}-std${o}.txt)
+    if(RunCMake-std${o}-file AND EXISTS ${top_src}/${RunCMake-std${o}-file})
+      file(READ ${top_src}/${RunCMake-std${o}-file} expect_std${o})
+      string(REGEX REPLACE "\n+$" "" expect_std${o} "${expect_std${o}}")
+    elseif(EXISTS ${top_src}/${test}-std${o}.txt)
       file(READ ${top_src}/${test}-std${o}.txt expect_std${o})
       string(REGEX REPLACE "\n+$" "" expect_std${o} "${expect_std${o}}")
     else()
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
rename to Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
rename to Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr.txt b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr.txt
rename to Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr.txt b/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/InstallInBinDir-stderr.txt
rename to Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr.txt b/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr.txt
rename to Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr.txt b/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr.txt
rename to Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr.txt b/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr.txt
rename to Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake b/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
index eefdbf7..54d0cd8 100644
--- a/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
+++ b/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
@@ -2,6 +2,7 @@ include(RunCMake)
 
 macro(run_cmake test)
   list(APPEND RunCMake_TEST_OPTIONS -DTEST_PROP=${TEST_PROP})
+  set(RunCMake-stderr-file ${test}-stderr_${TEST_PROP}.txt)
   _run_cmake(${test})
 endmacro()
 
diff --git a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr.txt b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr.txt
rename to Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
rename to Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
rename to Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41c5bce7dbc60d427229a719ff3ae307d2b3d1e9
commit 41c5bce7dbc60d427229a719ff3ae307d2b3d1e9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 30 13:42:00 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:19:48 2015 +0100

    Tests: Run build-property-paths tests with a parameter.
    
    Run the tests for the INCLUDE_DIRECTORIES INTERFACE property
    in a specific build location, and update the stderr expectation
    to match the new output.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 88f4ab2..7a09a2c 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -1,17 +1,29 @@
 # See adjacent README.rst for documentation of this test infrastructure.
 
 macro(add_RunCMake_test test)
+  set(TEST_ARGS ${ARGN})
+  if ("${ARGV1}" STREQUAL "TEST_DIR")
+    message("HERE ${ARGV1}")
+    if ("${ARGV2}" STREQUAL "")
+      message(FATAL_ERROR "Invalid args")
+    endif()
+    set(Test_Dir ${ARGV2})
+    list(REMOVE_AT TEST_ARGS 0)
+    list(REMOVE_AT TEST_ARGS 0)
+  else()
+    set(Test_Dir ${test})
+  endif()
   add_test(NAME RunCMake.${test} COMMAND ${CMAKE_CMAKE_COMMAND}
     -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR}
     -DRunCMake_GENERATOR=${CMAKE_GENERATOR}
     -DRunCMake_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
     -DRunCMake_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET}
     -DRunCMake_MAKE_PROGRAM=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}
-    -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${test}
+    -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}
     -DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test}
     ${${test}_ARGS}
-    ${ARGN}
-    -P "${CMAKE_CURRENT_SOURCE_DIR}/${test}/RunCMakeTest.cmake"
+    ${TEST_ARGS}
+    -P "${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}/RunCMakeTest.cmake"
     )
 endmacro()
 
@@ -177,7 +189,9 @@ add_RunCMake_test(CommandLine)
 add_RunCMake_test(install)
 add_RunCMake_test(CPackInstallProperties)
 add_RunCMake_test(ExternalProject)
-add_RunCMake_test(build-property-paths)
+
+set(build-property-paths_INCLUDE_DIRECTORIES_ARGS -DTEST_PROP=INCLUDE_DIRECTORIES)
+add_RunCMake_test(build-property-paths_INCLUDE_DIRECTORIES TEST_DIR build-property-paths)
 
 if(RPMBUILD)
   add_RunCMake_test(CPackRPM)
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
index e8c47b1..8db7283 100644
--- a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/build-property-paths/prefix/BinInInstallPrefix-CMP0052-NEW-build/foo"
+    ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-NEW-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
index c0c4806..6473efe 100644
--- a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
@@ -6,15 +6,15 @@ CMake Warning \(dev\) in CMakeLists.txt:
 
   Directory:
 
-      ".*Tests/RunCMake/build-property-paths/prefix/BinInInstallPrefix-CMP0052-WARN-build/foo"
+      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-WARN-build/foo"
 
   in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory
   of the install directory:
 
-      ".*Tests/RunCMake/build-property-paths/prefix"
+      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix"
 
   however it is also a subdirectory of the build tree:
 
-      ".*Tests/RunCMake/build-property-paths/prefix/BinInInstallPrefix-CMP0052-WARN-build"
+      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-WARN-build"
 
 This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr.txt b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr.txt
index 332c237..94c46ab 100644
--- a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*RunCMake/build-property-paths/BinaryDirectoryInInterface-build/foo"
+    ".*RunCMake/build-property-paths_INCLUDE_DIRECTORIES/BinaryDirectoryInInterface-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr.txt b/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr.txt
index 504e332..83ae34c 100644
--- a/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/build-property-paths/InstallInBinDir-build/foo"
+    ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/InstallInBinDir-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr.txt b/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr.txt
index 5f0a3ea..a7a5af4 100644
--- a/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/build-property-paths/copy/foo"
+    ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/copy/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake b/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
index 2add175..eefdbf7 100644
--- a/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
+++ b/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
@@ -1,5 +1,10 @@
 include(RunCMake)
 
+macro(run_cmake test)
+  list(APPEND RunCMake_TEST_OPTIONS -DTEST_PROP=${TEST_PROP})
+  _run_cmake(${test})
+endmacro()
+
 run_cmake(RelativePathInInterface)
 run_cmake(RelativePathInGenex)
 run_cmake(export-NOWARN)
@@ -57,12 +62,15 @@ configure_file(
   COPYONLY
 )
 
-foreach(policyStatus "" NEW OLD)
-  if (NOT "${policyStatus}" STREQUAL "")
-    set(policyOption -DCMAKE_POLICY_DEFAULT_CMP0052=${policyStatus})
-  else()
-    unset(policyOption)
-    set(policyStatus WARN)
+foreach(policyStatus NEW OLD "")
+  if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+    if (NOT "${policyStatus}" STREQUAL "")
+      set(policyOption -DCMAKE_POLICY_DEFAULT_CMP0052=${policyStatus})
+    else()
+      unset(policyOption)
+      set(policyStatus WARN)
+    endif()
+    set(policySuffix -CMP0052-${policyStatus})
   endif()
   set(RunCMake_TEST_OPTIONS
     "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
@@ -73,16 +81,20 @@ foreach(policyStatus "" NEW OLD)
   # a subdirectory or the source directory, which is allowed and tested separately
   # below.
   set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/prefix/src")
-  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/prefix/BinInInstallPrefix-CMP0052-${policyStatus}-build")
-  run_cmake(BinInInstallPrefix-CMP0052-${policyStatus})
+  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/prefix/BinInInstallPrefix${policySuffix}-build")
+  run_cmake(BinInInstallPrefix${policySuffix})
   unset(RunCMake_TEST_BINARY_DIR)
 
   set(RunCMake_TEST_OPTIONS
     "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
     "-DTEST_FILE=${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake"
     )
-  run_cmake(SrcInInstallPrefix-CMP0052-${policyStatus})
+  run_cmake(SrcInInstallPrefix${policySuffix})
   unset(RunCMake_TEST_SOURCE_DIR)
+
+  if (NOT TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+    break()
+  endif()
 endforeach()
 
 set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallPrefixInInterface-build/prefix")
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
index 4838a53..2af50d5 100644
--- a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/build-property-paths/prefix/src/foo"
+    ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/src/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
index 8b2d69d..56aaa2c 100644
--- a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
@@ -6,15 +6,15 @@ CMake Warning \(dev\) in CMakeLists.txt:
 
   Directory:
 
-      ".*Tests/RunCMake/build-property-paths/prefix/src/foo"
+      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/src/foo"
 
   in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory
   of the install directory:
 
-      ".*Tests/RunCMake/build-property-paths/prefix"
+      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix"
 
   however it is also a subdirectory of the source tree:
 
-      ".*Tests/RunCMake/build-property-paths/prefix/src"
+      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/src"
 
 This warning is for project developers.  Use -Wno-dev to suppress it.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33d6cc7ef3c4df40ac33570e60f2d478001ee70a
commit 33d6cc7ef3c4df40ac33570e60f2d478001ee70a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 30 13:20:32 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:19:23 2015 +0100

    Tests: Split part of include_directories test to a generic location.
    
    The moved tests are related to paths in INTERFACE_INCLUDE_DIRECTORIES
    in general, and when exporting, and covering cases of the install
    location being within the build or source prefix etc.  Other build
    properties containing paths should have similar tests, so this
    allows some parameterization while keeping the preparation of the
    various directory structures.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 801655f..88f4ab2 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -177,6 +177,7 @@ add_RunCMake_test(CommandLine)
 add_RunCMake_test(install)
 add_RunCMake_test(CPackInstallProperties)
 add_RunCMake_test(ExternalProject)
+add_RunCMake_test(build-property-paths)
 
 if(RPMBUILD)
   add_RunCMake_test(CPackRPM)
diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-result.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-result.txt
rename to Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-result.txt
diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
similarity index 62%
rename from Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt
rename to Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
index f0adc9f..e8c47b1 100644
--- a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/include_directories/prefix/BinInInstallPrefix-CMP0052-NEW-build/foo"
+    ".*Tests/RunCMake/build-property-paths/prefix/BinInInstallPrefix-CMP0052-NEW-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-result.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-OLD-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-result.txt
rename to Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-OLD-result.txt
diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-result.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-result.txt
rename to Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-result.txt
diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
similarity index 68%
rename from Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt
rename to Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
index 054bff5..c0c4806 100644
--- a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
@@ -6,15 +6,15 @@ CMake Warning \(dev\) in CMakeLists.txt:
 
   Directory:
 
-      ".*Tests/RunCMake/include_directories/prefix/BinInInstallPrefix-CMP0052-WARN-build/foo"
+      ".*Tests/RunCMake/build-property-paths/prefix/BinInInstallPrefix-CMP0052-WARN-build/foo"
 
   in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory
   of the install directory:
 
-      ".*Tests/RunCMake/include_directories/prefix"
+      ".*Tests/RunCMake/build-property-paths/prefix"
 
   however it is also a subdirectory of the build tree:
 
-      ".*Tests/RunCMake/include_directories/prefix/BinInInstallPrefix-CMP0052-WARN-build"
+      ".*Tests/RunCMake/build-property-paths/prefix/BinInInstallPrefix-CMP0052-WARN-build"
 
 This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-result.txt b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/BinaryDirectoryInInterface-result.txt
rename to Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-result.txt
diff --git a/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-stderr.txt b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr.txt
similarity index 67%
rename from Tests/RunCMake/include_directories/BinaryDirectoryInInterface-stderr.txt
rename to Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr.txt
index 0d4379e..332c237 100644
--- a/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*RunCMake/include_directories/BinaryDirectoryInInterface-build/foo"
+    ".*RunCMake/build-property-paths/BinaryDirectoryInInterface-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake
similarity index 100%
rename from Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake
rename to Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake
diff --git a/Tests/RunCMake/build-property-paths/CMakeLists.txt b/Tests/RunCMake/build-property-paths/CMakeLists.txt
new file mode 100644
index 0000000..5cd4825
--- /dev/null
+++ b/Tests/RunCMake/build-property-paths/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.0)
+project(${RunCMake_TEST} NONE)
+if(NOT TEST_FILE)
+  set(TEST_FILE ${RunCMake_TEST}.cmake)
+endif()
+include(${TEST_FILE})
diff --git a/Tests/RunCMake/include_directories/DirInInstallPrefix-result.txt b/Tests/RunCMake/build-property-paths/DirInInstallPrefix-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/DirInInstallPrefix-result.txt
rename to Tests/RunCMake/build-property-paths/DirInInstallPrefix-result.txt
diff --git a/Tests/RunCMake/include_directories/DirInInstallPrefix.cmake b/Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake
similarity index 100%
rename from Tests/RunCMake/include_directories/DirInInstallPrefix.cmake
rename to Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake
diff --git a/Tests/RunCMake/include_directories/InstallInBinDir-result.txt b/Tests/RunCMake/build-property-paths/InstallInBinDir-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/InstallInBinDir-result.txt
rename to Tests/RunCMake/build-property-paths/InstallInBinDir-result.txt
diff --git a/Tests/RunCMake/include_directories/InstallInBinDir-stderr.txt b/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr.txt
similarity index 68%
rename from Tests/RunCMake/include_directories/InstallInBinDir-stderr.txt
rename to Tests/RunCMake/build-property-paths/InstallInBinDir-stderr.txt
index 254fae1..504e332 100644
--- a/Tests/RunCMake/include_directories/InstallInBinDir-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/include_directories/InstallInBinDir-build/foo"
+    ".*Tests/RunCMake/build-property-paths/InstallInBinDir-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/include_directories/InstallInSrcDir-result.txt b/Tests/RunCMake/build-property-paths/InstallInSrcDir-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/InstallInSrcDir-result.txt
rename to Tests/RunCMake/build-property-paths/InstallInSrcDir-result.txt
diff --git a/Tests/RunCMake/include_directories/InstallInSrcDir-stderr.txt b/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr.txt
similarity index 74%
rename from Tests/RunCMake/include_directories/InstallInSrcDir-stderr.txt
rename to Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr.txt
index 7be3044..5f0a3ea 100644
--- a/Tests/RunCMake/include_directories/InstallInSrcDir-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/include_directories/copy/foo"
+    ".*Tests/RunCMake/build-property-paths/copy/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/include_directories/InstallPrefixInInterface-result.txt b/Tests/RunCMake/build-property-paths/InstallPrefixInInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/InstallPrefixInInterface-result.txt
rename to Tests/RunCMake/build-property-paths/InstallPrefixInInterface-result.txt
diff --git a/Tests/RunCMake/include_directories/InstallPrefixInInterface.cmake b/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
similarity index 100%
rename from Tests/RunCMake/include_directories/InstallPrefixInInterface.cmake
rename to Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-result.txt b/Tests/RunCMake/build-property-paths/InstallToPrefixInSrcDirInSource-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-result.txt
rename to Tests/RunCMake/build-property-paths/InstallToPrefixInSrcDirInSource-result.txt
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-result.txt b/Tests/RunCMake/build-property-paths/InstallToPrefixInSrcDirOutOfSource-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-result.txt
rename to Tests/RunCMake/build-property-paths/InstallToPrefixInSrcDirOutOfSource-result.txt
diff --git a/Tests/RunCMake/include_directories/RelativePathInGenex-result.txt b/Tests/RunCMake/build-property-paths/RelativePathInGenex-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/RelativePathInGenex-result.txt
rename to Tests/RunCMake/build-property-paths/RelativePathInGenex-result.txt
diff --git a/Tests/RunCMake/include_directories/RelativePathInGenex-stderr.txt b/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/RelativePathInGenex-stderr.txt
rename to Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr.txt
diff --git a/Tests/RunCMake/include_directories/RelativePathInGenex.cmake b/Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake
similarity index 100%
rename from Tests/RunCMake/include_directories/RelativePathInGenex.cmake
rename to Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake
diff --git a/Tests/RunCMake/include_directories/RelativePathInInterface-result.txt b/Tests/RunCMake/build-property-paths/RelativePathInInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/RelativePathInInterface-result.txt
rename to Tests/RunCMake/build-property-paths/RelativePathInInterface-result.txt
diff --git a/Tests/RunCMake/include_directories/RelativePathInInterface-stderr.txt b/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/RelativePathInInterface-stderr.txt
rename to Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr.txt
diff --git a/Tests/RunCMake/include_directories/RelativePathInInterface.cmake b/Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake
similarity index 100%
rename from Tests/RunCMake/include_directories/RelativePathInInterface.cmake
rename to Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake
diff --git a/Tests/RunCMake/include_directories/RunCMakeTest.cmake b/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
similarity index 96%
copy from Tests/RunCMake/include_directories/RunCMakeTest.cmake
copy to Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
index fa76f24..2add175 100644
--- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake
+++ b/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
@@ -1,17 +1,10 @@
 include(RunCMake)
 
-run_cmake(NotFoundContent)
-run_cmake(DebugIncludes)
-run_cmake(TID-bad-target)
-run_cmake(SourceDirectoryInInterface)
-run_cmake(BinaryDirectoryInInterface)
 run_cmake(RelativePathInInterface)
-run_cmake(ImportedTarget)
 run_cmake(RelativePathInGenex)
-run_cmake(CMP0021)
-run_cmake(install_config)
-run_cmake(incomplete-genex)
 run_cmake(export-NOWARN)
+run_cmake(SourceDirectoryInInterface)
+run_cmake(BinaryDirectoryInInterface)
 
 set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/DirInInstallPrefix/prefix")
 run_cmake(DirInInstallPrefix)
@@ -118,7 +111,6 @@ set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/installToSrc")
 run_cmake(InstallToPrefixInSrcDirOutOfSource)
 unset(RunCMake_TEST_SOURCE_DIR)
 
-
 file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}/installToSrcInSrc")
 set(RunCMake_TEST_NO_CLEAN ON)
 
diff --git a/Tests/RunCMake/include_directories/SourceDirectoryInInterface-result.txt b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/SourceDirectoryInInterface-result.txt
rename to Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-result.txt
diff --git a/Tests/RunCMake/include_directories/SourceDirectoryInInterface-stderr.txt b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr.txt
similarity index 78%
rename from Tests/RunCMake/include_directories/SourceDirectoryInInterface-stderr.txt
rename to Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr.txt
index 9346b99..f42a2c2 100644
--- a/Tests/RunCMake/include_directories/SourceDirectoryInInterface-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*RunCMake/include_directories/foo"
+    ".*RunCMake/build-property-paths/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake
similarity index 100%
rename from Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake
rename to Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake
diff --git a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-result.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-result.txt
rename to Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-result.txt
diff --git a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
similarity index 72%
rename from Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
rename to Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
index afa43e0..4838a53 100644
--- a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/include_directories/prefix/src/foo"
+    ".*Tests/RunCMake/build-property-paths/prefix/src/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-result.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-OLD-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-result.txt
rename to Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-OLD-result.txt
diff --git a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-result.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-result.txt
rename to Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-result.txt
diff --git a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
similarity index 75%
rename from Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
rename to Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
index 0b13fd8..8b2d69d 100644
--- a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
@@ -6,15 +6,15 @@ CMake Warning \(dev\) in CMakeLists.txt:
 
   Directory:
 
-      ".*Tests/RunCMake/include_directories/prefix/src/foo"
+      ".*Tests/RunCMake/build-property-paths/prefix/src/foo"
 
   in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory
   of the install directory:
 
-      ".*Tests/RunCMake/include_directories/prefix"
+      ".*Tests/RunCMake/build-property-paths/prefix"
 
   however it is also a subdirectory of the source tree:
 
-      ".*Tests/RunCMake/include_directories/prefix/src"
+      ".*Tests/RunCMake/build-property-paths/prefix/src"
 
 This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/build-property-paths/empty.cpp b/Tests/RunCMake/build-property-paths/empty.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/include_directories/export-NOWARN-result.txt b/Tests/RunCMake/build-property-paths/export-NOWARN-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/export-NOWARN-result.txt
rename to Tests/RunCMake/build-property-paths/export-NOWARN-result.txt
diff --git a/Tests/RunCMake/include_directories/export-NOWARN.cmake b/Tests/RunCMake/build-property-paths/export-NOWARN.cmake
similarity index 100%
rename from Tests/RunCMake/include_directories/export-NOWARN.cmake
rename to Tests/RunCMake/build-property-paths/export-NOWARN.cmake
diff --git a/Tests/RunCMake/include_directories/RunCMakeTest.cmake b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
index fa76f24..3f624f8 100644
--- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake
+++ b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
@@ -3,148 +3,7 @@ include(RunCMake)
 run_cmake(NotFoundContent)
 run_cmake(DebugIncludes)
 run_cmake(TID-bad-target)
-run_cmake(SourceDirectoryInInterface)
-run_cmake(BinaryDirectoryInInterface)
-run_cmake(RelativePathInInterface)
 run_cmake(ImportedTarget)
-run_cmake(RelativePathInGenex)
 run_cmake(CMP0021)
 run_cmake(install_config)
 run_cmake(incomplete-genex)
-run_cmake(export-NOWARN)
-
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/DirInInstallPrefix/prefix")
-run_cmake(DirInInstallPrefix)
-
-configure_file(
-  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
-  "${RunCMake_BINARY_DIR}/copy/CMakeLists.txt"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/empty.cpp"
-  "${RunCMake_BINARY_DIR}/copy/empty.cpp"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/SourceDirectoryInInterface.cmake"
-  "${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface.cmake"
-  COPYONLY
-)
-set(RunCMake_TEST_OPTIONS
-  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface/prefix"
-  "-DTEST_FILE=${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface.cmake"
-  )
-set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/copy")
-run_cmake(InstallInSrcDir)
-unset(RunCMake_TEST_SOURCE_DIR)
-
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallInBinDir-build/prefix")
-set(RunCMake_TEST_OPTIONS
-  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallInBinDir-build/prefix"
-  "-DTEST_FILE=${RunCMake_SOURCE_DIR}/BinaryDirectoryInInterface.cmake"
-  )
-set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/InstallInBinDir-build")
-run_cmake(InstallInBinDir)
-unset(RunCMake_TEST_BINARY_DIR)
-
-configure_file(
-  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
-  "${RunCMake_BINARY_DIR}/prefix/src/CMakeLists.txt"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/empty.cpp"
-  "${RunCMake_BINARY_DIR}/prefix/src/empty.cpp"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/SourceDirectoryInInterface.cmake"
-  "${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake"
-  COPYONLY
-)
-
-foreach(policyStatus "" NEW OLD)
-  if (NOT "${policyStatus}" STREQUAL "")
-    set(policyOption -DCMAKE_POLICY_DEFAULT_CMP0052=${policyStatus})
-  else()
-    unset(policyOption)
-    set(policyStatus WARN)
-  endif()
-  set(RunCMake_TEST_OPTIONS
-    "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
-    "-DTEST_FILE=${RunCMake_SOURCE_DIR}/BinaryDirectoryInInterface.cmake"
-    )
-  # Set the RunCMake_TEST_SOURCE_DIR here to the copy too. This is needed to run
-  # the test suite in-source properly.  Otherwise the install directory would be
-  # a subdirectory or the source directory, which is allowed and tested separately
-  # below.
-  set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/prefix/src")
-  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/prefix/BinInInstallPrefix-CMP0052-${policyStatus}-build")
-  run_cmake(BinInInstallPrefix-CMP0052-${policyStatus})
-  unset(RunCMake_TEST_BINARY_DIR)
-
-  set(RunCMake_TEST_OPTIONS
-    "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
-    "-DTEST_FILE=${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake"
-    )
-  run_cmake(SrcInInstallPrefix-CMP0052-${policyStatus})
-  unset(RunCMake_TEST_SOURCE_DIR)
-endforeach()
-
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallPrefixInInterface-build/prefix")
-run_cmake(InstallPrefixInInterface)
-
-configure_file(
-  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
-  "${RunCMake_BINARY_DIR}/installToSrc/CMakeLists.txt"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/empty.cpp"
-  "${RunCMake_BINARY_DIR}/installToSrc/empty.cpp"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/InstallPrefixInInterface.cmake"
-  "${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface.cmake"
-  COPYONLY
-)
-set(RunCMake_TEST_OPTIONS
-  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface/prefix"
-  "-DTEST_FILE=${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface.cmake"
-  )
-set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/installToSrc")
-run_cmake(InstallToPrefixInSrcDirOutOfSource)
-unset(RunCMake_TEST_SOURCE_DIR)
-
-
-file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}/installToSrcInSrc")
-set(RunCMake_TEST_NO_CLEAN ON)
-
-configure_file(
-  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
-  "${RunCMake_BINARY_DIR}/installToSrcInSrc/CMakeLists.txt"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/empty.cpp"
-  "${RunCMake_BINARY_DIR}/installToSrcInSrc/empty.cpp"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/InstallPrefixInInterface.cmake"
-  "${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface.cmake"
-  COPYONLY
-)
-
-set(RunCMake_TEST_OPTIONS
-  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface/prefix"
-  "-DTEST_FILE=${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface.cmake"
-  )
-set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/installToSrcInSrc")
-set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/installToSrcInSrc")
-run_cmake(InstallToPrefixInSrcDirInSource)
-unset(RunCMake_TEST_SOURCE_DIR)
-unset(RunCMake_TEST_BINARY_DIR)
-unset(RunCMake_TEST_NO_CLEAN)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aae86094c63ddb5f312c23670d4e7a19ba84ad45
commit aae86094c63ddb5f312c23670d4e7a19ba84ad45
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 1 17:38:59 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:19:10 2015 +0100

    RunCMake: Remove unneeded files.
    
    The default expectation of RunCMake tests is empty content, so there
    is no need to specify it.

diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt b/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt b/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt b/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt b/Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt b/Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt b/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt b/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt b/Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt b/Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt b/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt b/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt b/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt b/Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt b/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt b/Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt b/Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt b/Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt b/Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt b/Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt b/Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt b/Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt b/Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt b/Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt b/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt b/Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt b/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt b/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt b/Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt b/Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt b/Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt b/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt b/Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt b/Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt b/Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt b/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt b/Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/include_directories/export-NOWARN-stderr.txt b/Tests/RunCMake/include_directories/export-NOWARN-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/include_directories/export-NOWARN-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt b/Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt b/Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/interface_library/genex_link-stderr.txt b/Tests/RunCMake/interface_library/genex_link-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/interface_library/genex_link-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt b/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/message/nomessage-stderr.txt b/Tests/RunCMake/message/nomessage-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/message/nomessage-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt b/Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/project/CMP0048-NEW-stderr.txt b/Tests/RunCMake/project/CMP0048-NEW-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/project/CMP0048-NEW-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$

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

Summary of changes:
 Help/command/target_sources.rst                    |    4 -
 Help/prop_tgt/INTERFACE_SOURCES.rst                |    4 -
 Help/release/dev/export-interface-source-files.rst |    6 +
 Source/cmExportBuildFileGenerator.cxx              |   13 +-
 Source/cmExportFileGenerator.cxx                   |  136 +++++++++++++------
 Source/cmExportFileGenerator.h                     |    5 +
 Source/cmExportInstallFileGenerator.cxx            |   28 ++--
 Tests/ExportImport/Export/Interface/CMakeLists.txt |   12 +-
 .../Export/Interface/source_target.cpp             |   13 ++
 .../Export/Interface/source_target_for_install.cpp |   13 ++
 Tests/ExportImport/Import/Interface/CMakeLists.txt |    8 ++
 .../Import/Interface/source_target_test.cpp        |    7 +
 .../RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt |    1 -
 .../CMP0022/CMP0022-NOWARN-shared-stderr.txt       |    1 -
 .../CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt   |    1 -
 ...CMP0022-NOWARN-static-link_libraries-stderr.txt |    1 -
 .../CMP0022/CMP0022-NOWARN-static-stderr.txt       |    1 -
 .../RunCMake/CMP0022/CMP0022-export-exe-stderr.txt |    1 -
 .../CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt |    1 -
 Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt |    1 -
 .../CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt |    1 -
 .../RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt  |    1 -
 Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt      |    1 -
 .../CMP0037/CMP0037-OLD-reserved-stderr.txt        |    1 -
 .../RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt  |    1 -
 Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt      |    1 -
 Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt      |    1 -
 .../CMP0040/CMP0040-NEW-existing-target-stderr.txt |    1 -
 .../CMP0040/CMP0040-OLD-existing-target-stderr.txt |    1 -
 .../CMP0040/CMP0040-OLD-missing-target-stderr.txt  |    1 -
 Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt      |    1 -
 Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt  |    1 -
 Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt      |    1 -
 Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt      |    1 -
 Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt      |    1 -
 Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt      |    1 -
 Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt      |    1 -
 .../CMP0046-NEW-existing-dependency-stderr.txt     |    1 -
 .../CMP0046-OLD-existing-dependency-stderr.txt     |    1 -
 .../CMP0046-OLD-missing-dependency-stderr.txt      |    1 -
 Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt      |    1 -
 Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt      |    1 -
 .../CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt    |    1 -
 .../CMP0055-OLD-Reject-Arguments-stderr.txt        |    1 -
 Tests/RunCMake/CMakeLists.txt                      |   24 +++-
 ...LinkImplementationFeatureCycleSolved-stderr.txt |    1 -
 .../DisallowedCommands/CMP0029-OLD-stderr.txt      |    1 -
 .../File_Generate/CarryPermissions-stderr.txt      |    1 -
 .../File_Generate/GenerateSource-stderr.txt        |    1 -
 .../OutputNameMatchesOtherSources-stderr.txt       |    1 -
 Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt |    1 -
 .../File_Generate/WriteIfDifferent-stderr.txt      |    1 -
 .../ValidTarget-TARGET_PDB_FILE-stderr.txt         |    1 -
 Tests/RunCMake/RunCMake.cmake                      |    5 +-
 Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt     |    1 -
 .../LinkImplementationCycle3-stderr.txt            |    1 -
 .../TargetSources/CMP0026-LOCATION-stderr.txt      |    1 -
 .../RunCMake/TargetSources/ExportBuild-result.txt  |    2 +-
 .../RunCMake/TargetSources/ExportBuild-stderr.txt  |    1 -
 .../TargetSources/ExportInstall-result.txt         |    1 -
 .../TargetSources/ExportInstall-stderr.txt         |    1 -
 Tests/RunCMake/TargetSources/ExportInstall.cmake   |    6 -
 Tests/RunCMake/TargetSources/RunCMakeTest.cmake    |    1 -
 .../BinInInstallPrefix-CMP0052-NEW-result.txt}     |    0
 ...fix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../BinInInstallPrefix-CMP0052-OLD-result.txt      |    0
 .../BinInInstallPrefix-CMP0052-WARN-result.txt     |    0
 ...ix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} |    6 +-
 .../BinInInstallPrefix-result.txt}                 |    0
 .../BinInInstallPrefix-stderr_SOURCES.txt          |    6 +
 .../BinaryDirectoryInInterface-result.txt}         |    0
 ...toryInInterface-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../BinaryDirectoryInInterface-stderr_SOURCES.txt  |    6 +
 .../BinaryDirectoryInInterface.cmake               |   15 +++
 .../CMakeLists.txt                                 |    0
 .../DirInInstallPrefix-result.txt                  |    0
 .../build-property-paths/DirInInstallPrefix.cmake  |   14 ++
 .../InstallInBinDir-result.txt}                    |    0
 ...InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../InstallInBinDir-stderr_SOURCES.txt             |    6 +
 .../InstallInSrcDir-result.txt}                    |    0
 ...InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../InstallInSrcDir-stderr_SOURCES.txt             |    6 +
 .../InstallPrefixInInterface-result.txt            |    0
 .../InstallPrefixInInterface.cmake                 |    0
 .../InstallToPrefixInSrcDirInSource-result.txt     |    0
 .../InstallToPrefixInSrcDirOutOfSource-result.txt  |    0
 .../RelativePathInGenex-result.txt}                |    0
 ...tivePathInGenex-stderr_INCLUDE_DIRECTORIES.txt} |    0
 .../RelativePathInGenex-stderr_SOURCES.txt         |    4 +
 .../build-property-paths/RelativePathInGenex.cmake |   13 ++
 .../RelativePathInInterface-result.txt}            |    0
 ...PathInInterface-stderr_INCLUDE_DIRECTORIES.txt} |    0
 .../RelativePathInInterface-stderr_SOURCES.txt     |    4 +
 .../RelativePathInInterface.cmake                  |   14 ++
 .../RunCMakeTest.cmake                             |   43 +++---
 .../SourceDirectoryInInterface-result.txt}         |    0
 ...toryInInterface-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../SourceDirectoryInInterface-stderr_SOURCES.txt  |    6 +
 .../SourceDirectoryInInterface.cmake               |   15 +++
 .../SrcInInstallPrefix-CMP0052-NEW-result.txt}     |    0
 ...fix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../SrcInInstallPrefix-CMP0052-OLD-result.txt      |    0
 .../SrcInInstallPrefix-CMP0052-WARN-result.txt     |    0
 ...ix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} |    6 +-
 .../SrcInInstallPrefix-result.txt}                 |    0
 .../SrcInInstallPrefix-stderr_SOURCES.txt          |    6 +
 .../{CMP0004 => build-property-paths}/empty.cpp    |    0
 .../export-NOWARN-result.txt                       |    0
 .../export-NOWARN.cmake                            |   15 +++
 .../BinInInstallPrefix-CMP0052-NEW-result.txt      |    1 -
 .../BinInInstallPrefix-CMP0052-OLD-stderr.txt      |    1 -
 .../BinaryDirectoryInInterface-result.txt          |    1 -
 .../BinaryDirectoryInInterface.cmake               |   11 --
 .../DirInInstallPrefix-stderr.txt                  |    1 -
 .../include_directories/DirInInstallPrefix.cmake   |    9 --
 .../include_directories/InstallInBinDir-result.txt |    1 -
 .../include_directories/InstallInSrcDir-result.txt |    1 -
 .../InstallPrefixInInterface-stderr.txt            |    1 -
 .../InstallToPrefixInSrcDirInSource-stderr.txt     |    1 -
 .../InstallToPrefixInSrcDirOutOfSource-stderr.txt  |    1 -
 .../RelativePathInGenex-result.txt                 |    1 -
 .../include_directories/RelativePathInGenex.cmake  |    8 --
 .../RelativePathInInterface-result.txt             |    1 -
 .../RelativePathInInterface.cmake                  |   11 --
 .../include_directories/RunCMakeTest.cmake         |  141 --------------------
 .../SourceDirectoryInInterface-result.txt          |    1 -
 .../SourceDirectoryInInterface.cmake               |   11 --
 .../SrcInInstallPrefix-CMP0052-NEW-result.txt      |    1 -
 .../SrcInInstallPrefix-CMP0052-OLD-stderr.txt      |    1 -
 .../include_directories/export-NOWARN-stderr.txt   |    1 -
 .../install/SkipInstallRulesNoWarning1-stderr.txt  |    1 -
 .../install/SkipInstallRulesNoWarning2-stderr.txt  |    1 -
 .../interface_library/genex_link-stderr.txt        |    1 -
 .../interface_library/no_shared_libs-stderr.txt    |    1 -
 Tests/RunCMake/message/nomessage-stderr.txt        |    1 -
 .../with_install_prefix-stderr.txt                 |    1 -
 Tests/RunCMake/project/CMP0048-NEW-stderr.txt      |    1 -
 138 files changed, 367 insertions(+), 376 deletions(-)
 create mode 100644 Help/release/dev/export-interface-source-files.rst
 create mode 100644 Tests/ExportImport/Export/Interface/source_target.cpp
 create mode 100644 Tests/ExportImport/Export/Interface/source_target_for_install.cpp
 create mode 100644 Tests/ExportImport/Import/Interface/source_target_test.cpp
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt
 delete mode 100644 Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt
 delete mode 100644 Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
 delete mode 100644 Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
 delete mode 100644 Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt
 delete mode 100644 Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
 delete mode 100644 Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt
 delete mode 100644 Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt
 delete mode 100644 Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt
 delete mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt
 delete mode 100644 Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt
 delete mode 100644 Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
 delete mode 100644 Tests/RunCMake/TargetSources/ExportInstall-result.txt
 delete mode 100644 Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
 delete mode 100644 Tests/RunCMake/TargetSources/ExportInstall.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => build-property-paths/BinInInstallPrefix-CMP0052-NEW-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/BinaryDirectoryInInterface-stderr.txt => build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} (57%)
 rename Tests/RunCMake/{include_directories => build-property-paths}/BinInInstallPrefix-CMP0052-OLD-result.txt (100%)
 rename Tests/RunCMake/{include_directories => build-property-paths}/BinInInstallPrefix-CMP0052-WARN-result.txt (100%)
 rename Tests/RunCMake/{include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt => build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} (63%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => build-property-paths/BinInInstallPrefix-result.txt} (100%)
 create mode 100644 Tests/RunCMake/build-property-paths/BinInInstallPrefix-stderr_SOURCES.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => build-property-paths/BinaryDirectoryInInterface-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt => build-property-paths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt} (61%)
 create mode 100644 Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_SOURCES.txt
 create mode 100644 Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake
 copy Tests/RunCMake/{include_directories => build-property-paths}/CMakeLists.txt (100%)
 rename Tests/RunCMake/{include_directories => build-property-paths}/DirInInstallPrefix-result.txt (100%)
 create mode 100644 Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => build-property-paths/InstallInBinDir-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/InstallInBinDir-stderr.txt => build-property-paths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt} (62%)
 create mode 100644 Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_SOURCES.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => build-property-paths/InstallInSrcDir-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/InstallInSrcDir-stderr.txt => build-property-paths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt} (67%)
 create mode 100644 Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_SOURCES.txt
 rename Tests/RunCMake/{include_directories => build-property-paths}/InstallPrefixInInterface-result.txt (100%)
 rename Tests/RunCMake/{include_directories => build-property-paths}/InstallPrefixInInterface.cmake (100%)
 rename Tests/RunCMake/{include_directories => build-property-paths}/InstallToPrefixInSrcDirInSource-result.txt (100%)
 rename Tests/RunCMake/{include_directories => build-property-paths}/InstallToPrefixInSrcDirOutOfSource-result.txt (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => build-property-paths/RelativePathInGenex-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/RelativePathInGenex-stderr.txt => build-property-paths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt} (100%)
 create mode 100644 Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_SOURCES.txt
 create mode 100644 Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => build-property-paths/RelativePathInInterface-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/RelativePathInInterface-stderr.txt => build-property-paths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt} (100%)
 create mode 100644 Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_SOURCES.txt
 create mode 100644 Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake
 copy Tests/RunCMake/{include_directories => build-property-paths}/RunCMakeTest.cmake (86%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => build-property-paths/SourceDirectoryInInterface-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/SourceDirectoryInInterface-stderr.txt => build-property-paths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt} (78%)
 create mode 100644 Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_SOURCES.txt
 create mode 100644 Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => build-property-paths/SrcInInstallPrefix-CMP0052-NEW-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt => build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} (66%)
 rename Tests/RunCMake/{include_directories => build-property-paths}/SrcInInstallPrefix-CMP0052-OLD-result.txt (100%)
 rename Tests/RunCMake/{include_directories => build-property-paths}/SrcInInstallPrefix-CMP0052-WARN-result.txt (100%)
 rename Tests/RunCMake/{include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt => build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} (69%)
 rename Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => build-property-paths/SrcInInstallPrefix-result.txt} (100%)
 create mode 100644 Tests/RunCMake/build-property-paths/SrcInInstallPrefix-stderr_SOURCES.txt
 copy Tests/RunCMake/{CMP0004 => build-property-paths}/empty.cpp (100%)
 rename Tests/RunCMake/{include_directories => build-property-paths}/export-NOWARN-result.txt (100%)
 rename Tests/RunCMake/{include_directories => build-property-paths}/export-NOWARN.cmake (71%)
 delete mode 100644 Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/BinaryDirectoryInInterface-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake
 delete mode 100644 Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/DirInInstallPrefix.cmake
 delete mode 100644 Tests/RunCMake/include_directories/InstallInBinDir-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/InstallInSrcDir-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/RelativePathInGenex-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/RelativePathInGenex.cmake
 delete mode 100644 Tests/RunCMake/include_directories/RelativePathInInterface-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/RelativePathInInterface.cmake
 delete mode 100644 Tests/RunCMake/include_directories/SourceDirectoryInInterface-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake
 delete mode 100644 Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/export-NOWARN-stderr.txt
 delete mode 100644 Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt
 delete mode 100644 Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt
 delete mode 100644 Tests/RunCMake/interface_library/genex_link-stderr.txt
 delete mode 100644 Tests/RunCMake/interface_library/no_shared_libs-stderr.txt
 delete mode 100644 Tests/RunCMake/message/nomessage-stderr.txt
 delete mode 100644 Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt
 delete mode 100644 Tests/RunCMake/project/CMP0048-NEW-stderr.txt


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Feb  5 14:43:30 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu,  5 Feb 2015 14:43:30 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1036-g89d7b57
Message-ID: <20150205194330.EA76E49DB@public.kitware.com>

This is an automated email from 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  89d7b57de756afb8063fa69f113a86b4fe1e527a (commit)
       via  2c1e04033d314653938953d4890d017757a6386f (commit)
      from  72bef67dd5494a872e34131f0cb194a9ede3edd9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89d7b57de756afb8063fa69f113a86b4fe1e527a
commit 89d7b57de756afb8063fa69f113a86b4fe1e527a
Merge: 72bef67 2c1e040
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 5 14:43:30 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 14:43:30 2015 -0500

    Merge topic 'export-interface-source-files' into next
    
    2c1e0403 Add missing file.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c1e04033d314653938953d4890d017757a6386f
commit 2c1e04033d314653938953d4890d017757a6386f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 5 20:43:10 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:43:10 2015 +0100

    Add missing file.

diff --git a/Tests/RunCMake/CMP0004/CMP0004-NEW-result.txt b/Tests/RunCMake/CMP0004/CMP0004-NEW-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0004/CMP0004-NEW-result.txt
@@ -0,0 +1 @@
+1

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

Summary of changes:
 .../CMP0004/{CMP0004-OLD-result.txt => CMP0004-NEW-result.txt}         |    0
 1 file changed, 0 insertions(+), 0 deletions(-)
 copy Tests/RunCMake/CMP0004/{CMP0004-OLD-result.txt => CMP0004-NEW-result.txt} (100%)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Feb  5 15:12:58 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu,  5 Feb 2015 15:12:58 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1057-g4464623
Message-ID: <20150205201258.ABB2A49AC@public.kitware.com>

This is an automated email from 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  446462370badf7bf80b74dc5209c72c7f6a88a26 (commit)
       via  e2f3597e92bda18efc2631e318870008b6e230d5 (commit)
       via  dd00d8774c30e6db232efdfb888f846fa328cd16 (commit)
       via  f0661877be6685d701d2165ad1c09676ce54b0b2 (commit)
       via  b00274b4ccb1178d92d3ebb559c4d1b9a23b0140 (commit)
       via  9b2bdd8aeaa3531a50e95baaeba2509ed84deec0 (commit)
       via  7814d8f59d405cdbe73e7f7e3bdebd7f690df687 (commit)
       via  849bac91454ecb24075463d4c6b4ccb2bffb6cfe (commit)
       via  f9150275d98f3e71f0f99d7523a3a720fe755d56 (commit)
       via  c8c5138c5db489670e2dd4d43910f54d7f5108d0 (commit)
       via  a86c60c3fa87b0efc7bb1c8e49cb4c0f70922685 (commit)
       via  4426219c2acffb544d85f18755d4f0abf6f1461d (commit)
       via  8b3a7bd824907c63732ca425e0361f288210ce52 (commit)
       via  465e89bef4db18334424fc3f6c32e3b5398c5fbf (commit)
       via  84658067660e1b391fdfd3b203e03e7b071fd992 (commit)
       via  3fe17c6d70797ce4d73aac1942c2f6036ce660c8 (commit)
       via  7b2c2fb83d9973fce37864827024ec4f07de8684 (commit)
       via  3f3db74413fc6b0afe4aa484c0ada2d5271ef0ba (commit)
       via  bd990c803b40e1532cab6b29c75414ca6f30e782 (commit)
       via  5fc53f1edb2d003595ef224b31a805c3af0dc0e6 (commit)
       via  421eadb45b48d40aa7d0b5e42a48df4ba94b9fc0 (commit)
      from  89d7b57de756afb8063fa69f113a86b4fe1e527a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=446462370badf7bf80b74dc5209c72c7f6a88a26
commit 446462370badf7bf80b74dc5209c72c7f6a88a26
Merge: 89d7b57 e2f3597
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 5 15:12:56 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 15:12:56 2015 -0500

    Merge topic 'use-algorithms' into next
    
    e2f3597e cmSystemTools: Remove unnecessary comparison.
    dd00d877 cmSystemTools: Early return if size makes later comparison false.
    f0661877 Replace temporary bool by inlining warning condition.
    b00274b4 Replace loop with member algorithm.
    9b2bdd8a cmComputeLinkDepends: Remove temporary iterator copy.
    7814d8f5 Replace loop with algorithm.
    849bac91 Replace a loop with std::transform.
    f9150275 Replace while loop with member insert.
    c8c5138c Take a size check outside of an inner loop.
    a86c60c3 Use insert member instead of back_inserter.
    4426219c Convert while loop to member insert.
    8b3a7bd8 Convert loop to algorithm.
    465e89be Extract a prefix variable from loop.
    84658067 Take computation out of loop.
    3fe17c6d Convert a nested loop to use an algorithm.
    7b2c2fb8 cmListCommand: Use std::find algorithm for FIND subcommand.
    ...


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2f3597e92bda18efc2631e318870008b6e230d5
commit e2f3597e92bda18efc2631e318870008b6e230d5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 27 23:52:50 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 21:00:27 2015 +0100

    cmSystemTools: Remove unnecessary comparison.
    
    We already know the string is uppercase.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index bb007ef..d3ab36b 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -376,7 +376,7 @@ bool cmSystemTools::IsInternallyOn(const char* val)
     {
     *c = static_cast<char>(toupper(*c));
     }
-  return (v == "I_ON" || v == "i_on");
+  return v == "I_ON";
 }
 
 bool cmSystemTools::IsOn(const char* val)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd00d8774c30e6db232efdfb888f846fa328cd16
commit dd00d8774c30e6db232efdfb888f846fa328cd16
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 27 23:50:42 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 21:00:27 2015 +0100

    cmSystemTools: Early return if size makes later comparison false.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index b07dd78..bb007ef 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -366,6 +366,10 @@ bool cmSystemTools::IsInternallyOn(const char* val)
     return false;
     }
   std::basic_string<char> v = val;
+  if (v.size() > 4)
+    {
+    return false;
+    }
 
   for(std::basic_string<char>::iterator c = v.begin();
       c != v.end(); c++)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0661877be6685d701d2165ad1c09676ce54b0b2
commit f0661877be6685d701d2165ad1c09676ce54b0b2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 27 22:13:45 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 21:00:27 2015 +0100

    Replace temporary bool by inlining warning condition.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index bd9cb26..7afe05f 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -3641,24 +3641,20 @@ bool cmLocalGenerator::NeedBackwardsCompatibility_2_4()
 bool cmLocalGenerator::CheckDefinition(std::string const& define) const
 {
   // Many compilers do not support -DNAME(arg)=sdf so we disable it.
-  bool function_style = false;
-
   std::string::size_type pos = define.find_first_of("(=");
   if (pos != std::string::npos)
     {
-    function_style = define[pos] == '(';
-    }
-
-  if(function_style)
-    {
-    std::ostringstream e;
-    e << "WARNING: Function-style preprocessor definitions may not be "
-      << "passed on the compiler command line because many compilers "
-      << "do not support it.\n"
-      << "CMake is dropping a preprocessor definition: " << define << "\n"
-      << "Consider defining the macro in a (configured) header file.\n";
-    cmSystemTools::Message(e.str().c_str());
-    return false;
+    if (define[pos] == '(')
+      {
+      std::ostringstream e;
+      e << "WARNING: Function-style preprocessor definitions may not be "
+        << "passed on the compiler command line because many compilers "
+        << "do not support it.\n"
+        << "CMake is dropping a preprocessor definition: " << define << "\n"
+        << "Consider defining the macro in a (configured) header file.\n";
+      cmSystemTools::Message(e.str().c_str());
+      return false;
+      }
     }
 
   // Many compilers do not support # in the value so we disable it.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b00274b4ccb1178d92d3ebb559c4d1b9a23b0140
commit b00274b4ccb1178d92d3ebb559c4d1b9a23b0140
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 27 22:09:17 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 21:00:27 2015 +0100

    Replace loop with member algorithm.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 9109db4..bd9cb26 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -3642,14 +3642,13 @@ bool cmLocalGenerator::CheckDefinition(std::string const& define) const
 {
   // Many compilers do not support -DNAME(arg)=sdf so we disable it.
   bool function_style = false;
-  for(const char* c = define.c_str(); *c && *c != '='; ++c)
+
+  std::string::size_type pos = define.find_first_of("(=");
+  if (pos != std::string::npos)
     {
-    if(*c == '(')
-      {
-      function_style = true;
-      break;
-      }
+    function_style = define[pos] == '(';
     }
+
   if(function_style)
     {
     std::ostringstream e;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b2bdd8aeaa3531a50e95baaeba2509ed84deec0
commit 9b2bdd8aeaa3531a50e95baaeba2509ed84deec0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 27 21:34:01 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 21:00:27 2015 +0100

    cmComputeLinkDepends: Remove temporary iterator copy.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index fa1bbcc..8652690 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -692,8 +692,7 @@ void cmComputeLinkDepends::CleanConstraintGraph()
     std::sort(i->begin(), i->end());
 
     // Make the edge list unique.
-    EdgeList::iterator last = std::unique(i->begin(), i->end());
-    i->erase(last, i->end());
+    i->erase(std::unique(i->begin(), i->end()), i->end());
     }
 }
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7814d8f59d405cdbe73e7f7e3bdebd7f690df687
commit 7814d8f59d405cdbe73e7f7e3bdebd7f690df687
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 16:02:46 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 21:00:26 2015 +0100

    Replace loop with algorithm.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ef42b38..f0bdea7 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1153,15 +1153,11 @@ cmTarget::LinkLibraryType cmTarget::ComputeLinkType(
 
   // Check if any entry in the list matches this configuration.
   std::string configUpper = cmSystemTools::UpperCase(config);
-  for(std::vector<std::string>::const_iterator i = debugConfigs.begin();
-      i != debugConfigs.end(); ++i)
+  if (std::find(debugConfigs.begin(), debugConfigs.end(), configUpper) !=
+      debugConfigs.end())
     {
-    if(*i == configUpper)
-      {
-      return cmTarget::DEBUG;
-      }
+    return cmTarget::DEBUG;
     }
-
   // The current configuration is not a debug configuration.
   return cmTarget::OPTIMIZED;
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=849bac91454ecb24075463d4c6b4ccb2bffb6cfe
commit 849bac91454ecb24075463d4c6b4ccb2bffb6cfe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 16:01:07 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 21:00:17 2015 +0100

    Replace a loop with std::transform.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 652e451..875dbbd 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2731,11 +2731,10 @@ std::vector<std::string> const& cmake::GetDebugConfigs()
       {
       // Expand the specified list and convert to upper-case.
       cmSystemTools::ExpandListArgument(config_list, this->DebugConfigs);
-      for(std::vector<std::string>::iterator i = this->DebugConfigs.begin();
-          i != this->DebugConfigs.end(); ++i)
-        {
-        *i = cmSystemTools::UpperCase(*i);
-        }
+      std::transform(this->DebugConfigs.begin(),
+                     this->DebugConfigs.end(),
+                     this->DebugConfigs.begin(),
+                     cmSystemTools::UpperCase);
       }
     // If no configurations were specified, use a default list.
     if(this->DebugConfigs.empty())

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9150275d98f3e71f0f99d7523a3a720fe755d56
commit f9150275d98f3e71f0f99d7523a3a720fe755d56
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:36:59 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:59:06 2015 +0100

    Replace while loop with member insert.

diff --git a/Source/cmSetTargetPropertiesCommand.cxx b/Source/cmSetTargetPropertiesCommand.cxx
index 9a7fab2..e41a0ca 100644
--- a/Source/cmSetTargetPropertiesCommand.cxx
+++ b/Source/cmSetTargetPropertiesCommand.cxx
@@ -40,14 +40,7 @@ bool cmSetTargetPropertiesCommand
         this->SetError("called with incorrect number of arguments.");
         return false;
         }
-      while (j != args.end())
-        {
-        propertyPairs.push_back(*j);
-        ++j;
-        propertyPairs.push_back(*j);
-        ++j;
-        }
-      // break out of the loop because j is already == end
+      propertyPairs.insert(propertyPairs.end(), j, args.end());
       break;
       }
     else if (doingFiles)
diff --git a/Source/cmSetTestsPropertiesCommand.cxx b/Source/cmSetTestsPropertiesCommand.cxx
index 032c78e..d079a19 100644
--- a/Source/cmSetTestsPropertiesCommand.cxx
+++ b/Source/cmSetTestsPropertiesCommand.cxx
@@ -41,14 +41,7 @@ bool cmSetTestsPropertiesCommand
         this->SetError("called with incorrect number of arguments.");
         return false;
         }
-      while (j != args.end())
-        {
-        propertyPairs.push_back(*j);
-        ++j;
-        propertyPairs.push_back(*j);
-        ++j;
-        }
-      // break out of the loop because j is already == end
+      propertyPairs.insert(propertyPairs.end(), j, args.end());
       break;
       }
     else if (doingFiles)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8c5138c5db489670e2dd4d43910f54d7f5108d0
commit c8c5138c5db489670e2dd4d43910f54d7f5108d0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:35:26 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:59:06 2015 +0100

    Take a size check outside of an inner loop.

diff --git a/Source/cmSetTargetPropertiesCommand.cxx b/Source/cmSetTargetPropertiesCommand.cxx
index aeb8077..9a7fab2 100644
--- a/Source/cmSetTargetPropertiesCommand.cxx
+++ b/Source/cmSetTargetPropertiesCommand.cxx
@@ -35,15 +35,15 @@ bool cmSetTargetPropertiesCommand
       doingFiles = false;
       // now loop through the rest of the arguments, new style
       ++j;
+      if (std::distance(j, args.end()) % 2 != 0)
+        {
+        this->SetError("called with incorrect number of arguments.");
+        return false;
+        }
       while (j != args.end())
         {
         propertyPairs.push_back(*j);
         ++j;
-        if(j == args.end())
-          {
-          this->SetError("called with incorrect number of arguments.");
-          return false;
-          }
         propertyPairs.push_back(*j);
         ++j;
         }
diff --git a/Source/cmSetTestsPropertiesCommand.cxx b/Source/cmSetTestsPropertiesCommand.cxx
index e66d13d..032c78e 100644
--- a/Source/cmSetTestsPropertiesCommand.cxx
+++ b/Source/cmSetTestsPropertiesCommand.cxx
@@ -36,15 +36,15 @@ bool cmSetTestsPropertiesCommand
       doingFiles = false;
       // now loop through the rest of the arguments, new style
       ++j;
+      if (std::distance(j, args.end()) % 2 != 0)
+        {
+        this->SetError("called with incorrect number of arguments.");
+        return false;
+        }
       while (j != args.end())
         {
         propertyPairs.push_back(*j);
         ++j;
-        if(j == args.end())
-          {
-          this->SetError("called with incorrect number of arguments.");
-          return false;
-          }
         propertyPairs.push_back(*j);
         ++j;
         }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a86c60c3fa87b0efc7bb1c8e49cb4c0f70922685
commit a86c60c3fa87b0efc7bb1c8e49cb4c0f70922685
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 24 18:21:56 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:59:06 2015 +0100

    Use insert member instead of back_inserter.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 98cb75c..ef42b38 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -5919,8 +5919,7 @@ cmTarget::GetCompatibleInterfaces(std::string const& config) const
         { \
         std::vector<std::string> props; \
         cmSystemTools::ExpandListArgument(prop, props); \
-        std::copy(props.begin(), props.end(), \
-                  std::inserter(compat.Props##x, compat.Props##x.begin())); \
+        compat.Props##x.insert(props.begin(), props.end()); \
         }
       CM_READ_COMPATIBLE_INTERFACE(BOOL, Bool)
       CM_READ_COMPATIBLE_INTERFACE(STRING, String)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4426219c2acffb544d85f18755d4f0abf6f1461d
commit 4426219c2acffb544d85f18755d4f0abf6f1461d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 24 18:18:56 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:44:25 2015 +0100

    Convert while loop to member insert.

diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index db2f6fb..edf82bd 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -435,11 +435,7 @@ bool cmAddLibraryCommand
     cmSystemTools::Message(msg.c_str() ,"Warning");
     }
 
-  while (s != args.end())
-    {
-    srclists.push_back(*s);
-    ++s;
-    }
+  srclists.insert(srclists.end(), s, args.end());
 
   this->Makefile->AddLibrary(libName, type, srclists, excludeFromAll);
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b3a7bd824907c63732ca425e0361f288210ce52
commit 8b3a7bd824907c63732ca425e0361f288210ce52
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 18 16:01:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:44:25 2015 +0100

    Convert loop to algorithm.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 9a2186b..785d0ca 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2396,10 +2396,7 @@ void cmLocalUnixMakefileGenerator3
     std::string outputForExisting =
                           this->ConvertToOutputForExisting(tgtDir, relRetDir);
     std::string prefix = cd_cmd + outputForExisting + " && ";
-    std::vector<std::string>::iterator i = commands.begin();
-    for (; i != commands.end(); ++i)
-      {
-      *i = prefix + *i;
-      }
+    std::transform(commands.begin(), commands.end(), commands.begin(),
+                   std::bind1st(std::plus<std::string>(), prefix));
     }
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=465e89bef4db18334424fc3f6c32e3b5398c5fbf
commit 465e89bef4db18334424fc3f6c32e3b5398c5fbf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:07:27 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:44:25 2015 +0100

    Extract a prefix variable from loop.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 13c47c5..9a2186b 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2395,14 +2395,11 @@ void cmLocalUnixMakefileGenerator3
     // each command.
     std::string outputForExisting =
                           this->ConvertToOutputForExisting(tgtDir, relRetDir);
+    std::string prefix = cd_cmd + outputForExisting + " && ";
     std::vector<std::string>::iterator i = commands.begin();
     for (; i != commands.end(); ++i)
       {
-      std::string cmd = cd_cmd;
-      cmd += outputForExisting;
-      cmd += " && ";
-      cmd += *i;
-      *i = cmd;
+      *i = prefix + *i;
       }
     }
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84658067660e1b391fdfd3b203e03e7b071fd992
commit 84658067660e1b391fdfd3b203e03e7b071fd992
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 18 15:59:03 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:44:25 2015 +0100

    Take computation out of loop.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index fbf2140..13c47c5 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2393,11 +2393,13 @@ void cmLocalUnixMakefileGenerator3
     // On UNIX we must construct a single shell command to change
     // directory and build because make resets the directory between
     // each command.
+    std::string outputForExisting =
+                          this->ConvertToOutputForExisting(tgtDir, relRetDir);
     std::vector<std::string>::iterator i = commands.begin();
     for (; i != commands.end(); ++i)
       {
       std::string cmd = cd_cmd;
-      cmd += this->ConvertToOutputForExisting(tgtDir, relRetDir);
+      cmd += outputForExisting;
       cmd += " && ";
       cmd += *i;
       *i = cmd;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fe17c6d70797ce4d73aac1942c2f6036ce660c8
commit 3fe17c6d70797ce4d73aac1942c2f6036ce660c8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 24 18:47:19 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:44:25 2015 +0100

    Convert a nested loop to use an algorithm.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index d24af46..f76e428 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -372,18 +372,10 @@ bool cmListCommand
   size_t cc;
   for ( cc = 2; cc < args.size(); ++ cc )
     {
-    size_t kk = 0;
-    while ( kk < varArgsExpanded.size() )
-      {
-      if ( varArgsExpanded[kk] == args[cc] )
-        {
-        varArgsExpanded.erase(varArgsExpanded.begin()+kk);
-        }
-      else
-        {
-        kk ++;
-        }
-      }
+    varArgsExpanded.erase(
+        std::remove(varArgsExpanded.begin(), varArgsExpanded.end(),
+                    args[cc]),
+        varArgsExpanded.end());
     }
 
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b2c2fb83d9973fce37864827024ec4f07de8684
commit 7b2c2fb83d9973fce37864827024ec4f07de8684
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 24 18:43:37 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:44:25 2015 +0100

    cmListCommand: Use std::find algorithm for FIND subcommand.
    
    Adjust the format string to account for the input being a
    variable of type size_t as a result of using std::distance.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 107dca9..d24af46 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -287,18 +287,14 @@ bool cmListCommand::HandleFindCommand(std::vector<std::string> const& args)
     return true;
     }
 
-  std::vector<std::string>::iterator it;
-  unsigned int index = 0;
-  for ( it = varArgsExpanded.begin(); it != varArgsExpanded.end(); ++ it )
+  std::vector<std::string>::iterator it =
+      std::find(varArgsExpanded.begin(), varArgsExpanded.end(), args[2]);
+  if (it != varArgsExpanded.end())
     {
-    if ( *it == args[2] )
-      {
-      char indexString[32];
-      sprintf(indexString, "%d", index);
-      this->Makefile->AddDefinition(variableName, indexString);
-      return true;
-      }
-    index++;
+    char indexString[32];
+    sprintf(indexString, "%zu", std::distance(varArgsExpanded.begin(), it));
+    this->Makefile->AddDefinition(variableName, indexString);
+    return true;
     }
 
   this->Makefile->AddDefinition(variableName, "-1");

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f3db74413fc6b0afe4aa484c0ada2d5271ef0ba
commit 3f3db74413fc6b0afe4aa484c0ada2d5271ef0ba
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 14:26:57 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:44:25 2015 +0100

    cmMakefile: Remove ExpandSourceListArguments.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ba914e1..e709b9f 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3576,19 +3576,6 @@ void cmMakefile::EnableLanguage(std::vector<std::string> const &  lang,
                                                              optional);
 }
 
-void cmMakefile::ExpandSourceListArguments(
-  std::vector<std::string> const& arguments,
-  std::vector<std::string>& newargs, unsigned int /* start */) const
-{
-  // now expand the args
-  unsigned int i;
-  for(i = 0; i < arguments.size(); ++i)
-    {
-    // List expansion will have been done already.
-    newargs.push_back(arguments[i]);
-    }
-}
-
 int cmMakefile::TryCompile(const std::string& srcdir,
                            const std::string& bindir,
                            const std::string& projectName,
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index bff8c12..5f22485 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -599,17 +599,6 @@ public:
    */
   void AddSystemIncludeDirectories(const std::set<std::string> &incs);
 
-  /** Expand out any arguements in the vector that have ; separated
-   *  strings into multiple arguements.  A new vector is created
-   *  containing the expanded versions of all arguments in argsIn.
-   * This method differes from the one in cmSystemTools in that if
-   * the CmakeLists file is version 1.2 or earlier it will check for
-   * source lists being used without ${} around them
-   */
-  void ExpandSourceListArguments(std::vector<std::string> const& argsIn,
-                                 std::vector<std::string>& argsOut,
-                                 unsigned int startArgumentIndex) const;
-
   /** Get a cmSourceFile pointer for a given source name, if the name is
    *  not found, then a null pointer is returned.
    */

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd990c803b40e1532cab6b29c75414ca6f30e782
commit bd990c803b40e1532cab6b29c75414ca6f30e782
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 18 17:10:03 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:44:25 2015 +0100

    Remove use of ExpandSourceListArguments.
    
    By now, it is only an expensive copy.

diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index d0dc30a..691d80d 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -438,15 +438,14 @@ void CCONV cmExpandSourceListArguments(void *arg,
                                  char ***resArgv,
                                  unsigned int startArgumentIndex)
 {
-  cmMakefile *mf = static_cast<cmMakefile *>(arg);
+  (void)arg;
+  (void)startArgumentIndex;
   std::vector<std::string> result;
-  std::vector<std::string> args2;
   int i;
   for (i = 0; i < numArgs; ++i)
     {
-    args2.push_back(args[i]);
+    result.push_back(args[i]);
     }
-  mf->ExpandSourceListArguments(args2, result, startArgumentIndex);
   int resargc = static_cast<int>(result.size());
   char **resargv = 0;
   if (resargc)
diff --git a/Source/cmFLTKWrapUICommand.cxx b/Source/cmFLTKWrapUICommand.cxx
index f7d8243..488beaa 100644
--- a/Source/cmFLTKWrapUICommand.cxx
+++ b/Source/cmFLTKWrapUICommand.cxx
@@ -31,9 +31,6 @@ bool cmFLTKWrapUICommand
   // get parameter for the command
   this->Target = args[0];  // Target that will use the generated files
 
-  std::vector<std::string> newArgs;
-  this->Makefile->ExpandSourceListArguments(args,newArgs, 1);
-
   // get the list of GUI files from which .cxx and .h will be generated
   std::string outputDirectory = this->Makefile->GetCurrentOutputDirectory();
 
@@ -45,8 +42,8 @@ bool cmFLTKWrapUICommand
   this->Makefile->AddIncludeDirectories( outputDirectories );
   }
 
-  for(std::vector<std::string>::iterator i = (newArgs.begin() + 1);
-      i != newArgs.end(); i++)
+  for(std::vector<std::string>::const_iterator i = (args.begin() + 1);
+      i != args.end(); i++)
     {
     cmSourceFile *curr = this->Makefile->GetSource(*i);
     // if we should use the source GUI
diff --git a/Source/cmInstallFilesCommand.cxx b/Source/cmInstallFilesCommand.cxx
index 06a78e5..85e5345 100644
--- a/Source/cmInstallFilesCommand.cxx
+++ b/Source/cmInstallFilesCommand.cxx
@@ -15,9 +15,9 @@
 
 // cmExecutableCommand
 bool cmInstallFilesCommand
-::InitialPass(std::vector<std::string> const& argsIn, cmExecutionStatus &)
+::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
 {
-  if(argsIn.size() < 2)
+  if(args.size() < 2)
     {
     this->SetError("called with incorrect number of arguments");
     return false;
@@ -27,9 +27,6 @@ bool cmInstallFilesCommand
   this->Makefile->GetLocalGenerator()
     ->GetGlobalGenerator()->EnableInstallTarget();
 
-  std::vector<std::string> args;
-  this->Makefile->ExpandSourceListArguments(argsIn, args, 2);
-
   this->Destination = args[0];
 
   if((args.size() > 1) && (args[1] == "FILES"))
diff --git a/Source/cmQTWrapCPPCommand.cxx b/Source/cmQTWrapCPPCommand.cxx
index a984260..878562c 100644
--- a/Source/cmQTWrapCPPCommand.cxx
+++ b/Source/cmQTWrapCPPCommand.cxx
@@ -12,19 +12,15 @@
 #include "cmQTWrapCPPCommand.h"
 
 // cmQTWrapCPPCommand
-bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn,
+bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& args,
                                      cmExecutionStatus &)
 {
-  if(argsIn.size() < 3 )
+  if(args.size() < 3 )
     {
     this->SetError("called with incorrect number of arguments");
     return false;
     }
 
-  // This command supports source list inputs for compatibility.
-  std::vector<std::string> args;
-  this->Makefile->ExpandSourceListArguments(argsIn, args, 2);
-
   // Get the moc executable to run in the custom command.
   const char* moc_exe =
     this->Makefile->GetRequiredDefinition("QT_MOC_EXECUTABLE");
@@ -35,7 +31,7 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn,
     this->Makefile->GetSafeDefinition(sourceList);
 
   // Create a rule for all sources listed.
-  for(std::vector<std::string>::iterator j = (args.begin() + 2);
+  for(std::vector<std::string>::const_iterator j = (args.begin() + 2);
       j != args.end(); ++j)
     {
     cmSourceFile *curr = this->Makefile->GetSource(*j);
diff --git a/Source/cmQTWrapUICommand.cxx b/Source/cmQTWrapUICommand.cxx
index dce59ef..9b92b1e 100644
--- a/Source/cmQTWrapUICommand.cxx
+++ b/Source/cmQTWrapUICommand.cxx
@@ -12,19 +12,15 @@
 #include "cmQTWrapUICommand.h"
 
 // cmQTWrapUICommand
-bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& argsIn,
+bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& args,
                                     cmExecutionStatus &)
 {
-  if(argsIn.size() < 4 )
+  if(args.size() < 4 )
     {
     this->SetError("called with incorrect number of arguments");
     return false;
     }
 
-  // This command supports source list inputs for compatibility.
-  std::vector<std::string> args;
-  this->Makefile->ExpandSourceListArguments(argsIn, args, 3);
-
   // Get the uic and moc executables to run in the custom commands.
   const char* uic_exe =
     this->Makefile->GetRequiredDefinition("QT_UIC_EXECUTABLE");
@@ -40,7 +36,7 @@ bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& argsIn,
     this->Makefile->GetSafeDefinition(sourceList);
 
   // Create rules for all sources listed.
-  for(std::vector<std::string>::iterator j = (args.begin() + 3);
+  for(std::vector<std::string>::const_iterator j = (args.begin() + 3);
       j != args.end(); ++j)
     {
     cmSourceFile *curr = this->Makefile->GetSource(*j);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fc53f1edb2d003595ef224b31a805c3af0dc0e6
commit 5fc53f1edb2d003595ef224b31a805c3af0dc0e6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 24 18:12:48 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:44:25 2015 +0100

    cmLocalGenerator: Replace loop with find_first_not_of

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 7ca7684..9109db4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -3204,11 +3204,7 @@ cmLocalGenerator
     std::string ssin = sin;
 
     // Avoid full paths by removing leading slashes.
-    std::string::size_type pos = 0;
-    for(;pos < ssin.size() && ssin[pos] == '/'; ++pos)
-      {
-      }
-    ssin = ssin.substr(pos);
+    ssin.erase(0, ssin.find_first_not_of("/"));
 
     // Avoid full paths by removing colons.
     cmSystemTools::ReplaceString(ssin, ":", "_");

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=421eadb45b48d40aa7d0b5e42a48df4ba94b9fc0
commit 421eadb45b48d40aa7d0b5e42a48df4ba94b9fc0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 29 23:19:40 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 20:44:25 2015 +0100

    Remove use of cmsys_stl.
    
    It is not needed.

diff --git a/Source/CPack/OSXScriptLauncher.cxx b/Source/CPack/OSXScriptLauncher.cxx
index d9d6236..1d7afbd 100644
--- a/Source/CPack/OSXScriptLauncher.cxx
+++ b/Source/CPack/OSXScriptLauncher.cxx
@@ -26,7 +26,7 @@
 int main(int argc, char* argv[])
 {
   //if ( cmsys::SystemTools::FileExists(
-  cmsys_stl::string cwd = cmsys::SystemTools::GetCurrentWorkingDirectory();
+  std::string cwd = cmsys::SystemTools::GetCurrentWorkingDirectory();
   cmsys::ofstream ofs("/tmp/output.txt");
 
   CFStringRef fileName;
@@ -66,7 +66,7 @@ int main(int argc, char* argv[])
   //dispose of the CF variable
   CFRelease(scriptFileURL);
 
-  cmsys_stl::string fullScriptPath = reinterpret_cast<char*>(path);
+  std::string fullScriptPath = reinterpret_cast<char*>(path);
   delete [] path;
 
 
@@ -75,10 +75,10 @@ int main(int argc, char* argv[])
     return 1;
     }
 
-  cmsys_stl::string scriptDirectory = cmsys::SystemTools::GetFilenamePath(
+  std::string scriptDirectory = cmsys::SystemTools::GetFilenamePath(
     fullScriptPath);
   ofs << fullScriptPath.c_str() << cmsys_ios::endl;
-  cmsys_stl::vector<const char*> args;
+  std::vector<const char*> args;
   args.push_back(fullScriptPath.c_str());
   int cc;
   for ( cc = 1; cc < argc; ++ cc )
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 8f63ca2..fe6cc95 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -654,7 +654,7 @@ bool cmCPackNSISGenerator::GetListOfSubdirectories(const char* topdir,
     if (strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)),".") &&
         strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)),".."))
       {
-      cmsys_stl::string fullPath = topdir;
+      std::string fullPath = topdir;
       fullPath += "/";
       fullPath += dir.GetFile(static_cast<unsigned long>(fileNum));
       if(cmsys::SystemTools::FileIsDirectory(fullPath) &&
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 08b7c66..1226d22 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -2542,10 +2542,10 @@ bool cmCTestCoverageHandler::IntersectsFilter(LabelSet const& labels)
     }
 
   std::vector<int> ids;
-  cmsys_stl::set_intersection
+  std::set_intersection
     (labels.begin(), labels.end(),
      this->LabelFilter.begin(), this->LabelFilter.end(),
-     cmsys_stl::back_inserter(ids));
+     std::back_inserter(ids));
   return !ids.empty();
 }
 
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index 82fa3a3..8a72a24 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -149,10 +149,10 @@ int main(int argc, char** argv)
     QStringList args = app.arguments();
     if(args.count() == 2)
       {
-      cmsys_stl::string filePath = cmSystemTools::CollapseFullPath(args[1].toLocal8Bit().data());
+      std::string filePath = cmSystemTools::CollapseFullPath(args[1].toLocal8Bit().data());
 
       // check if argument is a directory containing CMakeCache.txt
-      cmsys_stl::string buildFilePath =
+      std::string buildFilePath =
         cmSystemTools::CollapseFullPath("CMakeCache.txt", filePath.c_str());
 
       // check if argument is a CMakeCache.txt file
@@ -163,7 +163,7 @@ int main(int argc, char** argv)
         }
 
       // check if argument is a directory containing CMakeLists.txt
-      cmsys_stl::string srcFilePath =
+      std::string srcFilePath =
         cmSystemTools::CollapseFullPath("CMakeLists.txt", filePath.c_str());
 
       if(cmSystemTools::FileExists(buildFilePath.c_str()))
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 32d5cd3..fa1bbcc 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -669,7 +669,7 @@ void cmComputeLinkDepends::InferDependencies()
     for(++i; i != sets->end(); ++i)
       {
       DependSet intersection;
-      cmsys_stl::set_intersection
+      std::set_intersection
         (common.begin(), common.end(), i->begin(), i->end(),
          std::inserter(intersection, intersection.begin()));
       common = intersection;
@@ -689,10 +689,10 @@ void cmComputeLinkDepends::CleanConstraintGraph()
     {
     // Sort the outgoing edges for each graph node so that the
     // original order will be preserved as much as possible.
-    cmsys_stl::sort(i->begin(), i->end());
+    std::sort(i->begin(), i->end());
 
     // Make the edge list unique.
-    EdgeList::iterator last = cmsys_stl::unique(i->begin(), i->end());
+    EdgeList::iterator last = std::unique(i->begin(), i->end());
     i->erase(last, i->end());
     }
 }
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 579e715..8b893bc 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -71,7 +71,7 @@ static std::string fix_file_url_windows(const std::string& url)
   std::string ret = url;
   if(strncmp(url.c_str(), "file://", 7) == 0)
     {
-    cmsys_stl::wstring wurl = cmsys::Encoding::ToWide(url);
+    std::wstring wurl = cmsys::Encoding::ToWide(url);
     if(!wurl.empty())
       {
       int mblen = WideCharToMultiByte(CP_ACP, 0, wurl.c_str(), -1,
@@ -1843,7 +1843,7 @@ bool cmFileCopier::InstallDirectory(const char* source,
     if(!(strcmp(dir.GetFile(fileNum), ".") == 0 ||
          strcmp(dir.GetFile(fileNum), "..") == 0))
       {
-      cmsys_stl::string fromPath = source;
+      std::string fromPath = source;
       fromPath += "/";
       fromPath += dir.GetFile(fileNum);
       std::string toPath = destination;
diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx
index 78f0e9e..c499f61 100644
--- a/Source/cmFindLibraryCommand.cxx
+++ b/Source/cmFindLibraryCommand.cxx
@@ -195,12 +195,12 @@ struct cmFindLibraryHelper
   void RegexFromList(std::string& out, std::vector<std::string> const& in);
   size_type GetPrefixIndex(std::string const& prefix)
     {
-    return cmsys_stl::find(this->Prefixes.begin(), this->Prefixes.end(),
+    return std::find(this->Prefixes.begin(), this->Prefixes.end(),
                            prefix) - this->Prefixes.begin();
     }
   size_type GetSuffixIndex(std::string const& suffix)
     {
-    return cmsys_stl::find(this->Suffixes.begin(), this->Suffixes.end(),
+    return std::find(this->Suffixes.begin(), this->Suffixes.end(),
                            suffix) - this->Suffixes.begin();
     }
   bool HasValidSuffix(std::string const& name);
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index e9735ed..b07dd78 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2695,7 +2695,7 @@ bool cmSystemTools::RemoveRPath(std::string const& file, std::string* emsg,
     }
   if(se_count == 2 && se[1]->IndexInSection < se[0]->IndexInSection)
     {
-    cmsys_stl::swap(se[0], se[1]);
+    std::swap(se[0], se[1]);
     }
 
   // Get the size of the dynamic section header.
diff --git a/Source/cmXMLSafe.cxx b/Source/cmXMLSafe.cxx
index 72fdc34..99f5625 100644
--- a/Source/cmXMLSafe.cxx
+++ b/Source/cmXMLSafe.cxx
@@ -28,7 +28,7 @@ cmXMLSafe::cmXMLSafe(const char* s):
 }
 
 //----------------------------------------------------------------------------
-cmXMLSafe::cmXMLSafe(cmsys_stl::string const& s):
+cmXMLSafe::cmXMLSafe(std::string const& s):
     Data(s.c_str()),
     Size(static_cast<unsigned long>(s.length())),
     DoQuotes(true)
@@ -43,7 +43,7 @@ cmXMLSafe& cmXMLSafe::Quotes(bool b)
 }
 
 //----------------------------------------------------------------------------
-cmsys_stl::string cmXMLSafe::str()
+std::string cmXMLSafe::str()
 {
   cmsys_ios::ostringstream ss;
   ss << *this;
diff --git a/Source/cmXMLSafe.h b/Source/cmXMLSafe.h
index cba9f39..c23a90c 100644
--- a/Source/cmXMLSafe.h
+++ b/Source/cmXMLSafe.h
@@ -24,7 +24,7 @@ public:
   /** Construct with the data to be written.  This assumes the data
       will exist for the duration of this object's life.  */
   cmXMLSafe(const char* s);
-  cmXMLSafe(cmsys_stl::string const& s);
+  cmXMLSafe(std::string const& s);
 
   /** Specify whether to escape quotes too.  This is needed when
       writing the content of an attribute value.  By default quotes
@@ -32,7 +32,7 @@ public:
   cmXMLSafe& Quotes(bool b = true);
 
   /** Get the escaped data as a string.  */
-  cmsys_stl::string str();
+  std::string str();
 private:
   char const* Data;
   unsigned long Size;

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

Summary of changes:
 Source/CPack/OSXScriptLauncher.cxx       |    8 +++----
 Source/CPack/cmCPackNSISGenerator.cxx    |    2 +-
 Source/CTest/cmCTestCoverageHandler.cxx  |    4 ++--
 Source/QtDialog/CMakeSetup.cxx           |    6 +++---
 Source/cmAddLibraryCommand.cxx           |    6 +-----
 Source/cmCPluginAPI.cxx                  |    7 +++---
 Source/cmComputeLinkDepends.cxx          |    7 +++---
 Source/cmFLTKWrapUICommand.cxx           |    7 ++----
 Source/cmFileCommand.cxx                 |    4 ++--
 Source/cmFindLibraryCommand.cxx          |    4 ++--
 Source/cmInstallFilesCommand.cxx         |    7 ++----
 Source/cmListCommand.cxx                 |   34 ++++++++++--------------------
 Source/cmLocalGenerator.cxx              |   33 +++++++++++------------------
 Source/cmLocalUnixMakefileGenerator3.cxx |   14 +++++-------
 Source/cmMakefile.cxx                    |   13 ------------
 Source/cmMakefile.h                      |   11 ----------
 Source/cmQTWrapCPPCommand.cxx            |   10 +++------
 Source/cmQTWrapUICommand.cxx             |   10 +++------
 Source/cmSetTargetPropertiesCommand.cxx  |   15 ++++---------
 Source/cmSetTestsPropertiesCommand.cxx   |   15 ++++---------
 Source/cmSystemTools.cxx                 |    8 +++++--
 Source/cmTarget.cxx                      |   13 ++++--------
 Source/cmXMLSafe.cxx                     |    4 ++--
 Source/cmXMLSafe.h                       |    4 ++--
 Source/cmake.cxx                         |    9 ++++----
 25 files changed, 85 insertions(+), 170 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Feb  5 16:03:28 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu,  5 Feb 2015 16:03:28 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1059-g4587caf
Message-ID: <20150205210328.0E1E8AAC77@public.kitware.com>

This is an automated email from 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  4587caf8dc727e8a18b28cef9755c0b1d4500f4f (commit)
       via  9af29a6dc3f0fc2c21450e76f041561418c88dd7 (commit)
      from  446462370badf7bf80b74dc5209c72c7f6a88a26 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4587caf8dc727e8a18b28cef9755c0b1d4500f4f
commit 4587caf8dc727e8a18b28cef9755c0b1d4500f4f
Merge: 4464623 9af29a6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 5 16:03:27 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 16:03:27 2015 -0500

    Merge topic 'export-interface-source-files' into next
    
    9af29a6d Remove message.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9af29a6dc3f0fc2c21450e76f041561418c88dd7
commit 9af29a6dc3f0fc2c21450e76f041561418c88dd7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 5 22:02:48 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 22:02:48 2015 +0100

    Remove message.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index c7bef67..6519682 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -3,7 +3,6 @@
 macro(add_RunCMake_test test)
   set(TEST_ARGS ${ARGN})
   if ("${ARGV1}" STREQUAL "TEST_DIR")
-    message("HERE ${ARGV1}")
     if ("${ARGV2}" STREQUAL "")
       message(FATAL_ERROR "Invalid args")
     endif()

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt |    1 -
 1 file changed, 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Feb  5 16:20:17 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu,  5 Feb 2015 16:20:17 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1065-gdd90ab2
Message-ID: <20150205212017.47257A8122@public.kitware.com>

This is an automated email from 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  dd90ab2b3d50268705c5a6ca3e0aa9c9d16a3038 (commit)
       via  3a9bb53a0034c37ac38581fc3db63c3431682d2a (commit)
       via  47504ae2100cd13eb89b612ed819cc3d9548b12a (commit)
       via  7b593d4fc851a60ac4a8cc75d29aae1e9b711f86 (commit)
       via  4e9a4428f859fef71b774b095716d470b5ac7334 (commit)
       via  3e9d6e5439e7f35dbc5961c8d1bb5b2d35bfc451 (commit)
      from  4587caf8dc727e8a18b28cef9755c0b1d4500f4f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd90ab2b3d50268705c5a6ca3e0aa9c9d16a3038
commit dd90ab2b3d50268705c5a6ca3e0aa9c9d16a3038
Merge: 4587caf 3a9bb53
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 5 16:20:15 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 16:20:15 2015 -0500

    Merge topic 'cmStandardIncludes-cleanup' into next
    
    3a9bb53a cmStandardIncludes: Remove functional header.
    47504ae2 cmStandardIncludes: Remove list include.
    7b593d4f cmStandardIncludes: Remove deque include.
    4e9a4428 cmStandardIncludes: Remove some VS6 workarounds.
    3e9d6e54 cmStandardIncludes: Remove compatibility typedef added for MSVC6.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a9bb53a0034c37ac38581fc3db63c3431682d2a
commit 3a9bb53a0034c37ac38581fc3db63c3431682d2a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 5 22:08:53 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 22:19:30 2015 +0100

    cmStandardIncludes: Remove functional header.
    
    It is unused.

diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 8b4742a..262e9a6 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -51,7 +51,6 @@
 #include <string>
 #include <iterator>
 #include <algorithm>
-#include <functional>
 #include <map>
 #include <set>
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47504ae2100cd13eb89b612ed819cc3d9548b12a
commit 47504ae2100cd13eb89b612ed819cc3d9548b12a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 12 21:17:55 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 22:19:30 2015 +0100

    cmStandardIncludes: Remove list include.
    
    Include it only where used.

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 1c670d2..006239a 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -25,6 +25,7 @@
 #include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>
 #include <algorithm>
+#include <list>
 
 #if defined(__HAIKU__)
 #include <FindDirectory.h>
diff --git a/Source/CTest/cmCTestGlobalVC.h b/Source/CTest/cmCTestGlobalVC.h
index cb0d165..29e0a61 100644
--- a/Source/CTest/cmCTestGlobalVC.h
+++ b/Source/CTest/cmCTestGlobalVC.h
@@ -14,6 +14,8 @@
 
 #include "cmCTestVC.h"
 
+#include <list>
+
 /** \class cmCTestGlobalVC
  * \brief Base class for handling globally-versioned trees
  *
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index f9e8a3c..f223127 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -16,6 +16,7 @@
 #include "cmSystemTools.h"
 #include <stdlib.h>
 #include <stack>
+#include <list>
 #include <float.h>
 #include <cmsys/FStream.hxx>
 
diff --git a/Source/CTest/cmCTestSVN.h b/Source/CTest/cmCTestSVN.h
index c6548e3..17bf7cb 100644
--- a/Source/CTest/cmCTestSVN.h
+++ b/Source/CTest/cmCTestSVN.h
@@ -14,6 +14,8 @@
 
 #include "cmCTestGlobalVC.h"
 
+#include <list>
+
 /** \class cmCTestSVN
  * \brief Interaction with subversion command-line tool
  *
diff --git a/Source/cmCommands.h b/Source/cmCommands.h
index c56673f..e902853 100644
--- a/Source/cmCommands.h
+++ b/Source/cmCommands.h
@@ -13,6 +13,8 @@
 #define cmCommands_h
 #include "cmStandardIncludes.h"
 
+#include <list>
+
 class cmCommand;
 /**
  * Global function to return all compiled in commands.
diff --git a/Source/cmConditionEvaluator.h b/Source/cmConditionEvaluator.h
index 01624f9..fcef234 100644
--- a/Source/cmConditionEvaluator.h
+++ b/Source/cmConditionEvaluator.h
@@ -15,6 +15,8 @@
 #include "cmCommand.h"
 #include "cmExpandedCommandArgument.h"
 
+#include <list>
+
 class cmConditionEvaluator
 {
 public:
diff --git a/Source/cmFileLockPool.h b/Source/cmFileLockPool.h
index baef310..f0614a3 100644
--- a/Source/cmFileLockPool.h
+++ b/Source/cmFileLockPool.h
@@ -14,6 +14,8 @@
 
 #include "cmStandardIncludes.h"
 
+#include <list>
+
 class cmFileLockResult;
 class cmFileLock;
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ba914e1..ff3e35d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -38,6 +38,7 @@
 #include <cmsys/auto_ptr.hxx>
 
 #include <stack>
+#include <list>
 #include <ctype.h> // for isspace
 #include <assert.h>
 
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 79fa5df..f74e3c5 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -14,6 +14,8 @@
 #ifndef cmQtAutoGenerators_h
 #define cmQtAutoGenerators_h
 
+#include <list>
+
 class cmGlobalGenerator;
 class cmMakefile;
 
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index cf23feb..8b4742a 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -53,7 +53,6 @@
 #include <algorithm>
 #include <functional>
 #include <map>
-#include <list>
 #include <set>
 
 // include the "c" string header
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 652e451..4b6af0a 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -103,6 +103,8 @@
 
 #include <sys/stat.h> // struct stat
 
+#include <list>
+
 static bool cmakeCheckStampFile(const char* stampName);
 static bool cmakeCheckStampList(const char* stampName);
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b593d4fc851a60ac4a8cc75d29aae1e9b711f86
commit 7b593d4fc851a60ac4a8cc75d29aae1e9b711f86
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 12 21:11:16 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 22:19:29 2015 +0100

    cmStandardIncludes: Remove deque include.
    
    Include it only where used.

diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h
index 09346f9..d13d5cf 100644
--- a/Source/CTest/cmCTestBuildHandler.h
+++ b/Source/CTest/cmCTestBuildHandler.h
@@ -19,6 +19,8 @@
 
 #include <cmsys/RegularExpression.hxx>
 
+#include <deque>
+
 class cmMakefile;
 
 /** \class cmCTestBuildHandler
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index bff8c12..110db24 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -35,6 +35,7 @@
 #endif
 
 #include <stack>
+#include <deque>
 
 class cmFunctionBlocker;
 class cmCommand;
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 7a966d8..cf23feb 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -55,7 +55,6 @@
 #include <map>
 #include <list>
 #include <set>
-#include <deque>
 
 // include the "c" string header
 #include <string.h>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e9a4428f859fef71b774b095716d470b5ac7334
commit 4e9a4428f859fef71b774b095716d470b5ac7334
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 12 21:05:34 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 22:19:29 2015 +0100

    cmStandardIncludes: Remove some VS6 workarounds.
    
    Added in commit v2.6.0~2824 (COMP: Fix warnings in system headers
    on VS6., 2006-08-29), but no longer needed.

diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 3b46e8d..7a966d8 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -22,7 +22,6 @@
 #ifdef _MSC_VER
 #pragma warning ( disable : 4786 )
 #pragma warning ( disable : 4503 )
-#pragma warning ( disable : 4512 ) /* operator=() could not be generated */
 #endif
 
 
@@ -42,11 +41,6 @@
 # include <cmsys/IOStream.hxx>
 #endif
 
-// Avoid warnings in system headers.
-#if defined(_MSC_VER)
-# pragma warning (push,1)
-#endif
-
 #include <fstream>
 #include <iostream>
 #include <iomanip>
@@ -63,10 +57,6 @@
 #include <set>
 #include <deque>
 
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif
-
 // include the "c" string header
 #include <string.h>
 #include <stdio.h>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e9d6e5439e7f35dbc5961c8d1bb5b2d35bfc451
commit 3e9d6e5439e7f35dbc5961c8d1bb5b2d35bfc451
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 12 20:51:42 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 22:19:20 2015 +0100

    cmStandardIncludes: Remove compatibility typedef added for MSVC6.
    
    Added in commit v2.4.0~3401 (ERR: Fix build problems on Visual
    Studio 6, 2004-01-26)

diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 646300d..3b46e8d 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -72,10 +72,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if defined( _MSC_VER )
-typedef unsigned short mode_t;
-#endif
-
 // use this class to shrink the size of symbols in .o files
 // std::string is really basic_string<....lots of stuff....>
 // when combined with a map or set, the symbols can be > 2000 chars!

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

Summary of changes:
 Source/CPack/cmCPackGenerator.cxx           |    1 +
 Source/CTest/cmCTestBuildHandler.h          |    2 ++
 Source/CTest/cmCTestGlobalVC.h              |    2 ++
 Source/CTest/cmCTestMultiProcessHandler.cxx |    1 +
 Source/CTest/cmCTestSVN.h                   |    2 ++
 Source/cmCommands.h                         |    2 ++
 Source/cmConditionEvaluator.h               |    2 ++
 Source/cmFileLockPool.h                     |    2 ++
 Source/cmMakefile.cxx                       |    1 +
 Source/cmMakefile.h                         |    1 +
 Source/cmQtAutoGenerators.h                 |    2 ++
 Source/cmStandardIncludes.h                 |   17 -----------------
 Source/cmake.cxx                            |    2 ++
 13 files changed, 20 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Feb  5 17:54:16 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu,  5 Feb 2015 17:54:16 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1067-gcd87066
Message-ID: <20150205225416.E9FF5AAB02@public.kitware.com>

This is an automated email from 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  cd8706623698962a152d8dce29a3c03bf8008cf7 (commit)
       via  641c5583339c945d07c2f54e235e2c6662d471b5 (commit)
      from  dd90ab2b3d50268705c5a6ca3e0aa9c9d16a3038 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd8706623698962a152d8dce29a3c03bf8008cf7
commit cd8706623698962a152d8dce29a3c03bf8008cf7
Merge: dd90ab2 641c558
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 5 17:54:16 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 5 17:54:16 2015 -0500

    Merge topic 'cmStandardIncludes-cleanup' into next
    
    641c5583 Revert "cmStandardIncludes: Remove compatibility typedef added for MSVC6."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=641c5583339c945d07c2f54e235e2c6662d471b5
commit 641c5583339c945d07c2f54e235e2c6662d471b5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 5 23:53:49 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 5 23:53:49 2015 +0100

    Revert "cmStandardIncludes: Remove compatibility typedef added for MSVC6."
    
    This reverts commit 3e9d6e5439e7f35dbc5961c8d1bb5b2d35bfc451.

diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 262e9a6..0909719 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -59,6 +59,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#if defined( _MSC_VER )
+typedef unsigned short mode_t;
+#endif
+
 // use this class to shrink the size of symbols in .o files
 // std::string is really basic_string<....lots of stuff....>
 // when combined with a map or set, the symbols can be > 2000 chars!

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

Summary of changes:
 Source/cmStandardIncludes.h |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Fri Feb  6 00:01:21 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Fri,  6 Feb 2015 00:01:21 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1019-g3f73531
Message-ID: <20150206050122.657F3AAE82@public.kitware.com>

This is an automated email from 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  3f73531d4e415c9c6182e162028eb146922d3c90 (commit)
      from  098160d5f2a1aa35d2f14c585dd87cefd8f56f41 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f73531d4e415c9c6182e162028eb146922d3c90
commit 3f73531d4e415c9c6182e162028eb146922d3c90
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Fri Feb 6 00:01:16 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Feb 6 00:01:16 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index a7d6c4b..ee29533 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 2)
-set(CMake_VERSION_PATCH 20150205)
+set(CMake_VERSION_PATCH 20150206)
 #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 Feb  6 09:22:05 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  6 Feb 2015 09:22:05 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1070-ge74b7b5
Message-ID: <20150206142205.E43EAAAED9@public.kitware.com>

This is an automated email from 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  e74b7b59722283f44775831ddb0357bdcc9c798a (commit)
       via  8521fdf56e4908676c28c6bbdda3f1fb2284d3d7 (commit)
       via  69ac6d27555cd4819d0c7f40e4471c6f885e23ab (commit)
      from  cd8706623698962a152d8dce29a3c03bf8008cf7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e74b7b59722283f44775831ddb0357bdcc9c798a
commit e74b7b59722283f44775831ddb0357bdcc9c798a
Merge: cd87066 8521fdf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 09:22:04 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 6 09:22:04 2015 -0500

    Merge topic 'fix-make-parallel-output' into next
    
    8521fdf5 Makefile: Fix output during parallel builds (#12991)
    69ac6d27 bootstrap: Enable color Makefile output


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8521fdf56e4908676c28c6bbdda3f1fb2284d3d7
commit 8521fdf56e4908676c28c6bbdda3f1fb2284d3d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 16:48:16 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 6 08:36:51 2015 -0500

    Makefile: Fix output during parallel builds (#12991)
    
    Replace use of separate "cmake -E cmake_progress_report" and "cmake -E
    cmake_echo_color" commands to report the progress and message portions
    of build output lines with --progress-* options to the latter to print
    everything with a single command.  The line buffering of the stdout FILE
    stream should cause the whole line to be printed with one atomic write.
    This will avoid inter-mixing of line-wise messages from different
    processes during a parallel build.

diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 5f1bb83..e0ccaa9 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -779,29 +779,24 @@ cmGlobalUnixMakefileGenerator3
       localName += "/all";
       depends.clear();
 
-      std::string progressDir =
-        lg->GetMakefile()->GetHomeOutputDirectory();
-      progressDir += cmake::GetCMakeFilesDirectory();
+      cmLocalUnixMakefileGenerator3::EchoProgress progress;
+      progress.Dir = lg->GetMakefile()->GetHomeOutputDirectory();
+      progress.Dir += cmake::GetCMakeFilesDirectory();
+      {
+      std::ostringstream progressArg;
+      const char* sep = "";
+      std::vector<unsigned long>& progFiles =
+        this->ProgressMap[gtarget->Target].Marks;
+      for (std::vector<unsigned long>::iterator i = progFiles.begin();
+           i != progFiles.end(); ++i)
         {
-        std::ostringstream progCmd;
-        progCmd << "$(CMAKE_COMMAND) -E cmake_progress_report ";
-        // all target counts
-        progCmd << lg->Convert(progressDir,
-                                cmLocalGenerator::FULL,
-                                cmLocalGenerator::SHELL);
-        progCmd << " ";
-        std::vector<unsigned long>& progFiles =
-          this->ProgressMap[gtarget->Target].Marks;
-        for (std::vector<unsigned long>::iterator i = progFiles.begin();
-              i != progFiles.end(); ++i)
-          {
-          progCmd << " " << *i;
-          }
-        commands.push_back(progCmd.str());
+        progressArg << sep << *i;
+        sep = ",";
         }
-      progressDir = "Built target ";
-      progressDir += name;
-      lg->AppendEcho(commands,progressDir.c_str());
+      progress.Arg = progressArg.str();
+      }
+      lg->AppendEcho(commands, "Built target " + name,
+        cmLocalUnixMakefileGenerator3::EchoNormal, &progress);
 
       this->AppendGlobalTargetDepends(depends,*gtarget->Target);
       lg->WriteMakeRule(ruleFileStream, "All Build rule for target.",
@@ -819,15 +814,13 @@ cmGlobalUnixMakefileGenerator3
 
       // Write the rule.
       commands.clear();
-      progressDir = lg->GetMakefile()->GetHomeOutputDirectory();
-      progressDir += cmake::GetCMakeFilesDirectory();
 
       {
       // TODO: Convert the total progress count to a make variable.
       std::ostringstream progCmd;
       progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start ";
       // # in target
-      progCmd << lg->Convert(progressDir,
+      progCmd << lg->Convert(progress.Dir,
                               cmLocalGenerator::FULL,
                               cmLocalGenerator::SHELL);
       //
@@ -843,7 +836,7 @@ cmGlobalUnixMakefileGenerator3
       {
       std::ostringstream progCmd;
       progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # 0
-      progCmd << lg->Convert(progressDir,
+      progCmd << lg->Convert(progress.Dir,
                               cmLocalGenerator::FULL,
                               cmLocalGenerator::SHELL);
       progCmd << " 0";
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 72d4ef0..c60a9c7 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1346,8 +1346,9 @@ cmLocalUnixMakefileGenerator3
 //----------------------------------------------------------------------------
 void
 cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands,
-                                          const char* text,
-                                          EchoColor color)
+                                          std::string const& text,
+                                          EchoColor color,
+                                          EchoProgress const* progress)
 {
   // Choose the color for the text.
   std::string color_name;
@@ -1380,7 +1381,7 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands,
   // Echo one line at a time.
   std::string line;
   line.reserve(200);
-  for(const char* c = text;; ++c)
+  for(const char* c = text.c_str();; ++c)
     {
     if(*c == '\n' || *c == '\0')
       {
@@ -1389,7 +1390,7 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands,
         {
         // Add a command to echo this line.
         std::string cmd;
-        if(color_name.empty())
+        if(color_name.empty() && !progress)
           {
           // Use the native echo command.
           cmd = "@echo ";
@@ -1400,6 +1401,17 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands,
           // Use cmake to echo the text in color.
           cmd = "@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) ";
           cmd += color_name;
+          if (progress)
+            {
+            cmd += "--progress-dir=";
+            cmd += this->Convert(progress->Dir,
+                                 cmLocalGenerator::FULL,
+                                 cmLocalGenerator::SHELL);
+            cmd += " ";
+            cmd += "--progress-num=";
+            cmd += progress->Arg;
+            cmd += " ";
+            }
           cmd += this->EscapeForShell(line);
           }
         commands.push_back(cmd);
@@ -1408,6 +1420,9 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands,
       // Reset the line to emtpy.
       line = "";
 
+      // Progress appears only on first line.
+      progress = 0;
+
       // Terminate on end-of-string.
       if(*c == '\0')
         {
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 7c8e27f..1ff5e7f 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -184,8 +184,9 @@ public:
   // append an echo command
   enum EchoColor { EchoNormal, EchoDepend, EchoBuild, EchoLink,
                    EchoGenerate, EchoGlobal };
-  void AppendEcho(std::vector<std::string>& commands, const char* text,
-                  EchoColor color = EchoNormal);
+  struct EchoProgress { std::string Dir; std::string Arg; };
+  void AppendEcho(std::vector<std::string>& commands, std::string const& text,
+                  EchoColor color = EchoNormal, EchoProgress const* = 0);
 
   /** Get whether the makefile is to have color.  */
   bool GetColorMakefile() const { return this->ColorMakefile; }
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 7ed0c10..20207f5 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -618,16 +618,19 @@ cmMakefileTargetGenerator
   std::vector<std::string> commands;
 
   // add in a progress call if needed
-  this->AppendProgress(commands);
+  this->NumberOfProgressActions++;
 
   if(!this->NoRuleMessages)
     {
+    cmLocalUnixMakefileGenerator3::EchoProgress progress;
+    this->MakeEchoProgress(progress);
     std::string buildEcho = "Building ";
     buildEcho += lang;
     buildEcho += " object ";
     buildEcho += relativeObj;
     this->LocalGenerator->AppendEcho
-      (commands, buildEcho.c_str(), cmLocalUnixMakefileGenerator3::EchoBuild);
+      (commands, buildEcho.c_str(), cmLocalUnixMakefileGenerator3::EchoBuild,
+       &progress);
     }
 
   std::string targetOutPathReal;
@@ -1200,12 +1203,15 @@ void cmMakefileTargetGenerator
   if(!comment.empty())
     {
     // add in a progress call if needed
-    this->AppendProgress(commands);
+    this->NumberOfProgressActions++;
     if(!this->NoRuleMessages)
       {
+      cmLocalUnixMakefileGenerator3::EchoProgress progress;
+      this->MakeEchoProgress(progress);
       this->LocalGenerator
         ->AppendEcho(commands, comment.c_str(),
-                     cmLocalUnixMakefileGenerator3::EchoGenerate);
+                     cmLocalUnixMakefileGenerator3::EchoGenerate,
+                     &progress);
       }
     }
 
@@ -1263,22 +1269,14 @@ void cmMakefileTargetGenerator
 
 //----------------------------------------------------------------------------
 void
-cmMakefileTargetGenerator::AppendProgress(std::vector<std::string>& commands)
+cmMakefileTargetGenerator
+::MakeEchoProgress(cmLocalUnixMakefileGenerator3::EchoProgress& progress) const
 {
-  this->NumberOfProgressActions++;
-  if(this->NoRuleMessages)
-    {
-    return;
-    }
-  std::string progressDir = this->Makefile->GetHomeOutputDirectory();
-  progressDir += cmake::GetCMakeFilesDirectory();
-  std::ostringstream progCmd;
-  progCmd << "$(CMAKE_COMMAND) -E cmake_progress_report ";
-  progCmd << this->LocalGenerator->Convert(progressDir,
-                                           cmLocalGenerator::FULL,
-                                           cmLocalGenerator::SHELL);
-  progCmd << " $(CMAKE_PROGRESS_" << this->NumberOfProgressActions << ")";
-  commands.push_back(progCmd.str());
+  progress.Dir = this->Makefile->GetHomeOutputDirectory();
+  progress.Dir += cmake::GetCMakeFilesDirectory();
+  std::ostringstream progressArg;
+  progressArg << "$(CMAKE_PROGRESS_" << this->NumberOfProgressActions << ")";
+  progress.Arg = progressArg.str();
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h
index e31e086..b072cfa 100644
--- a/Source/cmMakefileTargetGenerator.h
+++ b/Source/cmMakefileTargetGenerator.h
@@ -109,7 +109,7 @@ protected:
   void GenerateExtraOutput(const char* out, const char* in,
                            bool symbolic = false);
 
-  void AppendProgress(std::vector<std::string>& commands);
+  void MakeEchoProgress(cmLocalUnixMakefileGenerator3::EchoProgress&) const;
 
   // write out the variable that lists the objects for this target
   void WriteObjectsVariable(std::string& variableName,
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 6b04d26..5260cb0 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -534,48 +534,9 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
     // Command to report progress for a build
     else if (args[1] == "cmake_progress_report" && args.size() >= 3)
       {
-      std::string dirName = args[2];
-      dirName += "/Progress";
-      std::string fName;
-      FILE *progFile;
-
-      // read the count
-      fName = dirName;
-      fName += "/count.txt";
-      progFile = cmsys::SystemTools::Fopen(fName,"r");
-      int count = 0;
-      if (!progFile)
-        {
-        return 0;
-        }
-      else
-        {
-        if (1!=fscanf(progFile,"%i",&count))
-          {
-          cmSystemTools::Message("Could not read from progress file.");
-          }
-        fclose(progFile);
-        }
-      unsigned int i;
-      for (i = 3; i < args.size(); ++i)
-        {
-        fName = dirName;
-        fName += "/";
-        fName += args[i];
-        progFile = cmsys::SystemTools::Fopen(fName,"w");
-        if (progFile)
-          {
-          fprintf(progFile,"empty");
-          fclose(progFile);
-          }
-        }
-      int fileNum = static_cast<int>
-        (cmsys::Directory::GetNumberOfFilesInDirectory(dirName));
-      if (count > 0)
-        {
-        // print the progress
-        fprintf(stdout,"[%3i%%] ",((fileNum-3)*100)/count);
-        }
+      // This has been superseded by cmake_echo_color --progress-*
+      // options.  We leave it here to avoid errors if somehow this
+      // is invoked by an existing makefile without regenerating.
       return 0;
       }
 
@@ -987,6 +948,65 @@ bool cmcmd::SymlinkInternal(std::string const& file, std::string const& link)
 }
 
 //----------------------------------------------------------------------------
+static void cmcmdProgressReport(std::string const& dir,
+                                std::string const& num)
+{
+  std::string dirName = dir;
+  dirName += "/Progress";
+  std::string fName;
+  FILE *progFile;
+
+  // read the count
+  fName = dirName;
+  fName += "/count.txt";
+  progFile = cmsys::SystemTools::Fopen(fName,"r");
+  int count = 0;
+  if (!progFile)
+    {
+    return;
+    }
+  else
+    {
+    if (1!=fscanf(progFile,"%i",&count))
+      {
+      cmSystemTools::Message("Could not read from progress file.");
+      }
+    fclose(progFile);
+    }
+  const char* last = num.c_str();
+  for(const char* c = last;; ++c)
+    {
+    if (*c == ',' || *c == '\0')
+      {
+      if (c != last)
+        {
+        fName = dirName;
+        fName += "/";
+        fName.append(last, c-last);
+        progFile = cmsys::SystemTools::Fopen(fName,"w");
+        if (progFile)
+          {
+          fprintf(progFile,"empty");
+          fclose(progFile);
+          }
+        }
+      if(*c == '\0')
+        {
+        break;
+        }
+      last = c + 1;
+      }
+    }
+  int fileNum = static_cast<int>
+    (cmsys::Directory::GetNumberOfFilesInDirectory(dirName));
+  if (count > 0)
+    {
+    // print the progress
+    fprintf(stdout,"[%3i%%] ",((fileNum-3)*100)/count);
+    }
+}
+
+//----------------------------------------------------------------------------
 int cmcmd::ExecuteEchoColor(std::vector<std::string>& args)
 {
   // The arguments are
@@ -996,6 +1016,7 @@ int cmcmd::ExecuteEchoColor(std::vector<std::string>& args)
   bool enabled = true;
   int color = cmsysTerminal_Color_Normal;
   bool newline = true;
+  std::string progressDir;
   for(unsigned int i=2; i < args.size(); ++i)
     {
     if(args[i].find("--switch=") == 0)
@@ -1014,6 +1035,18 @@ int cmcmd::ExecuteEchoColor(std::vector<std::string>& args)
           }
         }
       }
+    else if(cmHasLiteralPrefix(args[i], "--progress-dir="))
+      {
+      progressDir = args[i].substr(15);
+      }
+    else if(cmHasLiteralPrefix(args[i], "--progress-num="))
+      {
+      if (!progressDir.empty())
+        {
+        std::string const& progressNum = args[i].substr(15);
+        cmcmdProgressReport(progressDir, progressNum);
+        }
+      }
     else if(args[i] == "--normal")
       {
       color = cmsysTerminal_Color_Normal;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69ac6d27555cd4819d0c7f40e4471c6f885e23ab
commit 69ac6d27555cd4819d0c7f40e4471c6f885e23ab
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 5 16:29:59 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 5 16:44:56 2015 -0500

    bootstrap: Enable color Makefile output
    
    Build the needed infrastructure during bootstrap in order to allow
    "cmake -E cmake_echo_color" to be used unconditionally during
    generation.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index fbf2140..72d4ef0 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -27,10 +27,10 @@
 #ifdef CMAKE_BUILD_WITH_CMAKE
 # include "cmDependsFortran.h"
 # include "cmDependsJava.h"
-# include <cmsys/Terminal.h>
 #endif
 
 #include <cmsys/auto_ptr.hxx>
+#include <cmsys/Terminal.h>
 
 #include <queue>
 
@@ -1351,7 +1351,6 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands,
 {
   // Choose the color for the text.
   std::string color_name;
-#ifdef CMAKE_BUILD_WITH_CMAKE
   if(this->GlobalGenerator->GetToolSupportsColor() && this->ColorMakefile)
     {
     // See cmake::ExecuteEchoColor in cmake.cxx for these options.
@@ -1377,9 +1376,6 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands,
         break;
       }
     }
-#else
-  (void)color;
-#endif
 
   // Echo one line at a time.
   std::string line;
@@ -1617,14 +1613,10 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies(const char* tgtInfo,
     targetName = targetName.substr(0, targetName.length()-4);
     std::string message = "Scanning dependencies of target ";
     message += targetName;
-#ifdef CMAKE_BUILD_WITH_CMAKE
     cmSystemTools::MakefileColorEcho(
       cmsysTerminal_Color_ForegroundMagenta |
       cmsysTerminal_Color_ForegroundBold,
       message.c_str(), true, color);
-#else
-    fprintf(stdout, "%s\n", message.c_str());
-#endif
 
     return this->ScanDependencies(dir.c_str(), validDependencies);
     }
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index e9735ed..ec3d846 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -27,10 +27,10 @@
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 # include "cmArchiveWrite.h"
 # include <cm_libarchive.h>
-# include <cmsys/Terminal.h>
 #endif
 #include <cmsys/stl/algorithm>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Terminal.h>
 
 #if defined(_WIN32)
 # include <windows.h>
@@ -2284,7 +2284,6 @@ std::string const& cmSystemTools::GetCMakeRoot()
 }
 
 //----------------------------------------------------------------------------
-#if defined(CMAKE_BUILD_WITH_CMAKE)
 void cmSystemTools::MakefileColorEcho(int color, const char* message,
                                       bool newline, bool enabled)
 {
@@ -2314,7 +2313,6 @@ void cmSystemTools::MakefileColorEcho(int color, const char* message,
     fprintf(stdout, "%s%s", message, newline? "\n" : "");
     }
 }
-#endif
 
 //----------------------------------------------------------------------------
 bool cmSystemTools::GuessLibrarySOName(std::string const& fullPath,
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index 361f42e..c59ae96 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -428,11 +428,9 @@ public:
   static std::string const& GetCMakeCursesCommand();
   static std::string const& GetCMakeRoot();
 
-#if defined(CMAKE_BUILD_WITH_CMAKE)
   /** Echo a message in color using KWSys's Terminal cprintf.  */
   static void MakefileColorEcho(int color, const char* message,
                                 bool newLine, bool enabled);
-#endif
 
   /** Try to guess the soname of a shared library.  */
   static bool GuessLibrarySOName(std::string const& fullPath,
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 28fcd27..6b04d26 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -18,12 +18,12 @@
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 # include "cmDependsFortran.h" // For -E cmake_copy_f90_mod callback.
-# include <cmsys/Terminal.h>
 #endif
 
 #include <cmsys/Directory.hxx>
 #include <cmsys/Process.h>
 #include <cmsys/FStream.hxx>
+#include <cmsys/Terminal.h>
 
 #if defined(CMAKE_HAVE_VS_GENERATORS)
 #include "cmCallVisualStudioMacro.h"
@@ -753,12 +753,12 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
       {
       return cmcmd::VisualStudioLink(args, 2);
       }
-#ifdef CMAKE_BUILD_WITH_CMAKE
     // Internal CMake color makefile support.
     else if (args[1] == "cmake_echo_color")
       {
       return cmcmd::ExecuteEchoColor(args);
       }
+#ifdef CMAKE_BUILD_WITH_CMAKE
     else if (args[1] == "cmake_autogen" && args.size() >= 4)
       {
         cmQtAutoGenerators autogen;
@@ -987,7 +987,6 @@ bool cmcmd::SymlinkInternal(std::string const& file, std::string const& link)
 }
 
 //----------------------------------------------------------------------------
-#ifdef CMAKE_BUILD_WITH_CMAKE
 int cmcmd::ExecuteEchoColor(std::vector<std::string>& args)
 {
   // The arguments are
@@ -1073,12 +1072,6 @@ int cmcmd::ExecuteEchoColor(std::vector<std::string>& args)
 
   return 0;
 }
-#else
-int cmcmd::ExecuteEchoColor(std::vector<std::string>&)
-{
-  return 1;
-}
-#endif
 
 //----------------------------------------------------------------------------
 int cmcmd::ExecuteLinkScript(std::vector<std::string>& args)
diff --git a/bootstrap b/bootstrap
index a88eb6a..8e22bee 100755
--- a/bootstrap
+++ b/bootstrap
@@ -333,13 +333,15 @@ if ${cmake_system_mingw}; then
     EncodingC \
     ProcessWin32 \
     String \
-    System"
+    System \
+    Terminal"
 else
   KWSYS_C_SOURCES="\
     EncodingC \
     ProcessUNIX \
     String \
-    System"
+    System \
+    Terminal"
 fi
 
 KWSYS_CXX_SOURCES="\
@@ -362,7 +364,8 @@ KWSYS_FILES="\
   String.h \
   String.hxx \
   System.h \
-  SystemTools.hxx"
+  SystemTools.hxx \
+  Terminal.h"
 
 KWSYS_IOS_FILES="
   fstream \

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

Summary of changes:
 Source/cmGlobalUnixMakefileGenerator3.cxx |   43 ++++------
 Source/cmLocalUnixMakefileGenerator3.cxx  |   33 +++++---
 Source/cmLocalUnixMakefileGenerator3.h    |    5 +-
 Source/cmMakefileTargetGenerator.cxx      |   36 ++++----
 Source/cmMakefileTargetGenerator.h        |    2 +-
 Source/cmSystemTools.cxx                  |    4 +-
 Source/cmSystemTools.h                    |    2 -
 Source/cmcmd.cxx                          |  128 +++++++++++++++++------------
 bootstrap                                 |    9 +-
 9 files changed, 143 insertions(+), 119 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb  6 10:16:42 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  6 Feb 2015 10:16:42 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1072-gabee514
Message-ID: <20150206151642.7E47DA7F26@public.kitware.com>

This is an automated email from 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  abee514ddbf3a5b3fb5fea1a4b755149100eaf5d (commit)
       via  3f73531d4e415c9c6182e162028eb146922d3c90 (commit)
      from  e74b7b59722283f44775831ddb0357bdcc9c798a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=abee514ddbf3a5b3fb5fea1a4b755149100eaf5d
commit abee514ddbf3a5b3fb5fea1a4b755149100eaf5d
Merge: e74b7b5 3f73531
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 10:16:34 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 6 10:16:34 2015 -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 Feb  6 12:54:58 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  6 Feb 2015 12:54:58 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1076-g9d3b0df
Message-ID: <20150206175458.43B5EAAEC6@public.kitware.com>

This is an automated email from 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  9d3b0dfd93694ffee04c5b4b5795aa7ebf6ca059 (commit)
       via  d2fe4c420370727c644432549b7a5ca9dfef3a28 (commit)
       via  de63ff489d25095e41deae724f499ea3df05b6cf (commit)
       via  9924486f8a979bf937c8fd7749aaf37c1bd762e1 (commit)
      from  abee514ddbf3a5b3fb5fea1a4b755149100eaf5d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d3b0dfd93694ffee04c5b4b5795aa7ebf6ca059
commit 9d3b0dfd93694ffee04c5b4b5795aa7ebf6ca059
Merge: abee514 d2fe4c4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 12:54:57 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 6 12:54:57 2015 -0500

    Merge topic 'xcode-flags-per-language' into next
    
    d2fe4c42 cmGlobalXCodeGenerator: Rename variable 'lang' => 'llang'
    de63ff48 Xcode: Generate Intel Fortran compiler flags in project files
    9924486f Xcode: Refactor generation of per-language compiler flags


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2fe4c420370727c644432549b7a5ca9dfef3a28
commit d2fe4c420370727c644432549b7a5ca9dfef3a28
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 10:31:08 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 6 11:46:03 2015 -0500

    cmGlobalXCodeGenerator: Rename variable 'lang' => 'llang'
    
    In CreateBuildSettings the variable holds the linker language.
    Use a more distinctive variable name.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 0636910..30ed134 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1775,8 +1775,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       AddCompileOptions(flags, &target, lang, configName);
     }
 
-  std::string lang = target.GetLinkerLanguage(configName);
-  if(binary && lang.empty())
+  std::string llang = target.GetLinkerLanguage(configName);
+  if(binary && llang.empty())
     {
     cmSystemTools::Error
       ("CMake can not determine linker language for target: ",
@@ -2001,7 +2001,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       // in many ways as an application bundle, as far as
       // link flags go
       std::string createFlags =
-        this->LookupFlags("CMAKE_SHARED_MODULE_CREATE_", lang, "_FLAGS",
+        this->LookupFlags("CMAKE_SHARED_MODULE_CREATE_", llang, "_FLAGS",
                           "-bundle");
       if(!createFlags.empty())
         {
@@ -2029,7 +2029,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                   this->CreateString("NO"));
       // Add the flags to create an executable.
       std::string createFlags =
-        this->LookupFlags("CMAKE_", lang, "_LINK_FLAGS", "");
+        this->LookupFlags("CMAKE_", llang, "_LINK_FLAGS", "");
       if(!createFlags.empty())
         {
         extraLinkOptions += " ";
@@ -2040,7 +2040,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       {
       // Add the flags to create a module.
       std::string createFlags =
-        this->LookupFlags("CMAKE_SHARED_MODULE_CREATE_", lang, "_FLAGS",
+        this->LookupFlags("CMAKE_SHARED_MODULE_CREATE_", llang, "_FLAGS",
                           "-bundle");
       if(!createFlags.empty())
         {
@@ -2074,7 +2074,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       {
       // Add the flags to create a shared library.
       std::string createFlags =
-        this->LookupFlags("CMAKE_SHARED_LIBRARY_CREATE_", lang, "_FLAGS",
+        this->LookupFlags("CMAKE_SHARED_LIBRARY_CREATE_", llang, "_FLAGS",
                           "-dynamiclib");
       if(!createFlags.empty())
         {
@@ -2091,7 +2091,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     // Add the flags to create an executable.
     std::string createFlags =
-      this->LookupFlags("CMAKE_", lang, "_LINK_FLAGS", "");
+      this->LookupFlags("CMAKE_", llang, "_LINK_FLAGS", "");
     if(!createFlags.empty())
       {
       extraLinkOptions += " ";

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de63ff489d25095e41deae724f499ea3df05b6cf
commit de63ff489d25095e41deae724f499ea3df05b6cf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 11:02:48 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 6 11:45:28 2015 -0500

    Xcode: Generate Intel Fortran compiler flags in project files

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 7b2ac8e..0636910 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2250,6 +2250,11 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       buildSettings->AddAttribute("OTHER_CPLUSPLUSFLAGS",
                                   this->CreateString(flags.c_str()));
       }
+    else if (*li == "Fortran")
+      {
+      buildSettings->AddAttribute("IFORT_OTHER_FLAGS",
+                                  this->CreateString(flags.c_str()));
+      }
     else if (*li == "C")
       {
       buildSettings->AddAttribute("OTHER_CFLAGS",

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9924486f8a979bf937c8fd7749aaf37c1bd762e1
commit 9924486f8a979bf937c8fd7749aaf37c1bd762e1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 11:01:48 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 6 11:44:41 2015 -0500

    Xcode: Refactor generation of per-language compiler flags

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index cd0dcc6..7b2ac8e 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1743,7 +1743,6 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     return;
     }
 
-  std::string flags;
   std::string defFlags;
   bool shared = ((target.GetType() == cmTarget::SHARED_LIBRARY) ||
                  (target.GetType() == cmTarget::MODULE_LIBRARY));
@@ -1752,19 +1751,15 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                  (target.GetType() == cmTarget::EXECUTABLE) ||
                  shared);
 
-  std::string lang = target.GetLinkerLanguage(configName);
-  std::string cflags;
-  if(!lang.empty())
+  // Compute the compilation flags for each language.
+  std::set<std::string> languages;
+  target.GetLanguages(languages, configName);
+  std::map<std::string, std::string> cflags;
+  for (std::set<std::string>::iterator li = languages.begin();
+       li != languages.end(); ++li)
     {
-    // for c++ projects get the c flags as well
-    if(lang == "CXX")
-      {
-      this->CurrentLocalGenerator->AddLanguageFlags(cflags, "C", configName);
-      this->CurrentLocalGenerator->AddCMP0018Flags(cflags, &target,
-                                                   "C", configName);
-      this->CurrentLocalGenerator->
-        AddCompileOptions(cflags, &target, "C", configName);
-      }
+    std::string const& lang = *li;
+    std::string& flags = cflags[lang];
 
     // Add language-specific flags.
     this->CurrentLocalGenerator->AddLanguageFlags(flags, lang, configName);
@@ -1779,13 +1774,15 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     this->CurrentLocalGenerator->
       AddCompileOptions(flags, &target, lang, configName);
     }
-  else if(binary)
-  {
+
+  std::string lang = target.GetLinkerLanguage(configName);
+  if(binary && lang.empty())
+    {
     cmSystemTools::Error
       ("CMake can not determine linker language for target: ",
        target.GetName().c_str());
     return;
-  }
+    }
 
   // Add define flags
   this->CurrentLocalGenerator->
@@ -2178,53 +2175,58 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     buildSettings->AddAttribute("HEADER_SEARCH_PATHS",
                                 dirs.CreateList());
     }
-  std::string oflagc = this->ExtractFlag("-O", cflags);
+
+  bool same_gflags = true;
+  std::map<std::string, std::string> gflags;
+  std::string const* last_gflag = 0;
   char optLevel[2];
   optLevel[0] = '0';
   optLevel[1] = 0;
-  if(oflagc.size() == 3)
-    {
-    optLevel[0] = oflagc[2];
-    }
-  if(oflagc.size() == 2)
-    {
-    optLevel[0] = '1';
-    }
-  std::string oflag = this->ExtractFlag("-O", flags);
-  if(oflag.size() == 3)
-    {
-    optLevel[0] = oflag[2];
-    }
-  if(oflag.size() == 2)
-    {
-    optLevel[0] = '1';
-    }
-  std::string gflagc = this->ExtractFlag("-g", cflags);
-  // put back gdwarf-2 if used since there is no way
-  // to represent it in the gui, but we still want debug yes
-  if(gflagc == "-gdwarf-2")
-    {
-    cflags += " ";
-    cflags += gflagc;
-    }
-  std::string gflag = this->ExtractFlag("-g", flags);
-  if(gflag == "-gdwarf-2")
+
+  // Minimal map of flags to build settings.
+  for (std::set<std::string>::iterator li = languages.begin();
+       li != languages.end(); ++li)
     {
-    flags += " ";
-    flags += gflag;
+    std::string& flags = cflags[*li];
+    std::string& gflag = gflags[*li];
+    std::string oflag = this->ExtractFlag("-O", flags);
+    if(oflag.size() == 3)
+      {
+      optLevel[0] = oflag[2];
+      }
+    if(oflag.size() == 2)
+      {
+      optLevel[0] = '1';
+      }
+    gflag = this->ExtractFlag("-g", flags);
+    // put back gdwarf-2 if used since there is no way
+    // to represent it in the gui, but we still want debug yes
+    if(gflag == "-gdwarf-2")
+      {
+      flags += " ";
+      flags += gflag;
+      }
+    if (last_gflag && *last_gflag != gflag)
+      {
+      same_gflags = false;
+      }
+    last_gflag = &gflag;
     }
+
   const char* debugStr = "YES";
-  // We can't set the Xcode flag differently depending on the language,
-  // so put them back in this case.
-  if( (lang == "CXX") && gflag != gflagc )
+  if (!same_gflags)
     {
-    cflags += " ";
-    cflags += gflagc;
-    flags += " ";
-    flags += gflag;
+    // We can't set the Xcode flag differently depending on the language,
+    // so put them back in this case.
+    for (std::set<std::string>::iterator li = languages.begin();
+         li != languages.end(); ++li)
+      {
+      cflags[*li] += " ";
+      cflags[*li] += gflags[*li];
+      }
     debugStr = "NO";
     }
-  if( gflag == "-g0" || gflag.size() == 0 )
+  else if (last_gflag && (last_gflag->empty() || *last_gflag == "-g0"))
     {
     debugStr = "NO";
     }
@@ -2239,24 +2241,20 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                               this->CreateString("NO"));
   buildSettings->AddAttribute("GCC_INLINES_ARE_PRIVATE_EXTERN",
                               this->CreateString("NO"));
-  if(lang == "CXX")
-    {
-    flags += " ";
-    flags += defFlags;
-    buildSettings->AddAttribute("OTHER_CPLUSPLUSFLAGS",
-                                this->CreateString(flags.c_str()));
-    cflags += " ";
-    cflags += defFlags;
-    buildSettings->AddAttribute("OTHER_CFLAGS",
-                                this->CreateString(cflags.c_str()));
-
-    }
-  else
+  for (std::set<std::string>::iterator li = languages.begin();
+       li != languages.end(); ++li)
     {
-    flags += " ";
-    flags += defFlags;
-    buildSettings->AddAttribute("OTHER_CFLAGS",
-                                this->CreateString(flags.c_str()));
+    std::string flags = cflags[*li] + " " + defFlags;
+    if (*li == "CXX")
+      {
+      buildSettings->AddAttribute("OTHER_CPLUSPLUSFLAGS",
+                                  this->CreateString(flags.c_str()));
+      }
+    else if (*li == "C")
+      {
+      buildSettings->AddAttribute("OTHER_CFLAGS",
+                                  this->CreateString(flags.c_str()));
+      }
     }
 
   // Add Fortran source format attribute if property is set.

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |  155 +++++++++++++++++++------------------
 1 file changed, 79 insertions(+), 76 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Fri Feb  6 13:03:35 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Fri,  6 Feb 2015 13:03:35 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1079-gf72dfcb
Message-ID: <20150206180335.DF52FAB1FA@public.kitware.com>

This is an automated email from 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  f72dfcb7ccca2d134aa456eb771aee7178bd5675 (commit)
       via  c6c6b26accc13ad50cad5130e44d06d52d6f2c1f (commit)
       via  861b1bd67d3f80ecff62a4598036924c0b527cb6 (commit)
      from  9d3b0dfd93694ffee04c5b4b5795aa7ebf6ca059 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f72dfcb7ccca2d134aa456eb771aee7178bd5675
commit f72dfcb7ccca2d134aa456eb771aee7178bd5675
Merge: 9d3b0df c6c6b26
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 6 13:03:35 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 6 13:03:35 2015 -0500

    Merge topic 'use-algorithms' into next
    
    c6c6b26a Revert "cmListCommand: Use std::find algorithm for FIND subcommand."
    861b1bd6 Revert "Convert a nested loop to use an algorithm."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6c6b26accc13ad50cad5130e44d06d52d6f2c1f
commit c6c6b26accc13ad50cad5130e44d06d52d6f2c1f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 6 19:01:24 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:01:24 2015 +0100

    Revert "cmListCommand: Use std::find algorithm for FIND subcommand."
    
    This reverts commit 7b2c2fb83d9973fce37864827024ec4f07de8684.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index d24af46..107dca9 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -287,14 +287,18 @@ bool cmListCommand::HandleFindCommand(std::vector<std::string> const& args)
     return true;
     }
 
-  std::vector<std::string>::iterator it =
-      std::find(varArgsExpanded.begin(), varArgsExpanded.end(), args[2]);
-  if (it != varArgsExpanded.end())
+  std::vector<std::string>::iterator it;
+  unsigned int index = 0;
+  for ( it = varArgsExpanded.begin(); it != varArgsExpanded.end(); ++ it )
     {
-    char indexString[32];
-    sprintf(indexString, "%zu", std::distance(varArgsExpanded.begin(), it));
-    this->Makefile->AddDefinition(variableName, indexString);
-    return true;
+    if ( *it == args[2] )
+      {
+      char indexString[32];
+      sprintf(indexString, "%d", index);
+      this->Makefile->AddDefinition(variableName, indexString);
+      return true;
+      }
+    index++;
     }
 
   this->Makefile->AddDefinition(variableName, "-1");

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=861b1bd67d3f80ecff62a4598036924c0b527cb6
commit 861b1bd67d3f80ecff62a4598036924c0b527cb6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 6 19:01:14 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:01:14 2015 +0100

    Revert "Convert a nested loop to use an algorithm."
    
    This reverts commit 3fe17c6d70797ce4d73aac1942c2f6036ce660c8.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index f76e428..d24af46 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -372,10 +372,18 @@ bool cmListCommand
   size_t cc;
   for ( cc = 2; cc < args.size(); ++ cc )
     {
-    varArgsExpanded.erase(
-        std::remove(varArgsExpanded.begin(), varArgsExpanded.end(),
-                    args[cc]),
-        varArgsExpanded.end());
+    size_t kk = 0;
+    while ( kk < varArgsExpanded.size() )
+      {
+      if ( varArgsExpanded[kk] == args[cc] )
+        {
+        varArgsExpanded.erase(varArgsExpanded.begin()+kk);
+        }
+      else
+        {
+        kk ++;
+        }
+      }
     }
 
 

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

Summary of changes:
 Source/cmListCommand.cxx |   34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Fri Feb  6 13:04:31 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Fri,  6 Feb 2015 13:04:31 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1094-ged2953e
Message-ID: <20150206180431.C1557AB21B@public.kitware.com>

This is an automated email from 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  ed2953e57b017f3bbfb189658c98a34dd44d9993 (commit)
       via  d8639733a42149ca1402dcae427f2142ab0cf037 (commit)
       via  803317aab622e4f12e7d342be5bbb4f16b088efd (commit)
       via  11093a03e064e1b7ef2d5db28845b5da7b934806 (commit)
       via  6cd2ee9524e501a4ef9dc481b469b91f8f022dc9 (commit)
       via  94e993a0c170cf84da9ddb026dfec9d8d99304e0 (commit)
       via  69dbe51b08bd6b4564d031d78034633f55ed4593 (commit)
       via  683fafea088c26658283da3bdf05277aaa1a3cee (commit)
       via  63f584b618b3381ad93c901f691191acd48329a7 (commit)
       via  74c4d9d27aece9a619eaab330ad23cf4b0de2b19 (commit)
       via  71d47115d009983665d6db4b25ea0ef40464f365 (commit)
       via  39622c995c189b4e22dfdc0e9aa29c8fce5eac17 (commit)
       via  a7fcc148bdfa5e9f2c6901b0de8192f5aa043741 (commit)
       via  d46c4f0727acb35963dfda579cd5c9efd63aab01 (commit)
       via  d59913f001b6eb74f9baf8bad183dc83d5e7bcd1 (commit)
      from  f72dfcb7ccca2d134aa456eb771aee7178bd5675 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed2953e57b017f3bbfb189658c98a34dd44d9993
commit ed2953e57b017f3bbfb189658c98a34dd44d9993
Merge: f72dfcb d863973
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 6 13:04:29 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 6 13:04:29 2015 -0500

    Merge topic 'use-algorithms' into next
    
    d8639733 cmSystemTools: Remove unnecessary comparison.
    803317aa cmSystemTools: Early return if size makes later comparison false.
    11093a03 Replace temporary bool by inlining warning condition.
    6cd2ee95 Replace loop with member algorithm.
    94e993a0 cmComputeLinkDepends: Remove temporary iterator copy.
    69dbe51b Replace loop with algorithm.
    683fafea Replace a loop with std::transform.
    63f584b6 Replace while loop with member insert.
    74c4d9d2 Take a size check outside of an inner loop.
    71d47115 Use insert member instead of back_inserter.
    39622c99 Convert while loop to member insert.
    a7fcc148 Convert loop to algorithm.
    d46c4f07 Extract a prefix variable from loop.
    d59913f0 Take computation out of loop.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8639733a42149ca1402dcae427f2142ab0cf037
commit d8639733a42149ca1402dcae427f2142ab0cf037
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 27 23:52:50 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:10 2015 +0100

    cmSystemTools: Remove unnecessary comparison.
    
    We already know the string is uppercase.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index bb007ef..d3ab36b 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -376,7 +376,7 @@ bool cmSystemTools::IsInternallyOn(const char* val)
     {
     *c = static_cast<char>(toupper(*c));
     }
-  return (v == "I_ON" || v == "i_on");
+  return v == "I_ON";
 }
 
 bool cmSystemTools::IsOn(const char* val)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=803317aab622e4f12e7d342be5bbb4f16b088efd
commit 803317aab622e4f12e7d342be5bbb4f16b088efd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 27 23:50:42 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:10 2015 +0100

    cmSystemTools: Early return if size makes later comparison false.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index b07dd78..bb007ef 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -366,6 +366,10 @@ bool cmSystemTools::IsInternallyOn(const char* val)
     return false;
     }
   std::basic_string<char> v = val;
+  if (v.size() > 4)
+    {
+    return false;
+    }
 
   for(std::basic_string<char>::iterator c = v.begin();
       c != v.end(); c++)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11093a03e064e1b7ef2d5db28845b5da7b934806
commit 11093a03e064e1b7ef2d5db28845b5da7b934806
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 27 22:13:45 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:10 2015 +0100

    Replace temporary bool by inlining warning condition.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index bd9cb26..7afe05f 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -3641,24 +3641,20 @@ bool cmLocalGenerator::NeedBackwardsCompatibility_2_4()
 bool cmLocalGenerator::CheckDefinition(std::string const& define) const
 {
   // Many compilers do not support -DNAME(arg)=sdf so we disable it.
-  bool function_style = false;
-
   std::string::size_type pos = define.find_first_of("(=");
   if (pos != std::string::npos)
     {
-    function_style = define[pos] == '(';
-    }
-
-  if(function_style)
-    {
-    std::ostringstream e;
-    e << "WARNING: Function-style preprocessor definitions may not be "
-      << "passed on the compiler command line because many compilers "
-      << "do not support it.\n"
-      << "CMake is dropping a preprocessor definition: " << define << "\n"
-      << "Consider defining the macro in a (configured) header file.\n";
-    cmSystemTools::Message(e.str().c_str());
-    return false;
+    if (define[pos] == '(')
+      {
+      std::ostringstream e;
+      e << "WARNING: Function-style preprocessor definitions may not be "
+        << "passed on the compiler command line because many compilers "
+        << "do not support it.\n"
+        << "CMake is dropping a preprocessor definition: " << define << "\n"
+        << "Consider defining the macro in a (configured) header file.\n";
+      cmSystemTools::Message(e.str().c_str());
+      return false;
+      }
     }
 
   // Many compilers do not support # in the value so we disable it.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cd2ee9524e501a4ef9dc481b469b91f8f022dc9
commit 6cd2ee9524e501a4ef9dc481b469b91f8f022dc9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 27 22:09:17 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:10 2015 +0100

    Replace loop with member algorithm.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 9109db4..bd9cb26 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -3642,14 +3642,13 @@ bool cmLocalGenerator::CheckDefinition(std::string const& define) const
 {
   // Many compilers do not support -DNAME(arg)=sdf so we disable it.
   bool function_style = false;
-  for(const char* c = define.c_str(); *c && *c != '='; ++c)
+
+  std::string::size_type pos = define.find_first_of("(=");
+  if (pos != std::string::npos)
     {
-    if(*c == '(')
-      {
-      function_style = true;
-      break;
-      }
+    function_style = define[pos] == '(';
     }
+
   if(function_style)
     {
     std::ostringstream e;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=94e993a0c170cf84da9ddb026dfec9d8d99304e0
commit 94e993a0c170cf84da9ddb026dfec9d8d99304e0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 27 21:34:01 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:10 2015 +0100

    cmComputeLinkDepends: Remove temporary iterator copy.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index fa1bbcc..8652690 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -692,8 +692,7 @@ void cmComputeLinkDepends::CleanConstraintGraph()
     std::sort(i->begin(), i->end());
 
     // Make the edge list unique.
-    EdgeList::iterator last = std::unique(i->begin(), i->end());
-    i->erase(last, i->end());
+    i->erase(std::unique(i->begin(), i->end()), i->end());
     }
 }
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69dbe51b08bd6b4564d031d78034633f55ed4593
commit 69dbe51b08bd6b4564d031d78034633f55ed4593
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 16:02:46 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:10 2015 +0100

    Replace loop with algorithm.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ef42b38..f0bdea7 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1153,15 +1153,11 @@ cmTarget::LinkLibraryType cmTarget::ComputeLinkType(
 
   // Check if any entry in the list matches this configuration.
   std::string configUpper = cmSystemTools::UpperCase(config);
-  for(std::vector<std::string>::const_iterator i = debugConfigs.begin();
-      i != debugConfigs.end(); ++i)
+  if (std::find(debugConfigs.begin(), debugConfigs.end(), configUpper) !=
+      debugConfigs.end())
     {
-    if(*i == configUpper)
-      {
-      return cmTarget::DEBUG;
-      }
+    return cmTarget::DEBUG;
     }
-
   // The current configuration is not a debug configuration.
   return cmTarget::OPTIMIZED;
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=683fafea088c26658283da3bdf05277aaa1a3cee
commit 683fafea088c26658283da3bdf05277aaa1a3cee
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 16:01:07 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:09 2015 +0100

    Replace a loop with std::transform.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 652e451..875dbbd 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2731,11 +2731,10 @@ std::vector<std::string> const& cmake::GetDebugConfigs()
       {
       // Expand the specified list and convert to upper-case.
       cmSystemTools::ExpandListArgument(config_list, this->DebugConfigs);
-      for(std::vector<std::string>::iterator i = this->DebugConfigs.begin();
-          i != this->DebugConfigs.end(); ++i)
-        {
-        *i = cmSystemTools::UpperCase(*i);
-        }
+      std::transform(this->DebugConfigs.begin(),
+                     this->DebugConfigs.end(),
+                     this->DebugConfigs.begin(),
+                     cmSystemTools::UpperCase);
       }
     // If no configurations were specified, use a default list.
     if(this->DebugConfigs.empty())

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63f584b618b3381ad93c901f691191acd48329a7
commit 63f584b618b3381ad93c901f691191acd48329a7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:36:59 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:09 2015 +0100

    Replace while loop with member insert.

diff --git a/Source/cmSetTargetPropertiesCommand.cxx b/Source/cmSetTargetPropertiesCommand.cxx
index 9a7fab2..e41a0ca 100644
--- a/Source/cmSetTargetPropertiesCommand.cxx
+++ b/Source/cmSetTargetPropertiesCommand.cxx
@@ -40,14 +40,7 @@ bool cmSetTargetPropertiesCommand
         this->SetError("called with incorrect number of arguments.");
         return false;
         }
-      while (j != args.end())
-        {
-        propertyPairs.push_back(*j);
-        ++j;
-        propertyPairs.push_back(*j);
-        ++j;
-        }
-      // break out of the loop because j is already == end
+      propertyPairs.insert(propertyPairs.end(), j, args.end());
       break;
       }
     else if (doingFiles)
diff --git a/Source/cmSetTestsPropertiesCommand.cxx b/Source/cmSetTestsPropertiesCommand.cxx
index 032c78e..d079a19 100644
--- a/Source/cmSetTestsPropertiesCommand.cxx
+++ b/Source/cmSetTestsPropertiesCommand.cxx
@@ -41,14 +41,7 @@ bool cmSetTestsPropertiesCommand
         this->SetError("called with incorrect number of arguments.");
         return false;
         }
-      while (j != args.end())
-        {
-        propertyPairs.push_back(*j);
-        ++j;
-        propertyPairs.push_back(*j);
-        ++j;
-        }
-      // break out of the loop because j is already == end
+      propertyPairs.insert(propertyPairs.end(), j, args.end());
       break;
       }
     else if (doingFiles)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74c4d9d27aece9a619eaab330ad23cf4b0de2b19
commit 74c4d9d27aece9a619eaab330ad23cf4b0de2b19
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:35:26 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:09 2015 +0100

    Take a size check outside of an inner loop.

diff --git a/Source/cmSetTargetPropertiesCommand.cxx b/Source/cmSetTargetPropertiesCommand.cxx
index aeb8077..9a7fab2 100644
--- a/Source/cmSetTargetPropertiesCommand.cxx
+++ b/Source/cmSetTargetPropertiesCommand.cxx
@@ -35,15 +35,15 @@ bool cmSetTargetPropertiesCommand
       doingFiles = false;
       // now loop through the rest of the arguments, new style
       ++j;
+      if (std::distance(j, args.end()) % 2 != 0)
+        {
+        this->SetError("called with incorrect number of arguments.");
+        return false;
+        }
       while (j != args.end())
         {
         propertyPairs.push_back(*j);
         ++j;
-        if(j == args.end())
-          {
-          this->SetError("called with incorrect number of arguments.");
-          return false;
-          }
         propertyPairs.push_back(*j);
         ++j;
         }
diff --git a/Source/cmSetTestsPropertiesCommand.cxx b/Source/cmSetTestsPropertiesCommand.cxx
index e66d13d..032c78e 100644
--- a/Source/cmSetTestsPropertiesCommand.cxx
+++ b/Source/cmSetTestsPropertiesCommand.cxx
@@ -36,15 +36,15 @@ bool cmSetTestsPropertiesCommand
       doingFiles = false;
       // now loop through the rest of the arguments, new style
       ++j;
+      if (std::distance(j, args.end()) % 2 != 0)
+        {
+        this->SetError("called with incorrect number of arguments.");
+        return false;
+        }
       while (j != args.end())
         {
         propertyPairs.push_back(*j);
         ++j;
-        if(j == args.end())
-          {
-          this->SetError("called with incorrect number of arguments.");
-          return false;
-          }
         propertyPairs.push_back(*j);
         ++j;
         }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=71d47115d009983665d6db4b25ea0ef40464f365
commit 71d47115d009983665d6db4b25ea0ef40464f365
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 24 18:21:56 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:09 2015 +0100

    Use insert member instead of back_inserter.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 98cb75c..ef42b38 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -5919,8 +5919,7 @@ cmTarget::GetCompatibleInterfaces(std::string const& config) const
         { \
         std::vector<std::string> props; \
         cmSystemTools::ExpandListArgument(prop, props); \
-        std::copy(props.begin(), props.end(), \
-                  std::inserter(compat.Props##x, compat.Props##x.begin())); \
+        compat.Props##x.insert(props.begin(), props.end()); \
         }
       CM_READ_COMPATIBLE_INTERFACE(BOOL, Bool)
       CM_READ_COMPATIBLE_INTERFACE(STRING, String)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39622c995c189b4e22dfdc0e9aa29c8fce5eac17
commit 39622c995c189b4e22dfdc0e9aa29c8fce5eac17
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 24 18:18:56 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:09 2015 +0100

    Convert while loop to member insert.

diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index db2f6fb..edf82bd 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -435,11 +435,7 @@ bool cmAddLibraryCommand
     cmSystemTools::Message(msg.c_str() ,"Warning");
     }
 
-  while (s != args.end())
-    {
-    srclists.push_back(*s);
-    ++s;
-    }
+  srclists.insert(srclists.end(), s, args.end());
 
   this->Makefile->AddLibrary(libName, type, srclists, excludeFromAll);
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7fcc148bdfa5e9f2c6901b0de8192f5aa043741
commit a7fcc148bdfa5e9f2c6901b0de8192f5aa043741
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 18 16:01:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:09 2015 +0100

    Convert loop to algorithm.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 9a2186b..785d0ca 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2396,10 +2396,7 @@ void cmLocalUnixMakefileGenerator3
     std::string outputForExisting =
                           this->ConvertToOutputForExisting(tgtDir, relRetDir);
     std::string prefix = cd_cmd + outputForExisting + " && ";
-    std::vector<std::string>::iterator i = commands.begin();
-    for (; i != commands.end(); ++i)
-      {
-      *i = prefix + *i;
-      }
+    std::transform(commands.begin(), commands.end(), commands.begin(),
+                   std::bind1st(std::plus<std::string>(), prefix));
     }
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d46c4f0727acb35963dfda579cd5c9efd63aab01
commit d46c4f0727acb35963dfda579cd5c9efd63aab01
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:07:27 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:08 2015 +0100

    Extract a prefix variable from loop.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 13c47c5..9a2186b 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2395,14 +2395,11 @@ void cmLocalUnixMakefileGenerator3
     // each command.
     std::string outputForExisting =
                           this->ConvertToOutputForExisting(tgtDir, relRetDir);
+    std::string prefix = cd_cmd + outputForExisting + " && ";
     std::vector<std::string>::iterator i = commands.begin();
     for (; i != commands.end(); ++i)
       {
-      std::string cmd = cd_cmd;
-      cmd += outputForExisting;
-      cmd += " && ";
-      cmd += *i;
-      *i = cmd;
+      *i = prefix + *i;
       }
     }
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d59913f001b6eb74f9baf8bad183dc83d5e7bcd1
commit d59913f001b6eb74f9baf8bad183dc83d5e7bcd1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 18 15:59:03 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:08 2015 +0100

    Take computation out of loop.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index fbf2140..13c47c5 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2393,11 +2393,13 @@ void cmLocalUnixMakefileGenerator3
     // On UNIX we must construct a single shell command to change
     // directory and build because make resets the directory between
     // each command.
+    std::string outputForExisting =
+                          this->ConvertToOutputForExisting(tgtDir, relRetDir);
     std::vector<std::string>::iterator i = commands.begin();
     for (; i != commands.end(); ++i)
       {
       std::string cmd = cd_cmd;
-      cmd += this->ConvertToOutputForExisting(tgtDir, relRetDir);
+      cmd += outputForExisting;
       cmd += " && ";
       cmd += *i;
       *i = cmd;

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

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Fri Feb  6 13:05:12 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Fri,  6 Feb 2015 13:05:12 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1099-gc9827da
Message-ID: <20150206180512.1735BAB232@public.kitware.com>

This is an automated email from 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  c9827dabebf5d3e93d2f37223141f2ccd5209b1a (commit)
       via  17a2adc29de90c6ce441f7fff5cf9366286de3d6 (commit)
       via  af65da0aa97f20947f93ddcf9872d23d671f699b (commit)
       via  e848cc5074c402fe38bb19c831f0b71dc34ece73 (commit)
       via  5fea6898346f30119b7f5272033b0713aca4c389 (commit)
      from  ed2953e57b017f3bbfb189658c98a34dd44d9993 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9827dabebf5d3e93d2f37223141f2ccd5209b1a
commit c9827dabebf5d3e93d2f37223141f2ccd5209b1a
Merge: ed2953e 17a2adc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 6 13:05:10 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 6 13:05:10 2015 -0500

    Merge topic 'cmStandardIncludes-cleanup' into next
    
    17a2adc2 cmStandardIncludes: Remove functional header.
    af65da0a cmStandardIncludes: Remove list include.
    e848cc50 cmStandardIncludes: Remove deque include.
    5fea6898 cmStandardIncludes: Remove some VS6 workarounds.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17a2adc29de90c6ce441f7fff5cf9366286de3d6
commit 17a2adc29de90c6ce441f7fff5cf9366286de3d6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 5 22:08:53 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:53 2015 +0100

    cmStandardIncludes: Remove functional header.
    
    It is unused.

diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 77b4f62..0909719 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -51,7 +51,6 @@
 #include <string>
 #include <iterator>
 #include <algorithm>
-#include <functional>
 #include <map>
 #include <set>
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af65da0aa97f20947f93ddcf9872d23d671f699b
commit af65da0aa97f20947f93ddcf9872d23d671f699b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 12 21:17:55 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:53 2015 +0100

    cmStandardIncludes: Remove list include.
    
    Include it only where used.

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 1c670d2..006239a 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -25,6 +25,7 @@
 #include <cmsys/Glob.hxx>
 #include <cmsys/FStream.hxx>
 #include <algorithm>
+#include <list>
 
 #if defined(__HAIKU__)
 #include <FindDirectory.h>
diff --git a/Source/CTest/cmCTestGlobalVC.h b/Source/CTest/cmCTestGlobalVC.h
index cb0d165..29e0a61 100644
--- a/Source/CTest/cmCTestGlobalVC.h
+++ b/Source/CTest/cmCTestGlobalVC.h
@@ -14,6 +14,8 @@
 
 #include "cmCTestVC.h"
 
+#include <list>
+
 /** \class cmCTestGlobalVC
  * \brief Base class for handling globally-versioned trees
  *
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index f9e8a3c..f223127 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -16,6 +16,7 @@
 #include "cmSystemTools.h"
 #include <stdlib.h>
 #include <stack>
+#include <list>
 #include <float.h>
 #include <cmsys/FStream.hxx>
 
diff --git a/Source/CTest/cmCTestSVN.h b/Source/CTest/cmCTestSVN.h
index c6548e3..17bf7cb 100644
--- a/Source/CTest/cmCTestSVN.h
+++ b/Source/CTest/cmCTestSVN.h
@@ -14,6 +14,8 @@
 
 #include "cmCTestGlobalVC.h"
 
+#include <list>
+
 /** \class cmCTestSVN
  * \brief Interaction with subversion command-line tool
  *
diff --git a/Source/cmCommands.h b/Source/cmCommands.h
index c56673f..e902853 100644
--- a/Source/cmCommands.h
+++ b/Source/cmCommands.h
@@ -13,6 +13,8 @@
 #define cmCommands_h
 #include "cmStandardIncludes.h"
 
+#include <list>
+
 class cmCommand;
 /**
  * Global function to return all compiled in commands.
diff --git a/Source/cmConditionEvaluator.h b/Source/cmConditionEvaluator.h
index 01624f9..fcef234 100644
--- a/Source/cmConditionEvaluator.h
+++ b/Source/cmConditionEvaluator.h
@@ -15,6 +15,8 @@
 #include "cmCommand.h"
 #include "cmExpandedCommandArgument.h"
 
+#include <list>
+
 class cmConditionEvaluator
 {
 public:
diff --git a/Source/cmFileLockPool.h b/Source/cmFileLockPool.h
index baef310..f0614a3 100644
--- a/Source/cmFileLockPool.h
+++ b/Source/cmFileLockPool.h
@@ -14,6 +14,8 @@
 
 #include "cmStandardIncludes.h"
 
+#include <list>
+
 class cmFileLockResult;
 class cmFileLock;
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ba914e1..ff3e35d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -38,6 +38,7 @@
 #include <cmsys/auto_ptr.hxx>
 
 #include <stack>
+#include <list>
 #include <ctype.h> // for isspace
 #include <assert.h>
 
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 79fa5df..f74e3c5 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -14,6 +14,8 @@
 #ifndef cmQtAutoGenerators_h
 #define cmQtAutoGenerators_h
 
+#include <list>
+
 class cmGlobalGenerator;
 class cmMakefile;
 
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 180bd8d..77b4f62 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -53,7 +53,6 @@
 #include <algorithm>
 #include <functional>
 #include <map>
-#include <list>
 #include <set>
 
 // include the "c" string header
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 652e451..4b6af0a 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -103,6 +103,8 @@
 
 #include <sys/stat.h> // struct stat
 
+#include <list>
+
 static bool cmakeCheckStampFile(const char* stampName);
 static bool cmakeCheckStampList(const char* stampName);
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e848cc5074c402fe38bb19c831f0b71dc34ece73
commit e848cc5074c402fe38bb19c831f0b71dc34ece73
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 12 21:11:16 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:53 2015 +0100

    cmStandardIncludes: Remove deque include.
    
    Include it only where used.

diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h
index 09346f9..d13d5cf 100644
--- a/Source/CTest/cmCTestBuildHandler.h
+++ b/Source/CTest/cmCTestBuildHandler.h
@@ -19,6 +19,8 @@
 
 #include <cmsys/RegularExpression.hxx>
 
+#include <deque>
+
 class cmMakefile;
 
 /** \class cmCTestBuildHandler
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index bff8c12..110db24 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -35,6 +35,7 @@
 #endif
 
 #include <stack>
+#include <deque>
 
 class cmFunctionBlocker;
 class cmCommand;
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 99e1868..180bd8d 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -55,7 +55,6 @@
 #include <map>
 #include <list>
 #include <set>
-#include <deque>
 
 // include the "c" string header
 #include <string.h>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fea6898346f30119b7f5272033b0713aca4c389
commit 5fea6898346f30119b7f5272033b0713aca4c389
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 12 21:05:34 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:04:53 2015 +0100

    cmStandardIncludes: Remove some VS6 workarounds.
    
    Added in commit v2.6.0~2824 (COMP: Fix warnings in system headers
    on VS6., 2006-08-29), but no longer needed.

diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 646300d..99e1868 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -22,7 +22,6 @@
 #ifdef _MSC_VER
 #pragma warning ( disable : 4786 )
 #pragma warning ( disable : 4503 )
-#pragma warning ( disable : 4512 ) /* operator=() could not be generated */
 #endif
 
 
@@ -42,11 +41,6 @@
 # include <cmsys/IOStream.hxx>
 #endif
 
-// Avoid warnings in system headers.
-#if defined(_MSC_VER)
-# pragma warning (push,1)
-#endif
-
 #include <fstream>
 #include <iostream>
 #include <iomanip>
@@ -63,10 +57,6 @@
 #include <set>
 #include <deque>
 
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif
-
 // include the "c" string header
 #include <string.h>
 #include <stdio.h>

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

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Fri Feb  6 13:11:43 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Fri,  6 Feb 2015 13:11:43 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1101-g3aea927
Message-ID: <20150206181143.7822BA7B4A@public.kitware.com>

This is an automated email from 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  3aea9271e7d727191e862f67cb29341334a73b4b (commit)
       via  def45d12916c8c118da7ce29a4ec0425e87daca0 (commit)
      from  c9827dabebf5d3e93d2f37223141f2ccd5209b1a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3aea9271e7d727191e862f67cb29341334a73b4b
commit 3aea9271e7d727191e862f67cb29341334a73b4b
Merge: c9827da def45d1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 6 13:11:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 6 13:11:42 2015 -0500

    Merge topic 'export-interface-source-files' into next
    
    def45d12 Fix property name.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=def45d12916c8c118da7ce29a4ec0425e87daca0
commit def45d12916c8c118da7ce29a4ec0425e87daca0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 6 19:11:18 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:11:18 2015 +0100

    Fix property name.

diff --git a/Help/release/dev/export-interface-source-files.rst b/Help/release/dev/export-interface-source-files.rst
index a26092a..00dcd25 100644
--- a/Help/release/dev/export-interface-source-files.rst
+++ b/Help/release/dev/export-interface-source-files.rst
@@ -2,5 +2,5 @@ export-interface-source-files
 -----------------------------
 
 * It is now possible to export targets which populate the
-  :prop_tgt:`TARGET_SOURCES` target property using the
+  :prop_tgt:`INTERFACE_SOURCES` target property using the
   :command:`install(EXPORT)` and :command:`export()` commands.

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

Summary of changes:
 Help/release/dev/export-interface-source-files.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Fri Feb  6 13:14:07 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Fri,  6 Feb 2015 13:14:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1106-ga56d580
Message-ID: <20150206181407.2AED9A9DFB@public.kitware.com>

This is an automated email from 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  a56d580574e11b13a9adb8de0632c6c0b4a8a4da (commit)
       via  4ac168031fc4819d41851a9fee7e61881a37de27 (commit)
       via  0e4c8bebeec03167707571e1f3c6c0ee156c5a3b (commit)
       via  b58c846b24475aa2f7fdb57139d04717d6d3007e (commit)
       via  93bd212735198d7420de6613bc5557ff0acc2d5a (commit)
      from  3aea9271e7d727191e862f67cb29341334a73b4b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a56d580574e11b13a9adb8de0632c6c0b4a8a4da
commit a56d580574e11b13a9adb8de0632c6c0b4a8a4da
Merge: 3aea927 4ac1680
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 6 13:14:05 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 6 13:14:05 2015 -0500

    Merge topic 'export-interface-source-files' into next
    
    4ac16803 Add release notes for export-interface-source-files.
    0e4c8beb Allow export of targets with INTERFACE_SOURCES.
    b58c846b Tests: Move build-property-paths test stderr files.
    93bd2127 Tests: Run build-property-paths tests with a parameter.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ac168031fc4819d41851a9fee7e61881a37de27
commit 4ac168031fc4819d41851a9fee7e61881a37de27
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 5 20:40:51 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:12:41 2015 +0100

    Add release notes for export-interface-source-files.

diff --git a/Help/release/dev/export-interface-source-files.rst b/Help/release/dev/export-interface-source-files.rst
new file mode 100644
index 0000000..00dcd25
--- /dev/null
+++ b/Help/release/dev/export-interface-source-files.rst
@@ -0,0 +1,6 @@
+export-interface-source-files
+-----------------------------
+
+* It is now possible to export targets which populate the
+  :prop_tgt:`INTERFACE_SOURCES` target property using the
+  :command:`install(EXPORT)` and :command:`export()` commands.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e4c8bebeec03167707571e1f3c6c0ee156c5a3b
commit 0e4c8bebeec03167707571e1f3c6c0ee156c5a3b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 28 18:58:38 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:12:41 2015 +0100

    Allow export of targets with INTERFACE_SOURCES.
    
    Use the same rules for paths in source and binary dirs in
    installed INTERFACE_SOURCES as are used for
    INTERFACE_INCLUDE_DIRECTORIES.

diff --git a/Help/command/target_sources.rst b/Help/command/target_sources.rst
index 832240a..d6f148d 100644
--- a/Help/command/target_sources.rst
+++ b/Help/command/target_sources.rst
@@ -22,10 +22,6 @@ items will populate the :prop_tgt:`SOURCES` property of
 following arguments specify sources.  Repeated calls for the same
 ``<target>`` append items in the order called.
 
-Targets with :prop_tgt:`INTERFACE_SOURCES` may not be exported with the
-:command:`export` or :command:`install(EXPORT)` commands. This limitation may be
-lifted in a future version of CMake.
-
 Arguments to ``target_sources`` may use "generator expressions"
 with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)`
 manual for available expressions.  See the :manual:`cmake-buildsystem(7)`
diff --git a/Help/prop_tgt/INTERFACE_SOURCES.rst b/Help/prop_tgt/INTERFACE_SOURCES.rst
index 696ee95..a224b68 100644
--- a/Help/prop_tgt/INTERFACE_SOURCES.rst
+++ b/Help/prop_tgt/INTERFACE_SOURCES.rst
@@ -12,10 +12,6 @@ When target dependencies are specified using :command:`target_link_libraries`,
 CMake will read this property from all target dependencies to determine the
 sources of the consumer.
 
-Targets with ``INTERFACE_SOURCES`` may not be exported with the
-:command:`export` or :command:`install(EXPORT)` commands. This limitation may be
-lifted in a future version of CMake.
-
 Contents of ``INTERFACE_SOURCES`` may use "generator expressions"
 with the syntax ``$<...>``.  See the :manual:`cmake-generator-expressions(7)`
 manual for available expressions.  See the :manual:`cmake-buildsystem(7)`
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index a28ec48..b1203dd 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -68,16 +68,6 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
       tei != this->Exports.end(); ++tei)
     {
     cmTarget* te = *tei;
-    if (te->GetProperty("INTERFACE_SOURCES"))
-      {
-      std::ostringstream e;
-      e << "Target \""
-        << te->GetName()
-        << "\" has a populated INTERFACE_SOURCES property.  This is not "
-          "currently supported.";
-      cmSystemTools::Error(e.str().c_str());
-      return false;
-      }
     this->GenerateImportTargetCode(os, te);
 
     te->AppendBuildInterfaceIncludes();
@@ -87,6 +77,9 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
     this->PopulateInterfaceProperty("INTERFACE_INCLUDE_DIRECTORIES", te,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
+    this->PopulateInterfaceProperty("INTERFACE_SOURCES", te,
+                                    cmGeneratorExpression::BuildInterface,
+                                    properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS", te,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index af4ce8b..71728be 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -224,7 +224,7 @@ static bool isSubDirectory(const char* a, const char* b)
 
 //----------------------------------------------------------------------------
 static bool checkInterfaceDirs(const std::string &prepro,
-                      cmTarget *target)
+                      cmTarget *target, const std::string& prop)
 {
   const char* installDir =
             target->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
@@ -250,20 +250,27 @@ static bool checkInterfaceDirs(const std::string &prepro,
     std::ostringstream e;
     if (genexPos != std::string::npos)
       {
-      switch (target->GetPolicyStatusCMP0041())
+      if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
         {
-        case cmPolicies::WARN:
-          messageType = cmake::WARNING;
-          e << target->GetMakefile()->GetPolicies()
-                      ->GetPolicyWarning(cmPolicies::CMP0041) << "\n";
-          break;
-        case cmPolicies::OLD:
-          continue;
-        case cmPolicies::REQUIRED_IF_USED:
-        case cmPolicies::REQUIRED_ALWAYS:
-        case cmPolicies::NEW:
-          hadFatalError = true;
-          break; // Issue fatal message.
+        switch (target->GetPolicyStatusCMP0041())
+          {
+          case cmPolicies::WARN:
+            messageType = cmake::WARNING;
+            e << target->GetMakefile()->GetPolicies()
+                        ->GetPolicyWarning(cmPolicies::CMP0041) << "\n";
+            break;
+          case cmPolicies::OLD:
+            continue;
+          case cmPolicies::REQUIRED_IF_USED:
+          case cmPolicies::REQUIRED_ALWAYS:
+          case cmPolicies::NEW:
+            hadFatalError = true;
+            break; // Issue fatal message.
+          }
+        }
+      else
+        {
+        hadFatalError = true;
         }
       }
     if (cmHasLiteralPrefix(li->c_str(), "${_IMPORT_PREFIX}"))
@@ -272,8 +279,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       }
     if (!cmSystemTools::FileIsFullPath(li->c_str()))
       {
-      e << "Target \"" << target->GetName() << "\" "
-           "INTERFACE_INCLUDE_DIRECTORIES property contains relative path:\n"
+      e << "Target \"" << target->GetName() << "\" " << prop <<
+           " property contains relative path:\n"
            "  \"" << *li << "\"";
       target->GetMakefile()->IssueMessage(messageType, e.str());
       }
@@ -289,32 +296,35 @@ static bool checkInterfaceDirs(const std::string &prepro,
         (!inBinary || isSubDirectory(installDir, topBinaryDir)) &&
         (!inSource || isSubDirectory(installDir, topSourceDir));
 
-      if (!shouldContinue)
+      if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
         {
-        switch(target->GetPolicyStatusCMP0052())
+        if (!shouldContinue)
           {
-          case cmPolicies::WARN:
+          switch(target->GetPolicyStatusCMP0052())
             {
-            std::ostringstream s;
-            s << target->GetMakefile()->GetPolicies()
-                      ->GetPolicyWarning(cmPolicies::CMP0052) << "\n";
-            s << "Directory:\n    \"" << *li << "\"\nin "
-              "INTERFACE_INCLUDE_DIRECTORIES of target \""
-              << target->GetName() << "\" is a subdirectory of the install "
-              "directory:\n    \"" << installDir << "\"\nhowever it is also "
-              "a subdirectory of the " << (inBinary ? "build" : "source")
-              << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
-              << "\"" << std::endl;
-            target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
-                                                s.str());
+            case cmPolicies::WARN:
+              {
+              std::ostringstream s;
+              s << target->GetMakefile()->GetPolicies()
+                        ->GetPolicyWarning(cmPolicies::CMP0052) << "\n";
+              s << "Directory:\n    \"" << *li << "\"\nin "
+                "INTERFACE_INCLUDE_DIRECTORIES of target \""
+                << target->GetName() << "\" is a subdirectory of the install "
+                "directory:\n    \"" << installDir << "\"\nhowever it is also "
+                "a subdirectory of the " << (inBinary ? "build" : "source")
+                << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
+                << "\"" << std::endl;
+              target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
+                                                  s.str());
+              }
+            case cmPolicies::OLD:
+              shouldContinue = true;
+              break;
+            case cmPolicies::REQUIRED_ALWAYS:
+            case cmPolicies::REQUIRED_IF_USED:
+            case cmPolicies::NEW:
+              break;
             }
-          case cmPolicies::OLD:
-            shouldContinue = true;
-            break;
-          case cmPolicies::REQUIRED_ALWAYS:
-          case cmPolicies::REQUIRED_IF_USED:
-          case cmPolicies::NEW:
-            break;
           }
         }
       if (shouldContinue)
@@ -324,8 +334,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       }
     if (inBinary)
       {
-      e << "Target \"" << target->GetName() << "\" "
-           "INTERFACE_INCLUDE_DIRECTORIES property contains path:\n"
+      e << "Target \"" << target->GetName() << "\" " << prop <<
+           " property contains path:\n"
            "  \"" << *li << "\"\nwhich is prefixed in the build directory.";
       target->GetMakefile()->IssueMessage(messageType, e.str());
       }
@@ -333,8 +343,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       {
       if (inSource)
         {
-        e << "Target \"" << target->GetName() << "\" "
-            "INTERFACE_INCLUDE_DIRECTORIES property contains path:\n"
+        e << "Target \"" << target->GetName() << "\" " << prop <<
+            " property contains path:\n"
             "  \"" << *li << "\"\nwhich is prefixed in the source directory.";
         target->GetMakefile()->IssueMessage(messageType, e.str());
         }
@@ -365,6 +375,46 @@ static void prefixItems(std::string &exportDirs)
 }
 
 //----------------------------------------------------------------------------
+void cmExportFileGenerator::PopulateSourcesInterface(
+                      cmTargetExport *tei,
+                      cmGeneratorExpression::PreprocessContext preprocessRule,
+                      ImportPropertyMap &properties,
+                      std::vector<std::string> &missingTargets)
+{
+  cmTarget *target = tei->Target;
+  assert(preprocessRule == cmGeneratorExpression::InstallInterface);
+
+  const char *propName = "INTERFACE_SOURCES";
+  const char *input = target->GetProperty(propName);
+
+  if (!input)
+    {
+    return;
+    }
+
+  if (!*input)
+    {
+    properties[propName] = "";
+    return;
+    }
+
+  std::string prepro = cmGeneratorExpression::Preprocess(input,
+                                                         preprocessRule,
+                                                         true);
+  if (!prepro.empty())
+    {
+    this->ResolveTargetsInGeneratorExpressions(prepro, target,
+                                                missingTargets);
+
+    if (!checkInterfaceDirs(prepro, target, propName))
+      {
+      return;
+      }
+    properties[propName] = prepro;
+    }
+}
+
+//----------------------------------------------------------------------------
 void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                       cmTargetExport *tei,
                       cmGeneratorExpression::PreprocessContext preprocessRule,
@@ -424,7 +474,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target))
+    if (!checkInterfaceDirs(prepro, target, propName))
       {
       return;
       }
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index 919924e..b6f4166 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -139,6 +139,11 @@ protected:
                       cmGeneratorExpression::PreprocessContext preprocessRule,
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets);
+  void PopulateSourcesInterface(
+                      cmTargetExport *target,
+                      cmGeneratorExpression::PreprocessContext preprocessRule,
+                      ImportPropertyMap &properties,
+                      std::vector<std::string> &missingTargets);
 
   void SetImportLinkInterface(const std::string& config,
                     std::string const& suffix,
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 98ed818..a0d9013 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -123,6 +123,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
 
   bool require2_8_12 = false;
   bool require3_0_0 = false;
+  bool require3_1_0 = false;
   bool requiresConfigFiles = false;
   // Create all the imported targets.
   for(std::vector<cmTargetExport*>::const_iterator
@@ -131,17 +132,6 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     {
     cmTarget* te = (*tei)->Target;
 
-    if (te->GetProperty("INTERFACE_SOURCES"))
-      {
-      std::ostringstream e;
-      e << "Target \""
-        << te->GetName()
-        << "\" has a populated INTERFACE_SOURCES property.  This is not "
-          "currently supported.";
-      cmSystemTools::Error(e.str().c_str());
-      return false;
-      }
-
     requiresConfigFiles = requiresConfigFiles
                               || te->GetType() != cmTarget::INTERFACE_LIBRARY;
 
@@ -152,6 +142,9 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     this->PopulateIncludeDirectoriesInterface(*tei,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
+    this->PopulateSourcesInterface(*tei,
+                                  cmGeneratorExpression::InstallInterface,
+                                  properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_SYSTEM_INCLUDE_DIRECTORIES",
                                   te,
                                   cmGeneratorExpression::InstallInterface,
@@ -190,6 +183,13 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
       {
       require3_0_0 = true;
       }
+    if(te->GetProperty("INTERFACE_SOURCES"))
+      {
+      // We can only generate INTERFACE_SOURCES in CMake 3.3, but CMake 3.1
+      // can consume them.
+      require3_1_0 = true;
+      }
+
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
                                   te, properties);
     this->PopulateCompatibleInterfaceProperties(te, properties);
@@ -197,7 +197,11 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     this->GenerateInterfaceProperties(te, os, properties);
     }
 
-  if (require3_0_0)
+  if (require3_1_0)
+    {
+    this->GenerateRequiredCMakeVersion(os, "3.1.0");
+    }
+  else if (require3_0_0)
     {
     this->GenerateRequiredCMakeVersion(os, "3.0.0");
     }
diff --git a/Tests/ExportImport/Export/Interface/CMakeLists.txt b/Tests/ExportImport/Export/Interface/CMakeLists.txt
index 523fc29..00a5375 100644
--- a/Tests/ExportImport/Export/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Export/Interface/CMakeLists.txt
@@ -29,7 +29,17 @@ target_compile_features(use_auto_type INTERFACE cxx_auto_type)
 add_library(use_c_restrict INTERFACE)
 target_compile_features(use_c_restrict INTERFACE c_restrict)
 
-install(TARGETS headeronly sharediface use_auto_type use_c_restrict
+add_library(source_target INTERFACE)
+target_sources(source_target INTERFACE
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/source_target.cpp>
+  $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/src/source_target_for_install.cpp>
+)
+install(FILES
+  source_target_for_install.cpp
+  DESTINATION src
+)
+
+install(TARGETS headeronly sharediface use_auto_type use_c_restrict source_target
   EXPORT expInterface
 )
 install(TARGETS sharedlib
diff --git a/Tests/ExportImport/Export/Interface/source_target.cpp b/Tests/ExportImport/Export/Interface/source_target.cpp
new file mode 100644
index 0000000..037191c
--- /dev/null
+++ b/Tests/ExportImport/Export/Interface/source_target.cpp
@@ -0,0 +1,13 @@
+
+#ifndef USE_FROM_BUILD_DIR
+#error Expected define USE_FROM_BUILD_DIR
+#endif
+
+#ifdef USE_FROM_INSTALL_DIR
+#error Unexpected define USE_FROM_INSTALL_DIR
+#endif
+
+int source_symbol()
+{
+  return 42;
+}
diff --git a/Tests/ExportImport/Export/Interface/source_target_for_install.cpp b/Tests/ExportImport/Export/Interface/source_target_for_install.cpp
new file mode 100644
index 0000000..64514ed
--- /dev/null
+++ b/Tests/ExportImport/Export/Interface/source_target_for_install.cpp
@@ -0,0 +1,13 @@
+
+#ifdef USE_FROM_BUILD_DIR
+#error Unexpected define USE_FROM_BUILD_DIR
+#endif
+
+#ifndef USE_FROM_INSTALL_DIR
+#error Expected define USE_FROM_INSTALL_DIR
+#endif
+
+int source_symbol()
+{
+  return 42;
+}
diff --git a/Tests/ExportImport/Import/Interface/CMakeLists.txt b/Tests/ExportImport/Import/Interface/CMakeLists.txt
index 4028405..51d518e 100644
--- a/Tests/ExportImport/Import/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Import/Interface/CMakeLists.txt
@@ -82,6 +82,14 @@ endmacro()
 
 do_try_compile(bld)
 
+add_executable(source_target_test_bld source_target_test.cpp)
+target_link_libraries(source_target_test_bld bld::source_target)
+target_compile_definitions(source_target_test_bld PRIVATE USE_FROM_BUILD_DIR)
+
+add_executable(source_target_test_exp source_target_test.cpp)
+target_link_libraries(source_target_test_exp exp::source_target)
+target_compile_definitions(source_target_test_exp PRIVATE USE_FROM_INSTALL_DIR)
+
 add_executable(headeronlytest_exp headeronlytest.cpp)
 target_link_libraries(headeronlytest_exp exp::headeronly)
 
diff --git a/Tests/ExportImport/Import/Interface/source_target_test.cpp b/Tests/ExportImport/Import/Interface/source_target_test.cpp
new file mode 100644
index 0000000..0e8ec5f
--- /dev/null
+++ b/Tests/ExportImport/Import/Interface/source_target_test.cpp
@@ -0,0 +1,7 @@
+
+extern int source_symbol();
+
+int main()
+{
+  return source_symbol() - 42;
+}
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index a6a4100..6519682 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -192,6 +192,9 @@ add_RunCMake_test(ExternalProject)
 set(build-property-paths_INCLUDE_DIRECTORIES_ARGS -DTEST_PROP=INCLUDE_DIRECTORIES)
 add_RunCMake_test(build-property-paths_INCLUDE_DIRECTORIES TEST_DIR build-property-paths)
 
+set(build-property-paths_SOURCES_ARGS -DTEST_PROP=SOURCES)
+add_RunCMake_test(build-property-paths_SOURCES TEST_DIR build-property-paths)
+
 if(RPMBUILD)
   add_RunCMake_test(CPackRPM)
 endif()
diff --git a/Tests/RunCMake/TargetSources/ExportBuild-result.txt b/Tests/RunCMake/TargetSources/ExportBuild-result.txt
index d00491f..573541a 100644
--- a/Tests/RunCMake/TargetSources/ExportBuild-result.txt
+++ b/Tests/RunCMake/TargetSources/ExportBuild-result.txt
@@ -1 +1 @@
-1
+0
diff --git a/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt b/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
deleted file mode 100644
index 0d65a55..0000000
--- a/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-CMake Error: Target "iface" has a populated INTERFACE_SOURCES property.  This is not currently supported.
diff --git a/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt b/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
deleted file mode 100644
index 0d65a55..0000000
--- a/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-CMake Error: Target "iface" has a populated INTERFACE_SOURCES property.  This is not currently supported.
diff --git a/Tests/RunCMake/TargetSources/ExportInstall.cmake b/Tests/RunCMake/TargetSources/ExportInstall.cmake
deleted file mode 100644
index 8e7c9f9..0000000
--- a/Tests/RunCMake/TargetSources/ExportInstall.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-
-add_library(iface INTERFACE)
-target_sources(iface INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/empty_1.cpp")
-
-install(TARGETS iface EXPORT exp)
-install(EXPORT exp DESTINATION cmake)
diff --git a/Tests/RunCMake/TargetSources/RunCMakeTest.cmake b/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
index 1b4ef0b..4416ef9 100644
--- a/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
+++ b/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
@@ -10,4 +10,3 @@ endif()
 run_cmake(CMP0026-LOCATION)
 run_cmake(RelativePathInInterface)
 run_cmake(ExportBuild)
-run_cmake(ExportInstall)
diff --git a/Tests/RunCMake/TargetSources/ExportInstall-result.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-result.txt
similarity index 100%
rename from Tests/RunCMake/TargetSources/ExportInstall-result.txt
rename to Tests/RunCMake/build-property-paths/BinInInstallPrefix-result.txt
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-stderr_SOURCES.txt
new file mode 100644
index 0000000..fa39ff8
--- /dev/null
+++ b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/build-property-paths_SOURCES/prefix/BinInInstallPrefix-build/empty.cpp"
+
+  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_SOURCES.txt
new file mode 100644
index 0000000..bed2424
--- /dev/null
+++ b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/build-property-paths_SOURCES/BinaryDirectoryInInterface-build/empty.cpp"
+
+  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake
index 67ee7de..7001f3f 100644
--- a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake
+++ b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake
@@ -2,7 +2,11 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/foo")
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/foo")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/empty.cpp")
+endif()
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake b/Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake
index fab7717..f5f3005 100644
--- a/Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake
+++ b/Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake
@@ -1,6 +1,11 @@
 enable_language(CXX)
 add_library(testTarget empty.cpp)
-target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/dir")
+
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/dir")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_INSTALL_PREFIX}/empty.cpp")
+endif()
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_SOURCES.txt
new file mode 100644
index 0000000..02a8198
--- /dev/null
+++ b/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/build-property-paths_SOURCES/InstallInBinDir-build/empty.cpp"
+
+  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_SOURCES.txt
new file mode 100644
index 0000000..aece1ab
--- /dev/null
+++ b/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/build-property-paths_SOURCES/copy/empty.cpp"
+
+  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_SOURCES.txt
new file mode 100644
index 0000000..2311af9
--- /dev/null
+++ b/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_SOURCES.txt
@@ -0,0 +1,4 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" contains relative path in its INTERFACE_SOURCES:
+
+    "empty.cpp"
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake b/Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake
index 070a381..489c3a1 100644
--- a/Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake
+++ b/Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake
@@ -2,7 +2,12 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<1:foo>")
+
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<1:foo>")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "$<1:empty.cpp>")
+endif()
 
 add_library(userTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
 target_link_libraries(userTarget testTarget)
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_SOURCES.txt
new file mode 100644
index 0000000..f0f002c
--- /dev/null
+++ b/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_SOURCES.txt
@@ -0,0 +1,4 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains relative path:
+
+    "empty.cpp"
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake b/Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake
index 4c4727d..e974aac 100644
--- a/Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake
+++ b/Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake
@@ -2,8 +2,11 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "foo")
-
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "foo")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "empty.cpp")
+endif()
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
 )
diff --git a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_SOURCES.txt
new file mode 100644
index 0000000..187ccdf
--- /dev/null
+++ b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/build-property-paths/empty.cpp"
+
+  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake
index f814a3c..d80cbec 100644
--- a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake
+++ b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake
@@ -2,7 +2,11 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/foo")
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/foo")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
+endif()
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/TargetSources/ExportBuild-result.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-result.txt
similarity index 100%
copy from Tests/RunCMake/TargetSources/ExportBuild-result.txt
copy to Tests/RunCMake/build-property-paths/SrcInInstallPrefix-result.txt
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-stderr_SOURCES.txt
new file mode 100644
index 0000000..6a123f7
--- /dev/null
+++ b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/build-property-paths_SOURCES/prefix/src/empty.cpp"
+
+  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/export-NOWARN.cmake b/Tests/RunCMake/build-property-paths/export-NOWARN.cmake
index 50720a0..592572c 100644
--- a/Tests/RunCMake/build-property-paths/export-NOWARN.cmake
+++ b/Tests/RunCMake/build-property-paths/export-NOWARN.cmake
@@ -1,19 +1,34 @@
 enable_language(CXX)
 add_library(foo empty.cpp)
+
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<0:>/include/subdir)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_PREFIX>/include/subdir)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<0:>/include/subdir/empty.cpp)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_PREFIX>/include/subdir/empty.cpp)
 
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/subdir>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include/subdir>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include/$<0:>>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:$<0:>/include>)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/subdir/empty.cpp>)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:include/subdir/empty.cpp>)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:include/subdir/empty.cpp$<0:>>)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:$<0:>/include/subdir/empty.cpp>)
 
 # target_include_directories(foo INTERFACE include/subdir) # Does and should warn. INSTALL_INTERFACE must not list src dir paths.
 target_include_directories(foo INTERFACE $<0:>/include/subdir) # Does not and should not should warn, because it starts with a genex.
 target_include_directories(foo INTERFACE $<INSTALL_PREFIX>/include/subdir)
+target_sources(foo INTERFACE $<0:>/include/subdir/empty.cpp)
+target_sources(foo INTERFACE $<INSTALL_PREFIX>/include/subdir/empty.cpp)
 
 target_include_directories(foo INTERFACE $<INSTALL_INTERFACE:include/subdir>)
 target_include_directories(foo INTERFACE $<INSTALL_INTERFACE:include/$<0:>>)
+target_sources(foo INTERFACE $<INSTALL_INTERFACE:include/subdir/empty.cpp>)
+target_sources(foo INTERFACE $<INSTALL_INTERFACE:include/subdir/empty.cpp$<0:>>)
+
+install(FILES include/subdir/empty.cpp
+  DESTINATION include/subdir
+)
 
 install(TARGETS foo EXPORT FooTargets DESTINATION lib)
 install(EXPORT FooTargets DESTINATION lib/cmake)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b58c846b24475aa2f7fdb57139d04717d6d3007e
commit b58c846b24475aa2f7fdb57139d04717d6d3007e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 30 13:54:18 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:12:31 2015 +0100

    Tests: Move build-property-paths test stderr files.
    
    Rename the files with a property-specific name, so that additional
    properties can be easily tested.
    
    Extend the RunCMake infrastructure to allow specifying a non-uniform
    stderr file location.

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 33b745d..6389ef4 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -18,7 +18,10 @@ function(run_cmake test)
     set(expect_result 0)
   endif()
   foreach(o out err)
-    if(EXISTS ${top_src}/${test}-std${o}.txt)
+    if(RunCMake-std${o}-file AND EXISTS ${top_src}/${RunCMake-std${o}-file})
+      file(READ ${top_src}/${RunCMake-std${o}-file} expect_std${o})
+      string(REGEX REPLACE "\n+$" "" expect_std${o} "${expect_std${o}}")
+    elseif(EXISTS ${top_src}/${test}-std${o}.txt)
       file(READ ${top_src}/${test}-std${o}.txt expect_std${o})
       string(REGEX REPLACE "\n+$" "" expect_std${o} "${expect_std${o}}")
     else()
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
rename to Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
rename to Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr.txt b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr.txt
rename to Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr.txt b/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/InstallInBinDir-stderr.txt
rename to Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr.txt b/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr.txt
rename to Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr.txt b/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr.txt
rename to Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr.txt b/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr.txt
rename to Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake b/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
index eefdbf7..54d0cd8 100644
--- a/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
+++ b/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
@@ -2,6 +2,7 @@ include(RunCMake)
 
 macro(run_cmake test)
   list(APPEND RunCMake_TEST_OPTIONS -DTEST_PROP=${TEST_PROP})
+  set(RunCMake-stderr-file ${test}-stderr_${TEST_PROP}.txt)
   _run_cmake(${test})
 endmacro()
 
diff --git a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr.txt b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr.txt
rename to Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
rename to Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
rename to Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93bd212735198d7420de6613bc5557ff0acc2d5a
commit 93bd212735198d7420de6613bc5557ff0acc2d5a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 30 13:42:00 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 6 19:12:31 2015 +0100

    Tests: Run build-property-paths tests with a parameter.
    
    Run the tests for the INCLUDE_DIRECTORIES INTERFACE property
    in a specific build location, and update the stderr expectation
    to match the new output.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 88f4ab2..a6a4100 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -1,17 +1,28 @@
 # See adjacent README.rst for documentation of this test infrastructure.
 
 macro(add_RunCMake_test test)
+  set(TEST_ARGS ${ARGN})
+  if ("${ARGV1}" STREQUAL "TEST_DIR")
+    if ("${ARGV2}" STREQUAL "")
+      message(FATAL_ERROR "Invalid args")
+    endif()
+    set(Test_Dir ${ARGV2})
+    list(REMOVE_AT TEST_ARGS 0)
+    list(REMOVE_AT TEST_ARGS 0)
+  else()
+    set(Test_Dir ${test})
+  endif()
   add_test(NAME RunCMake.${test} COMMAND ${CMAKE_CMAKE_COMMAND}
     -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR}
     -DRunCMake_GENERATOR=${CMAKE_GENERATOR}
     -DRunCMake_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
     -DRunCMake_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET}
     -DRunCMake_MAKE_PROGRAM=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}
-    -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${test}
+    -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}
     -DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test}
     ${${test}_ARGS}
-    ${ARGN}
-    -P "${CMAKE_CURRENT_SOURCE_DIR}/${test}/RunCMakeTest.cmake"
+    ${TEST_ARGS}
+    -P "${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}/RunCMakeTest.cmake"
     )
 endmacro()
 
@@ -177,7 +188,9 @@ add_RunCMake_test(CommandLine)
 add_RunCMake_test(install)
 add_RunCMake_test(CPackInstallProperties)
 add_RunCMake_test(ExternalProject)
-add_RunCMake_test(build-property-paths)
+
+set(build-property-paths_INCLUDE_DIRECTORIES_ARGS -DTEST_PROP=INCLUDE_DIRECTORIES)
+add_RunCMake_test(build-property-paths_INCLUDE_DIRECTORIES TEST_DIR build-property-paths)
 
 if(RPMBUILD)
   add_RunCMake_test(CPackRPM)
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
index e8c47b1..8db7283 100644
--- a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/build-property-paths/prefix/BinInInstallPrefix-CMP0052-NEW-build/foo"
+    ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-NEW-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
index c0c4806..6473efe 100644
--- a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
@@ -6,15 +6,15 @@ CMake Warning \(dev\) in CMakeLists.txt:
 
   Directory:
 
-      ".*Tests/RunCMake/build-property-paths/prefix/BinInInstallPrefix-CMP0052-WARN-build/foo"
+      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-WARN-build/foo"
 
   in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory
   of the install directory:
 
-      ".*Tests/RunCMake/build-property-paths/prefix"
+      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix"
 
   however it is also a subdirectory of the build tree:
 
-      ".*Tests/RunCMake/build-property-paths/prefix/BinInInstallPrefix-CMP0052-WARN-build"
+      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-WARN-build"
 
 This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr.txt b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr.txt
index 332c237..94c46ab 100644
--- a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*RunCMake/build-property-paths/BinaryDirectoryInInterface-build/foo"
+    ".*RunCMake/build-property-paths_INCLUDE_DIRECTORIES/BinaryDirectoryInInterface-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr.txt b/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr.txt
index 504e332..83ae34c 100644
--- a/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/build-property-paths/InstallInBinDir-build/foo"
+    ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/InstallInBinDir-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr.txt b/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr.txt
index 5f0a3ea..a7a5af4 100644
--- a/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/build-property-paths/copy/foo"
+    ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/copy/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake b/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
index 2add175..eefdbf7 100644
--- a/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
+++ b/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
@@ -1,5 +1,10 @@
 include(RunCMake)
 
+macro(run_cmake test)
+  list(APPEND RunCMake_TEST_OPTIONS -DTEST_PROP=${TEST_PROP})
+  _run_cmake(${test})
+endmacro()
+
 run_cmake(RelativePathInInterface)
 run_cmake(RelativePathInGenex)
 run_cmake(export-NOWARN)
@@ -57,12 +62,15 @@ configure_file(
   COPYONLY
 )
 
-foreach(policyStatus "" NEW OLD)
-  if (NOT "${policyStatus}" STREQUAL "")
-    set(policyOption -DCMAKE_POLICY_DEFAULT_CMP0052=${policyStatus})
-  else()
-    unset(policyOption)
-    set(policyStatus WARN)
+foreach(policyStatus NEW OLD "")
+  if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+    if (NOT "${policyStatus}" STREQUAL "")
+      set(policyOption -DCMAKE_POLICY_DEFAULT_CMP0052=${policyStatus})
+    else()
+      unset(policyOption)
+      set(policyStatus WARN)
+    endif()
+    set(policySuffix -CMP0052-${policyStatus})
   endif()
   set(RunCMake_TEST_OPTIONS
     "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
@@ -73,16 +81,20 @@ foreach(policyStatus "" NEW OLD)
   # a subdirectory or the source directory, which is allowed and tested separately
   # below.
   set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/prefix/src")
-  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/prefix/BinInInstallPrefix-CMP0052-${policyStatus}-build")
-  run_cmake(BinInInstallPrefix-CMP0052-${policyStatus})
+  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/prefix/BinInInstallPrefix${policySuffix}-build")
+  run_cmake(BinInInstallPrefix${policySuffix})
   unset(RunCMake_TEST_BINARY_DIR)
 
   set(RunCMake_TEST_OPTIONS
     "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
     "-DTEST_FILE=${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake"
     )
-  run_cmake(SrcInInstallPrefix-CMP0052-${policyStatus})
+  run_cmake(SrcInInstallPrefix${policySuffix})
   unset(RunCMake_TEST_SOURCE_DIR)
+
+  if (NOT TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+    break()
+  endif()
 endforeach()
 
 set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallPrefixInInterface-build/prefix")
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
index 4838a53..2af50d5 100644
--- a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/build-property-paths/prefix/src/foo"
+    ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/src/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
index 8b2d69d..56aaa2c 100644
--- a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
+++ b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
@@ -6,15 +6,15 @@ CMake Warning \(dev\) in CMakeLists.txt:
 
   Directory:
 
-      ".*Tests/RunCMake/build-property-paths/prefix/src/foo"
+      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/src/foo"
 
   in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory
   of the install directory:
 
-      ".*Tests/RunCMake/build-property-paths/prefix"
+      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix"
 
   however it is also a subdirectory of the source tree:
 
-      ".*Tests/RunCMake/build-property-paths/prefix/src"
+      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/src"
 
 This warning is for project developers.  Use -Wno-dev to suppress it.

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb  6 13:39:53 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  6 Feb 2015 13:39:53 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1110-gac06e3e
Message-ID: <20150206183953.EEB3949B8@public.kitware.com>

This is an automated email from 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  ac06e3ebdab8cdec3195464774bf91f9404929a4 (commit)
       via  0f870234febd9dba0df78e903b412ea19d681062 (commit)
       via  cd408d93fdf347ff63a8062f75f1f4ee3e898b17 (commit)
       via  87be2e1427ba2b1b7697c9332487862917897dca (commit)
      from  a56d580574e11b13a9adb8de0632c6c0b4a8a4da (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac06e3ebdab8cdec3195464774bf91f9404929a4
commit ac06e3ebdab8cdec3195464774bf91f9404929a4
Merge: a56d580 0f87023
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 13:39:52 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 6 13:39:52 2015 -0500

    Merge topic 'no-global-setlocale' into next
    
    0f870234 Merge branch 'backport-no-global-setlocale' into no-global-setlocale
    cd408d93 Add setlocale() calls around use of libarchive APIs (#14934, #15377)
    87be2e14 Do not call setlocale() globally in CMake applications (#15377)

diff --cc Source/cmSystemTools.cxx
index fea3b5f,6a7467f..2d70ab4
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@@ -26,7 -26,9 +26,8 @@@
  #include <cmsys/Encoding.hxx>
  #if defined(CMAKE_BUILD_WITH_CMAKE)
  # include "cmArchiveWrite.h"
+ # include "cmLocale.h"
  # include <cm_libarchive.h>
 -# include <cmsys/Terminal.h>
  #endif
  #include <cmsys/stl/algorithm>
  #include <cmsys/FStream.hxx>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f870234febd9dba0df78e903b412ea19d681062
commit 0f870234febd9dba0df78e903b412ea19d681062
Merge: 78c4418 cd408d9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 13:35:21 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 6 13:35:21 2015 -0500

    Merge branch 'backport-no-global-setlocale' into no-global-setlocale
    
    Resolve conflict in Source/CMakeLists.txt by taking both changes.

diff --cc Source/CMakeLists.txt
index 07839f3,1ff1c16..8a83c3e
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@@ -277,7 -261,7 +277,8 @@@ set(SRC
    cmLocalGenerator.cxx
    cmLocalGenerator.h
    cmLocalUnixMakefileGenerator3.cxx
+   cmLocale.h
 +  ${MACH_SRCS}
    cmMakeDepend.cxx
    cmMakeDepend.h
    cmMakefile.cxx

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd408d93fdf347ff63a8062f75f1f4ee3e898b17
commit cd408d93fdf347ff63a8062f75f1f4ee3e898b17
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 13:23:07 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 6 13:32:57 2015 -0500

    Add setlocale() calls around use of libarchive APIs (#14934, #15377)
    
    The libarchive APIs use nl_langinfo(CODESET) for iconv so they need the
    locale to be set for LC_CTYPE.  However, the rest of CMake does not
    define any behavior for non-ASCII character classification/conversion so
    we do not want to setlocale() globally.  Add a RAII class to save, set,
    and restore the locale around calls to libarchive APIs.
    
    Inspired-by: Clinton Stimpson <clinton at elemtech.com>

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index f9405b3..1ff1c16 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -261,6 +261,7 @@ set(SRCS
   cmLocalGenerator.cxx
   cmLocalGenerator.h
   cmLocalUnixMakefileGenerator3.cxx
+  cmLocale.h
   cmMakeDepend.cxx
   cmMakeDepend.h
   cmMakefile.cxx
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index a2aecac..9f28d42 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -12,6 +12,7 @@
 #include "cmArchiveWrite.h"
 
 #include "cmSystemTools.h"
+#include "cmLocale.h"
 #include <cmsys/ios/iostream>
 #include <cmsys/Directory.hxx>
 #include <cmsys/FStream.hxx>
@@ -259,6 +260,9 @@ bool cmArchiveWrite::AddFile(const char* file,
     }
   const char* out = file + skip;
 
+  cmLocaleRAII localeRAII;
+  static_cast<void>(localeRAII);
+
   // Meta-data.
   std::string dest = prefix? prefix : "";
   dest += out;
diff --git a/Source/cmLocale.h b/Source/cmLocale.h
new file mode 100644
index 0000000..727f0f5
--- /dev/null
+++ b/Source/cmLocale.h
@@ -0,0 +1,31 @@
+/*============================================================================
+  CMake - Cross Platform Makefile Generator
+  Copyright 2000-2015 Kitware, Inc., Insight Software Consortium
+
+  Distributed under the OSI-approved BSD License (the "License");
+  see accompanying file Copyright.txt for details.
+
+  This software is distributed WITHOUT ANY WARRANTY; without even the
+  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the License for more information.
+============================================================================*/
+#ifndef cmLocale_h
+#define cmLocale_h
+
+#include <locale.h>
+
+class cmLocaleRAII
+{
+  const char* OldLocale;
+public:
+  cmLocaleRAII(): OldLocale(setlocale(LC_CTYPE, 0))
+    {
+    setlocale(LC_CTYPE, "");
+    }
+  ~cmLocaleRAII()
+    {
+    setlocale(LC_CTYPE, this->OldLocale);
+    }
+};
+
+#endif
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index fbb4416..89efdc7 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -28,6 +28,7 @@
 #include <cmsys/Encoding.hxx>
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 # include "cmArchiveWrite.h"
+# include "cmLocale.h"
 # include <cm_libarchive.h>
 # include <cmsys/Terminal.h>
 #endif
@@ -1691,6 +1692,8 @@ long copy_data(struct archive *ar, struct archive *aw)
 bool extract_tar(const char* outFileName, bool verbose,
                  bool extract)
 {
+  cmLocaleRAII localeRAII;
+  static_cast<void>(localeRAII);
   struct archive* a = archive_read_new();
   struct archive *ext = archive_write_disk_new();
   archive_read_support_compression_all(a);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87be2e1427ba2b1b7697c9332487862917897dca
commit 87be2e1427ba2b1b7697c9332487862917897dca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 13:09:37 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 6 13:32:26 2015 -0500

    Do not call setlocale() globally in CMake applications (#15377)
    
    Revert the changes made by commit v3.1.0-rc1~406^2~1 (Encoding: Add
    setlocale() to applications, 2014-05-30) and commit v3.1.0-rc1~406^2
    (Encoding: Change to only set LC_CTYPE, 2014-06-11), and other setlocale
    calls added later in their spirit.  CMake has not been taught how to
    deal with non-C locales everywhere.  We do not define any functionality
    for character conversions for non-ASCII strings.  Another solution will
    be needed to address the original problem motivating addition of
    setlocale() calls.

diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index c57028d..0173361 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -26,7 +26,6 @@
 #include <cmsys/CommandLineArguments.hxx>
 #include <cmsys/SystemTools.hxx>
 #include <cmsys/Encoding.hxx>
-#include <locale.h>
 
 //----------------------------------------------------------------------------
 static const char * cmDocumentationName[][2] =
@@ -101,7 +100,6 @@ int cpackDefinitionArgument(const char* argument, const char* cValue,
 // this is CPack.
 int main (int argc, char const* const* argv)
 {
-  setlocale(LC_CTYPE, "");
   cmsys::Encoding::CommandLineArguments args =
     cmsys::Encoding::CommandLineArguments::Main(argc, argv);
   argc = args.argc();
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx
index 28f3d9b..3d92a2d 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@@ -16,7 +16,6 @@
 
 #include <signal.h>
 #include <sys/ioctl.h>
-#include <locale.h>
 
 #include "cmCursesMainForm.h"
 #include "cmCursesStandardIncludes.h"
@@ -95,8 +94,6 @@ void CMakeMessageHandler(const char* message, const char* title, bool&,
 
 int main(int argc, char const* const* argv)
 {
-  setlocale(LC_CTYPE, "");
-
   cmsys::Encoding::CommandLineArguments encoding_args =
     cmsys::Encoding::CommandLineArguments::Main(argc, argv);
   argc = encoding_args.argc();
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 61b175e..e825f1f 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -25,7 +25,6 @@
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 #include <cmsys/Encoding.hxx>
-#include <locale.h>
 
 #ifdef CMAKE_BUILD_WITH_CMAKE
 //----------------------------------------------------------------------------
@@ -175,7 +174,6 @@ static void cmakemainProgressCallback(const char *m, float prog,
 
 int main(int ac, char const* const* av)
 {
-  setlocale(LC_CTYPE, "");
   cmsys::Encoding::CommandLineArguments args =
     cmsys::Encoding::CommandLineArguments::Main(ac, av);
   ac = args.argc();
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index fb97af6..3fe31ca 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -19,7 +19,6 @@
 #include "CTest/cmCTestScriptHandler.h"
 #include "CTest/cmCTestLaunch.h"
 #include "cmsys/Encoding.hxx"
-#include <locale.h>
 
 //----------------------------------------------------------------------------
 static const char * cmDocumentationName[][2] =
@@ -117,8 +116,6 @@ static const char * cmDocumentationOptions[][2] =
 // this is a test driver program for cmCTest.
 int main (int argc, char const* const* argv)
 {
-  setlocale(LC_CTYPE, "");
-
   cmsys::Encoding::CommandLineArguments encoding_args =
     cmsys::Encoding::CommandLineArguments::Main(argc, argv);
   argc = encoding_args.argc();
diff --git a/Tests/CTestTestMemcheck/memtester.cxx.in b/Tests/CTestTestMemcheck/memtester.cxx.in
index 43c0ba7..c018e08 100644
--- a/Tests/CTestTestMemcheck/memtester.cxx.in
+++ b/Tests/CTestTestMemcheck/memtester.cxx.in
@@ -1,14 +1,12 @@
 #include <cmSystemTools.h>
 #include <cmsys/Encoding.hxx>
 #include <string>
-#include <locale.h>
 
 #define RETVAL @_retval@
 
 int
 main(int ac, char **av)
 {
-  setlocale(LC_CTYPE, "");
   cmsys::Encoding::CommandLineArguments args =
     cmsys::Encoding::CommandLineArguments::Main(ac, av);
   int argc = args.argc();

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

Summary of changes:
 Source/CMakeLists.txt                          |    1 +
 Source/CPack/cpack.cxx                         |    2 --
 Source/CursesDialog/ccmake.cxx                 |    3 ---
 Source/cmArchiveWrite.cxx                      |    4 ++++
 Source/{cmCurl.h => cmLocale.h}                |   22 ++++++++++++++++------
 Source/cmSystemTools.cxx                       |    3 +++
 Source/cmakemain.cxx                           |    2 --
 Source/ctest.cxx                               |    3 ---
 Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in |    2 --
 9 files changed, 24 insertions(+), 18 deletions(-)
 copy Source/{cmCurl.h => cmLocale.h} (67%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb  6 16:44:37 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  6 Feb 2015 16:44:37 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1112-g57d15db
Message-ID: <20150206214437.F0F59AAAEB@public.kitware.com>

This is an automated email from 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  57d15db5af7074d421ee5f86eafcf852c93e2d6a (commit)
       via  c6ada8275b680e02f50a7aee1c02b0b184cadf83 (commit)
      from  ac06e3ebdab8cdec3195464774bf91f9404929a4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57d15db5af7074d421ee5f86eafcf852c93e2d6a
commit 57d15db5af7074d421ee5f86eafcf852c93e2d6a
Merge: ac06e3e c6ada82
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 16:44:37 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 6 16:44:37 2015 -0500

    Merge topic 'fix-make-parallel-output' into next
    
    c6ada827 Makefile: Print all color escape sequences before newline


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6ada8275b680e02f50a7aee1c02b0b184cadf83
commit c6ada8275b680e02f50a7aee1c02b0b184cadf83
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 16:39:00 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 6 16:41:51 2015 -0500

    Makefile: Print all color escape sequences before newline
    
    Ensure that the escape sequences do not leak across lines.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index ec3d846..f50d16c 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2304,13 +2304,19 @@ void cmSystemTools::MakefileColorEcho(int color, const char* message,
 
   if(enabled)
     {
-    cmsysTerminal_cfprintf(color | assumeTTY, stdout, "%s%s",
-                           message, newline? "\n" : "");
+    // Print with color.  Delay the newline until later so that
+    // all color restore sequences appear before it.
+    cmsysTerminal_cfprintf(color | assumeTTY, stdout, "%s", message);
     }
   else
     {
     // Color is disabled.  Print without color.
-    fprintf(stdout, "%s%s", message, newline? "\n" : "");
+    fprintf(stdout, "%s", message);
+    }
+
+  if(newline)
+    {
+    fprintf(stdout, "\n");
     }
 }
 

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

Summary of changes:
 Source/cmSystemTools.cxx |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sat Feb  7 00:01:11 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Sat,  7 Feb 2015 00:01:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1020-g8b7e5e5
Message-ID: <20150207050111.3A09AAAAF3@public.kitware.com>

This is an automated email from 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  8b7e5e599616b6b805d87addc12050a6d6987429 (commit)
      from  3f73531d4e415c9c6182e162028eb146922d3c90 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b7e5e599616b6b805d87addc12050a6d6987429
commit 8b7e5e599616b6b805d87addc12050a6d6987429
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sat Feb 7 00:01:09 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sat Feb 7 00:01:09 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index ee29533..acb4882 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 2)
-set(CMake_VERSION_PATCH 20150206)
+set(CMake_VERSION_PATCH 20150207)
 #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  Sat Feb  7 06:52:05 2015
From: brad.king at kitware.com (Brad King)
Date: Sat,  7 Feb 2015 06:52:05 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1116-g82caa82
Message-ID: <20150207115206.5F864AA168@public.kitware.com>

This is an automated email from 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  82caa821d99066ee5eba5dcdbd0ee937b6890919 (commit)
       via  63668954e002aa41ff0287aae22caeeacdc0c356 (commit)
       via  ae775fe8041183030c69db1714c898b6e74f1284 (commit)
       via  7bb50e4a31ad5a8a58fe60885014d431a887b27f (commit)
      from  57d15db5af7074d421ee5f86eafcf852c93e2d6a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82caa821d99066ee5eba5dcdbd0ee937b6890919
commit 82caa821d99066ee5eba5dcdbd0ee937b6890919
Merge: 57d15db 6366895
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Feb 7 06:52:03 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 7 06:52:03 2015 -0500

    Merge topic 'makefile-progress-improvements' into next
    
    63668954 Help: Add notes for topic 'makefile-progress-improvements'
    ae775fe8 Makefile: Change link step message color to bold green
    7bb50e4a Makefile: Add progress to link step messages


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63668954e002aa41ff0287aae22caeeacdc0c356
commit 63668954e002aa41ff0287aae22caeeacdc0c356
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 19:16:45 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 6 19:16:45 2015 -0500

    Help: Add notes for topic 'makefile-progress-improvements'

diff --git a/Help/release/dev/makefile-progress-improvements.rst b/Help/release/dev/makefile-progress-improvements.rst
new file mode 100644
index 0000000..9cc9706
--- /dev/null
+++ b/Help/release/dev/makefile-progress-improvements.rst
@@ -0,0 +1,7 @@
+makefile-progress-improvements
+------------------------------
+
+* With Makefile generators, the build-time progress output has been improved.
+  It no longer mixes progress and build rule messages during parallel builds.
+  The link rule messages now have progress and are displayed as bold green
+  instead of bold red (since red is often associated with an error message).

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae775fe8041183030c69db1714c898b6e74f1284
commit ae775fe8041183030c69db1714c898b6e74f1284
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 19:07:56 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 6 19:07:56 2015 -0500

    Makefile: Change link step message color to bold green
    
    Avoid displaying red messages when no error has occurred.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index c60a9c7..c4f7243 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1367,7 +1367,7 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands,
         color_name = "--green ";
         break;
       case EchoLink:
-        color_name = "--red --bold ";
+        color_name = "--green --bold ";
         break;
       case EchoGenerate:
         color_name = "--blue --bold ";

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bb50e4a31ad5a8a58fe60885014d431a887b27f
commit 7bb50e4a31ad5a8a58fe60885014d431a887b27f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 19:07:24 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 6 19:07:24 2015 -0500

    Makefile: Add progress to link step messages

diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index d4036d2..ab58cbd 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -171,15 +171,19 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     return;
     }
 
+  this->NumberOfProgressActions++;
   if(!this->NoRuleMessages)
     {
+    cmLocalUnixMakefileGenerator3::EchoProgress progress;
+    this->MakeEchoProgress(progress);
     // Add the link message.
     std::string buildEcho = "Linking ";
     buildEcho += linkLanguage;
     buildEcho += " executable ";
     buildEcho += targetOutPath;
     this->LocalGenerator->AppendEcho(commands, buildEcho.c_str(),
-                                     cmLocalUnixMakefileGenerator3::EchoLink);
+                                     cmLocalUnixMakefileGenerator3::EchoLink,
+                                     &progress);
     }
 
   // Build a list of compiler flags and linker flags.
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index cdda36c..84761cc 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -341,8 +341,11 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     this->Convert(targetFullPathImport,cmLocalGenerator::START_OUTPUT,
                   cmLocalGenerator::SHELL);
 
+  this->NumberOfProgressActions++;
   if(!this->NoRuleMessages)
     {
+    cmLocalUnixMakefileGenerator3::EchoProgress progress;
+    this->MakeEchoProgress(progress);
     // Add the link message.
     std::string buildEcho = "Linking ";
     buildEcho += linkLanguage;
@@ -365,7 +368,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
       }
     buildEcho += targetOutPath.c_str();
     this->LocalGenerator->AppendEcho(commands, buildEcho.c_str(),
-                                     cmLocalUnixMakefileGenerator3::EchoLink);
+                                     cmLocalUnixMakefileGenerator3::EchoLink,
+                                     &progress);
     }
 
   const char* forbiddenFlagVar = 0;

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

Summary of changes:
 Help/release/dev/makefile-progress-improvements.rst |    7 +++++++
 Source/cmLocalUnixMakefileGenerator3.cxx            |    2 +-
 Source/cmMakefileExecutableTargetGenerator.cxx      |    6 +++++-
 Source/cmMakefileLibraryTargetGenerator.cxx         |    6 +++++-
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 Help/release/dev/makefile-progress-improvements.rst


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sun Feb  8 00:01:11 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Sun,  8 Feb 2015 00:01:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1021-gd30036c
Message-ID: <20150208050111.1B0FFAAA18@public.kitware.com>

This is an automated email from 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  d30036cfadb6f5ad927bf5f968f7e93472b50c45 (commit)
      from  8b7e5e599616b6b805d87addc12050a6d6987429 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d30036cfadb6f5ad927bf5f968f7e93472b50c45
commit d30036cfadb6f5ad927bf5f968f7e93472b50c45
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sun Feb 8 00:01:08 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun Feb 8 00:01:08 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index acb4882..4747b4c 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 2)
-set(CMake_VERSION_PATCH 20150207)
+set(CMake_VERSION_PATCH 20150208)
 #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 Feb  8 14:05:25 2015
From: domen.vrankar at gmail.com (Domen Vrankar)
Date: Sun,  8 Feb 2015 14:05:25 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1118-g1952221
Message-ID: <20150208190525.8B6B1AAD14@public.kitware.com>

This is an automated email from 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  19522216e892f73351dc480507040cd453a795cb (commit)
       via  521d4cc55eee3e0c541af822f4d786978b6bf31d (commit)
      from  82caa821d99066ee5eba5dcdbd0ee937b6890919 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19522216e892f73351dc480507040cd453a795cb
commit 19522216e892f73351dc480507040cd453a795cb
Merge: 82caa82 521d4cc
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun Feb 8 14:05:24 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 8 14:05:24 2015 -0500

    Merge topic 'cpack_rpm_mulit_prefix_fixup' into next
    
    521d4cc5 fixup! CPackRPM: Allow multiple path relocation prefixes for one package


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=521d4cc55eee3e0c541af822f4d786978b6bf31d
commit 521d4cc55eee3e0c541af822f4d786978b6bf31d
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun Feb 8 20:03:53 2015 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sun Feb 8 20:03:53 2015 +0100

    fixup! CPackRPM: Allow multiple path relocation prefixes for one package

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 43e3fe0..214d655 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -442,7 +442,7 @@ function(cpack_rpm_prepare_relocation_paths)
 
   # set other path prefixes
   foreach(RELOCATION_PATH ${RPM_RELOCATION_PATHS})
-    if(IS_ABSOLUTE "${RELOCATE_PATH}")
+    if(IS_ABSOLUTE "${RELOCATION_PATH}")
       set(PREPARED_RELOCATION_PATH "${RELOCATION_PATH}")
     else()
       set(PREPARED_RELOCATION_PATH "${PATH_PREFIX}/${RELOCATION_PATH}")

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

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


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Mon Feb  9 00:01:11 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Mon,  9 Feb 2015 00:01:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1022-g9bbfe76
Message-ID: <20150209050111.621F2AAA31@public.kitware.com>

This is an automated email from 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  9bbfe76d2c899fdbb54eb92716aea7282d2f3cce (commit)
      from  d30036cfadb6f5ad927bf5f968f7e93472b50c45 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9bbfe76d2c899fdbb54eb92716aea7282d2f3cce
commit 9bbfe76d2c899fdbb54eb92716aea7282d2f3cce
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Mon Feb 9 00:01:09 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Feb 9 00:01:09 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 4747b4c..6ac9705 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 2)
-set(CMake_VERSION_PATCH 20150208)
+set(CMake_VERSION_PATCH 20150209)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From nilsgladitz at gmail.com  Mon Feb  9 05:04:14 2015
From: nilsgladitz at gmail.com (Nils Gladitz)
Date: Mon,  9 Feb 2015 05:04:14 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1123-ge09df3a
Message-ID: <20150209100414.A0C07AAE81@public.kitware.com>

This is an automated email from 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  e09df3a8536a8f0e0b426ddeb628ac58d418489b (commit)
       via  220c427e84215b28ea1dd6de74e9dc6e81f7962e (commit)
       via  9bbfe76d2c899fdbb54eb92716aea7282d2f3cce (commit)
       via  d30036cfadb6f5ad927bf5f968f7e93472b50c45 (commit)
       via  8b7e5e599616b6b805d87addc12050a6d6987429 (commit)
      from  19522216e892f73351dc480507040cd453a795cb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e09df3a8536a8f0e0b426ddeb628ac58d418489b
commit e09df3a8536a8f0e0b426ddeb628ac58d418489b
Merge: 1952221 220c427
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Feb 9 05:04:13 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 9 05:04:13 2015 -0500

    Merge topic 'try_compile-quote-module-path' into next
    
    220c427e try_compile: Quote the content of CMAKE_MODULE_PATH to allow for spaces
    9bbfe76d CMake Nightly Date Stamp
    d30036cf CMake Nightly Date Stamp
    8b7e5e59 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=220c427e84215b28ea1dd6de74e9dc6e81f7962e
commit 220c427e84215b28ea1dd6de74e9dc6e81f7962e
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Feb 9 10:51:22 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Feb 9 10:51:22 2015 +0100

    try_compile: Quote the content of CMAKE_MODULE_PATH to allow for spaces

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 5b5d6b6..c414553 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -296,7 +296,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
             cmVersion::GetPatchVersion(), cmVersion::GetTweakVersion());
     if(def)
       {
-      fprintf(fout, "set(CMAKE_MODULE_PATH %s)\n", def);
+      fprintf(fout, "set(CMAKE_MODULE_PATH \"%s\")\n", def);
       }
 
     std::string projectLangs;

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

Summary of changes:
 Source/CMakeVersion.cmake   |    2 +-
 Source/cmCoreTryCompile.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Feb  9 13:37:42 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon,  9 Feb 2015 13:37:42 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1125-g0d4ba3c
Message-ID: <20150209183742.0C1C4AAE8A@public.kitware.com>

This is an automated email from 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  0d4ba3c93ba7d30587eaf9ede129ff94801dda91 (commit)
       via  32d0e398fd2739881a2755c1d24b11a304edbfe4 (commit)
      from  e09df3a8536a8f0e0b426ddeb628ac58d418489b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d4ba3c93ba7d30587eaf9ede129ff94801dda91
commit 0d4ba3c93ba7d30587eaf9ede129ff94801dda91
Merge: e09df3a 32d0e39
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 13:37:38 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 9 13:37:38 2015 -0500

    Merge topic 'export-interface-source-files' into next
    
    32d0e398 Revert topic


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32d0e398fd2739881a2755c1d24b11a304edbfe4
commit 32d0e398fd2739881a2755c1d24b11a304edbfe4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 19:36:30 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 9 19:36:48 2015 +0100

    Revert topic

diff --git a/Help/command/target_sources.rst b/Help/command/target_sources.rst
index d6f148d..832240a 100644
--- a/Help/command/target_sources.rst
+++ b/Help/command/target_sources.rst
@@ -22,6 +22,10 @@ items will populate the :prop_tgt:`SOURCES` property of
 following arguments specify sources.  Repeated calls for the same
 ``<target>`` append items in the order called.
 
+Targets with :prop_tgt:`INTERFACE_SOURCES` may not be exported with the
+:command:`export` or :command:`install(EXPORT)` commands. This limitation may be
+lifted in a future version of CMake.
+
 Arguments to ``target_sources`` may use "generator expressions"
 with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)`
 manual for available expressions.  See the :manual:`cmake-buildsystem(7)`
diff --git a/Help/prop_tgt/INTERFACE_SOURCES.rst b/Help/prop_tgt/INTERFACE_SOURCES.rst
index a224b68..696ee95 100644
--- a/Help/prop_tgt/INTERFACE_SOURCES.rst
+++ b/Help/prop_tgt/INTERFACE_SOURCES.rst
@@ -12,6 +12,10 @@ When target dependencies are specified using :command:`target_link_libraries`,
 CMake will read this property from all target dependencies to determine the
 sources of the consumer.
 
+Targets with ``INTERFACE_SOURCES`` may not be exported with the
+:command:`export` or :command:`install(EXPORT)` commands. This limitation may be
+lifted in a future version of CMake.
+
 Contents of ``INTERFACE_SOURCES`` may use "generator expressions"
 with the syntax ``$<...>``.  See the :manual:`cmake-generator-expressions(7)`
 manual for available expressions.  See the :manual:`cmake-buildsystem(7)`
diff --git a/Help/release/dev/export-interface-source-files.rst b/Help/release/dev/export-interface-source-files.rst
deleted file mode 100644
index 00dcd25..0000000
--- a/Help/release/dev/export-interface-source-files.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-export-interface-source-files
------------------------------
-
-* It is now possible to export targets which populate the
-  :prop_tgt:`INTERFACE_SOURCES` target property using the
-  :command:`install(EXPORT)` and :command:`export()` commands.
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index b1203dd..a28ec48 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -68,6 +68,16 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
       tei != this->Exports.end(); ++tei)
     {
     cmTarget* te = *tei;
+    if (te->GetProperty("INTERFACE_SOURCES"))
+      {
+      std::ostringstream e;
+      e << "Target \""
+        << te->GetName()
+        << "\" has a populated INTERFACE_SOURCES property.  This is not "
+          "currently supported.";
+      cmSystemTools::Error(e.str().c_str());
+      return false;
+      }
     this->GenerateImportTargetCode(os, te);
 
     te->AppendBuildInterfaceIncludes();
@@ -77,9 +87,6 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
     this->PopulateInterfaceProperty("INTERFACE_INCLUDE_DIRECTORIES", te,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_SOURCES", te,
-                                    cmGeneratorExpression::BuildInterface,
-                                    properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS", te,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 71728be..af4ce8b 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -224,7 +224,7 @@ static bool isSubDirectory(const char* a, const char* b)
 
 //----------------------------------------------------------------------------
 static bool checkInterfaceDirs(const std::string &prepro,
-                      cmTarget *target, const std::string& prop)
+                      cmTarget *target)
 {
   const char* installDir =
             target->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
@@ -250,27 +250,20 @@ static bool checkInterfaceDirs(const std::string &prepro,
     std::ostringstream e;
     if (genexPos != std::string::npos)
       {
-      if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
+      switch (target->GetPolicyStatusCMP0041())
         {
-        switch (target->GetPolicyStatusCMP0041())
-          {
-          case cmPolicies::WARN:
-            messageType = cmake::WARNING;
-            e << target->GetMakefile()->GetPolicies()
-                        ->GetPolicyWarning(cmPolicies::CMP0041) << "\n";
-            break;
-          case cmPolicies::OLD:
-            continue;
-          case cmPolicies::REQUIRED_IF_USED:
-          case cmPolicies::REQUIRED_ALWAYS:
-          case cmPolicies::NEW:
-            hadFatalError = true;
-            break; // Issue fatal message.
-          }
-        }
-      else
-        {
-        hadFatalError = true;
+        case cmPolicies::WARN:
+          messageType = cmake::WARNING;
+          e << target->GetMakefile()->GetPolicies()
+                      ->GetPolicyWarning(cmPolicies::CMP0041) << "\n";
+          break;
+        case cmPolicies::OLD:
+          continue;
+        case cmPolicies::REQUIRED_IF_USED:
+        case cmPolicies::REQUIRED_ALWAYS:
+        case cmPolicies::NEW:
+          hadFatalError = true;
+          break; // Issue fatal message.
         }
       }
     if (cmHasLiteralPrefix(li->c_str(), "${_IMPORT_PREFIX}"))
@@ -279,8 +272,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       }
     if (!cmSystemTools::FileIsFullPath(li->c_str()))
       {
-      e << "Target \"" << target->GetName() << "\" " << prop <<
-           " property contains relative path:\n"
+      e << "Target \"" << target->GetName() << "\" "
+           "INTERFACE_INCLUDE_DIRECTORIES property contains relative path:\n"
            "  \"" << *li << "\"";
       target->GetMakefile()->IssueMessage(messageType, e.str());
       }
@@ -296,35 +289,32 @@ static bool checkInterfaceDirs(const std::string &prepro,
         (!inBinary || isSubDirectory(installDir, topBinaryDir)) &&
         (!inSource || isSubDirectory(installDir, topSourceDir));
 
-      if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
+      if (!shouldContinue)
         {
-        if (!shouldContinue)
+        switch(target->GetPolicyStatusCMP0052())
           {
-          switch(target->GetPolicyStatusCMP0052())
+          case cmPolicies::WARN:
             {
-            case cmPolicies::WARN:
-              {
-              std::ostringstream s;
-              s << target->GetMakefile()->GetPolicies()
-                        ->GetPolicyWarning(cmPolicies::CMP0052) << "\n";
-              s << "Directory:\n    \"" << *li << "\"\nin "
-                "INTERFACE_INCLUDE_DIRECTORIES of target \""
-                << target->GetName() << "\" is a subdirectory of the install "
-                "directory:\n    \"" << installDir << "\"\nhowever it is also "
-                "a subdirectory of the " << (inBinary ? "build" : "source")
-                << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
-                << "\"" << std::endl;
-              target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
-                                                  s.str());
-              }
-            case cmPolicies::OLD:
-              shouldContinue = true;
-              break;
-            case cmPolicies::REQUIRED_ALWAYS:
-            case cmPolicies::REQUIRED_IF_USED:
-            case cmPolicies::NEW:
-              break;
+            std::ostringstream s;
+            s << target->GetMakefile()->GetPolicies()
+                      ->GetPolicyWarning(cmPolicies::CMP0052) << "\n";
+            s << "Directory:\n    \"" << *li << "\"\nin "
+              "INTERFACE_INCLUDE_DIRECTORIES of target \""
+              << target->GetName() << "\" is a subdirectory of the install "
+              "directory:\n    \"" << installDir << "\"\nhowever it is also "
+              "a subdirectory of the " << (inBinary ? "build" : "source")
+              << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
+              << "\"" << std::endl;
+            target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
+                                                s.str());
             }
+          case cmPolicies::OLD:
+            shouldContinue = true;
+            break;
+          case cmPolicies::REQUIRED_ALWAYS:
+          case cmPolicies::REQUIRED_IF_USED:
+          case cmPolicies::NEW:
+            break;
           }
         }
       if (shouldContinue)
@@ -334,8 +324,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       }
     if (inBinary)
       {
-      e << "Target \"" << target->GetName() << "\" " << prop <<
-           " property contains path:\n"
+      e << "Target \"" << target->GetName() << "\" "
+           "INTERFACE_INCLUDE_DIRECTORIES property contains path:\n"
            "  \"" << *li << "\"\nwhich is prefixed in the build directory.";
       target->GetMakefile()->IssueMessage(messageType, e.str());
       }
@@ -343,8 +333,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       {
       if (inSource)
         {
-        e << "Target \"" << target->GetName() << "\" " << prop <<
-            " property contains path:\n"
+        e << "Target \"" << target->GetName() << "\" "
+            "INTERFACE_INCLUDE_DIRECTORIES property contains path:\n"
             "  \"" << *li << "\"\nwhich is prefixed in the source directory.";
         target->GetMakefile()->IssueMessage(messageType, e.str());
         }
@@ -375,46 +365,6 @@ static void prefixItems(std::string &exportDirs)
 }
 
 //----------------------------------------------------------------------------
-void cmExportFileGenerator::PopulateSourcesInterface(
-                      cmTargetExport *tei,
-                      cmGeneratorExpression::PreprocessContext preprocessRule,
-                      ImportPropertyMap &properties,
-                      std::vector<std::string> &missingTargets)
-{
-  cmTarget *target = tei->Target;
-  assert(preprocessRule == cmGeneratorExpression::InstallInterface);
-
-  const char *propName = "INTERFACE_SOURCES";
-  const char *input = target->GetProperty(propName);
-
-  if (!input)
-    {
-    return;
-    }
-
-  if (!*input)
-    {
-    properties[propName] = "";
-    return;
-    }
-
-  std::string prepro = cmGeneratorExpression::Preprocess(input,
-                                                         preprocessRule,
-                                                         true);
-  if (!prepro.empty())
-    {
-    this->ResolveTargetsInGeneratorExpressions(prepro, target,
-                                                missingTargets);
-
-    if (!checkInterfaceDirs(prepro, target, propName))
-      {
-      return;
-      }
-    properties[propName] = prepro;
-    }
-}
-
-//----------------------------------------------------------------------------
 void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                       cmTargetExport *tei,
                       cmGeneratorExpression::PreprocessContext preprocessRule,
@@ -474,7 +424,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target, propName))
+    if (!checkInterfaceDirs(prepro, target))
       {
       return;
       }
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index b6f4166..919924e 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -139,11 +139,6 @@ protected:
                       cmGeneratorExpression::PreprocessContext preprocessRule,
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets);
-  void PopulateSourcesInterface(
-                      cmTargetExport *target,
-                      cmGeneratorExpression::PreprocessContext preprocessRule,
-                      ImportPropertyMap &properties,
-                      std::vector<std::string> &missingTargets);
 
   void SetImportLinkInterface(const std::string& config,
                     std::string const& suffix,
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index a0d9013..98ed818 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -123,7 +123,6 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
 
   bool require2_8_12 = false;
   bool require3_0_0 = false;
-  bool require3_1_0 = false;
   bool requiresConfigFiles = false;
   // Create all the imported targets.
   for(std::vector<cmTargetExport*>::const_iterator
@@ -132,6 +131,17 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     {
     cmTarget* te = (*tei)->Target;
 
+    if (te->GetProperty("INTERFACE_SOURCES"))
+      {
+      std::ostringstream e;
+      e << "Target \""
+        << te->GetName()
+        << "\" has a populated INTERFACE_SOURCES property.  This is not "
+          "currently supported.";
+      cmSystemTools::Error(e.str().c_str());
+      return false;
+      }
+
     requiresConfigFiles = requiresConfigFiles
                               || te->GetType() != cmTarget::INTERFACE_LIBRARY;
 
@@ -142,9 +152,6 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     this->PopulateIncludeDirectoriesInterface(*tei,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
-    this->PopulateSourcesInterface(*tei,
-                                  cmGeneratorExpression::InstallInterface,
-                                  properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_SYSTEM_INCLUDE_DIRECTORIES",
                                   te,
                                   cmGeneratorExpression::InstallInterface,
@@ -183,13 +190,6 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
       {
       require3_0_0 = true;
       }
-    if(te->GetProperty("INTERFACE_SOURCES"))
-      {
-      // We can only generate INTERFACE_SOURCES in CMake 3.3, but CMake 3.1
-      // can consume them.
-      require3_1_0 = true;
-      }
-
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
                                   te, properties);
     this->PopulateCompatibleInterfaceProperties(te, properties);
@@ -197,11 +197,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     this->GenerateInterfaceProperties(te, os, properties);
     }
 
-  if (require3_1_0)
-    {
-    this->GenerateRequiredCMakeVersion(os, "3.1.0");
-    }
-  else if (require3_0_0)
+  if (require3_0_0)
     {
     this->GenerateRequiredCMakeVersion(os, "3.0.0");
     }
diff --git a/Tests/ExportImport/Export/Interface/CMakeLists.txt b/Tests/ExportImport/Export/Interface/CMakeLists.txt
index 00a5375..523fc29 100644
--- a/Tests/ExportImport/Export/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Export/Interface/CMakeLists.txt
@@ -29,17 +29,7 @@ target_compile_features(use_auto_type INTERFACE cxx_auto_type)
 add_library(use_c_restrict INTERFACE)
 target_compile_features(use_c_restrict INTERFACE c_restrict)
 
-add_library(source_target INTERFACE)
-target_sources(source_target INTERFACE
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/source_target.cpp>
-  $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/src/source_target_for_install.cpp>
-)
-install(FILES
-  source_target_for_install.cpp
-  DESTINATION src
-)
-
-install(TARGETS headeronly sharediface use_auto_type use_c_restrict source_target
+install(TARGETS headeronly sharediface use_auto_type use_c_restrict
   EXPORT expInterface
 )
 install(TARGETS sharedlib
diff --git a/Tests/ExportImport/Export/Interface/source_target.cpp b/Tests/ExportImport/Export/Interface/source_target.cpp
deleted file mode 100644
index 037191c..0000000
--- a/Tests/ExportImport/Export/Interface/source_target.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#ifndef USE_FROM_BUILD_DIR
-#error Expected define USE_FROM_BUILD_DIR
-#endif
-
-#ifdef USE_FROM_INSTALL_DIR
-#error Unexpected define USE_FROM_INSTALL_DIR
-#endif
-
-int source_symbol()
-{
-  return 42;
-}
diff --git a/Tests/ExportImport/Export/Interface/source_target_for_install.cpp b/Tests/ExportImport/Export/Interface/source_target_for_install.cpp
deleted file mode 100644
index 64514ed..0000000
--- a/Tests/ExportImport/Export/Interface/source_target_for_install.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#ifdef USE_FROM_BUILD_DIR
-#error Unexpected define USE_FROM_BUILD_DIR
-#endif
-
-#ifndef USE_FROM_INSTALL_DIR
-#error Expected define USE_FROM_INSTALL_DIR
-#endif
-
-int source_symbol()
-{
-  return 42;
-}
diff --git a/Tests/ExportImport/Import/Interface/CMakeLists.txt b/Tests/ExportImport/Import/Interface/CMakeLists.txt
index 51d518e..4028405 100644
--- a/Tests/ExportImport/Import/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Import/Interface/CMakeLists.txt
@@ -82,14 +82,6 @@ endmacro()
 
 do_try_compile(bld)
 
-add_executable(source_target_test_bld source_target_test.cpp)
-target_link_libraries(source_target_test_bld bld::source_target)
-target_compile_definitions(source_target_test_bld PRIVATE USE_FROM_BUILD_DIR)
-
-add_executable(source_target_test_exp source_target_test.cpp)
-target_link_libraries(source_target_test_exp exp::source_target)
-target_compile_definitions(source_target_test_exp PRIVATE USE_FROM_INSTALL_DIR)
-
 add_executable(headeronlytest_exp headeronlytest.cpp)
 target_link_libraries(headeronlytest_exp exp::headeronly)
 
diff --git a/Tests/ExportImport/Import/Interface/source_target_test.cpp b/Tests/ExportImport/Import/Interface/source_target_test.cpp
deleted file mode 100644
index 0e8ec5f..0000000
--- a/Tests/ExportImport/Import/Interface/source_target_test.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-extern int source_symbol();
-
-int main()
-{
-  return source_symbol() - 42;
-}
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt b/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt b/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt b/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt b/Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt b/Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt b/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt b/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt b/Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt b/Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt b/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt b/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt b/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt b/Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt b/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt b/Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt b/Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt b/Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt b/Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt b/Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt b/Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt b/Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt b/Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt b/Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 6519682..801655f 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -1,28 +1,17 @@
 # See adjacent README.rst for documentation of this test infrastructure.
 
 macro(add_RunCMake_test test)
-  set(TEST_ARGS ${ARGN})
-  if ("${ARGV1}" STREQUAL "TEST_DIR")
-    if ("${ARGV2}" STREQUAL "")
-      message(FATAL_ERROR "Invalid args")
-    endif()
-    set(Test_Dir ${ARGV2})
-    list(REMOVE_AT TEST_ARGS 0)
-    list(REMOVE_AT TEST_ARGS 0)
-  else()
-    set(Test_Dir ${test})
-  endif()
   add_test(NAME RunCMake.${test} COMMAND ${CMAKE_CMAKE_COMMAND}
     -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR}
     -DRunCMake_GENERATOR=${CMAKE_GENERATOR}
     -DRunCMake_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
     -DRunCMake_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET}
     -DRunCMake_MAKE_PROGRAM=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}
-    -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}
+    -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${test}
     -DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test}
     ${${test}_ARGS}
-    ${TEST_ARGS}
-    -P "${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}/RunCMakeTest.cmake"
+    ${ARGN}
+    -P "${CMAKE_CURRENT_SOURCE_DIR}/${test}/RunCMakeTest.cmake"
     )
 endmacro()
 
@@ -189,12 +178,6 @@ add_RunCMake_test(install)
 add_RunCMake_test(CPackInstallProperties)
 add_RunCMake_test(ExternalProject)
 
-set(build-property-paths_INCLUDE_DIRECTORIES_ARGS -DTEST_PROP=INCLUDE_DIRECTORIES)
-add_RunCMake_test(build-property-paths_INCLUDE_DIRECTORIES TEST_DIR build-property-paths)
-
-set(build-property-paths_SOURCES_ARGS -DTEST_PROP=SOURCES)
-add_RunCMake_test(build-property-paths_SOURCES TEST_DIR build-property-paths)
-
 if(RPMBUILD)
   add_RunCMake_test(CPackRPM)
 endif()
diff --git a/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt b/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt b/Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt b/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt b/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt b/Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt b/Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt b/Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt b/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 6389ef4..33b745d 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -18,10 +18,7 @@ function(run_cmake test)
     set(expect_result 0)
   endif()
   foreach(o out err)
-    if(RunCMake-std${o}-file AND EXISTS ${top_src}/${RunCMake-std${o}-file})
-      file(READ ${top_src}/${RunCMake-std${o}-file} expect_std${o})
-      string(REGEX REPLACE "\n+$" "" expect_std${o} "${expect_std${o}}")
-    elseif(EXISTS ${top_src}/${test}-std${o}.txt)
+    if(EXISTS ${top_src}/${test}-std${o}.txt)
       file(READ ${top_src}/${test}-std${o}.txt expect_std${o})
       string(REGEX REPLACE "\n+$" "" expect_std${o} "${expect_std${o}}")
     else()
diff --git a/Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt b/Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt b/Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt b/Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/TargetSources/ExportBuild-result.txt b/Tests/RunCMake/TargetSources/ExportBuild-result.txt
index 573541a..d00491f 100644
--- a/Tests/RunCMake/TargetSources/ExportBuild-result.txt
+++ b/Tests/RunCMake/TargetSources/ExportBuild-result.txt
@@ -1 +1 @@
-0
+1
diff --git a/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt b/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
new file mode 100644
index 0000000..0d65a55
--- /dev/null
+++ b/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
@@ -0,0 +1 @@
+CMake Error: Target "iface" has a populated INTERFACE_SOURCES property.  This is not currently supported.
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-result.txt b/Tests/RunCMake/TargetSources/ExportInstall-result.txt
similarity index 100%
copy from Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-result.txt
copy to Tests/RunCMake/TargetSources/ExportInstall-result.txt
diff --git a/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt b/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
new file mode 100644
index 0000000..0d65a55
--- /dev/null
+++ b/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
@@ -0,0 +1 @@
+CMake Error: Target "iface" has a populated INTERFACE_SOURCES property.  This is not currently supported.
diff --git a/Tests/RunCMake/TargetSources/ExportInstall.cmake b/Tests/RunCMake/TargetSources/ExportInstall.cmake
new file mode 100644
index 0000000..8e7c9f9
--- /dev/null
+++ b/Tests/RunCMake/TargetSources/ExportInstall.cmake
@@ -0,0 +1,6 @@
+
+add_library(iface INTERFACE)
+target_sources(iface INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/empty_1.cpp")
+
+install(TARGETS iface EXPORT exp)
+install(EXPORT exp DESTINATION cmake)
diff --git a/Tests/RunCMake/TargetSources/RunCMakeTest.cmake b/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
index 4416ef9..1b4ef0b 100644
--- a/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
+++ b/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
@@ -10,3 +10,4 @@ endif()
 run_cmake(CMP0026-LOCATION)
 run_cmake(RelativePathInInterface)
 run_cmake(ExportBuild)
+run_cmake(ExportInstall)
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-result.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-stderr_SOURCES.txt
deleted file mode 100644
index fa39ff8..0000000
--- a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-stderr_SOURCES.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Error in CMakeLists.txt:
-  Target "testTarget" INTERFACE_SOURCES property contains path:
-
-    ".*Tests/RunCMake/build-property-paths_SOURCES/prefix/BinInInstallPrefix-build/empty.cpp"
-
-  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_SOURCES.txt
deleted file mode 100644
index bed2424..0000000
--- a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_SOURCES.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Error in CMakeLists.txt:
-  Target "testTarget" INTERFACE_SOURCES property contains path:
-
-    ".*Tests/RunCMake/build-property-paths_SOURCES/BinaryDirectoryInInterface-build/empty.cpp"
-
-  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake
deleted file mode 100644
index 7001f3f..0000000
--- a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-
-enable_language(CXX)
-
-add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
-  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/foo")
-else()
-  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/empty.cpp")
-endif()
-
-install(TARGETS testTarget EXPORT testTargets
-  DESTINATION lib
-)
-
-install(EXPORT testTargets DESTINATION lib/cmake)
diff --git a/Tests/RunCMake/build-property-paths/CMakeLists.txt b/Tests/RunCMake/build-property-paths/CMakeLists.txt
deleted file mode 100644
index 5cd4825..0000000
--- a/Tests/RunCMake/build-property-paths/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-project(${RunCMake_TEST} NONE)
-if(NOT TEST_FILE)
-  set(TEST_FILE ${RunCMake_TEST}.cmake)
-endif()
-include(${TEST_FILE})
diff --git a/Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake b/Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake
deleted file mode 100644
index f5f3005..0000000
--- a/Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-enable_language(CXX)
-add_library(testTarget empty.cpp)
-
-if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
-  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/dir")
-else()
-  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_INSTALL_PREFIX}/empty.cpp")
-endif()
-
-install(TARGETS testTarget EXPORT testTargets
-  DESTINATION lib
-)
-
-install(EXPORT testTargets DESTINATION lib/cmake)
diff --git a/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_SOURCES.txt
deleted file mode 100644
index 02a8198..0000000
--- a/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_SOURCES.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Error in CMakeLists.txt:
-  Target "testTarget" INTERFACE_SOURCES property contains path:
-
-    ".*Tests/RunCMake/build-property-paths_SOURCES/InstallInBinDir-build/empty.cpp"
-
-  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_SOURCES.txt
deleted file mode 100644
index aece1ab..0000000
--- a/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_SOURCES.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Error in CMakeLists.txt:
-  Target "testTarget" INTERFACE_SOURCES property contains path:
-
-    ".*Tests/RunCMake/build-property-paths_SOURCES/copy/empty.cpp"
-
-  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_SOURCES.txt
deleted file mode 100644
index 2311af9..0000000
--- a/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_SOURCES.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-CMake Error in CMakeLists.txt:
-  Target "testTarget" contains relative path in its INTERFACE_SOURCES:
-
-    "empty.cpp"
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake b/Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake
deleted file mode 100644
index 489c3a1..0000000
--- a/Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-
-enable_language(CXX)
-
-add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-
-if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
-  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<1:foo>")
-else()
-  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "$<1:empty.cpp>")
-endif()
-
-add_library(userTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_link_libraries(userTarget testTarget)
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_SOURCES.txt
deleted file mode 100644
index f0f002c..0000000
--- a/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_SOURCES.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-CMake Error in CMakeLists.txt:
-  Target "testTarget" INTERFACE_SOURCES property contains relative path:
-
-    "empty.cpp"
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake b/Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake
deleted file mode 100644
index e974aac..0000000
--- a/Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-
-enable_language(CXX)
-
-add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
-  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "foo")
-else()
-  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "empty.cpp")
-endif()
-install(TARGETS testTarget EXPORT testTargets
-  DESTINATION lib
-)
-
-install(EXPORT testTargets DESTINATION lib/cmake)
diff --git a/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake b/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
deleted file mode 100644
index 54d0cd8..0000000
--- a/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
+++ /dev/null
@@ -1,155 +0,0 @@
-include(RunCMake)
-
-macro(run_cmake test)
-  list(APPEND RunCMake_TEST_OPTIONS -DTEST_PROP=${TEST_PROP})
-  set(RunCMake-stderr-file ${test}-stderr_${TEST_PROP}.txt)
-  _run_cmake(${test})
-endmacro()
-
-run_cmake(RelativePathInInterface)
-run_cmake(RelativePathInGenex)
-run_cmake(export-NOWARN)
-run_cmake(SourceDirectoryInInterface)
-run_cmake(BinaryDirectoryInInterface)
-
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/DirInInstallPrefix/prefix")
-run_cmake(DirInInstallPrefix)
-
-configure_file(
-  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
-  "${RunCMake_BINARY_DIR}/copy/CMakeLists.txt"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/empty.cpp"
-  "${RunCMake_BINARY_DIR}/copy/empty.cpp"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/SourceDirectoryInInterface.cmake"
-  "${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface.cmake"
-  COPYONLY
-)
-set(RunCMake_TEST_OPTIONS
-  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface/prefix"
-  "-DTEST_FILE=${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface.cmake"
-  )
-set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/copy")
-run_cmake(InstallInSrcDir)
-unset(RunCMake_TEST_SOURCE_DIR)
-
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallInBinDir-build/prefix")
-set(RunCMake_TEST_OPTIONS
-  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallInBinDir-build/prefix"
-  "-DTEST_FILE=${RunCMake_SOURCE_DIR}/BinaryDirectoryInInterface.cmake"
-  )
-set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/InstallInBinDir-build")
-run_cmake(InstallInBinDir)
-unset(RunCMake_TEST_BINARY_DIR)
-
-configure_file(
-  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
-  "${RunCMake_BINARY_DIR}/prefix/src/CMakeLists.txt"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/empty.cpp"
-  "${RunCMake_BINARY_DIR}/prefix/src/empty.cpp"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/SourceDirectoryInInterface.cmake"
-  "${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake"
-  COPYONLY
-)
-
-foreach(policyStatus NEW OLD "")
-  if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
-    if (NOT "${policyStatus}" STREQUAL "")
-      set(policyOption -DCMAKE_POLICY_DEFAULT_CMP0052=${policyStatus})
-    else()
-      unset(policyOption)
-      set(policyStatus WARN)
-    endif()
-    set(policySuffix -CMP0052-${policyStatus})
-  endif()
-  set(RunCMake_TEST_OPTIONS
-    "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
-    "-DTEST_FILE=${RunCMake_SOURCE_DIR}/BinaryDirectoryInInterface.cmake"
-    )
-  # Set the RunCMake_TEST_SOURCE_DIR here to the copy too. This is needed to run
-  # the test suite in-source properly.  Otherwise the install directory would be
-  # a subdirectory or the source directory, which is allowed and tested separately
-  # below.
-  set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/prefix/src")
-  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/prefix/BinInInstallPrefix${policySuffix}-build")
-  run_cmake(BinInInstallPrefix${policySuffix})
-  unset(RunCMake_TEST_BINARY_DIR)
-
-  set(RunCMake_TEST_OPTIONS
-    "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
-    "-DTEST_FILE=${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake"
-    )
-  run_cmake(SrcInInstallPrefix${policySuffix})
-  unset(RunCMake_TEST_SOURCE_DIR)
-
-  if (NOT TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
-    break()
-  endif()
-endforeach()
-
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallPrefixInInterface-build/prefix")
-run_cmake(InstallPrefixInInterface)
-
-configure_file(
-  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
-  "${RunCMake_BINARY_DIR}/installToSrc/CMakeLists.txt"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/empty.cpp"
-  "${RunCMake_BINARY_DIR}/installToSrc/empty.cpp"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/InstallPrefixInInterface.cmake"
-  "${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface.cmake"
-  COPYONLY
-)
-set(RunCMake_TEST_OPTIONS
-  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface/prefix"
-  "-DTEST_FILE=${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface.cmake"
-  )
-set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/installToSrc")
-run_cmake(InstallToPrefixInSrcDirOutOfSource)
-unset(RunCMake_TEST_SOURCE_DIR)
-
-file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}/installToSrcInSrc")
-set(RunCMake_TEST_NO_CLEAN ON)
-
-configure_file(
-  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
-  "${RunCMake_BINARY_DIR}/installToSrcInSrc/CMakeLists.txt"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/empty.cpp"
-  "${RunCMake_BINARY_DIR}/installToSrcInSrc/empty.cpp"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/InstallPrefixInInterface.cmake"
-  "${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface.cmake"
-  COPYONLY
-)
-
-set(RunCMake_TEST_OPTIONS
-  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface/prefix"
-  "-DTEST_FILE=${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface.cmake"
-  )
-set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/installToSrcInSrc")
-set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/installToSrcInSrc")
-run_cmake(InstallToPrefixInSrcDirInSource)
-unset(RunCMake_TEST_SOURCE_DIR)
-unset(RunCMake_TEST_BINARY_DIR)
-unset(RunCMake_TEST_NO_CLEAN)
diff --git a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_SOURCES.txt
deleted file mode 100644
index 187ccdf..0000000
--- a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_SOURCES.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Error in CMakeLists.txt:
-  Target "testTarget" INTERFACE_SOURCES property contains path:
-
-    ".*Tests/RunCMake/build-property-paths/empty.cpp"
-
-  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake
deleted file mode 100644
index d80cbec..0000000
--- a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-
-enable_language(CXX)
-
-add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
-  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/foo")
-else()
-  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-endif()
-
-install(TARGETS testTarget EXPORT testTargets
-  DESTINATION lib
-)
-
-install(EXPORT testTargets DESTINATION lib/cmake)
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-result.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-stderr_SOURCES.txt
deleted file mode 100644
index 6a123f7..0000000
--- a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-stderr_SOURCES.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Error in CMakeLists.txt:
-  Target "testTarget" INTERFACE_SOURCES property contains path:
-
-    ".*Tests/RunCMake/build-property-paths_SOURCES/prefix/src/empty.cpp"
-
-  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/empty.cpp b/Tests/RunCMake/build-property-paths/empty.cpp
deleted file mode 100644
index e69de29..0000000
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-result.txt b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-result.txt
rename to Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-result.txt
diff --git a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt
similarity index 61%
rename from Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt
index 94c46ab..f0adc9f 100644
--- a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
+++ b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*RunCMake/build-property-paths_INCLUDE_DIRECTORIES/BinaryDirectoryInInterface-build/foo"
+    ".*Tests/RunCMake/include_directories/prefix/BinInInstallPrefix-CMP0052-NEW-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-OLD-result.txt b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-OLD-result.txt
rename to Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-result.txt
diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-result.txt b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-result.txt
rename to Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-result.txt
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt
similarity index 63%
rename from Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt
index 6473efe..054bff5 100644
--- a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
+++ b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt
@@ -6,15 +6,15 @@ CMake Warning \(dev\) in CMakeLists.txt:
 
   Directory:
 
-      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-WARN-build/foo"
+      ".*Tests/RunCMake/include_directories/prefix/BinInInstallPrefix-CMP0052-WARN-build/foo"
 
   in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory
   of the install directory:
 
-      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix"
+      ".*Tests/RunCMake/include_directories/prefix"
 
   however it is also a subdirectory of the build tree:
 
-      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-WARN-build"
+      ".*Tests/RunCMake/include_directories/prefix/BinInInstallPrefix-CMP0052-WARN-build"
 
 This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-result.txt b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-result.txt
rename to Tests/RunCMake/include_directories/BinaryDirectoryInInterface-result.txt
diff --git a/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-stderr.txt
similarity index 62%
rename from Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/BinaryDirectoryInInterface-stderr.txt
index 83ae34c..0d4379e 100644
--- a/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt
+++ b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/InstallInBinDir-build/foo"
+    ".*RunCMake/include_directories/BinaryDirectoryInInterface-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake
similarity index 71%
copy from Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
copy to Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake
index 8d777f5..67ee7de 100644
--- a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
+++ b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake
@@ -2,7 +2,7 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/foo")
+target_include_directories(testTarget INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/foo")
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/build-property-paths/DirInInstallPrefix-result.txt b/Tests/RunCMake/include_directories/DirInInstallPrefix-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/DirInInstallPrefix-result.txt
rename to Tests/RunCMake/include_directories/DirInInstallPrefix-result.txt
diff --git a/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt b/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake b/Tests/RunCMake/include_directories/DirInInstallPrefix.cmake
similarity index 71%
copy from Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
copy to Tests/RunCMake/include_directories/DirInInstallPrefix.cmake
index 8d777f5..fab7717 100644
--- a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
+++ b/Tests/RunCMake/include_directories/DirInInstallPrefix.cmake
@@ -1,8 +1,6 @@
-
 enable_language(CXX)
-
-add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/foo")
+add_library(testTarget empty.cpp)
+target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/dir")
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/build-property-paths/InstallInBinDir-result.txt b/Tests/RunCMake/include_directories/InstallInBinDir-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/InstallInBinDir-result.txt
rename to Tests/RunCMake/include_directories/InstallInBinDir-result.txt
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/InstallInBinDir-stderr.txt
similarity index 57%
rename from Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/InstallInBinDir-stderr.txt
index 8db7283..254fae1 100644
--- a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
+++ b/Tests/RunCMake/include_directories/InstallInBinDir-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-NEW-build/foo"
+    ".*Tests/RunCMake/include_directories/InstallInBinDir-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/InstallInSrcDir-result.txt b/Tests/RunCMake/include_directories/InstallInSrcDir-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/InstallInSrcDir-result.txt
rename to Tests/RunCMake/include_directories/InstallInSrcDir-result.txt
diff --git a/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/InstallInSrcDir-stderr.txt
similarity index 67%
rename from Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/InstallInSrcDir-stderr.txt
index a7a5af4..7be3044 100644
--- a/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt
+++ b/Tests/RunCMake/include_directories/InstallInSrcDir-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/copy/foo"
+    ".*Tests/RunCMake/include_directories/copy/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface-result.txt b/Tests/RunCMake/include_directories/InstallPrefixInInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/InstallPrefixInInterface-result.txt
rename to Tests/RunCMake/include_directories/InstallPrefixInInterface-result.txt
diff --git a/Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt b/Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake b/Tests/RunCMake/include_directories/InstallPrefixInInterface.cmake
similarity index 100%
copy from Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
copy to Tests/RunCMake/include_directories/InstallPrefixInInterface.cmake
diff --git a/Tests/RunCMake/build-property-paths/InstallToPrefixInSrcDirInSource-result.txt b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/InstallToPrefixInSrcDirInSource-result.txt
rename to Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-result.txt
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/build-property-paths/InstallToPrefixInSrcDirOutOfSource-result.txt b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/InstallToPrefixInSrcDirOutOfSource-result.txt
rename to Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-result.txt
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInGenex-result.txt b/Tests/RunCMake/include_directories/RelativePathInGenex-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/RelativePathInGenex-result.txt
rename to Tests/RunCMake/include_directories/RelativePathInGenex-result.txt
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/RelativePathInGenex-stderr.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/RelativePathInGenex-stderr.txt
diff --git a/Tests/RunCMake/include_directories/RelativePathInGenex.cmake b/Tests/RunCMake/include_directories/RelativePathInGenex.cmake
new file mode 100644
index 0000000..070a381
--- /dev/null
+++ b/Tests/RunCMake/include_directories/RelativePathInGenex.cmake
@@ -0,0 +1,8 @@
+
+enable_language(CXX)
+
+add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
+set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<1:foo>")
+
+add_library(userTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
+target_link_libraries(userTarget testTarget)
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInInterface-result.txt b/Tests/RunCMake/include_directories/RelativePathInInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/RelativePathInInterface-result.txt
rename to Tests/RunCMake/include_directories/RelativePathInInterface-result.txt
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/RelativePathInInterface-stderr.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/RelativePathInInterface-stderr.txt
diff --git a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake b/Tests/RunCMake/include_directories/RelativePathInInterface.cmake
similarity index 72%
copy from Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
copy to Tests/RunCMake/include_directories/RelativePathInInterface.cmake
index 8d777f5..4c4727d 100644
--- a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
+++ b/Tests/RunCMake/include_directories/RelativePathInInterface.cmake
@@ -2,7 +2,7 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/foo")
+set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "foo")
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/include_directories/RunCMakeTest.cmake b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
index 3f624f8..fa76f24 100644
--- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake
+++ b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
@@ -3,7 +3,148 @@ include(RunCMake)
 run_cmake(NotFoundContent)
 run_cmake(DebugIncludes)
 run_cmake(TID-bad-target)
+run_cmake(SourceDirectoryInInterface)
+run_cmake(BinaryDirectoryInInterface)
+run_cmake(RelativePathInInterface)
 run_cmake(ImportedTarget)
+run_cmake(RelativePathInGenex)
 run_cmake(CMP0021)
 run_cmake(install_config)
 run_cmake(incomplete-genex)
+run_cmake(export-NOWARN)
+
+set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/DirInInstallPrefix/prefix")
+run_cmake(DirInInstallPrefix)
+
+configure_file(
+  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
+  "${RunCMake_BINARY_DIR}/copy/CMakeLists.txt"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/empty.cpp"
+  "${RunCMake_BINARY_DIR}/copy/empty.cpp"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/SourceDirectoryInInterface.cmake"
+  "${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface.cmake"
+  COPYONLY
+)
+set(RunCMake_TEST_OPTIONS
+  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface/prefix"
+  "-DTEST_FILE=${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface.cmake"
+  )
+set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/copy")
+run_cmake(InstallInSrcDir)
+unset(RunCMake_TEST_SOURCE_DIR)
+
+set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallInBinDir-build/prefix")
+set(RunCMake_TEST_OPTIONS
+  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallInBinDir-build/prefix"
+  "-DTEST_FILE=${RunCMake_SOURCE_DIR}/BinaryDirectoryInInterface.cmake"
+  )
+set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/InstallInBinDir-build")
+run_cmake(InstallInBinDir)
+unset(RunCMake_TEST_BINARY_DIR)
+
+configure_file(
+  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
+  "${RunCMake_BINARY_DIR}/prefix/src/CMakeLists.txt"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/empty.cpp"
+  "${RunCMake_BINARY_DIR}/prefix/src/empty.cpp"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/SourceDirectoryInInterface.cmake"
+  "${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake"
+  COPYONLY
+)
+
+foreach(policyStatus "" NEW OLD)
+  if (NOT "${policyStatus}" STREQUAL "")
+    set(policyOption -DCMAKE_POLICY_DEFAULT_CMP0052=${policyStatus})
+  else()
+    unset(policyOption)
+    set(policyStatus WARN)
+  endif()
+  set(RunCMake_TEST_OPTIONS
+    "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
+    "-DTEST_FILE=${RunCMake_SOURCE_DIR}/BinaryDirectoryInInterface.cmake"
+    )
+  # Set the RunCMake_TEST_SOURCE_DIR here to the copy too. This is needed to run
+  # the test suite in-source properly.  Otherwise the install directory would be
+  # a subdirectory or the source directory, which is allowed and tested separately
+  # below.
+  set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/prefix/src")
+  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/prefix/BinInInstallPrefix-CMP0052-${policyStatus}-build")
+  run_cmake(BinInInstallPrefix-CMP0052-${policyStatus})
+  unset(RunCMake_TEST_BINARY_DIR)
+
+  set(RunCMake_TEST_OPTIONS
+    "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
+    "-DTEST_FILE=${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake"
+    )
+  run_cmake(SrcInInstallPrefix-CMP0052-${policyStatus})
+  unset(RunCMake_TEST_SOURCE_DIR)
+endforeach()
+
+set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallPrefixInInterface-build/prefix")
+run_cmake(InstallPrefixInInterface)
+
+configure_file(
+  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
+  "${RunCMake_BINARY_DIR}/installToSrc/CMakeLists.txt"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/empty.cpp"
+  "${RunCMake_BINARY_DIR}/installToSrc/empty.cpp"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/InstallPrefixInInterface.cmake"
+  "${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface.cmake"
+  COPYONLY
+)
+set(RunCMake_TEST_OPTIONS
+  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface/prefix"
+  "-DTEST_FILE=${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface.cmake"
+  )
+set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/installToSrc")
+run_cmake(InstallToPrefixInSrcDirOutOfSource)
+unset(RunCMake_TEST_SOURCE_DIR)
+
+
+file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}/installToSrcInSrc")
+set(RunCMake_TEST_NO_CLEAN ON)
+
+configure_file(
+  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
+  "${RunCMake_BINARY_DIR}/installToSrcInSrc/CMakeLists.txt"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/empty.cpp"
+  "${RunCMake_BINARY_DIR}/installToSrcInSrc/empty.cpp"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/InstallPrefixInInterface.cmake"
+  "${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface.cmake"
+  COPYONLY
+)
+
+set(RunCMake_TEST_OPTIONS
+  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface/prefix"
+  "-DTEST_FILE=${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface.cmake"
+  )
+set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/installToSrcInSrc")
+set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/installToSrcInSrc")
+run_cmake(InstallToPrefixInSrcDirInSource)
+unset(RunCMake_TEST_SOURCE_DIR)
+unset(RunCMake_TEST_BINARY_DIR)
+unset(RunCMake_TEST_NO_CLEAN)
diff --git a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-result.txt b/Tests/RunCMake/include_directories/SourceDirectoryInInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-result.txt
rename to Tests/RunCMake/include_directories/SourceDirectoryInInterface-result.txt
diff --git a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/SourceDirectoryInInterface-stderr.txt
similarity index 78%
rename from Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/SourceDirectoryInInterface-stderr.txt
index f42a2c2..9346b99 100644
--- a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
+++ b/Tests/RunCMake/include_directories/SourceDirectoryInInterface-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*RunCMake/build-property-paths/foo"
+    ".*RunCMake/include_directories/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake b/Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake
similarity index 71%
rename from Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
rename to Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake
index 8d777f5..f814a3c 100644
--- a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
+++ b/Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake
@@ -2,7 +2,7 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/foo")
+target_include_directories(testTarget INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/foo")
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-result.txt b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-result.txt
rename to Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-result.txt
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
similarity index 66%
rename from Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
index 2af50d5..afa43e0 100644
--- a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
+++ b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/src/foo"
+    ".*Tests/RunCMake/include_directories/prefix/src/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-OLD-result.txt b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-OLD-result.txt
rename to Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-result.txt
diff --git a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-result.txt b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-result.txt
rename to Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-result.txt
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
similarity index 69%
rename from Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
index 56aaa2c..0b13fd8 100644
--- a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
+++ b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
@@ -6,15 +6,15 @@ CMake Warning \(dev\) in CMakeLists.txt:
 
   Directory:
 
-      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/src/foo"
+      ".*Tests/RunCMake/include_directories/prefix/src/foo"
 
   in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory
   of the install directory:
 
-      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix"
+      ".*Tests/RunCMake/include_directories/prefix"
 
   however it is also a subdirectory of the source tree:
 
-      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/src"
+      ".*Tests/RunCMake/include_directories/prefix/src"
 
 This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/build-property-paths/export-NOWARN-result.txt b/Tests/RunCMake/include_directories/export-NOWARN-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/export-NOWARN-result.txt
rename to Tests/RunCMake/include_directories/export-NOWARN-result.txt
diff --git a/Tests/RunCMake/include_directories/export-NOWARN-stderr.txt b/Tests/RunCMake/include_directories/export-NOWARN-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/include_directories/export-NOWARN-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/build-property-paths/export-NOWARN.cmake b/Tests/RunCMake/include_directories/export-NOWARN.cmake
similarity index 71%
rename from Tests/RunCMake/build-property-paths/export-NOWARN.cmake
rename to Tests/RunCMake/include_directories/export-NOWARN.cmake
index 592572c..50720a0 100644
--- a/Tests/RunCMake/build-property-paths/export-NOWARN.cmake
+++ b/Tests/RunCMake/include_directories/export-NOWARN.cmake
@@ -1,34 +1,19 @@
 enable_language(CXX)
 add_library(foo empty.cpp)
-
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<0:>/include/subdir)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_PREFIX>/include/subdir)
-set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<0:>/include/subdir/empty.cpp)
-set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_PREFIX>/include/subdir/empty.cpp)
 
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/subdir>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include/subdir>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include/$<0:>>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:$<0:>/include>)
-set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/subdir/empty.cpp>)
-set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:include/subdir/empty.cpp>)
-set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:include/subdir/empty.cpp$<0:>>)
-set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:$<0:>/include/subdir/empty.cpp>)
 
 # target_include_directories(foo INTERFACE include/subdir) # Does and should warn. INSTALL_INTERFACE must not list src dir paths.
 target_include_directories(foo INTERFACE $<0:>/include/subdir) # Does not and should not should warn, because it starts with a genex.
 target_include_directories(foo INTERFACE $<INSTALL_PREFIX>/include/subdir)
-target_sources(foo INTERFACE $<0:>/include/subdir/empty.cpp)
-target_sources(foo INTERFACE $<INSTALL_PREFIX>/include/subdir/empty.cpp)
 
 target_include_directories(foo INTERFACE $<INSTALL_INTERFACE:include/subdir>)
 target_include_directories(foo INTERFACE $<INSTALL_INTERFACE:include/$<0:>>)
-target_sources(foo INTERFACE $<INSTALL_INTERFACE:include/subdir/empty.cpp>)
-target_sources(foo INTERFACE $<INSTALL_INTERFACE:include/subdir/empty.cpp$<0:>>)
-
-install(FILES include/subdir/empty.cpp
-  DESTINATION include/subdir
-)
 
 install(TARGETS foo EXPORT FooTargets DESTINATION lib)
 install(EXPORT FooTargets DESTINATION lib/cmake)
diff --git a/Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt b/Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt b/Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/interface_library/genex_link-stderr.txt b/Tests/RunCMake/interface_library/genex_link-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/interface_library/genex_link-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt b/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/message/nomessage-stderr.txt b/Tests/RunCMake/message/nomessage-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/message/nomessage-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt b/Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/project/CMP0048-NEW-stderr.txt b/Tests/RunCMake/project/CMP0048-NEW-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/project/CMP0048-NEW-stderr.txt
@@ -0,0 +1 @@
+^$

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

Summary of changes:
 Help/command/target_sources.rst                    |    4 +
 Help/prop_tgt/INTERFACE_SOURCES.rst                |    4 +
 Help/release/dev/export-interface-source-files.rst |    6 -
 Source/cmExportBuildFileGenerator.cxx              |   13 +-
 Source/cmExportFileGenerator.cxx                   |  136 ++++++-----------
 Source/cmExportFileGenerator.h                     |    5 -
 Source/cmExportInstallFileGenerator.cxx            |   28 ++--
 Tests/ExportImport/Export/Interface/CMakeLists.txt |   12 +-
 .../Export/Interface/source_target.cpp             |   13 --
 .../Export/Interface/source_target_for_install.cpp |   13 --
 Tests/ExportImport/Import/Interface/CMakeLists.txt |    8 -
 .../Import/Interface/source_target_test.cpp        |    7 -
 .../RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt |    1 +
 .../CMP0022/CMP0022-NOWARN-shared-stderr.txt       |    1 +
 .../CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt   |    1 +
 ...CMP0022-NOWARN-static-link_libraries-stderr.txt |    1 +
 .../CMP0022/CMP0022-NOWARN-static-stderr.txt       |    1 +
 .../RunCMake/CMP0022/CMP0022-export-exe-stderr.txt |    1 +
 .../CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt |    1 +
 Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt |    1 +
 .../CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt |    1 +
 .../RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt  |    1 +
 Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt      |    1 +
 .../CMP0037/CMP0037-OLD-reserved-stderr.txt        |    1 +
 .../RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt  |    1 +
 Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt      |    1 +
 Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt      |    1 +
 .../CMP0040/CMP0040-NEW-existing-target-stderr.txt |    1 +
 .../CMP0040/CMP0040-OLD-existing-target-stderr.txt |    1 +
 .../CMP0040/CMP0040-OLD-missing-target-stderr.txt  |    1 +
 Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt      |    1 +
 Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt  |    1 +
 Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt      |    1 +
 Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt      |    1 +
 Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt      |    1 +
 Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt      |    1 +
 Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt      |    1 +
 .../CMP0046-NEW-existing-dependency-stderr.txt     |    1 +
 .../CMP0046-OLD-existing-dependency-stderr.txt     |    1 +
 .../CMP0046-OLD-missing-dependency-stderr.txt      |    1 +
 Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt      |    1 +
 Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt      |    1 +
 .../CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt    |    1 +
 .../CMP0055-OLD-Reject-Arguments-stderr.txt        |    1 +
 Tests/RunCMake/CMakeLists.txt                      |   23 +--
 ...LinkImplementationFeatureCycleSolved-stderr.txt |    1 +
 .../DisallowedCommands/CMP0029-OLD-stderr.txt      |    1 +
 .../File_Generate/CarryPermissions-stderr.txt      |    1 +
 .../File_Generate/GenerateSource-stderr.txt        |    1 +
 .../OutputNameMatchesOtherSources-stderr.txt       |    1 +
 Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt |    1 +
 .../File_Generate/WriteIfDifferent-stderr.txt      |    1 +
 .../ValidTarget-TARGET_PDB_FILE-stderr.txt         |    1 +
 Tests/RunCMake/RunCMake.cmake                      |    5 +-
 Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt     |    1 +
 .../LinkImplementationCycle3-stderr.txt            |    1 +
 .../TargetSources/CMP0026-LOCATION-stderr.txt      |    1 +
 .../RunCMake/TargetSources/ExportBuild-result.txt  |    2 +-
 .../RunCMake/TargetSources/ExportBuild-stderr.txt  |    1 +
 .../ExportInstall-result.txt}                      |    0
 .../TargetSources/ExportInstall-stderr.txt         |    1 +
 Tests/RunCMake/TargetSources/ExportInstall.cmake   |    6 +
 Tests/RunCMake/TargetSources/RunCMakeTest.cmake    |    1 +
 .../BinInInstallPrefix-CMP0052-NEW-result.txt      |    1 -
 .../BinInInstallPrefix-result.txt                  |    1 -
 .../BinInInstallPrefix-stderr_SOURCES.txt          |    6 -
 .../BinaryDirectoryInInterface-result.txt          |    1 -
 .../BinaryDirectoryInInterface-stderr_SOURCES.txt  |    6 -
 .../BinaryDirectoryInInterface.cmake               |   15 --
 Tests/RunCMake/build-property-paths/CMakeLists.txt |    6 -
 .../build-property-paths/DirInInstallPrefix.cmake  |   14 --
 .../InstallInBinDir-result.txt                     |    1 -
 .../InstallInBinDir-stderr_SOURCES.txt             |    6 -
 .../InstallInSrcDir-result.txt                     |    1 -
 .../InstallInSrcDir-stderr_SOURCES.txt             |    6 -
 .../RelativePathInGenex-result.txt                 |    1 -
 .../RelativePathInGenex-stderr_SOURCES.txt         |    4 -
 .../build-property-paths/RelativePathInGenex.cmake |   13 --
 .../RelativePathInInterface-result.txt             |    1 -
 .../RelativePathInInterface-stderr_SOURCES.txt     |    4 -
 .../RelativePathInInterface.cmake                  |   14 --
 .../build-property-paths/RunCMakeTest.cmake        |  155 --------------------
 .../SourceDirectoryInInterface-result.txt          |    1 -
 .../SourceDirectoryInInterface-stderr_SOURCES.txt  |    6 -
 .../SourceDirectoryInInterface.cmake               |   15 --
 .../SrcInInstallPrefix-CMP0052-NEW-result.txt      |    1 -
 .../SrcInInstallPrefix-result.txt                  |    1 -
 .../SrcInInstallPrefix-stderr_SOURCES.txt          |    6 -
 .../BinInInstallPrefix-CMP0052-NEW-result.txt}     |    0
 .../BinInInstallPrefix-CMP0052-NEW-stderr.txt}     |    2 +-
 .../BinInInstallPrefix-CMP0052-OLD-result.txt      |    0
 .../BinInInstallPrefix-CMP0052-OLD-stderr.txt      |    1 +
 .../BinInInstallPrefix-CMP0052-WARN-result.txt     |    0
 .../BinInInstallPrefix-CMP0052-WARN-stderr.txt}    |    6 +-
 .../BinaryDirectoryInInterface-result.txt}         |    0
 .../BinaryDirectoryInInterface-stderr.txt}         |    2 +-
 .../BinaryDirectoryInInterface.cmake}              |    2 +-
 .../DirInInstallPrefix-result.txt                  |    0
 .../DirInInstallPrefix-stderr.txt                  |    1 +
 .../DirInInstallPrefix.cmake}                      |    6 +-
 .../InstallInBinDir-result.txt}                    |    0
 .../InstallInBinDir-stderr.txt}                    |    2 +-
 .../InstallInSrcDir-result.txt}                    |    0
 .../InstallInSrcDir-stderr.txt}                    |    2 +-
 .../InstallPrefixInInterface-result.txt            |    0
 .../InstallPrefixInInterface-stderr.txt            |    1 +
 .../InstallPrefixInInterface.cmake                 |    0
 .../InstallToPrefixInSrcDirInSource-result.txt     |    0
 .../InstallToPrefixInSrcDirInSource-stderr.txt     |    1 +
 .../InstallToPrefixInSrcDirOutOfSource-result.txt  |    0
 .../InstallToPrefixInSrcDirOutOfSource-stderr.txt  |    1 +
 .../RelativePathInGenex-result.txt}                |    0
 .../RelativePathInGenex-stderr.txt}                |    0
 .../include_directories/RelativePathInGenex.cmake  |    8 +
 .../RelativePathInInterface-result.txt}            |    0
 .../RelativePathInInterface-stderr.txt}            |    0
 .../RelativePathInInterface.cmake}                 |    2 +-
 .../include_directories/RunCMakeTest.cmake         |  141 ++++++++++++++++++
 .../SourceDirectoryInInterface-result.txt}         |    0
 .../SourceDirectoryInInterface-stderr.txt}         |    2 +-
 .../SourceDirectoryInInterface.cmake}              |    2 +-
 .../SrcInInstallPrefix-CMP0052-NEW-result.txt}     |    0
 .../SrcInInstallPrefix-CMP0052-NEW-stderr.txt}     |    2 +-
 .../SrcInInstallPrefix-CMP0052-OLD-result.txt      |    0
 .../SrcInInstallPrefix-CMP0052-OLD-stderr.txt      |    1 +
 .../SrcInInstallPrefix-CMP0052-WARN-result.txt     |    0
 .../SrcInInstallPrefix-CMP0052-WARN-stderr.txt}    |    6 +-
 .../export-NOWARN-result.txt                       |    0
 .../include_directories/export-NOWARN-stderr.txt   |    1 +
 .../export-NOWARN.cmake                            |   15 --
 .../install/SkipInstallRulesNoWarning1-stderr.txt  |    1 +
 .../install/SkipInstallRulesNoWarning2-stderr.txt  |    1 +
 .../interface_library/genex_link-stderr.txt        |    1 +
 .../interface_library/no_shared_libs-stderr.txt    |    1 +
 Tests/RunCMake/message/nomessage-stderr.txt        |    1 +
 .../with_install_prefix-stderr.txt                 |    1 +
 Tests/RunCMake/project/CMP0048-NEW-stderr.txt      |    1 +
 137 files changed, 311 insertions(+), 520 deletions(-)
 delete mode 100644 Help/release/dev/export-interface-source-files.rst
 delete mode 100644 Tests/ExportImport/Export/Interface/source_target.cpp
 delete mode 100644 Tests/ExportImport/Export/Interface/source_target_for_install.cpp
 delete mode 100644 Tests/ExportImport/Import/Interface/source_target_test.cpp
 create mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt
 create mode 100644 Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt
 create mode 100644 Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
 create mode 100644 Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
 create mode 100644 Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt
 create mode 100644 Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
 create mode 100644 Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt
 create mode 100644 Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt
 create mode 100644 Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt
 create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt
 create mode 100644 Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt
 create mode 100644 Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => TargetSources/ExportInstall-result.txt} (100%)
 create mode 100644 Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
 create mode 100644 Tests/RunCMake/TargetSources/ExportInstall.cmake
 delete mode 100644 Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/BinInInstallPrefix-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/BinInInstallPrefix-stderr_SOURCES.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_SOURCES.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake
 delete mode 100644 Tests/RunCMake/build-property-paths/CMakeLists.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake
 delete mode 100644 Tests/RunCMake/build-property-paths/InstallInBinDir-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_SOURCES.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/InstallInSrcDir-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_SOURCES.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/RelativePathInGenex-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_SOURCES.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake
 delete mode 100644 Tests/RunCMake/build-property-paths/RelativePathInInterface-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_SOURCES.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake
 delete mode 100644 Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
 delete mode 100644 Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_SOURCES.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake
 delete mode 100644 Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/SrcInInstallPrefix-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/SrcInInstallPrefix-stderr_SOURCES.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/empty.cpp
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/BinInInstallPrefix-CMP0052-NEW-result.txt} (100%)
 rename Tests/RunCMake/{build-property-paths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt => include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt} (61%)
 rename Tests/RunCMake/{build-property-paths => include_directories}/BinInInstallPrefix-CMP0052-OLD-result.txt (100%)
 create mode 100644 Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt
 rename Tests/RunCMake/{build-property-paths => include_directories}/BinInInstallPrefix-CMP0052-WARN-result.txt (100%)
 rename Tests/RunCMake/{build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt => include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt} (63%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/BinaryDirectoryInInterface-result.txt} (100%)
 rename Tests/RunCMake/{build-property-paths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt => include_directories/BinaryDirectoryInInterface-stderr.txt} (62%)
 copy Tests/RunCMake/{build-property-paths/InstallPrefixInInterface.cmake => include_directories/BinaryDirectoryInInterface.cmake} (71%)
 rename Tests/RunCMake/{build-property-paths => include_directories}/DirInInstallPrefix-result.txt (100%)
 create mode 100644 Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt
 copy Tests/RunCMake/{build-property-paths/InstallPrefixInInterface.cmake => include_directories/DirInInstallPrefix.cmake} (71%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/InstallInBinDir-result.txt} (100%)
 rename Tests/RunCMake/{build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt => include_directories/InstallInBinDir-stderr.txt} (57%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/InstallInSrcDir-result.txt} (100%)
 rename Tests/RunCMake/{build-property-paths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt => include_directories/InstallInSrcDir-stderr.txt} (67%)
 rename Tests/RunCMake/{build-property-paths => include_directories}/InstallPrefixInInterface-result.txt (100%)
 create mode 100644 Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt
 copy Tests/RunCMake/{build-property-paths => include_directories}/InstallPrefixInInterface.cmake (100%)
 rename Tests/RunCMake/{build-property-paths => include_directories}/InstallToPrefixInSrcDirInSource-result.txt (100%)
 create mode 100644 Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt
 rename Tests/RunCMake/{build-property-paths => include_directories}/InstallToPrefixInSrcDirOutOfSource-result.txt (100%)
 create mode 100644 Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/RelativePathInGenex-result.txt} (100%)
 rename Tests/RunCMake/{build-property-paths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt => include_directories/RelativePathInGenex-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/include_directories/RelativePathInGenex.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/RelativePathInInterface-result.txt} (100%)
 rename Tests/RunCMake/{build-property-paths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt => include_directories/RelativePathInInterface-stderr.txt} (100%)
 copy Tests/RunCMake/{build-property-paths/InstallPrefixInInterface.cmake => include_directories/RelativePathInInterface.cmake} (72%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/SourceDirectoryInInterface-result.txt} (100%)
 rename Tests/RunCMake/{build-property-paths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt => include_directories/SourceDirectoryInInterface-stderr.txt} (78%)
 rename Tests/RunCMake/{build-property-paths/InstallPrefixInInterface.cmake => include_directories/SourceDirectoryInInterface.cmake} (71%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/SrcInInstallPrefix-CMP0052-NEW-result.txt} (100%)
 rename Tests/RunCMake/{build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt => include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt} (66%)
 rename Tests/RunCMake/{build-property-paths => include_directories}/SrcInInstallPrefix-CMP0052-OLD-result.txt (100%)
 create mode 100644 Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt
 rename Tests/RunCMake/{build-property-paths => include_directories}/SrcInInstallPrefix-CMP0052-WARN-result.txt (100%)
 rename Tests/RunCMake/{build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt => include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt} (69%)
 rename Tests/RunCMake/{build-property-paths => include_directories}/export-NOWARN-result.txt (100%)
 create mode 100644 Tests/RunCMake/include_directories/export-NOWARN-stderr.txt
 rename Tests/RunCMake/{build-property-paths => include_directories}/export-NOWARN.cmake (71%)
 create mode 100644 Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt
 create mode 100644 Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt
 create mode 100644 Tests/RunCMake/interface_library/genex_link-stderr.txt
 create mode 100644 Tests/RunCMake/interface_library/no_shared_libs-stderr.txt
 create mode 100644 Tests/RunCMake/message/nomessage-stderr.txt
 create mode 100644 Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt
 create mode 100644 Tests/RunCMake/project/CMP0048-NEW-stderr.txt


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Feb  9 13:38:28 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon,  9 Feb 2015 13:38:28 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1134-g7afab9f
Message-ID: <20150209183828.9D1DAAAE98@public.kitware.com>

This is an automated email from 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  7afab9f4863d2ee87a1f32ee93a39d681d4a7056 (commit)
       via  686d101fe28eda7850afe1c4db9d183f43991edb (commit)
       via  2278346fce493a6dff5bbc0ae3234a560afc36ca (commit)
       via  abded27208623ebd45e2ce66ab0ba36c40ccae58 (commit)
       via  d9f8390db6ab0d776eb39b840a3b096b5422229f (commit)
       via  cc1520947608f5224a4fdfa94b5cb07e19e23600 (commit)
       via  c0d8e715915f65196353c09d86d4d34fe100437f (commit)
       via  68d29f519047aeef92a0ab8fef531010c311efaa (commit)
       via  1c3918ff0278715e2a4ec5929f75f7812003ee97 (commit)
      from  0d4ba3c93ba7d30587eaf9ede129ff94801dda91 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7afab9f4863d2ee87a1f32ee93a39d681d4a7056
commit 7afab9f4863d2ee87a1f32ee93a39d681d4a7056
Merge: 0d4ba3c 686d101
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 13:38:25 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 9 13:38:25 2015 -0500

    Merge topic 'export-interface-source-files' into next
    
    686d101f Add release notes for export-interface-source-files.
    2278346f Allow export of targets with INTERFACE_SOURCES.
    abded272 Tests: Move IfacePaths test stderr files.
    d9f8390d Tests: Run IfacePaths tests with a parameter.
    cc152094 Tests: Split part of include_directories test to a generic location.
    c0d8e715 RunCMake: Allow specifying the stderr file for a test.
    68d29f51 RunCMake: Allow specifying the directory to run tests in.
    1c3918ff RunCMake: Remove unneeded files.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=686d101fe28eda7850afe1c4db9d183f43991edb
commit 686d101fe28eda7850afe1c4db9d183f43991edb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 5 20:40:51 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 9 19:34:50 2015 +0100

    Add release notes for export-interface-source-files.

diff --git a/Help/release/dev/export-interface-source-files.rst b/Help/release/dev/export-interface-source-files.rst
new file mode 100644
index 0000000..00dcd25
--- /dev/null
+++ b/Help/release/dev/export-interface-source-files.rst
@@ -0,0 +1,6 @@
+export-interface-source-files
+-----------------------------
+
+* It is now possible to export targets which populate the
+  :prop_tgt:`INTERFACE_SOURCES` target property using the
+  :command:`install(EXPORT)` and :command:`export()` commands.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2278346fce493a6dff5bbc0ae3234a560afc36ca
commit 2278346fce493a6dff5bbc0ae3234a560afc36ca
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 28 18:58:38 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 9 19:34:50 2015 +0100

    Allow export of targets with INTERFACE_SOURCES.
    
    Use the same rules for paths in source and binary dirs in
    installed INTERFACE_SOURCES as are used for
    INTERFACE_INCLUDE_DIRECTORIES.

diff --git a/Help/command/target_sources.rst b/Help/command/target_sources.rst
index 832240a..d6f148d 100644
--- a/Help/command/target_sources.rst
+++ b/Help/command/target_sources.rst
@@ -22,10 +22,6 @@ items will populate the :prop_tgt:`SOURCES` property of
 following arguments specify sources.  Repeated calls for the same
 ``<target>`` append items in the order called.
 
-Targets with :prop_tgt:`INTERFACE_SOURCES` may not be exported with the
-:command:`export` or :command:`install(EXPORT)` commands. This limitation may be
-lifted in a future version of CMake.
-
 Arguments to ``target_sources`` may use "generator expressions"
 with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)`
 manual for available expressions.  See the :manual:`cmake-buildsystem(7)`
diff --git a/Help/prop_tgt/INTERFACE_SOURCES.rst b/Help/prop_tgt/INTERFACE_SOURCES.rst
index 696ee95..a224b68 100644
--- a/Help/prop_tgt/INTERFACE_SOURCES.rst
+++ b/Help/prop_tgt/INTERFACE_SOURCES.rst
@@ -12,10 +12,6 @@ When target dependencies are specified using :command:`target_link_libraries`,
 CMake will read this property from all target dependencies to determine the
 sources of the consumer.
 
-Targets with ``INTERFACE_SOURCES`` may not be exported with the
-:command:`export` or :command:`install(EXPORT)` commands. This limitation may be
-lifted in a future version of CMake.
-
 Contents of ``INTERFACE_SOURCES`` may use "generator expressions"
 with the syntax ``$<...>``.  See the :manual:`cmake-generator-expressions(7)`
 manual for available expressions.  See the :manual:`cmake-buildsystem(7)`
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index a28ec48..b1203dd 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -68,16 +68,6 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
       tei != this->Exports.end(); ++tei)
     {
     cmTarget* te = *tei;
-    if (te->GetProperty("INTERFACE_SOURCES"))
-      {
-      std::ostringstream e;
-      e << "Target \""
-        << te->GetName()
-        << "\" has a populated INTERFACE_SOURCES property.  This is not "
-          "currently supported.";
-      cmSystemTools::Error(e.str().c_str());
-      return false;
-      }
     this->GenerateImportTargetCode(os, te);
 
     te->AppendBuildInterfaceIncludes();
@@ -87,6 +77,9 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
     this->PopulateInterfaceProperty("INTERFACE_INCLUDE_DIRECTORIES", te,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
+    this->PopulateInterfaceProperty("INTERFACE_SOURCES", te,
+                                    cmGeneratorExpression::BuildInterface,
+                                    properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS", te,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index af4ce8b..71728be 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -224,7 +224,7 @@ static bool isSubDirectory(const char* a, const char* b)
 
 //----------------------------------------------------------------------------
 static bool checkInterfaceDirs(const std::string &prepro,
-                      cmTarget *target)
+                      cmTarget *target, const std::string& prop)
 {
   const char* installDir =
             target->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
@@ -250,20 +250,27 @@ static bool checkInterfaceDirs(const std::string &prepro,
     std::ostringstream e;
     if (genexPos != std::string::npos)
       {
-      switch (target->GetPolicyStatusCMP0041())
+      if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
         {
-        case cmPolicies::WARN:
-          messageType = cmake::WARNING;
-          e << target->GetMakefile()->GetPolicies()
-                      ->GetPolicyWarning(cmPolicies::CMP0041) << "\n";
-          break;
-        case cmPolicies::OLD:
-          continue;
-        case cmPolicies::REQUIRED_IF_USED:
-        case cmPolicies::REQUIRED_ALWAYS:
-        case cmPolicies::NEW:
-          hadFatalError = true;
-          break; // Issue fatal message.
+        switch (target->GetPolicyStatusCMP0041())
+          {
+          case cmPolicies::WARN:
+            messageType = cmake::WARNING;
+            e << target->GetMakefile()->GetPolicies()
+                        ->GetPolicyWarning(cmPolicies::CMP0041) << "\n";
+            break;
+          case cmPolicies::OLD:
+            continue;
+          case cmPolicies::REQUIRED_IF_USED:
+          case cmPolicies::REQUIRED_ALWAYS:
+          case cmPolicies::NEW:
+            hadFatalError = true;
+            break; // Issue fatal message.
+          }
+        }
+      else
+        {
+        hadFatalError = true;
         }
       }
     if (cmHasLiteralPrefix(li->c_str(), "${_IMPORT_PREFIX}"))
@@ -272,8 +279,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       }
     if (!cmSystemTools::FileIsFullPath(li->c_str()))
       {
-      e << "Target \"" << target->GetName() << "\" "
-           "INTERFACE_INCLUDE_DIRECTORIES property contains relative path:\n"
+      e << "Target \"" << target->GetName() << "\" " << prop <<
+           " property contains relative path:\n"
            "  \"" << *li << "\"";
       target->GetMakefile()->IssueMessage(messageType, e.str());
       }
@@ -289,32 +296,35 @@ static bool checkInterfaceDirs(const std::string &prepro,
         (!inBinary || isSubDirectory(installDir, topBinaryDir)) &&
         (!inSource || isSubDirectory(installDir, topSourceDir));
 
-      if (!shouldContinue)
+      if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
         {
-        switch(target->GetPolicyStatusCMP0052())
+        if (!shouldContinue)
           {
-          case cmPolicies::WARN:
+          switch(target->GetPolicyStatusCMP0052())
             {
-            std::ostringstream s;
-            s << target->GetMakefile()->GetPolicies()
-                      ->GetPolicyWarning(cmPolicies::CMP0052) << "\n";
-            s << "Directory:\n    \"" << *li << "\"\nin "
-              "INTERFACE_INCLUDE_DIRECTORIES of target \""
-              << target->GetName() << "\" is a subdirectory of the install "
-              "directory:\n    \"" << installDir << "\"\nhowever it is also "
-              "a subdirectory of the " << (inBinary ? "build" : "source")
-              << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
-              << "\"" << std::endl;
-            target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
-                                                s.str());
+            case cmPolicies::WARN:
+              {
+              std::ostringstream s;
+              s << target->GetMakefile()->GetPolicies()
+                        ->GetPolicyWarning(cmPolicies::CMP0052) << "\n";
+              s << "Directory:\n    \"" << *li << "\"\nin "
+                "INTERFACE_INCLUDE_DIRECTORIES of target \""
+                << target->GetName() << "\" is a subdirectory of the install "
+                "directory:\n    \"" << installDir << "\"\nhowever it is also "
+                "a subdirectory of the " << (inBinary ? "build" : "source")
+                << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
+                << "\"" << std::endl;
+              target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
+                                                  s.str());
+              }
+            case cmPolicies::OLD:
+              shouldContinue = true;
+              break;
+            case cmPolicies::REQUIRED_ALWAYS:
+            case cmPolicies::REQUIRED_IF_USED:
+            case cmPolicies::NEW:
+              break;
             }
-          case cmPolicies::OLD:
-            shouldContinue = true;
-            break;
-          case cmPolicies::REQUIRED_ALWAYS:
-          case cmPolicies::REQUIRED_IF_USED:
-          case cmPolicies::NEW:
-            break;
           }
         }
       if (shouldContinue)
@@ -324,8 +334,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       }
     if (inBinary)
       {
-      e << "Target \"" << target->GetName() << "\" "
-           "INTERFACE_INCLUDE_DIRECTORIES property contains path:\n"
+      e << "Target \"" << target->GetName() << "\" " << prop <<
+           " property contains path:\n"
            "  \"" << *li << "\"\nwhich is prefixed in the build directory.";
       target->GetMakefile()->IssueMessage(messageType, e.str());
       }
@@ -333,8 +343,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       {
       if (inSource)
         {
-        e << "Target \"" << target->GetName() << "\" "
-            "INTERFACE_INCLUDE_DIRECTORIES property contains path:\n"
+        e << "Target \"" << target->GetName() << "\" " << prop <<
+            " property contains path:\n"
             "  \"" << *li << "\"\nwhich is prefixed in the source directory.";
         target->GetMakefile()->IssueMessage(messageType, e.str());
         }
@@ -365,6 +375,46 @@ static void prefixItems(std::string &exportDirs)
 }
 
 //----------------------------------------------------------------------------
+void cmExportFileGenerator::PopulateSourcesInterface(
+                      cmTargetExport *tei,
+                      cmGeneratorExpression::PreprocessContext preprocessRule,
+                      ImportPropertyMap &properties,
+                      std::vector<std::string> &missingTargets)
+{
+  cmTarget *target = tei->Target;
+  assert(preprocessRule == cmGeneratorExpression::InstallInterface);
+
+  const char *propName = "INTERFACE_SOURCES";
+  const char *input = target->GetProperty(propName);
+
+  if (!input)
+    {
+    return;
+    }
+
+  if (!*input)
+    {
+    properties[propName] = "";
+    return;
+    }
+
+  std::string prepro = cmGeneratorExpression::Preprocess(input,
+                                                         preprocessRule,
+                                                         true);
+  if (!prepro.empty())
+    {
+    this->ResolveTargetsInGeneratorExpressions(prepro, target,
+                                                missingTargets);
+
+    if (!checkInterfaceDirs(prepro, target, propName))
+      {
+      return;
+      }
+    properties[propName] = prepro;
+    }
+}
+
+//----------------------------------------------------------------------------
 void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                       cmTargetExport *tei,
                       cmGeneratorExpression::PreprocessContext preprocessRule,
@@ -424,7 +474,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target))
+    if (!checkInterfaceDirs(prepro, target, propName))
       {
       return;
       }
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index 919924e..b6f4166 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -139,6 +139,11 @@ protected:
                       cmGeneratorExpression::PreprocessContext preprocessRule,
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets);
+  void PopulateSourcesInterface(
+                      cmTargetExport *target,
+                      cmGeneratorExpression::PreprocessContext preprocessRule,
+                      ImportPropertyMap &properties,
+                      std::vector<std::string> &missingTargets);
 
   void SetImportLinkInterface(const std::string& config,
                     std::string const& suffix,
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 98ed818..a0d9013 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -123,6 +123,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
 
   bool require2_8_12 = false;
   bool require3_0_0 = false;
+  bool require3_1_0 = false;
   bool requiresConfigFiles = false;
   // Create all the imported targets.
   for(std::vector<cmTargetExport*>::const_iterator
@@ -131,17 +132,6 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     {
     cmTarget* te = (*tei)->Target;
 
-    if (te->GetProperty("INTERFACE_SOURCES"))
-      {
-      std::ostringstream e;
-      e << "Target \""
-        << te->GetName()
-        << "\" has a populated INTERFACE_SOURCES property.  This is not "
-          "currently supported.";
-      cmSystemTools::Error(e.str().c_str());
-      return false;
-      }
-
     requiresConfigFiles = requiresConfigFiles
                               || te->GetType() != cmTarget::INTERFACE_LIBRARY;
 
@@ -152,6 +142,9 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     this->PopulateIncludeDirectoriesInterface(*tei,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
+    this->PopulateSourcesInterface(*tei,
+                                  cmGeneratorExpression::InstallInterface,
+                                  properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_SYSTEM_INCLUDE_DIRECTORIES",
                                   te,
                                   cmGeneratorExpression::InstallInterface,
@@ -190,6 +183,13 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
       {
       require3_0_0 = true;
       }
+    if(te->GetProperty("INTERFACE_SOURCES"))
+      {
+      // We can only generate INTERFACE_SOURCES in CMake 3.3, but CMake 3.1
+      // can consume them.
+      require3_1_0 = true;
+      }
+
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
                                   te, properties);
     this->PopulateCompatibleInterfaceProperties(te, properties);
@@ -197,7 +197,11 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     this->GenerateInterfaceProperties(te, os, properties);
     }
 
-  if (require3_0_0)
+  if (require3_1_0)
+    {
+    this->GenerateRequiredCMakeVersion(os, "3.1.0");
+    }
+  else if (require3_0_0)
     {
     this->GenerateRequiredCMakeVersion(os, "3.0.0");
     }
diff --git a/Tests/ExportImport/Export/Interface/CMakeLists.txt b/Tests/ExportImport/Export/Interface/CMakeLists.txt
index 523fc29..00a5375 100644
--- a/Tests/ExportImport/Export/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Export/Interface/CMakeLists.txt
@@ -29,7 +29,17 @@ target_compile_features(use_auto_type INTERFACE cxx_auto_type)
 add_library(use_c_restrict INTERFACE)
 target_compile_features(use_c_restrict INTERFACE c_restrict)
 
-install(TARGETS headeronly sharediface use_auto_type use_c_restrict
+add_library(source_target INTERFACE)
+target_sources(source_target INTERFACE
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/source_target.cpp>
+  $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/src/source_target_for_install.cpp>
+)
+install(FILES
+  source_target_for_install.cpp
+  DESTINATION src
+)
+
+install(TARGETS headeronly sharediface use_auto_type use_c_restrict source_target
   EXPORT expInterface
 )
 install(TARGETS sharedlib
diff --git a/Tests/ExportImport/Export/Interface/source_target.cpp b/Tests/ExportImport/Export/Interface/source_target.cpp
new file mode 100644
index 0000000..037191c
--- /dev/null
+++ b/Tests/ExportImport/Export/Interface/source_target.cpp
@@ -0,0 +1,13 @@
+
+#ifndef USE_FROM_BUILD_DIR
+#error Expected define USE_FROM_BUILD_DIR
+#endif
+
+#ifdef USE_FROM_INSTALL_DIR
+#error Unexpected define USE_FROM_INSTALL_DIR
+#endif
+
+int source_symbol()
+{
+  return 42;
+}
diff --git a/Tests/ExportImport/Export/Interface/source_target_for_install.cpp b/Tests/ExportImport/Export/Interface/source_target_for_install.cpp
new file mode 100644
index 0000000..64514ed
--- /dev/null
+++ b/Tests/ExportImport/Export/Interface/source_target_for_install.cpp
@@ -0,0 +1,13 @@
+
+#ifdef USE_FROM_BUILD_DIR
+#error Unexpected define USE_FROM_BUILD_DIR
+#endif
+
+#ifndef USE_FROM_INSTALL_DIR
+#error Expected define USE_FROM_INSTALL_DIR
+#endif
+
+int source_symbol()
+{
+  return 42;
+}
diff --git a/Tests/ExportImport/Import/Interface/CMakeLists.txt b/Tests/ExportImport/Import/Interface/CMakeLists.txt
index 4028405..51d518e 100644
--- a/Tests/ExportImport/Import/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Import/Interface/CMakeLists.txt
@@ -82,6 +82,14 @@ endmacro()
 
 do_try_compile(bld)
 
+add_executable(source_target_test_bld source_target_test.cpp)
+target_link_libraries(source_target_test_bld bld::source_target)
+target_compile_definitions(source_target_test_bld PRIVATE USE_FROM_BUILD_DIR)
+
+add_executable(source_target_test_exp source_target_test.cpp)
+target_link_libraries(source_target_test_exp exp::source_target)
+target_compile_definitions(source_target_test_exp PRIVATE USE_FROM_INSTALL_DIR)
+
 add_executable(headeronlytest_exp headeronlytest.cpp)
 target_link_libraries(headeronlytest_exp exp::headeronly)
 
diff --git a/Tests/ExportImport/Import/Interface/source_target_test.cpp b/Tests/ExportImport/Import/Interface/source_target_test.cpp
new file mode 100644
index 0000000..0e8ec5f
--- /dev/null
+++ b/Tests/ExportImport/Import/Interface/source_target_test.cpp
@@ -0,0 +1,7 @@
+
+extern int source_symbol();
+
+int main()
+{
+  return source_symbol() - 42;
+}
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 71507b8..2de82a7 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -192,6 +192,9 @@ add_RunCMake_test(ExternalProject)
 set(IfacePaths_INCLUDE_DIRECTORIES_ARGS -DTEST_PROP=INCLUDE_DIRECTORIES)
 add_RunCMake_test(IfacePaths_INCLUDE_DIRECTORIES TEST_DIR IfacePaths)
 
+set(IfacePaths_SOURCES_ARGS -DTEST_PROP=SOURCES)
+add_RunCMake_test(IfacePaths_SOURCES TEST_DIR IfacePaths)
+
 if(RPMBUILD)
   add_RunCMake_test(CPackRPM)
 endif()
diff --git a/Tests/RunCMake/TargetSources/ExportInstall-result.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-result.txt
similarity index 100%
rename from Tests/RunCMake/TargetSources/ExportInstall-result.txt
rename to Tests/RunCMake/IfacePaths/BinInInstallPrefix-result.txt
diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-stderr_SOURCES.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-stderr_SOURCES.txt
new file mode 100644
index 0000000..239c069
--- /dev/null
+++ b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/IfacePaths_SOURCES/prefix/BinInInstallPrefix-build/empty.cpp"
+
+  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_SOURCES.txt b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_SOURCES.txt
new file mode 100644
index 0000000..e931a01
--- /dev/null
+++ b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/IfacePaths_SOURCES/BinaryDirectoryInInterface-build/empty.cpp"
+
+  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface.cmake b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface.cmake
index 67ee7de..7001f3f 100644
--- a/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface.cmake
+++ b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface.cmake
@@ -2,7 +2,11 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/foo")
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/foo")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/empty.cpp")
+endif()
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/IfacePaths/DirInInstallPrefix.cmake b/Tests/RunCMake/IfacePaths/DirInInstallPrefix.cmake
index fab7717..f5f3005 100644
--- a/Tests/RunCMake/IfacePaths/DirInInstallPrefix.cmake
+++ b/Tests/RunCMake/IfacePaths/DirInInstallPrefix.cmake
@@ -1,6 +1,11 @@
 enable_language(CXX)
 add_library(testTarget empty.cpp)
-target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/dir")
+
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/dir")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_INSTALL_PREFIX}/empty.cpp")
+endif()
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_SOURCES.txt b/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_SOURCES.txt
new file mode 100644
index 0000000..c79d598
--- /dev/null
+++ b/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/IfacePaths_SOURCES/InstallInBinDir-build/empty.cpp"
+
+  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_SOURCES.txt b/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_SOURCES.txt
new file mode 100644
index 0000000..e71921e
--- /dev/null
+++ b/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/IfacePaths_SOURCES/copy/empty.cpp"
+
+  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_SOURCES.txt b/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_SOURCES.txt
new file mode 100644
index 0000000..2311af9
--- /dev/null
+++ b/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_SOURCES.txt
@@ -0,0 +1,4 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" contains relative path in its INTERFACE_SOURCES:
+
+    "empty.cpp"
diff --git a/Tests/RunCMake/IfacePaths/RelativePathInGenex.cmake b/Tests/RunCMake/IfacePaths/RelativePathInGenex.cmake
index 070a381..489c3a1 100644
--- a/Tests/RunCMake/IfacePaths/RelativePathInGenex.cmake
+++ b/Tests/RunCMake/IfacePaths/RelativePathInGenex.cmake
@@ -2,7 +2,12 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<1:foo>")
+
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<1:foo>")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "$<1:empty.cpp>")
+endif()
 
 add_library(userTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
 target_link_libraries(userTarget testTarget)
diff --git a/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_SOURCES.txt b/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_SOURCES.txt
new file mode 100644
index 0000000..f0f002c
--- /dev/null
+++ b/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_SOURCES.txt
@@ -0,0 +1,4 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains relative path:
+
+    "empty.cpp"
diff --git a/Tests/RunCMake/IfacePaths/RelativePathInInterface.cmake b/Tests/RunCMake/IfacePaths/RelativePathInInterface.cmake
index 4c4727d..e974aac 100644
--- a/Tests/RunCMake/IfacePaths/RelativePathInInterface.cmake
+++ b/Tests/RunCMake/IfacePaths/RelativePathInInterface.cmake
@@ -2,8 +2,11 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "foo")
-
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "foo")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "empty.cpp")
+endif()
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
 )
diff --git a/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_SOURCES.txt b/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_SOURCES.txt
new file mode 100644
index 0000000..c5157ad
--- /dev/null
+++ b/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/IfacePaths/empty.cpp"
+
+  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface.cmake b/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface.cmake
index f814a3c..d80cbec 100644
--- a/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface.cmake
+++ b/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface.cmake
@@ -2,7 +2,11 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/foo")
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/foo")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
+endif()
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/TargetSources/ExportBuild-result.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-result.txt
similarity index 100%
copy from Tests/RunCMake/TargetSources/ExportBuild-result.txt
copy to Tests/RunCMake/IfacePaths/SrcInInstallPrefix-result.txt
diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-stderr_SOURCES.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-stderr_SOURCES.txt
new file mode 100644
index 0000000..48f2485
--- /dev/null
+++ b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/IfacePaths_SOURCES/prefix/src/empty.cpp"
+
+  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/IfacePaths/export-NOWARN.cmake b/Tests/RunCMake/IfacePaths/export-NOWARN.cmake
index 50720a0..592572c 100644
--- a/Tests/RunCMake/IfacePaths/export-NOWARN.cmake
+++ b/Tests/RunCMake/IfacePaths/export-NOWARN.cmake
@@ -1,19 +1,34 @@
 enable_language(CXX)
 add_library(foo empty.cpp)
+
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<0:>/include/subdir)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_PREFIX>/include/subdir)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<0:>/include/subdir/empty.cpp)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_PREFIX>/include/subdir/empty.cpp)
 
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/subdir>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include/subdir>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include/$<0:>>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:$<0:>/include>)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/subdir/empty.cpp>)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:include/subdir/empty.cpp>)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:include/subdir/empty.cpp$<0:>>)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:$<0:>/include/subdir/empty.cpp>)
 
 # target_include_directories(foo INTERFACE include/subdir) # Does and should warn. INSTALL_INTERFACE must not list src dir paths.
 target_include_directories(foo INTERFACE $<0:>/include/subdir) # Does not and should not should warn, because it starts with a genex.
 target_include_directories(foo INTERFACE $<INSTALL_PREFIX>/include/subdir)
+target_sources(foo INTERFACE $<0:>/include/subdir/empty.cpp)
+target_sources(foo INTERFACE $<INSTALL_PREFIX>/include/subdir/empty.cpp)
 
 target_include_directories(foo INTERFACE $<INSTALL_INTERFACE:include/subdir>)
 target_include_directories(foo INTERFACE $<INSTALL_INTERFACE:include/$<0:>>)
+target_sources(foo INTERFACE $<INSTALL_INTERFACE:include/subdir/empty.cpp>)
+target_sources(foo INTERFACE $<INSTALL_INTERFACE:include/subdir/empty.cpp$<0:>>)
+
+install(FILES include/subdir/empty.cpp
+  DESTINATION include/subdir
+)
 
 install(TARGETS foo EXPORT FooTargets DESTINATION lib)
 install(EXPORT FooTargets DESTINATION lib/cmake)
diff --git a/Tests/RunCMake/TargetSources/ExportBuild-result.txt b/Tests/RunCMake/TargetSources/ExportBuild-result.txt
index d00491f..573541a 100644
--- a/Tests/RunCMake/TargetSources/ExportBuild-result.txt
+++ b/Tests/RunCMake/TargetSources/ExportBuild-result.txt
@@ -1 +1 @@
-1
+0
diff --git a/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt b/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
deleted file mode 100644
index 0d65a55..0000000
--- a/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-CMake Error: Target "iface" has a populated INTERFACE_SOURCES property.  This is not currently supported.
diff --git a/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt b/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
deleted file mode 100644
index 0d65a55..0000000
--- a/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-CMake Error: Target "iface" has a populated INTERFACE_SOURCES property.  This is not currently supported.
diff --git a/Tests/RunCMake/TargetSources/ExportInstall.cmake b/Tests/RunCMake/TargetSources/ExportInstall.cmake
deleted file mode 100644
index 8e7c9f9..0000000
--- a/Tests/RunCMake/TargetSources/ExportInstall.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-
-add_library(iface INTERFACE)
-target_sources(iface INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/empty_1.cpp")
-
-install(TARGETS iface EXPORT exp)
-install(EXPORT exp DESTINATION cmake)
diff --git a/Tests/RunCMake/TargetSources/RunCMakeTest.cmake b/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
index 1b4ef0b..4416ef9 100644
--- a/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
+++ b/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
@@ -10,4 +10,3 @@ endif()
 run_cmake(CMP0026-LOCATION)
 run_cmake(RelativePathInInterface)
 run_cmake(ExportBuild)
-run_cmake(ExportInstall)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=abded27208623ebd45e2ce66ab0ba36c40ccae58
commit abded27208623ebd45e2ce66ab0ba36c40ccae58
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 30 13:54:18 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 9 19:34:39 2015 +0100

    Tests: Move IfacePaths test stderr files.
    
    Rename the files with a property-specific name, so that additional
    properties can be easily tested.
    
    Extend the RunCMake infrastructure to allow specifying a non-uniform
    stderr file location.

diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
rename to Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
rename to Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr.txt b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr.txt
rename to Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt b/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt
rename to Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt b/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt
rename to Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr.txt b/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr.txt
rename to Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr.txt b/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr.txt
rename to Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake b/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake
index 8febf18..489e3df 100644
--- a/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake
+++ b/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake
@@ -2,6 +2,7 @@ include(RunCMake)
 
 macro(run_cmake test)
   list(APPEND RunCMake_TEST_OPTIONS -DTEST_PROP=${TEST_PROP})
+  set(RunCMake-stderr-file ${test}-stderr_${TEST_PROP}.txt)
   _run_cmake(${test})
 endmacro()
 
diff --git a/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr.txt b/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr.txt
rename to Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
rename to Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
rename to Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9f8390db6ab0d776eb39b840a3b096b5422229f
commit d9f8390db6ab0d776eb39b840a3b096b5422229f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 30 13:42:00 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 9 19:34:27 2015 +0100

    Tests: Run IfacePaths tests with a parameter.
    
    Run the tests for the INCLUDE_DIRECTORIES INTERFACE property
    in a specific build location, and update the stderr expectation
    to match the new output.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 3645735..71507b8 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -188,7 +188,9 @@ add_RunCMake_test(CommandLine)
 add_RunCMake_test(install)
 add_RunCMake_test(CPackInstallProperties)
 add_RunCMake_test(ExternalProject)
-add_RunCMake_test(IfacePaths)
+
+set(IfacePaths_INCLUDE_DIRECTORIES_ARGS -DTEST_PROP=INCLUDE_DIRECTORIES)
+add_RunCMake_test(IfacePaths_INCLUDE_DIRECTORIES TEST_DIR IfacePaths)
 
 if(RPMBUILD)
   add_RunCMake_test(CPackRPM)
diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
index 09d225f..f2d749b 100644
--- a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
+++ b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/IfacePaths/prefix/BinInInstallPrefix-CMP0052-NEW-build/foo"
+    ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-NEW-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
index 6c3a122..3d83892 100644
--- a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
+++ b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
@@ -6,15 +6,15 @@ CMake Warning \(dev\) in CMakeLists.txt:
 
   Directory:
 
-      ".*Tests/RunCMake/IfacePaths/prefix/BinInInstallPrefix-CMP0052-WARN-build/foo"
+      ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-WARN-build/foo"
 
   in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory
   of the install directory:
 
-      ".*Tests/RunCMake/IfacePaths/prefix"
+      ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix"
 
   however it is also a subdirectory of the build tree:
 
-      ".*Tests/RunCMake/IfacePaths/prefix/BinInInstallPrefix-CMP0052-WARN-build"
+      ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-WARN-build"
 
 This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr.txt b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr.txt
index cb2cba4..ed7cd58 100644
--- a/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr.txt
+++ b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*RunCMake/IfacePaths/BinaryDirectoryInInterface-build/foo"
+    ".*RunCMake/IfacePaths_INCLUDE_DIRECTORIES/BinaryDirectoryInInterface-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt b/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt
index c71b375..3d60831 100644
--- a/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt
+++ b/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/IfacePaths/InstallInBinDir-build/foo"
+    ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/InstallInBinDir-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt b/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt
index 526ef61..11994dd 100644
--- a/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt
+++ b/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/IfacePaths/copy/foo"
+    ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/copy/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake b/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake
index 4c9a703..8febf18 100644
--- a/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake
+++ b/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake
@@ -1,5 +1,10 @@
 include(RunCMake)
 
+macro(run_cmake test)
+  list(APPEND RunCMake_TEST_OPTIONS -DTEST_PROP=${TEST_PROP})
+  _run_cmake(${test})
+endmacro()
+
 run_cmake(RelativePathInInterface)
 run_cmake(RelativePathInGenex)
 run_cmake(export-NOWARN)
@@ -57,12 +62,15 @@ configure_file(
   COPYONLY
 )
 
-foreach(policyStatus "" NEW OLD)
-  if (NOT "${policyStatus}" STREQUAL "")
-    set(policyOption -DCMAKE_POLICY_DEFAULT_CMP0052=${policyStatus})
-  else()
-    unset(policyOption)
-    set(policyStatus WARN)
+foreach(policyStatus NEW OLD "")
+  if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+    if (NOT "${policyStatus}" STREQUAL "")
+      set(policyOption -DCMAKE_POLICY_DEFAULT_CMP0052=${policyStatus})
+    else()
+      unset(policyOption)
+      set(policyStatus WARN)
+    endif()
+    set(policySuffix -CMP0052-${policyStatus})
   endif()
   set(RunCMake_TEST_OPTIONS
     "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
@@ -73,16 +81,20 @@ foreach(policyStatus "" NEW OLD)
   # a subdirectory or the source directory, which is allowed and tested separately
   # below.
   set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/prefix/src")
-  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/prefix/BinInInstallPrefix-CMP0052-${policyStatus}-build")
-  run_cmake(BinInInstallPrefix-CMP0052-${policyStatus})
+  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/prefix/BinInInstallPrefix${policySuffix}-build")
+  run_cmake(BinInInstallPrefix${policySuffix})
   unset(RunCMake_TEST_BINARY_DIR)
 
   set(RunCMake_TEST_OPTIONS
     "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
     "-DTEST_FILE=${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake"
     )
-  run_cmake(SrcInInstallPrefix-CMP0052-${policyStatus})
+  run_cmake(SrcInInstallPrefix${policySuffix})
   unset(RunCMake_TEST_SOURCE_DIR)
+
+  if (NOT TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+    break()
+  endif()
 endforeach()
 
 set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallPrefixInInterface-build/prefix")
diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
index ab95537..ed5df34 100644
--- a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
+++ b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/IfacePaths/prefix/src/foo"
+    ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/src/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
index 23683e8..cb5a51c 100644
--- a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
+++ b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
@@ -6,15 +6,15 @@ CMake Warning \(dev\) in CMakeLists.txt:
 
   Directory:
 
-      ".*Tests/RunCMake/IfacePaths/prefix/src/foo"
+      ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/src/foo"
 
   in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory
   of the install directory:
 
-      ".*Tests/RunCMake/IfacePaths/prefix"
+      ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix"
 
   however it is also a subdirectory of the source tree:
 
-      ".*Tests/RunCMake/IfacePaths/prefix/src"
+      ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/src"
 
 This warning is for project developers.  Use -Wno-dev to suppress it.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc1520947608f5224a4fdfa94b5cb07e19e23600
commit cc1520947608f5224a4fdfa94b5cb07e19e23600
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 30 13:20:32 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 9 19:23:47 2015 +0100

    Tests: Split part of include_directories test to a generic location.
    
    The moved tests are related to paths in INTERFACE_INCLUDE_DIRECTORIES
    in general, and when exporting, and covering cases of the install
    location being within the build or source prefix etc.  Other build
    properties containing paths should have similar tests, so this
    allows some parameterization while keeping the preparation of the
    various directory structures.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 2973fe9..3645735 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -188,6 +188,7 @@ add_RunCMake_test(CommandLine)
 add_RunCMake_test(install)
 add_RunCMake_test(CPackInstallProperties)
 add_RunCMake_test(ExternalProject)
+add_RunCMake_test(IfacePaths)
 
 if(RPMBUILD)
   add_RunCMake_test(CPackRPM)
diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-result.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-result.txt
rename to Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-result.txt
diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
similarity index 62%
rename from Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt
rename to Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
index f0adc9f..09d225f 100644
--- a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt
+++ b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/include_directories/prefix/BinInInstallPrefix-CMP0052-NEW-build/foo"
+    ".*Tests/RunCMake/IfacePaths/prefix/BinInInstallPrefix-CMP0052-NEW-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-result.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-OLD-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-result.txt
rename to Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-OLD-result.txt
diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-result.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-result.txt
rename to Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-result.txt
diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
similarity index 69%
rename from Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt
rename to Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
index 054bff5..6c3a122 100644
--- a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt
+++ b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
@@ -6,15 +6,15 @@ CMake Warning \(dev\) in CMakeLists.txt:
 
   Directory:
 
-      ".*Tests/RunCMake/include_directories/prefix/BinInInstallPrefix-CMP0052-WARN-build/foo"
+      ".*Tests/RunCMake/IfacePaths/prefix/BinInInstallPrefix-CMP0052-WARN-build/foo"
 
   in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory
   of the install directory:
 
-      ".*Tests/RunCMake/include_directories/prefix"
+      ".*Tests/RunCMake/IfacePaths/prefix"
 
   however it is also a subdirectory of the build tree:
 
-      ".*Tests/RunCMake/include_directories/prefix/BinInInstallPrefix-CMP0052-WARN-build"
+      ".*Tests/RunCMake/IfacePaths/prefix/BinInInstallPrefix-CMP0052-WARN-build"
 
 This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-result.txt b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/BinaryDirectoryInInterface-result.txt
rename to Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-result.txt
diff --git a/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-stderr.txt b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr.txt
similarity index 67%
rename from Tests/RunCMake/include_directories/BinaryDirectoryInInterface-stderr.txt
rename to Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr.txt
index 0d4379e..cb2cba4 100644
--- a/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-stderr.txt
+++ b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*RunCMake/include_directories/BinaryDirectoryInInterface-build/foo"
+    ".*RunCMake/IfacePaths/BinaryDirectoryInInterface-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface.cmake
similarity index 100%
rename from Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake
rename to Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface.cmake
diff --git a/Tests/RunCMake/include_directories/CMakeLists.txt b/Tests/RunCMake/IfacePaths/CMakeLists.txt
similarity index 100%
copy from Tests/RunCMake/include_directories/CMakeLists.txt
copy to Tests/RunCMake/IfacePaths/CMakeLists.txt
diff --git a/Tests/RunCMake/include_directories/DirInInstallPrefix-result.txt b/Tests/RunCMake/IfacePaths/DirInInstallPrefix-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/DirInInstallPrefix-result.txt
rename to Tests/RunCMake/IfacePaths/DirInInstallPrefix-result.txt
diff --git a/Tests/RunCMake/include_directories/DirInInstallPrefix.cmake b/Tests/RunCMake/IfacePaths/DirInInstallPrefix.cmake
similarity index 100%
rename from Tests/RunCMake/include_directories/DirInInstallPrefix.cmake
rename to Tests/RunCMake/IfacePaths/DirInInstallPrefix.cmake
diff --git a/Tests/RunCMake/include_directories/InstallInBinDir-result.txt b/Tests/RunCMake/IfacePaths/InstallInBinDir-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/InstallInBinDir-result.txt
rename to Tests/RunCMake/IfacePaths/InstallInBinDir-result.txt
diff --git a/Tests/RunCMake/include_directories/InstallInBinDir-stderr.txt b/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt
similarity index 68%
rename from Tests/RunCMake/include_directories/InstallInBinDir-stderr.txt
rename to Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt
index 254fae1..c71b375 100644
--- a/Tests/RunCMake/include_directories/InstallInBinDir-stderr.txt
+++ b/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/include_directories/InstallInBinDir-build/foo"
+    ".*Tests/RunCMake/IfacePaths/InstallInBinDir-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/include_directories/InstallInSrcDir-result.txt b/Tests/RunCMake/IfacePaths/InstallInSrcDir-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/InstallInSrcDir-result.txt
rename to Tests/RunCMake/IfacePaths/InstallInSrcDir-result.txt
diff --git a/Tests/RunCMake/include_directories/InstallInSrcDir-stderr.txt b/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt
similarity index 74%
rename from Tests/RunCMake/include_directories/InstallInSrcDir-stderr.txt
rename to Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt
index 7be3044..526ef61 100644
--- a/Tests/RunCMake/include_directories/InstallInSrcDir-stderr.txt
+++ b/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/include_directories/copy/foo"
+    ".*Tests/RunCMake/IfacePaths/copy/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/include_directories/InstallPrefixInInterface-result.txt b/Tests/RunCMake/IfacePaths/InstallPrefixInInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/InstallPrefixInInterface-result.txt
rename to Tests/RunCMake/IfacePaths/InstallPrefixInInterface-result.txt
diff --git a/Tests/RunCMake/include_directories/InstallPrefixInInterface.cmake b/Tests/RunCMake/IfacePaths/InstallPrefixInInterface.cmake
similarity index 100%
rename from Tests/RunCMake/include_directories/InstallPrefixInInterface.cmake
rename to Tests/RunCMake/IfacePaths/InstallPrefixInInterface.cmake
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-result.txt b/Tests/RunCMake/IfacePaths/InstallToPrefixInSrcDirInSource-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-result.txt
rename to Tests/RunCMake/IfacePaths/InstallToPrefixInSrcDirInSource-result.txt
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-result.txt b/Tests/RunCMake/IfacePaths/InstallToPrefixInSrcDirOutOfSource-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-result.txt
rename to Tests/RunCMake/IfacePaths/InstallToPrefixInSrcDirOutOfSource-result.txt
diff --git a/Tests/RunCMake/include_directories/RelativePathInGenex-result.txt b/Tests/RunCMake/IfacePaths/RelativePathInGenex-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/RelativePathInGenex-result.txt
rename to Tests/RunCMake/IfacePaths/RelativePathInGenex-result.txt
diff --git a/Tests/RunCMake/include_directories/RelativePathInGenex-stderr.txt b/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/RelativePathInGenex-stderr.txt
rename to Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr.txt
diff --git a/Tests/RunCMake/include_directories/RelativePathInGenex.cmake b/Tests/RunCMake/IfacePaths/RelativePathInGenex.cmake
similarity index 100%
rename from Tests/RunCMake/include_directories/RelativePathInGenex.cmake
rename to Tests/RunCMake/IfacePaths/RelativePathInGenex.cmake
diff --git a/Tests/RunCMake/include_directories/RelativePathInInterface-result.txt b/Tests/RunCMake/IfacePaths/RelativePathInInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/RelativePathInInterface-result.txt
rename to Tests/RunCMake/IfacePaths/RelativePathInInterface-result.txt
diff --git a/Tests/RunCMake/include_directories/RelativePathInInterface-stderr.txt b/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/RelativePathInInterface-stderr.txt
rename to Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr.txt
diff --git a/Tests/RunCMake/include_directories/RelativePathInInterface.cmake b/Tests/RunCMake/IfacePaths/RelativePathInInterface.cmake
similarity index 100%
rename from Tests/RunCMake/include_directories/RelativePathInInterface.cmake
rename to Tests/RunCMake/IfacePaths/RelativePathInInterface.cmake
diff --git a/Tests/RunCMake/include_directories/RunCMakeTest.cmake b/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake
similarity index 96%
copy from Tests/RunCMake/include_directories/RunCMakeTest.cmake
copy to Tests/RunCMake/IfacePaths/RunCMakeTest.cmake
index fa76f24..4c9a703 100644
--- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake
+++ b/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake
@@ -1,17 +1,10 @@
 include(RunCMake)
 
-run_cmake(NotFoundContent)
-run_cmake(DebugIncludes)
-run_cmake(TID-bad-target)
-run_cmake(SourceDirectoryInInterface)
-run_cmake(BinaryDirectoryInInterface)
 run_cmake(RelativePathInInterface)
-run_cmake(ImportedTarget)
 run_cmake(RelativePathInGenex)
-run_cmake(CMP0021)
-run_cmake(install_config)
-run_cmake(incomplete-genex)
 run_cmake(export-NOWARN)
+run_cmake(SourceDirectoryInInterface)
+run_cmake(BinaryDirectoryInInterface)
 
 set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/DirInInstallPrefix/prefix")
 run_cmake(DirInInstallPrefix)
diff --git a/Tests/RunCMake/include_directories/SourceDirectoryInInterface-result.txt b/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/SourceDirectoryInInterface-result.txt
rename to Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-result.txt
diff --git a/Tests/RunCMake/include_directories/SourceDirectoryInInterface-stderr.txt b/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr.txt
similarity index 78%
rename from Tests/RunCMake/include_directories/SourceDirectoryInInterface-stderr.txt
rename to Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr.txt
index 9346b99..97a94b1 100644
--- a/Tests/RunCMake/include_directories/SourceDirectoryInInterface-stderr.txt
+++ b/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*RunCMake/include_directories/foo"
+    ".*RunCMake/IfacePaths/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake b/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface.cmake
similarity index 100%
rename from Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake
rename to Tests/RunCMake/IfacePaths/SourceDirectoryInInterface.cmake
diff --git a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-result.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-result.txt
rename to Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-result.txt
diff --git a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
similarity index 72%
rename from Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
rename to Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
index afa43e0..ab95537 100644
--- a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
+++ b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/include_directories/prefix/src/foo"
+    ".*Tests/RunCMake/IfacePaths/prefix/src/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-result.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-OLD-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-result.txt
rename to Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-OLD-result.txt
diff --git a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-result.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-result.txt
rename to Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-result.txt
diff --git a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
similarity index 75%
rename from Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
rename to Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
index 0b13fd8..23683e8 100644
--- a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
+++ b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
@@ -6,15 +6,15 @@ CMake Warning \(dev\) in CMakeLists.txt:
 
   Directory:
 
-      ".*Tests/RunCMake/include_directories/prefix/src/foo"
+      ".*Tests/RunCMake/IfacePaths/prefix/src/foo"
 
   in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory
   of the install directory:
 
-      ".*Tests/RunCMake/include_directories/prefix"
+      ".*Tests/RunCMake/IfacePaths/prefix"
 
   however it is also a subdirectory of the source tree:
 
-      ".*Tests/RunCMake/include_directories/prefix/src"
+      ".*Tests/RunCMake/IfacePaths/prefix/src"
 
 This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/IfacePaths/empty.cpp b/Tests/RunCMake/IfacePaths/empty.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/include_directories/export-NOWARN-result.txt b/Tests/RunCMake/IfacePaths/export-NOWARN-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/export-NOWARN-result.txt
rename to Tests/RunCMake/IfacePaths/export-NOWARN-result.txt
diff --git a/Tests/RunCMake/include_directories/export-NOWARN.cmake b/Tests/RunCMake/IfacePaths/export-NOWARN.cmake
similarity index 100%
rename from Tests/RunCMake/include_directories/export-NOWARN.cmake
rename to Tests/RunCMake/IfacePaths/export-NOWARN.cmake
diff --git a/Tests/RunCMake/include_directories/CMakeLists.txt b/Tests/RunCMake/include_directories/CMakeLists.txt
index 5cd4825..2897109 100644
--- a/Tests/RunCMake/include_directories/CMakeLists.txt
+++ b/Tests/RunCMake/include_directories/CMakeLists.txt
@@ -1,6 +1,3 @@
 cmake_minimum_required(VERSION 3.0)
 project(${RunCMake_TEST} NONE)
-if(NOT TEST_FILE)
-  set(TEST_FILE ${RunCMake_TEST}.cmake)
-endif()
-include(${TEST_FILE})
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/include_directories/RunCMakeTest.cmake b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
index fa76f24..3f624f8 100644
--- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake
+++ b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
@@ -3,148 +3,7 @@ include(RunCMake)
 run_cmake(NotFoundContent)
 run_cmake(DebugIncludes)
 run_cmake(TID-bad-target)
-run_cmake(SourceDirectoryInInterface)
-run_cmake(BinaryDirectoryInInterface)
-run_cmake(RelativePathInInterface)
 run_cmake(ImportedTarget)
-run_cmake(RelativePathInGenex)
 run_cmake(CMP0021)
 run_cmake(install_config)
 run_cmake(incomplete-genex)
-run_cmake(export-NOWARN)
-
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/DirInInstallPrefix/prefix")
-run_cmake(DirInInstallPrefix)
-
-configure_file(
-  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
-  "${RunCMake_BINARY_DIR}/copy/CMakeLists.txt"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/empty.cpp"
-  "${RunCMake_BINARY_DIR}/copy/empty.cpp"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/SourceDirectoryInInterface.cmake"
-  "${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface.cmake"
-  COPYONLY
-)
-set(RunCMake_TEST_OPTIONS
-  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface/prefix"
-  "-DTEST_FILE=${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface.cmake"
-  )
-set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/copy")
-run_cmake(InstallInSrcDir)
-unset(RunCMake_TEST_SOURCE_DIR)
-
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallInBinDir-build/prefix")
-set(RunCMake_TEST_OPTIONS
-  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallInBinDir-build/prefix"
-  "-DTEST_FILE=${RunCMake_SOURCE_DIR}/BinaryDirectoryInInterface.cmake"
-  )
-set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/InstallInBinDir-build")
-run_cmake(InstallInBinDir)
-unset(RunCMake_TEST_BINARY_DIR)
-
-configure_file(
-  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
-  "${RunCMake_BINARY_DIR}/prefix/src/CMakeLists.txt"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/empty.cpp"
-  "${RunCMake_BINARY_DIR}/prefix/src/empty.cpp"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/SourceDirectoryInInterface.cmake"
-  "${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake"
-  COPYONLY
-)
-
-foreach(policyStatus "" NEW OLD)
-  if (NOT "${policyStatus}" STREQUAL "")
-    set(policyOption -DCMAKE_POLICY_DEFAULT_CMP0052=${policyStatus})
-  else()
-    unset(policyOption)
-    set(policyStatus WARN)
-  endif()
-  set(RunCMake_TEST_OPTIONS
-    "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
-    "-DTEST_FILE=${RunCMake_SOURCE_DIR}/BinaryDirectoryInInterface.cmake"
-    )
-  # Set the RunCMake_TEST_SOURCE_DIR here to the copy too. This is needed to run
-  # the test suite in-source properly.  Otherwise the install directory would be
-  # a subdirectory or the source directory, which is allowed and tested separately
-  # below.
-  set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/prefix/src")
-  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/prefix/BinInInstallPrefix-CMP0052-${policyStatus}-build")
-  run_cmake(BinInInstallPrefix-CMP0052-${policyStatus})
-  unset(RunCMake_TEST_BINARY_DIR)
-
-  set(RunCMake_TEST_OPTIONS
-    "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
-    "-DTEST_FILE=${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake"
-    )
-  run_cmake(SrcInInstallPrefix-CMP0052-${policyStatus})
-  unset(RunCMake_TEST_SOURCE_DIR)
-endforeach()
-
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallPrefixInInterface-build/prefix")
-run_cmake(InstallPrefixInInterface)
-
-configure_file(
-  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
-  "${RunCMake_BINARY_DIR}/installToSrc/CMakeLists.txt"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/empty.cpp"
-  "${RunCMake_BINARY_DIR}/installToSrc/empty.cpp"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/InstallPrefixInInterface.cmake"
-  "${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface.cmake"
-  COPYONLY
-)
-set(RunCMake_TEST_OPTIONS
-  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface/prefix"
-  "-DTEST_FILE=${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface.cmake"
-  )
-set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/installToSrc")
-run_cmake(InstallToPrefixInSrcDirOutOfSource)
-unset(RunCMake_TEST_SOURCE_DIR)
-
-
-file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}/installToSrcInSrc")
-set(RunCMake_TEST_NO_CLEAN ON)
-
-configure_file(
-  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
-  "${RunCMake_BINARY_DIR}/installToSrcInSrc/CMakeLists.txt"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/empty.cpp"
-  "${RunCMake_BINARY_DIR}/installToSrcInSrc/empty.cpp"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/InstallPrefixInInterface.cmake"
-  "${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface.cmake"
-  COPYONLY
-)
-
-set(RunCMake_TEST_OPTIONS
-  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface/prefix"
-  "-DTEST_FILE=${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface.cmake"
-  )
-set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/installToSrcInSrc")
-set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/installToSrcInSrc")
-run_cmake(InstallToPrefixInSrcDirInSource)
-unset(RunCMake_TEST_SOURCE_DIR)
-unset(RunCMake_TEST_BINARY_DIR)
-unset(RunCMake_TEST_NO_CLEAN)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0d8e715915f65196353c09d86d4d34fe100437f
commit c0d8e715915f65196353c09d86d4d34fe100437f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 08:41:06 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 9 19:15:04 2015 +0100

    RunCMake: Allow specifying the stderr file for a test.

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 33b745d..6389ef4 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -18,7 +18,10 @@ function(run_cmake test)
     set(expect_result 0)
   endif()
   foreach(o out err)
-    if(EXISTS ${top_src}/${test}-std${o}.txt)
+    if(RunCMake-std${o}-file AND EXISTS ${top_src}/${RunCMake-std${o}-file})
+      file(READ ${top_src}/${RunCMake-std${o}-file} expect_std${o})
+      string(REGEX REPLACE "\n+$" "" expect_std${o} "${expect_std${o}}")
+    elseif(EXISTS ${top_src}/${test}-std${o}.txt)
       file(READ ${top_src}/${test}-std${o}.txt expect_std${o})
       string(REGEX REPLACE "\n+$" "" expect_std${o} "${expect_std${o}}")
     else()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68d29f519047aeef92a0ab8fef531010c311efaa
commit 68d29f519047aeef92a0ab8fef531010c311efaa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 08:39:18 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 9 19:15:04 2015 +0100

    RunCMake: Allow specifying the directory to run tests in.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 801655f..2973fe9 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -1,17 +1,28 @@
 # See adjacent README.rst for documentation of this test infrastructure.
 
 macro(add_RunCMake_test test)
+  set(TEST_ARGS ${ARGN})
+  if ("${ARGV1}" STREQUAL "TEST_DIR")
+    if ("${ARGV2}" STREQUAL "")
+      message(FATAL_ERROR "Invalid args")
+    endif()
+    set(Test_Dir ${ARGV2})
+    list(REMOVE_AT TEST_ARGS 0)
+    list(REMOVE_AT TEST_ARGS 0)
+  else()
+    set(Test_Dir ${test})
+  endif()
   add_test(NAME RunCMake.${test} COMMAND ${CMAKE_CMAKE_COMMAND}
     -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR}
     -DRunCMake_GENERATOR=${CMAKE_GENERATOR}
     -DRunCMake_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
     -DRunCMake_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET}
     -DRunCMake_MAKE_PROGRAM=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}
-    -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${test}
+    -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}
     -DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test}
     ${${test}_ARGS}
-    ${ARGN}
-    -P "${CMAKE_CURRENT_SOURCE_DIR}/${test}/RunCMakeTest.cmake"
+    ${TEST_ARGS}
+    -P "${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}/RunCMakeTest.cmake"
     )
 endmacro()
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c3918ff0278715e2a4ec5929f75f7812003ee97
commit 1c3918ff0278715e2a4ec5929f75f7812003ee97
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 1 17:38:59 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 9 19:15:04 2015 +0100

    RunCMake: Remove unneeded files.
    
    The default expectation of RunCMake tests is empty content, so there
    is no need to specify it.

diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt b/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt b/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt b/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt b/Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt b/Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt b/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt b/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt b/Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt b/Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt b/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt b/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt b/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt b/Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt b/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt b/Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt b/Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt b/Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt b/Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt b/Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt b/Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt b/Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt b/Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt b/Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt b/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt b/Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt b/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt b/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt b/Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt b/Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt b/Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt b/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt b/Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt b/Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt b/Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt b/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt b/Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/include_directories/export-NOWARN-stderr.txt b/Tests/RunCMake/include_directories/export-NOWARN-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/include_directories/export-NOWARN-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt b/Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt b/Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/interface_library/genex_link-stderr.txt b/Tests/RunCMake/interface_library/genex_link-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/interface_library/genex_link-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt b/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/message/nomessage-stderr.txt b/Tests/RunCMake/message/nomessage-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/message/nomessage-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt b/Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/project/CMP0048-NEW-stderr.txt b/Tests/RunCMake/project/CMP0048-NEW-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/project/CMP0048-NEW-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$

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

Summary of changes:
 Help/command/target_sources.rst                    |    4 -
 Help/prop_tgt/INTERFACE_SOURCES.rst                |    4 -
 Help/release/dev/export-interface-source-files.rst |    6 +
 Source/cmExportBuildFileGenerator.cxx              |   13 +-
 Source/cmExportFileGenerator.cxx                   |  136 +++++++++++++------
 Source/cmExportFileGenerator.h                     |    5 +
 Source/cmExportInstallFileGenerator.cxx            |   28 ++--
 Tests/ExportImport/Export/Interface/CMakeLists.txt |   12 +-
 .../Export/Interface/source_target.cpp             |   13 ++
 .../Export/Interface/source_target_for_install.cpp |   13 ++
 Tests/ExportImport/Import/Interface/CMakeLists.txt |    8 ++
 .../Import/Interface/source_target_test.cpp        |    7 +
 .../RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt |    1 -
 .../CMP0022/CMP0022-NOWARN-shared-stderr.txt       |    1 -
 .../CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt   |    1 -
 ...CMP0022-NOWARN-static-link_libraries-stderr.txt |    1 -
 .../CMP0022/CMP0022-NOWARN-static-stderr.txt       |    1 -
 .../RunCMake/CMP0022/CMP0022-export-exe-stderr.txt |    1 -
 .../CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt |    1 -
 Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt |    1 -
 .../CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt |    1 -
 .../RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt  |    1 -
 Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt      |    1 -
 .../CMP0037/CMP0037-OLD-reserved-stderr.txt        |    1 -
 .../RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt  |    1 -
 Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt      |    1 -
 Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt      |    1 -
 .../CMP0040/CMP0040-NEW-existing-target-stderr.txt |    1 -
 .../CMP0040/CMP0040-OLD-existing-target-stderr.txt |    1 -
 .../CMP0040/CMP0040-OLD-missing-target-stderr.txt  |    1 -
 Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt      |    1 -
 Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt  |    1 -
 Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt      |    1 -
 Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt      |    1 -
 Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt      |    1 -
 Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt      |    1 -
 Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt      |    1 -
 .../CMP0046-NEW-existing-dependency-stderr.txt     |    1 -
 .../CMP0046-OLD-existing-dependency-stderr.txt     |    1 -
 .../CMP0046-OLD-missing-dependency-stderr.txt      |    1 -
 Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt      |    1 -
 Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt      |    1 -
 .../CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt    |    1 -
 .../CMP0055-OLD-Reject-Arguments-stderr.txt        |    1 -
 Tests/RunCMake/CMakeLists.txt                      |   23 +++-
 ...LinkImplementationFeatureCycleSolved-stderr.txt |    1 -
 .../DisallowedCommands/CMP0029-OLD-stderr.txt      |    1 -
 .../File_Generate/CarryPermissions-stderr.txt      |    1 -
 .../File_Generate/GenerateSource-stderr.txt        |    1 -
 .../OutputNameMatchesOtherSources-stderr.txt       |    1 -
 Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt |    1 -
 .../File_Generate/WriteIfDifferent-stderr.txt      |    1 -
 .../ValidTarget-TARGET_PDB_FILE-stderr.txt         |    1 -
 .../BinInInstallPrefix-CMP0052-NEW-result.txt}     |    0
 ...fix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../BinInInstallPrefix-CMP0052-OLD-result.txt      |    0
 .../BinInInstallPrefix-CMP0052-WARN-result.txt     |    0
 ...ix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} |    6 +-
 .../BinInInstallPrefix-result.txt}                 |    0
 .../BinInInstallPrefix-stderr_SOURCES.txt          |    6 +
 .../BinaryDirectoryInInterface-result.txt}         |    0
 ...toryInInterface-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../BinaryDirectoryInInterface-stderr_SOURCES.txt  |    6 +
 .../IfacePaths/BinaryDirectoryInInterface.cmake    |   15 +++
 .../CMakeLists.txt                                 |    0
 .../DirInInstallPrefix-result.txt                  |    0
 Tests/RunCMake/IfacePaths/DirInInstallPrefix.cmake |   14 ++
 .../InstallInBinDir-result.txt}                    |    0
 ...InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../IfacePaths/InstallInBinDir-stderr_SOURCES.txt  |    6 +
 .../InstallInSrcDir-result.txt}                    |    0
 ...InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../IfacePaths/InstallInSrcDir-stderr_SOURCES.txt  |    6 +
 .../InstallPrefixInInterface-result.txt            |    0
 .../InstallPrefixInInterface.cmake                 |    0
 .../InstallToPrefixInSrcDirInSource-result.txt     |    0
 .../InstallToPrefixInSrcDirOutOfSource-result.txt  |    0
 .../RelativePathInGenex-result.txt}                |    0
 ...tivePathInGenex-stderr_INCLUDE_DIRECTORIES.txt} |    0
 .../RelativePathInGenex-stderr_SOURCES.txt         |    4 +
 .../RunCMake/IfacePaths/RelativePathInGenex.cmake  |   13 ++
 .../RelativePathInInterface-result.txt}            |    0
 ...PathInInterface-stderr_INCLUDE_DIRECTORIES.txt} |    0
 .../RelativePathInInterface-stderr_SOURCES.txt     |    4 +
 .../IfacePaths/RelativePathInInterface.cmake       |   14 ++
 .../RunCMakeTest.cmake                             |   42 +++---
 .../SourceDirectoryInInterface-result.txt}         |    0
 ...toryInInterface-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../SourceDirectoryInInterface-stderr_SOURCES.txt  |    6 +
 .../IfacePaths/SourceDirectoryInInterface.cmake    |   15 +++
 .../SrcInInstallPrefix-CMP0052-NEW-result.txt}     |    0
 ...fix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../SrcInInstallPrefix-CMP0052-OLD-result.txt      |    0
 .../SrcInInstallPrefix-CMP0052-WARN-result.txt     |    0
 ...ix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} |    6 +-
 .../SrcInInstallPrefix-result.txt}                 |    0
 .../SrcInInstallPrefix-stderr_SOURCES.txt          |    6 +
 Tests/RunCMake/{CMP0004 => IfacePaths}/empty.cpp   |    0
 .../export-NOWARN-result.txt                       |    0
 .../export-NOWARN.cmake                            |   15 +++
 Tests/RunCMake/RunCMake.cmake                      |    5 +-
 Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt     |    1 -
 .../LinkImplementationCycle3-stderr.txt            |    1 -
 .../TargetSources/CMP0026-LOCATION-stderr.txt      |    1 -
 .../RunCMake/TargetSources/ExportBuild-result.txt  |    2 +-
 .../RunCMake/TargetSources/ExportBuild-stderr.txt  |    1 -
 .../TargetSources/ExportInstall-result.txt         |    1 -
 .../TargetSources/ExportInstall-stderr.txt         |    1 -
 Tests/RunCMake/TargetSources/ExportInstall.cmake   |    6 -
 Tests/RunCMake/TargetSources/RunCMakeTest.cmake    |    1 -
 .../BinInInstallPrefix-CMP0052-NEW-result.txt      |    1 -
 .../BinInInstallPrefix-CMP0052-OLD-stderr.txt      |    1 -
 .../BinaryDirectoryInInterface-result.txt          |    1 -
 .../BinaryDirectoryInInterface.cmake               |   11 --
 Tests/RunCMake/include_directories/CMakeLists.txt  |    5 +-
 .../DirInInstallPrefix-stderr.txt                  |    1 -
 .../include_directories/DirInInstallPrefix.cmake   |    9 --
 .../include_directories/InstallInBinDir-result.txt |    1 -
 .../include_directories/InstallInSrcDir-result.txt |    1 -
 .../InstallPrefixInInterface-stderr.txt            |    1 -
 .../InstallToPrefixInSrcDirInSource-stderr.txt     |    1 -
 .../InstallToPrefixInSrcDirOutOfSource-stderr.txt  |    1 -
 .../RelativePathInGenex-result.txt                 |    1 -
 .../include_directories/RelativePathInGenex.cmake  |    8 --
 .../RelativePathInInterface-result.txt             |    1 -
 .../RelativePathInInterface.cmake                  |   11 --
 .../include_directories/RunCMakeTest.cmake         |  141 --------------------
 .../SourceDirectoryInInterface-result.txt          |    1 -
 .../SourceDirectoryInInterface.cmake               |   11 --
 .../SrcInInstallPrefix-CMP0052-NEW-result.txt      |    1 -
 .../SrcInInstallPrefix-CMP0052-OLD-stderr.txt      |    1 -
 .../include_directories/export-NOWARN-stderr.txt   |    1 -
 .../install/SkipInstallRulesNoWarning1-stderr.txt  |    1 -
 .../install/SkipInstallRulesNoWarning2-stderr.txt  |    1 -
 .../interface_library/genex_link-stderr.txt        |    1 -
 .../interface_library/no_shared_libs-stderr.txt    |    1 -
 Tests/RunCMake/message/nomessage-stderr.txt        |    1 -
 .../with_install_prefix-stderr.txt                 |    1 -
 Tests/RunCMake/project/CMP0048-NEW-stderr.txt      |    1 -
 139 files changed, 367 insertions(+), 379 deletions(-)
 create mode 100644 Help/release/dev/export-interface-source-files.rst
 create mode 100644 Tests/ExportImport/Export/Interface/source_target.cpp
 create mode 100644 Tests/ExportImport/Export/Interface/source_target_for_install.cpp
 create mode 100644 Tests/ExportImport/Import/Interface/source_target_test.cpp
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt
 delete mode 100644 Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt
 delete mode 100644 Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
 delete mode 100644 Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
 delete mode 100644 Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt
 delete mode 100644 Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
 delete mode 100644 Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt
 delete mode 100644 Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/BinInInstallPrefix-CMP0052-NEW-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt => IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} (60%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/BinInInstallPrefix-CMP0052-OLD-result.txt (100%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/BinInInstallPrefix-CMP0052-WARN-result.txt (100%)
 rename Tests/RunCMake/{include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt => IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} (66%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/BinInInstallPrefix-result.txt} (100%)
 create mode 100644 Tests/RunCMake/IfacePaths/BinInInstallPrefix-stderr_SOURCES.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/BinaryDirectoryInInterface-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/BinaryDirectoryInInterface-stderr.txt => IfacePaths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt} (64%)
 create mode 100644 Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_SOURCES.txt
 create mode 100644 Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface.cmake
 copy Tests/RunCMake/{include_directories => IfacePaths}/CMakeLists.txt (100%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/DirInInstallPrefix-result.txt (100%)
 create mode 100644 Tests/RunCMake/IfacePaths/DirInInstallPrefix.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/InstallInBinDir-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/InstallInBinDir-stderr.txt => IfacePaths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt} (65%)
 create mode 100644 Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_SOURCES.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/InstallInSrcDir-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/InstallInSrcDir-stderr.txt => IfacePaths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt} (70%)
 create mode 100644 Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_SOURCES.txt
 rename Tests/RunCMake/{include_directories => IfacePaths}/InstallPrefixInInterface-result.txt (100%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/InstallPrefixInInterface.cmake (100%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/InstallToPrefixInSrcDirInSource-result.txt (100%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/InstallToPrefixInSrcDirOutOfSource-result.txt (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/RelativePathInGenex-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/RelativePathInGenex-stderr.txt => IfacePaths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt} (100%)
 create mode 100644 Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_SOURCES.txt
 create mode 100644 Tests/RunCMake/IfacePaths/RelativePathInGenex.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/RelativePathInInterface-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/RelativePathInInterface-stderr.txt => IfacePaths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt} (100%)
 create mode 100644 Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_SOURCES.txt
 create mode 100644 Tests/RunCMake/IfacePaths/RelativePathInInterface.cmake
 copy Tests/RunCMake/{include_directories => IfacePaths}/RunCMakeTest.cmake (86%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/SourceDirectoryInInterface-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/SourceDirectoryInInterface-stderr.txt => IfacePaths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt} (78%)
 create mode 100644 Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_SOURCES.txt
 create mode 100644 Tests/RunCMake/IfacePaths/SourceDirectoryInInterface.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/SrcInInstallPrefix-CMP0052-NEW-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt => IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} (69%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/SrcInInstallPrefix-CMP0052-OLD-result.txt (100%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/SrcInInstallPrefix-CMP0052-WARN-result.txt (100%)
 rename Tests/RunCMake/{include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt => IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} (72%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/SrcInInstallPrefix-result.txt} (100%)
 create mode 100644 Tests/RunCMake/IfacePaths/SrcInInstallPrefix-stderr_SOURCES.txt
 copy Tests/RunCMake/{CMP0004 => IfacePaths}/empty.cpp (100%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/export-NOWARN-result.txt (100%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/export-NOWARN.cmake (71%)
 delete mode 100644 Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt
 delete mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt
 delete mode 100644 Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt
 delete mode 100644 Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
 delete mode 100644 Tests/RunCMake/TargetSources/ExportInstall-result.txt
 delete mode 100644 Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
 delete mode 100644 Tests/RunCMake/TargetSources/ExportInstall.cmake
 delete mode 100644 Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/BinaryDirectoryInInterface-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake
 delete mode 100644 Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/DirInInstallPrefix.cmake
 delete mode 100644 Tests/RunCMake/include_directories/InstallInBinDir-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/InstallInSrcDir-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/RelativePathInGenex-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/RelativePathInGenex.cmake
 delete mode 100644 Tests/RunCMake/include_directories/RelativePathInInterface-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/RelativePathInInterface.cmake
 delete mode 100644 Tests/RunCMake/include_directories/SourceDirectoryInInterface-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake
 delete mode 100644 Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/export-NOWARN-stderr.txt
 delete mode 100644 Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt
 delete mode 100644 Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt
 delete mode 100644 Tests/RunCMake/interface_library/genex_link-stderr.txt
 delete mode 100644 Tests/RunCMake/interface_library/no_shared_libs-stderr.txt
 delete mode 100644 Tests/RunCMake/message/nomessage-stderr.txt
 delete mode 100644 Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt
 delete mode 100644 Tests/RunCMake/project/CMP0048-NEW-stderr.txt


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Feb  9 14:51:02 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon,  9 Feb 2015 14:51:02 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1136-g36c115f
Message-ID: <20150209195102.57656AAB44@public.kitware.com>

This is an automated email from 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  36c115f4b7c31775b107dfdcebb42afa531b18ed (commit)
       via  71c21ebb8d76339752061d0531e512988e925538 (commit)
      from  7afab9f4863d2ee87a1f32ee93a39d681d4a7056 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36c115f4b7c31775b107dfdcebb42afa531b18ed
commit 36c115f4b7c31775b107dfdcebb42afa531b18ed
Merge: 7afab9f 71c21eb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 14:51:01 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 9 14:51:01 2015 -0500

    Merge topic 'cmStandardIncludes-cleanup' into next
    
    71c21ebb Revert "cmStandardIncludes: Remove functional header."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=71c21ebb8d76339752061d0531e512988e925538
commit 71c21ebb8d76339752061d0531e512988e925538
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 20:50:42 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 9 20:50:42 2015 +0100

    Revert "cmStandardIncludes: Remove functional header."
    
    This reverts commit 17a2adc29de90c6ce441f7fff5cf9366286de3d6.

diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 0909719..77b4f62 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -51,6 +51,7 @@
 #include <string>
 #include <iterator>
 #include <algorithm>
+#include <functional>
 #include <map>
 #include <set>
 

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

Summary of changes:
 Source/cmStandardIncludes.h |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Feb  9 17:12:44 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon,  9 Feb 2015 17:12:44 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1138-g0f1c037
Message-ID: <20150209221244.9024049B9@public.kitware.com>

This is an automated email from 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  0f1c0377293906e3dbd6c898b36b14d92335c8c4 (commit)
       via  8c044ade09cd104706a16580ab82fa03008d74de (commit)
      from  36c115f4b7c31775b107dfdcebb42afa531b18ed (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f1c0377293906e3dbd6c898b36b14d92335c8c4
commit 0f1c0377293906e3dbd6c898b36b14d92335c8c4
Merge: 36c115f 8c044ad
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 17:12:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 9 17:12:42 2015 -0500

    Merge topic 'doc-user-interaction' into next
    
    8c044ade Help: Add a new user manual for user interaction.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c044ade09cd104706a16580ab82fa03008d74de
commit 8c044ade09cd104706a16580ab82fa03008d74de
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 23:33:27 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 9 23:11:51 2015 +0100

    Help: Add a new user manual for user interaction.
    
    This manual does not describe how to write CMake files, but how
    to invoke the CMake tools on a 1st/3rd party software distribution.

diff --git a/Help/index.rst b/Help/index.rst
index 2d3f156..cfcf164 100644
--- a/Help/index.rst
+++ b/Help/index.rst
@@ -38,6 +38,7 @@ Reference Manuals
    /manual/cmake-properties.7
    /manual/cmake-qt.7
    /manual/cmake-toolchains.7
+   /manual/cmake-user-interaction.7
    /manual/cmake-variables.7
 
 .. only:: html or text
diff --git a/Help/manual/cmake-user-interaction.7.rst b/Help/manual/cmake-user-interaction.7.rst
new file mode 100644
index 0000000..81bb4c1
--- /dev/null
+++ b/Help/manual/cmake-user-interaction.7.rst
@@ -0,0 +1,654 @@
+.. cmake-manual-description: CMake User Interaction Reference
+
+cmake-user-interaction(7)
+*************************
+
+.. only:: html
+
+   .. contents::
+
+Introduction
+============
+
+Where a software package supplies a CMake-based buildsystem with their
+software, the consumer of the software is required to run a CMake user
+interaction tool in order to build it.
+
+Well-behaved CMake-based buildsystems do not create any output in the source
+directory, so typically, the user performs an out-of-source build and
+performs the build there.  First, CMake must be instructed to generate a
+suitable buildsystem, then the user invokes a build tool to process that
+generated buildsystem.  The generated buildsystem is specific to the machine
+used to generate it and is not redistributable.  Each consumer of a provided
+software package is required to use CMake to generate a buildsystem specific
+to their system.
+
+Generated buildsystems should generally be treated as read-only. The CMake
+files as a primary artifact should completely specify the buildsystem and
+there should be no reason to populate properties in an IDE for example.
+
+The features and user interfaces described in this manual are available for
+all CMake-based build systems by virtue of providing CMake files.
+
+The CMake tooling may report errors to the user when processing provided
+CMake files, such as reporting that the compiler is not supported, or the
+compiler does not support a required compile option, or a dependency can
+not be found.  These errors must be resolved by the user by choosing a
+different compiler, installing dependencies, or instructing CMake where to
+find them, etc.
+
+Quick Start
+-----------
+
+The typical, portable way to build and install any CMake-based software on
+any supported platform is:
+
+.. code-block:: console
+
+  $ cd some_software-1.4.2
+  $ mkdir build
+  $ cd build
+  $ cmake .. -DCMAKE_INSTALL_PREFIX=/opt/the/prefix
+  $ cmake --build .
+  $ cmake --build . --target install
+
+Generating a Buildsystem
+========================
+
+There are several user interface tools which may be used to generate a
+buildsystem from CMake files.  The :manual:`ccmake(1)` and
+:manual:`cmake-gui(1)` tools guide the user through setting the various
+necessary options.  The :manual:`cmake(1)` tool can be invoked to specify
+options on the command line.  This manual describes options which may be
+set using any of the user interface tools, though the mode of setting an
+option is different for each tool.
+
+For simplicity, this manual only describes how to set options with
+the :manual:`cmake(1)` command line tool, and assumes the software package
+is free from bugs preventing typical CMake use.
+
+A simple but typical use of :manual:`cmake(1)` with a fresh copy of software
+source code is to create a build directory and invoke cmake there:
+
+.. code-block:: console
+
+  $ cd some_software-1.4.2
+  $ mkdir build
+  $ cd build
+  $ cmake ..
+
+It is recommended to build in a separate directory to the source because
+that keeps the source directory pristine, allows for building a single source
+with multiple toolchains, and allows easy clearing of build artifacts by
+simply deleting the build directory.
+
+The CMake tooling may report warnings which are intended for the provider
+of the software, not intended for the consumer of the software.  Such
+warnings usually take the form of :manual:`policy <cmake-policies(7)>`
+warnings.  Users may disable such warnings by passing the ``-Wno-dev`` flag
+to :manual:`cmake(1)`.
+
+Note that spaces in the path to the source directory or build directory can
+cause problems if the provided software is not written to carefully quote
+each path it uses.  Such issues are usually easy to fix in the provided
+CMake files.
+
+Choosing a Generator
+--------------------
+
+CMake chooses a generator by default based on the platform.  Usually, the
+default generator is sufficient to allow the user to proceed to build the
+software.
+
+The user may override the default generator with the ``-G`` option:
+
+.. code-block:: console
+
+  $ cmake .. -G Ninja
+
+The output of ``cmake --help`` includes a list of
+:manual:`generators <cmake-generators(7)>` available for the user to
+choose from.
+
+On Unix-like systems (including Apple), the :generator:`Unix Makefiles`
+generator is used by default.  A variant of that generator can also be used
+on Windows in various environments, such as the :generator:`NMake Makefiles`
+and :generator:`MinGW Makefiles` generator.  These generators generate
+a ``Makefile`` variant which can be executed with ``make``, ``gmake``,
+``nmake`` or similar tools.  See the individual generator documentation for
+more information on targetted environments and tools.
+
+The :generator:`Ninja` generator is available on all major platforms.
+``ninja`` is a build tool similar in use-cases to ``make``, but with a
+focus on performance and efficiency.
+
+On Windows, :manual:`cmake(1)` can be used to generate solutions for the
+Visual Studio IDE from version 6 to the most recent version.
+:manual:`cmake(1)` must be invoked in a command line environment suitable
+for executing the compiler which is to be generated for by running the
+``vcvarsall.bat`` script, or launching the appropriate command line
+environment.
+
+Visual Studio versions may be specified by the product name of the IDE, which
+includes a four-digit year.  Aliases are provided for other means by which
+Visual Studio versions are sometimes referred to, such as two digits which
+correspond to the product version of the VisualC++ compiler, or a
+combination of the two:
+
+.. code-block:: console
+
+  $ cmake .. -G "Visual Studio 2013"
+  $ cmake .. -G "Visual Studio 12"
+  $ cmake .. -G "Visual Studio 12 2013"
+
+If building for a 64 bit environment, ``Win64`` must be appended to the
+generator name to generate correct files for the IDE:
+
+.. code-block:: console
+
+  $ cmake .. -G "Visual Studio 2013 Win64"
+  $ cmake .. -G "Visual Studio 12 Win64"
+  $ cmake .. -G "Visual Studio 12 2013 Win64"
+
+On Apple, the :generator:`Xcode` generator may be used to generate project
+files for the Xcode IDE.  The particular version of Xcode used is determined
+by the ``xcode-select`` platform tool and the ``DEVELOPER_DIR`` environment
+variable.
+
+Note that for all Xcode and Visual Studio generators, the toolchain related
+environment variables must be consistent between generating the buildsystem
+and executing it.  Executing the build in a different toolchain environment
+than it was generated in results in undefined behavior.
+
+CMake also ships some generators which generate a ``Makefile`` or ``Ninja``
+based buildsystem, but also generate an IDE project which executes it.  This
+allows use of Eclipse with the :generator:`Eclipse CDT4` generator for
+example, which allows semantic navigation through the software source files.
+
+Some IDEs such as KDevelop4, QtCreator and CLion have native support for
+CMake-based buildsystems.  Those IDEs provide user interface for selecting
+an underlying generator to use, typcially a choice between a ``Makefile``
+or a ``Ninja`` based generator.
+
+After the first run, :manual:`cmake(1)` may be executed with a path to the
+build directory instead of the source directory.  This is most useful if
+the build directory is not a subdirectory of the source directory as above,
+but in a different location.  Invoking :manual:`cmake(1)` directly after the
+first generation is needed only when setting additional options for the
+buildsystem generation:
+
+.. code-block:: console
+
+  $ cmake . -DBUILD_EXAMPLES=TRUE
+
+Note that it is not possible to change the generator with ``-G`` after the
+first invocation of CMake.  To change the generator, the build directory
+must be deleted and the build must be started from scratch.
+
+The CMake Cache
+---------------
+
+When CMake is executed, it needs to find the locations of compilers, tools
+and dependencies.  It also needs to be able to consistently re-generate
+a buildsystem to use the same compile/link flags and paths to
+dependencies.  Such parameters are also required to be configurable by the
+user because they are paths and options specific to the users system.
+
+When it is first executed, CMake generates a cache file in the build
+directory containing key-value pairs for such artifacts.  The cache file
+can be viewed or edited by the user by running the :manual:`cmake-gui(1)`
+or :manual:`ccmake(1)` tool.  The tools provide user interface for
+re-configuring the provided software and re-generating the buildsystem, as
+is needed after editing cached values.  Each cache entry may have an
+associated short help text which is displayed in the user interface tools.
+
+The cache entries may also have a type to signify how it should be
+presented in the user interface.  For example, a cache entry of
+type ``BOOL`` can be edited by a checkbox in a user interface, a
+``STRING`` can be edited in a text field, and a ``FILEPATH`` while similar
+to a ``STRING`` should also provide a way to locate filesystem paths using
+a file dialog.  An entry of type ``STRING`` may provide a restricted list of
+allowed values which are then provided in a drop-down menu in
+the :manual:`cmake-gui(1)` user interface.
+
+On the command line, the ``-D`` option to the :manual:`cmake(1)` tool is
+used to specify cache entries, and the ``-U`` option is used to clear
+them.  Cache entries may be populated on first run, or any time after
+the first run.
+
+The CMake files shipped with a software package may also define options
+using the :command:`option` command.  The command creates a cache entry
+which can has a type, help text and a default value.  Such cache entries
+are typically specific to the provided software and affect the configuration
+of the build, such as whether tests and examples are built, whether to build
+with exceptions enabled, which major version of Qt to prefer etc.
+
+There is no convention provided by CMake for how such variables are named
+between different provided buildsystems, except that variables with the
+prefix ``CMAKE_`` usually refer to options provided by CMake itself and
+should not be used in provider-specific options, which should use their
+own prefix instead.  The :manual:`cmake-gui(1)` tool can display options
+in groups defined by their prefix, so it makes sense for providers to
+ensure that they use a self-consistent prefix.
+
+The :manual:`cmake(1)` tool allows specifying a file to use to populate
+the initial cache using the ``-C`` option.  This can be useful to simplify
+commands and scripts which repeatedly require the same cache entries.
+
+Choosing a Toolchain
+--------------------
+
+After determining the generator to use, CMake then attempts to determine the
+toolchain to use for the build.
+
+CMake generates buildsystem files for multiple languages, so it tries to
+find compilers for each language enabled by the :command:`project`
+command in the provided software.  As the ``C`` and ``CXX`` languages are
+enabled by default, most CMake-based buildsystems will look for compilers
+for those languages.
+
+CMake searches for well-known compilers in the ``PATH`` and in other
+typical locations.  Several compilers are searched for by default for
+a particular language, such as ``g++``, ``cl.exe``, ``clang++`` for the
+``CXX`` language.  When CMake is run,
+the :variable:`CMAKE_<LANG>_COMPILER` cache entry is populated with the
+compiler in use for each language.
+
+The default compiler may be overriden by specifing that cache value in one
+of the gui tools or on the command line.  This is typically specified when
+first run, along with the generator if overriding that too.  Either a full
+path to a compiler may be specified, or a basename may be specified, in
+which case CMake will search for it in the ``PATH``:
+
+.. code-block:: console
+
+  $ cmake .. -G "Ninja" \
+    -DCMAKE_C_COMPILER=/custom/built/clang \
+    -DCMAKE_CXX_COMPILER=/custom/built/clang++
+
+The initial value of the :variable:`CMAKE_<LANG>_COMPILER` for a particular
+language may also be specified by populating the environment variable
+corresponding to the language:
+
+.. code-block:: console
+
+  $ CXX=g++-4.8 cmake .. -G "Ninja"
+
+If the :variable:`CMAKE_<LANG>_COMPILER` variable for a particular language
+changed after the first invocation, CMake will re-run the compiler tests for
+the new toolchain.  Note that changing the environment variable and
+re-running CMake has no effect, so setting the
+:variable:`CMAKE_<LANG>_COMPILER` should be preferred.
+
+In the case of cross compiling provided software, it is usually required to
+specify the locations of compilers, the sysroot, custom compile flags and
+settings to affect behavior specific to cross-compiling.  Users can maintain
+a :variable:`toolchain file <CMAKE_TOOLCHAIN_FILE>` with specific paths to
+particular cross-compiling environments.  Such files are usually not
+distributable because they only contain content specific to a machine such as
+user paths in the filesystem.  For more see :ref:`Cross Compiling Toolchain`.
+
+For most generators, the compiler for each language is a primary
+customization point.  For Visual Studio however, the user does not generally
+specify the compilers to use, but may specify a particular toolset.  This
+can be used to specify a
+:ref:`cross compiling toolchain <Cross Compiling Toolchain>` or to specify
+the Windows port of the Clang toolchain for use with Visual Studio:
+
+.. code-block:: console
+
+  $ # Build with the clang-cl toolset
+  $ cmake.exe .. -G "Visual Studio 2013" -T LLVM-vs2013
+  $ # Build targetting Windows XP
+  $ cmake.exe .. -G "Visual Studio 2013" -T v120_xp
+
+The :variable:`CMAKE_GENERATOR_TOOLSET` may also be specified in
+a :variable:`toolchain file <CMAKE_TOOLCHAIN_FILE>` instead of as a
+CMake execution setting.
+
+If using Xcode build tools, the ``Makefile`` and ``Ninja`` generators
+determine the compilers to use when CMake is run.  Changing the
+``DEVELOPER_DIR`` environment variable, or using ``xcode-select``
+to select a different version of Xcode will not affect the toolchain
+used to build with those generators as the paths to the tools will be
+cached.  If using the :generator:`Xcode` generator, executing the build
+in a different toolchain environment than it was generated in results
+in undefined behavior.
+
+.. _`Choosing a Build Configuration`:
+
+Choosing a Build Configuration
+------------------------------
+
+Often software packages are intended to be built in at least two
+configurations: Debug and Release.  These configurations are defined by
+a small number of build flags, such as for generating debugging symbols,
+defining the ``NDEBUG`` macro or activating a particular optimization level.
+Some software also provides extra configurations defined in their CMake
+files such as a configuration for compiling in a mode for generating
+coverage statistics.
+
+The available configurations known to the provided buildsystem are listed
+in the :variable:`CMAKE_CONFIGURATION_TYPES` variable.
+
+The IDE generators, Visual Studio and Xcode, are multi-configuration
+generators.  The user does not specify the build configuration when
+invoking CMake to generate the project files.  The user instead generates
+project files capable of building all configurations listed in the
+:variable:`CMAKE_CONFIGURATION_TYPES` variable, and the then chooses
+a particular configuration to build afterward.  The IDEs themselves
+provide user interface for choosing the build configuration, and
+the :manual:`cmake(1)` tool
+:ref:`provides a mode <Specifying the Build Configuration>` to build a
+particular configuration on the command line.
+
+All other generators are for one particular configuration, determined by
+the :variable:`CMAKE_BUILD_TYPE` variable.  The user can set that variable
+in a gui tool or on the command line to choose a particular configuration
+to generate for:
+
+.. code-block:: console
+
+  $ cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Debug
+
+The build flags used for a particular configuration and compile language are
+specified by the ``CMAKE_<LANG>_FLAGS_<CONFIG>`` variables such
+as :variable:`CMAKE_CXX_FLAGS_DEBUG <CMAKE_<LANG>_FLAGS_DEBUG>`.
+
+Configuration names are always handled in a case-insensitive way by
+CMake.  That is, ``release``, ``RELEASE`` and ``Release`` are all acceptable
+ways of specifying the configuration.
+
+Customizing the Build
+---------------------
+
+CMake files in a software package may provide high-level cache options for
+some build customization, such as with or without multi-threading support,
+enabling compiler warnings etc.  Where high-level interfaces are not
+provided, users may specify additional flags when invoking
+:manual:`cmake(1)`.
+
+The :variable:`CMAKE_<LANG>_FLAGS` variables such as ``CMAKE_CXX_FLAGS`` can
+be populated with a strings containing flags which will be passed to the
+compiler for the appropriate language:
+
+.. code-block:: console
+
+  $ cmake .. -DCMAKE_CXX_FLAGS="-Wall -Werror"
+
+For linker flag customization, variables specific to the type of target
+being linked are used:
+
+.. code-block:: console
+
+  $ cmake .. -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined"
+
+The initial values of the compiler and linker flags are populated with the
+content of the environment variables ``CFLAGS``, ``CXXFLAGS`` and
+``LDFLAGS``.  These environment variables are considered only on the first
+invocation of :manual:`cmake(1)` and are ignored if on subsequent
+invocations, so setting the appropriate variables should be preferred.
+
+Because build configurations are defined by variables with a naming
+convention, it is often possible to define the build configuration even if
+the CMake files do not explicitly provide it:
+
+.. code-block:: console
+
+  $ cmake .. -DCMAKE_BUILD_TYPE=Coverage \
+    -DCMAKE_CXX_FLAGS_COVERAGE="-fprofile-arcs -ftest-coverage" \
+    -DCMAKE_C_FLAGS_COVERAGE="-fprofile-arcs -ftest-coverage" \
+    -DCMAKE_EXE_LINKER_FLAGS_COVERAGE="-fprofile-arcs -ftest-coverage"
+
+Note that both the generic build property variables, such
+as ``CMAKE_CXX_FLAGS``, and the config-specific build property variables,
+such as ``CMAKE_CXX_FLAGS_RELEASE``, are used when invoking the compiler.
+The config-specifc variants are additions, not replacements.
+
+Finding Dependencies
+--------------------
+
+CMake files provided with a software package contain instructions for
+finding each build dependency.  Some build dependencies are optional
+in that the build may succeed with a different feature set if the
+dependency is missing, and some dependencies are required.  CMake
+searches well-known locations for each dependency, and the provided
+software may supply additional hints or locations to CMake to find each
+dependency.
+
+If a required dependency is not found by :manual:`cmake(1)`, the cache is
+populated with an entry which contains a ``NOTFOUND`` value.  This value
+can be replaced by specifying it on the command line, or in
+the :manual:`ccmake(1)` or :manual:`cmake-gui(1)` tool.
+
+The cache entries which need to be populated depend on several factors
+relating to the dependency.  CMake-aware upstreams may
+provide :ref:`Config File Packages` which supply all required information
+about the package.  All packaged artifacts such as libraries and header
+files have their location specified in
+the :ref:`Config File Package <Config File Packages>`, so there is nothing
+more CMake is required to find.
+
+CMake searches certain well-known locations for :ref:`Config File Packages`,
+and end users can extend the locations searched by populating the
+:variable:`CMAKE_PREFIX_PATH` variable, or the environment variable
+of the same name.  For each particular package, CMake provides a cache
+entry matching the name ``<PACKAGE_NAME>_DIR``, which can be populated on
+the command line or using the :manual:`ccmake(1)` or :manual:`cmake-gui(1)`
+tool.  The :variable:`CMAKE_PREFIX_PATH` and ``<PACKAGE_NAME>_DIR`` are
+dis-similar in that the former is a prefix within which the ``Config.cmake``
+file is searched in several locations, whereas the ``<PACKAGE_NAME>_DIR``
+is a specific individual directory where the ``Config.cmake`` is expected
+to be found directly.
+
+Where dependencies are not CMake-aware, each of their artifacts may need
+to be found by specifying their path.  In some cases, this will involve
+specifying locations of multiple configurations, such as debug and
+release versions.  Some modules are written to find some artifacts
+relative to others, so for example specifying the location of ``qmake``
+is enough to define the location of the accompanying Qt4 libraries.  Some
+find scripts in use by a CMake buildsystem are
+:manual:`supplied by CMake <cmake-modules(7)>`, while others are
+maintained by the software being built.  Consult the documentation of the
+particular module for specific information.
+
+Invoking the Buildsystem
+========================
+
+After generating the buildsystem, the software can be built by invoking
+the particular build tool.  In the case of the IDE generators, this can
+involve loading the generated project file into the IDE to invoke the
+build.
+
+For all generators, it is possible to run the underlying build tool after
+invoking CMake.  For example, ``make`` may be executed after generating
+with the :generator:`Unix Makefiles` generator to invoke the build, or
+``ninja`` after generating with the :generator:`Ninja` generator etc.
+The IDE buildsystems usually provide command line tooling for building
+a project which can also be invoked.
+
+CMake is aware of the specific build tool needed to invoke a build so in
+general, to build a buildsystem or project from the command line after
+generating, the following command may be invoked in the build directory:
+
+.. code-block:: console
+
+  $ cmake --build .
+
+The ``--build`` flag enables a particular mode of operation for
+the :manual:`cmake(1)` tool.  It invokes the :variable:`CMAKE_MAKE_PROGRAM`
+command associated with the :manual:`generator <cmake-generators(7)>`, or
+the build tool configured by the user.
+
+The ``--build`` mode also accepts the parameter ``--target`` to specify a
+particular target to build, for example a particular library, executable or
+custom target, or a particular special target like ``install``.
+
+.. code-block:: console
+
+  $ cmake --build . --target myexe
+
+The ``--build`` mode can also pass particular command line options to the
+underlying build tool by listing them after ``--``.  This can be useful to
+specify options to the build tool, such as parallel jobs, where CMake does
+not provide a high-level user interface.
+
+Selecting a Target
+------------------
+
+Each executable and library described in the CMake files is a build
+target, and the provided package may describe custom targets, either for
+internal use, or for user consumption, for example to create documentation.
+
+CMake provides some built-in targets for all buildsystems providing CMake
+files.
+
+``all``
+  The default target used by ``Makefile`` and ``Ninja`` generators.  Builds
+  all targets in the buildsystem, except those which are excluded by
+  their :prop_tgt:`EXCLUDE_FROM_ALL` target property
+  or :prop_dir:`EXCLUDE_FROM_ALL` directory property.  The name ``ALL_BUILD``
+  is used for this purpose for the Xcode and Visual Studio generators.
+``help``
+  Lists the targets available for build.  This target is available when
+  using the :generator:`Unix Makefiles` or :generator:`Ninja` generator, and
+  the exact output is tool-specific.
+``clean``
+  Delete built object files and other output files.  The ``Makefile`` based
+  generators create a ``clean`` target per directory, so that an individual
+  directory can be cleaned.  The ``Ninja`` tool provides its own granular
+  ``-t clean`` system.
+``test``
+  Runs tests.  This target is only automatically available if the CMake
+  files provide CTest-based tests.  See also `Running Tests`_.
+``install``
+  Installs the software.  This target is only automatically available if
+  the software defines install rules with the :command:`install`
+  command.  See also `Software Installation`_.
+``package``
+  Creates a binary package.  This target is only automatically available
+  if the CMake files provide CPack-based packages.
+``package_source``
+  Creates a source package.  This target is only automatically available
+  if the CMake files provide CPack-based packages.
+
+For ``Makefile`` based systems, ``/fast`` variants of binary build targets
+are provided. The ``/fast`` variants are used to build the specified target
+without regard for its dependencies.  The dependencies are not checked and
+are not rebuilt if out of date.  The :generator:`Ninja` generator is
+sufficiently fast at dependency checking that such targets are not provided.
+
+``Makefile`` based systems also provide build-targets to preprocess,
+assemble and compile individual files in a particular directory.
+
+.. code-block:: console
+
+  $ make foo.cpp.i
+  $ make foo.cpp.s
+  $ make foo.cpp.o
+
+The file extension is built into the name of the target because another file
+with the same name but a different extension may exist.  However,
+build-targets without the file extension are also provided.
+
+.. code-block:: console
+
+  $ make foo.i
+  $ make foo.s
+  $ make foo.o
+
+In buildsystems which contain ``foo.c`` and ``foo.cpp``, building
+the ``foo.i`` target will preprocess both files.
+
+.. _`Specifying the Build Configuration`:
+
+Specifying a Build Configuration
+--------------------------------
+
+The mode also accepts a ``--config`` parameter in the case of multi-config
+IDE projects to specify which particular configuration to build.
+
+.. code-block:: console
+
+  $ cmake --build . --target myexe --config Release
+
+The ``--config`` option has no effect if the generator generates a
+buildsystem specific to a configuration which is
+:ref:`chosen when invoking cmake <Choosing a Build Configuration>` with
+the :variable:`CMAKE_BUILD_TYPE` variable.
+
+Specifying a Build Program
+--------------------------
+
+The program invoked by the ``--build`` mode is determined by the
+:variable:`CMAKE_MAKE_PROGRAM` variable.  For some generators, the
+particular program does not need to be configured.
+
+===================== =========================== ===========================
+      Generator           Default make program           Alternatives
+===================== =========================== ===========================
+ XCode                 ``xcodebuild``
+ Unix Makefiles        ``make``
+ NMake Makefiles       ``nmake``                   ``jom``
+ NMake Makefiles JOM   ``jom``                     ``nmake``
+ MinGW Makefiles       ``mingw32-make``
+ MSYS Makefiles        ``make``
+ Ninja                 ``ninja``
+ Visual Studio         ``msbuild``                ``devenv``
+ Watcom WMake          ``wmake``
+===================== =========================== ===========================
+
+The ``jom`` tool is capable of reading makefiles of the ``NMake`` flavor
+and building in parallel, while the ``nmake`` tool always builds
+serially.  After generating with the :generator:`NMake Makefiles` generator
+a user can run ``jom`` instead of ``nmake``.  The ``--build`` mode would
+also use ``jom`` if the :variable:`CMAKE_MAKE_PROGRAM` was set to ``jom``
+while using the :generator:`NMake Makefiles` generator, and as a
+convenience, the :generator:`NMake Makefiles JOM` generator is provided
+to find ``jom`` in the normal way and use it as
+the :variable:`CMAKE_MAKE_PROGRAM`. For completeness, ``nmake`` is an
+alternative tool which can process the output of
+the :generator:`NMake Makefiles JOM` generator, but doing so would be a
+pessimisation.
+
+The Visual Studio generators use either ``msbuild`` or ``devenv`` by
+default, depending on the version and the enabled toolsets.
+
+Software Installation
+=====================
+
+The :variable:`CMAKE_INSTALL_PREFIX` variable can be set in the CMake cache
+to specify where to install the provided software.  If the provided
+software has install rules, specified using the :command:`install` command,
+they will install artifacts into that prefix.  On Windows, the default
+installation location corresponds to the ``ProgramFiles`` system directory
+which may be architecture specific.  On Unix hosts, ``/usr/local`` is the
+default installation location.
+
+The :variable:`CMAKE_INSTALL_PREFIX` variable always refers to the
+installation prefix on the target filesystem.  The CMake RPath-related
+features ensure that this is the string written into the installed binary,
+and the buildsystem might write it into the compiled binary in some cases.
+
+In cross-compiling or packaging scenarios where the sysroot is read-only
+or where the sysroot should otherwise remain pristine,
+the :variable:`CMAKE_STAGING_PREFIX` variable can be set to a location to
+actually install the files.
+
+The commands:
+
+.. code-block:: console
+
+  $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local \
+    -DCMAKE_SYSROOT=$HOME/root \
+    -DCMAKE_STAGING_PREFIX=/tmp/package
+  $ cmake --build .
+  $ cmake --build . --target install
+
+result in files being installed to paths such
+as ``/tmp/package/lib/libfoo.so`` on the host machine, with RPath
+information on the installed binaries prefixed at ``/usr/local``.  The
+``/usr/local`` location on the host machine is not affected.
+
+Some provided software may specify ``uninstall`` rules, but CMake does not
+generate such rules by default itself.

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

Summary of changes:
 Help/index.rst                           |    1 +
 Help/manual/cmake-user-interaction.7.rst |  654 ++++++++++++++++++++++++++++++
 2 files changed, 655 insertions(+)
 create mode 100644 Help/manual/cmake-user-interaction.7.rst


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Feb  9 17:31:02 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon,  9 Feb 2015 17:31:02 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1140-gd96c269
Message-ID: <20150209223102.A9705AA7E7@public.kitware.com>

This is an automated email from 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  d96c269d8e899f9318ea4f30794b4b4b4f000a97 (commit)
       via  f0bd3e98c6aa5a899349a2740f0f19a4a29d2d16 (commit)
      from  0f1c0377293906e3dbd6c898b36b14d92335c8c4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d96c269d8e899f9318ea4f30794b4b4b4f000a97
commit d96c269d8e899f9318ea4f30794b4b4b4f000a97
Merge: 0f1c037 f0bd3e9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 17:31:02 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 9 17:31:02 2015 -0500

    Merge topic 'doc-user-interaction' into next
    
    f0bd3e98 Remove reference to invalid section.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0bd3e98c6aa5a899349a2740f0f19a4a29d2d16
commit f0bd3e98c6aa5a899349a2740f0f19a4a29d2d16
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 23:30:27 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 9 23:30:27 2015 +0100

    Remove reference to invalid section.

diff --git a/Help/manual/cmake-user-interaction.7.rst b/Help/manual/cmake-user-interaction.7.rst
index 81bb4c1..519c187 100644
--- a/Help/manual/cmake-user-interaction.7.rst
+++ b/Help/manual/cmake-user-interaction.7.rst
@@ -520,7 +520,7 @@ files.
   ``-t clean`` system.
 ``test``
   Runs tests.  This target is only automatically available if the CMake
-  files provide CTest-based tests.  See also `Running Tests`_.
+  files provide CTest-based tests.
 ``install``
   Installs the software.  This target is only automatically available if
   the software defines install rules with the :command:`install`

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

Summary of changes:
 Help/manual/cmake-user-interaction.7.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Tue Feb 10 00:01:10 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Tue, 10 Feb 2015 00:01:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1023-g7ab4fb5
Message-ID: <20150210050110.701D4AAC68@public.kitware.com>

This is an automated email from 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  7ab4fb5760a03cfcf1317351ebc75c7cfd91de96 (commit)
      from  9bbfe76d2c899fdbb54eb92716aea7282d2f3cce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ab4fb5760a03cfcf1317351ebc75c7cfd91de96
commit 7ab4fb5760a03cfcf1317351ebc75c7cfd91de96
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Tue Feb 10 00:01:07 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Feb 10 00:01:07 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 6ac9705..03df29d 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 2)
-set(CMake_VERSION_PATCH 20150209)
+set(CMake_VERSION_PATCH 20150210)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From nilsgladitz at gmail.com  Tue Feb 10 06:27:50 2015
From: nilsgladitz at gmail.com (Nils Gladitz)
Date: Tue, 10 Feb 2015 06:27:50 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1143-g6818ee6
Message-ID: <20150210112753.E8A35AA895@public.kitware.com>

This is an automated email from 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  6818ee67a5b1f81e3e5b7db36a49774d3dde8c99 (commit)
       via  007bab6b400d1da0b4afb6a3b13fbbbe7b533361 (commit)
       via  7ab4fb5760a03cfcf1317351ebc75c7cfd91de96 (commit)
      from  d96c269d8e899f9318ea4f30794b4b4b4f000a97 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6818ee67a5b1f81e3e5b7db36a49774d3dde8c99
commit 6818ee67a5b1f81e3e5b7db36a49774d3dde8c99
Merge: d96c269 007bab6
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Feb 10 06:27:48 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 06:27:48 2015 -0500

    Merge topic 'makefile-missing-comment' into next
    
    007bab6b Makefile: Fix target bound custom command COMMENT output.
    7ab4fb57 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=007bab6b400d1da0b4afb6a3b13fbbbe7b533361
commit 007bab6b400d1da0b4afb6a3b13fbbbe7b533361
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Feb 10 12:26:56 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Feb 10 12:26:56 2015 +0100

    Makefile: Fix target bound custom command COMMENT output.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index fbf2140..dfa6cc9 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1132,7 +1132,7 @@ cmLocalUnixMakefileGenerator3
   if(echo_comment)
     {
     const char* comment = ccg.GetComment();
-    if(comment && !*comment)
+    if(comment && *comment)
       {
       this->AppendEcho(commands, comment,
                        cmLocalUnixMakefileGenerator3::EchoGenerate);

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

Summary of changes:
 Source/CMakeVersion.cmake                |    2 +-
 Source/cmLocalUnixMakefileGenerator3.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 09:27:34 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 09:27:34 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1145-g57c6574
Message-ID: <20150210142734.CAE82AA917@public.kitware.com>

This is an automated email from 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  57c6574b35a3d533e47cc8c2be131c46d2b30a99 (commit)
       via  eeb2831b5f35af1ec8a65be343e754ff1c29550d (commit)
      from  6818ee67a5b1f81e3e5b7db36a49774d3dde8c99 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57c6574b35a3d533e47cc8c2be131c46d2b30a99
commit 57c6574b35a3d533e47cc8c2be131c46d2b30a99
Merge: 6818ee6 eeb2831
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:27:33 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 09:27:33 2015 -0500

    Merge topic 'makefile-missing-comment' into next
    
    eeb2831b Makefile: Fix regression in target-bound custom command COMMENT output


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eeb2831b5f35af1ec8a65be343e754ff1c29550d
commit eeb2831b5f35af1ec8a65be343e754ff1c29550d
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Feb 10 12:26:56 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 09:22:05 2015 -0500

    Makefile: Fix regression in target-bound custom command COMMENT output
    
    Fix a logic typo introduced by commit v3.1.0-rc1~781^2 (Generalize
    cmCustomCommandGenerator to more fields, 2014-03-10).

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 23513fa..280d4ab 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1076,7 +1076,7 @@ cmLocalUnixMakefileGenerator3
   if(echo_comment)
     {
     const char* comment = ccg.GetComment();
-    if(comment && !*comment)
+    if(comment && *comment)
       {
       this->AppendEcho(commands, comment,
                        cmLocalUnixMakefileGenerator3::EchoGenerate);

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 09:37:45 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 09:37:45 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1026-gf2ae132
Message-ID: <20150210143745.E23FCAADE2@public.kitware.com>

This is an automated email from 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  f2ae132d96e36b856f91da499800d58efc37ccf5 (commit)
       via  39e0aa5390964953e1462f0efed0058c172a0a26 (commit)
       via  892b854f57f48381751b79bfc52048ea57bb0376 (commit)
      from  7ab4fb5760a03cfcf1317351ebc75c7cfd91de96 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2ae132d96e36b856f91da499800d58efc37ccf5
commit f2ae132d96e36b856f91da499800d58efc37ccf5
Merge: 7ab4fb5 39e0aa5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:37:44 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 09:37:44 2015 -0500

    Merge topic 'FindBoost-per-config-libraries'
    
    39e0aa53 Help: Add notes for topic 'FindBoost-per-config-libraries'
    892b854f FindBoost: Search for debug and release libraries separately (#15364)


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

Summary of changes:
 .../release/dev/FindBoost-per-config-libraries.rst |    5 +
 Modules/FindBoost.cmake                            |  156 ++++++++++++++------
 2 files changed, 112 insertions(+), 49 deletions(-)
 create mode 100644 Help/release/dev/FindBoost-per-config-libraries.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 09:37:47 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 09:37:47 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1030-g06e527b
Message-ID: <20150210143747.AFEE0AA930@public.kitware.com>

This is an automated email from 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  06e527b36ccb86078e0caad2cd2962057b0c0558 (commit)
       via  d2fe4c420370727c644432549b7a5ca9dfef3a28 (commit)
       via  de63ff489d25095e41deae724f499ea3df05b6cf (commit)
       via  9924486f8a979bf937c8fd7749aaf37c1bd762e1 (commit)
      from  f2ae132d96e36b856f91da499800d58efc37ccf5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06e527b36ccb86078e0caad2cd2962057b0c0558
commit 06e527b36ccb86078e0caad2cd2962057b0c0558
Merge: f2ae132 d2fe4c4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:37:46 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 09:37:46 2015 -0500

    Merge topic 'xcode-flags-per-language'
    
    d2fe4c42 cmGlobalXCodeGenerator: Rename variable 'lang' => 'llang'
    de63ff48 Xcode: Generate Intel Fortran compiler flags in project files
    9924486f Xcode: Refactor generation of per-language compiler flags


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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |  155 +++++++++++++++++++------------------
 1 file changed, 79 insertions(+), 76 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 09:37:49 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 09:37:49 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1034-g80c0800
Message-ID: <20150210143750.005F9AADEA@public.kitware.com>

This is an automated email from 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  80c080052a123b71b69bf42fa99e01df621502bb (commit)
       via  1814cf744ce69ab97ce4a8fe8183b4d4f7f75cf4 (commit)
       via  54e900abfbbddde560a853355b448e1b86681741 (commit)
       via  393a45e2e1fa2f0d9657d4a686257d828cd918e4 (commit)
      from  06e527b36ccb86078e0caad2cd2962057b0c0558 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80c080052a123b71b69bf42fa99e01df621502bb
commit 80c080052a123b71b69bf42fa99e01df621502bb
Merge: 06e527b 1814cf7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:37:48 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 09:37:48 2015 -0500

    Merge topic 'add-CheckFortranCompilerFlag'
    
    1814cf74 Help: Add notes for topic 'add-CheckFortranCompilerFlag'
    54e900ab CheckFortranCompilerFlag: Add test case
    393a45e2 CheckFortranCompilerFlag: Add module to check Fortran flag existence


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

Summary of changes:
 Help/manual/cmake-modules.7.rst                    |    1 +
 Help/module/CheckFortranCompilerFlag.rst           |    1 +
 Help/release/dev/add-CheckFortranCompilerFlag.rst  |    6 ++
 Modules/CMakeCheckCompilerFlagCommonPatterns.cmake |    5 +-
 Modules/CheckFortranCompilerFlag.cmake             |   66 ++++++++++++++++++++
 Tests/FortranOnly/CMakeLists.txt                   |    7 +++
 6 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 Help/module/CheckFortranCompilerFlag.rst
 create mode 100644 Help/release/dev/add-CheckFortranCompilerFlag.rst
 create mode 100644 Modules/CheckFortranCompilerFlag.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 09:37:52 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 09:37:52 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1038-gdb9a2e8
Message-ID: <20150210143752.5EED0AADEB@public.kitware.com>

This is an automated email from 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  db9a2e8966256d50efcd593a20ed8a2b8b9cc05e (commit)
       via  0f870234febd9dba0df78e903b412ea19d681062 (commit)
       via  cd408d93fdf347ff63a8062f75f1f4ee3e898b17 (commit)
       via  87be2e1427ba2b1b7697c9332487862917897dca (commit)
      from  80c080052a123b71b69bf42fa99e01df621502bb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db9a2e8966256d50efcd593a20ed8a2b8b9cc05e
commit db9a2e8966256d50efcd593a20ed8a2b8b9cc05e
Merge: 80c0800 0f87023
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:37:50 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 09:37:50 2015 -0500

    Merge topic 'no-global-setlocale'
    
    0f870234 Merge branch 'backport-no-global-setlocale' into no-global-setlocale
    cd408d93 Add setlocale() calls around use of libarchive APIs (#14934, #15377)
    87be2e14 Do not call setlocale() globally in CMake applications (#15377)


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

Summary of changes:
 Source/CMakeLists.txt                          |    1 +
 Source/CPack/cpack.cxx                         |    2 --
 Source/CursesDialog/ccmake.cxx                 |    3 ---
 Source/cmArchiveWrite.cxx                      |    4 ++++
 Source/{cmCurl.h => cmLocale.h}                |   22 ++++++++++++++++------
 Source/cmSystemTools.cxx                       |    3 +++
 Source/cmakemain.cxx                           |    2 --
 Source/ctest.cxx                               |    3 ---
 Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in |    2 --
 9 files changed, 24 insertions(+), 18 deletions(-)
 copy Source/{cmCurl.h => cmLocale.h} (67%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 09:37:54 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 09:37:54 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1040-g1d6f4b6
Message-ID: <20150210143754.28070AADEC@public.kitware.com>

This is an automated email from 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  1d6f4b6fcc04620fd5f8e090381e8330dc2a4b23 (commit)
       via  220c427e84215b28ea1dd6de74e9dc6e81f7962e (commit)
      from  db9a2e8966256d50efcd593a20ed8a2b8b9cc05e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1d6f4b6fcc04620fd5f8e090381e8330dc2a4b23
commit 1d6f4b6fcc04620fd5f8e090381e8330dc2a4b23
Merge: db9a2e8 220c427
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:37:53 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 09:37:53 2015 -0500

    Merge topic 'try_compile-quote-module-path'
    
    220c427e try_compile: Quote the content of CMAKE_MODULE_PATH to allow for spaces


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 09:37:56 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 09:37:56 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1047-gc548ddc
Message-ID: <20150210143756.7CDA4AADE3@public.kitware.com>

This is an automated email from 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  c548ddc1724c9c96bab04d2f51d1740360bcb737 (commit)
       via  63668954e002aa41ff0287aae22caeeacdc0c356 (commit)
       via  ae775fe8041183030c69db1714c898b6e74f1284 (commit)
       via  7bb50e4a31ad5a8a58fe60885014d431a887b27f (commit)
       via  c6ada8275b680e02f50a7aee1c02b0b184cadf83 (commit)
       via  8521fdf56e4908676c28c6bbdda3f1fb2284d3d7 (commit)
       via  69ac6d27555cd4819d0c7f40e4471c6f885e23ab (commit)
      from  1d6f4b6fcc04620fd5f8e090381e8330dc2a4b23 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c548ddc1724c9c96bab04d2f51d1740360bcb737
commit c548ddc1724c9c96bab04d2f51d1740360bcb737
Merge: 1d6f4b6 6366895
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:37:55 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 09:37:55 2015 -0500

    Merge topic 'makefile-progress-improvements'
    
    63668954 Help: Add notes for topic 'makefile-progress-improvements'
    ae775fe8 Makefile: Change link step message color to bold green
    7bb50e4a Makefile: Add progress to link step messages
    c6ada827 Makefile: Print all color escape sequences before newline
    8521fdf5 Makefile: Fix output during parallel builds (#12991)
    69ac6d27 bootstrap: Enable color Makefile output

diff --cc Source/cmSystemTools.cxx
index 6a7467f,f50d16c..d6f8d6b
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@@ -26,9 -26,7 +26,8 @@@
  #include <cmsys/Encoding.hxx>
  #if defined(CMAKE_BUILD_WITH_CMAKE)
  # include "cmArchiveWrite.h"
 +# include "cmLocale.h"
  # include <cm_libarchive.h>
- # include <cmsys/Terminal.h>
  #endif
  #include <cmsys/stl/algorithm>
  #include <cmsys/FStream.hxx>

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

Summary of changes:
 .../release/dev/makefile-progress-improvements.rst |    7 ++
 Source/cmGlobalUnixMakefileGenerator3.cxx          |   43 +++----
 Source/cmLocalUnixMakefileGenerator3.cxx           |   35 +++---
 Source/cmLocalUnixMakefileGenerator3.h             |    5 +-
 Source/cmMakefileExecutableTargetGenerator.cxx     |    6 +-
 Source/cmMakefileLibraryTargetGenerator.cxx        |    6 +-
 Source/cmMakefileTargetGenerator.cxx               |   36 +++---
 Source/cmMakefileTargetGenerator.h                 |    2 +-
 Source/cmSystemTools.cxx                           |   16 ++-
 Source/cmSystemTools.h                             |    2 -
 Source/cmcmd.cxx                                   |  128 ++++++++++++--------
 bootstrap                                          |    9 +-
 12 files changed, 170 insertions(+), 125 deletions(-)
 create mode 100644 Help/release/dev/makefile-progress-improvements.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 09:37:58 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 09:37:58 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1066-ge2619c1
Message-ID: <20150210143758.65427AAE5C@public.kitware.com>

This is an automated email from 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  e2619c13f727504b7368e0bf156c17112ee81568 (commit)
       via  d8639733a42149ca1402dcae427f2142ab0cf037 (commit)
       via  803317aab622e4f12e7d342be5bbb4f16b088efd (commit)
       via  11093a03e064e1b7ef2d5db28845b5da7b934806 (commit)
       via  6cd2ee9524e501a4ef9dc481b469b91f8f022dc9 (commit)
       via  94e993a0c170cf84da9ddb026dfec9d8d99304e0 (commit)
       via  69dbe51b08bd6b4564d031d78034633f55ed4593 (commit)
       via  683fafea088c26658283da3bdf05277aaa1a3cee (commit)
       via  63f584b618b3381ad93c901f691191acd48329a7 (commit)
       via  74c4d9d27aece9a619eaab330ad23cf4b0de2b19 (commit)
       via  71d47115d009983665d6db4b25ea0ef40464f365 (commit)
       via  39622c995c189b4e22dfdc0e9aa29c8fce5eac17 (commit)
       via  a7fcc148bdfa5e9f2c6901b0de8192f5aa043741 (commit)
       via  d46c4f0727acb35963dfda579cd5c9efd63aab01 (commit)
       via  d59913f001b6eb74f9baf8bad183dc83d5e7bcd1 (commit)
       via  3f3db74413fc6b0afe4aa484c0ada2d5271ef0ba (commit)
       via  bd990c803b40e1532cab6b29c75414ca6f30e782 (commit)
       via  5fc53f1edb2d003595ef224b31a805c3af0dc0e6 (commit)
       via  421eadb45b48d40aa7d0b5e42a48df4ba94b9fc0 (commit)
      from  c548ddc1724c9c96bab04d2f51d1740360bcb737 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2619c13f727504b7368e0bf156c17112ee81568
commit e2619c13f727504b7368e0bf156c17112ee81568
Merge: c548ddc d863973
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:37:57 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 09:37:57 2015 -0500

    Merge topic 'use-algorithms'
    
    d8639733 cmSystemTools: Remove unnecessary comparison.
    803317aa cmSystemTools: Early return if size makes later comparison false.
    11093a03 Replace temporary bool by inlining warning condition.
    6cd2ee95 Replace loop with member algorithm.
    94e993a0 cmComputeLinkDepends: Remove temporary iterator copy.
    69dbe51b Replace loop with algorithm.
    683fafea Replace a loop with std::transform.
    63f584b6 Replace while loop with member insert.
    74c4d9d2 Take a size check outside of an inner loop.
    71d47115 Use insert member instead of back_inserter.
    39622c99 Convert while loop to member insert.
    a7fcc148 Convert loop to algorithm.
    d46c4f07 Extract a prefix variable from loop.
    d59913f0 Take computation out of loop.
    3f3db744 cmMakefile: Remove ExpandSourceListArguments.
    bd990c80 Remove use of ExpandSourceListArguments.
    ...


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

Summary of changes:
 Source/CPack/OSXScriptLauncher.cxx       |    8 ++++----
 Source/CPack/cmCPackNSISGenerator.cxx    |    2 +-
 Source/CTest/cmCTestCoverageHandler.cxx  |    4 ++--
 Source/QtDialog/CMakeSetup.cxx           |    6 +++---
 Source/cmAddLibraryCommand.cxx           |    6 +-----
 Source/cmCPluginAPI.cxx                  |    7 +++----
 Source/cmComputeLinkDepends.cxx          |    7 +++----
 Source/cmFLTKWrapUICommand.cxx           |    7 ++-----
 Source/cmFileCommand.cxx                 |    4 ++--
 Source/cmFindLibraryCommand.cxx          |    4 ++--
 Source/cmInstallFilesCommand.cxx         |    7 ++-----
 Source/cmLocalGenerator.cxx              |   33 +++++++++++-------------------
 Source/cmLocalUnixMakefileGenerator3.cxx |   14 +++++--------
 Source/cmMakefile.cxx                    |   13 ------------
 Source/cmMakefile.h                      |   11 ----------
 Source/cmQTWrapCPPCommand.cxx            |   10 +++------
 Source/cmQTWrapUICommand.cxx             |   10 +++------
 Source/cmSetTargetPropertiesCommand.cxx  |   15 ++++----------
 Source/cmSetTestsPropertiesCommand.cxx   |   15 ++++----------
 Source/cmSystemTools.cxx                 |    8 ++++++--
 Source/cmTarget.cxx                      |   13 ++++--------
 Source/cmXMLSafe.cxx                     |    4 ++--
 Source/cmXMLSafe.h                       |    4 ++--
 Source/cmake.cxx                         |    9 ++++----
 24 files changed, 74 insertions(+), 147 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 09:38:22 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 09:38:22 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1153-g2681102
Message-ID: <20150210143822.4CFD5AADF4@public.kitware.com>

This is an automated email from 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  2681102e08a5a1f3615ee0c7717e7569ee460e25 (commit)
       via  e2619c13f727504b7368e0bf156c17112ee81568 (commit)
       via  c548ddc1724c9c96bab04d2f51d1740360bcb737 (commit)
       via  1d6f4b6fcc04620fd5f8e090381e8330dc2a4b23 (commit)
       via  db9a2e8966256d50efcd593a20ed8a2b8b9cc05e (commit)
       via  80c080052a123b71b69bf42fa99e01df621502bb (commit)
       via  06e527b36ccb86078e0caad2cd2962057b0c0558 (commit)
       via  f2ae132d96e36b856f91da499800d58efc37ccf5 (commit)
      from  57c6574b35a3d533e47cc8c2be131c46d2b30a99 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2681102e08a5a1f3615ee0c7717e7569ee460e25
commit 2681102e08a5a1f3615ee0c7717e7569ee460e25
Merge: 57c6574 e2619c1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:38:13 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 09:38:13 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 09:42:19 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 09:42:19 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1155-g4267f43
Message-ID: <20150210144219.46446499E@public.kitware.com>

This is an automated email from 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  4267f43d15cd42040773c620781ab8f7926f343b (commit)
       via  3d99355b11b2509f4e16ddfd71373538410364e7 (commit)
      from  2681102e08a5a1f3615ee0c7717e7569ee460e25 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4267f43d15cd42040773c620781ab8f7926f343b
commit 4267f43d15cd42040773c620781ab8f7926f343b
Merge: 2681102 3d99355
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:42:18 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 09:42:18 2015 -0500

    Merge topic 'cpack_rpm_mulit_prefix_fixup' into next
    
    3d99355b CPackRPM: Fix recognition of absolute relocation paths


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d99355b11b2509f4e16ddfd71373538410364e7
commit 3d99355b11b2509f4e16ddfd71373538410364e7
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun Feb 8 20:03:53 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 09:41:37 2015 -0500

    CPackRPM: Fix recognition of absolute relocation paths
    
    Fix typo in logic added by commit 3ec02547 (CPackRPM: Allow multiple
    path relocation prefixes for one package, 2015-01-21).

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 43e3fe0..214d655 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -442,7 +442,7 @@ function(cpack_rpm_prepare_relocation_paths)
 
   # set other path prefixes
   foreach(RELOCATION_PATH ${RPM_RELOCATION_PATHS})
-    if(IS_ABSOLUTE "${RELOCATE_PATH}")
+    if(IS_ABSOLUTE "${RELOCATION_PATH}")
       set(PREPARED_RELOCATION_PATH "${RELOCATION_PATH}")
     else()
       set(PREPARED_RELOCATION_PATH "${PATH_PREFIX}/${RELOCATION_PATH}")

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 09:42:22 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 09:42:22 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1068-geb8acf8
Message-ID: <20150210144222.678B349CC@public.kitware.com>

This is an automated email from 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  eb8acf85d0e49c8b5f5e291cab043028dd979fac (commit)
       via  3d99355b11b2509f4e16ddfd71373538410364e7 (commit)
      from  e2619c13f727504b7368e0bf156c17112ee81568 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb8acf85d0e49c8b5f5e291cab043028dd979fac
commit eb8acf85d0e49c8b5f5e291cab043028dd979fac
Merge: e2619c1 3d99355
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:42:21 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 09:42:21 2015 -0500

    Merge topic 'cpack_rpm_mulit_prefix_fixup'
    
    3d99355b CPackRPM: Fix recognition of absolute relocation paths


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

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 Feb 10 09:43:01 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 09:43:01 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1157-gc2edefc
Message-ID: <20150210144301.A94F749D5@public.kitware.com>

This is an automated email from 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  c2edefc15ec1f2c13c64ac0b999caf1fd23f029f (commit)
       via  eb8acf85d0e49c8b5f5e291cab043028dd979fac (commit)
      from  4267f43d15cd42040773c620781ab8f7926f343b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2edefc15ec1f2c13c64ac0b999caf1fd23f029f
commit c2edefc15ec1f2c13c64ac0b999caf1fd23f029f
Merge: 4267f43 eb8acf8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:42:50 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 09:42:50 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 09:48:39 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 09:48:39 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1073-gd46e1e3
Message-ID: <20150210144839.8403DAA1CB@public.kitware.com>

This is an automated email from 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  d46e1e3f0fa386638b5a50b45783f4ec4d94bf2c (commit)
       via  0b8d9581c0a651f36fc5a2d0b996fd006152ce50 (commit)
       via  52340b904d2eed7f5f337c255486017626b01593 (commit)
       via  8772420e2ff1da38903162ce8e9335edbe1c3dcd (commit)
       via  e1ce81a2cb66c70d806adf755d9ee273687ca962 (commit)
      from  eb8acf85d0e49c8b5f5e291cab043028dd979fac (commit)

Those revisions listed 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  Tue Feb 10 09:48:39 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 09:48:39 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1163-gf69ce95
Message-ID: <20150210144839.A1B3EAA1CE@public.kitware.com>

This is an automated email from 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  f69ce957afe5631e73f2130c725474e651813623 (commit)
       via  d46e1e3f0fa386638b5a50b45783f4ec4d94bf2c (commit)
       via  0b8d9581c0a651f36fc5a2d0b996fd006152ce50 (commit)
       via  52340b904d2eed7f5f337c255486017626b01593 (commit)
       via  8772420e2ff1da38903162ce8e9335edbe1c3dcd (commit)
       via  e1ce81a2cb66c70d806adf755d9ee273687ca962 (commit)
      from  c2edefc15ec1f2c13c64ac0b999caf1fd23f029f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f69ce957afe5631e73f2130c725474e651813623
commit f69ce957afe5631e73f2130c725474e651813623
Merge: c2edefc d46e1e3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:48:23 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 09:48:23 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 09:48:39 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 09:48:39 -0500 (EST)
Subject: [Cmake-commits] CMake branch, release, updated. v3.1.2-1022-g0b8d958
Message-ID: <20150210144839.DF3CBAA1E5@public.kitware.com>

This is an automated email from 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  0b8d9581c0a651f36fc5a2d0b996fd006152ce50 (commit)
       via  3d99355b11b2509f4e16ddfd71373538410364e7 (commit)
       via  8772420e2ff1da38903162ce8e9335edbe1c3dcd (commit)
       via  0f870234febd9dba0df78e903b412ea19d681062 (commit)
       via  cd408d93fdf347ff63a8062f75f1f4ee3e898b17 (commit)
       via  87be2e1427ba2b1b7697c9332487862917897dca (commit)
      from  cb01f1517051b577d571e8fd21d210ef303f56c9 (commit)

Those revisions listed 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/CPackRPM.cmake                         |    2 +-
 Source/CMakeLists.txt                          |    1 +
 Source/CPack/cpack.cxx                         |    2 --
 Source/CursesDialog/ccmake.cxx                 |    3 ---
 Source/cmArchiveWrite.cxx                      |    4 ++++
 Source/{cmCurl.h => cmLocale.h}                |   22 ++++++++++++++++------
 Source/cmSystemTools.cxx                       |    3 +++
 Source/cmakemain.cxx                           |    2 --
 Source/ctest.cxx                               |    3 ---
 Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in |    2 --
 10 files changed, 25 insertions(+), 19 deletions(-)
 copy Source/{cmCurl.h => cmLocale.h} (67%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 09:56:13 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 09:56:13 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1165-g5b19ac5
Message-ID: <20150210145613.52E4BAAC7A@public.kitware.com>

This is an automated email from 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  5b19ac52bb4db11dd932c2f522cdda25a19a2ba3 (commit)
       via  e5ef9271a1bb1a0779132beba4cf2b0bae13d6cc (commit)
      from  f69ce957afe5631e73f2130c725474e651813623 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b19ac52bb4db11dd932c2f522cdda25a19a2ba3
commit 5b19ac52bb4db11dd932c2f522cdda25a19a2ba3
Merge: f69ce95 e5ef927
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:56:12 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 09:56:12 2015 -0500

    Merge topic 'FindRuby-windows-x64' into next
    
    e5ef9271 FindRuby: Fix finding 64-bit Ruby on Windows


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5ef9271a1bb1a0779132beba4cf2b0bae13d6cc
commit e5ef9271a1bb1a0779132beba4cf2b0bae13d6cc
Author:     Michael Smith <michael.smith at puppetlabs.com>
AuthorDate: Fri Feb 6 12:21:51 2015 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 09:54:21 2015 -0500

    FindRuby: Fix finding 64-bit Ruby on Windows
    
    Ruby 2.0.0 and 2.1.5 have 64-bit binaries for Windows, with "x64-"
    prefix.

diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index 4be16c9..e5ea210 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -234,11 +234,16 @@ if(WIN32)
      set( _RUBY_MSVC_RUNTIME "90" )
    endif()
 
+   set(_RUBY_ARCH_PREFIX "")
+   if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+     set(_RUBY_ARCH_PREFIX "x64-")
+   endif()
+
    list(APPEND _RUBY_POSSIBLE_LIB_NAMES
-               "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}"
-               "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}-static"
-               "msvcrt-ruby${_RUBY_NODOT_VERSION}"
-               "msvcrt-ruby${_RUBY_NODOT_VERSION}-static" )
+               "${_RUBY_ARCH_PREFIX}msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}"
+               "${_RUBY_ARCH_PREFIX}msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}-static"
+               "${_RUBY_ARCH_PREFIX}msvcrt-ruby${_RUBY_NODOT_VERSION}"
+               "${_RUBY_ARCH_PREFIX}msvcrt-ruby${_RUBY_NODOT_VERSION}-static" )
 endif()
 
 find_library(RUBY_LIBRARY NAMES ${_RUBY_POSSIBLE_LIB_NAMES} HINTS ${RUBY_POSSIBLE_LIB_DIR} )

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 10:07:28 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 10:07:28 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1167-g0f422f3
Message-ID: <20150210150728.D7673AAF24@public.kitware.com>

This is an automated email from 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  0f422f38cb7532af36b6d0a080dcf5ef4ff77748 (commit)
       via  85fd62ee91b7a8dcb929eee36424886bd0b59592 (commit)
      from  5b19ac52bb4db11dd932c2f522cdda25a19a2ba3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f422f38cb7532af36b6d0a080dcf5ef4ff77748
commit 0f422f38cb7532af36b6d0a080dcf5ef4ff77748
Merge: 5b19ac5 85fd62e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 10:07:28 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 10:07:28 2015 -0500

    Merge topic 'bootstrap-sphinx-qthelp' into next
    
    85fd62ee bootstrap: Add --sphinx-qthelp option to enable qthelp doc generation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85fd62ee91b7a8dcb929eee36424886bd0b59592
commit 85fd62ee91b7a8dcb929eee36424886bd0b59592
Author:     Nuno Sucena Almeida <nuno at aeminium.org>
AuthorDate: Sat Feb 7 17:23:28 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 10:03:10 2015 -0500

    bootstrap: Add --sphinx-qthelp option to enable qthelp doc generation

diff --git a/bootstrap b/bootstrap
index a88eb6a..e7d0496 100755
--- a/bootstrap
+++ b/bootstrap
@@ -72,6 +72,7 @@ cmake_bootstrap_qt_gui=""
 cmake_bootstrap_qt_qmake=""
 cmake_sphinx_man=""
 cmake_sphinx_html=""
+cmake_sphinx_qthelp=""
 cmake_sphinx_build=""
 
 # Determine whether this is a Cygwin environment.
@@ -410,6 +411,7 @@ Configuration:
 
   --sphinx-man            build man pages with Sphinx
   --sphinx-html           build html help with Sphinx
+  --sphinx-qthelp         build qch help with Sphinx
   --sphinx-build=<sb>     use <sb> as the sphinx-build executable
 
 Directory and file names:
@@ -646,6 +648,7 @@ while test $# != 0; do
   --qt-qmake=*) cmake_bootstrap_qt_qmake=`cmake_arg "$1"` ;;
   --sphinx-man) cmake_sphinx_man="1" ;;
   --sphinx-html) cmake_sphinx_html="1" ;;
+  --sphinx-qthelp) cmake_sphinx_qthelp="1" ;;
   --sphinx-build=*) cmake_sphinx_build=`cmake_arg "$1"` ;;
   --help) cmake_usage ;;
   --version) cmake_version_display ; exit 2 ;;
@@ -1661,6 +1664,11 @@ if [ "x${cmake_sphinx_html}" != "x" ]; then
 set (SPHINX_HTML "'"${cmake_sphinx_html}"'" CACHE FILEPATH "Build html help with Sphinx" FORCE)
 ' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
 fi
+if [ "x${cmake_sphinx_qthelp}" != "x" ]; then
+  echo '
+set (SPHINX_QTHELP "'"${cmake_sphinx_qthelp}"'" CACHE FILEPATH "Build qch help with Sphinx" FORCE)
+' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
+fi
 if [ "x${cmake_sphinx_build}" != "x" ]; then
   echo '
 set (SPHINX_EXECUTABLE "'"${cmake_sphinx_build}"'" CACHE FILEPATH "Location of Qt sphinx-build" FORCE)

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

Summary of changes:
 bootstrap |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 10:09:48 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 10:09:48 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1077-g2fd44b0
Message-ID: <20150210150948.7930F25E8@public.kitware.com>

This is an automated email from 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  2fd44b082b0a8e546c73d921f9d8264a668c3b78 (commit)
       via  c0d8e715915f65196353c09d86d4d34fe100437f (commit)
       via  68d29f519047aeef92a0ab8fef531010c311efaa (commit)
       via  1c3918ff0278715e2a4ec5929f75f7812003ee97 (commit)
      from  d46e1e3f0fa386638b5a50b45783f4ec4d94bf2c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2fd44b082b0a8e546c73d921f9d8264a668c3b78
commit 2fd44b082b0a8e546c73d921f9d8264a668c3b78
Merge: d46e1e3 c0d8e71
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 10:09:47 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 10:09:47 2015 -0500

    Merge topic 'test-RunCMake-updates'
    
    c0d8e715 RunCMake: Allow specifying the stderr file for a test.
    68d29f51 RunCMake: Allow specifying the directory to run tests in.
    1c3918ff RunCMake: Remove unneeded files.


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

Summary of changes:
 Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt  |    1 -
 .../RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt |    1 -
 .../CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt      |    1 -
 .../CMP0022-NOWARN-static-link_libraries-stderr.txt   |    1 -
 .../RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt |    1 -
 Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt  |    1 -
 .../CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt    |    1 -
 Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt    |    1 -
 .../CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt    |    1 -
 Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt   |    1 -
 Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt         |    1 -
 .../RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt  |    1 -
 Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt   |    1 -
 Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt         |    1 -
 Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt         |    1 -
 .../CMP0040/CMP0040-NEW-existing-target-stderr.txt    |    1 -
 .../CMP0040/CMP0040-OLD-existing-target-stderr.txt    |    1 -
 .../CMP0040/CMP0040-OLD-missing-target-stderr.txt     |    1 -
 Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt         |    1 -
 Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt     |    1 -
 Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt         |    1 -
 Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt         |    1 -
 Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt         |    1 -
 Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt         |    1 -
 Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt         |    1 -
 .../CMP0046-NEW-existing-dependency-stderr.txt        |    1 -
 .../CMP0046-OLD-existing-dependency-stderr.txt        |    1 -
 .../CMP0046/CMP0046-OLD-missing-dependency-stderr.txt |    1 -
 Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt         |    1 -
 Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt         |    1 -
 .../CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt       |    1 -
 .../CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt   |    1 -
 Tests/RunCMake/CMakeLists.txt                         |   17 ++++++++++++++---
 .../LinkImplementationFeatureCycleSolved-stderr.txt   |    1 -
 .../DisallowedCommands/CMP0029-OLD-stderr.txt         |    1 -
 .../File_Generate/CarryPermissions-stderr.txt         |    1 -
 .../RunCMake/File_Generate/GenerateSource-stderr.txt  |    1 -
 .../OutputNameMatchesOtherSources-stderr.txt          |    1 -
 Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt    |    1 -
 .../File_Generate/WriteIfDifferent-stderr.txt         |    1 -
 .../ValidTarget-TARGET_PDB_FILE-stderr.txt            |    1 -
 Tests/RunCMake/RunCMake.cmake                         |    5 ++++-
 Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt        |    1 -
 .../LinkImplementationCycle3-stderr.txt               |    1 -
 .../TargetSources/CMP0026-LOCATION-stderr.txt         |    1 -
 .../BinInInstallPrefix-CMP0052-OLD-stderr.txt         |    1 -
 .../include_directories/DirInInstallPrefix-stderr.txt |    1 -
 .../InstallPrefixInInterface-stderr.txt               |    1 -
 .../InstallToPrefixInSrcDirInSource-stderr.txt        |    1 -
 .../InstallToPrefixInSrcDirOutOfSource-stderr.txt     |    1 -
 .../SrcInInstallPrefix-CMP0052-OLD-stderr.txt         |    1 -
 .../include_directories/export-NOWARN-stderr.txt      |    1 -
 .../install/SkipInstallRulesNoWarning1-stderr.txt     |    1 -
 .../install/SkipInstallRulesNoWarning2-stderr.txt     |    1 -
 .../RunCMake/interface_library/genex_link-stderr.txt  |    1 -
 .../interface_library/no_shared_libs-stderr.txt       |    1 -
 Tests/RunCMake/message/nomessage-stderr.txt           |    1 -
 .../no_install_prefix/with_install_prefix-stderr.txt  |    1 -
 Tests/RunCMake/project/CMP0048-NEW-stderr.txt         |    1 -
 59 files changed, 18 insertions(+), 61 deletions(-)
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt
 delete mode 100644 Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt
 delete mode 100644 Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt
 delete mode 100644 Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
 delete mode 100644 Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
 delete mode 100644 Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt
 delete mode 100644 Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
 delete mode 100644 Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt
 delete mode 100644 Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt
 delete mode 100644 Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt
 delete mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt
 delete mode 100644 Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt
 delete mode 100644 Tests/RunCMake/include_directories/export-NOWARN-stderr.txt
 delete mode 100644 Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt
 delete mode 100644 Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt
 delete mode 100644 Tests/RunCMake/interface_library/genex_link-stderr.txt
 delete mode 100644 Tests/RunCMake/interface_library/no_shared_libs-stderr.txt
 delete mode 100644 Tests/RunCMake/message/nomessage-stderr.txt
 delete mode 100644 Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt
 delete mode 100644 Tests/RunCMake/project/CMP0048-NEW-stderr.txt


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 10:10:10 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 10:10:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1169-g5367c0e
Message-ID: <20150210151010.8C74A49B8@public.kitware.com>

This is an automated email from 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  5367c0e4781644a33ce9163666a626e50efffa2c (commit)
       via  2fd44b082b0a8e546c73d921f9d8264a668c3b78 (commit)
      from  0f422f38cb7532af36b6d0a080dcf5ef4ff77748 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5367c0e4781644a33ce9163666a626e50efffa2c
commit 5367c0e4781644a33ce9163666a626e50efffa2c
Merge: 0f422f3 2fd44b0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 10:10:02 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 10:10:02 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 10:35:26 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 10:35:26 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1171-ga06bd9f
Message-ID: <20150210153526.99217AB0D2@public.kitware.com>

This is an automated email from 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  a06bd9fdc9c2ac5a921f6836454fc13c7523d060 (commit)
       via  f3e9eeedf43f783c02b2a2a10fc0e632eaf7cfd0 (commit)
      from  5367c0e4781644a33ce9163666a626e50efffa2c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a06bd9fdc9c2ac5a921f6836454fc13c7523d060
commit a06bd9fdc9c2ac5a921f6836454fc13c7523d060
Merge: 5367c0e f3e9eee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 10:35:25 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 10:35:25 2015 -0500

    Merge topic 'try_compile-shorter-names' into next
    
    f3e9eeed try_compile: Use shorter test executable name with consistent length


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3e9eeedf43f783c02b2a2a10fc0e632eaf7cfd0
commit f3e9eeedf43f783c02b2a2a10fc0e632eaf7cfd0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 10:21:55 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 10:28:41 2015 -0500

    try_compile: Use shorter test executable name with consistent length
    
    Since commit v2.8.8~176^2 (try_compile: Use random executable file name,
    2012-02-13) the length of the test executable name in generated
    try_compile projects has been longer and unpredictable.  With Visual
    Studio on windows, the tools try to create paths like:
    
     CMakeFiles/CMakeTmp/$tgt.dir/Debug/$tgt.tlog/$tgt.lastbuildstate
    
    With the target name repeated up to 3 times, we must make it short and
    of consistent length to avoid overrunning the 260 character limit
    imposed by VS tools.

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index c414553..d9369e6 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -383,8 +383,8 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
 
     /* Use a random file name to avoid rapid creation and deletion
        of the same executable name (some filesystems fail on that).  */
-    sprintf(targetNameBuf, "cmTryCompileExec%u",
-            cmSystemTools::RandomSeed());
+    sprintf(targetNameBuf, "cmTC_%05x",
+            cmSystemTools::RandomSeed() & 0xFFFFF);
     targetName = targetNameBuf;
 
     if (!targets.empty())

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 11:00:39 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 11:00:39 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1173-gfa1af50
Message-ID: <20150210160039.BE39AAB225@public.kitware.com>

This is an automated email from 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  fa1af50e9bbe0506da14019b82cbc86fd1333e02 (commit)
       via  a27c13f4cad2247833d048ec5e334861943fd4d9 (commit)
      from  a06bd9fdc9c2ac5a921f6836454fc13c7523d060 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa1af50e9bbe0506da14019b82cbc86fd1333e02
commit fa1af50e9bbe0506da14019b82cbc86fd1333e02
Merge: a06bd9f a27c13f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 11:00:39 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 11:00:39 2015 -0500

    Merge topic 'BundleUtilities-install_name_tool-exit' into next
    
    a27c13f4 BundleUtilities: Teach fixup_bundle to check install_name_tool result


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a27c13f4cad2247833d048ec5e334861943fd4d9
commit a27c13f4cad2247833d048ec5e334861943fd4d9
Author:     Ruslan Baratov <ruslan_baratov at yahoo.com>
AuthorDate: Mon Feb 9 20:09:41 2015 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 11:00:27 2015 -0500

    BundleUtilities: Teach fixup_bundle to check install_name_tool result
    
    Fail explicitly if install_name_tool fails to make an update we need.

diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index fee0a7c..ce90f30 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -776,7 +776,12 @@ function(fixup_bundle_item resolved_embedded_item exepath dirs)
   # to install_name_tool:
   #
   if(changes)
-    execute_process(COMMAND install_name_tool ${changes} "${resolved_embedded_item}")
+    set(cmd install_name_tool ${changes} "${resolved_embedded_item}")
+    execute_process(COMMAND ${cmd} RESULT_VARIABLE install_name_tool_result)
+    if(NOT install_name_tool_result EQUAL 0)
+      string(REPLACE ";" "' '" msg "'${cmd}'")
+      message(FATAL_ERROR "Command failed:\n ${msg}")
+    endif()
   endif()
 endfunction()
 

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

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


hooks/post-receive
-- 
CMake

From zack.galbreath at kitware.com  Tue Feb 10 11:10:03 2015
From: zack.galbreath at kitware.com (Zack Galbreath)
Date: Tue, 10 Feb 2015 11:10:03 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1175-g8926a09
Message-ID: <20150210161003.902B321F8@public.kitware.com>

This is an automated email from 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  8926a09dd37e32502f0ed82b5b84dda9ce686d82 (commit)
       via  248d74165ed6f18d130e13a19fa8a866d81fabe8 (commit)
      from  fa1af50e9bbe0506da14019b82cbc86fd1333e02 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8926a09dd37e32502f0ed82b5b84dda9ce686d82
commit 8926a09dd37e32502f0ed82b5b84dda9ce686d82
Merge: fa1af50 248d741
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 10 11:10:02 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 11:10:02 2015 -0500

    Merge topic 'fix_timeout_docs' into next
    
    248d7416 fix the name of the referenced variable.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=248d74165ed6f18d130e13a19fa8a866d81fabe8
commit 248d74165ed6f18d130e13a19fa8a866d81fabe8
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 10 11:07:26 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Tue Feb 10 11:07:26 2015 -0500

    fix the name of the referenced variable.
    
    It's CTEST_TEST_TIMEOUT, not CTEST_TESTING_TIMEOUT.
    This change also adds a link to the variable's documentation.

diff --git a/Help/prop_test/TIMEOUT.rst b/Help/prop_test/TIMEOUT.rst
index 0b247b8..d1cb90d 100644
--- a/Help/prop_test/TIMEOUT.rst
+++ b/Help/prop_test/TIMEOUT.rst
@@ -6,4 +6,4 @@ How many seconds to allow for this test.
 This property if set will limit a test to not take more than the
 specified number of seconds to run.  If it exceeds that the test
 process will be killed and ctest will move to the next test.  This
-setting takes precedence over CTEST_TESTING_TIMEOUT.
+setting takes precedence over :variable:`CTEST_TEST_TIMEOUT`.

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

Summary of changes:
 Help/prop_test/TIMEOUT.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 12:56:09 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 12:56:09 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1081-gcbffbf7
Message-ID: <20150210175609.890D6AAC91@public.kitware.com>

This is an automated email from 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  cbffbf7437ea2d571e26bedee032c23be9347d94 (commit)
       via  af65da0aa97f20947f93ddcf9872d23d671f699b (commit)
       via  e848cc5074c402fe38bb19c831f0b71dc34ece73 (commit)
       via  5fea6898346f30119b7f5272033b0713aca4c389 (commit)
      from  2fd44b082b0a8e546c73d921f9d8264a668c3b78 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbffbf7437ea2d571e26bedee032c23be9347d94
commit cbffbf7437ea2d571e26bedee032c23be9347d94
Merge: 2fd44b0 af65da0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 12:56:08 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 12:56:08 2015 -0500

    Merge topic 'cmStandardIncludes-cleanup'
    
    af65da0a cmStandardIncludes: Remove list include.
    e848cc50 cmStandardIncludes: Remove deque include.
    5fea6898 cmStandardIncludes: Remove some VS6 workarounds.


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

Summary of changes:
 Source/CPack/cmCPackGenerator.cxx           |    1 +
 Source/CTest/cmCTestBuildHandler.h          |    2 ++
 Source/CTest/cmCTestGlobalVC.h              |    2 ++
 Source/CTest/cmCTestMultiProcessHandler.cxx |    1 +
 Source/CTest/cmCTestSVN.h                   |    2 ++
 Source/cmCommands.h                         |    2 ++
 Source/cmConditionEvaluator.h               |    2 ++
 Source/cmFileLockPool.h                     |    2 ++
 Source/cmMakefile.cxx                       |    1 +
 Source/cmMakefile.h                         |    1 +
 Source/cmQtAutoGenerators.h                 |    2 ++
 Source/cmStandardIncludes.h                 |   12 ------------
 Source/cmake.cxx                            |    2 ++
 13 files changed, 20 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 12:56:29 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 12:56:29 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1177-ga027292
Message-ID: <20150210175629.5B6E5AACA4@public.kitware.com>

This is an automated email from 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  a0272926fcd2ff20b26092c789dd6ae9538fc5e5 (commit)
       via  cbffbf7437ea2d571e26bedee032c23be9347d94 (commit)
      from  8926a09dd37e32502f0ed82b5b84dda9ce686d82 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0272926fcd2ff20b26092c789dd6ae9538fc5e5
commit a0272926fcd2ff20b26092c789dd6ae9538fc5e5
Merge: 8926a09 cbffbf7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 12:56:22 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 12:56:22 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 12:59:00 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 12:59:00 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1179-g17fef0d
Message-ID: <20150210175900.C5F12AAD14@public.kitware.com>

This is an automated email from 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  17fef0dae571e0f745c3dd14facd90e68cf8c9db (commit)
       via  56cb4a6c3a71f1a3d3e0dccbdc593bc58d76c5ee (commit)
      from  a0272926fcd2ff20b26092c789dd6ae9538fc5e5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17fef0dae571e0f745c3dd14facd90e68cf8c9db
commit 17fef0dae571e0f745c3dd14facd90e68cf8c9db
Merge: a027292 56cb4a6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 12:59:00 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 12:59:00 2015 -0500

    Merge topic 'fix_timeout_docs' into next
    
    56cb4a6c Help: Fix variable reference in TIMEOUT test property docs


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56cb4a6c3a71f1a3d3e0dccbdc593bc58d76c5ee
commit 56cb4a6c3a71f1a3d3e0dccbdc593bc58d76c5ee
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 10 11:07:26 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 12:58:01 2015 -0500

    Help: Fix variable reference in TIMEOUT test property docs
    
    Link to 'CTEST_TEST_TIMEOUT', not 'CTEST_TESTING_TIMEOUT'.

diff --git a/Help/prop_test/TIMEOUT.rst b/Help/prop_test/TIMEOUT.rst
index 0b247b8..d1cb90d 100644
--- a/Help/prop_test/TIMEOUT.rst
+++ b/Help/prop_test/TIMEOUT.rst
@@ -6,4 +6,4 @@ How many seconds to allow for this test.
 This property if set will limit a test to not take more than the
 specified number of seconds to run.  If it exceeds that the test
 process will be killed and ctest will move to the next test.  This
-setting takes precedence over CTEST_TESTING_TIMEOUT.
+setting takes precedence over :variable:`CTEST_TEST_TIMEOUT`.

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 10 13:01:41 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 10 Feb 2015 13:01:41 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1181-g5e36f8e
Message-ID: <20150210180141.8B7DCAAD4A@public.kitware.com>

This is an automated email from 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  5e36f8ee1ebf4538146f9f0cb5974426eac14249 (commit)
       via  918bf7fa136b79ccd4a572214b803e94a4fa5e69 (commit)
      from  17fef0dae571e0f745c3dd14facd90e68cf8c9db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e36f8ee1ebf4538146f9f0cb5974426eac14249
commit 5e36f8ee1ebf4538146f9f0cb5974426eac14249
Merge: 17fef0d 918bf7f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 13:01:40 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 13:01:40 2015 -0500

    Merge topic 'doc-user-interaction' into next
    
    918bf7fa fixup! Help: Add a new user manual for user interaction.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=918bf7fa136b79ccd4a572214b803e94a4fa5e69
commit 918bf7fa136b79ccd4a572214b803e94a4fa5e69
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 13:01:20 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 13:01:20 2015 -0500

    fixup! Help: Add a new user manual for user interaction.

diff --git a/Help/manual/cmake-user-interaction.7.rst b/Help/manual/cmake-user-interaction.7.rst
index 519c187..85e506e 100644
--- a/Help/manual/cmake-user-interaction.7.rst
+++ b/Help/manual/cmake-user-interaction.7.rst
@@ -25,7 +25,8 @@ to their system.
 
 Generated buildsystems should generally be treated as read-only. The CMake
 files as a primary artifact should completely specify the buildsystem and
-there should be no reason to populate properties in an IDE for example.
+there should be no reason to populate properties manually in an IDE for
+example.
 
 The features and user interfaces described in this manual are available for
 all CMake-based build systems by virtue of providing CMake files.
@@ -84,9 +85,8 @@ simply deleting the build directory.
 
 The CMake tooling may report warnings which are intended for the provider
 of the software, not intended for the consumer of the software.  Such
-warnings usually take the form of :manual:`policy <cmake-policies(7)>`
-warnings.  Users may disable such warnings by passing the ``-Wno-dev`` flag
-to :manual:`cmake(1)`.
+warnings end with "This warning is for project developers".  Users may
+disable such warnings by passing the ``-Wno-dev`` flag to :manual:`cmake(1)`.
 
 Note that spaces in the path to the source directory or build directory can
 cause problems if the provided software is not written to carefully quote
@@ -110,7 +110,7 @@ The output of ``cmake --help`` includes a list of
 :manual:`generators <cmake-generators(7)>` available for the user to
 choose from.
 
-On Unix-like systems (including Apple), the :generator:`Unix Makefiles`
+On Unix-like systems (including Mac OS X), the :generator:`Unix Makefiles`
 generator is used by default.  A variant of that generator can also be used
 on Windows in various environments, such as the :generator:`NMake Makefiles`
 and :generator:`MinGW Makefiles` generator.  These generators generate

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

Summary of changes:
 Help/manual/cmake-user-interaction.7.rst |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake

From domen.vrankar at gmail.com  Tue Feb 10 17:04:54 2015
From: domen.vrankar at gmail.com (Domen Vrankar)
Date: Tue, 10 Feb 2015 17:04:54 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1183-gfd2cc9a
Message-ID: <20150210220454.8F2D7AADE0@public.kitware.com>

This is an automated email from 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  fd2cc9a1071279c0e3d41c38d670d0e669ab92bb (commit)
       via  a06feb122e5a76f43f2cdbfe6ef5ed54ad711375 (commit)
      from  5e36f8ee1ebf4538146f9f0cb5974426eac14249 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd2cc9a1071279c0e3d41c38d670d0e669ab92bb
commit fd2cc9a1071279c0e3d41c38d670d0e669ab92bb
Merge: 5e36f8e a06feb1
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Feb 10 17:04:53 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 17:04:53 2015 -0500

    Merge topic 'cpack_rpm_mulit_prefix_policy_version_fixup' into next
    
    a06feb12 fixup! cpack_rpm_mulit_prefix


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a06feb122e5a76f43f2cdbfe6ef5ed54ad711375
commit a06feb122e5a76f43f2cdbfe6ef5ed54ad711375
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Feb 10 23:03:06 2015 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Tue Feb 10 23:03:06 2015 +0100

    fixup! cpack_rpm_mulit_prefix
    
    Fix infinite loop with symbolic links when using minimum
    required cmake version with CMP0009 policy not set in
    logic added by commit 3ec02547 (CPackRPM: Allow multiple
    path relocation prefixes for one package, 2015-01-21).

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 214d655..c53caa1 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -423,6 +423,10 @@
 
 # Author: Eric Noulard with the help of Alexander Neundorf.
 
+# prevent older policies from interfearing with this script
+cmake_policy(PUSH)
+cmake_policy(VERSION ${CMAKE_VERSION})
+
 function(cpack_rpm_prepare_relocation_paths)
   # set appropriate prefix, remove possible trailing slash and convert backslashes to slashes
   if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_PREFIX)
@@ -1308,3 +1312,6 @@ if(CPACK_RPM_PACKAGE_DESCRIPTION_)
 else()
   unset(CPACK_RPM_PACKAGE_DESCRIPTION)
 endif()
+
+# restore previous policies
+cmake_policy(POP)

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

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


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Feb 10 18:50:11 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 10 Feb 2015 18:50:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1204-g03d60ba
Message-ID: <20150210235012.0CFD1AA94E@public.kitware.com>

This is an automated email from 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  03d60ba97b9790ec80a22be5b51d91492235a11f (commit)
       via  a7c8ee44932d6983dea9a55bf18857ee9aa3e75f (commit)
       via  f09d355d7dd7f1d66b7f43980523b673f12f6798 (commit)
       via  63dcb641c903d97f4e26a83e3efcf24acbb44f53 (commit)
       via  87680637654721c4827636f571f794865c2c0a55 (commit)
       via  709e3e17fbbc3fec6dc30d31c8f3a083f5e83d8e (commit)
       via  cc02a6647b5473d3c92318f134ffa6ef081564d7 (commit)
       via  780f75dc43f754e3ad10bf48328a33c1d2173463 (commit)
       via  d4cee4e382e48949920b81e7219ab48f06bfc398 (commit)
       via  1e57ca6f0f69efb3238a98434fb086c30f1a02f1 (commit)
       via  55a11552a49c59b786feb9c229ec2d4ee84a70e7 (commit)
       via  05097f44d032e65891746edf5fecc610017ef214 (commit)
       via  4d3b952d7b2d4d708d823914e49c07cd9c065880 (commit)
       via  ee1304531efb85b41d3c2f84f32c7d2901298be7 (commit)
       via  b4edadd2c32f881a06c79ab7c1385a27ddc4b971 (commit)
       via  7b92bdd86f6d180031d8bea2222f4dc971eab8d3 (commit)
       via  8da80aed2d8b2d82f0bd56804fe9366ea651d516 (commit)
       via  45795a9a2e8d51b72fb5f19a5de1db628c7dd2cb (commit)
       via  562a3ea3d4c4ba431f7c109c6fac41decba96e50 (commit)
       via  7e7d489030dbd63dfb00d407b4d61a33d55747b5 (commit)
       via  ac26d4b343aece40b6b9a931ab619fc88d4b9492 (commit)
      from  fd2cc9a1071279c0e3d41c38d670d0e669ab92bb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03d60ba97b9790ec80a22be5b51d91492235a11f
commit 03d60ba97b9790ec80a22be5b51d91492235a11f
Merge: fd2cc9a a7c8ee4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 18:50:01 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 18:50:01 2015 -0500

    Merge topic 'use-cmRange' into next
    
    a7c8ee44 Convert loop into two algorithms.
    f09d355d Convert loop to the common pattern.
    63dcb641 Move loop inside of condition.
    87680637 Handle last element outside of the loop.
    709e3e17 cmTarget: Use a sorted vector in place of a set.
    cc02a664 cmSet: Replace loop with cmJoin.
    780f75dc cmFindBase: Replace loop with cmJoin on range.
    d4cee4e3 Convert loops to cmJoin algorithm with cmRange.
    1e57ca6f cmStringCommand: Accumulate with cmJoin and range adaptors.
    55a11552 cmAlgorithms: Add a range adaptor and API for adjusting a range.
    05097f44 Use cmJoin to accumulate string ranges.
    4d3b952d cmAlgorithms: Add a Range container and adaptor method.
    ee130453 Replace common loop pattern with cmJoin
    b4edadd2 Convert loops populating maybe-empty content into the common pattern.
    7b92bdd8 Convert loops into the commonly used pattern.
    8da80aed cmMacroCommand: Remove counting variable.
    ...


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7c8ee44932d6983dea9a55bf18857ee9aa3e75f
commit a7c8ee44932d6983dea9a55bf18857ee9aa3e75f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 24 18:07:37 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:35:15 2015 +0100

    Convert loop into two algorithms.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 359141a..a08c159 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2299,16 +2299,12 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
       {
       // Now add the rest of the components separated by the proper slash
       // direction for this platform.
-      const char* sep = "";
-      for(unsigned int i=1; i < components.size() - 1; ++i)
-        {
-        if(!components[i].empty())
-          {
-          result += sep;
-          result += components[i];
-          sep = slash;
-          }
-        }
+      std::vector<std::string>::const_iterator compEnd
+          = std::remove(components.begin() + 1, components.end() - 1,
+                          std::string());
+      std::vector<std::string>::const_iterator compStart
+          = components.begin() + 1;
+      result += cmJoin(cmRange(compStart, compEnd), slash);
       // Only the last component can be empty to avoid double slashes.
       result += slash;
       result += components.back();

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f09d355d7dd7f1d66b7f43980523b673f12f6798
commit f09d355d7dd7f1d66b7f43980523b673f12f6798
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 23 01:06:40 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:35:15 2015 +0100

    Convert loop to the common pattern.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 703ab27..359141a 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2299,24 +2299,18 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
       {
       // Now add the rest of the components separated by the proper slash
       // direction for this platform.
-      bool first = true;
+      const char* sep = "";
       for(unsigned int i=1; i < components.size() - 1; ++i)
         {
         if(!components[i].empty())
           {
-          if(!first)
-            {
-            result += slash;
-            }
+          result += sep;
           result += components[i];
-          first = false;
+          sep = slash;
           }
         }
       // Only the last component can be empty to avoid double slashes.
-      if(!first)
-        {
-        result += slash;
-        }
+      result += slash;
       result += components.back();
       }
     }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63dcb641c903d97f4e26a83e3efcf24acbb44f53
commit 63dcb641c903d97f4e26a83e3efcf24acbb44f53
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 23:09:03 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:35:14 2015 +0100

    Move loop inside of condition.
    
    The loop is only executed if the condition is true.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 32da821..703ab27 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2295,23 +2295,23 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
     // Begin the quoted result with the root component.
     result += components[0];
 
-    // Now add the rest of the components separated by the proper slash
-    // direction for this platform.
-    bool first = true;
-    for(unsigned int i=1; i < components.size() - 1; ++i)
+    if (components.size() > 1)
       {
-      if(!components[i].empty())
+      // Now add the rest of the components separated by the proper slash
+      // direction for this platform.
+      bool first = true;
+      for(unsigned int i=1; i < components.size() - 1; ++i)
         {
-        if(!first)
+        if(!components[i].empty())
           {
-          result += slash;
+          if(!first)
+            {
+            result += slash;
+            }
+          result += components[i];
+          first = false;
           }
-        result += components[i];
-        first = false;
         }
-      }
-    if (components.size() > 1)
-      {
       // Only the last component can be empty to avoid double slashes.
       if(!first)
         {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87680637654721c4827636f571f794865c2c0a55
commit 87680637654721c4827636f571f794865c2c0a55
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 23 01:03:45 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:35:14 2015 +0100

    Handle last element outside of the loop.
    
    There is no point in checking on each loop iteration whether
    it is the last element.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 54d330f..32da821 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2298,10 +2298,9 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
     // Now add the rest of the components separated by the proper slash
     // direction for this platform.
     bool first = true;
-    for(unsigned int i=1; i < components.size(); ++i)
+    for(unsigned int i=1; i < components.size() - 1; ++i)
       {
-      // Only the last component can be empty to avoid double slashes.
-      if(!components[i].empty() || (i == (components.size()-1)))
+      if(!components[i].empty())
         {
         if(!first)
           {
@@ -2311,6 +2310,15 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
         first = false;
         }
       }
+    if (components.size() > 1)
+      {
+      // Only the last component can be empty to avoid double slashes.
+      if(!first)
+        {
+        result += slash;
+        }
+      result += components.back();
+      }
     }
 
   // Close the quoted result.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=709e3e17fbbc3fec6dc30d31c8f3a083f5e83d8e
commit 709e3e17fbbc3fec6dc30d31c8f3a083f5e83d8e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 22:48:02 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:35:14 2015 +0100

    cmTarget: Use a sorted vector in place of a set.
    
    The vector has a more easy-to-use API.
    
    Join the string with cmJoin, and avoid erasing from the container
    in the loop.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f0bdea7..526a923 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6687,40 +6687,33 @@ void cmTarget::CheckPropertyCompatibility(cmComputeLinkInformation *info,
 
   if (!prop.empty())
     {
-    // Use a std::set to keep the error message sorted.
-    std::set<std::string> props;
+    // Use a sorted std::vector to keep the error message sorted.
+    std::vector<std::string> props;
     std::set<std::string>::const_iterator i = emittedBools.find(prop);
     if (i != emittedBools.end())
       {
-      props.insert(strBool);
+      props.push_back(strBool);
       }
     i = emittedStrings.find(prop);
     if (i != emittedStrings.end())
       {
-      props.insert(strString);
+      props.push_back(strString);
       }
     i = emittedMinNumbers.find(prop);
     if (i != emittedMinNumbers.end())
       {
-      props.insert(strNumMin);
+      props.push_back(strNumMin);
       }
     i = emittedMaxNumbers.find(prop);
     if (i != emittedMaxNumbers.end())
       {
-      props.insert(strNumMax);
+      props.push_back(strNumMax);
       }
+    std::sort(props.begin(), props.end());
+
+    std::string propsString = cmJoin(cmRange(props).retreat(1), ", ");
+    propsString += " and the " + props.back();
 
-    std::string propsString = *props.begin();
-    props.erase(props.begin());
-    while (props.size() > 1)
-      {
-      propsString += ", " + *props.begin();
-      props.erase(props.begin());
-      }
-   if (props.size() == 1)
-     {
-     propsString += " and the " + *props.begin();
-     }
     std::ostringstream e;
     e << "Property \"" << prop << "\" appears in both the "
       << propsString <<

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc02a6647b5473d3c92318f134ffa6ef081564d7
commit cc02a6647b5473d3c92318f134ffa6ef081564d7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 23:26:58 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:35:14 2015 +0100

    cmSet: Replace loop with cmJoin.

diff --git a/Source/cmSetCommand.cxx b/Source/cmSetCommand.cxx
index 90d7b03..204d95b 100644
--- a/Source/cmSetCommand.cxx
+++ b/Source/cmSetCommand.cxx
@@ -108,17 +108,7 @@ bool cmSetCommand
     }
 
   // collect any values into a single semi-colon separated value list
-  if(static_cast<unsigned short>(args.size()) >
-     static_cast<unsigned short>(1 + ignoreLastArgs))
-    {
-    value = args[1];
-    size_t endPos = args.size() - ignoreLastArgs;
-    for(size_t i = 2; i < endPos; ++i)
-      {
-      value += ";";
-      value += args[i];
-      }
-    }
+  value = cmJoin(cmRange(args).advance(1).retreat(ignoreLastArgs), ";");
 
   if (parentScope)
     {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=780f75dc43f754e3ad10bf48328a33c1d2173463
commit 780f75dc43f754e3ad10bf48328a33c1d2173463
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 14 22:23:41 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:35:14 2015 +0100

    cmFindBase: Replace loop with cmJoin on range.

diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 69991d5..6e55533 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -166,11 +166,9 @@ bool cmFindBase::ParseArguments(std::vector<std::string> const& argsIn)
       }
     else
       {
-      this->VariableDocumentation += "one of the " + this->Names[0];
-      for (unsigned int j = 1; j < this->Names.size() - 1; ++j)
-        {
-        this->VariableDocumentation += ", " + this->Names[j];
-        }
+      this->VariableDocumentation += "one of the ";
+      this->VariableDocumentation += cmJoin(cmRange(this->Names).retreat(1),
+                                            ", ");
       this->VariableDocumentation += " or "
         + this->Names[this->Names.size() - 1] + " libraries be found";
       }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4cee4e382e48949920b81e7219ab48f06bfc398
commit d4cee4e382e48949920b81e7219ab48f06bfc398
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:53:20 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:35:14 2015 +0100

    Convert loops to cmJoin algorithm with cmRange.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 8d1657d..dd0cfa9 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -259,14 +259,7 @@ bool cmListCommand::HandleAppendCommand(std::vector<std::string> const& args)
     {
     listString += ";";
     }
-  const char* sep = "";
-  size_t cc;
-  for ( cc = 2; cc < args.size(); ++ cc )
-    {
-    listString += sep;
-    listString += args[cc];
-    sep = ";";
-    }
+  listString += cmJoin(cmRange(args).advance(2), ";");
 
   this->Makefile->AddDefinition(listName, listString.c_str());
   return true;
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 05d8ab5..35956ad 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -3016,13 +3016,7 @@ cmLocalGenerator::ConvertToRelativePath(const std::vector<std::string>& local,
     {
     relative += "/";
     }
-  const char* sep = "";
-  for(unsigned int i=common; i < remote.size(); ++i)
-    {
-    relative += sep;
-    relative += remote[i];
-    sep = "/";
-    }
+  relative += cmJoin(cmRange(remote).advance(common), "/");
 
   // Finally return the path.
   return relative;
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 14b241d..ecdd4a0 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -172,12 +172,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
                 }
               std::vector<std::string>::const_iterator eit
                   = expandedArgs.begin() + this->Args.size() - 1;
-              const char* sep = "";
-              for( ; eit != expandedArgs.end(); ++eit)
-                {
-                argnDef += sep + *eit;
-                sep = ";";
-                }
+              argnDef += cmJoin(cmRange(eit, expandedArgs.end()), ";");
               }
             argnDefInitialized = true;
             }
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 5260cb0..5c93975 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -406,12 +406,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
     // Clock command
     else if (args[1] == "time" && args.size() > 2)
       {
-      std::string command = args[2];
-      for (std::string::size_type cc = 3; cc < args.size(); cc ++)
-        {
-        command += " ";
-        command += args[cc];
-        }
+      std::string command = cmJoin(cmRange(args).advance(2), " ");
 
       clock_t clock_start, clock_finish;
       time_t time_start, time_finish;
@@ -473,14 +468,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
         }
 
       std::string command = "\"";
-      command += args[3];
+      command += cmJoin(cmRange(args).advance(3), "\" \"");
       command += "\"";
-      for (std::string::size_type cc = 4; cc < args.size(); cc ++)
-        {
-        command += " \"";
-        command += args[cc];
-        command += "\"";
-        }
       int retval = 0;
       int timeout = 0;
       if ( cmSystemTools::RunSingleCommand(command.c_str(), 0, &retval,

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e57ca6f0f69efb3238a98434fb086c30f1a02f1
commit 1e57ca6f0f69efb3238a98434fb086c30f1a02f1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 22:23:41 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:30:34 2015 +0100

    cmStringCommand: Accumulate with cmJoin and range adaptors.

diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 3e606d7..edc6afc 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -303,13 +303,6 @@ bool cmStringCommand::RegexMatch(std::vector<std::string> const& args)
   std::string regex = args[2];
   std::string outvar = args[3];
 
-  // Concatenate all the last arguments together.
-  std::string input = args[4];
-  for(unsigned int i=5; i < args.size(); ++i)
-    {
-    input += args[i];
-    }
-
   this->Makefile->ClearMatches();
   // Compile the regular expression.
   cmsys::RegularExpression re;
@@ -321,6 +314,9 @@ bool cmStringCommand::RegexMatch(std::vector<std::string> const& args)
     return false;
     }
 
+  // Concatenate all the last arguments together.
+  std::string input = cmJoin(cmRange(args).advance(4), std::string());
+
   // Scan through the input for all matches.
   std::string output;
   if(re.find(input.c_str()))
@@ -352,13 +348,6 @@ bool cmStringCommand::RegexMatchAll(std::vector<std::string> const& args)
   std::string regex = args[2];
   std::string outvar = args[3];
 
-  // Concatenate all the last arguments together.
-  std::string input = args[4];
-  for(unsigned int i=5; i < args.size(); ++i)
-    {
-    input += args[i];
-    }
-
   this->Makefile->ClearMatches();
   // Compile the regular expression.
   cmsys::RegularExpression re;
@@ -371,6 +360,9 @@ bool cmStringCommand::RegexMatchAll(std::vector<std::string> const& args)
     return false;
     }
 
+  // Concatenate all the last arguments together.
+  std::string input = cmJoin(cmRange(args).advance(4), std::string());
+
   // Scan through the input for all matches.
   std::string output;
   const char* p = input.c_str();
@@ -456,13 +448,6 @@ bool cmStringCommand::RegexReplace(std::vector<std::string> const& args)
     l = r;
     }
 
-  // Concatenate all the last arguments together.
-  std::string input = args[5];
-  for(unsigned int i=6; i < args.size(); ++i)
-    {
-    input += args[i];
-    }
-
   this->Makefile->ClearMatches();
   // Compile the regular expression.
   cmsys::RegularExpression re;
@@ -475,6 +460,9 @@ bool cmStringCommand::RegexReplace(std::vector<std::string> const& args)
     return false;
     }
 
+  // Concatenate all the last arguments together.
+  std::string input = cmJoin(cmRange(args).advance(5), std::string());
+
   // Scan through the input for all matches.
   std::string output;
   std::string::size_type base = 0;
@@ -673,11 +661,7 @@ bool cmStringCommand::HandleReplaceCommand(std::vector<std::string> const&
   const std::string& replaceExpression = args[2];
   const std::string& variableName = args[3];
 
-  std::string input = args[4];
-  for(unsigned int i=5; i < args.size(); ++i)
-    {
-    input += args[i];
-    }
+  std::string input = cmJoin(cmRange(args).advance(4), std::string());
 
   cmsys::SystemTools::ReplaceString(input, matchExpression.c_str(),
                                     replaceExpression.c_str());
@@ -756,11 +740,7 @@ bool cmStringCommand
     }
 
   std::string const& variableName = args[1];
-  std::string value;
-  for(unsigned int i = 2; i < args.size(); ++i)
-    {
-    value += args[i];
-    }
+  std::string value = cmJoin(cmRange(args).advance(2), std::string());
 
   this->Makefile->AddDefinition(variableName, value.c_str());
   return true;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55a11552a49c59b786feb9c229ec2d4ee84a70e7
commit 55a11552a49c59b786feb9c229ec2d4ee84a70e7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 22:14:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:30:34 2015 +0100

    cmAlgorithms: Add a range adaptor and API for adjusting a range.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 6c03f51..851b105 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -122,6 +122,17 @@ struct Range
   const_iterator begin() const { return Begin; }
   const_iterator end() const { return End; }
   bool empty() const { return std::distance(Begin, End) == 0; }
+  Range& advance(size_t amount)
+  {
+    std::advance(Begin, amount);
+    return *this;
+  }
+
+  Range& retreat(size_t amount)
+  {
+    std::advance(End, -amount);
+    return *this;
+  }
 private:
   const_iterator Begin;
   const_iterator End;
@@ -135,6 +146,14 @@ ContainerAlgorithms::Range<Iter1> cmRange(Iter1 begin, Iter2 end)
   return ContainerAlgorithms::Range<Iter1>(begin, end);
 }
 
+template<typename Range>
+ContainerAlgorithms::Range<typename Range::const_iterator>
+cmRange(Range const& range)
+{
+  return ContainerAlgorithms::Range<typename Range::const_iterator>(
+      range.begin(), range.end());
+}
+
 template<typename Container>
 void cmDeleteAll(Container const& c)
 {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05097f44d032e65891746edf5fecc610017ef214
commit 05097f44d032e65891746edf5fecc610017ef214
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 14 21:27:25 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:30:34 2015 +0100

    Use cmJoin to accumulate string ranges.
    
    Avoid using the std::accumulate algorithm which is designed for
    numeric types, not complex types.  It introduces unneccessary
    copies.
    
    Initialize variables where they are populated.

diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 8b893bc..212603c 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -217,7 +217,6 @@ bool cmFileCommand
 bool cmFileCommand::HandleWriteCommand(std::vector<std::string> const& args,
   bool append)
 {
-  std::string message;
   std::vector<std::string>::const_iterator i = args.begin();
 
   i++; // Get rid of subcommand
@@ -231,10 +230,6 @@ bool cmFileCommand::HandleWriteCommand(std::vector<std::string> const& args,
 
   i++;
 
-  for(;i != args.end(); ++i)
-    {
-    message += *i;
-    }
   if ( !this->Makefile->CanIWriteThisFile(fileName.c_str()) )
     {
     std::string e
@@ -272,6 +267,7 @@ bool cmFileCommand::HandleWriteCommand(std::vector<std::string> const& args,
     this->SetError(error);
     return false;
     }
+  std::string message = cmJoin(cmRange(i, args.end()), std::string());
   file << message;
   file.close();
   if(mode)
diff --git a/Source/cmMessageCommand.cxx b/Source/cmMessageCommand.cxx
index 88d6a77..0449c50 100644
--- a/Source/cmMessageCommand.cxx
+++ b/Source/cmMessageCommand.cxx
@@ -20,7 +20,6 @@ bool cmMessageCommand
     this->SetError("called with incorrect number of arguments");
     return false;
     }
-  std::string message;
   std::vector<std::string>::const_iterator i = args.begin();
 
   cmake::MessageType type = cmake::MESSAGE;
@@ -70,10 +69,7 @@ bool cmMessageCommand
     ++i;
     }
 
-  for(;i != args.end(); ++i)
-    {
-    message += *i;
-    }
+  std::string message = cmJoin(cmRange(i, args.end()), std::string());
 
   if (type != cmake::MESSAGE)
     {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d3b952d7b2d4d708d823914e49c07cd9c065880
commit 4d3b952d7b2d4d708d823914e49c07cd9c065880
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 22:19:21 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:30:34 2015 +0100

    cmAlgorithms: Add a Range container and adaptor method.
    
    This can make a pair of iterators API compatible with the
    cmJoin algorithm and other range-based algorithms.
    
    Accept different iterator types in the cmRange adaptor so that
    a const and non-const iterator are accepted.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 4938140..6c03f51 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -112,6 +112,27 @@ struct DefaultDeleter<Container, /* valueTypeIsPair = */ true>
   }
 };
 
+template<typename const_iterator_>
+struct Range
+{
+  typedef const_iterator_ const_iterator;
+  typedef typename std::iterator_traits<const_iterator>::value_type value_type;
+  Range(const_iterator begin_, const_iterator end_)
+    : Begin(begin_), End(end_) {}
+  const_iterator begin() const { return Begin; }
+  const_iterator end() const { return End; }
+  bool empty() const { return std::distance(Begin, End) == 0; }
+private:
+  const_iterator Begin;
+  const_iterator End;
+};
+
+}
+
+template<typename Iter1, typename Iter2>
+ContainerAlgorithms::Range<Iter1> cmRange(Iter1 begin, Iter2 end)
+{
+  return ContainerAlgorithms::Range<Iter1>(begin, end);
 }
 
 template<typename Container>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee1304531efb85b41d3c2f84f32c7d2901298be7
commit ee1304531efb85b41d3c2f84f32c7d2901298be7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 14 21:31:46 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:30:34 2015 +0100

    Replace common loop pattern with cmJoin

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 7746980..fd9b236 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1064,26 +1064,11 @@ void cmFindPackageCommand::AppendToFoundProperty(bool found)
     }
 
 
-  std::string tmp;
-  const char* sep ="";
-  for(size_t i=0; i<foundContents.size(); i++)
-    {
-    tmp += sep;
-    tmp += foundContents[i];
-    sep = ";";
-    }
-
+  std::string tmp = cmJoin(foundContents, ";");
   this->Makefile->GetCMakeInstance()->SetProperty("PACKAGES_FOUND",
                                                   tmp.c_str());
 
-  tmp = "";
-  sep = "";
-  for(size_t i=0; i<notFoundContents.size(); i++)
-    {
-    tmp += sep;
-    tmp += notFoundContents[i];
-    sep = ";";
-    }
+  tmp = cmJoin(notFoundContents, ";");
   this->Makefile->GetCMakeInstance()->SetProperty("PACKAGES_NOT_FOUND",
                                                   tmp.c_str());
 }
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index c33048c..2e71b01 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -194,11 +194,8 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
       {
       std::string name = this->Args[0];
       std::vector<std::string>::size_type cc;
-      name += "(";
-      for ( cc = 0; cc < this->Args.size(); cc ++ )
-        {
-        name += " " + this->Args[cc];
-        }
+      name += "( ";
+      name += cmJoin(this->Args, " ");
       name += " )";
 
       // create a new command and add it to cmake
diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx
index c0e4683..84c00ba 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -34,15 +34,7 @@ bool cmGetCMakePropertyCommand
     std::vector<std::string> vars = this->Makefile->GetDefinitions(cacheonly);
     if (!vars.empty())
       {
-      output = "";
-      const char* sep = "";
-      std::vector<std::string>::size_type cc;
-      for ( cc = 0; cc < vars.size(); ++cc )
-        {
-        output += sep;
-        output += vars[cc];
-        sep = ";";
-        }
+      output = cmJoin(vars, ";");
       }
     }
   else if ( args[1] == "MACROS" )
@@ -54,15 +46,7 @@ bool cmGetCMakePropertyCommand
     const std::set<std::string>* components
       = this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
         ->GetInstallComponents();
-    std::set<std::string>::const_iterator compIt;
-    output = "";
-    const char* sep = "";
-    for (compIt = components->begin(); compIt != components->end(); ++compIt)
-      {
-      output += sep;
-      output += *compIt;
-      sep = ";";
-      }
+    output = cmJoin(*components, ";");
     }
   else
     {
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 27154d2..14b241d 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -197,14 +197,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
               {
               argvDef += ";";
               }
-            const char* sep = "";
-            std::vector<std::string>::const_iterator eit;
-            for(eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit)
-              {
-              argvDef += sep;
-              argvDef += *eit;
-              sep = ";";
-              }
+            argvDef += cmJoin(expandedArgs, ";");
             argvDefInitialized = true;
             }
           cmSystemTools::ReplaceString(tmps, "${ARGV}", argvDef.c_str());
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index aca4413..ac5fec9 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4202,15 +4202,7 @@ const char *cmMakefile::GetProperty(const std::string& prop,
     }
   else if (prop == "LISTFILE_STACK")
     {
-    const char* sep = "";
-    for (std::deque<std::string>::const_iterator
-        i = this->ListFileStack.begin();
-        i != this->ListFileStack.end(); ++i)
-      {
-      output += sep;
-      output += *i;
-      sep = ";";
-      }
+    output = cmJoin(this->ListFileStack, ";");
     return output.c_str();
     }
   else if (prop == "VARIABLES" || prop == "CACHE_VARIABLES")
@@ -4220,14 +4212,7 @@ const char *cmMakefile::GetProperty(const std::string& prop,
       {
       cacheonly = 1;
       }
-    std::vector<std::string> vars = this->GetDefinitions(cacheonly);
-    const char* sep = "";
-    for (unsigned int cc = 0; cc < vars.size(); cc ++ )
-      {
-      output += sep;
-      output += vars[cc];
-      sep = ";";
-      }
+    output = cmJoin(this->GetDefinitions(cacheonly), ";");
     return output.c_str();
     }
   else if (prop == "MACROS")
@@ -4242,16 +4227,7 @@ const char *cmMakefile::GetProperty(const std::string& prop,
     }
   else if (prop == "LINK_DIRECTORIES")
     {
-    const char* sep = "";
-    for (std::vector<std::string>::const_iterator
-         it = this->GetLinkDirectories().begin();
-         it != this->GetLinkDirectories().end();
-         ++ it )
-      {
-      output += sep;
-      output += *it;
-      sep = ";";
-      }
+    output = cmJoin(this->GetLinkDirectories(), ";");
     return output.c_str();
     }
   else if (prop == "INCLUDE_DIRECTORIES")
diff --git a/Source/cmOptionCommand.cxx b/Source/cmOptionCommand.cxx
index e505440..60728ea 100644
--- a/Source/cmOptionCommand.cxx
+++ b/Source/cmOptionCommand.cxx
@@ -34,11 +34,7 @@ bool cmOptionCommand
   if(argError)
     {
     std::string m = "called with incorrect number of arguments: ";
-    for(size_t i =0; i < args.size(); ++i)
-      {
-      m += args[i];
-      m += " ";
-      }
+    m += cmJoin(args, " ");
     this->SetError(m);
     return false;
     }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4edadd2c32f881a06c79ab7c1385a27ddc4b971
commit b4edadd2c32f881a06c79ab7c1385a27ddc4b971
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 17 17:36:19 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:30:34 2015 +0100

    Convert loops populating maybe-empty content into the common pattern.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 107dca9..8d1657d 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -254,14 +254,18 @@ bool cmListCommand::HandleAppendCommand(std::vector<std::string> const& args)
   // expand the variable
   std::string listString;
   this->GetListString(listString, listName);
+
+  if(!listString.empty() && !args.empty())
+    {
+    listString += ";";
+    }
+  const char* sep = "";
   size_t cc;
   for ( cc = 2; cc < args.size(); ++ cc )
     {
-    if(!listString.empty())
-      {
-      listString += ";";
-      }
+    listString += sep;
     listString += args[cc];
+    sep = ";";
     }
 
   this->Makefile->AddDefinition(listName, listString.c_str());
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 7afe05f..05d8ab5 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -3011,13 +3011,17 @@ cmLocalGenerator::ConvertToRelativePath(const std::vector<std::string>& local,
   // trailing slash in the input then the last iteration of the loop
   // will add a slash followed by an empty string which will preserve
   // the trailing slash in the output.
+
+  if(!relative.empty() && !remote.empty())
+    {
+    relative += "/";
+    }
+  const char* sep = "";
   for(unsigned int i=common; i < remote.size(); ++i)
     {
-    if(!relative.empty())
-      {
-      relative += "/";
-      }
+    relative += sep;
     relative += remote[i];
+    sep = "/";
     }
 
   // Finally return the path.
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 8ffd909..27154d2 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -166,15 +166,17 @@ bool cmMacroHelperCommand::InvokeInitialPass
             {
             if (expandedArgs.size() > this->Args.size() - 1)
               {
+              if (!argnDef.empty() && !expandedArgs.empty())
+                {
+                argnDef += ";";
+                }
               std::vector<std::string>::const_iterator eit
                   = expandedArgs.begin() + this->Args.size() - 1;
+              const char* sep = "";
               for( ; eit != expandedArgs.end(); ++eit)
                 {
-                if (!argnDef.empty())
-                  {
-                  argnDef += ";";
-                  }
-                argnDef += *eit;
+                argnDef += sep + *eit;
+                sep = ";";
                 }
               }
             argnDefInitialized = true;
@@ -191,14 +193,17 @@ bool cmMacroHelperCommand::InvokeInitialPass
           // repleace ARGV, compute it only once
           if (!argvDefInitialized)
             {
+            if (!argvDef.empty() && !expandedArgs.empty())
+              {
+              argvDef += ";";
+              }
+            const char* sep = "";
             std::vector<std::string>::const_iterator eit;
             for(eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit)
               {
-              if (!argvDef.empty())
-                {
-                argvDef += ";";
-                }
+              argvDef += sep;
               argvDef += *eit;
+              sep = ";";
               }
             argvDefInitialized = true;
             }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b92bdd86f6d180031d8bea2222f4dc971eab8d3
commit 7b92bdd86f6d180031d8bea2222f4dc971eab8d3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 17 17:47:10 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:30:33 2015 +0100

    Convert loops into the commonly used pattern.

diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx
index e193cf5..c0e4683 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -25,7 +25,6 @@ bool cmGetCMakePropertyCommand
     return false;
     }
 
-  std::vector<std::string>::size_type cc;
   std::string variable = args[0];
   std::string output = "NOTFOUND";
 
@@ -35,12 +34,15 @@ bool cmGetCMakePropertyCommand
     std::vector<std::string> vars = this->Makefile->GetDefinitions(cacheonly);
     if (!vars.empty())
       {
-      output = vars[0];
-      }
-    for ( cc = 1; cc < vars.size(); ++cc )
-      {
-      output += ";";
-      output += vars[cc];
+      output = "";
+      const char* sep = "";
+      std::vector<std::string>::size_type cc;
+      for ( cc = 0; cc < vars.size(); ++cc )
+        {
+        output += sep;
+        output += vars[cc];
+        sep = ";";
+        }
       }
     }
   else if ( args[1] == "MACROS" )
@@ -54,13 +56,12 @@ bool cmGetCMakePropertyCommand
         ->GetInstallComponents();
     std::set<std::string>::const_iterator compIt;
     output = "";
+    const char* sep = "";
     for (compIt = components->begin(); compIt != components->end(); ++compIt)
       {
-      if (compIt != components->begin())
-        {
-        output += ";";
-        }
+      output += sep;
       output += *compIt;
+      sep = ";";
       }
     }
   else
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index eb68e49..aca4413 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3752,15 +3752,12 @@ void cmMakefile::GetListOfMacros(std::string& macros) const
 {
   StringStringMap::const_iterator it;
   macros = "";
-  int cc = 0;
+  const char* sep = "";
   for ( it = this->MacrosMap.begin(); it != this->MacrosMap.end(); ++it )
     {
-    if ( cc > 0 )
-      {
-      macros += ";";
-      }
+    macros += sep;
     macros += it->first;
-    cc ++;
+    sep = "";
     }
 }
 
@@ -4205,15 +4202,14 @@ const char *cmMakefile::GetProperty(const std::string& prop,
     }
   else if (prop == "LISTFILE_STACK")
     {
+    const char* sep = "";
     for (std::deque<std::string>::const_iterator
         i = this->ListFileStack.begin();
         i != this->ListFileStack.end(); ++i)
       {
-      if (i != this->ListFileStack.begin())
-        {
-        output += ";";
-        }
+      output += sep;
       output += *i;
+      sep = ";";
       }
     return output.c_str();
     }
@@ -4225,13 +4221,12 @@ const char *cmMakefile::GetProperty(const std::string& prop,
       cacheonly = 1;
       }
     std::vector<std::string> vars = this->GetDefinitions(cacheonly);
+    const char* sep = "";
     for (unsigned int cc = 0; cc < vars.size(); cc ++ )
       {
-      if ( cc > 0 )
-        {
-        output += ";";
-        }
+      output += sep;
       output += vars[cc];
+      sep = ";";
       }
     return output.c_str();
     }
@@ -4247,19 +4242,16 @@ const char *cmMakefile::GetProperty(const std::string& prop,
     }
   else if (prop == "LINK_DIRECTORIES")
     {
-    std::ostringstream str;
+    const char* sep = "";
     for (std::vector<std::string>::const_iterator
          it = this->GetLinkDirectories().begin();
          it != this->GetLinkDirectories().end();
          ++ it )
       {
-      if ( it != this->GetLinkDirectories().begin())
-        {
-        str << ";";
-        }
-      str << it->c_str();
+      output += sep;
+      output += *it;
+      sep = ";";
       }
-    output = str.str();
     return output.c_str();
     }
   else if (prop == "INCLUDE_DIRECTORIES")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8da80aed2d8b2d82f0bd56804fe9366ea651d516
commit 8da80aed2d8b2d82f0bd56804fe9366ea651d516
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:47:21 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:30:33 2015 +0100

    cmMacroCommand: Remove counting variable.
    
    Start iteration at correct starting point directly.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 743cd13..8ffd909 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -167,19 +167,14 @@ bool cmMacroHelperCommand::InvokeInitialPass
             if (expandedArgs.size() > this->Args.size() - 1)
               {
               std::vector<std::string>::const_iterator eit
-                  = expandedArgs.begin();
-              std::vector<std::string>::size_type cnt = 0;
+                  = expandedArgs.begin() + this->Args.size() - 1;
               for( ; eit != expandedArgs.end(); ++eit)
                 {
-                if ( cnt >= this->Args.size()-1 )
+                if (!argnDef.empty())
                   {
-                  if (!argnDef.empty())
-                    {
-                    argnDef += ";";
-                    }
-                  argnDef += *eit;
+                  argnDef += ";";
                   }
-                cnt ++;
+                argnDef += *eit;
                 }
               }
             argnDefInitialized = true;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45795a9a2e8d51b72fb5f19a5de1db628c7dd2cb
commit 45795a9a2e8d51b72fb5f19a5de1db628c7dd2cb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:44:49 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:30:33 2015 +0100

    cmMacroCommand: Execute loop only if it has an effect.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 5f7fa36..743cd13 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -164,20 +164,23 @@ bool cmMacroHelperCommand::InvokeInitialPass
           {
           if (!argnDefInitialized)
             {
-            std::vector<std::string>::const_iterator eit
-                = expandedArgs.begin();
-            std::vector<std::string>::size_type cnt = 0;
-            for( ; eit != expandedArgs.end(); ++eit)
+            if (expandedArgs.size() > this->Args.size() - 1)
               {
-              if ( cnt >= this->Args.size()-1 )
+              std::vector<std::string>::const_iterator eit
+                  = expandedArgs.begin();
+              std::vector<std::string>::size_type cnt = 0;
+              for( ; eit != expandedArgs.end(); ++eit)
                 {
-                if (!argnDef.empty())
+                if ( cnt >= this->Args.size()-1 )
                   {
-                  argnDef += ";";
+                  if (!argnDef.empty())
+                    {
+                    argnDef += ";";
+                    }
+                  argnDef += *eit;
                   }
-                argnDef += *eit;
+                cnt ++;
                 }
-              cnt ++;
               }
             argnDefInitialized = true;
             }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=562a3ea3d4c4ba431f7c109c6fac41decba96e50
commit 562a3ea3d4c4ba431f7c109c6fac41decba96e50
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:42:12 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:30:33 2015 +0100

    cmMacroCommand: Extract iteration starting point.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index a5804b2..5f7fa36 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -164,9 +164,10 @@ bool cmMacroHelperCommand::InvokeInitialPass
           {
           if (!argnDefInitialized)
             {
-            std::vector<std::string>::const_iterator eit;
+            std::vector<std::string>::const_iterator eit
+                = expandedArgs.begin();
             std::vector<std::string>::size_type cnt = 0;
-            for(eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit)
+            for( ; eit != expandedArgs.end(); ++eit)
               {
               if ( cnt >= this->Args.size()-1 )
                 {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e7d489030dbd63dfb00d407b4d61a33d55747b5
commit 7e7d489030dbd63dfb00d407b4d61a33d55747b5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 00:29:20 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:30:20 2015 +0100

    cmMacroCommand: Replace a loop with cmJoin.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 69fcca7..a5804b2 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -264,9 +264,10 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
       std::string name = this->Args[0];
       std::vector<std::string>::size_type cc;
       name += "(";
-      for ( cc = 0; cc < this->Args.size(); cc ++ )
+      if (!this->Args.empty())
         {
-        name += " " + this->Args[cc];
+        name += " ";
+        name += cmJoin(this->Args, " ");
         }
       name += " )";
       mf.AddMacro(this->Args[0].c_str(), name.c_str());

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac26d4b343aece40b6b9a931ab619fc88d4b9492
commit ac26d4b343aece40b6b9a931ab619fc88d4b9492
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 21:50:16 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 10 22:14:18 2015 +0100

    Split cmAlgorithms into a separate header file.

diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx
index a07c29a..4626142 100644
--- a/Source/CPack/cmCPackGeneratorFactory.cxx
+++ b/Source/CPack/cmCPackGeneratorFactory.cxx
@@ -46,6 +46,7 @@
 #endif
 
 #include "cmCPackLog.h"
+#include "cmAlgorithms.h"
 
 
 //----------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 98bc9d7..6b84bab 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -13,6 +13,7 @@
 
 #include "cmCTest.h"
 #include "cmSystemTools.h"
+#include "cmAlgorithms.h"
 #include "cmXMLSafe.h"
 
 #include <cmsys/RegularExpression.hxx>
diff --git a/Source/cmStandardIncludes.h b/Source/cmAlgorithms.h
similarity index 52%
copy from Source/cmStandardIncludes.h
copy to Source/cmAlgorithms.h
index 77b4f62..4938140 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmAlgorithms.h
@@ -1,6 +1,6 @@
 /*============================================================================
   CMake - Cross Platform Makefile Generator
-  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+  Copyright 2015 Stephen Kelly <steveire at gmail.com>
 
   Distributed under the OSI-approved BSD License (the "License");
   see accompanying file Copyright.txt for details.
@@ -9,154 +9,10 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-/**
- * Include header files as a function of the build process, compiler,
- * and operating system.
- */
-#ifndef cmStandardIncludes_h
-#define cmStandardIncludes_h
+#ifndef cmAlgorithms_h
+#define cmAlgorithms_h
 
-#include <cmConfigure.h>
-#include <cmsys/Configure.hxx>
-
-#ifdef _MSC_VER
-#pragma warning ( disable : 4786 )
-#pragma warning ( disable : 4503 )
-#endif
-
-
-#ifdef __ICL
-#pragma warning ( disable : 985 )
-#pragma warning ( disable : 1572 ) /* floating-point equality test */
-#endif
-
-// Provide fixed-size integer types.
-#include <cmIML/INT.h>
-
-// Include stream compatibility layer from KWSys.
-// This is needed to work with large file support
-// on some platforms whose stream operators do not
-// support the large integer types.
-#if defined(CMAKE_BUILD_WITH_CMAKE)
-# include <cmsys/IOStream.hxx>
-#endif
-
-#include <fstream>
-#include <iostream>
-#include <iomanip>
-#include <sstream>
-
-// we must have stl with the standard include style
-#include <vector>
-#include <string>
-#include <iterator>
-#include <algorithm>
-#include <functional>
-#include <map>
-#include <set>
-
-// include the "c" string header
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#if defined( _MSC_VER )
-typedef unsigned short mode_t;
-#endif
-
-// use this class to shrink the size of symbols in .o files
-// std::string is really basic_string<....lots of stuff....>
-// when combined with a map or set, the symbols can be > 2000 chars!
-#include <cmsys/String.hxx>
-//typedef cmsys::String std::string;
-
-/* Poison this operator to avoid common mistakes.  */
-extern void operator << (std::ostream&, const std::ostringstream&);
-
-/** Standard documentation entry for cmDocumentation's formatting.  */
-struct cmDocumentationEntry
-{
-  std::string Name;
-  std::string Brief;
-  cmDocumentationEntry(){}
-  cmDocumentationEntry(const char *doc[2])
-  { if (doc[0]) this->Name = doc[0];
-  if (doc[1]) this->Brief = doc[1];}
-  cmDocumentationEntry(const char *n, const char *b)
-  { if (n) this->Name = n; if (b) this->Brief = b; }
-};
-
-/** Data structure to represent a single command line.  */
-class cmCustomCommandLine: public std::vector<std::string>
-{
-public:
-  typedef std::vector<std::string> Superclass;
-  typedef Superclass::iterator iterator;
-  typedef Superclass::const_iterator const_iterator;
-};
-
-/** Data structure to represent a list of command lines.  */
-class cmCustomCommandLines: public std::vector<cmCustomCommandLine>
-{
-public:
-  typedef std::vector<cmCustomCommandLine> Superclass;
-  typedef Superclass::iterator iterator;
-  typedef Superclass::const_iterator const_iterator;
-};
-
-// All subclasses of cmCommand or cmCTestGenericHandler should
-// invoke this macro.
-#define cmTypeMacro(thisClass,superclass) \
-virtual const char* GetNameOfClass() { return #thisClass; } \
-typedef superclass Superclass; \
-static bool IsTypeOf(const char *type) \
-{ \
-  if ( !strcmp(#thisClass,type) ) \
-    { \
-    return true; \
-    } \
-  return Superclass::IsTypeOf(type); \
-} \
-virtual bool IsA(const char *type) \
-{ \
-  return thisClass::IsTypeOf(type); \
-} \
-static thisClass* SafeDownCast(cmObject *c) \
-{ \
-  if ( c && c->IsA(#thisClass) ) \
-    { \
-    return static_cast<thisClass *>(c); \
-    } \
-  return 0;\
-} \
-class cmTypeMacro_UseTrailingSemicolon
-
-template<typename Range>
-std::string cmJoin(Range const& r, const char* delimiter)
-{
-  if (r.empty())
-    {
-    return std::string();
-    }
-  std::ostringstream os;
-  typedef typename Range::value_type ValueType;
-  typedef typename Range::const_iterator InputIt;
-  InputIt first = r.begin();
-  InputIt last = r.end();
-  --last;
-  std::copy(first, last,
-      std::ostream_iterator<ValueType>(os, delimiter));
-
-  os << *last;
-
-  return os.str();
-}
-
-template<typename Range>
-std::string cmJoin(Range const& r, std::string delimiter)
-{
-  return cmJoin(r, delimiter.c_str());
-};
+#include "cmStandardIncludes.h"
 
 inline bool cmHasLiteralPrefixImpl(const std::string &str1,
                                  const char *str2,
@@ -265,4 +121,31 @@ void cmDeleteAll(Container const& c)
                 ContainerAlgorithms::DefaultDeleter<Container>());
 }
 
+template<typename Range>
+std::string cmJoin(Range const& r, const char* delimiter)
+{
+  if (r.empty())
+    {
+    return std::string();
+    }
+  std::ostringstream os;
+  typedef typename Range::value_type ValueType;
+  typedef typename Range::const_iterator InputIt;
+  InputIt first = r.begin();
+  InputIt last = r.end();
+  --last;
+  std::copy(first, last,
+      std::ostream_iterator<ValueType>(os, delimiter));
+
+  os << *last;
+
+  return os.str();
+}
+
+template<typename Range>
+std::string cmJoin(Range const& r, std::string delimiter)
+{
+  return cmJoin(r, delimiter.c_str());
+};
+
 #endif
diff --git a/Source/cmExportSet.cxx b/Source/cmExportSet.cxx
index 14812e4..4148fb5 100644
--- a/Source/cmExportSet.cxx
+++ b/Source/cmExportSet.cxx
@@ -12,6 +12,7 @@
 
 #include "cmExportSet.h"
 #include "cmTargetExport.h"
+#include "cmAlgorithms.h"
 
 cmExportSet::~cmExportSet()
 {
diff --git a/Source/cmExportSetMap.cxx b/Source/cmExportSetMap.cxx
index 14c4458..cf431c6 100644
--- a/Source/cmExportSetMap.cxx
+++ b/Source/cmExportSetMap.cxx
@@ -12,6 +12,7 @@
 
 #include "cmExportSetMap.h"
 #include "cmExportSet.h"
+#include "cmAlgorithms.h"
 
 cmExportSet* cmExportSetMap::operator[](const std::string &name)
 {
diff --git a/Source/cmFileLockPool.cxx b/Source/cmFileLockPool.cxx
index cf8e9a9..3710eb0 100644
--- a/Source/cmFileLockPool.cxx
+++ b/Source/cmFileLockPool.cxx
@@ -16,6 +16,7 @@
 
 #include "cmFileLock.h"
 #include "cmFileLockResult.h"
+#include "cmAlgorithms.h"
 
 cmFileLockPool::cmFileLockPool()
 {
diff --git a/Source/cmInstalledFile.h b/Source/cmInstalledFile.h
index 503f92c..cdb0866 100644
--- a/Source/cmInstalledFile.h
+++ b/Source/cmInstalledFile.h
@@ -13,6 +13,7 @@
 #define cmInstalledFile_h
 
 #include "cmGeneratorExpression.h"
+#include "cmAlgorithms.h"
 
 /** \class cmInstalledFile
  * \brief Represents a file intended for installation.
diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index f4607c6..d20d999 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -12,6 +12,7 @@
 #include "cmRST.h"
 
 #include "cmSystemTools.h"
+#include "cmAlgorithms.h"
 #include "cmVersion.h"
 #include <cmsys/FStream.hxx>
 #include <ctype.h>
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 77b4f62..a9796b9 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -131,138 +131,4 @@ static thisClass* SafeDownCast(cmObject *c) \
 } \
 class cmTypeMacro_UseTrailingSemicolon
 
-template<typename Range>
-std::string cmJoin(Range const& r, const char* delimiter)
-{
-  if (r.empty())
-    {
-    return std::string();
-    }
-  std::ostringstream os;
-  typedef typename Range::value_type ValueType;
-  typedef typename Range::const_iterator InputIt;
-  InputIt first = r.begin();
-  InputIt last = r.end();
-  --last;
-  std::copy(first, last,
-      std::ostream_iterator<ValueType>(os, delimiter));
-
-  os << *last;
-
-  return os.str();
-}
-
-template<typename Range>
-std::string cmJoin(Range const& r, std::string delimiter)
-{
-  return cmJoin(r, delimiter.c_str());
-};
-
-inline bool cmHasLiteralPrefixImpl(const std::string &str1,
-                                 const char *str2,
-                                 size_t N)
-{
-  return strncmp(str1.c_str(), str2, N) == 0;
-}
-
-inline bool cmHasLiteralPrefixImpl(const char* str1,
-                                 const char *str2,
-                                 size_t N)
-{
-  return strncmp(str1, str2, N) == 0;
-}
-
-inline bool cmHasLiteralSuffixImpl(const std::string &str1,
-                                   const char *str2,
-                                   size_t N)
-{
-  size_t len = str1.size();
-  return len >= N && strcmp(str1.c_str() + len - N, str2) == 0;
-}
-
-inline bool cmHasLiteralSuffixImpl(const char* str1,
-                                   const char* str2,
-                                   size_t N)
-{
-  size_t len = strlen(str1);
-  return len >= N && strcmp(str1 + len - N, str2) == 0;
-}
-
-template<typename T, size_t N>
-const T* cmArrayBegin(const T (&a)[N]) { return a; }
-template<typename T, size_t N>
-const T* cmArrayEnd(const T (&a)[N]) { return a + N; }
-template<typename T, size_t N>
-size_t cmArraySize(const T (&)[N]) { return N; }
-
-template<typename T, size_t N>
-bool cmHasLiteralPrefix(T str1, const char (&str2)[N])
-{
-  return cmHasLiteralPrefixImpl(str1, str2, N - 1);
-}
-
-template<typename T, size_t N>
-bool cmHasLiteralSuffix(T str1, const char (&str2)[N])
-{
-  return cmHasLiteralSuffixImpl(str1, str2, N - 1);
-}
-
-struct cmStrCmp {
-  cmStrCmp(const char *test) : m_test(test) {}
-  cmStrCmp(const std::string &test) : m_test(test) {}
-
-  bool operator()(const std::string& input) const
-  {
-    return m_test == input;
-  }
-
-  bool operator()(const char * input) const
-  {
-    return strcmp(input, m_test.c_str()) == 0;
-  }
-
-private:
-  const std::string m_test;
-};
-
-namespace ContainerAlgorithms {
-
-template<typename T>
-struct cmIsPair
-{
-  enum { value = false };
-};
-
-template<typename K, typename V>
-struct cmIsPair<std::pair<K, V> >
-{
-  enum { value = true };
-};
-
-template<typename Container,
-    bool valueTypeIsPair = cmIsPair<typename Container::value_type>::value>
-struct DefaultDeleter
-{
-  void operator()(typename Container::value_type value) {
-    delete value;
-  }
-};
-
-template<typename Container>
-struct DefaultDeleter<Container, /* valueTypeIsPair = */ true>
-{
-  void operator()(typename Container::value_type value) {
-    delete value.second;
-  }
-};
-
-}
-
-template<typename Container>
-void cmDeleteAll(Container const& c)
-{
-  std::for_each(c.begin(), c.end(),
-                ContainerAlgorithms::DefaultDeleter<Container>());
-}
-
 #endif
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 7dd6121..bf496e9 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -11,6 +11,7 @@
 ============================================================================*/
 
 #include "cmSystemTools.h"
+#include "cmAlgorithms.h"
 #include <ctype.h>
 #include <errno.h>
 #include <time.h>
diff --git a/Source/cmVariableWatch.cxx b/Source/cmVariableWatch.cxx
index b8a6df2..57dde31 100644
--- a/Source/cmVariableWatch.cxx
+++ b/Source/cmVariableWatch.cxx
@@ -11,6 +11,8 @@
 ============================================================================*/
 #include "cmVariableWatch.h"
 
+#include "cmAlgorithms.h"
+
 static const char* const cmVariableWatchAccessStrings[] =
 {
     "READ_ACCESS",

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

Summary of changes:
 Source/CPack/cmCPackGeneratorFactory.cxx        |    1 +
 Source/CTest/cmCTestGIT.cxx                     |    1 +
 Source/{cmStandardIncludes.h => cmAlgorithms.h} |  219 ++++++++---------------
 Source/cmExportSet.cxx                          |    1 +
 Source/cmExportSetMap.cxx                       |    1 +
 Source/cmFileCommand.cxx                        |    6 +-
 Source/cmFileLockPool.cxx                       |    1 +
 Source/cmFindBase.cxx                           |    8 +-
 Source/cmFindPackageCommand.cxx                 |   19 +-
 Source/cmFunctionCommand.cxx                    |    7 +-
 Source/cmGetCMakePropertyCommand.cxx            |   19 +-
 Source/cmInstalledFile.h                        |    1 +
 Source/cmListCommand.cxx                        |   11 +-
 Source/cmLocalGenerator.cxx                     |   10 +-
 Source/cmLocalUnixMakefileGenerator3.cxx        |   24 ++-
 Source/cmMacroCommand.cxx                       |   31 ++--
 Source/cmMakefile.cxx                           |   44 +----
 Source/cmMessageCommand.cxx                     |    6 +-
 Source/cmOptionCommand.cxx                      |    6 +-
 Source/cmRST.cxx                                |    1 +
 Source/cmSetCommand.cxx                         |   12 +-
 Source/cmStandardIncludes.h                     |  134 --------------
 Source/cmStringCommand.cxx                      |   42 ++---
 Source/cmSystemTools.cxx                        |    1 +
 Source/cmTarget.cxx                             |   27 ++-
 Source/cmVariableWatch.cxx                      |    2 +
 Source/cmcmd.cxx                                |   15 +-
 27 files changed, 154 insertions(+), 496 deletions(-)
 copy Source/{cmStandardIncludes.h => cmAlgorithms.h} (53%)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Feb 10 18:52:10 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 10 Feb 2015 18:52:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1208-gdb0f1df
Message-ID: <20150210235210.ED359AA9C4@public.kitware.com>

This is an automated email from 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  db0f1df7bada28ea675fb563803786e7251c42b9 (commit)
       via  f7e33820b628f39ae2e0ba3d25279545dfe18f73 (commit)
       via  6da65b3907419df28484c570f24d0da3593a0e5a (commit)
       via  736bcb9664b714b91e8a2a573451e0453716f4da (commit)
      from  03d60ba97b9790ec80a22be5b51d91492235a11f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db0f1df7bada28ea675fb563803786e7251c42b9
commit db0f1df7bada28ea675fb563803786e7251c42b9
Merge: 03d60ba f7e3382
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 18:52:08 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 18:52:08 2015 -0500

    Merge topic 'export-interface-source-files' into next
    
    f7e33820 Add release notes for export-interface-source-files.
    6da65b39 Allow export of targets with INTERFACE_SOURCES.
    736bcb96 Tests: Move IfacePaths test stderr files.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7e33820b628f39ae2e0ba3d25279545dfe18f73
commit f7e33820b628f39ae2e0ba3d25279545dfe18f73
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 5 20:40:51 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:51:35 2015 +0100

    Add release notes for export-interface-source-files.

diff --git a/Help/release/dev/export-interface-source-files.rst b/Help/release/dev/export-interface-source-files.rst
new file mode 100644
index 0000000..00dcd25
--- /dev/null
+++ b/Help/release/dev/export-interface-source-files.rst
@@ -0,0 +1,6 @@
+export-interface-source-files
+-----------------------------
+
+* It is now possible to export targets which populate the
+  :prop_tgt:`INTERFACE_SOURCES` target property using the
+  :command:`install(EXPORT)` and :command:`export()` commands.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6da65b3907419df28484c570f24d0da3593a0e5a
commit 6da65b3907419df28484c570f24d0da3593a0e5a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 28 18:58:38 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:51:34 2015 +0100

    Allow export of targets with INTERFACE_SOURCES.
    
    Use the same rules for paths in source and binary dirs in
    installed INTERFACE_SOURCES as are used for
    INTERFACE_INCLUDE_DIRECTORIES.

diff --git a/Help/command/target_sources.rst b/Help/command/target_sources.rst
index 832240a..d6f148d 100644
--- a/Help/command/target_sources.rst
+++ b/Help/command/target_sources.rst
@@ -22,10 +22,6 @@ items will populate the :prop_tgt:`SOURCES` property of
 following arguments specify sources.  Repeated calls for the same
 ``<target>`` append items in the order called.
 
-Targets with :prop_tgt:`INTERFACE_SOURCES` may not be exported with the
-:command:`export` or :command:`install(EXPORT)` commands. This limitation may be
-lifted in a future version of CMake.
-
 Arguments to ``target_sources`` may use "generator expressions"
 with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)`
 manual for available expressions.  See the :manual:`cmake-buildsystem(7)`
diff --git a/Help/prop_tgt/INTERFACE_SOURCES.rst b/Help/prop_tgt/INTERFACE_SOURCES.rst
index 696ee95..a224b68 100644
--- a/Help/prop_tgt/INTERFACE_SOURCES.rst
+++ b/Help/prop_tgt/INTERFACE_SOURCES.rst
@@ -12,10 +12,6 @@ When target dependencies are specified using :command:`target_link_libraries`,
 CMake will read this property from all target dependencies to determine the
 sources of the consumer.
 
-Targets with ``INTERFACE_SOURCES`` may not be exported with the
-:command:`export` or :command:`install(EXPORT)` commands. This limitation may be
-lifted in a future version of CMake.
-
 Contents of ``INTERFACE_SOURCES`` may use "generator expressions"
 with the syntax ``$<...>``.  See the :manual:`cmake-generator-expressions(7)`
 manual for available expressions.  See the :manual:`cmake-buildsystem(7)`
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index a28ec48..b1203dd 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -68,16 +68,6 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
       tei != this->Exports.end(); ++tei)
     {
     cmTarget* te = *tei;
-    if (te->GetProperty("INTERFACE_SOURCES"))
-      {
-      std::ostringstream e;
-      e << "Target \""
-        << te->GetName()
-        << "\" has a populated INTERFACE_SOURCES property.  This is not "
-          "currently supported.";
-      cmSystemTools::Error(e.str().c_str());
-      return false;
-      }
     this->GenerateImportTargetCode(os, te);
 
     te->AppendBuildInterfaceIncludes();
@@ -87,6 +77,9 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
     this->PopulateInterfaceProperty("INTERFACE_INCLUDE_DIRECTORIES", te,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
+    this->PopulateInterfaceProperty("INTERFACE_SOURCES", te,
+                                    cmGeneratorExpression::BuildInterface,
+                                    properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS", te,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index af4ce8b..71728be 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -224,7 +224,7 @@ static bool isSubDirectory(const char* a, const char* b)
 
 //----------------------------------------------------------------------------
 static bool checkInterfaceDirs(const std::string &prepro,
-                      cmTarget *target)
+                      cmTarget *target, const std::string& prop)
 {
   const char* installDir =
             target->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
@@ -250,20 +250,27 @@ static bool checkInterfaceDirs(const std::string &prepro,
     std::ostringstream e;
     if (genexPos != std::string::npos)
       {
-      switch (target->GetPolicyStatusCMP0041())
+      if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
         {
-        case cmPolicies::WARN:
-          messageType = cmake::WARNING;
-          e << target->GetMakefile()->GetPolicies()
-                      ->GetPolicyWarning(cmPolicies::CMP0041) << "\n";
-          break;
-        case cmPolicies::OLD:
-          continue;
-        case cmPolicies::REQUIRED_IF_USED:
-        case cmPolicies::REQUIRED_ALWAYS:
-        case cmPolicies::NEW:
-          hadFatalError = true;
-          break; // Issue fatal message.
+        switch (target->GetPolicyStatusCMP0041())
+          {
+          case cmPolicies::WARN:
+            messageType = cmake::WARNING;
+            e << target->GetMakefile()->GetPolicies()
+                        ->GetPolicyWarning(cmPolicies::CMP0041) << "\n";
+            break;
+          case cmPolicies::OLD:
+            continue;
+          case cmPolicies::REQUIRED_IF_USED:
+          case cmPolicies::REQUIRED_ALWAYS:
+          case cmPolicies::NEW:
+            hadFatalError = true;
+            break; // Issue fatal message.
+          }
+        }
+      else
+        {
+        hadFatalError = true;
         }
       }
     if (cmHasLiteralPrefix(li->c_str(), "${_IMPORT_PREFIX}"))
@@ -272,8 +279,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       }
     if (!cmSystemTools::FileIsFullPath(li->c_str()))
       {
-      e << "Target \"" << target->GetName() << "\" "
-           "INTERFACE_INCLUDE_DIRECTORIES property contains relative path:\n"
+      e << "Target \"" << target->GetName() << "\" " << prop <<
+           " property contains relative path:\n"
            "  \"" << *li << "\"";
       target->GetMakefile()->IssueMessage(messageType, e.str());
       }
@@ -289,32 +296,35 @@ static bool checkInterfaceDirs(const std::string &prepro,
         (!inBinary || isSubDirectory(installDir, topBinaryDir)) &&
         (!inSource || isSubDirectory(installDir, topSourceDir));
 
-      if (!shouldContinue)
+      if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
         {
-        switch(target->GetPolicyStatusCMP0052())
+        if (!shouldContinue)
           {
-          case cmPolicies::WARN:
+          switch(target->GetPolicyStatusCMP0052())
             {
-            std::ostringstream s;
-            s << target->GetMakefile()->GetPolicies()
-                      ->GetPolicyWarning(cmPolicies::CMP0052) << "\n";
-            s << "Directory:\n    \"" << *li << "\"\nin "
-              "INTERFACE_INCLUDE_DIRECTORIES of target \""
-              << target->GetName() << "\" is a subdirectory of the install "
-              "directory:\n    \"" << installDir << "\"\nhowever it is also "
-              "a subdirectory of the " << (inBinary ? "build" : "source")
-              << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
-              << "\"" << std::endl;
-            target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
-                                                s.str());
+            case cmPolicies::WARN:
+              {
+              std::ostringstream s;
+              s << target->GetMakefile()->GetPolicies()
+                        ->GetPolicyWarning(cmPolicies::CMP0052) << "\n";
+              s << "Directory:\n    \"" << *li << "\"\nin "
+                "INTERFACE_INCLUDE_DIRECTORIES of target \""
+                << target->GetName() << "\" is a subdirectory of the install "
+                "directory:\n    \"" << installDir << "\"\nhowever it is also "
+                "a subdirectory of the " << (inBinary ? "build" : "source")
+                << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
+                << "\"" << std::endl;
+              target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
+                                                  s.str());
+              }
+            case cmPolicies::OLD:
+              shouldContinue = true;
+              break;
+            case cmPolicies::REQUIRED_ALWAYS:
+            case cmPolicies::REQUIRED_IF_USED:
+            case cmPolicies::NEW:
+              break;
             }
-          case cmPolicies::OLD:
-            shouldContinue = true;
-            break;
-          case cmPolicies::REQUIRED_ALWAYS:
-          case cmPolicies::REQUIRED_IF_USED:
-          case cmPolicies::NEW:
-            break;
           }
         }
       if (shouldContinue)
@@ -324,8 +334,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       }
     if (inBinary)
       {
-      e << "Target \"" << target->GetName() << "\" "
-           "INTERFACE_INCLUDE_DIRECTORIES property contains path:\n"
+      e << "Target \"" << target->GetName() << "\" " << prop <<
+           " property contains path:\n"
            "  \"" << *li << "\"\nwhich is prefixed in the build directory.";
       target->GetMakefile()->IssueMessage(messageType, e.str());
       }
@@ -333,8 +343,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       {
       if (inSource)
         {
-        e << "Target \"" << target->GetName() << "\" "
-            "INTERFACE_INCLUDE_DIRECTORIES property contains path:\n"
+        e << "Target \"" << target->GetName() << "\" " << prop <<
+            " property contains path:\n"
             "  \"" << *li << "\"\nwhich is prefixed in the source directory.";
         target->GetMakefile()->IssueMessage(messageType, e.str());
         }
@@ -365,6 +375,46 @@ static void prefixItems(std::string &exportDirs)
 }
 
 //----------------------------------------------------------------------------
+void cmExportFileGenerator::PopulateSourcesInterface(
+                      cmTargetExport *tei,
+                      cmGeneratorExpression::PreprocessContext preprocessRule,
+                      ImportPropertyMap &properties,
+                      std::vector<std::string> &missingTargets)
+{
+  cmTarget *target = tei->Target;
+  assert(preprocessRule == cmGeneratorExpression::InstallInterface);
+
+  const char *propName = "INTERFACE_SOURCES";
+  const char *input = target->GetProperty(propName);
+
+  if (!input)
+    {
+    return;
+    }
+
+  if (!*input)
+    {
+    properties[propName] = "";
+    return;
+    }
+
+  std::string prepro = cmGeneratorExpression::Preprocess(input,
+                                                         preprocessRule,
+                                                         true);
+  if (!prepro.empty())
+    {
+    this->ResolveTargetsInGeneratorExpressions(prepro, target,
+                                                missingTargets);
+
+    if (!checkInterfaceDirs(prepro, target, propName))
+      {
+      return;
+      }
+    properties[propName] = prepro;
+    }
+}
+
+//----------------------------------------------------------------------------
 void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                       cmTargetExport *tei,
                       cmGeneratorExpression::PreprocessContext preprocessRule,
@@ -424,7 +474,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target))
+    if (!checkInterfaceDirs(prepro, target, propName))
       {
       return;
       }
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index 919924e..b6f4166 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -139,6 +139,11 @@ protected:
                       cmGeneratorExpression::PreprocessContext preprocessRule,
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets);
+  void PopulateSourcesInterface(
+                      cmTargetExport *target,
+                      cmGeneratorExpression::PreprocessContext preprocessRule,
+                      ImportPropertyMap &properties,
+                      std::vector<std::string> &missingTargets);
 
   void SetImportLinkInterface(const std::string& config,
                     std::string const& suffix,
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 98ed818..a0d9013 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -123,6 +123,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
 
   bool require2_8_12 = false;
   bool require3_0_0 = false;
+  bool require3_1_0 = false;
   bool requiresConfigFiles = false;
   // Create all the imported targets.
   for(std::vector<cmTargetExport*>::const_iterator
@@ -131,17 +132,6 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     {
     cmTarget* te = (*tei)->Target;
 
-    if (te->GetProperty("INTERFACE_SOURCES"))
-      {
-      std::ostringstream e;
-      e << "Target \""
-        << te->GetName()
-        << "\" has a populated INTERFACE_SOURCES property.  This is not "
-          "currently supported.";
-      cmSystemTools::Error(e.str().c_str());
-      return false;
-      }
-
     requiresConfigFiles = requiresConfigFiles
                               || te->GetType() != cmTarget::INTERFACE_LIBRARY;
 
@@ -152,6 +142,9 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     this->PopulateIncludeDirectoriesInterface(*tei,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
+    this->PopulateSourcesInterface(*tei,
+                                  cmGeneratorExpression::InstallInterface,
+                                  properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_SYSTEM_INCLUDE_DIRECTORIES",
                                   te,
                                   cmGeneratorExpression::InstallInterface,
@@ -190,6 +183,13 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
       {
       require3_0_0 = true;
       }
+    if(te->GetProperty("INTERFACE_SOURCES"))
+      {
+      // We can only generate INTERFACE_SOURCES in CMake 3.3, but CMake 3.1
+      // can consume them.
+      require3_1_0 = true;
+      }
+
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
                                   te, properties);
     this->PopulateCompatibleInterfaceProperties(te, properties);
@@ -197,7 +197,11 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     this->GenerateInterfaceProperties(te, os, properties);
     }
 
-  if (require3_0_0)
+  if (require3_1_0)
+    {
+    this->GenerateRequiredCMakeVersion(os, "3.1.0");
+    }
+  else if (require3_0_0)
     {
     this->GenerateRequiredCMakeVersion(os, "3.0.0");
     }
diff --git a/Tests/ExportImport/Export/Interface/CMakeLists.txt b/Tests/ExportImport/Export/Interface/CMakeLists.txt
index 523fc29..00a5375 100644
--- a/Tests/ExportImport/Export/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Export/Interface/CMakeLists.txt
@@ -29,7 +29,17 @@ target_compile_features(use_auto_type INTERFACE cxx_auto_type)
 add_library(use_c_restrict INTERFACE)
 target_compile_features(use_c_restrict INTERFACE c_restrict)
 
-install(TARGETS headeronly sharediface use_auto_type use_c_restrict
+add_library(source_target INTERFACE)
+target_sources(source_target INTERFACE
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/source_target.cpp>
+  $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/src/source_target_for_install.cpp>
+)
+install(FILES
+  source_target_for_install.cpp
+  DESTINATION src
+)
+
+install(TARGETS headeronly sharediface use_auto_type use_c_restrict source_target
   EXPORT expInterface
 )
 install(TARGETS sharedlib
diff --git a/Tests/ExportImport/Export/Interface/source_target.cpp b/Tests/ExportImport/Export/Interface/source_target.cpp
new file mode 100644
index 0000000..037191c
--- /dev/null
+++ b/Tests/ExportImport/Export/Interface/source_target.cpp
@@ -0,0 +1,13 @@
+
+#ifndef USE_FROM_BUILD_DIR
+#error Expected define USE_FROM_BUILD_DIR
+#endif
+
+#ifdef USE_FROM_INSTALL_DIR
+#error Unexpected define USE_FROM_INSTALL_DIR
+#endif
+
+int source_symbol()
+{
+  return 42;
+}
diff --git a/Tests/ExportImport/Export/Interface/source_target_for_install.cpp b/Tests/ExportImport/Export/Interface/source_target_for_install.cpp
new file mode 100644
index 0000000..64514ed
--- /dev/null
+++ b/Tests/ExportImport/Export/Interface/source_target_for_install.cpp
@@ -0,0 +1,13 @@
+
+#ifdef USE_FROM_BUILD_DIR
+#error Unexpected define USE_FROM_BUILD_DIR
+#endif
+
+#ifndef USE_FROM_INSTALL_DIR
+#error Expected define USE_FROM_INSTALL_DIR
+#endif
+
+int source_symbol()
+{
+  return 42;
+}
diff --git a/Tests/ExportImport/Import/Interface/CMakeLists.txt b/Tests/ExportImport/Import/Interface/CMakeLists.txt
index 4028405..51d518e 100644
--- a/Tests/ExportImport/Import/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Import/Interface/CMakeLists.txt
@@ -82,6 +82,14 @@ endmacro()
 
 do_try_compile(bld)
 
+add_executable(source_target_test_bld source_target_test.cpp)
+target_link_libraries(source_target_test_bld bld::source_target)
+target_compile_definitions(source_target_test_bld PRIVATE USE_FROM_BUILD_DIR)
+
+add_executable(source_target_test_exp source_target_test.cpp)
+target_link_libraries(source_target_test_exp exp::source_target)
+target_compile_definitions(source_target_test_exp PRIVATE USE_FROM_INSTALL_DIR)
+
 add_executable(headeronlytest_exp headeronlytest.cpp)
 target_link_libraries(headeronlytest_exp exp::headeronly)
 
diff --git a/Tests/ExportImport/Import/Interface/source_target_test.cpp b/Tests/ExportImport/Import/Interface/source_target_test.cpp
new file mode 100644
index 0000000..0e8ec5f
--- /dev/null
+++ b/Tests/ExportImport/Import/Interface/source_target_test.cpp
@@ -0,0 +1,7 @@
+
+extern int source_symbol();
+
+int main()
+{
+  return source_symbol() - 42;
+}
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 71507b8..2de82a7 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -192,6 +192,9 @@ add_RunCMake_test(ExternalProject)
 set(IfacePaths_INCLUDE_DIRECTORIES_ARGS -DTEST_PROP=INCLUDE_DIRECTORIES)
 add_RunCMake_test(IfacePaths_INCLUDE_DIRECTORIES TEST_DIR IfacePaths)
 
+set(IfacePaths_SOURCES_ARGS -DTEST_PROP=SOURCES)
+add_RunCMake_test(IfacePaths_SOURCES TEST_DIR IfacePaths)
+
 if(RPMBUILD)
   add_RunCMake_test(CPackRPM)
 endif()
diff --git a/Tests/RunCMake/TargetSources/ExportInstall-result.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-result.txt
similarity index 100%
rename from Tests/RunCMake/TargetSources/ExportInstall-result.txt
rename to Tests/RunCMake/IfacePaths/BinInInstallPrefix-result.txt
diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-stderr_SOURCES.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-stderr_SOURCES.txt
new file mode 100644
index 0000000..239c069
--- /dev/null
+++ b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/IfacePaths_SOURCES/prefix/BinInInstallPrefix-build/empty.cpp"
+
+  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_SOURCES.txt b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_SOURCES.txt
new file mode 100644
index 0000000..e931a01
--- /dev/null
+++ b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/IfacePaths_SOURCES/BinaryDirectoryInInterface-build/empty.cpp"
+
+  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface.cmake b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface.cmake
index 67ee7de..7001f3f 100644
--- a/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface.cmake
+++ b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface.cmake
@@ -2,7 +2,11 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/foo")
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/foo")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/empty.cpp")
+endif()
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/IfacePaths/DirInInstallPrefix.cmake b/Tests/RunCMake/IfacePaths/DirInInstallPrefix.cmake
index fab7717..f5f3005 100644
--- a/Tests/RunCMake/IfacePaths/DirInInstallPrefix.cmake
+++ b/Tests/RunCMake/IfacePaths/DirInInstallPrefix.cmake
@@ -1,6 +1,11 @@
 enable_language(CXX)
 add_library(testTarget empty.cpp)
-target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/dir")
+
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/dir")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_INSTALL_PREFIX}/empty.cpp")
+endif()
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_SOURCES.txt b/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_SOURCES.txt
new file mode 100644
index 0000000..c79d598
--- /dev/null
+++ b/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/IfacePaths_SOURCES/InstallInBinDir-build/empty.cpp"
+
+  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_SOURCES.txt b/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_SOURCES.txt
new file mode 100644
index 0000000..e71921e
--- /dev/null
+++ b/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/IfacePaths_SOURCES/copy/empty.cpp"
+
+  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_SOURCES.txt b/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_SOURCES.txt
new file mode 100644
index 0000000..2311af9
--- /dev/null
+++ b/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_SOURCES.txt
@@ -0,0 +1,4 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" contains relative path in its INTERFACE_SOURCES:
+
+    "empty.cpp"
diff --git a/Tests/RunCMake/IfacePaths/RelativePathInGenex.cmake b/Tests/RunCMake/IfacePaths/RelativePathInGenex.cmake
index 070a381..489c3a1 100644
--- a/Tests/RunCMake/IfacePaths/RelativePathInGenex.cmake
+++ b/Tests/RunCMake/IfacePaths/RelativePathInGenex.cmake
@@ -2,7 +2,12 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<1:foo>")
+
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<1:foo>")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "$<1:empty.cpp>")
+endif()
 
 add_library(userTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
 target_link_libraries(userTarget testTarget)
diff --git a/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_SOURCES.txt b/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_SOURCES.txt
new file mode 100644
index 0000000..f0f002c
--- /dev/null
+++ b/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_SOURCES.txt
@@ -0,0 +1,4 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains relative path:
+
+    "empty.cpp"
diff --git a/Tests/RunCMake/IfacePaths/RelativePathInInterface.cmake b/Tests/RunCMake/IfacePaths/RelativePathInInterface.cmake
index 4c4727d..e974aac 100644
--- a/Tests/RunCMake/IfacePaths/RelativePathInInterface.cmake
+++ b/Tests/RunCMake/IfacePaths/RelativePathInInterface.cmake
@@ -2,8 +2,11 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "foo")
-
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "foo")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "empty.cpp")
+endif()
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
 )
diff --git a/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_SOURCES.txt b/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_SOURCES.txt
new file mode 100644
index 0000000..c5157ad
--- /dev/null
+++ b/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/IfacePaths/empty.cpp"
+
+  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface.cmake b/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface.cmake
index f814a3c..d80cbec 100644
--- a/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface.cmake
+++ b/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface.cmake
@@ -2,7 +2,11 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/foo")
+if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
+  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/foo")
+else()
+  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
+endif()
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/TargetSources/ExportBuild-result.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-result.txt
similarity index 100%
copy from Tests/RunCMake/TargetSources/ExportBuild-result.txt
copy to Tests/RunCMake/IfacePaths/SrcInInstallPrefix-result.txt
diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-stderr_SOURCES.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-stderr_SOURCES.txt
new file mode 100644
index 0000000..48f2485
--- /dev/null
+++ b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-stderr_SOURCES.txt
@@ -0,0 +1,6 @@
+CMake Error in CMakeLists.txt:
+  Target "testTarget" INTERFACE_SOURCES property contains path:
+
+    ".*Tests/RunCMake/IfacePaths_SOURCES/prefix/src/empty.cpp"
+
+  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/IfacePaths/export-NOWARN.cmake b/Tests/RunCMake/IfacePaths/export-NOWARN.cmake
index 50720a0..592572c 100644
--- a/Tests/RunCMake/IfacePaths/export-NOWARN.cmake
+++ b/Tests/RunCMake/IfacePaths/export-NOWARN.cmake
@@ -1,19 +1,34 @@
 enable_language(CXX)
 add_library(foo empty.cpp)
+
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<0:>/include/subdir)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_PREFIX>/include/subdir)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<0:>/include/subdir/empty.cpp)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_PREFIX>/include/subdir/empty.cpp)
 
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/subdir>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include/subdir>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include/$<0:>>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:$<0:>/include>)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/subdir/empty.cpp>)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:include/subdir/empty.cpp>)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:include/subdir/empty.cpp$<0:>>)
+set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:$<0:>/include/subdir/empty.cpp>)
 
 # target_include_directories(foo INTERFACE include/subdir) # Does and should warn. INSTALL_INTERFACE must not list src dir paths.
 target_include_directories(foo INTERFACE $<0:>/include/subdir) # Does not and should not should warn, because it starts with a genex.
 target_include_directories(foo INTERFACE $<INSTALL_PREFIX>/include/subdir)
+target_sources(foo INTERFACE $<0:>/include/subdir/empty.cpp)
+target_sources(foo INTERFACE $<INSTALL_PREFIX>/include/subdir/empty.cpp)
 
 target_include_directories(foo INTERFACE $<INSTALL_INTERFACE:include/subdir>)
 target_include_directories(foo INTERFACE $<INSTALL_INTERFACE:include/$<0:>>)
+target_sources(foo INTERFACE $<INSTALL_INTERFACE:include/subdir/empty.cpp>)
+target_sources(foo INTERFACE $<INSTALL_INTERFACE:include/subdir/empty.cpp$<0:>>)
+
+install(FILES include/subdir/empty.cpp
+  DESTINATION include/subdir
+)
 
 install(TARGETS foo EXPORT FooTargets DESTINATION lib)
 install(EXPORT FooTargets DESTINATION lib/cmake)
diff --git a/Tests/RunCMake/TargetSources/ExportBuild-result.txt b/Tests/RunCMake/TargetSources/ExportBuild-result.txt
index d00491f..573541a 100644
--- a/Tests/RunCMake/TargetSources/ExportBuild-result.txt
+++ b/Tests/RunCMake/TargetSources/ExportBuild-result.txt
@@ -1 +1 @@
-1
+0
diff --git a/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt b/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
deleted file mode 100644
index 0d65a55..0000000
--- a/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-CMake Error: Target "iface" has a populated INTERFACE_SOURCES property.  This is not currently supported.
diff --git a/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt b/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
deleted file mode 100644
index 0d65a55..0000000
--- a/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-CMake Error: Target "iface" has a populated INTERFACE_SOURCES property.  This is not currently supported.
diff --git a/Tests/RunCMake/TargetSources/ExportInstall.cmake b/Tests/RunCMake/TargetSources/ExportInstall.cmake
deleted file mode 100644
index 8e7c9f9..0000000
--- a/Tests/RunCMake/TargetSources/ExportInstall.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-
-add_library(iface INTERFACE)
-target_sources(iface INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/empty_1.cpp")
-
-install(TARGETS iface EXPORT exp)
-install(EXPORT exp DESTINATION cmake)
diff --git a/Tests/RunCMake/TargetSources/RunCMakeTest.cmake b/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
index 1b4ef0b..4416ef9 100644
--- a/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
+++ b/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
@@ -10,4 +10,3 @@ endif()
 run_cmake(CMP0026-LOCATION)
 run_cmake(RelativePathInInterface)
 run_cmake(ExportBuild)
-run_cmake(ExportInstall)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=736bcb9664b714b91e8a2a573451e0453716f4da
commit 736bcb9664b714b91e8a2a573451e0453716f4da
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 30 13:54:18 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 00:51:30 2015 +0100

    Tests: Move IfacePaths test stderr files.
    
    Rename the files with a property-specific name, so that additional
    properties can be easily tested.

diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr.txt
rename to Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr.txt
rename to Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr.txt b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr.txt
rename to Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt b/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt
rename to Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt b/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt
rename to Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr.txt b/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr.txt
rename to Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr.txt b/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr.txt
rename to Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake b/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake
index 8febf18..489e3df 100644
--- a/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake
+++ b/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake
@@ -2,6 +2,7 @@ include(RunCMake)
 
 macro(run_cmake test)
   list(APPEND RunCMake_TEST_OPTIONS -DTEST_PROP=${TEST_PROP})
+  set(RunCMake-stderr-file ${test}-stderr_${TEST_PROP}.txt)
   _run_cmake(${test})
 endmacro()
 
diff --git a/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr.txt b/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr.txt
rename to Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
rename to Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
similarity index 100%
rename from Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
rename to Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt

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

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Wed Feb 11 00:01:12 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Wed, 11 Feb 2015 00:01:12 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1082-g1979330
Message-ID: <20150211050112.1B983AAA4A@public.kitware.com>

This is an automated email from 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  197933018863c4845262dd6fb47e4edf721445f1 (commit)
      from  cbffbf7437ea2d571e26bedee032c23be9347d94 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=197933018863c4845262dd6fb47e4edf721445f1
commit 197933018863c4845262dd6fb47e4edf721445f1
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Wed Feb 11 00:01:09 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Feb 11 00:01:09 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 03df29d..62cc2b6 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 2)
-set(CMake_VERSION_PATCH 20150210)
+set(CMake_VERSION_PATCH 20150211)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Feb 11 03:41:48 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 11 Feb 2015 03:41:48 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1211-g6c29803
Message-ID: <20150211084148.BA08F513B@public.kitware.com>

This is an automated email from 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  6c298034a8dabeea546317e152c7167924839c39 (commit)
       via  348155f1314d2538353b6936f76dc0466bd60f35 (commit)
       via  df38fac03da0d9c05d3c613f40f1421088ba8b66 (commit)
      from  db0f1df7bada28ea675fb563803786e7251c42b9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c298034a8dabeea546317e152c7167924839c39
commit 6c298034a8dabeea546317e152c7167924839c39
Merge: db0f1df 348155f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 03:41:47 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 03:41:47 2015 -0500

    Merge topic 'use-cmRange' into next
    
    348155f1 Resolve warning.
    df38fac0 Remove unused variable.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=348155f1314d2538353b6936f76dc0466bd60f35
commit 348155f1314d2538353b6936f76dc0466bd60f35
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 09:41:15 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 09:41:15 2015 +0100

    Resolve warning.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 851b105..430e25e 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -122,13 +122,15 @@ struct Range
   const_iterator begin() const { return Begin; }
   const_iterator end() const { return End; }
   bool empty() const { return std::distance(Begin, End) == 0; }
-  Range& advance(size_t amount)
+  template<typename Distance>
+  Range& advance(Distance amount)
   {
     std::advance(Begin, amount);
     return *this;
   }
 
-  Range& retreat(size_t amount)
+  template<typename Distance>
+  Range& retreat(Distance amount)
   {
     std::advance(End, -amount);
     return *this;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df38fac03da0d9c05d3c613f40f1421088ba8b66
commit df38fac03da0d9c05d3c613f40f1421088ba8b66
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 09:30:49 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 09:30:49 2015 +0100

    Remove unused variable.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index ecdd4a0..e09a934 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -254,7 +254,6 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
     if (!this->Depth)
       {
       std::string name = this->Args[0];
-      std::vector<std::string>::size_type cc;
       name += "(";
       if (!this->Args.empty())
         {

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

Summary of changes:
 Source/cmAlgorithms.h     |    6 ++++--
 Source/cmMacroCommand.cxx |    1 -
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 09:27:30 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 09:27:30 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1213-g4367669
Message-ID: <20150211142731.1DE11AA27F@public.kitware.com>

This is an automated email from 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  4367669ad48ddd7dafabeb8b89e1a4c01189d376 (commit)
       via  95f070b6213379f13e37f23af4833e76703a2399 (commit)
      from  6c298034a8dabeea546317e152c7167924839c39 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4367669ad48ddd7dafabeb8b89e1a4c01189d376
commit 4367669ad48ddd7dafabeb8b89e1a4c01189d376
Merge: 6c29803 95f070b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:27:29 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 09:27:29 2015 -0500

    Merge topic 'use-cmRange' into next
    
    95f070b6 cmAlgorithms: Use signed pointer-size type for advance/retreat


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95f070b6213379f13e37f23af4833e76703a2399
commit 95f070b6213379f13e37f23af4833e76703a2399
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:26:35 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 09:26:35 2015 -0500

    cmAlgorithms: Use signed pointer-size type for advance/retreat
    
    The template approach caused the unsigned "-" in retreat to be treated
    as a very large advancement.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 430e25e..ad2b9c1 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -122,15 +122,13 @@ struct Range
   const_iterator begin() const { return Begin; }
   const_iterator end() const { return End; }
   bool empty() const { return std::distance(Begin, End) == 0; }
-  template<typename Distance>
-  Range& advance(Distance amount)
+  Range& advance(cmIML_INT_intptr_t amount)
   {
     std::advance(Begin, amount);
     return *this;
   }
 
-  template<typename Distance>
-  Range& retreat(Distance amount)
+  Range& retreat(cmIML_INT_intptr_t amount)
   {
     std::advance(End, -amount);
     return *this;

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

Summary of changes:
 Source/cmAlgorithms.h |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 09:32:23 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 09:32:23 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1215-g7b5cca3
Message-ID: <20150211143223.7CD67AAA8A@public.kitware.com>

This is an automated email from 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  7b5cca3b2f6a29d570a0ad74ffe242661a930a92 (commit)
       via  68e2abd3912d2ac859c161e9b843d878a7aa76ef (commit)
      from  4367669ad48ddd7dafabeb8b89e1a4c01189d376 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b5cca3b2f6a29d570a0ad74ffe242661a930a92
commit 7b5cca3b2f6a29d570a0ad74ffe242661a930a92
Merge: 4367669 68e2abd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:32:22 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 09:32:22 2015 -0500

    Merge topic 'cpack_rpm_mulit_prefix_fixup' into next
    
    68e2abd3 CPackRPM: Do not run file(GLOB_RECURSE) without CMP0009 set to NEW


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68e2abd3912d2ac859c161e9b843d878a7aa76ef
commit 68e2abd3912d2ac859c161e9b843d878a7aa76ef
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Feb 10 23:03:06 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 09:31:09 2015 -0500

    CPackRPM: Do not run file(GLOB_RECURSE) without CMP0009 set to NEW
    
    The file(GLOB_RECURSE) call added by commit 3ec02547 (CPackRPM: Allow
    multiple path relocation prefixes for one package, 2015-01-21) should
    not follow directory symlinks, so make sure CMP0009 is set to NEW.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 214d655..c53caa1 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -423,6 +423,10 @@
 
 # Author: Eric Noulard with the help of Alexander Neundorf.
 
+# prevent older policies from interfearing with this script
+cmake_policy(PUSH)
+cmake_policy(VERSION ${CMAKE_VERSION})
+
 function(cpack_rpm_prepare_relocation_paths)
   # set appropriate prefix, remove possible trailing slash and convert backslashes to slashes
   if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_PREFIX)
@@ -1308,3 +1312,6 @@ if(CPACK_RPM_PACKAGE_DESCRIPTION_)
 else()
   unset(CPACK_RPM_PACKAGE_DESCRIPTION)
 endif()
+
+# restore previous policies
+cmake_policy(POP)

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 09:56:22 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 09:56:22 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1217-ge54b99a
Message-ID: <20150211145622.9D58CAAC76@public.kitware.com>

This is an automated email from 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  e54b99aa321c4290e0dce1c547107642005e78b4 (commit)
       via  02fc84777922c6de9923e3f5ef0ac4d3bd7b1bc4 (commit)
      from  7b5cca3b2f6a29d570a0ad74ffe242661a930a92 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e54b99aa321c4290e0dce1c547107642005e78b4
commit e54b99aa321c4290e0dce1c547107642005e78b4
Merge: 7b5cca3 02fc847
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:56:21 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 09:56:21 2015 -0500

    Merge topic 'cpack_rpm_mulit_prefix_fixup' into next
    
    02fc8477 fixup! CPackRPM: Do not run file(GLOB_RECURSE) without CMP0009 set to NEW


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02fc84777922c6de9923e3f5ef0ac4d3bd7b1bc4
commit 02fc84777922c6de9923e3f5ef0ac4d3bd7b1bc4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:33:51 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 09:33:51 2015 -0500

    fixup! CPackRPM: Do not run file(GLOB_RECURSE) without CMP0009 set to NEW

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index c53caa1..7516393 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -423,10 +423,6 @@
 
 # Author: Eric Noulard with the help of Alexander Neundorf.
 
-# prevent older policies from interfearing with this script
-cmake_policy(PUSH)
-cmake_policy(VERSION ${CMAKE_VERSION})
-
 function(cpack_rpm_prepare_relocation_paths)
   # set appropriate prefix, remove possible trailing slash and convert backslashes to slashes
   if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_PREFIX)
@@ -459,7 +455,12 @@ function(cpack_rpm_prepare_relocation_paths)
   endforeach()
 
   # warn about all the paths that are not relocatable
-  file(GLOB_RECURSE FILE_PATHS_ "${WDIR}/*")
+  cmake_policy(PUSH)
+    # Tell file(GLOB_RECURSE) not to follow directory symlinks
+    # even if the project does not set this policy to NEW.
+    cmake_policy(SET CMP0009 NEW)
+    file(GLOB_RECURSE FILE_PATHS_ "${WDIR}/*")
+  cmake_policy(POP)
   foreach(TMP_PATH ${FILE_PATHS_})
     string(LENGTH "${WDIR}" WDIR_LEN)
     string(SUBSTRING "${TMP_PATH}" ${WDIR_LEN} -1 TMP_PATH)
@@ -1312,6 +1313,3 @@ if(CPACK_RPM_PACKAGE_DESCRIPTION_)
 else()
   unset(CPACK_RPM_PACKAGE_DESCRIPTION)
 endif()
-
-# restore previous policies
-cmake_policy(POP)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 09:56:47 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 09:56:47 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1219-g0e9460a
Message-ID: <20150211145648.045A0AAC7B@public.kitware.com>

This is an automated email from 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  0e9460a458bb4b5e02594a0a2f4579845f77d37b (commit)
       via  be36bfd65d53962c7ba975382bd911e0857f6a33 (commit)
      from  e54b99aa321c4290e0dce1c547107642005e78b4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e9460a458bb4b5e02594a0a2f4579845f77d37b
commit 0e9460a458bb4b5e02594a0a2f4579845f77d37b
Merge: e54b99a be36bfd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:56:47 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 09:56:47 2015 -0500

    Merge topic 'cpack_rpm_mulit_prefix_fixup' into next
    
    be36bfd6 CPackRPM: Do not run file(GLOB_RECURSE) without CMP0009 set to NEW


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be36bfd65d53962c7ba975382bd911e0857f6a33
commit be36bfd65d53962c7ba975382bd911e0857f6a33
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Feb 10 23:03:06 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 09:56:27 2015 -0500

    CPackRPM: Do not run file(GLOB_RECURSE) without CMP0009 set to NEW
    
    The file(GLOB_RECURSE) call added by commit 3ec02547 (CPackRPM: Allow
    multiple path relocation prefixes for one package, 2015-01-21) should
    not follow directory symlinks, so make sure CMP0009 is set to NEW.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 214d655..7516393 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -455,7 +455,12 @@ function(cpack_rpm_prepare_relocation_paths)
   endforeach()
 
   # warn about all the paths that are not relocatable
-  file(GLOB_RECURSE FILE_PATHS_ "${WDIR}/*")
+  cmake_policy(PUSH)
+    # Tell file(GLOB_RECURSE) not to follow directory symlinks
+    # even if the project does not set this policy to NEW.
+    cmake_policy(SET CMP0009 NEW)
+    file(GLOB_RECURSE FILE_PATHS_ "${WDIR}/*")
+  cmake_policy(POP)
   foreach(TMP_PATH ${FILE_PATHS_})
     string(LENGTH "${WDIR}" WDIR_LEN)
     string(SUBSTRING "${TMP_PATH}" ${WDIR_LEN} -1 TMP_PATH)

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 09:59:19 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 09:59:19 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1084-g939167a
Message-ID: <20150211145919.EB1C7AAD33@public.kitware.com>

This is an automated email from 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  939167a65cf7e057ac98c63f8e3ff0acd4129c28 (commit)
       via  eeb2831b5f35af1ec8a65be343e754ff1c29550d (commit)
      from  197933018863c4845262dd6fb47e4edf721445f1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=939167a65cf7e057ac98c63f8e3ff0acd4129c28
commit 939167a65cf7e057ac98c63f8e3ff0acd4129c28
Merge: 1979330 eeb2831
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:59:18 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 09:59:18 2015 -0500

    Merge topic 'makefile-missing-comment'
    
    eeb2831b Makefile: Fix regression in target-bound custom command COMMENT output


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 09:59:22 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 09:59:22 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1086-g0e6af85
Message-ID: <20150211145922.1B3EDAAD38@public.kitware.com>

This is an automated email from 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  0e6af852637ada6b2343f1cbf1ac5ccf0b1b3c76 (commit)
       via  f3e9eeedf43f783c02b2a2a10fc0e632eaf7cfd0 (commit)
      from  939167a65cf7e057ac98c63f8e3ff0acd4129c28 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e6af852637ada6b2343f1cbf1ac5ccf0b1b3c76
commit 0e6af852637ada6b2343f1cbf1ac5ccf0b1b3c76
Merge: 939167a f3e9eee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:59:20 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 09:59:20 2015 -0500

    Merge topic 'try_compile-shorter-names'
    
    f3e9eeed try_compile: Use shorter test executable name with consistent length


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 09:59:24 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 09:59:24 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1088-gdcc5de9
Message-ID: <20150211145924.2E8BBAAD35@public.kitware.com>

This is an automated email from 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  dcc5de9c4b7dbc17229d9f11aee978f6828d932d (commit)
       via  e5ef9271a1bb1a0779132beba4cf2b0bae13d6cc (commit)
      from  0e6af852637ada6b2343f1cbf1ac5ccf0b1b3c76 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcc5de9c4b7dbc17229d9f11aee978f6828d932d
commit dcc5de9c4b7dbc17229d9f11aee978f6828d932d
Merge: 0e6af85 e5ef927
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:59:22 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 09:59:22 2015 -0500

    Merge topic 'FindRuby-windows-x64'
    
    e5ef9271 FindRuby: Fix finding 64-bit Ruby on Windows


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 09:59:25 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 09:59:25 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1090-gf3c0c61
Message-ID: <20150211145925.E55EEAAC7E@public.kitware.com>

This is an automated email from 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  f3c0c6140360d0591c5163e7a3fcdf0040f4690f (commit)
       via  85fd62ee91b7a8dcb929eee36424886bd0b59592 (commit)
      from  dcc5de9c4b7dbc17229d9f11aee978f6828d932d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3c0c6140360d0591c5163e7a3fcdf0040f4690f
commit f3c0c6140360d0591c5163e7a3fcdf0040f4690f
Merge: dcc5de9 85fd62e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:59:24 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 09:59:24 2015 -0500

    Merge topic 'bootstrap-sphinx-qthelp'
    
    85fd62ee bootstrap: Add --sphinx-qthelp option to enable qthelp doc generation


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

Summary of changes:
 bootstrap |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 09:59:27 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 09:59:27 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1092-g79ea7e6
Message-ID: <20150211145927.A1A23AAD3C@public.kitware.com>

This is an automated email from 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  79ea7e6d087924ff1c898e727b6e83944f0f689d (commit)
       via  a27c13f4cad2247833d048ec5e334861943fd4d9 (commit)
      from  f3c0c6140360d0591c5163e7a3fcdf0040f4690f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79ea7e6d087924ff1c898e727b6e83944f0f689d
commit 79ea7e6d087924ff1c898e727b6e83944f0f689d
Merge: f3c0c61 a27c13f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:59:26 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 09:59:26 2015 -0500

    Merge topic 'BundleUtilities-install_name_tool-exit'
    
    a27c13f4 BundleUtilities: Teach fixup_bundle to check install_name_tool result


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 09:59:29 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 09:59:29 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1094-gc1772e5
Message-ID: <20150211145929.627CFAAD41@public.kitware.com>

This is an automated email from 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  c1772e5fb25b798a99cdcc820272ca9457123eb6 (commit)
       via  56cb4a6c3a71f1a3d3e0dccbdc593bc58d76c5ee (commit)
      from  79ea7e6d087924ff1c898e727b6e83944f0f689d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1772e5fb25b798a99cdcc820272ca9457123eb6
commit c1772e5fb25b798a99cdcc820272ca9457123eb6
Merge: 79ea7e6 56cb4a6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:59:28 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 09:59:28 2015 -0500

    Merge topic 'fix_timeout_docs'
    
    56cb4a6c Help: Fix variable reference in TIMEOUT test property docs


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

Summary of changes:
 Help/prop_test/TIMEOUT.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 09:59:31 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 09:59:31 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1100-g108e94e
Message-ID: <20150211145931.67475AAD42@public.kitware.com>

This is an automated email from 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  108e94ecf11d33f3d87ea3c09cfc7961aa785641 (commit)
       via  f7e33820b628f39ae2e0ba3d25279545dfe18f73 (commit)
       via  6da65b3907419df28484c570f24d0da3593a0e5a (commit)
       via  736bcb9664b714b91e8a2a573451e0453716f4da (commit)
       via  d9f8390db6ab0d776eb39b840a3b096b5422229f (commit)
       via  cc1520947608f5224a4fdfa94b5cb07e19e23600 (commit)
      from  c1772e5fb25b798a99cdcc820272ca9457123eb6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=108e94ecf11d33f3d87ea3c09cfc7961aa785641
commit 108e94ecf11d33f3d87ea3c09cfc7961aa785641
Merge: c1772e5 f7e3382
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:59:30 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 09:59:30 2015 -0500

    Merge topic 'export-interface-source-files'
    
    f7e33820 Add release notes for export-interface-source-files.
    6da65b39 Allow export of targets with INTERFACE_SOURCES.
    736bcb96 Tests: Move IfacePaths test stderr files.
    d9f8390d Tests: Run IfacePaths tests with a parameter.
    cc152094 Tests: Split part of include_directories test to a generic location.


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

Summary of changes:
 Help/command/target_sources.rst                    |    4 -
 Help/prop_tgt/INTERFACE_SOURCES.rst                |    4 -
 Help/release/dev/export-interface-source-files.rst |    6 +
 Source/cmExportBuildFileGenerator.cxx              |   13 +-
 Source/cmExportFileGenerator.cxx                   |  136 +++++++++++++------
 Source/cmExportFileGenerator.h                     |    5 +
 Source/cmExportInstallFileGenerator.cxx            |   28 ++--
 Tests/ExportImport/Export/Interface/CMakeLists.txt |   12 +-
 .../Export/Interface/source_target.cpp             |   13 ++
 .../Export/Interface/source_target_for_install.cpp |   13 ++
 Tests/ExportImport/Import/Interface/CMakeLists.txt |    8 ++
 .../Import/Interface/source_target_test.cpp        |    7 +
 Tests/RunCMake/CMakeLists.txt                      |    6 +
 .../BinInInstallPrefix-CMP0052-NEW-result.txt}     |    0
 ...fix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../BinInInstallPrefix-CMP0052-OLD-result.txt      |    0
 .../BinInInstallPrefix-CMP0052-WARN-result.txt     |    0
 ...ix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} |    6 +-
 .../BinInInstallPrefix-result.txt}                 |    0
 .../BinInInstallPrefix-stderr_SOURCES.txt          |    6 +
 .../BinaryDirectoryInInterface-result.txt}         |    0
 ...toryInInterface-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../BinaryDirectoryInInterface-stderr_SOURCES.txt  |    6 +
 .../IfacePaths/BinaryDirectoryInInterface.cmake    |   15 +++
 .../CMakeLists.txt                                 |    0
 .../DirInInstallPrefix-result.txt                  |    0
 Tests/RunCMake/IfacePaths/DirInInstallPrefix.cmake |   14 ++
 .../InstallInBinDir-result.txt}                    |    0
 ...InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../IfacePaths/InstallInBinDir-stderr_SOURCES.txt  |    6 +
 .../InstallInSrcDir-result.txt}                    |    0
 ...InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../IfacePaths/InstallInSrcDir-stderr_SOURCES.txt  |    6 +
 .../InstallPrefixInInterface-result.txt            |    0
 .../InstallPrefixInInterface.cmake                 |    0
 .../InstallToPrefixInSrcDirInSource-result.txt     |    0
 .../InstallToPrefixInSrcDirOutOfSource-result.txt  |    0
 .../RelativePathInGenex-result.txt}                |    0
 ...tivePathInGenex-stderr_INCLUDE_DIRECTORIES.txt} |    0
 .../RelativePathInGenex-stderr_SOURCES.txt         |    4 +
 .../RunCMake/IfacePaths/RelativePathInGenex.cmake  |   13 ++
 .../RelativePathInInterface-result.txt}            |    0
 ...PathInInterface-stderr_INCLUDE_DIRECTORIES.txt} |    0
 .../RelativePathInInterface-stderr_SOURCES.txt     |    4 +
 .../IfacePaths/RelativePathInInterface.cmake       |   14 ++
 .../RunCMakeTest.cmake                             |   42 +++---
 .../SourceDirectoryInInterface-result.txt}         |    0
 ...toryInInterface-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../SourceDirectoryInInterface-stderr_SOURCES.txt  |    6 +
 .../IfacePaths/SourceDirectoryInInterface.cmake    |   15 +++
 .../SrcInInstallPrefix-CMP0052-NEW-result.txt}     |    0
 ...fix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} |    2 +-
 .../SrcInInstallPrefix-CMP0052-OLD-result.txt      |    0
 .../SrcInInstallPrefix-CMP0052-WARN-result.txt     |    0
 ...ix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} |    6 +-
 .../SrcInInstallPrefix-result.txt}                 |    0
 .../SrcInInstallPrefix-stderr_SOURCES.txt          |    6 +
 Tests/RunCMake/{CMP0004 => IfacePaths}/empty.cpp   |    0
 .../export-NOWARN-result.txt                       |    0
 .../export-NOWARN.cmake                            |   15 +++
 .../RunCMake/TargetSources/ExportBuild-result.txt  |    2 +-
 .../RunCMake/TargetSources/ExportBuild-stderr.txt  |    1 -
 .../TargetSources/ExportInstall-result.txt         |    1 -
 .../TargetSources/ExportInstall-stderr.txt         |    1 -
 Tests/RunCMake/TargetSources/ExportInstall.cmake   |    6 -
 Tests/RunCMake/TargetSources/RunCMakeTest.cmake    |    1 -
 .../BinInInstallPrefix-CMP0052-NEW-result.txt      |    1 -
 .../BinaryDirectoryInInterface-result.txt          |    1 -
 .../BinaryDirectoryInInterface.cmake               |   11 --
 Tests/RunCMake/include_directories/CMakeLists.txt  |    5 +-
 .../include_directories/DirInInstallPrefix.cmake   |    9 --
 .../include_directories/InstallInBinDir-result.txt |    1 -
 .../include_directories/InstallInSrcDir-result.txt |    1 -
 .../RelativePathInGenex-result.txt                 |    1 -
 .../include_directories/RelativePathInGenex.cmake  |    8 --
 .../RelativePathInInterface-result.txt             |    1 -
 .../RelativePathInInterface.cmake                  |   11 --
 .../include_directories/RunCMakeTest.cmake         |  141 --------------------
 .../SourceDirectoryInInterface-result.txt          |    1 -
 .../SourceDirectoryInInterface.cmake               |   11 --
 .../SrcInInstallPrefix-CMP0052-NEW-result.txt      |    1 -
 81 files changed, 349 insertions(+), 318 deletions(-)
 create mode 100644 Help/release/dev/export-interface-source-files.rst
 create mode 100644 Tests/ExportImport/Export/Interface/source_target.cpp
 create mode 100644 Tests/ExportImport/Export/Interface/source_target_for_install.cpp
 create mode 100644 Tests/ExportImport/Import/Interface/source_target_test.cpp
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/BinInInstallPrefix-CMP0052-NEW-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt => IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} (60%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/BinInInstallPrefix-CMP0052-OLD-result.txt (100%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/BinInInstallPrefix-CMP0052-WARN-result.txt (100%)
 rename Tests/RunCMake/{include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt => IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} (66%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/BinInInstallPrefix-result.txt} (100%)
 create mode 100644 Tests/RunCMake/IfacePaths/BinInInstallPrefix-stderr_SOURCES.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/BinaryDirectoryInInterface-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/BinaryDirectoryInInterface-stderr.txt => IfacePaths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt} (64%)
 create mode 100644 Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_SOURCES.txt
 create mode 100644 Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface.cmake
 copy Tests/RunCMake/{include_directories => IfacePaths}/CMakeLists.txt (100%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/DirInInstallPrefix-result.txt (100%)
 create mode 100644 Tests/RunCMake/IfacePaths/DirInInstallPrefix.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/InstallInBinDir-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/InstallInBinDir-stderr.txt => IfacePaths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt} (65%)
 create mode 100644 Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_SOURCES.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/InstallInSrcDir-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/InstallInSrcDir-stderr.txt => IfacePaths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt} (70%)
 create mode 100644 Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_SOURCES.txt
 rename Tests/RunCMake/{include_directories => IfacePaths}/InstallPrefixInInterface-result.txt (100%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/InstallPrefixInInterface.cmake (100%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/InstallToPrefixInSrcDirInSource-result.txt (100%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/InstallToPrefixInSrcDirOutOfSource-result.txt (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/RelativePathInGenex-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/RelativePathInGenex-stderr.txt => IfacePaths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt} (100%)
 create mode 100644 Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_SOURCES.txt
 create mode 100644 Tests/RunCMake/IfacePaths/RelativePathInGenex.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/RelativePathInInterface-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/RelativePathInInterface-stderr.txt => IfacePaths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt} (100%)
 create mode 100644 Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_SOURCES.txt
 create mode 100644 Tests/RunCMake/IfacePaths/RelativePathInInterface.cmake
 copy Tests/RunCMake/{include_directories => IfacePaths}/RunCMakeTest.cmake (86%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/SourceDirectoryInInterface-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/SourceDirectoryInInterface-stderr.txt => IfacePaths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt} (78%)
 create mode 100644 Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_SOURCES.txt
 create mode 100644 Tests/RunCMake/IfacePaths/SourceDirectoryInInterface.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/SrcInInstallPrefix-CMP0052-NEW-result.txt} (100%)
 rename Tests/RunCMake/{include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt => IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} (69%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/SrcInInstallPrefix-CMP0052-OLD-result.txt (100%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/SrcInInstallPrefix-CMP0052-WARN-result.txt (100%)
 rename Tests/RunCMake/{include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt => IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} (72%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => IfacePaths/SrcInInstallPrefix-result.txt} (100%)
 create mode 100644 Tests/RunCMake/IfacePaths/SrcInInstallPrefix-stderr_SOURCES.txt
 copy Tests/RunCMake/{CMP0004 => IfacePaths}/empty.cpp (100%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/export-NOWARN-result.txt (100%)
 rename Tests/RunCMake/{include_directories => IfacePaths}/export-NOWARN.cmake (71%)
 delete mode 100644 Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
 delete mode 100644 Tests/RunCMake/TargetSources/ExportInstall-result.txt
 delete mode 100644 Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
 delete mode 100644 Tests/RunCMake/TargetSources/ExportInstall.cmake
 delete mode 100644 Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/BinaryDirectoryInInterface-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake
 delete mode 100644 Tests/RunCMake/include_directories/DirInInstallPrefix.cmake
 delete mode 100644 Tests/RunCMake/include_directories/InstallInBinDir-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/InstallInSrcDir-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/RelativePathInGenex-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/RelativePathInGenex.cmake
 delete mode 100644 Tests/RunCMake/include_directories/RelativePathInInterface-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/RelativePathInInterface.cmake
 delete mode 100644 Tests/RunCMake/include_directories/SourceDirectoryInInterface-result.txt
 delete mode 100644 Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake
 delete mode 100644 Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-result.txt


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 10:02:38 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 10:02:38 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1228-g72cef44
Message-ID: <20150211150238.B4E49AAD9E@public.kitware.com>

This is an automated email from 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  72cef4494cf123a04cc1cf447950fa4c51558d89 (commit)
       via  108e94ecf11d33f3d87ea3c09cfc7961aa785641 (commit)
       via  c1772e5fb25b798a99cdcc820272ca9457123eb6 (commit)
       via  79ea7e6d087924ff1c898e727b6e83944f0f689d (commit)
       via  f3c0c6140360d0591c5163e7a3fcdf0040f4690f (commit)
       via  dcc5de9c4b7dbc17229d9f11aee978f6828d932d (commit)
       via  0e6af852637ada6b2343f1cbf1ac5ccf0b1b3c76 (commit)
       via  939167a65cf7e057ac98c63f8e3ff0acd4129c28 (commit)
       via  197933018863c4845262dd6fb47e4edf721445f1 (commit)
      from  0e9460a458bb4b5e02594a0a2f4579845f77d37b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72cef4494cf123a04cc1cf447950fa4c51558d89
commit 72cef4494cf123a04cc1cf447950fa4c51558d89
Merge: 0e9460a 108e94e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 10:02:27 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 10:02:27 2015 -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 Feb 11 10:05:55 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 10:05:55 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1230-g517360a
Message-ID: <20150211150555.45CBBAAE14@public.kitware.com>

This is an automated email from 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  517360a715c0f52408359715c0505789262692f2 (commit)
       via  bc76786efe4f4bebfa6fbd5b217b16c596ed1cd6 (commit)
      from  72cef4494cf123a04cc1cf447950fa4c51558d89 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=517360a715c0f52408359715c0505789262692f2
commit 517360a715c0f52408359715c0505789262692f2
Merge: 72cef44 bc76786
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 10:05:54 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 10:05:54 2015 -0500

    Merge topic 'use-cmRange' into next
    
    bc76786e cmFunctionCommand: Remove unused variable


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc76786efe4f4bebfa6fbd5b217b16c596ed1cd6
commit bc76786efe4f4bebfa6fbd5b217b16c596ed1cd6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 10:04:41 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 10:04:41 2015 -0500

    cmFunctionCommand: Remove unused variable

diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index 2e71b01..b44e228 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -193,7 +193,6 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
     if (!this->Depth)
       {
       std::string name = this->Args[0];
-      std::vector<std::string>::size_type cc;
       name += "( ";
       name += cmJoin(this->Args, " ");
       name += " )";

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

Summary of changes:
 Source/cmFunctionCommand.cxx |    1 -
 1 file changed, 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 10:22:36 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 10:22:36 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1106-gf00829a
Message-ID: <20150211152236.565BBAA34D@public.kitware.com>

This is an automated email from 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  f00829a9384283ef1cf86b337b41eaed30ca7ded (commit)
       via  d891b971b7d5d39c05d1e757ebc6068260bf1e9e (commit)
       via  0a95c5ce2ef8d9887c4a0bdde480155d75f12c7b (commit)
       via  f3a6e0cb6a96ca2c3e363371c17940d5cb2ed791 (commit)
       via  001cd08187513809e688d12469c5b6a13702aeba (commit)
       via  8ad8a81d5c150db2c4823b57cdc8e2f2de9afc91 (commit)
      from  108e94ecf11d33f3d87ea3c09cfc7961aa785641 (commit)

Those revisions listed 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 Feb 11 10:22:36 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 10:22:36 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1237-g546ffe6
Message-ID: <20150211152236.7B4E8AA396@public.kitware.com>

This is an automated email from 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  546ffe6f3e9f29a41584b7f72700f79b4e62bc59 (commit)
       via  f00829a9384283ef1cf86b337b41eaed30ca7ded (commit)
       via  d891b971b7d5d39c05d1e757ebc6068260bf1e9e (commit)
       via  0a95c5ce2ef8d9887c4a0bdde480155d75f12c7b (commit)
       via  f3a6e0cb6a96ca2c3e363371c17940d5cb2ed791 (commit)
       via  001cd08187513809e688d12469c5b6a13702aeba (commit)
       via  8ad8a81d5c150db2c4823b57cdc8e2f2de9afc91 (commit)
      from  517360a715c0f52408359715c0505789262692f2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=546ffe6f3e9f29a41584b7f72700f79b4e62bc59
commit 546ffe6f3e9f29a41584b7f72700f79b4e62bc59
Merge: 517360a f00829a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 10:22:25 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 10:22:25 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 10:22:36 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 10:22:36 -0500 (EST)
Subject: [Cmake-commits] CMake branch, release, updated. v3.1.2-1028-g0a95c5c
Message-ID: <20150211152236.9D740AA3E0@public.kitware.com>

This is an automated email from 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  0a95c5ce2ef8d9887c4a0bdde480155d75f12c7b (commit)
       via  56cb4a6c3a71f1a3d3e0dccbdc593bc58d76c5ee (commit)
       via  f3a6e0cb6a96ca2c3e363371c17940d5cb2ed791 (commit)
       via  85fd62ee91b7a8dcb929eee36424886bd0b59592 (commit)
       via  001cd08187513809e688d12469c5b6a13702aeba (commit)
       via  eeb2831b5f35af1ec8a65be343e754ff1c29550d (commit)
      from  0b8d9581c0a651f36fc5a2d0b996fd006152ce50 (commit)

Those revisions listed 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:
 Help/prop_test/TIMEOUT.rst               |    2 +-
 Source/cmLocalUnixMakefileGenerator3.cxx |    2 +-
 bootstrap                                |    8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 10:24:45 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 10:24:45 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1240-g6d83350
Message-ID: <20150211152445.BD9BDAA92F@public.kitware.com>

This is an automated email from 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  6d83350ced7e7a3760c60ab37bf5aecd3eb70637 (commit)
       via  c24aa305bc437c6f1c13ce17e18eccb3a52f5a60 (commit)
       via  bd6389f7bce6d69a75e6f84245834e19b24cc03f (commit)
      from  546ffe6f3e9f29a41584b7f72700f79b4e62bc59 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d83350ced7e7a3760c60ab37bf5aecd3eb70637
commit 6d83350ced7e7a3760c60ab37bf5aecd3eb70637
Merge: 546ffe6 c24aa30
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 10:24:44 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 10:24:44 2015 -0500

    Merge topic 'test-release' into next
    
    c24aa305 Merge branch 'release-3.1' into test-release
    bd6389f7 CMake 3.1.3


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c24aa305bc437c6f1c13ce17e18eccb3a52f5a60
commit c24aa305bc437c6f1c13ce17e18eccb3a52f5a60
Merge: f00829a bd6389f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 10:24:01 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 10:24:01 2015 -0500

    Merge branch 'release-3.1' into test-release


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd6389f7bce6d69a75e6f84245834e19b24cc03f
commit bd6389f7bce6d69a75e6f84245834e19b24cc03f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 10:23:38 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 10:23:38 2015 -0500

    CMake 3.1.3

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

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 11:07:36 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 11:07:36 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1242-g8a24443
Message-ID: <20150211160736.3BFF8AAF97@public.kitware.com>

This is an automated email from 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  8a2444385c68619836ed4e73a1175517b67d17c1 (commit)
       via  e2a8984c06a5f466a268ad7f1a7a8578bfe6bf5b (commit)
      from  6d83350ced7e7a3760c60ab37bf5aecd3eb70637 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a2444385c68619836ed4e73a1175517b67d17c1
commit 8a2444385c68619836ed4e73a1175517b67d17c1
Merge: 6d83350 e2a8984
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 11:07:35 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 11:07:35 2015 -0500

    Merge topic 'FindCoin3D-drop-link' into next
    
    e2a8984c FindCoin3D: Drop link to project homepage


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2a8984c06a5f466a268ad7f1a7a8578bfe6bf5b
commit e2a8984c06a5f466a268ad7f1a7a8578bfe6bf5b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 11:03:02 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 11:05:55 2015 -0500

    FindCoin3D: Drop link to project homepage
    
    The project has moved from <http://www.coin3d.org/> to
    <https://bitbucket.org/Coin3D/coin/wiki/Home>.  Simply drop the
    out-dated link.  Few find modules have links to the project sites.
    Anyone looking to use a given find module likely already knows about the
    project it finds and can use a search engine to find its homepage.

diff --git a/Modules/FindCoin3D.cmake b/Modules/FindCoin3D.cmake
index b5c3a96..f90860c 100644
--- a/Modules/FindCoin3D.cmake
+++ b/Modules/FindCoin3D.cmake
@@ -5,8 +5,7 @@
 # Find Coin3D (Open Inventor)
 #
 # Coin3D is an implementation of the Open Inventor API.  It provides
-# data structures and algorithms for 3D visualization
-# http://www.coin3d.org/
+# data structures and algorithms for 3D visualization.
 #
 # This module defines the following variables
 #

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

Summary of changes:
 Modules/FindCoin3D.cmake |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Feb 11 14:51:38 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 11 Feb 2015 14:51:38 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1262-g06b19bb
Message-ID: <20150211195138.5A3DCAAA5C@public.kitware.com>

This is an automated email from 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  06b19bbb3777430b3348a082d57da56f0d6e0e34 (commit)
       via  60ebc7d79f98c44fee7d3b9011808278284eaade (commit)
       via  6def2609ecf259c34b5d4fcac1f0702e648a7d61 (commit)
       via  3f1cb2c0712e4e87b092643db981339033558a1b (commit)
       via  40c13235fca82b96a1d6ee7ac6b7bb4d6020562a (commit)
       via  a6a7e14a9242e7eb8bd0828aeeff39fd0f9794cd (commit)
       via  a505a05562e50fdf8251e5fdbf2d32383f6b47aa (commit)
       via  59345fec63e59eda6c9ffd257ace7b15d4ebfb97 (commit)
       via  28ec965e9cb5fd997c611081a1add1c410e35916 (commit)
       via  437febee725af25a028e786571120d073933c763 (commit)
       via  4d6ba5ceb73a61aafd0a47da70c02c65daac1c2d (commit)
       via  892c822a209097b23150a031a76e477cfcd6b067 (commit)
       via  6650bcdcb1c99550983a1b8e8d25e8e62735f9b0 (commit)
       via  e8c13de3780cc6ec4c213ca2c01d90aa3ebd543b (commit)
       via  af289a56b78fe0d584cd97cb01c7e8d6f90ed91b (commit)
       via  9e784682ada6badec5b4da09d6e05594774801f9 (commit)
       via  6a4efb0ebd87bcb66a3bf98246aef491c82fa6c7 (commit)
       via  11ecc31d0a2da0090195a682364fb4628f55673a (commit)
       via  f95543f8a6b38bf6d5350169bdb53d5066839b76 (commit)
       via  9fe8f49353f927882af256c7870eb24e4be0c9be (commit)
      from  8a2444385c68619836ed4e73a1175517b67d17c1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06b19bbb3777430b3348a082d57da56f0d6e0e34
commit 06b19bbb3777430b3348a082d57da56f0d6e0e34
Merge: 8a24443 60ebc7d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 14:51:35 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 14:51:35 2015 -0500

    Merge topic 'use-cmRange' into next
    
    60ebc7d7 Convert loop into two algorithms.
    6def2609 Convert loop to the common pattern.
    3f1cb2c0 Move loop inside of condition.
    40c13235 Handle last element outside of the loop.
    a6a7e14a cmTarget: Use a sorted vector in place of a set.
    a505a055 cmSet: Replace loop with cmJoin.
    59345fec cmFindBase: Replace loop with cmJoin on range.
    28ec965e Convert loops to cmJoin algorithm with cmRange.
    437febee cmStringCommand: Accumulate with cmJoin and range adaptors.
    4d6ba5ce cmAlgorithms: Add a range adaptor and API for adjusting a range.
    892c822a Use cmJoin to accumulate string ranges.
    6650bcdc cmAlgorithms: Add a Range container and adaptor method.
    e8c13de3 Replace common loop pattern with cmJoin
    af289a56 Convert loops populating maybe-empty content into the common pattern.
    9e784682 Convert loops into the commonly used pattern.
    6a4efb0e cmMacroCommand: Remove counting variable.
    ...


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60ebc7d79f98c44fee7d3b9011808278284eaade
commit 60ebc7d79f98c44fee7d3b9011808278284eaade
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 24 18:07:37 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:08 2015 +0100

    Convert loop into two algorithms.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 359141a..a08c159 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2299,16 +2299,12 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
       {
       // Now add the rest of the components separated by the proper slash
       // direction for this platform.
-      const char* sep = "";
-      for(unsigned int i=1; i < components.size() - 1; ++i)
-        {
-        if(!components[i].empty())
-          {
-          result += sep;
-          result += components[i];
-          sep = slash;
-          }
-        }
+      std::vector<std::string>::const_iterator compEnd
+          = std::remove(components.begin() + 1, components.end() - 1,
+                          std::string());
+      std::vector<std::string>::const_iterator compStart
+          = components.begin() + 1;
+      result += cmJoin(cmRange(compStart, compEnd), slash);
       // Only the last component can be empty to avoid double slashes.
       result += slash;
       result += components.back();

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6def2609ecf259c34b5d4fcac1f0702e648a7d61
commit 6def2609ecf259c34b5d4fcac1f0702e648a7d61
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 23 01:06:40 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:08 2015 +0100

    Convert loop to the common pattern.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 703ab27..359141a 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2299,24 +2299,18 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
       {
       // Now add the rest of the components separated by the proper slash
       // direction for this platform.
-      bool first = true;
+      const char* sep = "";
       for(unsigned int i=1; i < components.size() - 1; ++i)
         {
         if(!components[i].empty())
           {
-          if(!first)
-            {
-            result += slash;
-            }
+          result += sep;
           result += components[i];
-          first = false;
+          sep = slash;
           }
         }
       // Only the last component can be empty to avoid double slashes.
-      if(!first)
-        {
-        result += slash;
-        }
+      result += slash;
       result += components.back();
       }
     }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f1cb2c0712e4e87b092643db981339033558a1b
commit 3f1cb2c0712e4e87b092643db981339033558a1b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 23:09:03 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:08 2015 +0100

    Move loop inside of condition.
    
    The loop is only executed if the condition is true.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 32da821..703ab27 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2295,23 +2295,23 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
     // Begin the quoted result with the root component.
     result += components[0];
 
-    // Now add the rest of the components separated by the proper slash
-    // direction for this platform.
-    bool first = true;
-    for(unsigned int i=1; i < components.size() - 1; ++i)
+    if (components.size() > 1)
       {
-      if(!components[i].empty())
+      // Now add the rest of the components separated by the proper slash
+      // direction for this platform.
+      bool first = true;
+      for(unsigned int i=1; i < components.size() - 1; ++i)
         {
-        if(!first)
+        if(!components[i].empty())
           {
-          result += slash;
+          if(!first)
+            {
+            result += slash;
+            }
+          result += components[i];
+          first = false;
           }
-        result += components[i];
-        first = false;
         }
-      }
-    if (components.size() > 1)
-      {
       // Only the last component can be empty to avoid double slashes.
       if(!first)
         {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=40c13235fca82b96a1d6ee7ac6b7bb4d6020562a
commit 40c13235fca82b96a1d6ee7ac6b7bb4d6020562a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 23 01:03:45 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:08 2015 +0100

    Handle last element outside of the loop.
    
    There is no point in checking on each loop iteration whether
    it is the last element.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 54d330f..32da821 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2298,10 +2298,9 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
     // Now add the rest of the components separated by the proper slash
     // direction for this platform.
     bool first = true;
-    for(unsigned int i=1; i < components.size(); ++i)
+    for(unsigned int i=1; i < components.size() - 1; ++i)
       {
-      // Only the last component can be empty to avoid double slashes.
-      if(!components[i].empty() || (i == (components.size()-1)))
+      if(!components[i].empty())
         {
         if(!first)
           {
@@ -2311,6 +2310,15 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
         first = false;
         }
       }
+    if (components.size() > 1)
+      {
+      // Only the last component can be empty to avoid double slashes.
+      if(!first)
+        {
+        result += slash;
+        }
+      result += components.back();
+      }
     }
 
   // Close the quoted result.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6a7e14a9242e7eb8bd0828aeeff39fd0f9794cd
commit a6a7e14a9242e7eb8bd0828aeeff39fd0f9794cd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 22:48:02 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:08 2015 +0100

    cmTarget: Use a sorted vector in place of a set.
    
    The vector has a more easy-to-use API.
    
    Join the string with cmJoin, and avoid erasing from the container
    in the loop.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f0bdea7..526a923 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6687,40 +6687,33 @@ void cmTarget::CheckPropertyCompatibility(cmComputeLinkInformation *info,
 
   if (!prop.empty())
     {
-    // Use a std::set to keep the error message sorted.
-    std::set<std::string> props;
+    // Use a sorted std::vector to keep the error message sorted.
+    std::vector<std::string> props;
     std::set<std::string>::const_iterator i = emittedBools.find(prop);
     if (i != emittedBools.end())
       {
-      props.insert(strBool);
+      props.push_back(strBool);
       }
     i = emittedStrings.find(prop);
     if (i != emittedStrings.end())
       {
-      props.insert(strString);
+      props.push_back(strString);
       }
     i = emittedMinNumbers.find(prop);
     if (i != emittedMinNumbers.end())
       {
-      props.insert(strNumMin);
+      props.push_back(strNumMin);
       }
     i = emittedMaxNumbers.find(prop);
     if (i != emittedMaxNumbers.end())
       {
-      props.insert(strNumMax);
+      props.push_back(strNumMax);
       }
+    std::sort(props.begin(), props.end());
+
+    std::string propsString = cmJoin(cmRange(props).retreat(1), ", ");
+    propsString += " and the " + props.back();
 
-    std::string propsString = *props.begin();
-    props.erase(props.begin());
-    while (props.size() > 1)
-      {
-      propsString += ", " + *props.begin();
-      props.erase(props.begin());
-      }
-   if (props.size() == 1)
-     {
-     propsString += " and the " + *props.begin();
-     }
     std::ostringstream e;
     e << "Property \"" << prop << "\" appears in both the "
       << propsString <<

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a505a05562e50fdf8251e5fdbf2d32383f6b47aa
commit a505a05562e50fdf8251e5fdbf2d32383f6b47aa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 23:26:58 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:08 2015 +0100

    cmSet: Replace loop with cmJoin.

diff --git a/Source/cmSetCommand.cxx b/Source/cmSetCommand.cxx
index 90d7b03..204d95b 100644
--- a/Source/cmSetCommand.cxx
+++ b/Source/cmSetCommand.cxx
@@ -108,17 +108,7 @@ bool cmSetCommand
     }
 
   // collect any values into a single semi-colon separated value list
-  if(static_cast<unsigned short>(args.size()) >
-     static_cast<unsigned short>(1 + ignoreLastArgs))
-    {
-    value = args[1];
-    size_t endPos = args.size() - ignoreLastArgs;
-    for(size_t i = 2; i < endPos; ++i)
-      {
-      value += ";";
-      value += args[i];
-      }
-    }
+  value = cmJoin(cmRange(args).advance(1).retreat(ignoreLastArgs), ";");
 
   if (parentScope)
     {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59345fec63e59eda6c9ffd257ace7b15d4ebfb97
commit 59345fec63e59eda6c9ffd257ace7b15d4ebfb97
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 14 22:23:41 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:08 2015 +0100

    cmFindBase: Replace loop with cmJoin on range.

diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 69991d5..6e55533 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -166,11 +166,9 @@ bool cmFindBase::ParseArguments(std::vector<std::string> const& argsIn)
       }
     else
       {
-      this->VariableDocumentation += "one of the " + this->Names[0];
-      for (unsigned int j = 1; j < this->Names.size() - 1; ++j)
-        {
-        this->VariableDocumentation += ", " + this->Names[j];
-        }
+      this->VariableDocumentation += "one of the ";
+      this->VariableDocumentation += cmJoin(cmRange(this->Names).retreat(1),
+                                            ", ");
       this->VariableDocumentation += " or "
         + this->Names[this->Names.size() - 1] + " libraries be found";
       }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28ec965e9cb5fd997c611081a1add1c410e35916
commit 28ec965e9cb5fd997c611081a1add1c410e35916
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:53:20 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:07 2015 +0100

    Convert loops to cmJoin algorithm with cmRange.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 8d1657d..dd0cfa9 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -259,14 +259,7 @@ bool cmListCommand::HandleAppendCommand(std::vector<std::string> const& args)
     {
     listString += ";";
     }
-  const char* sep = "";
-  size_t cc;
-  for ( cc = 2; cc < args.size(); ++ cc )
-    {
-    listString += sep;
-    listString += args[cc];
-    sep = ";";
-    }
+  listString += cmJoin(cmRange(args).advance(2), ";");
 
   this->Makefile->AddDefinition(listName, listString.c_str());
   return true;
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 05d8ab5..35956ad 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -3016,13 +3016,7 @@ cmLocalGenerator::ConvertToRelativePath(const std::vector<std::string>& local,
     {
     relative += "/";
     }
-  const char* sep = "";
-  for(unsigned int i=common; i < remote.size(); ++i)
-    {
-    relative += sep;
-    relative += remote[i];
-    sep = "/";
-    }
+  relative += cmJoin(cmRange(remote).advance(common), "/");
 
   // Finally return the path.
   return relative;
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 0ebaa50..e09a934 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -172,12 +172,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
                 }
               std::vector<std::string>::const_iterator eit
                   = expandedArgs.begin() + this->Args.size() - 1;
-              const char* sep = "";
-              for( ; eit != expandedArgs.end(); ++eit)
-                {
-                argnDef += sep + *eit;
-                sep = ";";
-                }
+              argnDef += cmJoin(cmRange(eit, expandedArgs.end()), ";");
               }
             argnDefInitialized = true;
             }
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 5260cb0..5c93975 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -406,12 +406,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
     // Clock command
     else if (args[1] == "time" && args.size() > 2)
       {
-      std::string command = args[2];
-      for (std::string::size_type cc = 3; cc < args.size(); cc ++)
-        {
-        command += " ";
-        command += args[cc];
-        }
+      std::string command = cmJoin(cmRange(args).advance(2), " ");
 
       clock_t clock_start, clock_finish;
       time_t time_start, time_finish;
@@ -473,14 +468,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
         }
 
       std::string command = "\"";
-      command += args[3];
+      command += cmJoin(cmRange(args).advance(3), "\" \"");
       command += "\"";
-      for (std::string::size_type cc = 4; cc < args.size(); cc ++)
-        {
-        command += " \"";
-        command += args[cc];
-        command += "\"";
-        }
       int retval = 0;
       int timeout = 0;
       if ( cmSystemTools::RunSingleCommand(command.c_str(), 0, &retval,

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=437febee725af25a028e786571120d073933c763
commit 437febee725af25a028e786571120d073933c763
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 22:23:41 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:07 2015 +0100

    cmStringCommand: Accumulate with cmJoin and range adaptors.

diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 3e606d7..edc6afc 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -303,13 +303,6 @@ bool cmStringCommand::RegexMatch(std::vector<std::string> const& args)
   std::string regex = args[2];
   std::string outvar = args[3];
 
-  // Concatenate all the last arguments together.
-  std::string input = args[4];
-  for(unsigned int i=5; i < args.size(); ++i)
-    {
-    input += args[i];
-    }
-
   this->Makefile->ClearMatches();
   // Compile the regular expression.
   cmsys::RegularExpression re;
@@ -321,6 +314,9 @@ bool cmStringCommand::RegexMatch(std::vector<std::string> const& args)
     return false;
     }
 
+  // Concatenate all the last arguments together.
+  std::string input = cmJoin(cmRange(args).advance(4), std::string());
+
   // Scan through the input for all matches.
   std::string output;
   if(re.find(input.c_str()))
@@ -352,13 +348,6 @@ bool cmStringCommand::RegexMatchAll(std::vector<std::string> const& args)
   std::string regex = args[2];
   std::string outvar = args[3];
 
-  // Concatenate all the last arguments together.
-  std::string input = args[4];
-  for(unsigned int i=5; i < args.size(); ++i)
-    {
-    input += args[i];
-    }
-
   this->Makefile->ClearMatches();
   // Compile the regular expression.
   cmsys::RegularExpression re;
@@ -371,6 +360,9 @@ bool cmStringCommand::RegexMatchAll(std::vector<std::string> const& args)
     return false;
     }
 
+  // Concatenate all the last arguments together.
+  std::string input = cmJoin(cmRange(args).advance(4), std::string());
+
   // Scan through the input for all matches.
   std::string output;
   const char* p = input.c_str();
@@ -456,13 +448,6 @@ bool cmStringCommand::RegexReplace(std::vector<std::string> const& args)
     l = r;
     }
 
-  // Concatenate all the last arguments together.
-  std::string input = args[5];
-  for(unsigned int i=6; i < args.size(); ++i)
-    {
-    input += args[i];
-    }
-
   this->Makefile->ClearMatches();
   // Compile the regular expression.
   cmsys::RegularExpression re;
@@ -475,6 +460,9 @@ bool cmStringCommand::RegexReplace(std::vector<std::string> const& args)
     return false;
     }
 
+  // Concatenate all the last arguments together.
+  std::string input = cmJoin(cmRange(args).advance(5), std::string());
+
   // Scan through the input for all matches.
   std::string output;
   std::string::size_type base = 0;
@@ -673,11 +661,7 @@ bool cmStringCommand::HandleReplaceCommand(std::vector<std::string> const&
   const std::string& replaceExpression = args[2];
   const std::string& variableName = args[3];
 
-  std::string input = args[4];
-  for(unsigned int i=5; i < args.size(); ++i)
-    {
-    input += args[i];
-    }
+  std::string input = cmJoin(cmRange(args).advance(4), std::string());
 
   cmsys::SystemTools::ReplaceString(input, matchExpression.c_str(),
                                     replaceExpression.c_str());
@@ -756,11 +740,7 @@ bool cmStringCommand
     }
 
   std::string const& variableName = args[1];
-  std::string value;
-  for(unsigned int i = 2; i < args.size(); ++i)
-    {
-    value += args[i];
-    }
+  std::string value = cmJoin(cmRange(args).advance(2), std::string());
 
   this->Makefile->AddDefinition(variableName, value.c_str());
   return true;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d6ba5ceb73a61aafd0a47da70c02c65daac1c2d
commit 4d6ba5ceb73a61aafd0a47da70c02c65daac1c2d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 22:14:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:07 2015 +0100

    cmAlgorithms: Add a range adaptor and API for adjusting a range.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 6c03f51..ad2b9c1 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -122,6 +122,17 @@ struct Range
   const_iterator begin() const { return Begin; }
   const_iterator end() const { return End; }
   bool empty() const { return std::distance(Begin, End) == 0; }
+  Range& advance(cmIML_INT_intptr_t amount)
+  {
+    std::advance(Begin, amount);
+    return *this;
+  }
+
+  Range& retreat(cmIML_INT_intptr_t amount)
+  {
+    std::advance(End, -amount);
+    return *this;
+  }
 private:
   const_iterator Begin;
   const_iterator End;
@@ -135,6 +146,14 @@ ContainerAlgorithms::Range<Iter1> cmRange(Iter1 begin, Iter2 end)
   return ContainerAlgorithms::Range<Iter1>(begin, end);
 }
 
+template<typename Range>
+ContainerAlgorithms::Range<typename Range::const_iterator>
+cmRange(Range const& range)
+{
+  return ContainerAlgorithms::Range<typename Range::const_iterator>(
+      range.begin(), range.end());
+}
+
 template<typename Container>
 void cmDeleteAll(Container const& c)
 {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=892c822a209097b23150a031a76e477cfcd6b067
commit 892c822a209097b23150a031a76e477cfcd6b067
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 14 21:27:25 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:07 2015 +0100

    Use cmJoin to accumulate string ranges.
    
    Avoid using the std::accumulate algorithm which is designed for
    numeric types, not complex types.  It introduces unneccessary
    copies.
    
    Initialize variables where they are populated.

diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 8b893bc..212603c 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -217,7 +217,6 @@ bool cmFileCommand
 bool cmFileCommand::HandleWriteCommand(std::vector<std::string> const& args,
   bool append)
 {
-  std::string message;
   std::vector<std::string>::const_iterator i = args.begin();
 
   i++; // Get rid of subcommand
@@ -231,10 +230,6 @@ bool cmFileCommand::HandleWriteCommand(std::vector<std::string> const& args,
 
   i++;
 
-  for(;i != args.end(); ++i)
-    {
-    message += *i;
-    }
   if ( !this->Makefile->CanIWriteThisFile(fileName.c_str()) )
     {
     std::string e
@@ -272,6 +267,7 @@ bool cmFileCommand::HandleWriteCommand(std::vector<std::string> const& args,
     this->SetError(error);
     return false;
     }
+  std::string message = cmJoin(cmRange(i, args.end()), std::string());
   file << message;
   file.close();
   if(mode)
diff --git a/Source/cmMessageCommand.cxx b/Source/cmMessageCommand.cxx
index 88d6a77..0449c50 100644
--- a/Source/cmMessageCommand.cxx
+++ b/Source/cmMessageCommand.cxx
@@ -20,7 +20,6 @@ bool cmMessageCommand
     this->SetError("called with incorrect number of arguments");
     return false;
     }
-  std::string message;
   std::vector<std::string>::const_iterator i = args.begin();
 
   cmake::MessageType type = cmake::MESSAGE;
@@ -70,10 +69,7 @@ bool cmMessageCommand
     ++i;
     }
 
-  for(;i != args.end(); ++i)
-    {
-    message += *i;
-    }
+  std::string message = cmJoin(cmRange(i, args.end()), std::string());
 
   if (type != cmake::MESSAGE)
     {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6650bcdcb1c99550983a1b8e8d25e8e62735f9b0
commit 6650bcdcb1c99550983a1b8e8d25e8e62735f9b0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 22:19:21 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:07 2015 +0100

    cmAlgorithms: Add a Range container and adaptor method.
    
    This can make a pair of iterators API compatible with the
    cmJoin algorithm and other range-based algorithms.
    
    Accept different iterator types in the cmRange adaptor so that
    a const and non-const iterator are accepted.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 4938140..6c03f51 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -112,6 +112,27 @@ struct DefaultDeleter<Container, /* valueTypeIsPair = */ true>
   }
 };
 
+template<typename const_iterator_>
+struct Range
+{
+  typedef const_iterator_ const_iterator;
+  typedef typename std::iterator_traits<const_iterator>::value_type value_type;
+  Range(const_iterator begin_, const_iterator end_)
+    : Begin(begin_), End(end_) {}
+  const_iterator begin() const { return Begin; }
+  const_iterator end() const { return End; }
+  bool empty() const { return std::distance(Begin, End) == 0; }
+private:
+  const_iterator Begin;
+  const_iterator End;
+};
+
+}
+
+template<typename Iter1, typename Iter2>
+ContainerAlgorithms::Range<Iter1> cmRange(Iter1 begin, Iter2 end)
+{
+  return ContainerAlgorithms::Range<Iter1>(begin, end);
 }
 
 template<typename Container>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8c13de3780cc6ec4c213ca2c01d90aa3ebd543b
commit e8c13de3780cc6ec4c213ca2c01d90aa3ebd543b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 14 21:31:46 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:07 2015 +0100

    Replace common loop pattern with cmJoin

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 7746980..fd9b236 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1064,26 +1064,11 @@ void cmFindPackageCommand::AppendToFoundProperty(bool found)
     }
 
 
-  std::string tmp;
-  const char* sep ="";
-  for(size_t i=0; i<foundContents.size(); i++)
-    {
-    tmp += sep;
-    tmp += foundContents[i];
-    sep = ";";
-    }
-
+  std::string tmp = cmJoin(foundContents, ";");
   this->Makefile->GetCMakeInstance()->SetProperty("PACKAGES_FOUND",
                                                   tmp.c_str());
 
-  tmp = "";
-  sep = "";
-  for(size_t i=0; i<notFoundContents.size(); i++)
-    {
-    tmp += sep;
-    tmp += notFoundContents[i];
-    sep = ";";
-    }
+  tmp = cmJoin(notFoundContents, ";");
   this->Makefile->GetCMakeInstance()->SetProperty("PACKAGES_NOT_FOUND",
                                                   tmp.c_str());
 }
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index c33048c..b44e228 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -193,12 +193,8 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
     if (!this->Depth)
       {
       std::string name = this->Args[0];
-      std::vector<std::string>::size_type cc;
-      name += "(";
-      for ( cc = 0; cc < this->Args.size(); cc ++ )
-        {
-        name += " " + this->Args[cc];
-        }
+      name += "( ";
+      name += cmJoin(this->Args, " ");
       name += " )";
 
       // create a new command and add it to cmake
diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx
index c0e4683..84c00ba 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -34,15 +34,7 @@ bool cmGetCMakePropertyCommand
     std::vector<std::string> vars = this->Makefile->GetDefinitions(cacheonly);
     if (!vars.empty())
       {
-      output = "";
-      const char* sep = "";
-      std::vector<std::string>::size_type cc;
-      for ( cc = 0; cc < vars.size(); ++cc )
-        {
-        output += sep;
-        output += vars[cc];
-        sep = ";";
-        }
+      output = cmJoin(vars, ";");
       }
     }
   else if ( args[1] == "MACROS" )
@@ -54,15 +46,7 @@ bool cmGetCMakePropertyCommand
     const std::set<std::string>* components
       = this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
         ->GetInstallComponents();
-    std::set<std::string>::const_iterator compIt;
-    output = "";
-    const char* sep = "";
-    for (compIt = components->begin(); compIt != components->end(); ++compIt)
-      {
-      output += sep;
-      output += *compIt;
-      sep = ";";
-      }
+    output = cmJoin(*components, ";");
     }
   else
     {
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index e1de7c3..0ebaa50 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -197,14 +197,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
               {
               argvDef += ";";
               }
-            const char* sep = "";
-            std::vector<std::string>::const_iterator eit;
-            for(eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit)
-              {
-              argvDef += sep;
-              argvDef += *eit;
-              sep = ";";
-              }
+            argvDef += cmJoin(expandedArgs, ";");
             argvDefInitialized = true;
             }
           cmSystemTools::ReplaceString(tmps, "${ARGV}", argvDef.c_str());
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index aca4413..ac5fec9 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4202,15 +4202,7 @@ const char *cmMakefile::GetProperty(const std::string& prop,
     }
   else if (prop == "LISTFILE_STACK")
     {
-    const char* sep = "";
-    for (std::deque<std::string>::const_iterator
-        i = this->ListFileStack.begin();
-        i != this->ListFileStack.end(); ++i)
-      {
-      output += sep;
-      output += *i;
-      sep = ";";
-      }
+    output = cmJoin(this->ListFileStack, ";");
     return output.c_str();
     }
   else if (prop == "VARIABLES" || prop == "CACHE_VARIABLES")
@@ -4220,14 +4212,7 @@ const char *cmMakefile::GetProperty(const std::string& prop,
       {
       cacheonly = 1;
       }
-    std::vector<std::string> vars = this->GetDefinitions(cacheonly);
-    const char* sep = "";
-    for (unsigned int cc = 0; cc < vars.size(); cc ++ )
-      {
-      output += sep;
-      output += vars[cc];
-      sep = ";";
-      }
+    output = cmJoin(this->GetDefinitions(cacheonly), ";");
     return output.c_str();
     }
   else if (prop == "MACROS")
@@ -4242,16 +4227,7 @@ const char *cmMakefile::GetProperty(const std::string& prop,
     }
   else if (prop == "LINK_DIRECTORIES")
     {
-    const char* sep = "";
-    for (std::vector<std::string>::const_iterator
-         it = this->GetLinkDirectories().begin();
-         it != this->GetLinkDirectories().end();
-         ++ it )
-      {
-      output += sep;
-      output += *it;
-      sep = ";";
-      }
+    output = cmJoin(this->GetLinkDirectories(), ";");
     return output.c_str();
     }
   else if (prop == "INCLUDE_DIRECTORIES")
diff --git a/Source/cmOptionCommand.cxx b/Source/cmOptionCommand.cxx
index e505440..60728ea 100644
--- a/Source/cmOptionCommand.cxx
+++ b/Source/cmOptionCommand.cxx
@@ -34,11 +34,7 @@ bool cmOptionCommand
   if(argError)
     {
     std::string m = "called with incorrect number of arguments: ";
-    for(size_t i =0; i < args.size(); ++i)
-      {
-      m += args[i];
-      m += " ";
-      }
+    m += cmJoin(args, " ");
     this->SetError(m);
     return false;
     }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af289a56b78fe0d584cd97cb01c7e8d6f90ed91b
commit af289a56b78fe0d584cd97cb01c7e8d6f90ed91b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 17 17:36:19 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:06 2015 +0100

    Convert loops populating maybe-empty content into the common pattern.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 107dca9..8d1657d 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -254,14 +254,18 @@ bool cmListCommand::HandleAppendCommand(std::vector<std::string> const& args)
   // expand the variable
   std::string listString;
   this->GetListString(listString, listName);
+
+  if(!listString.empty() && !args.empty())
+    {
+    listString += ";";
+    }
+  const char* sep = "";
   size_t cc;
   for ( cc = 2; cc < args.size(); ++ cc )
     {
-    if(!listString.empty())
-      {
-      listString += ";";
-      }
+    listString += sep;
     listString += args[cc];
+    sep = ";";
     }
 
   this->Makefile->AddDefinition(listName, listString.c_str());
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 7afe05f..05d8ab5 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -3011,13 +3011,17 @@ cmLocalGenerator::ConvertToRelativePath(const std::vector<std::string>& local,
   // trailing slash in the input then the last iteration of the loop
   // will add a slash followed by an empty string which will preserve
   // the trailing slash in the output.
+
+  if(!relative.empty() && !remote.empty())
+    {
+    relative += "/";
+    }
+  const char* sep = "";
   for(unsigned int i=common; i < remote.size(); ++i)
     {
-    if(!relative.empty())
-      {
-      relative += "/";
-      }
+    relative += sep;
     relative += remote[i];
+    sep = "/";
     }
 
   // Finally return the path.
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 36808e0..e1de7c3 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -166,15 +166,17 @@ bool cmMacroHelperCommand::InvokeInitialPass
             {
             if (expandedArgs.size() > this->Args.size() - 1)
               {
+              if (!argnDef.empty() && !expandedArgs.empty())
+                {
+                argnDef += ";";
+                }
               std::vector<std::string>::const_iterator eit
                   = expandedArgs.begin() + this->Args.size() - 1;
+              const char* sep = "";
               for( ; eit != expandedArgs.end(); ++eit)
                 {
-                if (!argnDef.empty())
-                  {
-                  argnDef += ";";
-                  }
-                argnDef += *eit;
+                argnDef += sep + *eit;
+                sep = ";";
                 }
               }
             argnDefInitialized = true;
@@ -191,14 +193,17 @@ bool cmMacroHelperCommand::InvokeInitialPass
           // repleace ARGV, compute it only once
           if (!argvDefInitialized)
             {
+            if (!argvDef.empty() && !expandedArgs.empty())
+              {
+              argvDef += ";";
+              }
+            const char* sep = "";
             std::vector<std::string>::const_iterator eit;
             for(eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit)
               {
-              if (!argvDef.empty())
-                {
-                argvDef += ";";
-                }
+              argvDef += sep;
               argvDef += *eit;
+              sep = ";";
               }
             argvDefInitialized = true;
             }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e784682ada6badec5b4da09d6e05594774801f9
commit 9e784682ada6badec5b4da09d6e05594774801f9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 17 17:47:10 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:06 2015 +0100

    Convert loops into the commonly used pattern.

diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx
index e193cf5..c0e4683 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -25,7 +25,6 @@ bool cmGetCMakePropertyCommand
     return false;
     }
 
-  std::vector<std::string>::size_type cc;
   std::string variable = args[0];
   std::string output = "NOTFOUND";
 
@@ -35,12 +34,15 @@ bool cmGetCMakePropertyCommand
     std::vector<std::string> vars = this->Makefile->GetDefinitions(cacheonly);
     if (!vars.empty())
       {
-      output = vars[0];
-      }
-    for ( cc = 1; cc < vars.size(); ++cc )
-      {
-      output += ";";
-      output += vars[cc];
+      output = "";
+      const char* sep = "";
+      std::vector<std::string>::size_type cc;
+      for ( cc = 0; cc < vars.size(); ++cc )
+        {
+        output += sep;
+        output += vars[cc];
+        sep = ";";
+        }
       }
     }
   else if ( args[1] == "MACROS" )
@@ -54,13 +56,12 @@ bool cmGetCMakePropertyCommand
         ->GetInstallComponents();
     std::set<std::string>::const_iterator compIt;
     output = "";
+    const char* sep = "";
     for (compIt = components->begin(); compIt != components->end(); ++compIt)
       {
-      if (compIt != components->begin())
-        {
-        output += ";";
-        }
+      output += sep;
       output += *compIt;
+      sep = ";";
       }
     }
   else
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index eb68e49..aca4413 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3752,15 +3752,12 @@ void cmMakefile::GetListOfMacros(std::string& macros) const
 {
   StringStringMap::const_iterator it;
   macros = "";
-  int cc = 0;
+  const char* sep = "";
   for ( it = this->MacrosMap.begin(); it != this->MacrosMap.end(); ++it )
     {
-    if ( cc > 0 )
-      {
-      macros += ";";
-      }
+    macros += sep;
     macros += it->first;
-    cc ++;
+    sep = "";
     }
 }
 
@@ -4205,15 +4202,14 @@ const char *cmMakefile::GetProperty(const std::string& prop,
     }
   else if (prop == "LISTFILE_STACK")
     {
+    const char* sep = "";
     for (std::deque<std::string>::const_iterator
         i = this->ListFileStack.begin();
         i != this->ListFileStack.end(); ++i)
       {
-      if (i != this->ListFileStack.begin())
-        {
-        output += ";";
-        }
+      output += sep;
       output += *i;
+      sep = ";";
       }
     return output.c_str();
     }
@@ -4225,13 +4221,12 @@ const char *cmMakefile::GetProperty(const std::string& prop,
       cacheonly = 1;
       }
     std::vector<std::string> vars = this->GetDefinitions(cacheonly);
+    const char* sep = "";
     for (unsigned int cc = 0; cc < vars.size(); cc ++ )
       {
-      if ( cc > 0 )
-        {
-        output += ";";
-        }
+      output += sep;
       output += vars[cc];
+      sep = ";";
       }
     return output.c_str();
     }
@@ -4247,19 +4242,16 @@ const char *cmMakefile::GetProperty(const std::string& prop,
     }
   else if (prop == "LINK_DIRECTORIES")
     {
-    std::ostringstream str;
+    const char* sep = "";
     for (std::vector<std::string>::const_iterator
          it = this->GetLinkDirectories().begin();
          it != this->GetLinkDirectories().end();
          ++ it )
       {
-      if ( it != this->GetLinkDirectories().begin())
-        {
-        str << ";";
-        }
-      str << it->c_str();
+      output += sep;
+      output += *it;
+      sep = ";";
       }
-    output = str.str();
     return output.c_str();
     }
   else if (prop == "INCLUDE_DIRECTORIES")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a4efb0ebd87bcb66a3bf98246aef491c82fa6c7
commit 6a4efb0ebd87bcb66a3bf98246aef491c82fa6c7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:47:21 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:06 2015 +0100

    cmMacroCommand: Remove counting variable.
    
    Start iteration at correct starting point directly.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index c1e7cbb..36808e0 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -167,19 +167,14 @@ bool cmMacroHelperCommand::InvokeInitialPass
             if (expandedArgs.size() > this->Args.size() - 1)
               {
               std::vector<std::string>::const_iterator eit
-                  = expandedArgs.begin();
-              std::vector<std::string>::size_type cnt = 0;
+                  = expandedArgs.begin() + this->Args.size() - 1;
               for( ; eit != expandedArgs.end(); ++eit)
                 {
-                if ( cnt >= this->Args.size()-1 )
+                if (!argnDef.empty())
                   {
-                  if (!argnDef.empty())
-                    {
-                    argnDef += ";";
-                    }
-                  argnDef += *eit;
+                  argnDef += ";";
                   }
-                cnt ++;
+                argnDef += *eit;
                 }
               }
             argnDefInitialized = true;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11ecc31d0a2da0090195a682364fb4628f55673a
commit 11ecc31d0a2da0090195a682364fb4628f55673a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:44:49 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:06 2015 +0100

    cmMacroCommand: Execute loop only if it has an effect.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index c1eb35e..c1e7cbb 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -164,20 +164,23 @@ bool cmMacroHelperCommand::InvokeInitialPass
           {
           if (!argnDefInitialized)
             {
-            std::vector<std::string>::const_iterator eit
-                = expandedArgs.begin();
-            std::vector<std::string>::size_type cnt = 0;
-            for( ; eit != expandedArgs.end(); ++eit)
+            if (expandedArgs.size() > this->Args.size() - 1)
               {
-              if ( cnt >= this->Args.size()-1 )
+              std::vector<std::string>::const_iterator eit
+                  = expandedArgs.begin();
+              std::vector<std::string>::size_type cnt = 0;
+              for( ; eit != expandedArgs.end(); ++eit)
                 {
-                if (!argnDef.empty())
+                if ( cnt >= this->Args.size()-1 )
                   {
-                  argnDef += ";";
+                  if (!argnDef.empty())
+                    {
+                    argnDef += ";";
+                    }
+                  argnDef += *eit;
                   }
-                argnDef += *eit;
+                cnt ++;
                 }
-              cnt ++;
               }
             argnDefInitialized = true;
             }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f95543f8a6b38bf6d5350169bdb53d5066839b76
commit f95543f8a6b38bf6d5350169bdb53d5066839b76
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:42:12 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:06 2015 +0100

    cmMacroCommand: Extract iteration starting point.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index e7c6a29..c1eb35e 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -164,9 +164,10 @@ bool cmMacroHelperCommand::InvokeInitialPass
           {
           if (!argnDefInitialized)
             {
-            std::vector<std::string>::const_iterator eit;
+            std::vector<std::string>::const_iterator eit
+                = expandedArgs.begin();
             std::vector<std::string>::size_type cnt = 0;
-            for(eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit)
+            for( ; eit != expandedArgs.end(); ++eit)
               {
               if ( cnt >= this->Args.size()-1 )
                 {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fe8f49353f927882af256c7870eb24e4be0c9be
commit 9fe8f49353f927882af256c7870eb24e4be0c9be
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 00:29:20 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:06 2015 +0100

    cmMacroCommand: Replace a loop with cmJoin.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 69fcca7..e7c6a29 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -262,11 +262,11 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
     if (!this->Depth)
       {
       std::string name = this->Args[0];
-      std::vector<std::string>::size_type cc;
       name += "(";
-      for ( cc = 0; cc < this->Args.size(); cc ++ )
+      if (!this->Args.empty())
         {
-        name += " " + this->Args[cc];
+        name += " ";
+        name += cmJoin(this->Args, " ");
         }
       name += " )";
       mf.AddMacro(this->Args[0].c_str(), name.c_str());

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

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Feb 11 14:57:12 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 11 Feb 2015 14:57:12 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1276-g84c6acb
Message-ID: <20150211195712.5DF62AAD2D@public.kitware.com>

This is an automated email from 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  84c6acb615a1fc48c43f75241c1de74a337b8d07 (commit)
       via  da4078d8654177c683d3f0544bdde8490537030c (commit)
       via  4e90e19bd10d2bd34a6b104f74a3d1ca9b445a42 (commit)
       via  466ced075eee8a6721a4f4f9dfb56727ce0cc9f7 (commit)
       via  accda6b07f29c024b8e1eef73bd19e083603aa35 (commit)
       via  c8918eaf1e8195bd47570812058f7f69820ae9bc (commit)
       via  8675d8471fa57a1415c360ab318e667e8dc6e6fb (commit)
       via  e72feb19253ed3fc8fe3d119582a0ff81044bbdf (commit)
       via  2db97910e89be78c7d51e3d8d46889c6679f48b4 (commit)
       via  26c69d686bcce330d4ba4a426e886c77df753cdf (commit)
       via  18de4e9895335b894a1b176ce8210e7521e1c92c (commit)
       via  b6b7b9ade08ad6d1d56c4463444accebd33bec91 (commit)
       via  709e96f11e0939638316bb3eab1e0bf32d5bdc05 (commit)
       via  255d307cd0cdecd0d10fabc020fd0b5b985c1eaf (commit)
      from  06b19bbb3777430b3348a082d57da56f0d6e0e34 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84c6acb615a1fc48c43f75241c1de74a337b8d07
commit 84c6acb615a1fc48c43f75241c1de74a337b8d07
Merge: 06b19bb da4078d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 14:57:10 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 14:57:10 2015 -0500

    Merge topic 'clean-up-cmMacroCommand' into next
    
    da4078d8 cmMacroCommand: Remove condition around ARGV replacement.
    4e90e19b cmMacroCommand: Move computation of ARGV%n names out of double loop.
    466ced07 cmMacroCommand: Move ARGV replacement out of condition.
    accda6b0 cmMacroCommand: Remove condition around ARGN replacement.
    c8918eaf cmMacroCommand: Declare tmps in the scope that it's used.
    8675d847 cmMacroCommand: Declare arg in the scope that it is used.
    e72feb19 cmMacroCommand: Inline variable computation.
    2db97910 cmMacroCommand: Compute variables outside of two loops.
    26c69d68 cmMacroCommand: Remove intermediate arg variables.
    18de4e98 cmMacroCommand: Remove condition around ARGN computation.
    b6b7b9ad cmMacroCommand: Remove conditional append of semicolon.
    709e96f1 cmMacroCommand: Declare arg variables where used and initialized.
    255d307c cmMacroCommand: Join the args strings outside of the loops.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da4078d8654177c683d3f0544bdde8490537030c
commit da4078d8654177c683d3f0544bdde8490537030c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 20:30:23 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:54 2015 +0100

    cmMacroCommand: Remove condition around ARGV replacement.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index c6f0571..1bc63a7 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -172,13 +172,10 @@ bool cmMacroHelperCommand::InvokeInitialPass
 
         // if the current argument of the current function has ${ARGV in it
         // then try replacing ARGV values
-        if (tmps.find("${ARGV") != std::string::npos)
+        for (unsigned int t = 0; t < expandedArgs.size(); ++t)
           {
-          for (unsigned int t = 0; t < expandedArgs.size(); ++t)
-            {
-            cmSystemTools::ReplaceString(tmps, argVs[t].c_str(),
-                                         expandedArgs[t].c_str());
-            }
+          cmSystemTools::ReplaceString(tmps, argVs[t].c_str(),
+                                       expandedArgs[t].c_str());
           }
 
         arg.Value = tmps;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e90e19bd10d2bd34a6b104f74a3d1ca9b445a42
commit 4e90e19bd10d2bd34a6b104f74a3d1ca9b445a42
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 20:16:40 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:54 2015 +0100

    cmMacroCommand: Move computation of ARGV%n names out of double loop.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index f797da8..c6f0571 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -113,10 +113,18 @@ bool cmMacroHelperCommand::InvokeInitialPass
   std::string expandedArgv = cmJoin(expandedArgs, ";");
   std::vector<std::string> variables;
   variables.reserve(this->Args.size() - 1);
+  std::vector<std::string> argVs;
+  argVs.reserve(this->Args.size() - 1);
+  char argvName[60];
   for (unsigned int j = 1; j < this->Args.size(); ++j)
     {
     variables.push_back("${" + this->Args[j] + "}");
     }
+  for (unsigned int j = 0; j < expandedArgs.size(); ++j)
+    {
+    sprintf(argvName,"${ARGV%i}",j);
+    argVs.push_back(argvName);
+    }
   if(!this->Functions.empty())
     {
     this->FilePath = this->Functions[0].FilePath;
@@ -166,12 +174,9 @@ bool cmMacroHelperCommand::InvokeInitialPass
         // then try replacing ARGV values
         if (tmps.find("${ARGV") != std::string::npos)
           {
-          char argvName[60];
-          // also replace the ARGV1 ARGV2 ... etc
           for (unsigned int t = 0; t < expandedArgs.size(); ++t)
             {
-            sprintf(argvName,"${ARGV%i}",t);
-            cmSystemTools::ReplaceString(tmps, argvName,
+            cmSystemTools::ReplaceString(tmps, argVs[t].c_str(),
                                          expandedArgs[t].c_str());
             }
           }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=466ced075eee8a6721a4f4f9dfb56727ce0cc9f7
commit 466ced075eee8a6721a4f4f9dfb56727ce0cc9f7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 20:08:05 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:54 2015 +0100

    cmMacroCommand: Move ARGV replacement out of condition.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index a9049bf..f797da8 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -160,14 +160,13 @@ bool cmMacroHelperCommand::InvokeInitialPass
         cmSystemTools::ReplaceString(tmps, "${ARGC}",argcDef.c_str());
 
         cmSystemTools::ReplaceString(tmps, "${ARGN}", expandedArgn.c_str());
+        cmSystemTools::ReplaceString(tmps, "${ARGV}", expandedArgv.c_str());
 
         // if the current argument of the current function has ${ARGV in it
         // then try replacing ARGV values
         if (tmps.find("${ARGV") != std::string::npos)
           {
           char argvName[60];
-          cmSystemTools::ReplaceString(tmps, "${ARGV}", expandedArgv.c_str());
-
           // also replace the ARGV1 ARGV2 ... etc
           for (unsigned int t = 0; t < expandedArgs.size(); ++t)
             {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=accda6b07f29c024b8e1eef73bd19e083603aa35
commit accda6b07f29c024b8e1eef73bd19e083603aa35
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 20:06:39 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:54 2015 +0100

    cmMacroCommand: Remove condition around ARGN replacement.
    
    There is none for ARGC replacement, so no reason to conditionalize the
    replacement.  The computation is already done.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 817681d..a9049bf 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -159,11 +159,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
         // replace argc
         cmSystemTools::ReplaceString(tmps, "${ARGC}",argcDef.c_str());
 
-        // repleace ARGN
-        if (tmps.find("${ARGN}") != std::string::npos)
-          {
-          cmSystemTools::ReplaceString(tmps, "${ARGN}", expandedArgn.c_str());
-          }
+        cmSystemTools::ReplaceString(tmps, "${ARGN}", expandedArgn.c_str());
 
         // if the current argument of the current function has ${ARGV in it
         // then try replacing ARGV values

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8918eaf1e8195bd47570812058f7f69820ae9bc
commit c8918eaf1e8195bd47570812058f7f69820ae9bc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 20:25:44 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:54 2015 +0100

    cmMacroCommand: Declare tmps in the scope that it's used.
    
    We don't particularly need to reuse the string memory here, and this
    pattern is not common in CMake.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 2a1fea4..817681d 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -84,8 +84,6 @@ bool cmMacroHelperCommand::InvokeInitialPass
   std::vector<std::string> expandedArgs;
   this->Makefile->ExpandArguments(args, expandedArgs);
 
-  std::string tmps;
-
   // make sure the number of arguments passed is at least the number
   // required by the signature
   if (expandedArgs.size() < this->Args.size() - 1)
@@ -151,7 +149,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
         }
       else
         {
-        tmps = k->Value;
+        std::string tmps = k->Value;
         // replace formal arguments
         for (unsigned int j = 0; j < variables.size(); ++j)
           {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8675d8471fa57a1415c360ab318e667e8dc6e6fb
commit 8675d8471fa57a1415c360ab318e667e8dc6e6fb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 20:23:36 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:54 2015 +0100

    cmMacroCommand: Declare arg in the scope that it is used.
    
    It can make sense to declare objects outside of loops if
    the size required by the object can grow (eg std::string when
    using getline), but that is not the case here.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index b87b39f..2a1fea4 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -85,7 +85,6 @@ bool cmMacroHelperCommand::InvokeInitialPass
   this->Makefile->ExpandArguments(args, expandedArgs);
 
   std::string tmps;
-  cmListFileArgument arg;
 
   // make sure the number of arguments passed is at least the number
   // required by the signature
@@ -144,6 +143,8 @@ bool cmMacroHelperCommand::InvokeInitialPass
       // Set the FilePath on the arguments to match the function since it is
       // not stored and the original values may be freed
       k->FilePath = this->FilePath.c_str();
+
+      cmListFileArgument arg;
       if(k->Delim == cmListFileArgument::Bracket)
         {
         arg.Value = k->Value;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e72feb19253ed3fc8fe3d119582a0ff81044bbdf
commit e72feb19253ed3fc8fe3d119582a0ff81044bbdf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 20:14:30 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:54 2015 +0100

    cmMacroCommand: Inline variable computation.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index ebf8b25..b87b39f 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -86,7 +86,6 @@ bool cmMacroHelperCommand::InvokeInitialPass
 
   std::string tmps;
   cmListFileArgument arg;
-  std::string variable;
 
   // make sure the number of arguments passed is at least the number
   // required by the signature
@@ -119,10 +118,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
   variables.reserve(this->Args.size() - 1);
   for (unsigned int j = 1; j < this->Args.size(); ++j)
     {
-    std::string variable = "${";
-    variable += this->Args[j];
-    variable += "}";
-    variables.push_back(variable);
+    variables.push_back("${" + this->Args[j] + "}");
     }
   if(!this->Functions.empty())
     {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2db97910e89be78c7d51e3d8d46889c6679f48b4
commit 2db97910e89be78c7d51e3d8d46889c6679f48b4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 19:51:15 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:54 2015 +0100

    cmMacroCommand: Compute variables outside of two loops.
    
    Avoid computing them from scratch for each argument of each
    function.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 3a2afc1..ebf8b25 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -115,6 +115,15 @@ bool cmMacroHelperCommand::InvokeInitialPass
       = expandedArgs.begin() + this->Args.size() - 1;
   std::string expandedArgn = cmJoin(cmRange(eit, expandedArgs.end()), ";");
   std::string expandedArgv = cmJoin(expandedArgs, ";");
+  std::vector<std::string> variables;
+  variables.reserve(this->Args.size() - 1);
+  for (unsigned int j = 1; j < this->Args.size(); ++j)
+    {
+    std::string variable = "${";
+    variable += this->Args[j];
+    variable += "}";
+    variables.push_back(variable);
+    }
   if(!this->Functions.empty())
     {
     this->FilePath = this->Functions[0].FilePath;
@@ -147,13 +156,10 @@ bool cmMacroHelperCommand::InvokeInitialPass
         {
         tmps = k->Value;
         // replace formal arguments
-        for (unsigned int j = 1; j < this->Args.size(); ++j)
+        for (unsigned int j = 0; j < variables.size(); ++j)
           {
-          variable = "${";
-          variable += this->Args[j];
-          variable += "}";
-          cmSystemTools::ReplaceString(tmps, variable.c_str(),
-                                       expandedArgs[j-1].c_str());
+          cmSystemTools::ReplaceString(tmps, variables[j].c_str(),
+                                       expandedArgs[j].c_str());
           }
         // replace argc
         cmSystemTools::ReplaceString(tmps, "${ARGC}",argcDef.c_str());

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26c69d686bcce330d4ba4a426e886c77df753cdf
commit 26c69d686bcce330d4ba4a426e886c77df753cdf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 19:26:33 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:54 2015 +0100

    cmMacroCommand: Remove intermediate arg variables.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index da5663d..3a2afc1 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -161,9 +161,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
         // repleace ARGN
         if (tmps.find("${ARGN}") != std::string::npos)
           {
-          std::string argnDef;
-          argnDef += expandedArgn;
-          cmSystemTools::ReplaceString(tmps, "${ARGN}", argnDef.c_str());
+          cmSystemTools::ReplaceString(tmps, "${ARGN}", expandedArgn.c_str());
           }
 
         // if the current argument of the current function has ${ARGV in it
@@ -171,10 +169,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
         if (tmps.find("${ARGV") != std::string::npos)
           {
           char argvName[60];
-
-          std::string argvDef;
-          argvDef += expandedArgv;
-          cmSystemTools::ReplaceString(tmps, "${ARGV}", argvDef.c_str());
+          cmSystemTools::ReplaceString(tmps, "${ARGV}", expandedArgv.c_str());
 
           // also replace the ARGV1 ARGV2 ... etc
           for (unsigned int t = 0; t < expandedArgs.size(); ++t)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18de4e9895335b894a1b176ce8210e7521e1c92c
commit 18de4e9895335b894a1b176ce8210e7521e1c92c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 19:17:29 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:54 2015 +0100

    cmMacroCommand: Remove condition around ARGN computation.
    
    An empty string is appended if the condition is false, which is
    ok for this commit.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 597f63b..da5663d 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -162,10 +162,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
         if (tmps.find("${ARGN}") != std::string::npos)
           {
           std::string argnDef;
-          if (expandedArgs.size() > this->Args.size() - 1)
-            {
-            argnDef += expandedArgn;
-            }
+          argnDef += expandedArgn;
           cmSystemTools::ReplaceString(tmps, "${ARGN}", argnDef.c_str());
           }
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6b7b9ade08ad6d1d56c4463444accebd33bec91
commit b6b7b9ade08ad6d1d56c4463444accebd33bec91
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 19:16:15 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:54 2015 +0100

    cmMacroCommand: Remove conditional append of semicolon.
    
    The conditions are never true.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 367e4d3..597f63b 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -164,10 +164,6 @@ bool cmMacroHelperCommand::InvokeInitialPass
           std::string argnDef;
           if (expandedArgs.size() > this->Args.size() - 1)
             {
-            if (!argnDef.empty() && !expandedArgs.empty())
-              {
-              argnDef += ";";
-              }
             argnDef += expandedArgn;
             }
           cmSystemTools::ReplaceString(tmps, "${ARGN}", argnDef.c_str());
@@ -180,10 +176,6 @@ bool cmMacroHelperCommand::InvokeInitialPass
           char argvName[60];
 
           std::string argvDef;
-          if (!argvDef.empty() && !expandedArgs.empty())
-            {
-            argvDef += ";";
-            }
           argvDef += expandedArgv;
           cmSystemTools::ReplaceString(tmps, "${ARGV}", argvDef.c_str());
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=709e96f11e0939638316bb3eab1e0bf32d5bdc05
commit 709e96f11e0939638316bb3eab1e0bf32d5bdc05
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 19:10:19 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:54 2015 +0100

    cmMacroCommand: Declare arg variables where used and initialized.
    
    Make the initialization by population with the expanded* content
    unconditional.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 18d637a..367e4d3 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -111,15 +111,10 @@ bool cmMacroHelperCommand::InvokeInitialPass
   argcDefStream << expandedArgs.size();
   std::string argcDef = argcDefStream.str();
 
-  // declare varuiables for ARGV ARGN but do not compute until needed
-  std::string argvDef;
-  std::string argnDef;
   std::vector<std::string>::const_iterator eit
       = expandedArgs.begin() + this->Args.size() - 1;
   std::string expandedArgn = cmJoin(cmRange(eit, expandedArgs.end()), ";");
   std::string expandedArgv = cmJoin(expandedArgs, ";");
-  bool argnDefInitialized = false;
-  bool argvDefInitialized = false;
   if(!this->Functions.empty())
     {
     this->FilePath = this->Functions[0].FilePath;
@@ -166,17 +161,14 @@ bool cmMacroHelperCommand::InvokeInitialPass
         // repleace ARGN
         if (tmps.find("${ARGN}") != std::string::npos)
           {
-          if (!argnDefInitialized)
+          std::string argnDef;
+          if (expandedArgs.size() > this->Args.size() - 1)
             {
-            if (expandedArgs.size() > this->Args.size() - 1)
+            if (!argnDef.empty() && !expandedArgs.empty())
               {
-              if (!argnDef.empty() && !expandedArgs.empty())
-                {
-                argnDef += ";";
-                }
-              argnDef += expandedArgn;
+              argnDef += ";";
               }
-            argnDefInitialized = true;
+            argnDef += expandedArgn;
             }
           cmSystemTools::ReplaceString(tmps, "${ARGN}", argnDef.c_str());
           }
@@ -187,16 +179,12 @@ bool cmMacroHelperCommand::InvokeInitialPass
           {
           char argvName[60];
 
-          // repleace ARGV, compute it only once
-          if (!argvDefInitialized)
+          std::string argvDef;
+          if (!argvDef.empty() && !expandedArgs.empty())
             {
-            if (!argvDef.empty() && !expandedArgs.empty())
-              {
-              argvDef += ";";
-              }
-            argvDef += expandedArgv;
-            argvDefInitialized = true;
+            argvDef += ";";
             }
+          argvDef += expandedArgv;
           cmSystemTools::ReplaceString(tmps, "${ARGV}", argvDef.c_str());
 
           // also replace the ARGV1 ARGV2 ... etc

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=255d307cd0cdecd0d10fabc020fd0b5b985c1eaf
commit 255d307cd0cdecd0d10fabc020fd0b5b985c1eaf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 20:47:16 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 20:51:53 2015 +0100

    cmMacroCommand: Join the args strings outside of the loops.
    
    This means that we compute the strings even if not used in the macro
    but this shouldn't be expensive and it simplifies the code.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index e09a934..18d637a 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -114,6 +114,10 @@ bool cmMacroHelperCommand::InvokeInitialPass
   // declare varuiables for ARGV ARGN but do not compute until needed
   std::string argvDef;
   std::string argnDef;
+  std::vector<std::string>::const_iterator eit
+      = expandedArgs.begin() + this->Args.size() - 1;
+  std::string expandedArgn = cmJoin(cmRange(eit, expandedArgs.end()), ";");
+  std::string expandedArgv = cmJoin(expandedArgs, ";");
   bool argnDefInitialized = false;
   bool argvDefInitialized = false;
   if(!this->Functions.empty())
@@ -170,9 +174,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
                 {
                 argnDef += ";";
                 }
-              std::vector<std::string>::const_iterator eit
-                  = expandedArgs.begin() + this->Args.size() - 1;
-              argnDef += cmJoin(cmRange(eit, expandedArgs.end()), ";");
+              argnDef += expandedArgn;
               }
             argnDefInitialized = true;
             }
@@ -192,7 +194,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
               {
               argvDef += ";";
               }
-            argvDef += cmJoin(expandedArgs, ";");
+            argvDef += expandedArgv;
             argvDefInitialized = true;
             }
           cmSystemTools::ReplaceString(tmps, "${ARGV}", argvDef.c_str());

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

Summary of changes:
 Source/cmMacroCommand.cxx |   86 +++++++++++++++------------------------------
 1 file changed, 29 insertions(+), 57 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Feb 11 15:18:49 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 11 Feb 2015 15:18:49 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1278-g1c961d4
Message-ID: <20150211201849.73EB8A9FB4@public.kitware.com>

This is an automated email from 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  1c961d4388be52bf7b6d644357a9cc86698d2eb1 (commit)
       via  e614bb74893c7cb8583f131b1b0fe44af0c128e0 (commit)
      from  84c6acb615a1fc48c43f75241c1de74a337b8d07 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c961d4388be52bf7b6d644357a9cc86698d2eb1
commit 1c961d4388be52bf7b6d644357a9cc86698d2eb1
Merge: 84c6acb e614bb7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 15:18:48 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 15:18:48 2015 -0500

    Merge topic 'clean-up-cmMacroCommand' into next
    
    e614bb74 Revert "cmMacroCommand: Remove condition around ARGV replacement."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e614bb74893c7cb8583f131b1b0fe44af0c128e0
commit e614bb74893c7cb8583f131b1b0fe44af0c128e0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 21:15:17 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 21:15:17 2015 +0100

    Revert "cmMacroCommand: Remove condition around ARGV replacement."
    
    This reverts commit da4078d8654177c683d3f0544bdde8490537030c.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 1bc63a7..c6f0571 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -172,10 +172,13 @@ bool cmMacroHelperCommand::InvokeInitialPass
 
         // if the current argument of the current function has ${ARGV in it
         // then try replacing ARGV values
-        for (unsigned int t = 0; t < expandedArgs.size(); ++t)
+        if (tmps.find("${ARGV") != std::string::npos)
           {
-          cmSystemTools::ReplaceString(tmps, argVs[t].c_str(),
-                                       expandedArgs[t].c_str());
+          for (unsigned int t = 0; t < expandedArgs.size(); ++t)
+            {
+            cmSystemTools::ReplaceString(tmps, argVs[t].c_str(),
+                                         expandedArgs[t].c_str());
+            }
           }
 
         arg.Value = tmps;

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

Summary of changes:
 Source/cmMacroCommand.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Feb 11 15:19:29 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 11 Feb 2015 15:19:29 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1280-g17b2eba
Message-ID: <20150211201929.08DDCAA032@public.kitware.com>

This is an automated email from 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  17b2ebaf51f87d9622c92fce30605989ce1b0afd (commit)
       via  df66c10eb5c616acd227d1765c1163421b3f57d6 (commit)
      from  1c961d4388be52bf7b6d644357a9cc86698d2eb1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17b2ebaf51f87d9622c92fce30605989ce1b0afd
commit 17b2ebaf51f87d9622c92fce30605989ce1b0afd
Merge: 1c961d4 df66c10
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 15:19:28 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 15:19:28 2015 -0500

    Merge topic 'clean-up-cmMacroCommand' into next
    
    df66c10e cmMacroCommand: Move computation of ARGV%n names out of double loop.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df66c10eb5c616acd227d1765c1163421b3f57d6
commit df66c10eb5c616acd227d1765c1163421b3f57d6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 20:16:40 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 21:19:11 2015 +0100

    cmMacroCommand: Move computation of ARGV%n names out of double loop.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index f797da8..c6f0571 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -113,10 +113,18 @@ bool cmMacroHelperCommand::InvokeInitialPass
   std::string expandedArgv = cmJoin(expandedArgs, ";");
   std::vector<std::string> variables;
   variables.reserve(this->Args.size() - 1);
+  std::vector<std::string> argVs;
+  argVs.reserve(this->Args.size() - 1);
+  char argvName[60];
   for (unsigned int j = 1; j < this->Args.size(); ++j)
     {
     variables.push_back("${" + this->Args[j] + "}");
     }
+  for (unsigned int j = 0; j < expandedArgs.size(); ++j)
+    {
+    sprintf(argvName,"${ARGV%i}",j);
+    argVs.push_back(argvName);
+    }
   if(!this->Functions.empty())
     {
     this->FilePath = this->Functions[0].FilePath;
@@ -166,12 +174,9 @@ bool cmMacroHelperCommand::InvokeInitialPass
         // then try replacing ARGV values
         if (tmps.find("${ARGV") != std::string::npos)
           {
-          char argvName[60];
-          // also replace the ARGV1 ARGV2 ... etc
           for (unsigned int t = 0; t < expandedArgs.size(); ++t)
             {
-            sprintf(argvName,"${ARGV%i}",t);
-            cmSystemTools::ReplaceString(tmps, argvName,
+            cmSystemTools::ReplaceString(tmps, argVs[t].c_str(),
                                          expandedArgs[t].c_str());
             }
           }

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 15:19:44 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 15:19:44 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1286-g9e978e3
Message-ID: <20150211201944.5D917AA05D@public.kitware.com>

This is an automated email from 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  9e978e3ee89f5f53991cd09e1b25ba3d2ec03e98 (commit)
       via  f30022eb07b913598326d2e3b10ff2e706fbe873 (commit)
       via  7607c3d16aa0636458c909f4036e4b0d91581b30 (commit)
       via  ebd556caa9e1fc92e00c8e401b145c531390e854 (commit)
       via  290ca8e2d0328d27f51ff5248c35e32e44fdd1eb (commit)
       via  f99991db882c2f4cf8246b9c272845faaa5bbce5 (commit)
      from  17b2ebaf51f87d9622c92fce30605989ce1b0afd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e978e3ee89f5f53991cd09e1b25ba3d2ec03e98
commit 9e978e3ee89f5f53991cd09e1b25ba3d2ec03e98
Merge: 17b2eba f30022e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 15:19:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 15:19:42 2015 -0500

    Merge topic 'install-DESTINATION-genex' into next
    
    f30022eb install: Allow generator expressions in TARGETS DESTINATION (#14317)
    7607c3d1 cmInstallGenerator: Pass destination explicitly to AddInstallRule
    ebd556ca cmInstallGenerator: Fix check for absolute install destinations
    290ca8e2 cmInstallGenerator: Refactor computation of absolute install dest
    f99991db cmInstallGenerator: Move GetDestination to subclasses that need it


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f30022eb07b913598326d2e3b10ff2e706fbe873
commit f30022eb07b913598326d2e3b10ff2e706fbe873
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 14:02:45 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 15:15:33 2015 -0500

    install: Allow generator expressions in TARGETS DESTINATION (#14317)
    
    This will allow per-config destinations for targets in EXPORT sets.
    Using multiple install(TARGETS) with separate CONFIGURATIONS is
    rejected as a target appearing more than once in an export set.
    Now instead one can write
    
     install(TARGETS foo EXPORT exp DESTINATION lib/$<CONFIG>)
    
    to get a single logical membership of the target in the export set
    while still having a per-config destination.

diff --git a/Help/command/install.rst b/Help/command/install.rst
index 5dd5aaa..c99ed73 100644
--- a/Help/command/install.rst
+++ b/Help/command/install.rst
@@ -159,6 +159,10 @@ file itself, call ``install(EXPORT)``, documented below.
 Installing a target with the :prop_tgt:`EXCLUDE_FROM_ALL` target property
 set to ``TRUE`` has undefined behavior.
 
+The install destination given to the target install ``DESTINATION`` may
+use "generator expressions" with the syntax ``$<...>``.  See the
+:manual:`cmake-generator-expressions(7)` manual for available expressions.
+
 Installing Files
 ^^^^^^^^^^^^^^^^
 
diff --git a/Help/release/dev/install-DESTINATION-genex.rst b/Help/release/dev/install-DESTINATION-genex.rst
new file mode 100644
index 0000000..4c4bbed
--- /dev/null
+++ b/Help/release/dev/install-DESTINATION-genex.rst
@@ -0,0 +1,5 @@
+install-DESTINATION-genex
+-------------------------
+
+* The :command:`install(TARGETS)` command learned to support
+  generator expressions in the ``DESTINATION`` value.
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 053c022..ba1dde2 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -398,7 +398,7 @@ cmExportInstallFileGenerator
   cmTarget* target = itgen->GetTarget();
 
   // Construct the installed location of the target.
-  std::string dest = itgen->GetDestination();
+  std::string dest = itgen->GetDestination(config);
   std::string value;
   if(!cmSystemTools::FileIsFullPath(dest.c_str()))
     {
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 7ab88f1..b035bad 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -12,6 +12,7 @@
 #include "cmInstallTargetGenerator.h"
 
 #include "cmComputeLinkInformation.h"
+#include "cmGeneratorExpression.h"
 #include "cmGlobalGenerator.h"
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
@@ -78,7 +79,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
     fromDirConfig += "/";
     }
   std::string toDir =
-    this->ConvertToAbsoluteDestination(this->Destination);
+    this->ConvertToAbsoluteDestination(this->GetDestination(config));
   toDir += "/";
 
   // Compute the list of files to install for this target.
@@ -323,7 +324,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
   const char* no_dir_permissions = 0;
   const char* no_rename = 0;
   bool optional = this->Optional || this->ImportLibrary;
-  this->AddInstallRule(os, this->Destination,
+  this->AddInstallRule(os, this->GetDestination(config),
                        type, filesFrom, optional,
                        this->FilePermissions.c_str(), no_dir_permissions,
                        no_rename, literal_args.c_str(),
@@ -336,6 +337,15 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
 
 //----------------------------------------------------------------------------
 std::string
+cmInstallTargetGenerator::GetDestination(std::string const& config) const
+{
+  cmGeneratorExpression ge;
+  return ge.Parse(this->Destination)
+    ->Evaluate(this->Target->GetMakefile(), config);
+}
+
+//----------------------------------------------------------------------------
+std::string
 cmInstallTargetGenerator::GetInstallFilename(const std::string& config) const
 {
   NameType nameType = this->ImportLibrary? NameImplib : NameNormal;
diff --git a/Source/cmInstallTargetGenerator.h b/Source/cmInstallTargetGenerator.h
index 4d4b399..075c8a4 100644
--- a/Source/cmInstallTargetGenerator.h
+++ b/Source/cmInstallTargetGenerator.h
@@ -60,8 +60,7 @@ public:
   cmTarget* GetTarget() const { return this->Target; }
   bool IsImportLibrary() const { return this->ImportLibrary; }
 
-  std::string const& GetDestination() const
-    { return this->Destination; }
+  std::string GetDestination(std::string const& config) const;
 
 protected:
   virtual void GenerateScript(std::ostream& os);
diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt
index e130eca..0df42d9 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -68,6 +68,11 @@ add_library(testLib5 SHARED testLib5.c)
 
 add_library(testLib6 STATIC testLib6.cxx testLib6c.c)
 
+add_library(testLibPerConfigDest STATIC testLibPerConfigDest.c)
+install(TARGETS testLibPerConfigDest EXPORT exp
+  DESTINATION lib/$<$<BOOL:$<CONFIG>>:$<CONFIG>>$<$<NOT:$<BOOL:$<CONFIG>>>:NoConfig>
+  )
+
 # Work-around: Visual Studio 6 does not support per-target object files.
 set(VS6)
 if("${CMAKE_GENERATOR}" MATCHES "Visual Studio 6")
@@ -446,9 +451,9 @@ install(
   cmp0022NEW cmp0022OLD
   systemlib
   EXPORT exp
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib NAMELINK_SKIP
-  ARCHIVE DESTINATION lib
+  RUNTIME DESTINATION $<1:bin>
+  LIBRARY DESTINATION $<1:lib> NAMELINK_SKIP
+  ARCHIVE DESTINATION $<1:lib>
   FRAMEWORK DESTINATION Frameworks
   BUNDLE DESTINATION Applications
   )
@@ -503,6 +508,7 @@ export(TARGETS testExe1 testLib1 testLib2 testLib3
 export(TARGETS testExe2 testLib4 testLib5 testLib6 testExe3 testExe2lib
   testLib4lib testLib4libdbg testLib4libopt
   testLibCycleA testLibCycleB
+  testLibPerConfigDest
   NAMESPACE bld_
   APPEND FILE ExportBuildTree.cmake
   )
diff --git a/Tests/ExportImport/Export/testLibPerConfigDest.c b/Tests/ExportImport/Export/testLibPerConfigDest.c
new file mode 100644
index 0000000..c7113fc
--- /dev/null
+++ b/Tests/ExportImport/Export/testLibPerConfigDest.c
@@ -0,0 +1 @@
+int testLibPerConfigDest(void) { return 0; }
diff --git a/Tests/ExportImport/Import/A/CMakeLists.txt b/Tests/ExportImport/Import/A/CMakeLists.txt
index 358776b..ced7b03 100644
--- a/Tests/ExportImport/Import/A/CMakeLists.txt
+++ b/Tests/ExportImport/Import/A/CMakeLists.txt
@@ -34,6 +34,7 @@ target_link_libraries(imp_testExe1
   exp_testLib5
   exp_testLib6
   exp_testLibCycleA
+  exp_testLibPerConfigDest
   )
 
 # Try building a plugin to an executable imported from the install tree.
@@ -66,6 +67,7 @@ target_link_libraries(imp_testExe1b
   bld_testLib5
   bld_testLib6
   bld_testLibCycleA
+  bld_testLibPerConfigDest
   )
 
 add_custom_target(check_testLib1_genex ALL
diff --git a/Tests/ExportImport/Import/A/imp_testExe1.c b/Tests/ExportImport/Import/A/imp_testExe1.c
index 451998a..150fcef 100644
--- a/Tests/ExportImport/Import/A/imp_testExe1.c
+++ b/Tests/ExportImport/Import/A/imp_testExe1.c
@@ -7,6 +7,7 @@ extern int testLib4lib();
 extern int testLib5();
 extern int testLib6();
 extern int testLibCycleA1();
+extern int testLibPerConfigDest();
 
 /* Switch a symbol between debug and optimized builds to make sure the
    proper library is found from the testLib4 link interface.  */
@@ -21,5 +22,6 @@ int main()
 {
   return (testLib2() + generated_by_testExe1() + testLib3() + testLib4()
           + testLib5() + testLib6() + testLibCycleA1()
+          + testLibPerConfigDest()
           + generated_by_testExe3() + testLib4lib() + testLib4libcfg());
 }
diff --git a/Tests/RunCMake/install/RunCMakeTest.cmake b/Tests/RunCMake/install/RunCMakeTest.cmake
index 53b91f3..7149603 100644
--- a/Tests/RunCMake/install/RunCMakeTest.cmake
+++ b/Tests/RunCMake/install/RunCMakeTest.cmake
@@ -6,3 +6,4 @@ run_cmake(DIRECTORY-message-lazy)
 run_cmake(SkipInstallRulesWarning)
 run_cmake(SkipInstallRulesNoWarning1)
 run_cmake(SkipInstallRulesNoWarning2)
+run_cmake(TARGETS-DESTINATION-bad)
diff --git a/Tests/RunCMake/install/TARGETS-DESTINATION-bad-result.txt b/Tests/RunCMake/install/TARGETS-DESTINATION-bad-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/install/TARGETS-DESTINATION-bad-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/install/TARGETS-DESTINATION-bad-stderr.txt b/Tests/RunCMake/install/TARGETS-DESTINATION-bad-stderr.txt
new file mode 100644
index 0000000..9844158
--- /dev/null
+++ b/Tests/RunCMake/install/TARGETS-DESTINATION-bad-stderr.txt
@@ -0,0 +1,6 @@
+CMake Error:
+  Error evaluating generator expression:
+
+    \$<NOTAGENEX>
+
+  Expression did not evaluate to a known generator expression
diff --git a/Tests/RunCMake/install/TARGETS-DESTINATION-bad.cmake b/Tests/RunCMake/install/TARGETS-DESTINATION-bad.cmake
new file mode 100644
index 0000000..feff52d
--- /dev/null
+++ b/Tests/RunCMake/install/TARGETS-DESTINATION-bad.cmake
@@ -0,0 +1,3 @@
+enable_language(C)
+add_library(empty empty.c)
+install(TARGETS empty DESTINATION $<NOTAGENEX>)
diff --git a/Tests/RunCMake/install/empty.c b/Tests/RunCMake/install/empty.c
new file mode 100644
index 0000000..e69de29

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7607c3d16aa0636458c909f4036e4b0d91581b30
commit 7607c3d16aa0636458c909f4036e4b0d91581b30
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 11:48:13 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 15:14:01 2015 -0500

    cmInstallGenerator: Pass destination explicitly to AddInstallRule
    
    This will allow specific invocations to transform the destination
    before AddInstallRule uses it.

diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx
index 8c13bab..7593380 100644
--- a/Source/cmInstallDirectoryGenerator.cxx
+++ b/Source/cmInstallDirectoryGenerator.cxx
@@ -44,7 +44,9 @@ cmInstallDirectoryGenerator::GenerateScriptActions(std::ostream& os,
 {
   // Write code to install the directories.
   const char* no_rename = 0;
-  this->AddInstallRule(os, cmInstallType_DIRECTORY,
+  this->AddInstallRule(os,
+                       this->Destination,
+                       cmInstallType_DIRECTORY,
                        this->Directories,
                        this->Optional,
                        this->FilePermissions.c_str(),
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index 77af6c2..38c80df 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -185,7 +185,8 @@ cmInstallExportGenerator::GenerateScriptConfigs(std::ostream& os,
     files.push_back(i->second);
     std::string config_test = this->CreateConfigTest(i->first);
     os << indent << "if(" << config_test << ")\n";
-    this->AddInstallRule(os, cmInstallType_FILES, files, false,
+    this->AddInstallRule(os, this->Destination,
+                         cmInstallType_FILES, files, false,
                          this->FilePermissions.c_str(), 0, 0, 0,
                          indent.Next());
     os << indent << "endif()\n";
@@ -224,6 +225,7 @@ void cmInstallExportGenerator::GenerateScriptActions(std::ostream& os,
   // Install the main export file.
   std::vector<std::string> files;
   files.push_back(this->MainImportFile);
-  this->AddInstallRule(os, cmInstallType_FILES, files, false,
+  this->AddInstallRule(os, this->Destination,
+                       cmInstallType_FILES, files, false,
                        this->FilePermissions.c_str(), 0, 0, 0, indent);
 }
diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx
index 91b102a..28c27c2 100644
--- a/Source/cmInstallFilesGenerator.cxx
+++ b/Source/cmInstallFilesGenerator.cxx
@@ -57,6 +57,7 @@ void cmInstallFilesGenerator::AddFilesInstallRule(
   // Write code to install the files.
   const char* no_dir_permissions = 0;
   this->AddInstallRule(os,
+                       this->Destination,
                        (this->Programs
                         ? cmInstallType_PROGRAMS
                         : cmInstallType_FILES),
diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx
index 3ae8975..2e1c5f0 100644
--- a/Source/cmInstallGenerator.cxx
+++ b/Source/cmInstallGenerator.cxx
@@ -37,6 +37,7 @@ cmInstallGenerator
 void cmInstallGenerator
 ::AddInstallRule(
                  std::ostream& os,
+                 std::string const& dest,
                  cmInstallType type,
                  std::vector<std::string> const& files,
                  bool optional /* = false */,
@@ -60,7 +61,6 @@ void cmInstallGenerator
     case cmInstallType_FILES:          stype = "FILE"; break;
     }
   os << indent;
-  std::string const& dest = this->Destination;
   if (cmSystemTools::FileIsFullPath(dest.c_str()))
      {
      os << "list(APPEND CMAKE_ABSOLUTE_DESTINATION_FILES\n";
diff --git a/Source/cmInstallGenerator.h b/Source/cmInstallGenerator.h
index 1e87bda..c4191e4 100644
--- a/Source/cmInstallGenerator.h
+++ b/Source/cmInstallGenerator.h
@@ -40,7 +40,9 @@ public:
   virtual ~cmInstallGenerator();
 
   void AddInstallRule(
-    std::ostream& os, cmInstallType type,
+    std::ostream& os,
+    std::string const& dest,
+    cmInstallType type,
     std::vector<std::string> const& files,
     bool optional = false,
     const char* permissions_file = 0,
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index a22b123..7ab88f1 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -323,8 +323,8 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
   const char* no_dir_permissions = 0;
   const char* no_rename = 0;
   bool optional = this->Optional || this->ImportLibrary;
-  this->AddInstallRule(os, type, filesFrom,
-                       optional,
+  this->AddInstallRule(os, this->Destination,
+                       type, filesFrom, optional,
                        this->FilePermissions.c_str(), no_dir_permissions,
                        no_rename, literal_args.c_str(),
                        indent);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ebd556caa9e1fc92e00c8e401b145c531390e854
commit ebd556caa9e1fc92e00c8e401b145c531390e854
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 11:52:19 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 15:13:57 2015 -0500

    cmInstallGenerator: Fix check for absolute install destinations
    
    In AddInstallRule, check for absolute install destinations before
    converting to the absolute install destination.  Previously this
    worked only by accident because literal "${CMAKE_INSTALL_PREFIX}"
    looks like a relative path.

diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx
index 1d64674..3ae8975 100644
--- a/Source/cmInstallGenerator.cxx
+++ b/Source/cmInstallGenerator.cxx
@@ -60,7 +60,7 @@ void cmInstallGenerator
     case cmInstallType_FILES:          stype = "FILE"; break;
     }
   os << indent;
-  std::string dest = this->ConvertToAbsoluteDestination(this->Destination);
+  std::string const& dest = this->Destination;
   if (cmSystemTools::FileIsFullPath(dest.c_str()))
      {
      os << "list(APPEND CMAKE_ABSOLUTE_DESTINATION_FILES\n";
@@ -94,7 +94,8 @@ void cmInstallGenerator
         << "${CMAKE_ABSOLUTE_DESTINATION_FILES}\")\n";
      os << indent << "endif()\n";
      }
-  os << "file(INSTALL DESTINATION \"" << dest << "\" TYPE " << stype;
+  std::string absDest = this->ConvertToAbsoluteDestination(dest);
+  os << "file(INSTALL DESTINATION \"" << absDest << "\" TYPE " << stype;
   if(optional)
     {
     os << " OPTIONAL";

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=290ca8e2d0328d27f51ff5248c35e32e44fdd1eb
commit 290ca8e2d0328d27f51ff5248c35e32e44fdd1eb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 11:48:02 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 15:12:16 2015 -0500

    cmInstallGenerator: Refactor computation of absolute install dest
    
    Replace the GetInstallDestination method, which looked up the
    Destination ivar, with a new ConvertToAbsoluteDestination method that
    takes the nominal destination as an argument.  Update call sites
    accordingly.  This will allow some clients to transform the install
    destination before calling the method.

diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index 4480cc6..77af6c2 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -199,7 +199,7 @@ void cmInstallExportGenerator::GenerateScriptActions(std::ostream& os,
 {
   // Remove old per-configuration export files if the main changes.
   std::string installedDir = "$ENV{DESTDIR}";
-  installedDir += this->GetInstallDestination();
+  installedDir += this->ConvertToAbsoluteDestination(this->Destination);
   installedDir += "/";
   std::string installedFile = installedDir;
   installedFile += this->FileName;
diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx
index b261cbf..1d64674 100644
--- a/Source/cmInstallGenerator.cxx
+++ b/Source/cmInstallGenerator.cxx
@@ -60,7 +60,7 @@ void cmInstallGenerator
     case cmInstallType_FILES:          stype = "FILE"; break;
     }
   os << indent;
-  std::string dest = this->GetInstallDestination();
+  std::string dest = this->ConvertToAbsoluteDestination(this->Destination);
   if (cmSystemTools::FileIsFullPath(dest.c_str()))
      {
      os << "list(APPEND CMAKE_ABSOLUTE_DESTINATION_FILES\n";
@@ -179,15 +179,16 @@ bool cmInstallGenerator::InstallsForConfig(const std::string& config)
 }
 
 //----------------------------------------------------------------------------
-std::string cmInstallGenerator::GetInstallDestination() const
+std::string
+cmInstallGenerator::ConvertToAbsoluteDestination(std::string const& dest) const
 {
   std::string result;
-  if(!this->Destination.empty() &&
-     !cmSystemTools::FileIsFullPath(this->Destination.c_str()))
+  if(!dest.empty() &&
+     !cmSystemTools::FileIsFullPath(dest.c_str()))
     {
     result = "${CMAKE_INSTALL_PREFIX}/";
     }
-  result += this->Destination;
+  result += dest;
   return result;
 }
 
diff --git a/Source/cmInstallGenerator.h b/Source/cmInstallGenerator.h
index eeeca15..1e87bda 100644
--- a/Source/cmInstallGenerator.h
+++ b/Source/cmInstallGenerator.h
@@ -52,7 +52,7 @@ public:
 
   /** Get the install destination as it should appear in the
       installation script.  */
-  std::string GetInstallDestination() const;
+  std::string ConvertToAbsoluteDestination(std::string const& dest) const;
 
   /** Test if this generator installs something for a given configuration.  */
   bool InstallsForConfig(const std::string& config);
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 6d69f54..a22b123 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -77,7 +77,8 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
     fromDirConfig = this->Target->GetDirectory(config, this->ImportLibrary);
     fromDirConfig += "/";
     }
-  std::string toDir = this->GetInstallDestination();
+  std::string toDir =
+    this->ConvertToAbsoluteDestination(this->Destination);
   toDir += "/";
 
   // Compute the list of files to install for this target.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f99991db882c2f4cf8246b9c272845faaa5bbce5
commit f99991db882c2f4cf8246b9c272845faaa5bbce5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 11:45:41 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 15:05:57 2015 -0500

    cmInstallGenerator: Move GetDestination to subclasses that need it
    
    The method is used only for EXPORT and TARGET install destinations.
    While at it, make it return a std::string by reference instead of a
    "const char*".

diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index a0d9013..053c022 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -73,8 +73,8 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
   // to reference if they are relative to the install prefix.
   std::string installPrefix =
     this->IEGen->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
-  const char* installDest = this->IEGen->GetDestination();
-  if(cmSystemTools::FileIsFullPath(installDest))
+  std::string const& expDest = this->IEGen->GetDestination();
+  if(cmSystemTools::FileIsFullPath(expDest))
     {
     // The export file is being installed to an absolute path so the
     // package is not relocatable.  Use the configured install prefix.
@@ -87,7 +87,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     {
     // Add code to compute the installation prefix relative to the
     // import file location.
-    std::string absDest = installPrefix + "/" + installDest;
+    std::string absDest = installPrefix + "/" + expDest;
     std::string absDestS = absDest + "/";
     os << "# Compute the installation prefix relative to this file.\n"
        << "get_filename_component(_IMPORT_PREFIX"
@@ -109,7 +109,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
         "unset(_realOrig)\n"
         "unset(_realCurr)\n";
       }
-    std::string dest = installDest;
+    std::string dest = expDest;
     while(!dest.empty())
       {
       os <<
diff --git a/Source/cmInstallExportGenerator.h b/Source/cmInstallExportGenerator.h
index eb8c28b..3e078f2 100644
--- a/Source/cmInstallExportGenerator.h
+++ b/Source/cmInstallExportGenerator.h
@@ -41,6 +41,9 @@ public:
 
   const std::string& GetNamespace() const { return this->Namespace; }
 
+  std::string const& GetDestination() const
+    { return this->Destination; }
+
 protected:
   virtual void GenerateScript(std::ostream& os);
   virtual void GenerateScriptConfigs(std::ostream& os, Indent const& indent);
diff --git a/Source/cmInstallGenerator.h b/Source/cmInstallGenerator.h
index 38aac91..eeeca15 100644
--- a/Source/cmInstallGenerator.h
+++ b/Source/cmInstallGenerator.h
@@ -50,9 +50,6 @@ public:
     Indent const& indent = Indent()
     );
 
-  const char* GetDestination() const
-    { return this->Destination.c_str(); }
-
   /** Get the install destination as it should appear in the
       installation script.  */
   std::string GetInstallDestination() const;
diff --git a/Source/cmInstallTargetGenerator.h b/Source/cmInstallTargetGenerator.h
index 7e5cc71..4d4b399 100644
--- a/Source/cmInstallTargetGenerator.h
+++ b/Source/cmInstallTargetGenerator.h
@@ -60,6 +60,9 @@ public:
   cmTarget* GetTarget() const { return this->Target; }
   bool IsImportLibrary() const { return this->ImportLibrary; }
 
+  std::string const& GetDestination() const
+    { return this->Destination; }
+
 protected:
   virtual void GenerateScript(std::ostream& os);
   virtual void GenerateScriptForConfig(std::ostream& os,

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

Summary of changes:
 Help/command/install.rst                              |    4 ++++
 Help/release/dev/install-DESTINATION-genex.rst        |    5 +++++
 Source/cmExportInstallFileGenerator.cxx               |   10 +++++-----
 Source/cmInstallDirectoryGenerator.cxx                |    4 +++-
 Source/cmInstallExportGenerator.cxx                   |    8 +++++---
 Source/cmInstallExportGenerator.h                     |    3 +++
 Source/cmInstallFilesGenerator.cxx                    |    1 +
 Source/cmInstallGenerator.cxx                         |   14 ++++++++------
 Source/cmInstallGenerator.h                           |    9 ++++-----
 Source/cmInstallTargetGenerator.cxx                   |   17 ++++++++++++++---
 Source/cmInstallTargetGenerator.h                     |    2 ++
 Tests/ExportImport/Export/CMakeLists.txt              |   12 +++++++++---
 Tests/ExportImport/Export/testLibPerConfigDest.c      |    1 +
 Tests/ExportImport/Import/A/CMakeLists.txt            |    2 ++
 Tests/ExportImport/Import/A/imp_testExe1.c            |    2 ++
 Tests/RunCMake/install/RunCMakeTest.cmake             |    1 +
 .../TARGETS-DESTINATION-bad-result.txt}               |    0
 .../install/TARGETS-DESTINATION-bad-stderr.txt        |    6 ++++++
 Tests/RunCMake/install/TARGETS-DESTINATION-bad.cmake  |    3 +++
 .../RunCMake/{GeneratorExpression => install}/empty.c |    0
 20 files changed, 78 insertions(+), 26 deletions(-)
 create mode 100644 Help/release/dev/install-DESTINATION-genex.rst
 create mode 100644 Tests/ExportImport/Export/testLibPerConfigDest.c
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => install/TARGETS-DESTINATION-bad-result.txt} (100%)
 create mode 100644 Tests/RunCMake/install/TARGETS-DESTINATION-bad-stderr.txt
 create mode 100644 Tests/RunCMake/install/TARGETS-DESTINATION-bad.cmake
 copy Tests/RunCMake/{GeneratorExpression => install}/empty.c (100%)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Feb 11 16:26:12 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 11 Feb 2015 16:26:12 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1288-g1af2299
Message-ID: <20150211212612.BF5D9AA152@public.kitware.com>

This is an automated email from 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  1af2299bd96f8d75142af21439a81a4038608198 (commit)
       via  2ad4e4cdcc316de116baa2a8611476dec6b5e99a (commit)
      from  9e978e3ee89f5f53991cd09e1b25ba3d2ec03e98 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1af2299bd96f8d75142af21439a81a4038608198
commit 1af2299bd96f8d75142af21439a81a4038608198
Merge: 9e978e3 2ad4e4c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 16:26:12 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 16:26:12 2015 -0500

    Merge topic 'clean-up-cmMacroCommand' into next
    
    2ad4e4cd cmMacroCommand: Manipulate target string directly.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ad4e4cdcc316de116baa2a8611476dec6b5e99a
commit 2ad4e4cdcc316de116baa2a8611476dec6b5e99a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 22:16:03 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:16:03 2015 +0100

    cmMacroCommand: Manipulate target string directly.
    
    Avoid copying a string from the source, manipulating it, and then
    copying it back.  Manipulate it in place instead.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index c6f0571..e2751f9 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -151,37 +151,33 @@ bool cmMacroHelperCommand::InvokeInitialPass
       k->FilePath = this->FilePath.c_str();
 
       cmListFileArgument arg;
-      if(k->Delim == cmListFileArgument::Bracket)
+      arg.Value = k->Value;
+      if(k->Delim != cmListFileArgument::Bracket)
         {
-        arg.Value = k->Value;
-        }
-      else
-        {
-        std::string tmps = k->Value;
         // replace formal arguments
         for (unsigned int j = 0; j < variables.size(); ++j)
           {
-          cmSystemTools::ReplaceString(tmps, variables[j].c_str(),
+          cmSystemTools::ReplaceString(arg.Value, variables[j].c_str(),
                                        expandedArgs[j].c_str());
           }
         // replace argc
-        cmSystemTools::ReplaceString(tmps, "${ARGC}",argcDef.c_str());
+        cmSystemTools::ReplaceString(arg.Value, "${ARGC}",argcDef.c_str());
 
-        cmSystemTools::ReplaceString(tmps, "${ARGN}", expandedArgn.c_str());
-        cmSystemTools::ReplaceString(tmps, "${ARGV}", expandedArgv.c_str());
+        cmSystemTools::ReplaceString(arg.Value, "${ARGN}",
+                                     expandedArgn.c_str());
+        cmSystemTools::ReplaceString(arg.Value, "${ARGV}",
+                                     expandedArgv.c_str());
 
         // if the current argument of the current function has ${ARGV in it
         // then try replacing ARGV values
-        if (tmps.find("${ARGV") != std::string::npos)
+        if (arg.Value.find("${ARGV") != std::string::npos)
           {
           for (unsigned int t = 0; t < expandedArgs.size(); ++t)
             {
-            cmSystemTools::ReplaceString(tmps, argVs[t].c_str(),
+            cmSystemTools::ReplaceString(arg.Value, argVs[t].c_str(),
                                          expandedArgs[t].c_str());
             }
           }
-
-        arg.Value = tmps;
         }
       arg.Delim = k->Delim;
       arg.FilePath = k->FilePath;

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

Summary of changes:
 Source/cmMacroCommand.cxx |   24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 11 16:44:47 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 11 Feb 2015 16:44:47 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1290-g6f86f8a
Message-ID: <20150211214447.61A72AA94F@public.kitware.com>

This is an automated email from 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  6f86f8a5626d8dc7ee84e7acddc8173189a28a76 (commit)
       via  9d2ef95e828f002144279e5a90bb18d17f83e62f (commit)
      from  1af2299bd96f8d75142af21439a81a4038608198 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f86f8a5626d8dc7ee84e7acddc8173189a28a76
commit 6f86f8a5626d8dc7ee84e7acddc8173189a28a76
Merge: 1af2299 9d2ef95
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 16:44:46 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 16:44:46 2015 -0500

    Merge topic 'clean-up-cmMacroCommand' into next
    
    9d2ef95e cmMacroCommand: Respect valid iterator range


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d2ef95e828f002144279e5a90bb18d17f83e62f
commit 9d2ef95e828f002144279e5a90bb18d17f83e62f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 16:43:29 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 16:43:29 2015 -0500

    cmMacroCommand: Respect valid iterator range
    
    Do not allow even a temporary iterator to sit out of range.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index e2751f9..7f21d44 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -108,7 +108,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
   std::string argcDef = argcDefStream.str();
 
   std::vector<std::string>::const_iterator eit
-      = expandedArgs.begin() + this->Args.size() - 1;
+      = expandedArgs.begin() + (this->Args.size() - 1);
   std::string expandedArgn = cmJoin(cmRange(eit, expandedArgs.end()), ";");
   std::string expandedArgv = cmJoin(expandedArgs, ";");
   std::vector<std::string> variables;

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

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


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Feb 11 16:49:40 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 11 Feb 2015 16:49:40 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1292-ge610103
Message-ID: <20150211214940.9B354AAAA1@public.kitware.com>

This is an automated email from 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  e610103fe20600300893e78426ade8c645ee87bb (commit)
       via  ee340f7a764bde9f4875fa927be5343a275c583b (commit)
      from  6f86f8a5626d8dc7ee84e7acddc8173189a28a76 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e610103fe20600300893e78426ade8c645ee87bb
commit e610103fe20600300893e78426ade8c645ee87bb
Merge: 6f86f8a ee340f7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 16:49:40 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 16:49:40 2015 -0500

    Merge topic 'clean-up-cmMacroCommand' into next
    
    ee340f7a fixup! cmMacroCommand: Move computation of ARGV%n names out of double loop.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee340f7a764bde9f4875fa927be5343a275c583b
commit ee340f7a764bde9f4875fa927be5343a275c583b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 22:45:20 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:49:16 2015 +0100

    fixup! cmMacroCommand: Move computation of ARGV%n names out of double loop.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 7f21d44..29e8cb1 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -113,13 +113,13 @@ bool cmMacroHelperCommand::InvokeInitialPass
   std::string expandedArgv = cmJoin(expandedArgs, ";");
   std::vector<std::string> variables;
   variables.reserve(this->Args.size() - 1);
-  std::vector<std::string> argVs;
-  argVs.reserve(this->Args.size() - 1);
-  char argvName[60];
   for (unsigned int j = 1; j < this->Args.size(); ++j)
     {
     variables.push_back("${" + this->Args[j] + "}");
     }
+  std::vector<std::string> argVs;
+  argVs.reserve(expandedArgs.size());
+  char argvName[60];
   for (unsigned int j = 0; j < expandedArgs.size(); ++j)
     {
     sprintf(argvName,"${ARGV%i}",j);

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

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


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Feb 11 16:59:17 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 11 Feb 2015 16:59:17 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1322-g015e5e0
Message-ID: <20150211215917.336E2AAD1B@public.kitware.com>

This is an automated email from 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  015e5e0c2cd0573f1ca07103216530703c337eb1 (commit)
       via  b5f98e5012ef53ee6746c42131fc66892bfff717 (commit)
       via  83414d5a07753d004f5e663c385ef0c713895d46 (commit)
       via  9a1f8f35f48d7dcfefc70de9ae530c31b16cd9e0 (commit)
       via  4aa7bd2ac11aa2edb0288e5ba360984b7799130d (commit)
       via  6774c92b5809b80c767ef8094b2f26d06556e0fd (commit)
       via  2c4a7298fcb3ac6a6b6c0a9545b343c814f3d6ec (commit)
       via  a551851ab3f23f58074638ffcf38a08d98a35fa8 (commit)
       via  f79c0f7697ee0bd25ec74f7dbb2ac0cf6189a9df (commit)
       via  8e0827b646b14028446503ac392a9ab7bb5a53a3 (commit)
       via  f2c49f59d8dbca936a40b62a9079fa71ca551365 (commit)
       via  3250a7e535684bec684c0109b31675ba72dc3aa9 (commit)
       via  081a13f7c011d0ebd28caebfedee1e3e3f7602c9 (commit)
       via  17b5ebd383df4c0c731b5c687ccaa3608b2d188f (commit)
       via  7c3f637680ac0cdb6cec5e75ba4a9b188de5017b (commit)
       via  8a399c8c9f1c4a793289d6baf37081efac082eee (commit)
       via  abfca97525be06e067981b6c6bf63ba7a3aa52f9 (commit)
       via  0b61b86df856e3cec366f8c23f35aae576b2d821 (commit)
       via  e21f7829a2891ce7599ade02d4fd9c193657069a (commit)
       via  559dc15589ad0b9a7bdaa62ac7552899993f6f0d (commit)
       via  0ea719326ea78b423a5ec95b1218b626e9392f07 (commit)
       via  9380e85f865e29cd5968e91408a31d5160f4a4cb (commit)
       via  bb10012fea677fd8aa1bbefd06061efcb7ec1955 (commit)
       via  0c12f1ea0da0a5822a7a69b4ff77b45732c72466 (commit)
       via  27c6f017a1ef7c62f7f0332d624add7e8189f81c (commit)
       via  4e78ebbdf94b99f7b7d5b9b31d05dd9479b1d6ab (commit)
       via  8910224950a2b723e0d4fd7c21a326af7fb2e050 (commit)
       via  7b8725bf8472ebf4781ddd60ef8fcca9c3ad98dd (commit)
       via  7ee56f03999e8605cc2cbe85a3a7b7159e639e5d (commit)
       via  0a4e5674eccb0126733086d4632c7239217db6f1 (commit)
      from  e610103fe20600300893e78426ade8c645ee87bb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=015e5e0c2cd0573f1ca07103216530703c337eb1
commit 015e5e0c2cd0573f1ca07103216530703c337eb1
Merge: e610103 b5f98e5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 16:59:15 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 16:59:15 2015 -0500

    Merge topic 'clean-up-cmMacroCommand' into next
    
    b5f98e50 cmMacroCommand: Manipulate target string directly.
    83414d5a cmMacroCommand: Move computation of ARGV%n names out of double loop.
    9a1f8f35 cmMacroCommand: Move ARGV replacement out of condition.
    4aa7bd2a cmMacroCommand: Remove condition around ARGN replacement.
    6774c92b cmMacroCommand: Declare tmps in the scope that it's used.
    2c4a7298 cmMacroCommand: Declare arg in the scope that it is used.
    a551851a cmMacroCommand: Inline variable computation.
    f79c0f76 cmMacroCommand: Compute variables outside of two loops.
    8e0827b6 cmMacroCommand: Remove intermediate arg variables.
    f2c49f59 cmMacroCommand: Remove condition around ARGN computation.
    3250a7e5 cmMacroCommand: Remove conditional append of semicolon.
    081a13f7 cmMacroCommand: Declare arg variables where used and initialized.
    17b5ebd3 cmMacroCommand: Join the args strings outside of the loops.
    7c3f6376 Convert loop into two algorithms.
    8a399c8c Convert loop to the common pattern.
    abfca975 Move loop inside of condition.
    ...


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5f98e5012ef53ee6746c42131fc66892bfff717
commit b5f98e5012ef53ee6746c42131fc66892bfff717
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 22:16:03 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:34 2015 +0100

    cmMacroCommand: Manipulate target string directly.
    
    Avoid copying a string from the source, manipulating it, and then
    copying it back.  Manipulate it in place instead.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 49b9fd2..29e8cb1 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -151,37 +151,33 @@ bool cmMacroHelperCommand::InvokeInitialPass
       k->FilePath = this->FilePath.c_str();
 
       cmListFileArgument arg;
-      if(k->Delim == cmListFileArgument::Bracket)
+      arg.Value = k->Value;
+      if(k->Delim != cmListFileArgument::Bracket)
         {
-        arg.Value = k->Value;
-        }
-      else
-        {
-        std::string tmps = k->Value;
         // replace formal arguments
         for (unsigned int j = 0; j < variables.size(); ++j)
           {
-          cmSystemTools::ReplaceString(tmps, variables[j].c_str(),
+          cmSystemTools::ReplaceString(arg.Value, variables[j].c_str(),
                                        expandedArgs[j].c_str());
           }
         // replace argc
-        cmSystemTools::ReplaceString(tmps, "${ARGC}",argcDef.c_str());
+        cmSystemTools::ReplaceString(arg.Value, "${ARGC}",argcDef.c_str());
 
-        cmSystemTools::ReplaceString(tmps, "${ARGN}", expandedArgn.c_str());
-        cmSystemTools::ReplaceString(tmps, "${ARGV}", expandedArgv.c_str());
+        cmSystemTools::ReplaceString(arg.Value, "${ARGN}",
+                                     expandedArgn.c_str());
+        cmSystemTools::ReplaceString(arg.Value, "${ARGV}",
+                                     expandedArgv.c_str());
 
         // if the current argument of the current function has ${ARGV in it
         // then try replacing ARGV values
-        if (tmps.find("${ARGV") != std::string::npos)
+        if (arg.Value.find("${ARGV") != std::string::npos)
           {
           for (unsigned int t = 0; t < expandedArgs.size(); ++t)
             {
-            cmSystemTools::ReplaceString(tmps, argVs[t].c_str(),
+            cmSystemTools::ReplaceString(arg.Value, argVs[t].c_str(),
                                          expandedArgs[t].c_str());
             }
           }
-
-        arg.Value = tmps;
         }
       arg.Delim = k->Delim;
       arg.FilePath = k->FilePath;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83414d5a07753d004f5e663c385ef0c713895d46
commit 83414d5a07753d004f5e663c385ef0c713895d46
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 20:16:40 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:34 2015 +0100

    cmMacroCommand: Move computation of ARGV%n names out of double loop.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 44b1465..49b9fd2 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -117,6 +117,14 @@ bool cmMacroHelperCommand::InvokeInitialPass
     {
     variables.push_back("${" + this->Args[j] + "}");
     }
+  std::vector<std::string> argVs;
+  argVs.reserve(expandedArgs.size());
+  char argvName[60];
+  for (unsigned int j = 0; j < expandedArgs.size(); ++j)
+    {
+    sprintf(argvName,"${ARGV%i}",j);
+    argVs.push_back(argvName);
+    }
   if(!this->Functions.empty())
     {
     this->FilePath = this->Functions[0].FilePath;
@@ -166,12 +174,9 @@ bool cmMacroHelperCommand::InvokeInitialPass
         // then try replacing ARGV values
         if (tmps.find("${ARGV") != std::string::npos)
           {
-          char argvName[60];
-          // also replace the ARGV1 ARGV2 ... etc
           for (unsigned int t = 0; t < expandedArgs.size(); ++t)
             {
-            sprintf(argvName,"${ARGV%i}",t);
-            cmSystemTools::ReplaceString(tmps, argvName,
+            cmSystemTools::ReplaceString(tmps, argVs[t].c_str(),
                                          expandedArgs[t].c_str());
             }
           }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a1f8f35f48d7dcfefc70de9ae530c31b16cd9e0
commit 9a1f8f35f48d7dcfefc70de9ae530c31b16cd9e0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 20:08:05 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:34 2015 +0100

    cmMacroCommand: Move ARGV replacement out of condition.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 111ad96..44b1465 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -160,14 +160,13 @@ bool cmMacroHelperCommand::InvokeInitialPass
         cmSystemTools::ReplaceString(tmps, "${ARGC}",argcDef.c_str());
 
         cmSystemTools::ReplaceString(tmps, "${ARGN}", expandedArgn.c_str());
+        cmSystemTools::ReplaceString(tmps, "${ARGV}", expandedArgv.c_str());
 
         // if the current argument of the current function has ${ARGV in it
         // then try replacing ARGV values
         if (tmps.find("${ARGV") != std::string::npos)
           {
           char argvName[60];
-          cmSystemTools::ReplaceString(tmps, "${ARGV}", expandedArgv.c_str());
-
           // also replace the ARGV1 ARGV2 ... etc
           for (unsigned int t = 0; t < expandedArgs.size(); ++t)
             {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4aa7bd2ac11aa2edb0288e5ba360984b7799130d
commit 4aa7bd2ac11aa2edb0288e5ba360984b7799130d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 20:06:39 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:34 2015 +0100

    cmMacroCommand: Remove condition around ARGN replacement.
    
    There is none for ARGC replacement, so no reason to conditionalize the
    replacement.  The computation is already done.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 6635fee..111ad96 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -159,11 +159,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
         // replace argc
         cmSystemTools::ReplaceString(tmps, "${ARGC}",argcDef.c_str());
 
-        // repleace ARGN
-        if (tmps.find("${ARGN}") != std::string::npos)
-          {
-          cmSystemTools::ReplaceString(tmps, "${ARGN}", expandedArgn.c_str());
-          }
+        cmSystemTools::ReplaceString(tmps, "${ARGN}", expandedArgn.c_str());
 
         // if the current argument of the current function has ${ARGV in it
         // then try replacing ARGV values

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6774c92b5809b80c767ef8094b2f26d06556e0fd
commit 6774c92b5809b80c767ef8094b2f26d06556e0fd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 20:25:44 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:34 2015 +0100

    cmMacroCommand: Declare tmps in the scope that it's used.
    
    We don't particularly need to reuse the string memory here, and this
    pattern is not common in CMake.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index bd53b1e..6635fee 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -84,8 +84,6 @@ bool cmMacroHelperCommand::InvokeInitialPass
   std::vector<std::string> expandedArgs;
   this->Makefile->ExpandArguments(args, expandedArgs);
 
-  std::string tmps;
-
   // make sure the number of arguments passed is at least the number
   // required by the signature
   if (expandedArgs.size() < this->Args.size() - 1)
@@ -151,7 +149,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
         }
       else
         {
-        tmps = k->Value;
+        std::string tmps = k->Value;
         // replace formal arguments
         for (unsigned int j = 0; j < variables.size(); ++j)
           {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c4a7298fcb3ac6a6b6c0a9545b343c814f3d6ec
commit 2c4a7298fcb3ac6a6b6c0a9545b343c814f3d6ec
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 20:23:36 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:34 2015 +0100

    cmMacroCommand: Declare arg in the scope that it is used.
    
    It can make sense to declare objects outside of loops if
    the size required by the object can grow (eg std::string when
    using getline), but that is not the case here.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 6f45484..bd53b1e 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -85,7 +85,6 @@ bool cmMacroHelperCommand::InvokeInitialPass
   this->Makefile->ExpandArguments(args, expandedArgs);
 
   std::string tmps;
-  cmListFileArgument arg;
 
   // make sure the number of arguments passed is at least the number
   // required by the signature
@@ -144,6 +143,8 @@ bool cmMacroHelperCommand::InvokeInitialPass
       // Set the FilePath on the arguments to match the function since it is
       // not stored and the original values may be freed
       k->FilePath = this->FilePath.c_str();
+
+      cmListFileArgument arg;
       if(k->Delim == cmListFileArgument::Bracket)
         {
         arg.Value = k->Value;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a551851ab3f23f58074638ffcf38a08d98a35fa8
commit a551851ab3f23f58074638ffcf38a08d98a35fa8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 20:14:30 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:33 2015 +0100

    cmMacroCommand: Inline variable computation.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 8424c75..6f45484 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -86,7 +86,6 @@ bool cmMacroHelperCommand::InvokeInitialPass
 
   std::string tmps;
   cmListFileArgument arg;
-  std::string variable;
 
   // make sure the number of arguments passed is at least the number
   // required by the signature
@@ -119,10 +118,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
   variables.reserve(this->Args.size() - 1);
   for (unsigned int j = 1; j < this->Args.size(); ++j)
     {
-    std::string variable = "${";
-    variable += this->Args[j];
-    variable += "}";
-    variables.push_back(variable);
+    variables.push_back("${" + this->Args[j] + "}");
     }
   if(!this->Functions.empty())
     {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f79c0f7697ee0bd25ec74f7dbb2ac0cf6189a9df
commit f79c0f7697ee0bd25ec74f7dbb2ac0cf6189a9df
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 19:51:15 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:33 2015 +0100

    cmMacroCommand: Compute variables outside of two loops.
    
    Avoid computing them from scratch for each argument of each
    function.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 8bbb7c6..8424c75 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -115,6 +115,15 @@ bool cmMacroHelperCommand::InvokeInitialPass
       = expandedArgs.begin() + (this->Args.size() - 1);
   std::string expandedArgn = cmJoin(cmRange(eit, expandedArgs.end()), ";");
   std::string expandedArgv = cmJoin(expandedArgs, ";");
+  std::vector<std::string> variables;
+  variables.reserve(this->Args.size() - 1);
+  for (unsigned int j = 1; j < this->Args.size(); ++j)
+    {
+    std::string variable = "${";
+    variable += this->Args[j];
+    variable += "}";
+    variables.push_back(variable);
+    }
   if(!this->Functions.empty())
     {
     this->FilePath = this->Functions[0].FilePath;
@@ -147,13 +156,10 @@ bool cmMacroHelperCommand::InvokeInitialPass
         {
         tmps = k->Value;
         // replace formal arguments
-        for (unsigned int j = 1; j < this->Args.size(); ++j)
+        for (unsigned int j = 0; j < variables.size(); ++j)
           {
-          variable = "${";
-          variable += this->Args[j];
-          variable += "}";
-          cmSystemTools::ReplaceString(tmps, variable.c_str(),
-                                       expandedArgs[j-1].c_str());
+          cmSystemTools::ReplaceString(tmps, variables[j].c_str(),
+                                       expandedArgs[j].c_str());
           }
         // replace argc
         cmSystemTools::ReplaceString(tmps, "${ARGC}",argcDef.c_str());

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e0827b646b14028446503ac392a9ab7bb5a53a3
commit 8e0827b646b14028446503ac392a9ab7bb5a53a3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 19:26:33 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:33 2015 +0100

    cmMacroCommand: Remove intermediate arg variables.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 9fc479e..8bbb7c6 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -161,9 +161,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
         // repleace ARGN
         if (tmps.find("${ARGN}") != std::string::npos)
           {
-          std::string argnDef;
-          argnDef += expandedArgn;
-          cmSystemTools::ReplaceString(tmps, "${ARGN}", argnDef.c_str());
+          cmSystemTools::ReplaceString(tmps, "${ARGN}", expandedArgn.c_str());
           }
 
         // if the current argument of the current function has ${ARGV in it
@@ -171,10 +169,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
         if (tmps.find("${ARGV") != std::string::npos)
           {
           char argvName[60];
-
-          std::string argvDef;
-          argvDef += expandedArgv;
-          cmSystemTools::ReplaceString(tmps, "${ARGV}", argvDef.c_str());
+          cmSystemTools::ReplaceString(tmps, "${ARGV}", expandedArgv.c_str());
 
           // also replace the ARGV1 ARGV2 ... etc
           for (unsigned int t = 0; t < expandedArgs.size(); ++t)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2c49f59d8dbca936a40b62a9079fa71ca551365
commit f2c49f59d8dbca936a40b62a9079fa71ca551365
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 19:17:29 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:33 2015 +0100

    cmMacroCommand: Remove condition around ARGN computation.
    
    An empty string is appended if the condition is false, which is
    ok for this commit.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index b27b994..9fc479e 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -162,10 +162,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
         if (tmps.find("${ARGN}") != std::string::npos)
           {
           std::string argnDef;
-          if (expandedArgs.size() > this->Args.size() - 1)
-            {
-            argnDef += expandedArgn;
-            }
+          argnDef += expandedArgn;
           cmSystemTools::ReplaceString(tmps, "${ARGN}", argnDef.c_str());
           }
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3250a7e535684bec684c0109b31675ba72dc3aa9
commit 3250a7e535684bec684c0109b31675ba72dc3aa9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 19:16:15 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:33 2015 +0100

    cmMacroCommand: Remove conditional append of semicolon.
    
    The conditions are never true.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index f7daa76..b27b994 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -164,10 +164,6 @@ bool cmMacroHelperCommand::InvokeInitialPass
           std::string argnDef;
           if (expandedArgs.size() > this->Args.size() - 1)
             {
-            if (!argnDef.empty() && !expandedArgs.empty())
-              {
-              argnDef += ";";
-              }
             argnDef += expandedArgn;
             }
           cmSystemTools::ReplaceString(tmps, "${ARGN}", argnDef.c_str());
@@ -180,10 +176,6 @@ bool cmMacroHelperCommand::InvokeInitialPass
           char argvName[60];
 
           std::string argvDef;
-          if (!argvDef.empty() && !expandedArgs.empty())
-            {
-            argvDef += ";";
-            }
           argvDef += expandedArgv;
           cmSystemTools::ReplaceString(tmps, "${ARGV}", argvDef.c_str());
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=081a13f7c011d0ebd28caebfedee1e3e3f7602c9
commit 081a13f7c011d0ebd28caebfedee1e3e3f7602c9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 19:10:19 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:33 2015 +0100

    cmMacroCommand: Declare arg variables where used and initialized.
    
    Make the initialization by population with the expanded* content
    unconditional.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index de52fc9..f7daa76 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -111,15 +111,10 @@ bool cmMacroHelperCommand::InvokeInitialPass
   argcDefStream << expandedArgs.size();
   std::string argcDef = argcDefStream.str();
 
-  // declare varuiables for ARGV ARGN but do not compute until needed
-  std::string argvDef;
-  std::string argnDef;
   std::vector<std::string>::const_iterator eit
       = expandedArgs.begin() + (this->Args.size() - 1);
   std::string expandedArgn = cmJoin(cmRange(eit, expandedArgs.end()), ";");
   std::string expandedArgv = cmJoin(expandedArgs, ";");
-  bool argnDefInitialized = false;
-  bool argvDefInitialized = false;
   if(!this->Functions.empty())
     {
     this->FilePath = this->Functions[0].FilePath;
@@ -166,17 +161,14 @@ bool cmMacroHelperCommand::InvokeInitialPass
         // repleace ARGN
         if (tmps.find("${ARGN}") != std::string::npos)
           {
-          if (!argnDefInitialized)
+          std::string argnDef;
+          if (expandedArgs.size() > this->Args.size() - 1)
             {
-            if (expandedArgs.size() > this->Args.size() - 1)
+            if (!argnDef.empty() && !expandedArgs.empty())
               {
-              if (!argnDef.empty() && !expandedArgs.empty())
-                {
-                argnDef += ";";
-                }
-              argnDef += expandedArgn;
+              argnDef += ";";
               }
-            argnDefInitialized = true;
+            argnDef += expandedArgn;
             }
           cmSystemTools::ReplaceString(tmps, "${ARGN}", argnDef.c_str());
           }
@@ -187,16 +179,12 @@ bool cmMacroHelperCommand::InvokeInitialPass
           {
           char argvName[60];
 
-          // repleace ARGV, compute it only once
-          if (!argvDefInitialized)
+          std::string argvDef;
+          if (!argvDef.empty() && !expandedArgs.empty())
             {
-            if (!argvDef.empty() && !expandedArgs.empty())
-              {
-              argvDef += ";";
-              }
-            argvDef += expandedArgv;
-            argvDefInitialized = true;
+            argvDef += ";";
             }
+          argvDef += expandedArgv;
           cmSystemTools::ReplaceString(tmps, "${ARGV}", argvDef.c_str());
 
           // also replace the ARGV1 ARGV2 ... etc

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17b5ebd383df4c0c731b5c687ccaa3608b2d188f
commit 17b5ebd383df4c0c731b5c687ccaa3608b2d188f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 20:47:16 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:31 2015 +0100

    cmMacroCommand: Join the args strings outside of the loops.
    
    This means that we compute the strings even if not used in the macro
    but this shouldn't be expensive and it simplifies the code.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 8f6364d..de52fc9 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -114,6 +114,10 @@ bool cmMacroHelperCommand::InvokeInitialPass
   // declare varuiables for ARGV ARGN but do not compute until needed
   std::string argvDef;
   std::string argnDef;
+  std::vector<std::string>::const_iterator eit
+      = expandedArgs.begin() + (this->Args.size() - 1);
+  std::string expandedArgn = cmJoin(cmRange(eit, expandedArgs.end()), ";");
+  std::string expandedArgv = cmJoin(expandedArgs, ";");
   bool argnDefInitialized = false;
   bool argvDefInitialized = false;
   if(!this->Functions.empty())
@@ -170,9 +174,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
                 {
                 argnDef += ";";
                 }
-              std::vector<std::string>::const_iterator eit
-                  = expandedArgs.begin() + (this->Args.size() - 1);
-              argnDef += cmJoin(cmRange(eit, expandedArgs.end()), ";");
+              argnDef += expandedArgn;
               }
             argnDefInitialized = true;
             }
@@ -192,7 +194,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
               {
               argvDef += ";";
               }
-            argvDef += cmJoin(expandedArgs, ";");
+            argvDef += expandedArgv;
             argvDefInitialized = true;
             }
           cmSystemTools::ReplaceString(tmps, "${ARGV}", argvDef.c_str());

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c3f637680ac0cdb6cec5e75ba4a9b188de5017b
commit 7c3f637680ac0cdb6cec5e75ba4a9b188de5017b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 24 18:07:37 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:09 2015 +0100

    Convert loop into two algorithms.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 359141a..a08c159 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2299,16 +2299,12 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
       {
       // Now add the rest of the components separated by the proper slash
       // direction for this platform.
-      const char* sep = "";
-      for(unsigned int i=1; i < components.size() - 1; ++i)
-        {
-        if(!components[i].empty())
-          {
-          result += sep;
-          result += components[i];
-          sep = slash;
-          }
-        }
+      std::vector<std::string>::const_iterator compEnd
+          = std::remove(components.begin() + 1, components.end() - 1,
+                          std::string());
+      std::vector<std::string>::const_iterator compStart
+          = components.begin() + 1;
+      result += cmJoin(cmRange(compStart, compEnd), slash);
       // Only the last component can be empty to avoid double slashes.
       result += slash;
       result += components.back();

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a399c8c9f1c4a793289d6baf37081efac082eee
commit 8a399c8c9f1c4a793289d6baf37081efac082eee
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 23 01:06:40 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:09 2015 +0100

    Convert loop to the common pattern.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 703ab27..359141a 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2299,24 +2299,18 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
       {
       // Now add the rest of the components separated by the proper slash
       // direction for this platform.
-      bool first = true;
+      const char* sep = "";
       for(unsigned int i=1; i < components.size() - 1; ++i)
         {
         if(!components[i].empty())
           {
-          if(!first)
-            {
-            result += slash;
-            }
+          result += sep;
           result += components[i];
-          first = false;
+          sep = slash;
           }
         }
       // Only the last component can be empty to avoid double slashes.
-      if(!first)
-        {
-        result += slash;
-        }
+      result += slash;
       result += components.back();
       }
     }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=abfca97525be06e067981b6c6bf63ba7a3aa52f9
commit abfca97525be06e067981b6c6bf63ba7a3aa52f9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 23:09:03 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:09 2015 +0100

    Move loop inside of condition.
    
    The loop is only executed if the condition is true.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 32da821..703ab27 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2295,23 +2295,23 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
     // Begin the quoted result with the root component.
     result += components[0];
 
-    // Now add the rest of the components separated by the proper slash
-    // direction for this platform.
-    bool first = true;
-    for(unsigned int i=1; i < components.size() - 1; ++i)
+    if (components.size() > 1)
       {
-      if(!components[i].empty())
+      // Now add the rest of the components separated by the proper slash
+      // direction for this platform.
+      bool first = true;
+      for(unsigned int i=1; i < components.size() - 1; ++i)
         {
-        if(!first)
+        if(!components[i].empty())
           {
-          result += slash;
+          if(!first)
+            {
+            result += slash;
+            }
+          result += components[i];
+          first = false;
           }
-        result += components[i];
-        first = false;
         }
-      }
-    if (components.size() > 1)
-      {
       // Only the last component can be empty to avoid double slashes.
       if(!first)
         {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b61b86df856e3cec366f8c23f35aae576b2d821
commit 0b61b86df856e3cec366f8c23f35aae576b2d821
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 23 01:03:45 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:08 2015 +0100

    Handle last element outside of the loop.
    
    There is no point in checking on each loop iteration whether
    it is the last element.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 54d330f..32da821 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2298,10 +2298,9 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
     // Now add the rest of the components separated by the proper slash
     // direction for this platform.
     bool first = true;
-    for(unsigned int i=1; i < components.size(); ++i)
+    for(unsigned int i=1; i < components.size() - 1; ++i)
       {
-      // Only the last component can be empty to avoid double slashes.
-      if(!components[i].empty() || (i == (components.size()-1)))
+      if(!components[i].empty())
         {
         if(!first)
           {
@@ -2311,6 +2310,15 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
         first = false;
         }
       }
+    if (components.size() > 1)
+      {
+      // Only the last component can be empty to avoid double slashes.
+      if(!first)
+        {
+        result += slash;
+        }
+      result += components.back();
+      }
     }
 
   // Close the quoted result.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e21f7829a2891ce7599ade02d4fd9c193657069a
commit e21f7829a2891ce7599ade02d4fd9c193657069a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 22:48:02 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:08 2015 +0100

    cmTarget: Use a sorted vector in place of a set.
    
    The vector has a more easy-to-use API.
    
    Join the string with cmJoin, and avoid erasing from the container
    in the loop.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f0bdea7..526a923 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6687,40 +6687,33 @@ void cmTarget::CheckPropertyCompatibility(cmComputeLinkInformation *info,
 
   if (!prop.empty())
     {
-    // Use a std::set to keep the error message sorted.
-    std::set<std::string> props;
+    // Use a sorted std::vector to keep the error message sorted.
+    std::vector<std::string> props;
     std::set<std::string>::const_iterator i = emittedBools.find(prop);
     if (i != emittedBools.end())
       {
-      props.insert(strBool);
+      props.push_back(strBool);
       }
     i = emittedStrings.find(prop);
     if (i != emittedStrings.end())
       {
-      props.insert(strString);
+      props.push_back(strString);
       }
     i = emittedMinNumbers.find(prop);
     if (i != emittedMinNumbers.end())
       {
-      props.insert(strNumMin);
+      props.push_back(strNumMin);
       }
     i = emittedMaxNumbers.find(prop);
     if (i != emittedMaxNumbers.end())
       {
-      props.insert(strNumMax);
+      props.push_back(strNumMax);
       }
+    std::sort(props.begin(), props.end());
+
+    std::string propsString = cmJoin(cmRange(props).retreat(1), ", ");
+    propsString += " and the " + props.back();
 
-    std::string propsString = *props.begin();
-    props.erase(props.begin());
-    while (props.size() > 1)
-      {
-      propsString += ", " + *props.begin();
-      props.erase(props.begin());
-      }
-   if (props.size() == 1)
-     {
-     propsString += " and the " + *props.begin();
-     }
     std::ostringstream e;
     e << "Property \"" << prop << "\" appears in both the "
       << propsString <<

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=559dc15589ad0b9a7bdaa62ac7552899993f6f0d
commit 559dc15589ad0b9a7bdaa62ac7552899993f6f0d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 23:26:58 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:08 2015 +0100

    cmSet: Replace loop with cmJoin.

diff --git a/Source/cmSetCommand.cxx b/Source/cmSetCommand.cxx
index 90d7b03..204d95b 100644
--- a/Source/cmSetCommand.cxx
+++ b/Source/cmSetCommand.cxx
@@ -108,17 +108,7 @@ bool cmSetCommand
     }
 
   // collect any values into a single semi-colon separated value list
-  if(static_cast<unsigned short>(args.size()) >
-     static_cast<unsigned short>(1 + ignoreLastArgs))
-    {
-    value = args[1];
-    size_t endPos = args.size() - ignoreLastArgs;
-    for(size_t i = 2; i < endPos; ++i)
-      {
-      value += ";";
-      value += args[i];
-      }
-    }
+  value = cmJoin(cmRange(args).advance(1).retreat(ignoreLastArgs), ";");
 
   if (parentScope)
     {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ea719326ea78b423a5ec95b1218b626e9392f07
commit 0ea719326ea78b423a5ec95b1218b626e9392f07
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 14 22:23:41 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:08 2015 +0100

    cmFindBase: Replace loop with cmJoin on range.

diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 69991d5..6e55533 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -166,11 +166,9 @@ bool cmFindBase::ParseArguments(std::vector<std::string> const& argsIn)
       }
     else
       {
-      this->VariableDocumentation += "one of the " + this->Names[0];
-      for (unsigned int j = 1; j < this->Names.size() - 1; ++j)
-        {
-        this->VariableDocumentation += ", " + this->Names[j];
-        }
+      this->VariableDocumentation += "one of the ";
+      this->VariableDocumentation += cmJoin(cmRange(this->Names).retreat(1),
+                                            ", ");
       this->VariableDocumentation += " or "
         + this->Names[this->Names.size() - 1] + " libraries be found";
       }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9380e85f865e29cd5968e91408a31d5160f4a4cb
commit 9380e85f865e29cd5968e91408a31d5160f4a4cb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:53:20 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:58:04 2015 +0100

    Convert loops to cmJoin algorithm with cmRange.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 8d1657d..dd0cfa9 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -259,14 +259,7 @@ bool cmListCommand::HandleAppendCommand(std::vector<std::string> const& args)
     {
     listString += ";";
     }
-  const char* sep = "";
-  size_t cc;
-  for ( cc = 2; cc < args.size(); ++ cc )
-    {
-    listString += sep;
-    listString += args[cc];
-    sep = ";";
-    }
+  listString += cmJoin(cmRange(args).advance(2), ";");
 
   this->Makefile->AddDefinition(listName, listString.c_str());
   return true;
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 05d8ab5..35956ad 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -3016,13 +3016,7 @@ cmLocalGenerator::ConvertToRelativePath(const std::vector<std::string>& local,
     {
     relative += "/";
     }
-  const char* sep = "";
-  for(unsigned int i=common; i < remote.size(); ++i)
-    {
-    relative += sep;
-    relative += remote[i];
-    sep = "/";
-    }
+  relative += cmJoin(cmRange(remote).advance(common), "/");
 
   // Finally return the path.
   return relative;
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 676e082..8f6364d 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -172,12 +172,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
                 }
               std::vector<std::string>::const_iterator eit
                   = expandedArgs.begin() + (this->Args.size() - 1);
-              const char* sep = "";
-              for( ; eit != expandedArgs.end(); ++eit)
-                {
-                argnDef += sep + *eit;
-                sep = ";";
-                }
+              argnDef += cmJoin(cmRange(eit, expandedArgs.end()), ";");
               }
             argnDefInitialized = true;
             }
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 5260cb0..5c93975 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -406,12 +406,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
     // Clock command
     else if (args[1] == "time" && args.size() > 2)
       {
-      std::string command = args[2];
-      for (std::string::size_type cc = 3; cc < args.size(); cc ++)
-        {
-        command += " ";
-        command += args[cc];
-        }
+      std::string command = cmJoin(cmRange(args).advance(2), " ");
 
       clock_t clock_start, clock_finish;
       time_t time_start, time_finish;
@@ -473,14 +468,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
         }
 
       std::string command = "\"";
-      command += args[3];
+      command += cmJoin(cmRange(args).advance(3), "\" \"");
       command += "\"";
-      for (std::string::size_type cc = 4; cc < args.size(); cc ++)
-        {
-        command += " \"";
-        command += args[cc];
-        command += "\"";
-        }
       int retval = 0;
       int timeout = 0;
       if ( cmSystemTools::RunSingleCommand(command.c_str(), 0, &retval,

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb10012fea677fd8aa1bbefd06061efcb7ec1955
commit bb10012fea677fd8aa1bbefd06061efcb7ec1955
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 22:23:41 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:57:56 2015 +0100

    cmStringCommand: Accumulate with cmJoin and range adaptors.

diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 3e606d7..edc6afc 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -303,13 +303,6 @@ bool cmStringCommand::RegexMatch(std::vector<std::string> const& args)
   std::string regex = args[2];
   std::string outvar = args[3];
 
-  // Concatenate all the last arguments together.
-  std::string input = args[4];
-  for(unsigned int i=5; i < args.size(); ++i)
-    {
-    input += args[i];
-    }
-
   this->Makefile->ClearMatches();
   // Compile the regular expression.
   cmsys::RegularExpression re;
@@ -321,6 +314,9 @@ bool cmStringCommand::RegexMatch(std::vector<std::string> const& args)
     return false;
     }
 
+  // Concatenate all the last arguments together.
+  std::string input = cmJoin(cmRange(args).advance(4), std::string());
+
   // Scan through the input for all matches.
   std::string output;
   if(re.find(input.c_str()))
@@ -352,13 +348,6 @@ bool cmStringCommand::RegexMatchAll(std::vector<std::string> const& args)
   std::string regex = args[2];
   std::string outvar = args[3];
 
-  // Concatenate all the last arguments together.
-  std::string input = args[4];
-  for(unsigned int i=5; i < args.size(); ++i)
-    {
-    input += args[i];
-    }
-
   this->Makefile->ClearMatches();
   // Compile the regular expression.
   cmsys::RegularExpression re;
@@ -371,6 +360,9 @@ bool cmStringCommand::RegexMatchAll(std::vector<std::string> const& args)
     return false;
     }
 
+  // Concatenate all the last arguments together.
+  std::string input = cmJoin(cmRange(args).advance(4), std::string());
+
   // Scan through the input for all matches.
   std::string output;
   const char* p = input.c_str();
@@ -456,13 +448,6 @@ bool cmStringCommand::RegexReplace(std::vector<std::string> const& args)
     l = r;
     }
 
-  // Concatenate all the last arguments together.
-  std::string input = args[5];
-  for(unsigned int i=6; i < args.size(); ++i)
-    {
-    input += args[i];
-    }
-
   this->Makefile->ClearMatches();
   // Compile the regular expression.
   cmsys::RegularExpression re;
@@ -475,6 +460,9 @@ bool cmStringCommand::RegexReplace(std::vector<std::string> const& args)
     return false;
     }
 
+  // Concatenate all the last arguments together.
+  std::string input = cmJoin(cmRange(args).advance(5), std::string());
+
   // Scan through the input for all matches.
   std::string output;
   std::string::size_type base = 0;
@@ -673,11 +661,7 @@ bool cmStringCommand::HandleReplaceCommand(std::vector<std::string> const&
   const std::string& replaceExpression = args[2];
   const std::string& variableName = args[3];
 
-  std::string input = args[4];
-  for(unsigned int i=5; i < args.size(); ++i)
-    {
-    input += args[i];
-    }
+  std::string input = cmJoin(cmRange(args).advance(4), std::string());
 
   cmsys::SystemTools::ReplaceString(input, matchExpression.c_str(),
                                     replaceExpression.c_str());
@@ -756,11 +740,7 @@ bool cmStringCommand
     }
 
   std::string const& variableName = args[1];
-  std::string value;
-  for(unsigned int i = 2; i < args.size(); ++i)
-    {
-    value += args[i];
-    }
+  std::string value = cmJoin(cmRange(args).advance(2), std::string());
 
   this->Makefile->AddDefinition(variableName, value.c_str());
   return true;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c12f1ea0da0a5822a7a69b4ff77b45732c72466
commit 0c12f1ea0da0a5822a7a69b4ff77b45732c72466
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 22:14:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:57:55 2015 +0100

    cmAlgorithms: Add a range adaptor and API for adjusting a range.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 6c03f51..ad2b9c1 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -122,6 +122,17 @@ struct Range
   const_iterator begin() const { return Begin; }
   const_iterator end() const { return End; }
   bool empty() const { return std::distance(Begin, End) == 0; }
+  Range& advance(cmIML_INT_intptr_t amount)
+  {
+    std::advance(Begin, amount);
+    return *this;
+  }
+
+  Range& retreat(cmIML_INT_intptr_t amount)
+  {
+    std::advance(End, -amount);
+    return *this;
+  }
 private:
   const_iterator Begin;
   const_iterator End;
@@ -135,6 +146,14 @@ ContainerAlgorithms::Range<Iter1> cmRange(Iter1 begin, Iter2 end)
   return ContainerAlgorithms::Range<Iter1>(begin, end);
 }
 
+template<typename Range>
+ContainerAlgorithms::Range<typename Range::const_iterator>
+cmRange(Range const& range)
+{
+  return ContainerAlgorithms::Range<typename Range::const_iterator>(
+      range.begin(), range.end());
+}
+
 template<typename Container>
 void cmDeleteAll(Container const& c)
 {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27c6f017a1ef7c62f7f0332d624add7e8189f81c
commit 27c6f017a1ef7c62f7f0332d624add7e8189f81c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 14 21:27:25 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:57:55 2015 +0100

    Use cmJoin to accumulate string ranges.
    
    Avoid using the std::accumulate algorithm which is designed for
    numeric types, not complex types.  It introduces unneccessary
    copies.
    
    Initialize variables where they are populated.

diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 8b893bc..212603c 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -217,7 +217,6 @@ bool cmFileCommand
 bool cmFileCommand::HandleWriteCommand(std::vector<std::string> const& args,
   bool append)
 {
-  std::string message;
   std::vector<std::string>::const_iterator i = args.begin();
 
   i++; // Get rid of subcommand
@@ -231,10 +230,6 @@ bool cmFileCommand::HandleWriteCommand(std::vector<std::string> const& args,
 
   i++;
 
-  for(;i != args.end(); ++i)
-    {
-    message += *i;
-    }
   if ( !this->Makefile->CanIWriteThisFile(fileName.c_str()) )
     {
     std::string e
@@ -272,6 +267,7 @@ bool cmFileCommand::HandleWriteCommand(std::vector<std::string> const& args,
     this->SetError(error);
     return false;
     }
+  std::string message = cmJoin(cmRange(i, args.end()), std::string());
   file << message;
   file.close();
   if(mode)
diff --git a/Source/cmMessageCommand.cxx b/Source/cmMessageCommand.cxx
index 88d6a77..0449c50 100644
--- a/Source/cmMessageCommand.cxx
+++ b/Source/cmMessageCommand.cxx
@@ -20,7 +20,6 @@ bool cmMessageCommand
     this->SetError("called with incorrect number of arguments");
     return false;
     }
-  std::string message;
   std::vector<std::string>::const_iterator i = args.begin();
 
   cmake::MessageType type = cmake::MESSAGE;
@@ -70,10 +69,7 @@ bool cmMessageCommand
     ++i;
     }
 
-  for(;i != args.end(); ++i)
-    {
-    message += *i;
-    }
+  std::string message = cmJoin(cmRange(i, args.end()), std::string());
 
   if (type != cmake::MESSAGE)
     {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e78ebbdf94b99f7b7d5b9b31d05dd9479b1d6ab
commit 4e78ebbdf94b99f7b7d5b9b31d05dd9479b1d6ab
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 10 22:19:21 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:57:55 2015 +0100

    cmAlgorithms: Add a Range container and adaptor method.
    
    This can make a pair of iterators API compatible with the
    cmJoin algorithm and other range-based algorithms.
    
    Accept different iterator types in the cmRange adaptor so that
    a const and non-const iterator are accepted.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 4938140..6c03f51 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -112,6 +112,27 @@ struct DefaultDeleter<Container, /* valueTypeIsPair = */ true>
   }
 };
 
+template<typename const_iterator_>
+struct Range
+{
+  typedef const_iterator_ const_iterator;
+  typedef typename std::iterator_traits<const_iterator>::value_type value_type;
+  Range(const_iterator begin_, const_iterator end_)
+    : Begin(begin_), End(end_) {}
+  const_iterator begin() const { return Begin; }
+  const_iterator end() const { return End; }
+  bool empty() const { return std::distance(Begin, End) == 0; }
+private:
+  const_iterator Begin;
+  const_iterator End;
+};
+
+}
+
+template<typename Iter1, typename Iter2>
+ContainerAlgorithms::Range<Iter1> cmRange(Iter1 begin, Iter2 end)
+{
+  return ContainerAlgorithms::Range<Iter1>(begin, end);
 }
 
 template<typename Container>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8910224950a2b723e0d4fd7c21a326af7fb2e050
commit 8910224950a2b723e0d4fd7c21a326af7fb2e050
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 14 21:31:46 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:57:55 2015 +0100

    Replace common loop pattern with cmJoin

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 7746980..fd9b236 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1064,26 +1064,11 @@ void cmFindPackageCommand::AppendToFoundProperty(bool found)
     }
 
 
-  std::string tmp;
-  const char* sep ="";
-  for(size_t i=0; i<foundContents.size(); i++)
-    {
-    tmp += sep;
-    tmp += foundContents[i];
-    sep = ";";
-    }
-
+  std::string tmp = cmJoin(foundContents, ";");
   this->Makefile->GetCMakeInstance()->SetProperty("PACKAGES_FOUND",
                                                   tmp.c_str());
 
-  tmp = "";
-  sep = "";
-  for(size_t i=0; i<notFoundContents.size(); i++)
-    {
-    tmp += sep;
-    tmp += notFoundContents[i];
-    sep = ";";
-    }
+  tmp = cmJoin(notFoundContents, ";");
   this->Makefile->GetCMakeInstance()->SetProperty("PACKAGES_NOT_FOUND",
                                                   tmp.c_str());
 }
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index c33048c..b44e228 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -193,12 +193,8 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
     if (!this->Depth)
       {
       std::string name = this->Args[0];
-      std::vector<std::string>::size_type cc;
-      name += "(";
-      for ( cc = 0; cc < this->Args.size(); cc ++ )
-        {
-        name += " " + this->Args[cc];
-        }
+      name += "( ";
+      name += cmJoin(this->Args, " ");
       name += " )";
 
       // create a new command and add it to cmake
diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx
index c0e4683..84c00ba 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -34,15 +34,7 @@ bool cmGetCMakePropertyCommand
     std::vector<std::string> vars = this->Makefile->GetDefinitions(cacheonly);
     if (!vars.empty())
       {
-      output = "";
-      const char* sep = "";
-      std::vector<std::string>::size_type cc;
-      for ( cc = 0; cc < vars.size(); ++cc )
-        {
-        output += sep;
-        output += vars[cc];
-        sep = ";";
-        }
+      output = cmJoin(vars, ";");
       }
     }
   else if ( args[1] == "MACROS" )
@@ -54,15 +46,7 @@ bool cmGetCMakePropertyCommand
     const std::set<std::string>* components
       = this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
         ->GetInstallComponents();
-    std::set<std::string>::const_iterator compIt;
-    output = "";
-    const char* sep = "";
-    for (compIt = components->begin(); compIt != components->end(); ++compIt)
-      {
-      output += sep;
-      output += *compIt;
-      sep = ";";
-      }
+    output = cmJoin(*components, ";");
     }
   else
     {
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 81aaf3e..676e082 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -197,14 +197,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
               {
               argvDef += ";";
               }
-            const char* sep = "";
-            std::vector<std::string>::const_iterator eit;
-            for(eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit)
-              {
-              argvDef += sep;
-              argvDef += *eit;
-              sep = ";";
-              }
+            argvDef += cmJoin(expandedArgs, ";");
             argvDefInitialized = true;
             }
           cmSystemTools::ReplaceString(tmps, "${ARGV}", argvDef.c_str());
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index aca4413..ac5fec9 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4202,15 +4202,7 @@ const char *cmMakefile::GetProperty(const std::string& prop,
     }
   else if (prop == "LISTFILE_STACK")
     {
-    const char* sep = "";
-    for (std::deque<std::string>::const_iterator
-        i = this->ListFileStack.begin();
-        i != this->ListFileStack.end(); ++i)
-      {
-      output += sep;
-      output += *i;
-      sep = ";";
-      }
+    output = cmJoin(this->ListFileStack, ";");
     return output.c_str();
     }
   else if (prop == "VARIABLES" || prop == "CACHE_VARIABLES")
@@ -4220,14 +4212,7 @@ const char *cmMakefile::GetProperty(const std::string& prop,
       {
       cacheonly = 1;
       }
-    std::vector<std::string> vars = this->GetDefinitions(cacheonly);
-    const char* sep = "";
-    for (unsigned int cc = 0; cc < vars.size(); cc ++ )
-      {
-      output += sep;
-      output += vars[cc];
-      sep = ";";
-      }
+    output = cmJoin(this->GetDefinitions(cacheonly), ";");
     return output.c_str();
     }
   else if (prop == "MACROS")
@@ -4242,16 +4227,7 @@ const char *cmMakefile::GetProperty(const std::string& prop,
     }
   else if (prop == "LINK_DIRECTORIES")
     {
-    const char* sep = "";
-    for (std::vector<std::string>::const_iterator
-         it = this->GetLinkDirectories().begin();
-         it != this->GetLinkDirectories().end();
-         ++ it )
-      {
-      output += sep;
-      output += *it;
-      sep = ";";
-      }
+    output = cmJoin(this->GetLinkDirectories(), ";");
     return output.c_str();
     }
   else if (prop == "INCLUDE_DIRECTORIES")
diff --git a/Source/cmOptionCommand.cxx b/Source/cmOptionCommand.cxx
index e505440..60728ea 100644
--- a/Source/cmOptionCommand.cxx
+++ b/Source/cmOptionCommand.cxx
@@ -34,11 +34,7 @@ bool cmOptionCommand
   if(argError)
     {
     std::string m = "called with incorrect number of arguments: ";
-    for(size_t i =0; i < args.size(); ++i)
-      {
-      m += args[i];
-      m += " ";
-      }
+    m += cmJoin(args, " ");
     this->SetError(m);
     return false;
     }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b8725bf8472ebf4781ddd60ef8fcca9c3ad98dd
commit 7b8725bf8472ebf4781ddd60ef8fcca9c3ad98dd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 17 17:36:19 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:57:53 2015 +0100

    Convert loops populating maybe-empty content into the common pattern.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 107dca9..8d1657d 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -254,14 +254,18 @@ bool cmListCommand::HandleAppendCommand(std::vector<std::string> const& args)
   // expand the variable
   std::string listString;
   this->GetListString(listString, listName);
+
+  if(!listString.empty() && !args.empty())
+    {
+    listString += ";";
+    }
+  const char* sep = "";
   size_t cc;
   for ( cc = 2; cc < args.size(); ++ cc )
     {
-    if(!listString.empty())
-      {
-      listString += ";";
-      }
+    listString += sep;
     listString += args[cc];
+    sep = ";";
     }
 
   this->Makefile->AddDefinition(listName, listString.c_str());
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 7afe05f..05d8ab5 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -3011,13 +3011,17 @@ cmLocalGenerator::ConvertToRelativePath(const std::vector<std::string>& local,
   // trailing slash in the input then the last iteration of the loop
   // will add a slash followed by an empty string which will preserve
   // the trailing slash in the output.
+
+  if(!relative.empty() && !remote.empty())
+    {
+    relative += "/";
+    }
+  const char* sep = "";
   for(unsigned int i=common; i < remote.size(); ++i)
     {
-    if(!relative.empty())
-      {
-      relative += "/";
-      }
+    relative += sep;
     relative += remote[i];
+    sep = "/";
     }
 
   // Finally return the path.
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 657e750..81aaf3e 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -166,15 +166,17 @@ bool cmMacroHelperCommand::InvokeInitialPass
             {
             if (expandedArgs.size() > this->Args.size() - 1)
               {
+              if (!argnDef.empty() && !expandedArgs.empty())
+                {
+                argnDef += ";";
+                }
               std::vector<std::string>::const_iterator eit
                   = expandedArgs.begin() + (this->Args.size() - 1);
+              const char* sep = "";
               for( ; eit != expandedArgs.end(); ++eit)
                 {
-                if (!argnDef.empty())
-                  {
-                  argnDef += ";";
-                  }
-                argnDef += *eit;
+                argnDef += sep + *eit;
+                sep = ";";
                 }
               }
             argnDefInitialized = true;
@@ -191,14 +193,17 @@ bool cmMacroHelperCommand::InvokeInitialPass
           // repleace ARGV, compute it only once
           if (!argvDefInitialized)
             {
+            if (!argvDef.empty() && !expandedArgs.empty())
+              {
+              argvDef += ";";
+              }
+            const char* sep = "";
             std::vector<std::string>::const_iterator eit;
             for(eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit)
               {
-              if (!argvDef.empty())
-                {
-                argvDef += ";";
-                }
+              argvDef += sep;
               argvDef += *eit;
+              sep = ";";
               }
             argvDefInitialized = true;
             }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ee56f03999e8605cc2cbe85a3a7b7159e639e5d
commit 7ee56f03999e8605cc2cbe85a3a7b7159e639e5d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 17 17:47:10 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:57:41 2015 +0100

    Convert loops into the commonly used pattern.

diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx
index e193cf5..c0e4683 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -25,7 +25,6 @@ bool cmGetCMakePropertyCommand
     return false;
     }
 
-  std::vector<std::string>::size_type cc;
   std::string variable = args[0];
   std::string output = "NOTFOUND";
 
@@ -35,12 +34,15 @@ bool cmGetCMakePropertyCommand
     std::vector<std::string> vars = this->Makefile->GetDefinitions(cacheonly);
     if (!vars.empty())
       {
-      output = vars[0];
-      }
-    for ( cc = 1; cc < vars.size(); ++cc )
-      {
-      output += ";";
-      output += vars[cc];
+      output = "";
+      const char* sep = "";
+      std::vector<std::string>::size_type cc;
+      for ( cc = 0; cc < vars.size(); ++cc )
+        {
+        output += sep;
+        output += vars[cc];
+        sep = ";";
+        }
       }
     }
   else if ( args[1] == "MACROS" )
@@ -54,13 +56,12 @@ bool cmGetCMakePropertyCommand
         ->GetInstallComponents();
     std::set<std::string>::const_iterator compIt;
     output = "";
+    const char* sep = "";
     for (compIt = components->begin(); compIt != components->end(); ++compIt)
       {
-      if (compIt != components->begin())
-        {
-        output += ";";
-        }
+      output += sep;
       output += *compIt;
+      sep = ";";
       }
     }
   else
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index eb68e49..aca4413 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3752,15 +3752,12 @@ void cmMakefile::GetListOfMacros(std::string& macros) const
 {
   StringStringMap::const_iterator it;
   macros = "";
-  int cc = 0;
+  const char* sep = "";
   for ( it = this->MacrosMap.begin(); it != this->MacrosMap.end(); ++it )
     {
-    if ( cc > 0 )
-      {
-      macros += ";";
-      }
+    macros += sep;
     macros += it->first;
-    cc ++;
+    sep = "";
     }
 }
 
@@ -4205,15 +4202,14 @@ const char *cmMakefile::GetProperty(const std::string& prop,
     }
   else if (prop == "LISTFILE_STACK")
     {
+    const char* sep = "";
     for (std::deque<std::string>::const_iterator
         i = this->ListFileStack.begin();
         i != this->ListFileStack.end(); ++i)
       {
-      if (i != this->ListFileStack.begin())
-        {
-        output += ";";
-        }
+      output += sep;
       output += *i;
+      sep = ";";
       }
     return output.c_str();
     }
@@ -4225,13 +4221,12 @@ const char *cmMakefile::GetProperty(const std::string& prop,
       cacheonly = 1;
       }
     std::vector<std::string> vars = this->GetDefinitions(cacheonly);
+    const char* sep = "";
     for (unsigned int cc = 0; cc < vars.size(); cc ++ )
       {
-      if ( cc > 0 )
-        {
-        output += ";";
-        }
+      output += sep;
       output += vars[cc];
+      sep = ";";
       }
     return output.c_str();
     }
@@ -4247,19 +4242,16 @@ const char *cmMakefile::GetProperty(const std::string& prop,
     }
   else if (prop == "LINK_DIRECTORIES")
     {
-    std::ostringstream str;
+    const char* sep = "";
     for (std::vector<std::string>::const_iterator
          it = this->GetLinkDirectories().begin();
          it != this->GetLinkDirectories().end();
          ++ it )
       {
-      if ( it != this->GetLinkDirectories().begin())
-        {
-        str << ";";
-        }
-      str << it->c_str();
+      output += sep;
+      output += *it;
+      sep = ";";
       }
-    output = str.str();
     return output.c_str();
     }
   else if (prop == "INCLUDE_DIRECTORIES")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a4e5674eccb0126733086d4632c7239217db6f1
commit 0a4e5674eccb0126733086d4632c7239217db6f1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:47:21 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:57:38 2015 +0100

    cmMacroCommand: Remove counting variable.
    
    Start iteration at correct starting point directly.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index c1e7cbb..657e750 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -167,19 +167,14 @@ bool cmMacroHelperCommand::InvokeInitialPass
             if (expandedArgs.size() > this->Args.size() - 1)
               {
               std::vector<std::string>::const_iterator eit
-                  = expandedArgs.begin();
-              std::vector<std::string>::size_type cnt = 0;
+                  = expandedArgs.begin() + (this->Args.size() - 1);
               for( ; eit != expandedArgs.end(); ++eit)
                 {
-                if ( cnt >= this->Args.size()-1 )
+                if (!argnDef.empty())
                   {
-                  if (!argnDef.empty())
-                    {
-                    argnDef += ";";
-                    }
-                  argnDef += *eit;
+                  argnDef += ";";
                   }
-                cnt ++;
+                argnDef += *eit;
                 }
               }
             argnDefInitialized = true;

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

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Thu Feb 12 00:01:17 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Thu, 12 Feb 2015 00:01:17 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1107-g09cdcc5
Message-ID: <20150212050117.91B9AAAA4D@public.kitware.com>

This is an automated email from 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  09cdcc54303bf065022a997056f403dd0707bc7e (commit)
      from  f00829a9384283ef1cf86b337b41eaed30ca7ded (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09cdcc54303bf065022a997056f403dd0707bc7e
commit 09cdcc54303bf065022a997056f403dd0707bc7e
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Thu Feb 12 00:01:15 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Feb 12 00:01:15 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 62cc2b6..6152144 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 2)
-set(CMake_VERSION_PATCH 20150211)
+set(CMake_VERSION_PATCH 20150212)
 #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 Feb 12 11:52:59 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Feb 2015 11:52:59 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1109-ga4a6b55
Message-ID: <20150212165259.78E45AAC23@public.kitware.com>

This is an automated email from 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  a4a6b55f08e37ce9b8a17680cc30ece66d048ec7 (commit)
       via  be36bfd65d53962c7ba975382bd911e0857f6a33 (commit)
      from  09cdcc54303bf065022a997056f403dd0707bc7e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4a6b55f08e37ce9b8a17680cc30ece66d048ec7
commit a4a6b55f08e37ce9b8a17680cc30ece66d048ec7
Merge: 09cdcc5 be36bfd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 12 11:52:58 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 12 11:52:58 2015 -0500

    Merge topic 'cpack_rpm_mulit_prefix_fixup'
    
    be36bfd6 CPackRPM: Do not run file(GLOB_RECURSE) without CMP0009 set to NEW


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 12 11:53:01 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Feb 2015 11:53:01 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1111-g8c59928
Message-ID: <20150212165301.389F7AABAF@public.kitware.com>

This is an automated email from 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  8c59928f3ac2a3a4f9b647f2c60c134d54d2237f (commit)
       via  e2a8984c06a5f466a268ad7f1a7a8578bfe6bf5b (commit)
      from  a4a6b55f08e37ce9b8a17680cc30ece66d048ec7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c59928f3ac2a3a4f9b647f2c60c134d54d2237f
commit 8c59928f3ac2a3a4f9b647f2c60c134d54d2237f
Merge: a4a6b55 e2a8984
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 12 11:53:00 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 12 11:53:00 2015 -0500

    Merge topic 'FindCoin3D-drop-link'
    
    e2a8984c FindCoin3D: Drop link to project homepage


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

Summary of changes:
 Modules/FindCoin3D.cmake |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 12 11:53:03 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Feb 2015 11:53:03 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1117-gfc7e156
Message-ID: <20150212165303.86495AABB4@public.kitware.com>

This is an automated email from 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  fc7e15691a870f8f5e199e615279c7eb4dba8f6f (commit)
       via  f30022eb07b913598326d2e3b10ff2e706fbe873 (commit)
       via  7607c3d16aa0636458c909f4036e4b0d91581b30 (commit)
       via  ebd556caa9e1fc92e00c8e401b145c531390e854 (commit)
       via  290ca8e2d0328d27f51ff5248c35e32e44fdd1eb (commit)
       via  f99991db882c2f4cf8246b9c272845faaa5bbce5 (commit)
      from  8c59928f3ac2a3a4f9b647f2c60c134d54d2237f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc7e15691a870f8f5e199e615279c7eb4dba8f6f
commit fc7e15691a870f8f5e199e615279c7eb4dba8f6f
Merge: 8c59928 f30022e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 12 11:53:02 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 12 11:53:02 2015 -0500

    Merge topic 'install-DESTINATION-genex'
    
    f30022eb install: Allow generator expressions in TARGETS DESTINATION (#14317)
    7607c3d1 cmInstallGenerator: Pass destination explicitly to AddInstallRule
    ebd556ca cmInstallGenerator: Fix check for absolute install destinations
    290ca8e2 cmInstallGenerator: Refactor computation of absolute install dest
    f99991db cmInstallGenerator: Move GetDestination to subclasses that need it


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

Summary of changes:
 Help/command/install.rst                              |    4 ++++
 Help/release/dev/install-DESTINATION-genex.rst        |    5 +++++
 Source/cmExportInstallFileGenerator.cxx               |   10 +++++-----
 Source/cmInstallDirectoryGenerator.cxx                |    4 +++-
 Source/cmInstallExportGenerator.cxx                   |    8 +++++---
 Source/cmInstallExportGenerator.h                     |    3 +++
 Source/cmInstallFilesGenerator.cxx                    |    1 +
 Source/cmInstallGenerator.cxx                         |   14 ++++++++------
 Source/cmInstallGenerator.h                           |    9 ++++-----
 Source/cmInstallTargetGenerator.cxx                   |   17 ++++++++++++++---
 Source/cmInstallTargetGenerator.h                     |    2 ++
 Tests/ExportImport/Export/CMakeLists.txt              |   12 +++++++++---
 Tests/ExportImport/Export/testLibPerConfigDest.c      |    1 +
 Tests/ExportImport/Import/A/CMakeLists.txt            |    2 ++
 Tests/ExportImport/Import/A/imp_testExe1.c            |    2 ++
 Tests/RunCMake/install/RunCMakeTest.cmake             |    1 +
 .../TARGETS-DESTINATION-bad-result.txt}               |    0
 .../install/TARGETS-DESTINATION-bad-stderr.txt        |    6 ++++++
 Tests/RunCMake/install/TARGETS-DESTINATION-bad.cmake  |    3 +++
 .../RunCMake/{GeneratorExpression => install}/empty.c |    0
 20 files changed, 78 insertions(+), 26 deletions(-)
 create mode 100644 Help/release/dev/install-DESTINATION-genex.rst
 create mode 100644 Tests/ExportImport/Export/testLibPerConfigDest.c
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => install/TARGETS-DESTINATION-bad-result.txt} (100%)
 create mode 100644 Tests/RunCMake/install/TARGETS-DESTINATION-bad-stderr.txt
 create mode 100644 Tests/RunCMake/install/TARGETS-DESTINATION-bad.cmake
 copy Tests/RunCMake/{GeneratorExpression => install}/empty.c (100%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 12 11:53:05 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Feb 2015 11:53:05 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1138-ge6ae3c6
Message-ID: <20150212165308.A3563AAC04@public.kitware.com>

This is an automated email from 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  e6ae3c6ae0540de51b3d615aea3abd49ccc70a34 (commit)
       via  7c3f637680ac0cdb6cec5e75ba4a9b188de5017b (commit)
       via  8a399c8c9f1c4a793289d6baf37081efac082eee (commit)
       via  abfca97525be06e067981b6c6bf63ba7a3aa52f9 (commit)
       via  0b61b86df856e3cec366f8c23f35aae576b2d821 (commit)
       via  e21f7829a2891ce7599ade02d4fd9c193657069a (commit)
       via  559dc15589ad0b9a7bdaa62ac7552899993f6f0d (commit)
       via  0ea719326ea78b423a5ec95b1218b626e9392f07 (commit)
       via  9380e85f865e29cd5968e91408a31d5160f4a4cb (commit)
       via  bb10012fea677fd8aa1bbefd06061efcb7ec1955 (commit)
       via  0c12f1ea0da0a5822a7a69b4ff77b45732c72466 (commit)
       via  27c6f017a1ef7c62f7f0332d624add7e8189f81c (commit)
       via  4e78ebbdf94b99f7b7d5b9b31d05dd9479b1d6ab (commit)
       via  8910224950a2b723e0d4fd7c21a326af7fb2e050 (commit)
       via  7b8725bf8472ebf4781ddd60ef8fcca9c3ad98dd (commit)
       via  7ee56f03999e8605cc2cbe85a3a7b7159e639e5d (commit)
       via  0a4e5674eccb0126733086d4632c7239217db6f1 (commit)
       via  11ecc31d0a2da0090195a682364fb4628f55673a (commit)
       via  f95543f8a6b38bf6d5350169bdb53d5066839b76 (commit)
       via  9fe8f49353f927882af256c7870eb24e4be0c9be (commit)
       via  ac26d4b343aece40b6b9a931ab619fc88d4b9492 (commit)
      from  fc7e15691a870f8f5e199e615279c7eb4dba8f6f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6ae3c6ae0540de51b3d615aea3abd49ccc70a34
commit e6ae3c6ae0540de51b3d615aea3abd49ccc70a34
Merge: fc7e156 7c3f637
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 12 11:53:04 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 12 11:53:04 2015 -0500

    Merge topic 'use-cmRange'
    
    7c3f6376 Convert loop into two algorithms.
    8a399c8c Convert loop to the common pattern.
    abfca975 Move loop inside of condition.
    0b61b86d Handle last element outside of the loop.
    e21f7829 cmTarget: Use a sorted vector in place of a set.
    559dc155 cmSet: Replace loop with cmJoin.
    0ea71932 cmFindBase: Replace loop with cmJoin on range.
    9380e85f Convert loops to cmJoin algorithm with cmRange.
    bb10012f cmStringCommand: Accumulate with cmJoin and range adaptors.
    0c12f1ea cmAlgorithms: Add a range adaptor and API for adjusting a range.
    27c6f017 Use cmJoin to accumulate string ranges.
    4e78ebbd cmAlgorithms: Add a Range container and adaptor method.
    89102249 Replace common loop pattern with cmJoin
    7b8725bf Convert loops populating maybe-empty content into the common pattern.
    7ee56f03 Convert loops into the commonly used pattern.
    0a4e5674 cmMacroCommand: Remove counting variable.
    ...


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

Summary of changes:
 Source/CPack/cmCPackGeneratorFactory.cxx        |    1 +
 Source/CTest/cmCTestGIT.cxx                     |    1 +
 Source/{cmStandardIncludes.h => cmAlgorithms.h} |  219 ++++++++---------------
 Source/cmExportSet.cxx                          |    1 +
 Source/cmExportSetMap.cxx                       |    1 +
 Source/cmFileCommand.cxx                        |    6 +-
 Source/cmFileLockPool.cxx                       |    1 +
 Source/cmFindBase.cxx                           |    8 +-
 Source/cmFindPackageCommand.cxx                 |   19 +-
 Source/cmFunctionCommand.cxx                    |    8 +-
 Source/cmGetCMakePropertyCommand.cxx            |   19 +-
 Source/cmInstalledFile.h                        |    1 +
 Source/cmListCommand.cxx                        |   11 +-
 Source/cmLocalGenerator.cxx                     |   10 +-
 Source/cmLocalUnixMakefileGenerator3.cxx        |   24 ++-
 Source/cmMacroCommand.cxx                       |   32 ++--
 Source/cmMakefile.cxx                           |   44 +----
 Source/cmMessageCommand.cxx                     |    6 +-
 Source/cmOptionCommand.cxx                      |    6 +-
 Source/cmRST.cxx                                |    1 +
 Source/cmSetCommand.cxx                         |   12 +-
 Source/cmStandardIncludes.h                     |  134 --------------
 Source/cmStringCommand.cxx                      |   42 ++---
 Source/cmSystemTools.cxx                        |    1 +
 Source/cmTarget.cxx                             |   27 ++-
 Source/cmVariableWatch.cxx                      |    2 +
 Source/cmcmd.cxx                                |   15 +-
 27 files changed, 154 insertions(+), 498 deletions(-)
 copy Source/{cmStandardIncludes.h => cmAlgorithms.h} (53%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 12 11:53:12 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Feb 2015 11:53:12 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.2-1152-g32821bb
Message-ID: <20150212165312.A8740AABAF@public.kitware.com>

This is an automated email from 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  32821bb3190a9539ebe98fb7dfa0ba7c7a890ff7 (commit)
       via  b5f98e5012ef53ee6746c42131fc66892bfff717 (commit)
       via  83414d5a07753d004f5e663c385ef0c713895d46 (commit)
       via  9a1f8f35f48d7dcfefc70de9ae530c31b16cd9e0 (commit)
       via  4aa7bd2ac11aa2edb0288e5ba360984b7799130d (commit)
       via  6774c92b5809b80c767ef8094b2f26d06556e0fd (commit)
       via  2c4a7298fcb3ac6a6b6c0a9545b343c814f3d6ec (commit)
       via  a551851ab3f23f58074638ffcf38a08d98a35fa8 (commit)
       via  f79c0f7697ee0bd25ec74f7dbb2ac0cf6189a9df (commit)
       via  8e0827b646b14028446503ac392a9ab7bb5a53a3 (commit)
       via  f2c49f59d8dbca936a40b62a9079fa71ca551365 (commit)
       via  3250a7e535684bec684c0109b31675ba72dc3aa9 (commit)
       via  081a13f7c011d0ebd28caebfedee1e3e3f7602c9 (commit)
       via  17b5ebd383df4c0c731b5c687ccaa3608b2d188f (commit)
      from  e6ae3c6ae0540de51b3d615aea3abd49ccc70a34 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32821bb3190a9539ebe98fb7dfa0ba7c7a890ff7
commit 32821bb3190a9539ebe98fb7dfa0ba7c7a890ff7
Merge: e6ae3c6 b5f98e5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 12 11:53:11 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 12 11:53:11 2015 -0500

    Merge topic 'clean-up-cmMacroCommand'
    
    b5f98e50 cmMacroCommand: Manipulate target string directly.
    83414d5a cmMacroCommand: Move computation of ARGV%n names out of double loop.
    9a1f8f35 cmMacroCommand: Move ARGV replacement out of condition.
    4aa7bd2a cmMacroCommand: Remove condition around ARGN replacement.
    6774c92b cmMacroCommand: Declare tmps in the scope that it's used.
    2c4a7298 cmMacroCommand: Declare arg in the scope that it is used.
    a551851a cmMacroCommand: Inline variable computation.
    f79c0f76 cmMacroCommand: Compute variables outside of two loops.
    8e0827b6 cmMacroCommand: Remove intermediate arg variables.
    f2c49f59 cmMacroCommand: Remove condition around ARGN computation.
    3250a7e5 cmMacroCommand: Remove conditional append of semicolon.
    081a13f7 cmMacroCommand: Declare arg variables where used and initialized.
    17b5ebd3 cmMacroCommand: Join the args strings outside of the loops.


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

Summary of changes:
 Source/cmMacroCommand.cxx |   93 ++++++++++++++++-----------------------------
 1 file changed, 32 insertions(+), 61 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 12 11:53:33 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Feb 2015 11:53:33 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.2-1329-gae8aeae
Message-ID: <20150212165333.9AEF3AABC0@public.kitware.com>

This is an automated email from 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  ae8aeae252f14c079b3bebebfa6e88f495c84922 (commit)
       via  32821bb3190a9539ebe98fb7dfa0ba7c7a890ff7 (commit)
       via  e6ae3c6ae0540de51b3d615aea3abd49ccc70a34 (commit)
       via  fc7e15691a870f8f5e199e615279c7eb4dba8f6f (commit)
       via  8c59928f3ac2a3a4f9b647f2c60c134d54d2237f (commit)
       via  a4a6b55f08e37ce9b8a17680cc30ece66d048ec7 (commit)
       via  09cdcc54303bf065022a997056f403dd0707bc7e (commit)
      from  015e5e0c2cd0573f1ca07103216530703c337eb1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae8aeae252f14c079b3bebebfa6e88f495c84922
commit ae8aeae252f14c079b3bebebfa6e88f495c84922
Merge: 015e5e0 32821bb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 12 11:53:20 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 12 11:53:20 2015 -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 Feb 12 12:45:48 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Feb 2015 12:45:48 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.3-1148-g8e05ba2
Message-ID: <20150212174548.2E647AB5D0@public.kitware.com>

This is an automated email from 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  8e05ba274f096e82b6df98f8d0d6b163cd93631d (commit)
       via  bd6389f7bce6d69a75e6f84245834e19b24cc03f (commit)
      from  32821bb3190a9539ebe98fb7dfa0ba7c7a890ff7 (commit)

Those revisions listed 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 Feb 12 12:45:48 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Feb 2015 12:45:48 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.3-1325-g93bac6e
Message-ID: <20150212174548.48F28AB5D1@public.kitware.com>

This is an automated email from 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  93bac6ed6219b86de71efe119e395e2819d42eb5 (commit)
       via  8e05ba274f096e82b6df98f8d0d6b163cd93631d (commit)
      from  ae8aeae252f14c079b3bebebfa6e88f495c84922 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93bac6ed6219b86de71efe119e395e2819d42eb5
commit 93bac6ed6219b86de71efe119e395e2819d42eb5
Merge: ae8aeae 8e05ba2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 12 12:45:32 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 12 12:45:32 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 12 12:45:48 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Feb 2015 12:45:48 -0500 (EST)
Subject: [Cmake-commits] CMake annotated tag, v3.1.3, created. v3.1.3
Message-ID: <20150212174548.5C5AAAB5D3@public.kitware.com>

This is an automated email 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.1.3 has been created
        at  78fa3a75b45b4a486f853e4495a2f4457283c5e5 (tag)
   tagging  bd6389f7bce6d69a75e6f84245834e19b24cc03f (commit)
  replaces  v3.1.2
 tagged by  Brad King
        on  Thu Feb 12 12:44:51 2015 -0500

- Log -----------------------------------------------------------------
CMake 3.1.3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAABAgAGBQJU3OaTAAoJEOyP7zp7+07aYGMP+gI1iA7JVHmHDLGYQ62ZrHrs
aBMQwyv8I8TwIDHtdiVGiFf3xsRVjhnssZta1obBtQheq07GKWLAs6pMLr9e/y2Z
NSdnXbhJtdd6AXKZtyQpDn8BHf/KPUTdxjRpAVR12zLpY5zbgfIFapivdsOS4xq1
BPFCM7n1t7hrjOXW4F0g+EGsrrnEv0FU32pfRFbNyn2zarFKubeMT2Sc1q4NW7Dq
vu+WQI2kF0TCbucI1kJruT8ayVC54dt//a8lGjxOhIy269m3mKnYdHGakpMjAVPi
6JQXvMu7uC/5k7GzLOdYXZRiqfQDlCsiW9GilEDXTVoLv1FulzGpMr6r1bSP2Dtd
z/M0q2/GFu4pr846mJVWYLuTJKUQtewHVGb4qzSNT7FzELe4ujjvvFcO8hoRBY1O
XpOU/I6C95hMCPCYfZl7TFUW0Bh7Tv5lK0iruUVrVJln6dNGV7ReoDQw+JXCmRAL
r1Hb6HIkPPu/6LSzMbQgpk4BNmGkYZj+HIUSiVecdB1XTl2oSR6RNCz1h5gPVLm6
vWc7yr1QoL2fXUOMZyNQs3KvSwQq5P4jG7s8UPIhwUz9NF1UYTWTzwySTyyELa6i
BRp468IJkm1Kj13oqjrXLDxZ9xOiMNqXZEdvwX3ZJYtJXADaAD5DFGSxnoShOMa3
1RA8eUxYmACVBx38/28y
=wlyj
-----END PGP SIGNATURE-----

Brad King (5):
      Do not call setlocale() globally in CMake applications (#15377)
      Add setlocale() calls around use of libarchive APIs (#14934, #15377)
      Merge branch 'backport-no-global-setlocale' into release-3.1
      Merge branch 'makefile-missing-comment' into release-3.1
      CMake 3.1.3

Nils Gladitz (1):
      Makefile: Fix regression in target-bound custom command COMMENT output

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 12 12:53:54 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Feb 2015 12:53:54 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.3-1329-g0c249a2
Message-ID: <20150212175354.D0A2CAB621@public.kitware.com>

This is an automated email from 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  0c249a20a57a744b88c44537df6206cd83ae2440 (commit)
       via  0ec1f45a138bd7a9ad618f6e9dfa077a6bc8533c (commit)
       via  da92cdab5206d0556822ee12350636300ec73160 (commit)
       via  a4568ca597ac94a32ea4e0e318e8175e614bc5ab (commit)
      from  93bac6ed6219b86de71efe119e395e2819d42eb5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c249a20a57a744b88c44537df6206cd83ae2440
commit 0c249a20a57a744b88c44537df6206cd83ae2440
Merge: 93bac6e 0ec1f45
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 12 12:53:45 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 12 12:53:45 2015 -0500

    Merge branch 'master' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ec1f45a138bd7a9ad618f6e9dfa077a6bc8533c
commit 0ec1f45a138bd7a9ad618f6e9dfa077a6bc8533c
Merge: 8e05ba2 da92cda
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 12 12:53:35 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 12 12:53:35 2015 -0500

    Merge branch 'release'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da92cdab5206d0556822ee12350636300ec73160
commit da92cdab5206d0556822ee12350636300ec73160
Merge: a4568ca be36bfd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 11:08:37 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 11:08:37 2015 -0500

    Merge branch 'cpack_rpm_mulit_prefix_fixup' into release


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4568ca597ac94a32ea4e0e318e8175e614bc5ab
commit a4568ca597ac94a32ea4e0e318e8175e614bc5ab
Merge: 0a95c5c e2a8984
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 11:08:32 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 11:08:32 2015 -0500

    Merge branch 'FindCoin3D-drop-link' into release


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 12 12:54:04 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Feb 2015 12:54:04 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.3-1151-g0ec1f45
Message-ID: <20150212175404.037CEAB5D3@public.kitware.com>

This is an automated email from 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  0ec1f45a138bd7a9ad618f6e9dfa077a6bc8533c (commit)
       via  da92cdab5206d0556822ee12350636300ec73160 (commit)
       via  a4568ca597ac94a32ea4e0e318e8175e614bc5ab (commit)
      from  8e05ba274f096e82b6df98f8d0d6b163cd93631d (commit)

Those revisions listed 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 Feb 12 12:54:08 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Feb 2015 12:54:08 -0500 (EST)
Subject: [Cmake-commits] CMake branch, release, updated. v3.1.2-1032-gda92cda
Message-ID: <20150212175408.7BA9DAB621@public.kitware.com>

This is an automated email from 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  da92cdab5206d0556822ee12350636300ec73160 (commit)
       via  a4568ca597ac94a32ea4e0e318e8175e614bc5ab (commit)
       via  e2a8984c06a5f466a268ad7f1a7a8578bfe6bf5b (commit)
       via  be36bfd65d53962c7ba975382bd911e0857f6a33 (commit)
      from  0a95c5ce2ef8d9887c4a0bdde480155d75f12c7b (commit)

Those revisions listed 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/CPackRPM.cmake   |    7 ++++++-
 Modules/FindCoin3D.cmake |    3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 12 13:12:15 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Feb 2015 13:12:15 -0500 (EST)
Subject: [Cmake-commits] CMake branch, maint, updated. v3.1.3
Message-ID: <20150212181215.52C5AA73C8@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, maint has been updated
       via  bd6389f7bce6d69a75e6f84245834e19b24cc03f (commit)
       via  8ad8a81d5c150db2c4823b57cdc8e2f2de9afc91 (commit)
       via  eeb2831b5f35af1ec8a65be343e754ff1c29550d (commit)
       via  e1ce81a2cb66c70d806adf755d9ee273687ca962 (commit)
       via  cd408d93fdf347ff63a8062f75f1f4ee3e898b17 (commit)
       via  87be2e1427ba2b1b7697c9332487862917897dca (commit)
       via  44100adc6c7f7db7bfd4ccf0d8bd18de8ab195c0 (commit)
       via  e6afd9500d0d00855ef0144a1e7c913a8bf4927d (commit)
       via  467f5bcc6ebb8468bb2ef1fc4edaeab9970a37d4 (commit)
       via  fdb0799d7568efbae2b01ede62e6cec30a0798ce (commit)
       via  dea42d929699ef62c1d6df0eb273beb30c9fbf6e (commit)
       via  37662ea4bf64087f2251e2f4a71a13623cfe047f (commit)
       via  4dc5acee634b3ac72f2e1c2f1ca0489526a86cf3 (commit)
       via  048fb8e3d0dd41f73f3a12f6ce3b13c80148ea3e (commit)
       via  d52b5f8835a1768dc3b16e8b8cc465b5f80098ad (commit)
       via  e6214b9a52ca4e79148017ef43e9228806999c06 (commit)
       via  9259d7788193ad23aa429652af983afc3bc4a953 (commit)
       via  5d96094874c148365441612158acf2039d421538 (commit)
       via  c5d9a8283cfac15b4a5a07f18d5eb10c1f388505 (commit)
       via  163bbff24afb284f3de142354c6c6ec75a6a7b67 (commit)
       via  c7310917e6b5efa6ef867ef5cabc5b5649d97b67 (commit)
       via  f6308b01398fdb5095f28662be326c66806eef20 (commit)
       via  482c84759fb6df983d519ca2ac61e3c92c0ae7e3 (commit)
       via  7ab7aa60bb88474ceb4119e79f349254910b853c (commit)
       via  b79d8f2934bc0dbe5f22fbb3ee709eb932baf3c6 (commit)
      from  57622bd19d3fd013038d34f497b106a7e2bfd26d (commit)

Those revisions listed 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:
 Help/command/link_libraries.rst              |   19 +++++++------
 Help/manual/cmake-commands.7.rst             |    2 +-
 Modules/FeatureSummary.cmake                 |    4 +--
 Modules/FindOpenSSL.cmake                    |    2 +-
 Modules/Platform/Windows-MSVC.cmake          |    2 +-
 Modules/Platform/Windows-df.cmake            |    2 +-
 Source/CMakeLists.txt                        |    1 +
 Source/CMakeVersion.cmake                    |    2 +-
 Source/CPack/cmCPackGenerator.cxx            |   12 +++++++++
 Source/CPack/cpack.cxx                       |    2 --
 Source/CTest/cmCTestBuildHandler.cxx         |    4 +--
 Source/CursesDialog/ccmake.cxx               |    3 ---
 Source/cmArchiveWrite.cxx                    |    4 +++
 Source/cmGeneratorTarget.cxx                 |    8 ++++++
 Source/cmLocalGenerator.cxx                  |   14 ++++------
 Source/cmLocalUnixMakefileGenerator3.cxx     |    2 +-
 Tests/QtAutogen/yaf.cpp => Source/cmLocale.h |   37 +++++++++++++-------------
 Source/cmNinjaTargetGenerator.cxx            |    8 ++++++
 Source/cmSystemTools.cxx                     |    3 +++
 Source/cmakemain.cxx                         |    2 --
 Source/ctest.cxx                             |    3 ---
 Source/kwsys/Directory.cxx                   |    5 ++++
 Tests/CTestTestMemcheck/memtester.cxx.in     |    2 --
 Tests/CustomCommand/CMakeLists.txt           |   13 +++++++++
 Tests/CustomCommand/foo.in                   |    5 ++++
 Tests/CustomCommand/subdir.h.in              |    1 +
 26 files changed, 104 insertions(+), 58 deletions(-)
 copy Tests/QtAutogen/yaf.cpp => Source/cmLocale.h (61%)
 create mode 100644 Tests/CustomCommand/subdir.h.in


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 12 13:36:26 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Feb 2015 13:36:26 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.3-1331-g2aa7f9a
Message-ID: <20150212183626.2E406AAD9B@public.kitware.com>

This is an automated email from 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  2aa7f9aec3ab5608b8a5f38c6d07bf647bc2c084 (commit)
       via  bf8f9c29e745933d5732f4481669c38ba8bdc3fc (commit)
      from  0c249a20a57a744b88c44537df6206cd83ae2440 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2aa7f9aec3ab5608b8a5f38c6d07bf647bc2c084
commit 2aa7f9aec3ab5608b8a5f38c6d07bf647bc2c084
Merge: 0c249a2 bf8f9c2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 12 13:36:12 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 12 13:36:12 2015 -0500

    Merge topic 'xcode-attribute-genex' into next
    
    bf8f9c29 Xcode: Teach XCODE_ATTRIBUTE target properties about generator expressions


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf8f9c29e745933d5732f4481669c38ba8bdc3fc
commit bf8f9c29e745933d5732f4481669c38ba8bdc3fc
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Wed Feb 11 20:48:43 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 12 13:35:31 2015 -0500

    Xcode: Teach XCODE_ATTRIBUTE target properties about generator expressions
    
    Signed-off-by: Gregor Jasny <gjasny at googlemail.com>

diff --git a/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst b/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst
index de98c37..7e00ac4 100644
--- a/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst
+++ b/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst
@@ -8,3 +8,9 @@ the generated Xcode project.  Ignored on other generators.
 
 See the :variable:`CMAKE_XCODE_ATTRIBUTE_<an-attribute>` variable
 to set attributes on all targets in a directory tree.
+
+Contents of ``XCODE_ATTRIBUTE_<an-attribute>`` may use
+"generator expressions" with the syntax ``$<...>``.  See the
+:manual:`cmake-generator-expressions(7)` manual for available
+expressions.  See the :manual:`cmake-buildsystem(7)` manual
+for more on defining buildsystem properties.
diff --git a/Help/release/dev/xcode-attribute-genex.rst b/Help/release/dev/xcode-attribute-genex.rst
new file mode 100644
index 0000000..3fd5b1c
--- /dev/null
+++ b/Help/release/dev/xcode-attribute-genex.rst
@@ -0,0 +1,5 @@
+xcode-attribute-genex
+---------------------
+
+* The :prop_tgt:`XCODE_ATTRIBUTE_<an-attribute>` target property learned
+  to support generator expressions.
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 30ed134..aea134e 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2436,8 +2436,11 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
       if (!attribute.empty())
         {
+        cmGeneratorExpression ge;
+        std::string processed = ge.Parse(i->second.GetValue())
+          ->Evaluate(this->CurrentMakefile, configName);
         buildSettings->AddAttribute(attribute.c_str(),
-                                    this->CreateString(i->second.GetValue()));
+                                    this->CreateString(processed));
         }
       }
     }
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index 8e4026b..792f40e 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -1,3 +1,5 @@
 include(RunCMake)
 
 run_cmake(XcodeFileType)
+run_cmake(XcodeAttributeGenex)
+run_cmake(XcodeAttributeGenexError)
diff --git a/Tests/RunCMake/XcodeProject/XcodeAttributeGenex-check.cmake b/Tests/RunCMake/XcodeProject/XcodeAttributeGenex-check.cmake
new file mode 100644
index 0000000..637df0f
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeAttributeGenex-check.cmake
@@ -0,0 +1,7 @@
+set(expect "TEST_HOST = \"[^;\"]*Tests/RunCMake/XcodeProject/XcodeAttributeGenex-build/[^;\"/]*/some\"")
+file(STRINGS ${RunCMake_TEST_BINARY_DIR}/XcodeAttributeGenex.xcodeproj/project.pbxproj actual
+     REGEX "TEST_HOST = .*;" LIMIT_COUNT 1)
+if(NOT "${actual}" MATCHES "${expect}")
+  message(SEND_ERROR "The actual project contains the line:\n ${actual}\n"
+    "which does not match expected regex:\n ${expect}\n")
+endif()
diff --git a/Tests/RunCMake/XcodeProject/XcodeAttributeGenex.cmake b/Tests/RunCMake/XcodeProject/XcodeAttributeGenex.cmake
new file mode 100644
index 0000000..760b882
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeAttributeGenex.cmake
@@ -0,0 +1,4 @@
+enable_language(C)
+add_executable(some main.c)
+add_executable(another main.c)
+set_property(TARGET another PROPERTY XCODE_ATTRIBUTE_TEST_HOST "$<TARGET_FILE:some>")
diff --git a/Tests/RunCMake/XcodeProject/XcodeAttributeGenexError-result.txt b/Tests/RunCMake/XcodeProject/XcodeAttributeGenexError-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeAttributeGenexError-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/XcodeProject/XcodeAttributeGenexError-stderr.txt b/Tests/RunCMake/XcodeProject/XcodeAttributeGenexError-stderr.txt
new file mode 100644
index 0000000..9844158
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeAttributeGenexError-stderr.txt
@@ -0,0 +1,6 @@
+CMake Error:
+  Error evaluating generator expression:
+
+    \$<NOTAGENEX>
+
+  Expression did not evaluate to a known generator expression
diff --git a/Tests/RunCMake/XcodeProject/XcodeAttributeGenexError.cmake b/Tests/RunCMake/XcodeProject/XcodeAttributeGenexError.cmake
new file mode 100644
index 0000000..98ad6c5
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeAttributeGenexError.cmake
@@ -0,0 +1,4 @@
+enable_language(C)
+add_executable(some main.c)
+add_executable(another main.c)
+set_property(TARGET another PROPERTY XCODE_ATTRIBUTE_TEST_HOST "$<NOTAGENEX>")

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

Summary of changes:
 Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst                  |    6 ++++++
 Help/release/dev/xcode-attribute-genex.rst                      |    5 +++++
 Source/cmGlobalXCodeGenerator.cxx                               |    5 ++++-
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake                  |    2 ++
 Tests/RunCMake/XcodeProject/XcodeAttributeGenex-check.cmake     |    7 +++++++
 Tests/RunCMake/XcodeProject/XcodeAttributeGenex.cmake           |    4 ++++
 .../XcodeAttributeGenexError-result.txt}                        |    0
 .../XcodeAttributeGenexError-stderr.txt}                        |    0
 Tests/RunCMake/XcodeProject/XcodeAttributeGenexError.cmake      |    4 ++++
 9 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/xcode-attribute-genex.rst
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeAttributeGenex-check.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeAttributeGenex.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => XcodeProject/XcodeAttributeGenexError-result.txt} (100%)
 copy Tests/RunCMake/{install/TARGETS-DESTINATION-bad-stderr.txt => XcodeProject/XcodeAttributeGenexError-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeAttributeGenexError.cmake


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Feb 12 14:31:25 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu, 12 Feb 2015 14:31:25 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.3-1335-g3df0a0a
Message-ID: <20150212193125.1C260AB3BA@public.kitware.com>

This is an automated email from 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  3df0a0aa91f24dbd08d310e13cd44e8d88524922 (commit)
       via  78757e7ffce9fb6297a2d501989e9b172e6151dc (commit)
       via  fc1cf2654de04ed8f6954dc1907ab1dcb8bb946e (commit)
       via  e5ebeae768a8310b5cfdce0aeff9419e1de51eaa (commit)
      from  2aa7f9aec3ab5608b8a5f38c6d07bf647bc2c084 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3df0a0aa91f24dbd08d310e13cd44e8d88524922
commit 3df0a0aa91f24dbd08d310e13cd44e8d88524922
Merge: 2aa7f9a 78757e7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 12 14:31:24 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 12 14:31:24 2015 -0500

    Merge topic 'clean-up-cmFunctionCommand' into next
    
    78757e7f cmFunctionCommand: Replace loops with cmJoin.
    fc1cf265 cmFunctionCommand: Remove counting variable.
    e5ebeae7 cmFunctionCommand: Split loop in two.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78757e7ffce9fb6297a2d501989e9b172e6151dc
commit 78757e7ffce9fb6297a2d501989e9b172e6151dc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 23:33:03 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 12 20:25:21 2015 +0100

    cmFunctionCommand: Replace loops with cmJoin.

diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index 088a697..a4d9357 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -126,25 +126,10 @@ bool cmFunctionHelperCommand::InvokeInitialPass
     }
 
   // define ARGV and ARGN
-  std::vector<std::string>::const_iterator eit;
-  std::string argvDef;
-  for ( eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit )
-    {
-    if (!argvDef.empty())
-      {
-      argvDef += ";";
-      }
-    argvDef += *eit;
-    }
-  std::string argnDef;
-  eit = expandedArgs.begin() + (this->Args.size()-1);
-  for ( ; eit != expandedArgs.end(); ++eit)
-    if (!argnDef.empty())
-      {
-      argnDef += ";";
-      }
-    argnDef += *eit;
-    }
+  std::string argvDef = cmJoin(expandedArgs, ";");
+  std::vector<std::string>::const_iterator eit
+      = expandedArgs.begin() + (this->Args.size()-1);
+  std::string argnDef = cmJoin(cmRange(eit, expandedArgs.end()), ";");
   this->Makefile->AddDefinition("ARGV", argvDef.c_str());
   this->Makefile->MarkVariableAsUsed("ARGV");
   this->Makefile->AddDefinition("ARGN", argnDef.c_str());

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc1cf2654de04ed8f6954dc1907ab1dcb8bb946e
commit fc1cf2654de04ed8f6954dc1907ab1dcb8bb946e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 23:31:22 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 12 20:25:21 2015 +0100

    cmFunctionCommand: Remove counting variable.
    
    Start iteration at correct starting point directly.

diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index a0a14e8..088a697 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -137,17 +137,13 @@ bool cmFunctionHelperCommand::InvokeInitialPass
     argvDef += *eit;
     }
   std::string argnDef;
-  unsigned int cnt = 0;
-  for ( eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit )
-    if ( cnt >= this->Args.size()-1 )
+  eit = expandedArgs.begin() + (this->Args.size()-1);
+  for ( ; eit != expandedArgs.end(); ++eit)
+    if (!argnDef.empty())
       {
-      if (!argnDef.empty())
-        {
-        argnDef += ";";
-        }
-      argnDef += *eit;
+      argnDef += ";";
       }
-    cnt ++;
+    argnDef += *eit;
     }
   this->Makefile->AddDefinition("ARGV", argvDef.c_str());
   this->Makefile->MarkVariableAsUsed("ARGV");

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5ebeae768a8310b5cfdce0aeff9419e1de51eaa
commit e5ebeae768a8310b5cfdce0aeff9419e1de51eaa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 23:29:04 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 12 20:25:20 2015 +0100

    cmFunctionCommand: Split loop in two.

diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index b44e228..a0a14e8 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -128,8 +128,6 @@ bool cmFunctionHelperCommand::InvokeInitialPass
   // define ARGV and ARGN
   std::vector<std::string>::const_iterator eit;
   std::string argvDef;
-  std::string argnDef;
-  unsigned int cnt = 0;
   for ( eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit )
     {
     if (!argvDef.empty())
@@ -137,6 +135,10 @@ bool cmFunctionHelperCommand::InvokeInitialPass
       argvDef += ";";
       }
     argvDef += *eit;
+    }
+  std::string argnDef;
+  unsigned int cnt = 0;
+  for ( eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit )
     if ( cnt >= this->Args.size()-1 )
       {
       if (!argnDef.empty())

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

Summary of changes:
 Source/cmFunctionCommand.cxx |   25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 12 16:21:22 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 12 Feb 2015 16:21:22 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.3-1337-ged0721a
Message-ID: <20150212212122.88F12AAFD4@public.kitware.com>

This is an automated email from 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  ed0721a37ab40da95e49a3d79b31f082d0c49cba (commit)
       via  029d38fa61a666bff89b522904e05a88f903d051 (commit)
      from  3df0a0aa91f24dbd08d310e13cd44e8d88524922 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed0721a37ab40da95e49a3d79b31f082d0c49cba
commit ed0721a37ab40da95e49a3d79b31f082d0c49cba
Merge: 3df0a0a 029d38f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 12 16:21:20 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 12 16:21:20 2015 -0500

    Merge topic 'doc-configure_file-output-location' into next
    
    029d38fa Help: Revise configure_file documentation (#15403)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=029d38fa61a666bff89b522904e05a88f903d051
commit 029d38fa61a666bff89b522904e05a88f903d051
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 12 16:06:07 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 12 16:20:32 2015 -0500

    Help: Revise configure_file documentation (#15403)
    
    Format the documentation with better reST markup.  Revise the
    wording to clarify how relative paths are handled.  Also add
    an example section.

diff --git a/Help/command/configure_file.rst b/Help/command/configure_file.rst
index 70357f2..4304f09 100644
--- a/Help/command/configure_file.rst
+++ b/Help/command/configure_file.rst
@@ -9,38 +9,103 @@ Copy a file to another location and modify its contents.
                  [COPYONLY] [ESCAPE_QUOTES] [@ONLY]
                  [NEWLINE_STYLE [UNIX|DOS|WIN32|LF|CRLF] ])
 
-Copies a file <input> to file <output> and substitutes variable values
-referenced in the file content.  If <input> is a relative path it is
-evaluated with respect to the current source directory.  The <input>
-must be a file, not a directory.  If <output> is a relative path it is
-evaluated with respect to the current binary directory.  If <output>
-names an existing directory the input file is placed in that directory
-with its original name.
-
-If the <input> file is modified the build system will re-run CMake to
+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.  Furthermore, input lines of the form::
+
+  #cmakedefine VAR ...
+
+will be replaced with either::
+
+  #define VAR ...
+
+or::
+
+  /* #undef VAR */
+
+depending on whether ``VAR`` is set in CMake to any value not considered
+a false constant by the :command:`if` command.  The "..." content on the
+line after the variable name, if any, is processed as above.
+Input file lines of the form ``#cmakedefine01 VAR`` will be replaced with
+either ``#define VAR 1`` or ``#define VAR 0`` similarly.
+
+If the input file is modified the build system will re-run CMake to
 re-configure the file and generate the build system again.
 
-This command replaces any variables in the input file referenced as
-${VAR} or @VAR@ with their values as determined by CMake.  If a
-variable is not defined, it will be replaced with nothing.  If
-COPYONLY is specified, then no variable expansion will take place.  If
-ESCAPE_QUOTES is specified then any substituted quotes will be C-style
-escaped.  The file will be configured with the current values of CMake
-variables.  If @ONLY is specified, only variables of the form @VAR@
-will be replaced and ${VAR} will be ignored.  This is useful for
-configuring scripts that use ${VAR}.
-
-Input file lines of the form "#cmakedefine VAR ..." will be replaced
-with either "#define VAR ..." or ``/* #undef VAR */`` depending on
-whether VAR is set in CMake to any value not considered a false
-constant by the if() command.  (Content of "...", if any, is processed
-as above.) Input file lines of the form "#cmakedefine01 VAR" will be
-replaced with either "#define VAR 1" or "#define VAR 0" similarly.
-
-With NEWLINE_STYLE the line ending could be adjusted:
+The arguments are:
 
-::
+``<input>``
+  Path to the input file.  A relative path is treated with respect to
+  the value of :variable:`CMAKE_CURRENT_SOURCE_DIR`.  The input path
+  must be a file, not a directory.
+
+``<output>``
+  Path to the output file or directory.  A relative path is treated
+  with respect to the value of :variable:`CMAKE_CURRENT_BINARY_DIR`.
+  If the path names an existing directory the output file is placed
+  in that directory with the same file name as the input file.
+
+``COPYONLY``
+  Copy the file without replacing any variable references or other
+  content.  This option may not be used with ``NEWLINE_STYLE``.
+
+``ESCAPE_QUOTES``
+  Escape any substituted quotes with backslashes (C-style).
+
+``@ONLY``
+  Restrict variable replacement to references of the form ``@VAR@``.
+  This is useful for configuring scripts that use ``${VAR}`` syntax.
+
+``NEWLINE_STYLE <style>``
+  Specify the newline style for the output file.  Specify
+  ``UNIX`` or ``LF`` for ``\n`` newlines, or specify
+  ``DOS``, ``WIN32``, or ``CRLF`` for ``\r\n`` newlines.
+  This option may not be used with ``COPYONLY``.
+
+Example
+^^^^^^^
+
+Consider a source tree containing a ``foo.h.in`` file:
+
+.. code-block:: c
+
+  #cmakedefine FOO_ENABLE
+  #cmakedefine FOO_STRING "@FOO_STRING@"
+
+An adjacent ``CMakeLists.txt`` may use ``configure_file`` to
+configure the header:
+
+.. code-block:: cmake
+
+  option(FOO_ENABLE "Enable Foo" ON)
+  if(FOO_ENABLE)
+    set(FOO_STRING "foo")
+  endif()
+  configure_file(foo.h.in foo.h @ONLY)
+
+This creates a ``foo.h`` in the build directory corresponding to
+this source directory.  If the ``FOO_ENABLE`` option is on, the
+configured file will contain:
+
+.. code-block:: c
+
+  #define FOO_ENABLE
+  #define FOO_STRING "foo"
+
+Otherwise it will contain:
+
+.. code-block:: c
+
+  /* #undef FOO_ENABLE */
+  /* #undef FOO_STRING */
+
+One may then use the :command:`include_directories` command to
+specify the output directory as an include directory:
+
+.. code-block:: cmake
 
-    'UNIX' or 'LF' for \n, 'DOS', 'WIN32' or 'CRLF' for \r\n.
+  include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-COPYONLY must not be used with NEWLINE_STYLE.
+so that sources may include the header as ``#include <foo.h>``.

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

Summary of changes:
 Help/command/configure_file.rst |  125 +++++++++++++++++++++++++++++----------
 1 file changed, 95 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Fri Feb 13 00:01:18 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Fri, 13 Feb 2015 00:01:18 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.3-1152-g8d38ff0
Message-ID: <20150213050118.6727AAAA7B@public.kitware.com>

This is an automated email from 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  8d38ff05e2db3f3bd907f5a3c279fd116010e775 (commit)
      from  0ec1f45a138bd7a9ad618f6e9dfa077a6bc8533c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d38ff05e2db3f3bd907f5a3c279fd116010e775
commit 8d38ff05e2db3f3bd907f5a3c279fd116010e775
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Fri Feb 13 00:01:16 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Feb 13 00:01:16 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 6152144..dcd8191 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 2)
-set(CMake_VERSION_PATCH 20150212)
+set(CMake_VERSION_PATCH 20150213)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From nilsgladitz at gmail.com  Fri Feb 13 05:59:03 2015
From: nilsgladitz at gmail.com (Nils Gladitz)
Date: Fri, 13 Feb 2015 05:59:03 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.3-1340-g39051c9
Message-ID: <20150213105903.64CF4AAF72@public.kitware.com>

This is an automated email from 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  39051c9bd0ffbc6f47ce7429e7d09ee0a045a025 (commit)
       via  5724bc58b6ac590a1844f7bfb0cff497754a909d (commit)
       via  8d38ff05e2db3f3bd907f5a3c279fd116010e775 (commit)
      from  ed0721a37ab40da95e49a3d79b31f082d0c49cba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39051c9bd0ffbc6f47ce7429e7d09ee0a045a025
commit 39051c9bd0ffbc6f47ce7429e7d09ee0a045a025
Merge: ed0721a 5724bc5
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Feb 13 05:59:02 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 13 05:59:02 2015 -0500

    Merge topic 'wix-product-fragment' into next
    
    5724bc58 CPackWIX: Extend the patching mechanism to allow adding content to <Product>.
    8d38ff05 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5724bc58b6ac590a1844f7bfb0cff497754a909d
commit 5724bc58b6ac590a1844f7bfb0cff497754a909d
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Feb 13 11:57:20 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Feb 13 11:57:20 2015 +0100

    CPackWIX: Extend the patching mechanism to allow adding content to <Product>.

diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index 0a47e19..105df96 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -148,6 +148,9 @@
 #  Currently fragments can be injected into most
 #  Component, File and Directory elements.
 #
+#  The special Id ``#PRODUCT`` can be used to inject content
+#  into the ``<Product>`` element.
+#
 #  The following example illustrates how this works.
 #
 #  Given that the WiX generator creates the following XML element:
@@ -233,7 +236,7 @@
 #  * ARPSIZE - Size (in kilobytes) of the application
 
 #=============================================================================
-# Copyright 2014 Kitware, Inc.
+# Copyright 2014-2015 Kitware, Inc.
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
diff --git a/Modules/WIX.template.in b/Modules/WIX.template.in
index bbb7c88..c4fc83a 100644
--- a/Modules/WIX.template.in
+++ b/Modules/WIX.template.in
@@ -42,5 +42,6 @@
         <UIRef Id="$(var.CPACK_WIX_UI_REF)" />
 
         <?include "properties.wxi"?>
+        <?include "product_fragment.wxi"?>
     </Product>
 </Wix>
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 59c38e9..59c0e73 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -1,6 +1,6 @@
 /*============================================================================
   CMake - Cross Platform Makefile Generator
-  Copyright 2000-2014 Kitware, Inc., Insight Software Consortium
+  Copyright 2014-2015 Kitware, Inc., Insight Software Consortium
 
   Distributed under the OSI-approved BSD License (the "License");
   see accompanying file Copyright.txt for details.
@@ -257,6 +257,7 @@ bool cmCPackWIXGenerator::PackageFilesImpl()
 
   CreateWiXVariablesIncludeFile();
   CreateWiXPropertiesIncludeFile();
+  CreateWiXProductFragmentIncludeFile();
 
   if(!CreateWiXSourceFiles())
     {
@@ -385,6 +386,17 @@ void cmCPackWIXGenerator::CreateWiXPropertiesIncludeFile()
     }
 }
 
+void cmCPackWIXGenerator::CreateWiXProductFragmentIncludeFile()
+{
+    std::string includeFilename =
+      this->CPackTopLevel + "/product_fragment.wxi";
+
+    cmWIXSourceWriter includeFile(
+      this->Logger, includeFilename, true);
+
+    this->Patch->ApplyFragment("#PRODUCT", includeFile);
+}
+
 void cmCPackWIXGenerator::CopyDefinition(
   cmWIXSourceWriter &source, std::string const& name)
 {
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h
index 8705d40..ecd0738 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.h
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.h
@@ -1,6 +1,6 @@
 /*============================================================================
   CMake - Cross Platform Makefile Generator
-  Copyright 2000-2012 Kitware, Inc.
+  Copyright 2014-2015 Kitware, Inc.
 
   Distributed under the OSI-approved BSD License (the "License");
   see accompanying file Copyright.txt for details.
@@ -76,6 +76,8 @@ private:
 
   void CreateWiXPropertiesIncludeFile();
 
+  void CreateWiXProductFragmentIncludeFile();
+
   void CopyDefinition(
     cmWIXSourceWriter &source, std::string const& name);
 

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

Summary of changes:
 Modules/CPackWIX.cmake                   |    5 ++++-
 Modules/WIX.template.in                  |    1 +
 Source/CMakeVersion.cmake                |    2 +-
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |   14 +++++++++++++-
 Source/CPack/WiX/cmCPackWIXGenerator.h   |    4 +++-
 5 files changed, 22 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From nilsgladitz at gmail.com  Fri Feb 13 06:09:15 2015
From: nilsgladitz at gmail.com (Nils Gladitz)
Date: Fri, 13 Feb 2015 06:09:15 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.3-1342-g9178b7c
Message-ID: <20150213110915.9D06C3C6@public.kitware.com>

This is an automated email from 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  9178b7cdf066b709fd70d83533ffc77abc69465b (commit)
       via  f41f12f460850da28b60e91ccbb9ca7f98ec6e7c (commit)
      from  39051c9bd0ffbc6f47ce7429e7d09ee0a045a025 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9178b7cdf066b709fd70d83533ffc77abc69465b
commit 9178b7cdf066b709fd70d83533ffc77abc69465b
Merge: 39051c9 f41f12f
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Feb 13 06:09:14 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 13 06:09:14 2015 -0500

    Merge topic 'wix-product-fragment' into next
    
    f41f12f4 CPackWIX: Fix copyright ranges


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f41f12f460850da28b60e91ccbb9ca7f98ec6e7c
commit f41f12f460850da28b60e91ccbb9ca7f98ec6e7c
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Feb 13 12:08:41 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Feb 13 12:08:41 2015 +0100

    CPackWIX: Fix copyright ranges

diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 59c0e73..11d5437 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -1,6 +1,6 @@
 /*============================================================================
   CMake - Cross Platform Makefile Generator
-  Copyright 2014-2015 Kitware, Inc., Insight Software Consortium
+  Copyright 2012-2015 Kitware, Inc., Insight Software Consortium
 
   Distributed under the OSI-approved BSD License (the "License");
   see accompanying file Copyright.txt for details.
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h
index ecd0738..7035297 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.h
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.h
@@ -1,6 +1,6 @@
 /*============================================================================
   CMake - Cross Platform Makefile Generator
-  Copyright 2014-2015 Kitware, Inc.
+  Copyright 2012-2015 Kitware, Inc.
 
   Distributed under the OSI-approved BSD License (the "License");
   see accompanying file Copyright.txt for details.

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

Summary of changes:
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |    2 +-
 Source/CPack/WiX/cmCPackWIXGenerator.h   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From nilsgladitz at gmail.com  Fri Feb 13 06:10:07 2015
From: nilsgladitz at gmail.com (Nils Gladitz)
Date: Fri, 13 Feb 2015 06:10:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.3-1344-g9c63fd7
Message-ID: <20150213111007.3594149B8@public.kitware.com>

This is an automated email from 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  9c63fd71adf70c69364385d28acf8743e4d82f34 (commit)
       via  a2ccbffd8b4191f7b8b888fafde85eb5e7dbb2e4 (commit)
      from  9178b7cdf066b709fd70d83533ffc77abc69465b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c63fd71adf70c69364385d28acf8743e4d82f34
commit 9c63fd71adf70c69364385d28acf8743e4d82f34
Merge: 9178b7c a2ccbff
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Feb 13 06:10:06 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 13 06:10:06 2015 -0500

    Merge topic 'wix-product-fragment' into next
    
    a2ccbffd CPackWIX: Extend the patching mechanism to allow adding content to <Product>.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2ccbffd8b4191f7b8b888fafde85eb5e7dbb2e4
commit a2ccbffd8b4191f7b8b888fafde85eb5e7dbb2e4
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Feb 13 11:57:20 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Feb 13 12:09:40 2015 +0100

    CPackWIX: Extend the patching mechanism to allow adding content to <Product>.

diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index 0a47e19..105df96 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -148,6 +148,9 @@
 #  Currently fragments can be injected into most
 #  Component, File and Directory elements.
 #
+#  The special Id ``#PRODUCT`` can be used to inject content
+#  into the ``<Product>`` element.
+#
 #  The following example illustrates how this works.
 #
 #  Given that the WiX generator creates the following XML element:
@@ -233,7 +236,7 @@
 #  * ARPSIZE - Size (in kilobytes) of the application
 
 #=============================================================================
-# Copyright 2014 Kitware, Inc.
+# Copyright 2014-2015 Kitware, Inc.
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
diff --git a/Modules/WIX.template.in b/Modules/WIX.template.in
index bbb7c88..c4fc83a 100644
--- a/Modules/WIX.template.in
+++ b/Modules/WIX.template.in
@@ -42,5 +42,6 @@
         <UIRef Id="$(var.CPACK_WIX_UI_REF)" />
 
         <?include "properties.wxi"?>
+        <?include "product_fragment.wxi"?>
     </Product>
 </Wix>
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 59c38e9..11d5437 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -1,6 +1,6 @@
 /*============================================================================
   CMake - Cross Platform Makefile Generator
-  Copyright 2000-2014 Kitware, Inc., Insight Software Consortium
+  Copyright 2012-2015 Kitware, Inc., Insight Software Consortium
 
   Distributed under the OSI-approved BSD License (the "License");
   see accompanying file Copyright.txt for details.
@@ -257,6 +257,7 @@ bool cmCPackWIXGenerator::PackageFilesImpl()
 
   CreateWiXVariablesIncludeFile();
   CreateWiXPropertiesIncludeFile();
+  CreateWiXProductFragmentIncludeFile();
 
   if(!CreateWiXSourceFiles())
     {
@@ -385,6 +386,17 @@ void cmCPackWIXGenerator::CreateWiXPropertiesIncludeFile()
     }
 }
 
+void cmCPackWIXGenerator::CreateWiXProductFragmentIncludeFile()
+{
+    std::string includeFilename =
+      this->CPackTopLevel + "/product_fragment.wxi";
+
+    cmWIXSourceWriter includeFile(
+      this->Logger, includeFilename, true);
+
+    this->Patch->ApplyFragment("#PRODUCT", includeFile);
+}
+
 void cmCPackWIXGenerator::CopyDefinition(
   cmWIXSourceWriter &source, std::string const& name)
 {
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h
index 8705d40..7035297 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.h
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.h
@@ -1,6 +1,6 @@
 /*============================================================================
   CMake - Cross Platform Makefile Generator
-  Copyright 2000-2012 Kitware, Inc.
+  Copyright 2012-2015 Kitware, Inc.
 
   Distributed under the OSI-approved BSD License (the "License");
   see accompanying file Copyright.txt for details.
@@ -76,6 +76,8 @@ private:
 
   void CreateWiXPropertiesIncludeFile();
 
+  void CreateWiXProductFragmentIncludeFile();
+
   void CopyDefinition(
     cmWIXSourceWriter &source, std::string const& name);
 

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 13 09:23:32 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Feb 2015 09:23:32 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.3-1346-g1e8cab7
Message-ID: <20150213142333.0064EAAA8F@public.kitware.com>

This is an automated email from 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  1e8cab716d3bc5971daf5360e67b12728f34afa2 (commit)
       via  1c7710e98c68355507efc83075fc7f7e109f50a9 (commit)
      from  9c63fd71adf70c69364385d28acf8743e4d82f34 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e8cab716d3bc5971daf5360e67b12728f34afa2
commit 1e8cab716d3bc5971daf5360e67b12728f34afa2
Merge: 9c63fd7 1c7710e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 09:23:31 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 13 09:23:31 2015 -0500

    Merge topic 'FindMatlab-rewrite' into next
    
    1c7710e9 FindMatlab: Rewrite module and provide a usage API


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c7710e98c68355507efc83075fc7f7e109f50a9
commit 1c7710e98c68355507efc83075fc7f7e109f50a9
Author:     Raffi Enficiaud <raffi.enficiaud at tuebingen.mpg.de>
AuthorDate: Thu Feb 12 17:13:31 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 13 09:20:44 2015 -0500

    FindMatlab: Rewrite module and provide a usage API
    
    Implementation of the new FindMatlab module
    
    - FindMatlab learned about versions and components
    - ability to find Matlab and its version in a more precise and multiplatform way
    - ability to add new mex extension with a macro
    - ability to add a documentation
    - ability to add matlab unit tests (with or without the unit test framework)
    - reworked documentation

diff --git a/Help/release/dev/FindMatlab-rewrite.rst b/Help/release/dev/FindMatlab-rewrite.rst
new file mode 100644
index 0000000..07727b8
--- /dev/null
+++ b/Help/release/dev/FindMatlab-rewrite.rst
@@ -0,0 +1,7 @@
+FindMatlab-rewrite
+------------------
+
+* The :module:`FindMatlab` module was completely rewritten.  It learned
+  about versions and components and to find Matlab in a more precise and
+  multiplatform way.  The module now offers APIs to create mex extensions,
+  documentation, and unit tests.
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 474556e..a821826 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -2,20 +2,201 @@
 # FindMatlab
 # ----------
 #
-# this module looks for Matlab
+# Finds Matlab installations and provides Matlab tools and libraries to cmake.
 #
-# Defines:
+# This package first intention is to find the libraries associated with Matlab
+# in order to be able to build Matlab extensions (mex files). It can also be
+# used:
 #
-# ::
+# * run specific commands in Matlab
+# * declare Matlab unit test
+# * retrieve various information from Matlab (mex extensions, versions and
+#   release queries, ...)
 #
-#   MATLAB_INCLUDE_DIR: include path for mex.h, engine.h
-#   MATLAB_LIBRARIES:   required libraries: libmex, etc
-#   MATLAB_MEX_LIBRARY: path to libmex.lib
-#   MATLAB_MX_LIBRARY:  path to libmx.lib
-#   MATLAB_ENG_LIBRARY: path to libeng.lib
+# The module supports the following components:
+#
+# * ``MX_LIBRARY`` and ``ENG_LIBRARY`` respectively the MX and ENG libraries of
+#   Matlab
+# * ``MAIN_PROGRAM`` the Matlab binary program.
+#
+# .. note::
+#
+#   The version given to the :command:`find_package` directive is the Matlab
+#   **version**, which should not be confused with the Matlab *release* name
+#   (eg. `R2014`).
+#   The :command:`matlab_get_version_from_release_name` and
+#   :command:`matlab_get_release_name_from_version` allow a mapping
+#   from the release name to the version.
+#
+# The variable :variable:`MATLAB_USER_ROOT` may be specified in order to give
+# the path of the desired Matlab version. Otherwise, the behaviour is platform
+# specific:
+#
+# * Windows: The installed versions of Matlab are retrieved from the
+#   Windows registry
+# * OS X: The installed versions of Matlab are given by the MATLAB
+#   paths in ``/Application``
+# * Unix: The desired Matlab should be accessible from the PATH.
+#
+# Additional information is provided when :variable:`MATLAB_FIND_DEBUG` is set.
+# When a Matlab binary is found automatically and the ``MATLAB_VERSION``
+# is not given, the version is queried from Matlab directly.
+# On Windows, it can make a window running Matlab appear.
+#
+# The mapping of the release names and the version of Matlab is performed by
+# defining pairs (name, version).  The variable
+# :variable:`MATLAB_ADDITIONAL_VERSIONS` may be provided before the call to
+# the :command:`find_package` in order to handle additional versions.
+#
+# A Matlab scripts can be added to the set of tests using the
+# :command:`matlab_add_unit_test`. By default, the Matlab unit test framework
+# will be used (>= 2013a) to run this script, but regular ``.m`` files
+# returning an exit code can be used as well (0 indicating a success).
+#
+# Module Input Variables
+# ----------------------
+#
+# Users or projects may set the following variables to configure the module
+# behaviour:
+#
+# :variable:`MATLAB_USER_ROOT`
+#   the root of the Matlab installation.
+# :variable:`MATLAB_FIND_DEBUG`
+#   outputs debug information
+# :variable:`MATLAB_ADDITIONAL_VERSIONS`
+#   additional versions of Matlab for the automatic retrieval of the installed
+#   versions.
+#
+# Variables defined by the module
+# -------------------------------
+#
+# Result variables
+# ^^^^^^^^^^^^^^^^
+#
+# ``Matlab_FOUND``
+#   ``TRUE`` if the Matlab installation is found, ``FALSE``
+#   otherwise. All variable below are defined if Matlab is found.
+# ``Matlab_ROOT_DIR``
+#   the root of the Matlab installation determined by the FindMatlab module.
+# ``Matlab_MAIN_PROGRAM``
+#   the Matlab binary program. Available only if the component ``MAIN_PROGRAM``
+#   is given in the :command:`find_package` directive.
+# ``Matlab_INCLUDE_DIRS``
+#  the path of the Matlab libraries headers
+# ``Matlab_MEX_LIBRARY``
+#   library for mex
+# ``Matlab_MX_LIBRARY``
+#   mx library of Matlab (arrays). Available only if the component
+#   ``MX_LIBRARY`` has been requested.
+# ``Matlab_ENG_LIBRARY``
+#   Matlab engine library. Available only if the component ``ENG_LIBRARY``
+#   is requested.
+# ``Matlab_LIBRARIES``
+#   the whole set of libraries of Matlab
+# ``Matlab_MEX_COMPILER``
+#   the mex compiler of Matlab. Currently not used.
+#   Available only if the component ``MEX_COMPILER`` is asked
+#
+# Cached variables
+# ^^^^^^^^^^^^^^^^
+#
+# ``Matlab_VERSION_STRING``
+#   the version of the Matlab installation
+# ``Matlab_MEX_EXTENSION``
+#   the extension of the mex files for the current platform (given by Matlab).
+#
+# Provided macros
+# ---------------
+#
+# :command:`matlab_get_version_from_release_name`
+#   returns the version from the release name
+# :command:`matlab_get_release_name_from_version`
+#   returns the release name from the Matlab version
+#
+# Provided functions
+# ------------------
+#
+# :command:`matlab_add_mex`
+#   adds a target compiling a MEX file.
+# :command:`matlab_add_unit_test`
+#   adds a Matlab unit test file as a test to the project.
+# :command:`matlab_extract_all_installed_versions_from_registry`
+#   parses the registry for all Matlab versions. Available on Windows only.
+#   The part of the registry parsed is dependent on the host processor
+# :command:`matlab_get_all_valid_matlab_roots_from_registry`
+#   returns all the possible Matlab paths, according to a previously
+#   given list. Only the existing/accessible paths are kept. This is mainly
+#   useful for the searching all possible Matlab installation.
+# :command:`matlab_get_mex_suffix`
+#   returns the suffix to be used for the mex files
+#   (platform/architecture dependant)
+# :command:`matlab_get_version_from_matlab_run`
+#   returns the version of Matlab, given the full directory of the Matlab program.
+#
+#
+# Known issues
+# ------------
+#
+# **Symbol clash in a MEX target**
+#   By default, every symbols inside a MEX
+#   file defined with the command :command:`matlab_add_mex` have hidden
+#   visibility, except for the entry point. This is the default behaviour of
+#   the MEX compiler, which lowers the risk of symbol collision between the
+#   libraries shipped with Matlab, and the libraries to which the MEX file is
+#   linking to. This is also the default on Windows platforms.
+#
+#   However, this is not sufficient in certain case, where for instance your
+#   MEX file is linking against libraries that are already loaded by Matlab,
+#   even if those libraries have different SONAMES.
+#   A possible solution is to hide the symbols of the libraries to which the
+#   MEX target is linking to. This can be achieved in GNU GCC compilers with
+#   the linker option ``-Wl,--exclude-libs,ALL``.
+#
+# **Tests using GPU resources**
+#   in case your MEX file is using the GPU and
+#   in order to be able to run unit tests on this MEX file, the GPU resources
+#   should be properly released by Matlab. A possible solution is to make
+#   Matlab aware of the use of the GPU resources in the session, which can be
+#   performed by a command such as ``D = gpuDevice()`` at the beginning of
+#   the test script (or via a fixture).
+#
+#
+# Reference
+# --------------
+#
+# .. variable:: MATLAB_USER_ROOT
+#
+#    The root folder of the Matlab installation. This is set before the call to
+#    :command:`find_package`. If not set, then an automatic search of Matlab
+#    will be performed. If set, it should point to a valid version of Matlab.
+#
+# .. variable:: MATLAB_FIND_DEBUG
+#
+#    If set, the lookup of Matlab and the intermediate configuration steps are
+#    outputted to the console.
+#
+# .. variable:: MATLAB_ADDITIONAL_VERSIONS
+#
+#   If set, specifies additional versions of Matlab that may be looked for.
+#   This variable will be used if :variable:`MATLAB_USER_ROOT` is not set.
+#   The variable should be a list of strings, organised by pairs of release
+#   name and versions, such as follows::
+#
+#     set(MATLAB_ADDITIONAL_VERSIONS
+#         "release_name1=corresponding_version1"
+#         "release_name2=corresponding_version2"
+#         ...
+#         )
+#
+#   Example::
+#
+#     set(MATLAB_ADDITIONAL_VERSIONS
+#         "R2013b=8.2"
+#         "R2013a=8.1"
+#         "R2012b=8.0")
 
 #=============================================================================
-# Copyright 2005-2009 Kitware, Inc.
+# Copyright 2014-2015 Raffi Enficiaud, Max Planck Society
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -27,102 +208,1170 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-set(MATLAB_FOUND 0)
-if(WIN32)
-  if(${CMAKE_GENERATOR} MATCHES "Visual Studio 6")
-    set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/msvc60")
+set(_FindMatlab_SELF_DIR "${CMAKE_CURRENT_LIST_DIR}")
+
+include(FindPackageHandleStandardArgs)
+include(CheckCXXCompilerFlag)
+
+
+# The currently supported versions. Other version can be added by the user by
+# providing MATLAB_ADDITIONAL_VERSIONS
+if(NOT MATLAB_ADDITIONAL_VERSIONS)
+  set(MATLAB_ADDITIONAL_VERSIONS)
+endif()
+
+set(MATLAB_VERSIONS_MAPPING
+  "R2013b=8.2"
+  "R2013a=8.1"
+  "R2012b=8.0"
+  "R2012a=7.14"
+
+  "R2011b=7.13"
+  "R2011a=7.12"
+  "R2010b=7.11"
+
+  ${MATLAB_ADDITIONAL_VERSIONS}
+  )
+
+
+# temporary folder for all Matlab runs
+set(_matlab_temporary_folder ${CMAKE_BINARY_DIR}/Matlab)
+
+if(NOT EXISTS ${_matlab_temporary_folder})
+  file(MAKE_DIRECTORY ${_matlab_temporary_folder})
+endif()
+
+#.rst:
+# .. command:: matlab_get_version_from_release_name
+#
+#   Returns the version of Matlab (17.58) from a release name (R2017k)
+macro (matlab_get_version_from_release_name release_name version_name)
+
+  string(REGEX MATCHALL "${release_name}=([0-9]+\\.?[0-9]*)" _matched ${MATLAB_VERSIONS_MAPPING})
+
+  set(${version_name} "")
+  if(NOT _matched STREQUAL "")
+    set(${version_name} ${CMAKE_MATCH_1})
   else()
-    if(${CMAKE_GENERATOR} MATCHES "Visual Studio 7")
-      # Assume people are generally using 7.1,
-      # if using 7.0 need to link to: ../extern/lib/win32/microsoft/msvc70
-      set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/msvc71")
-    else()
-      if(${CMAKE_GENERATOR} MATCHES "Borland")
-        # Same here, there are also: bcc50 and bcc51 directories
-        set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/bcc54")
-      else()
-        if(MATLAB_FIND_REQUIRED)
-          message(FATAL_ERROR "Generator not compatible: ${CMAKE_GENERATOR}")
-        endif()
+    message(WARNING "The release name ${release_name} is not registered")
+  endif()
+
+endmacro()
+
+
+
+
+
+#.rst:
+# .. command:: matlab_get_release_name_from_version
+#
+#   Returns the release name (R2017k) from the version of Matlab (17.58)
+macro (matlab_get_release_name_from_version version release_name)
+
+  set(${release_name} "")
+  foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
+    string(REGEX MATCHALL "(.+)=${version}" _matched ${_var})
+    if(NOT _matched STREQUAL "")
+      set(${release_name} ${CMAKE_MATCH_1})
+      break()
+    endif()
+  endforeach(_var)
+
+  unset(_var)
+  unset(_matched)
+  if(${release_name} STREQUAL "")
+    message(WARNING "The version ${version} is not registered")
+  endif()
+
+endmacro()
+
+
+
+
+
+# extracts all the supported release names (R2017k...) of Matlab
+# internal use
+macro(matlab_get_supported_releases list_releases)
+  set(${list_releases})
+  foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
+    string(REGEX MATCHALL "(.+)=([0-9]+\\.?[0-9]*)" _matched ${_var})
+    if(NOT _matched STREQUAL "")
+      list(APPEND ${list_releases} ${CMAKE_MATCH_1})
+    endif()
+    unset(_matched)
+    unset(CMAKE_MATCH_1)
+  endforeach(_var)
+  unset(_var)
+endmacro()
+
+
+
+# extracts all the supported versions of Matlab
+# internal use
+macro(matlab_get_supported_versions list_versions)
+  set(${list_releases})
+  foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
+    string(REGEX MATCHALL "(.+)=([0-9]+\\.?[0-9]*)" _matched ${_var})
+    if(NOT _matched STREQUAL "")
+      list(APPEND ${list_releases} ${CMAKE_MATCH_2})
+    endif()
+    unset(_matched)
+    unset(CMAKE_MATCH_1)
+  endforeach(_var)
+  unset(_var)
+endmacro()
+
+
+#.rst:
+# .. command:: matlab_extract_all_installed_versions_from_registry
+#
+#   This function parses the registry and founds the Matlab versions that are
+#   installed. The found versions are returned in `matlab_versions`.
+#   Set `win64` to `TRUE` if the 64 bit version of Matlab should be looked for
+#   The returned list contains all versions under
+#   ``HKLM\\SOFTWARE\\Mathworks\\MATLAB`` or an empty list in case an error
+#   occurred (or nothing found).
+#
+#   .. note::
+#
+#     Only the versions are provided. No check is made over the existence of the
+#     installation referenced in the registry,
+#
+function(matlab_extract_all_installed_versions_from_registry win64 matlab_versions)
+
+  if(NOT CMAKE_HOST_WIN32)
+    message(FATAL_ERROR "This macro can only be called by a windows host (call to reg.exe")
+  endif()
+
+  # list the keys under HKEY_LOCAL_MACHINE\SOFTWARE\mathworks but the call to
+  # reg does not work from cmake, curiously, as is. The command provides the
+  # desired result under the command line though.
+  # Fix: this is because "/reg:64" should appended to the command, otherwise
+  # it gets on the 32 bits software key (curiously again)
+  find_program(MATLAB_REG_EXE_LOCATION "reg")
+
+  # if reg.exe is not found, then it is impossible to use this method.
+  if(NOT MATLAB_REG_EXE_LOCATION)
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] reg.exe not found")
+    endif()
+    set(${matlab_versions} "" PARENT_SCOPE)
+    return()
+  endif()
+
+  if(${win64} AND ${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "64")
+    set(APPEND_REG "/reg:64")
+  else()
+    set(APPEND_REG "/reg:32")
+  endif()
+
+  # /reg:64 should be added on 64 bits capable OSs in order to enable the
+  # redirection of 64 bits applications
+  execute_process(
+    COMMAND ${MATLAB_REG_EXE_LOCATION} query HKEY_LOCAL_MACHINE\\SOFTWARE\\Mathworks\\MATLAB /f * /k ${APPEND_REG}
+    RESULT_VARIABLE resultMatlab
+    OUTPUT_VARIABLE varMatlab)
+  #message("Matlabs = ${varMatlab} | ${resultMatlab}")
+
+
+  set(matlabs_from_registry)
+  if(${resultMatlab} EQUAL 0)
+
+    string(
+      REGEX MATCHALL "MATLAB\\\\([0-9]+(\\.[0-9]+)?)"
+      matlab_versions_regex ${varMatlab})
+
+    foreach(match IN LISTS matlab_versions_regex)
+      string(
+        REGEX MATCH "MATLAB\\\\(([0-9]+)(\\.([0-9]+))?)"
+        current_match ${match})
+
+      set(_matlab_current_version ${CMAKE_MATCH_1})
+      set(current_matlab_version_major ${CMAKE_MATCH_2})
+      set(current_matlab_version_minor ${CMAKE_MATCH_4})
+      if(NOT current_matlab_version_minor)
+        set(current_matlab_version_minor "0")
       endif()
+
+      list(APPEND matlabs_from_registry ${_matlab_current_version})
+      unset(_matlab_current_version)
+    endforeach(match)
+
+  endif()
+
+  set(${matlab_versions} ${matlabs_from_registry} PARENT_SCOPE)
+
+endfunction()
+
+
+
+# (internal)
+macro(extract_matlab_versions_from_registry_brute_force matlab_versions)
+  # get the supported versions
+  set(matlab_supported_versions)
+  matlab_get_supported_versions(matlab_supported_versions)
+
+
+  # this is a manual population of the versions we want to look for
+  # this can be done as is, but preferably with the call to
+  # matlab_get_supported_versions and variable
+
+  # populating the versions we want to look for
+  # set(matlab_supported_versions)
+
+  # # Matlab 7
+  # set(matlab_major 7)
+  # foreach(current_matlab_minor RANGE 4 20)
+    # list(APPEND matlab_supported_versions "${matlab_major}.${current_matlab_minor}")
+  # endforeach(current_matlab_minor)
+
+  # # Matlab 8
+  # set(matlab_major 8)
+  # foreach(current_matlab_minor RANGE 0 5)
+    # list(APPEND matlab_supported_versions "${matlab_major}.${current_matlab_minor}")
+  # endforeach(current_matlab_minor)
+
+  # # taking into account the possible additional versions provided by the user
+  # if(DEFINED MATLAB_ADDITIONAL_VERSIONS)
+    # list(APPEND matlab_supported_versions MATLAB_ADDITIONAL_VERSIONS)
+  # endif()
+
+
+  # we order from more recent to older
+  list(REMOVE_DUPLICATES matlab_supported_versions)
+  list(SORT matlab_supported_versions)
+  list(REVERSE matlab_supported_versions)
+
+
+  set(${matlab_versions} ${matlab_supported_versions})
+
+
+endmacro()
+
+
+
+
+#.rst:
+# .. command:: matlab_get_all_valid_matlab_roots_from_registry
+#
+#   Populates the Matlab root with valid versions of Matlab.
+#   The returned matlab_roots is organized in pairs
+#   ``(version_number,matlab_root_path)``.
+#
+#   ::
+#
+#     matlab_get_all_valid_matlab_roots_from_registry(
+#         matlab_versions
+#         matlab_roots)
+#
+#   ``matlab_versions``
+#     the versions of each of the Matlab installations
+#   ``matlab_roots``
+#     the location of each of the Matlab installations
+function(matlab_get_all_valid_matlab_roots_from_registry matlab_versions matlab_roots)
+
+  # The matlab_versions comes either from
+  # extract_matlab_versions_from_registry_brute_force or
+  # matlab_extract_all_installed_versions_from_registry.
+
+
+  set(_matlab_roots_list )
+  foreach(_matlab_current_version ${matlab_versions})
+    get_filename_component(
+      current_MATLAB_ROOT
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\${_matlab_current_version};MATLABROOT]"
+      ABSOLUTE)
+
+    if(EXISTS ${current_MATLAB_ROOT})
+      list(APPEND _matlab_roots_list ${_matlab_current_version} ${current_MATLAB_ROOT})
+    endif()
+
+  endforeach(_matlab_current_version)
+  unset(_matlab_current_version)
+  set(${matlab_roots} ${_matlab_roots_list} PARENT_SCOPE)
+  unset(_matlab_roots_list)
+endfunction()
+
+#.rst:
+# .. command:: matlab_get_mex_suffix
+#
+#   Returns the extension of the mex files (the suffixes).
+#   This function should not be called before the appropriate Matlab root has
+#   been found.
+#
+#   ::
+#
+#     matlab_get_mex_suffix(
+#         matlab_root
+#         mex_suffix)
+#
+#   ``matlab_root``
+#     the root of the Matlab installation
+#   ``mex_suffix``
+#     the variable name in which the suffix will be returned.
+function(matlab_get_mex_suffix matlab_root mex_suffix)
+
+  # todo setup the extension properly. Currently I do not know if this is
+  # sufficient for all win32 distributions.
+  # there is also CMAKE_EXECUTABLE_SUFFIX that could be tweaked
+  set(mexext_suffix "")
+  if(WIN32)
+    list(APPEND mexext_suffix ".bat")
+  endif()
+
+  # we first try without suffix, since cmake does not understand a list with
+  # one empty string element
+  find_program(
+    MATLAB_MEXEXTENSIONS_PROG
+    "mexext"
+    PATHS ${matlab_root}/bin
+    DOC "Matlab MEX extension provider"
+    NO_DEFAULT_PATH
+  )
+
+  foreach(current_mexext_suffix IN LISTS mexext_suffix)
+    if(NOT DEFINED MATLAB_MEXEXTENSIONS_PROG OR NOT MATLAB_MEXEXTENSIONS_PROG)
+      # this call should populate the cache automatically
+      find_program(
+        MATLAB_MEXEXTENSIONS_PROG
+        "mexext${current_mexext_suffix}"
+        PATHS ${matlab_root}/bin
+        DOC "Matlab MEX extension provider"
+        NO_DEFAULT_PATH
+      )
+    endif()
+  endforeach(current_mexext_suffix)
+
+
+  # the program has been found?
+  if((NOT MATLAB_MEXEXTENSIONS_PROG) OR (NOT EXISTS ${MATLAB_MEXEXTENSIONS_PROG}))
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] Cannot found mexext program. Matlab root is ${matlab_root}")
+    endif()
+    return()
+  endif()
+
+  set(_matlab_mex_extension)
+
+
+  execute_process(
+    COMMAND ${MATLAB_MEXEXTENSIONS_PROG}
+    OUTPUT_VARIABLE _matlab_mex_extension)
+  string(STRIP ${_matlab_mex_extension} _matlab_mex_extension)
+
+  set(${mex_suffix} ${_matlab_mex_extension} PARENT_SCOPE)
+endfunction()
+
+
+
+
+#.rst:
+# .. command:: matlab_get_version_from_matlab_run
+#
+#   This function runs Matlab program specified on arguments and extracts its
+#   version.
+#
+#   ::
+#
+#     matlab_get_version_from_matlab_run(
+#         matlab_binary_path
+#         matlab_list_versions)
+#
+#   ``matlab_binary_path``
+#     the location of the `matlab` binary executable
+#   ``matlab_list_versions``
+#     the version extracted from Matlab
+function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_versions)
+
+  set(${matlab_list_versions} "" PARENT_SCOPE)
+
+
+  if(MATLAB_FIND_DEBUG)
+    message(STATUS "[MATLAB] Determining the version of Matlab from ${matlab_binary_program}")
+  endif()
+
+  if(EXISTS ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+    if(MATLAB_FIND_DEBUG)
+      message(STATUS "[MATLAB] Removing previous ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp file")
     endif()
+    file(REMOVE ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
   endif()
-  find_library(MATLAB_MEX_LIBRARY
-    libmex
-    ${MATLAB_ROOT}
+
+
+  # the log file is needed since on windows the command executes in a new
+  # window and it is not possible to get back the answer of Matlab
+  # the -wait command is needed on windows, otherwise the call returns
+  # immediately after the program launches itself.
+  if(WIN32)
+    set(_matlab_additional_commands "-wait")
+  endif()
+
+  # timeout set to 30 seconds, in case it does not start
+  # note as said before OUTPUT_VARIABLE cannot be used in a platform
+  # independent manner however, not setting it would flush the output of Matlab
+  # in the current console (unix variant)
+  execute_process(
+    COMMAND ${matlab_binary_program} -nosplash -nojvm ${_matlab_additional_commands} -logfile ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp -nodesktop -nodisplay -r "version, exit"
+    OUTPUT_VARIABLE _matlab_version_from_cmd_dummy
+    RESULT_VARIABLE _matlab_result_version_call
+    TIMEOUT 30
     )
-  find_library(MATLAB_MX_LIBRARY
-    libmx
-    ${MATLAB_ROOT}
+
+
+  if(${_matlab_result_version_call})
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] Unable to determine the version of Matlab. Matlab call returned with error ${_matlab_result_version_call}.")
+    endif()
+    return()
+  elseif(NOT EXISTS ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] Unable to determine the version of Matlab. The log file does not exist.")
+    endif()
+    return()
+  endif()
+
+  # if successful, read back the log
+  file(READ ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp _matlab_version_from_cmd)
+  file(REMOVE ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+
+  set(index -1)
+  string(FIND ${_matlab_version_from_cmd} "ans" index)
+  if(index EQUAL -1)
+
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] Cannot find the version of Matlab returned by the run.")
+    endif()
+
+  else()
+    set(matlab_list_of_all_versions_tmp)
+
+    string(SUBSTRING ${_matlab_version_from_cmd} ${index} -1 substring_ans)
+    string(
+      REGEX MATCHALL "ans[\r\n\t ]*=[\r\n\t ]*([0-9]+(\\.[0-9]+)?)"
+      matlab_versions_regex
+      ${substring_ans})
+    foreach(match IN LISTS matlab_versions_regex)
+      string(
+        REGEX MATCH "ans[\r\n\t ]*=[\r\n\t ]*(([0-9]+)(\\.([0-9]+))?)"
+        current_match ${match})
+
+      list(APPEND matlab_list_of_all_versions_tmp ${CMAKE_MATCH_1})
+    endforeach()
+    list(REMOVE_DUPLICATES matlab_list_of_all_versions_tmp)
+    set(${matlab_list_versions} ${matlab_list_of_all_versions_tmp} PARENT_SCOPE)
+
+  endif()
+
+endfunction()
+
+
+#.rst:
+# .. command:: matlab_add_unit_test
+#
+#   Adds a Matlab unit test to the test set of cmake/ctest.
+#   This command requires the component ``MAIN_PROGRAM``.
+#   The unit test uses the Matlab unittest framework (default, available
+#   starting Matlab 2013b+) except if the option ``NO_UNITTEST_FRAMEWORK``
+#   is given.
+#
+#   The function expects one Matlab test script file to be given.
+#   In the case ``NO_UNITTEST_FRAMEWORK`` is given, the unittest script file
+#   should contain the script to be run, plus an exit command with the exit
+#   value. This exit value will be passed to the ctest framework (0 success,
+#   non 0 failure). Additional arguments accepted by :command:`add_test` can be
+#   passed through ``TEST_ARGS`` (eg. ``CONFIGURATION <config> ...``).
+#
+#   ::
+#
+#     matlab_add_unit_test(
+#         NAME <name>
+#         UNITTEST_FILE matlab_file_containing_unittest.m
+#         [UNITTEST_PRECOMMAND matlab_command_to_run]
+#         [TIMEOUT timeout]
+#         [ADDITIONAL_PATH path1 [path2 ...]]
+#         [MATLAB_ADDITIONAL_STARTUP_OPTIONS option1 [option2 ...]]
+#         [TEST_ARGS arg1 [arg2 ...]]
+#         [NO_UNITTEST_FRAMEWORK]
+#         )
+#
+#   The function arguments are:
+#
+#   ``NAME``
+#     name of the unittest in ctest.
+#   ``UNITTEST_FILE``
+#     the matlab unittest file. Its path will be automatically
+#     added to the Matlab path.
+#   ``UNITTEST_PRECOMMAND``
+#     Matlab script command to be ran before the file
+#     containing the test (eg. GPU device initialisation based on CMake
+#     variables).
+#   ``TIMEOUT``
+#     the test timeout in seconds. Defaults to 180 seconds as the
+#     Matlab unit test may hang.
+#   ``ADDITIONAL_PATH``
+#     a list of paths to add to the Matlab path prior to
+#     running the unit test.
+#   ``MATLAB_ADDITIONAL_STARTUP_OPTIONS``
+#     a list of additional option in order
+#     to run Matlab from the command line.
+#   ``TEST_ARGS``
+#     Additional options provided to the add_test command. These
+#     options are added to the default options (eg. "CONFIGURATIONS Release")
+#   ``NO_UNITTEST_FRAMEWORK``
+#     when set, indicates that the test should not
+#     use the unittest framework of Matlab (available for versions >= R2013a).
+#
+function(matlab_add_unit_test)
+
+  if(NOT Matlab_MAIN_PROGRAM)
+    message(FATAL_ERROR "[MATLAB] This functionality needs the MAIN_PROGRAM component (not default)")
+  endif()
+
+  set(options NO_UNITTEST_FRAMEWORK)
+  set(oneValueArgs NAME UNITTEST_PRECOMMAND UNITTEST_FILE TIMEOUT)
+  set(multiValueArgs ADDITIONAL_PATH MATLAB_ADDITIONAL_STARTUP_OPTIONS TEST_ARGS)
+
+  set(prefix _matlab_unittest_prefix)
+  cmake_parse_arguments(${prefix} "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+
+  if(NOT ${prefix}_NAME)
+    message(FATAL_ERROR "[MATLAB] The Matlab test name cannot be empty")
+  endif()
+
+  add_test(NAME ${${prefix}_NAME}
+           COMMAND ${CMAKE_COMMAND}
+            -Dtest_name=${${prefix}_NAME}
+            -Dadditional_paths=${${prefix}_ADDITIONAL_PATH}
+            -Dtest_timeout=${${prefix}_TIMEOUT}
+            -Doutput_directory=${_matlab_temporary_folder}
+            -DMatlab_PROGRAM=${Matlab_MAIN_PROGRAM}
+            -Dno_unittest_framework=${${prefix}_NO_UNITTEST_FRAMEWORK}
+            -DMatlab_ADDITIONNAL_STARTUP_OPTIONS=${${prefix}_MATLAB_ADDITIONAL_STARTUP_OPTIONS}
+            -Dunittest_file_to_run=${${prefix}_UNITTEST_FILE}
+            -Dcmd_to_run_before_test=${${prefix}_UNITTEST_PRECOMMAND}
+            -P ${_FindMatlab_SELF_DIR}/MatlabTestsRedirect.cmake
+           ${${prefix}_TEST_ARGS}
+           ${${prefix}_UNPARSED_ARGUMENTS}
+           )
+endfunction()
+
+
+#.rst:
+# .. command:: matlab_add_mex
+#
+#   Adds a Matlab MEX target.
+#   This commands compiles the given sources with the current tool-chain in
+#   order to produce a MEX file. The final name of the produced output may be
+#   specified, as well as additional link libraries, and a documentation entry
+#   for the MEX file. Remaining arguments of the call are passed to the
+#   :command:`add_library` command.
+#
+#   ::
+#
+#      matlab_add_mex(
+#          NAME <name>
+#          SRC src1 [src2 ...]
+#          [OUTPUT_NAME output_name]
+#          [DOCUMENTATION file.txt]
+#          [LINK_TO target1 target2 ...]
+#          [...]
+#      )
+#
+#   ``NAME``
+#     name of the target.
+#   ``SRC``
+#     list of tje source files.
+#   ``LINK_TO``
+#     a list of additional link dependencies.  The target links to ``libmex``
+#     by default. If ``Matlab_MX_LIBRARY`` is defined, it also
+#     links to ``libmx``.
+#   ``OUTPUT_NAME``
+#     if given, overrides the default name. The default name is
+#     the name of the target without any prefix and
+#     with ``Matlab_MEX_EXTENSION`` suffix.
+#   ``DOCUMENTATION``
+#     if given, the file ``file.txt`` will be considered as
+#     being the documentation file for the MEX file. This file is copied into
+#     the same folder without any processing, with the same name as the final
+#     mex file, and with extension `.m`. In that case, typing ``help <name>``
+#     in Matlab prints the documentation contained in this file.
+#
+#   The documentation file is not processed and should be in the following
+#   format:
+#
+#   ::
+#
+#     % This is the documentation
+#     function ret = mex_target_output_name(input1)
+#
+function(matlab_add_mex )
+
+  if(NOT WIN32)
+    # we do not need all this on Windows
+    # pthread options
+    check_cxx_compiler_flag(-pthread                    HAS_MINUS_PTHREAD)
+    # we should use try_compile instead, the link flags are discarded from
+    # this compiler_flag function.
+    #check_cxx_compiler_flag(-Wl,--exclude-libs,ALL HAS_SYMBOL_HIDING_CAPABILITY)
+
+  endif()
+
+  set(oneValueArgs NAME DOCUMENTATION OUTPUT_NAME)
+  set(multiValueArgs LINK_TO SRC)
+
+  set(prefix _matlab_addmex_prefix)
+  cmake_parse_arguments(${prefix} "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+
+  if(NOT ${prefix}_NAME)
+    message(FATAL_ERROR "[MATLAB] The MEX target name cannot be empty")
+  endif()
+
+  if(NOT ${prefix}_OUTPUT_NAME)
+    set(${prefix}_OUTPUT_NAME ${${prefix}_NAME})
+  endif()
+
+  add_library(${${prefix}_NAME}
+    SHARED
+      ${${prefix}_SRC}
+      ${${prefix}_DOCUMENTATION}
+      ${${prefix}_UNPARSED_ARGUMENTS})
+  target_include_directories(${${prefix}_NAME} PRIVATE ${Matlab_INCLUDE_DIRS})
+
+  if(DEFINED Matlab_MX_LIBRARY)
+    target_link_libraries(${${prefix}_NAME} ${Matlab_MX_LIBRARY})
+  endif()
+
+  target_link_libraries(${${prefix}_NAME} ${Matlab_MEX_LIBRARY} ${${prefix}_LINK_TO})
+  set_target_properties(${${prefix}_NAME}
+      PROPERTIES
+        PREFIX ""
+        OUTPUT_NAME ${${prefix}_OUTPUT_NAME}
+        SUFFIX ".${Matlab_MEX_EXTENSION}")
+
+
+  # documentation
+  if(NOT ${${prefix}_DOCUMENTATION} STREQUAL "")
+    get_target_property(output_name ${${prefix}_NAME} OUTPUT_NAME)
+    add_custom_command(
+      TARGET ${${prefix}_NAME}
+      PRE_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${${prefix}_DOCUMENTATION} $<TARGET_FILE_DIR:${${prefix}_NAME}>/${output_name}.m
+      COMMENT "Copy ${${prefix}_NAME} documentation file into the output folder"
     )
-  find_library(MATLAB_ENG_LIBRARY
-    libeng
-    ${MATLAB_ROOT}
+  endif() # documentation
+
+  # entry point in the mex file + taking care of visibility and symbol clashes.
+  if(WIN32)
+    set_target_properties(${${prefix}_NAME}
+      PROPERTIES
+        DEFINE_SYMBOL "DLL_EXPORT_SYM=__declspec(dllexport)")
+  else()
+
+    if(HAS_MINUS_PTHREAD AND NOT APPLE)
+      # Apparently, compiling with -pthread generated the proper link flags
+      # and some defines at compilation
+      target_compile_options(${${prefix}_NAME} PRIVATE "-pthread")
+    endif()
+
+
+    # if we do not do that, the symbols linked from eg. boost remain weak and
+    # then clash with the ones defined in the matlab process. So by default
+    # the symbols are hidden.
+    # This also means that for shared libraries (like MEX), the entry point
+    # should be explicitly declared with default visibility, otherwise Matlab
+    # cannot find the entry point.
+    # Note that this is particularly meaningful if the MEX wrapper itself
+    # contains symbols that are clashing with Matlab (that are compiled in the
+    # MEX file). In order to propagate the visibility options to the libraries
+    # to which the MEX file is linked against, the -Wl,--exclude-libs,ALL
+    # option should also be specified.
+
+    set_target_properties(${${prefix}_NAME}
+      PROPERTIES
+        CXX_VISIBILITY_PRESET "hidden"
+        C_VISIBILITY_PRESET "hidden"
+        VISIBILITY_INLINES_HIDDEN "hidden"
     )
 
-  find_path(MATLAB_INCLUDE_DIR
-    "mex.h"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/include"
+    #  get_target_property(
+    #    _previous_link_flags
+    #    ${${prefix}_NAME}
+    #    LINK_FLAGS)
+    #  if(NOT _previous_link_flags)
+    #    set(_previous_link_flags)
+    #  endif()
+
+    #  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    #    set_target_properties(${${prefix}_NAME}
+    #      PROPERTIES
+    #        LINK_FLAGS "${_previous_link_flags} -Wl,--exclude-libs,ALL"
+    #        # -Wl,--version-script=${_FindMatlab_SELF_DIR}/MatlabLinuxVisibility.map"
+    #    )
+    #  elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    #    # in this case, all other symbols become hidden.
+    #    set_target_properties(${${prefix}_NAME}
+    #      PROPERTIES
+    #        LINK_FLAGS "${_previous_link_flags} -Wl,-exported_symbol,_mexFunction"
+    #        #-Wl,-exported_symbols_list,${_FindMatlab_SELF_DIR}/MatlabOSXVisilibity.map"
+    #    )
+    #  endif()
+
+
+
+    set_target_properties(${${prefix}_NAME}
+      PROPERTIES
+        DEFINE_SYMBOL "DLL_EXPORT_SYM=__attribute__ ((visibility (\"default\")))"
     )
+
+
+  endif()
+
+endfunction()
+
+
+
+
+
+
+
+
+# this variable will get all Matlab installations found in the current system.
+set(_matlab_possible_roots)
+
+
+# listing the Matlab versions installed on the WIN machine if MATLAB_USER_ROOT
+# is not set
+if(WIN32)
+
+  # for windows
+
+
+  if(NOT MATLAB_USER_ROOT)
+    # if MATLAB_USER_ROOT not specified, we look for Matlab installation in
+    # the registry
+    # if unsuccessful, we look for all known revision and filter the existing
+    # ones.
+
+    # testing if we are able to extract the needed information from the registry
+    set(matlab_versions_from_registry)
+    matlab_extract_all_installed_versions_from_registry(CMAKE_CL_64 matlab_versions_from_registry)
+
+    # the returned list is empty, doing the search on all known versions
+    if(NOT matlab_versions_from_registry)
+
+      if(MATLAB_FIND_DEBUG)
+        message(STATUS "[MATLAB] Search for Matlab from the registry unsuccessful, testing all supported versions")
+      endif()
+
+      extract_matlab_versions_from_registry_brute_force(matlab_versions_from_registry)
+    endif()
+
+    # filtering the results with the registry keys
+    matlab_get_all_valid_matlab_roots_from_registry(${matlab_versions_from_registry} _matlab_possible_roots)
+
+
+
+  elseif(NOT EXISTS ${MATLAB_USER_ROOT})
+
+    # if MATLAB_USER_ROOT specified but erroneous
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] the specified path for MATLAB_USER_ROOT does not exist (${MATLAB_USER_ROOT})")
+    endif()
+  else()
+    list(APPEND _matlab_possible_roots "NOTFOUND" ${MATLAB_USER_ROOT}) # empty version
+  endif()
+
+
 else()
-  if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-    # Regular x86
-    set(MATLAB_ROOT
-      /usr/local/matlab-7sp1/bin/glnx86/
-      /opt/matlab-7sp1/bin/glnx86/
-      $ENV{HOME}/matlab-7sp1/bin/glnx86/
-      $ENV{HOME}/redhat-matlab/bin/glnx86/
-      )
+  # for linux/osx
+
+  if(NOT MATLAB_USER_ROOT)
+
+    # if MATLAB_USER_ROOT not specified, we look for Matlab from the command
+    # line PATH
+    # maybe using CMAKE_PROGRAM_PATH to add some more hints
+    if(NOT Matlab_MAIN_PROGRAM)
+      # if we get there a second time and the folder matlab is created here,
+      # and then the find_program does not find it,
+      # the get_filename_component (... PROGRAM) finds this directory instead.
+    find_program(
+        Matlab_MAIN_PROGRAM
+      "matlab")
+    endif()
+
+    if(NOT Matlab_MAIN_PROGRAM)
+      #execute_process(COMMAND which matlab OUTPUT_VARIABLE _which_matlab
+      # RESULT_VARIABLE _which_matlab_result)
+      get_filename_component(Matlab_MAIN_PROGRAM "matlab" PROGRAM)
+
+      # "bug" of cmake: if we call get_filename_component with PROGRAM, it can
+      # return us a directory
+      if((NOT EXISTS ${Matlab_MAIN_PROGRAM}) OR (IS_DIRECTORY ${Matlab_MAIN_PROGRAM}))
+        execute_process(
+          COMMAND "which matlab"
+          OUTPUT_VARIABLE Matlab_MAIN_PROGRAM)
+      endif()
+
+      if(EXISTS ${Matlab_MAIN_PROGRAM})
+        get_filename_component(Matlab_MAIN_PROGRAM "${Matlab_MAIN_PROGRAM}" REALPATH)
+        get_filename_component(Matlab_MAIN_PROGRAM "${Matlab_MAIN_PROGRAM}" ABSOLUTE)
+        if(MATLAB_FIND_DEBUG)
+          message(STATUS "[MATLAB] matlab program result from the command line ${Matlab_MAIN_PROGRAM}")
+        endif()
+      else()
+        unset(Matlab_MAIN_PROGRAM)
+      endif()
+
+    endif()
+
+    if(Matlab_MAIN_PROGRAM AND EXISTS ${Matlab_MAIN_PROGRAM})
+      if(MATLAB_FIND_DEBUG)
+        message(STATUS "[MATLAB] found from the command line at ${Matlab_MAIN_PROGRAM}")
+      endif()
+
+      # resolve symlinks
+      get_filename_component(_matlab_current_location "${Matlab_MAIN_PROGRAM}" REALPATH)
+      if(${CMAKE_VERSION} VERSION_LESS "2.8.12")
+        set(_directory_alias PATH)
+      else()
+        set(_directory_alias DIRECTORY)
+      endif()
+      # get the directory (the command below has to be run twice)
+      get_filename_component(_matlab_current_location "${_matlab_current_location}" ${_directory_alias})
+      get_filename_component(_matlab_current_location "${_matlab_current_location}" ${_directory_alias}) # Matlab should be in bin
+      list(APPEND _matlab_possible_roots "NOTFOUND" ${_matlab_current_location}) # empty version
+    endif()
+
+    # on mac, we look for the /Application paths
+    # this corresponds to the behaviour on Windows. On Linux, we do not have
+    # any other guess.
+    if((NOT _matlab_possible_roots) AND APPLE)
+
+      matlab_get_supported_releases(_matlab_releases)
+      if(MATLAB_FIND_DEBUG)
+        message(STATUS "[MATLAB] Matlab supported versions ${_matlab_releases}. If more version should be supported "
+                     "the variable MATLAB_ADDITIONAL_VERSIONS can be set according to the documentation")
+      endif()
+
+      foreach(_matlab_current_release IN LISTS _matlab_releases)
+        set(_matlab_full_string "/Applications/MATLAB_${_matlab_current_release}.app")
+        if(EXISTS ${_matlab_full_string})
+          set(_matlab_current_version)
+          matlab_get_version_from_release_name(${_matlab_current_release} _matlab_current_version)
+          if(MATLAB_FIND_DEBUG)
+            message(STATUS "[MATLAB] Found version ${_matlab_current_release} (${_matlab_current_version}) in ${_matlab_full_string}")
+          endif()
+          list(APPEND _matlab_possible_roots ${_matlab_current_version})
+          list(APPEND _matlab_possible_roots ${_matlab_full_string})
+          unset(_matlab_current_version)
+        endif()
+
+        unset(_matlab_full_string)
+      endforeach(_matlab_current_release)
+      unset(_matlab_current_release)
+      unset(_matlab_releases)
+    endif()
+
+    # we need to clear Matlab_MAIN_PROGRAM here
+    unset(Matlab_MAIN_PROGRAM CACHE)
+    unset(Matlab_MAIN_PROGRAM)
+
+  elseif(NOT EXISTS ${MATLAB_USER_ROOT})
+    # if MATLAB_USER_ROOT specified but erroneous
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] the specified path for MATLAB_USER_ROOT does not exist (${MATLAB_USER_ROOT})")
+    endif()
   else()
-    # AMD64:
-    set(MATLAB_ROOT
-      /usr/local/matlab-7sp1/bin/glnxa64/
-      /opt/matlab-7sp1/bin/glnxa64/
-      $ENV{HOME}/matlab7_64/bin/glnxa64/
-      $ENV{HOME}/matlab-7sp1/bin/glnxa64/
-      $ENV{HOME}/redhat-matlab/bin/glnxa64/
-      )
+    list(APPEND _matlab_possible_roots "NOTFOUND" ${MATLAB_USER_ROOT}) # empty version
   endif()
-  find_library(MATLAB_MEX_LIBRARY
-    mex
-    ${MATLAB_ROOT}
-    )
-  find_library(MATLAB_MX_LIBRARY
-    mx
-    ${MATLAB_ROOT}
-    )
-  find_library(MATLAB_ENG_LIBRARY
-    eng
-    ${MATLAB_ROOT}
-    )
-  find_path(MATLAB_INCLUDE_DIR
-    "mex.h"
-    "/usr/local/matlab-7sp1/extern/include/"
-    "/opt/matlab-7sp1/extern/include/"
-    "$ENV{HOME}/matlab-7sp1/extern/include/"
-    "$ENV{HOME}/redhat-matlab/extern/include/"
+endif()
+
+
+if(MATLAB_FIND_DEBUG)
+  message(STATUS "[MATLAB] Matlab root folders are ${_matlab_possible_roots}")
+endif()
+
+
+
+if(DEFINED Matlab_ROOT_DIR)
+  unset(Matlab_ROOT_DIR)
+endif()
+
+# take the first possible Matlab root
+if(_matlab_possible_roots)
+  list(GET _matlab_possible_roots 0 Matlab_VERSION_STRING)
+  list(GET _matlab_possible_roots 1 Matlab_ROOT_DIR)
+  list(LENGTH _matlab_possible_roots numbers_of_matlab_roots)
+
+  # adding a warning in case of ambiguity
+  if(numbers_of_matlab_roots GREATER 2 AND MATLAB_FIND_DEBUG)
+    message(WARNING "[MATLAB] Found several distributions of Matlab. Setting the current version to ${Matlab_VERSION_STRING} (located ${Matlab_ROOT_DIR})."
+                    " If this is not the desired behaviour, provide the -DMATLAB_ROOT on the command line")
+  endif()
+endif()
+
+
+if((NOT (DEFINED Matlab_VERSION_STRING)) OR (NOT Matlab_VERSION_STRING))
+  set(Matlab_VERSION_STRING "NOTFOUND")
+endif()
+
+if(${Matlab_VERSION_STRING} STREQUAL "NOTFOUND")
+  if((NOT Matlab_MAIN_PROGRAM) OR (NOT EXISTS ${Matlab_MAIN_PROGRAM}))
+    if(MATLAB_FIND_DEBUG)
+      message(STATUS "[MATLAB] Unknown version, looking for Matlab under ${Matlab_ROOT_DIR}")
+    endif()
+    find_program(
+      Matlab_MAIN_PROGRAM
+      matlab
+      PATHS ${Matlab_ROOT_DIR} ${Matlab_ROOT_DIR}/bin
+      DOC "Matlab main program"
+      NO_DEFAULT_PATH
     )
 
+
+
+    if(Matlab_MAIN_PROGRAM)
+      set(matlab_list_of_all_versions)
+      matlab_get_version_from_matlab_run(${Matlab_MAIN_PROGRAM} matlab_list_of_all_versions)
+
+      list(GET matlab_list_of_all_versions 0 MATLAB_VERSION_tmp)
+
+      # set the version into the cache
+      set(Matlab_VERSION_STRING ${MATLAB_VERSION_tmp} CACHE STRING "Matlab version (automatically determined)")
+      list(LENGTH list_of_all_versions list_of_all_versions_length)
+      if((${list_of_all_versions_length} GREATER 1) AND MATLAB_FIND_DEBUG)
+        message(WARNING "[MATLAB] Found several versions, taking the first one (versions found ${list_of_all_versions})")
+      endif()
+    endif()
+  endif()
+endif()
+
+
+if(MATLAB_FIND_DEBUG)
+  message(STATUS "[MATLAB] Current version is ${Matlab_VERSION_STRING} located ${Matlab_ROOT_DIR}")
+endif()
+
+
+
+if(Matlab_ROOT_DIR)
+  file(TO_CMAKE_PATH ${Matlab_ROOT_DIR} Matlab_ROOT_DIR)
+endif()
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+  set(_matlab_64Build FALSE)
+else()
+  set(_matlab_64Build TRUE)
+endif()
+
+if(APPLE)
+  set(_matlab_bin_prefix "mac") # i should be for intel
+  set(_matlab_bin_suffix_32bits "i")
+  set(_matlab_bin_suffix_64bits "i64")
+elseif(UNIX)
+  set(_matlab_bin_prefix "gln")
+  set(_matlab_bin_suffix_32bits "x86")
+  set(_matlab_bin_suffix_64bits "xa64")
+else()
+  set(_matlab_bin_prefix "win")
+  set(_matlab_bin_suffix_32bits "32")
+  set(_matlab_bin_suffix_64bits "64")
+endif()
+
+
+
+set(MATLAB_INCLUDE_DIR_TO_LOOK ${Matlab_ROOT_DIR}/extern/include)
+if(_matlab_64Build)
+  set(_matlab_current_suffix ${_matlab_bin_suffix_64bits})
+else()
+  set(_matlab_current_suffix ${_matlab_bin_suffix_32bits})
+endif()
+
+set(Matlab_BINARIES_DIR
+    ${Matlab_ROOT_DIR}/bin/${_matlab_bin_prefix}${_matlab_current_suffix})
+set(Matlab_EXTERN_LIBRARY_DIR
+    ${Matlab_ROOT_DIR}/extern/lib/${_matlab_bin_prefix}${_matlab_current_suffix})
+
+if(WIN32)
+  set(_matlab_lib_dir_for_search ${Matlab_EXTERN_LIBRARY_DIR}/microsoft)
+  set(_matlab_lib_prefix_for_search "lib")
+else()
+  set(_matlab_lib_dir_for_search ${Matlab_BINARIES_DIR})
+  set(_matlab_lib_prefix_for_search "lib")
+endif()
+
+unset(_matlab_64Build)
+
+
+if(NOT DEFINED Matlab_MEX_EXTENSION)
+  set(_matlab_mex_extension "")
+  matlab_get_mex_suffix(${Matlab_ROOT_DIR} _matlab_mex_extension)
+
+  # This variable goes to the cache.
+  set(Matlab_MEX_EXTENSION ${_matlab_mex_extension} CACHE STRING "Extensions for the mex targets (automatically given by Matlab)")
+  unset(_matlab_mex_extension)
 endif()
 
-# This is common to UNIX and Win32:
-set(MATLAB_LIBRARIES
-  ${MATLAB_MEX_LIBRARY}
-  ${MATLAB_MX_LIBRARY}
-  ${MATLAB_ENG_LIBRARY}
-)
 
-if(MATLAB_INCLUDE_DIR AND MATLAB_LIBRARIES)
-  set(MATLAB_FOUND 1)
+if(MATLAB_FIND_DEBUG)
+  message(STATUS "[MATLAB] [DEBUG]_matlab_lib_prefix_for_search = ${_matlab_lib_prefix_for_search} | _matlab_lib_dir_for_search = ${_matlab_lib_dir_for_search}")
 endif()
 
-mark_as_advanced(
-  MATLAB_LIBRARIES
-  MATLAB_MEX_LIBRARY
-  MATLAB_MX_LIBRARY
-  MATLAB_ENG_LIBRARY
-  MATLAB_INCLUDE_DIR
-  MATLAB_FOUND
-  MATLAB_ROOT
+
+
+# internal
+# This small stub around find_library is to prevent any pollution of CMAKE_FIND_LIBRARY_PREFIXES in the global scope.
+# This is the function to be used below instead of the find_library directives.
+function(_Matlab_find_library _matlab_library_prefix)
+  set(CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES} ${_matlab_library_prefix})
+  find_library(${ARGN})
+endfunction()
+
+
+set(_matlab_required_variables)
+
+
+# the MEX library/header are required
+find_path(
+  Matlab_INCLUDE_DIRS
+  mex.h
+  PATHS ${MATLAB_INCLUDE_DIR_TO_LOOK}
+  NO_DEFAULT_PATH
+  )
+list(APPEND _matlab_required_variables Matlab_INCLUDE_DIRS)
+
+_Matlab_find_library(
+  ${_matlab_lib_prefix_for_search}
+  Matlab_MEX_LIBRARY
+  mex
+  PATHS ${_matlab_lib_dir_for_search}
+  NO_DEFAULT_PATH
 )
 
+
+list(APPEND _matlab_required_variables Matlab_MEX_LIBRARY)
+
+# the MEX extension is required
+list(APPEND _matlab_required_variables Matlab_MEX_EXTENSION)
+
+# the matlab root is required
+list(APPEND _matlab_required_variables Matlab_ROOT_DIR)
+
+
+# component Mex Compiler
+list(FIND Matlab_FIND_COMPONENTS MEX_COMPILER _matlab_find_mex_compiler)
+if(_matlab_find_mex_compiler GREATER -1)
+  find_program(
+    Matlab_MEX_COMPILER
+    "mex"
+    PATHS ${Matlab_BINARIES_DIR}
+    DOC "Matlab MEX compiler"
+    NO_DEFAULT_PATH
+  )
+
+  if(Matlab_MEX_COMPILER)
+    set(Matlab_MEX_COMPILER_FOUND TRUE)
+  endif()
+endif()
+unset(_matlab_find_mex_compiler)
+
+# component Matlab program
+list(FIND Matlab_FIND_COMPONENTS MAIN_PROGRAM _matlab_find_matlab_program)
+if(_matlab_find_matlab_program GREATER -1)
+  # todo cleanup with code above
+  if(NOT DEFINED Matlab_MAIN_PROGRAM)
+    find_program(
+      Matlab_MAIN_PROGRAM
+      matlab
+      PATHS ${Matlab_ROOT_DIR} ${Matlab_ROOT_DIR}/bin
+      DOC "Matlab main program"
+      NO_DEFAULT_PATH
+    )
+  endif()
+  if(Matlab_MAIN_PROGRAM)
+    set(Matlab_MAIN_PROGRAM_FOUND TRUE)
+  endif()
+
+endif()
+unset(_matlab_find_matlab_program)
+
+# Component MX library
+list(FIND Matlab_FIND_COMPONENTS MX_LIBRARY _matlab_find_mx)
+if(_matlab_find_mx GREATER -1)
+  _Matlab_find_library(
+    ${_matlab_lib_prefix_for_search}
+    Matlab_MX_LIBRARY
+    mx
+    PATHS ${_matlab_lib_dir_for_search}
+    NO_DEFAULT_PATH
+  )
+
+  if(Matlab_MX_LIBRARY)
+    set(Matlab_MX_LIBRARY_FOUND TRUE)
+  endif()
+endif()
+unset(_matlab_find_mx)
+
+
+# Component ENG library
+list(FIND Matlab_FIND_COMPONENTS ENG_LIBRARY _matlab_find_eng)
+if(_matlab_find_eng GREATER -1)
+  _Matlab_find_library(
+    ${_matlab_lib_prefix_for_search}
+    Matlab_ENG_LIBRARY
+    eng
+    PATHS ${_matlab_lib_dir_for_search}
+    NO_DEFAULT_PATH
+  )
+  if(Matlab_ENG_LIBRARY)
+    set(Matlab_ENG_LIBRARY_FOUND TRUE)
+  endif()
+endif()
+unset(_matlab_find_eng)
+
+
+
+
+
+unset(_matlab_lib_dir_for_search)
+
+
+set(Matlab_LIBRARIES ${Matlab_MEX_LIBRARY} ${Matlab_MX_LIBRARY} ${Matlab_ENG_LIBRARY})
+
+if(CMAKE_VERSION VERSION_LESS "2.8.11")
+  find_package_handle_standard_args(
+    Matlab
+    REQUIRED_VARS ${_matlab_required_variables}
+    VERSION_VAR Matlab_VERSION_STRING)
+else()
+  find_package_handle_standard_args(
+    Matlab
+    FOUND_VAR Matlab_FOUND
+    REQUIRED_VARS ${_matlab_required_variables} #MATLAB_REQUIRED_PROGRAMS MATLAB_REQUIRED_LIBRARIES MATLAB_REQUIRED_INCLUDE_DIRS
+    VERSION_VAR Matlab_VERSION_STRING
+    HANDLE_COMPONENTS)
+endif()
+
+unset(_matlab_required_variables)
+unset(_matlab_bin_prefix)
+unset(_matlab_bin_suffix_32bits)
+unset(_matlab_bin_suffix_64bits)
+unset(_matlab_current_suffix)
+unset(_matlab_lib_dir_for_search)
+unset(_matlab_lib_prefix_for_search)
+
+if(Matlab_INCLUDE_DIRS AND Matlab_LIBRARIES)
+  mark_as_advanced(
+    Matlab_LIBRARIES
+    Matlab_MEX_LIBRARY
+    Matlab_MX_LIBRARY
+    Matlab_ENG_LIBRARY
+    Matlab_INCLUDE_DIRS
+    Matlab_FOUND
+    MATLAB_USER_ROOT
+    Matlab_ROOT_DIR
+    Matlab_VERSION_STRING
+    Matlab_MAIN_PROGRAM
+    Matlab_MEX_EXTENSION
+    Matlab_BINARIES_DIR
+  )
+endif()
diff --git a/Modules/MatlabTestsRedirect.cmake b/Modules/MatlabTestsRedirect.cmake
new file mode 100644
index 0000000..29a8bfa
--- /dev/null
+++ b/Modules/MatlabTestsRedirect.cmake
@@ -0,0 +1,80 @@
+#=============================================================================
+# Copyright 2014-2015 Raffi Enficiaud, Max Planck Society
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+
+# Usage: cmake
+#   -Dtest_timeout=180
+#   -Dworking_directory="."
+#   -Doutput_directory=
+#   -Dadditional_paths=""
+#   -Dno_unittest_framework=""
+#   -DMatlab_PROGRAM=matlab_exe_location
+#   -DMatlab_ADDITIONNAL_STARTUP_OPTIONS=""
+#   -Dtest_name=name_of_the_test
+#   -Dcmd_to_run_before_test=""
+#   -Dunittest_file_to_run
+#   -P FindMatlab_TestsRedirect.cmake
+
+set(Matlab_UNIT_TESTS_CMD -nosplash -nojvm -nodesktop -nodisplay ${Matlab_ADDITIONNAL_STARTUP_OPTIONS})
+if(WIN32)
+  set(Matlab_UNIT_TESTS_CMD ${Matlab_UNIT_TESTS_CMD} -wait)
+endif()
+
+if(NOT test_timeout)
+  set(test_timeout 180)
+endif()
+
+if(NOT cmd_to_run_before_test)
+  set(cmd_to_run_before_test)
+endif()
+
+get_filename_component(unittest_file_directory   "${unittest_file_to_run}" DIRECTORY)
+get_filename_component(unittest_file_to_run_name "${unittest_file_to_run}" NAME_WE)
+
+set(concat_string '${unittest_file_directory}')
+foreach(s IN LISTS additional_paths)
+  if(NOT "${s}" STREQUAL "")
+    set(concat_string "${concat_string}, '${s}'")
+  endif()
+endforeach()
+
+set(unittest_to_run "runtests('${unittest_file_to_run_name}'), exit(max([ans(1,:).Failed]))")
+if(no_unittest_framework)
+  set(unittest_to_run "try, ${unittest_file_to_run_name}, catch err, disp('An exception has been thrown during the execution'), disp(err), disp(err.stack), exit(1), end, exit(0)")
+endif()
+
+set(Matlab_SCRIPT_TO_RUN
+    "addpath(${concat_string}), path, ${cmd_to_run_before_test}, ${unittest_to_run}"
+   )
+
+set(Matlab_LOG_FILE ${output_directory}/${test_name}.log)
+
+execute_process(
+  COMMAND ${Matlab_PROGRAM} ${Matlab_UNIT_TESTS_CMD} -logfile ${Matlab_LOG_FILE} -r ${Matlab_SCRIPT_TO_RUN}
+  RESULT_VARIABLE res
+  TIMEOUT ${test_timeout}
+  OUTPUT_QUIET # we do not want the output twice
+  )
+
+if(NOT EXISTS ${Matlab_LOG_FILE})
+  message( FATAL_ERROR "[MATLAB] ERROR: cannot find the log file ${Matlab_LOG_FILE}")
+endif()
+
+# print the output in any case.
+file(READ ${Matlab_LOG_FILE} matlab_log_content)
+message("Matlab test ${name_of_the_test} output:\n${matlab_log_content}") # if we put FATAL_ERROR here, the file is indented.
+
+
+if(NOT (res EQUAL 0))
+  message( FATAL_ERROR "[MATLAB] TEST FAILED" )
+endif()
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7e7aa2e..5c7e7af 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1251,6 +1251,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     add_subdirectory(FindJsonCpp)
   endif()
 
+  # Matlab module
+  if(CMake_TEST_FindMatlab)
+    ADD_TEST_MACRO(FindMatlab.basic_checks      ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>)
+    ADD_TEST_MACRO(FindMatlab.versions_checks   ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>)
+  endif()
+
   find_package(GTK2 QUIET)
   if(GTK2_FOUND)
     add_subdirectory(FindGTK2)
diff --git a/Tests/FindMatlab/basic_checks/CMakeLists.txt b/Tests/FindMatlab/basic_checks/CMakeLists.txt
new file mode 100644
index 0000000..acf71ea
--- /dev/null
+++ b/Tests/FindMatlab/basic_checks/CMakeLists.txt
@@ -0,0 +1,57 @@
+
+cmake_minimum_required (VERSION 2.8.12)
+enable_testing()
+project(basic_checks)
+
+set(MATLAB_FIND_DEBUG TRUE)
+
+# the success of the following command is dependent on the current configuration:
+# - on 32bits builds (cmake is building with 32 bits), it looks for 32 bits Matlab
+# - on 64bits builds (cmake is building with 64 bits), it looks for 64 bits Matlab
+find_package(Matlab REQUIRED COMPONENTS MX_LIBRARY MAIN_PROGRAM)
+
+
+
+matlab_add_mex(
+    # target name
+    NAME cmake_matlab_test_wrapper1
+    # output name
+    OUTPUT_NAME cmake_matlab_mex1
+    SRC ${CMAKE_CURRENT_SOURCE_DIR}/../matlab_wrapper1.cpp
+    DOCUMENTATION ${CMAKE_CURRENT_SOURCE_DIR}/../help_text1.m.txt
+  )
+
+
+matlab_add_unit_test(
+    NAME ${PROJECT_NAME}_matlabtest-1
+    TIMEOUT 30
+    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests1.m
+    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+    )
+
+matlab_add_unit_test(
+    NAME ${PROJECT_NAME}_matlabtest-2
+    TIMEOUT 15
+    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests_timeout.m
+    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+    )
+set_tests_properties(${PROJECT_NAME}_matlabtest-2 PROPERTIES WILL_FAIL TRUE)
+
+
+# testing the test without the unittest framework of Matlab
+matlab_add_unit_test(
+    NAME ${PROJECT_NAME}_matlabtest-3
+    TIMEOUT 30
+    NO_UNITTEST_FRAMEWORK
+    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests2.m
+    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+    )
+
+matlab_add_unit_test(
+    NAME ${PROJECT_NAME}_matlabtest-4
+    TIMEOUT 30
+    NO_UNITTEST_FRAMEWORK
+    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests3.m
+    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+    )
+set_tests_properties(${PROJECT_NAME}_matlabtest-4 PROPERTIES WILL_FAIL TRUE)
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests1.m b/Tests/FindMatlab/cmake_matlab_unit_tests1.m
new file mode 100644
index 0000000..2371c3a
--- /dev/null
+++ b/Tests/FindMatlab/cmake_matlab_unit_tests1.m
@@ -0,0 +1,33 @@
+
+classdef cmake_matlab_unit_tests1 < matlab.unittest.TestCase
+  % some simple unit test for CMake Matlab wrapper
+  properties
+  end
+
+  methods (Test)
+    function testDummyCall(testCase)
+      % very simple call test
+      cmake_matlab_mex1(rand(3,3));
+    end
+
+    function testDummyCall2(testCase)
+      % very simple call test 2
+      ret = cmake_matlab_mex1(rand(3,3));
+      testCase.verifyEqual(size(ret), size(rand(3,3)));
+
+      testCase.verifyEqual(size(cmake_matlab_mex1(rand(4,3))), [4,3] );
+    end
+
+    function testFailTest(testCase)
+      testCase.verifyError(@() cmake_matlab_mex1(10), 'cmake_matlab:configuration');
+      testCase.verifyError(@() cmake_matlab_mex1([10]), 'cmake_matlab:configuration');
+    end
+
+    function testHelpContent(testCase)
+      % testing the help feature
+      testCase.verifySubstring(evalc('help cmake_matlab_mex1'), 'Dummy matlab extension in cmake');
+    end
+
+
+  end
+end
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests2.m b/Tests/FindMatlab/cmake_matlab_unit_tests2.m
new file mode 100644
index 0000000..7a8a342
--- /dev/null
+++ b/Tests/FindMatlab/cmake_matlab_unit_tests2.m
@@ -0,0 +1,6 @@
+
+ret = cmake_matlab_mex1(rand(3,3));
+
+if(size(ret) ~= size(rand(3,3)))
+  error('Dimension mismatch!');
+end
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests3.m b/Tests/FindMatlab/cmake_matlab_unit_tests3.m
new file mode 100644
index 0000000..2639325
--- /dev/null
+++ b/Tests/FindMatlab/cmake_matlab_unit_tests3.m
@@ -0,0 +1,5 @@
+
+cmake_matlab_mex1(10);
+
+% should not reach this point
+exit(0);
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m b/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
new file mode 100644
index 0000000..66be1bb
--- /dev/null
+++ b/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
@@ -0,0 +1,15 @@
+
+classdef cmake_matlab_unit_tests_timeout < matlab.unittest.TestCase
+  % timeout tests
+
+  properties
+  end
+
+  methods (Test)
+    function testCallHangsShouldBeTimedOut(testCase)
+      cmake_matlab_mex1(rand(3,3));
+      disp('Will now wait.');
+      input('Testing the cmake Matlab package timeout - do not press anything');
+    end
+  end
+end
diff --git a/Tests/FindMatlab/help_text1.m.txt b/Tests/FindMatlab/help_text1.m.txt
new file mode 100644
index 0000000..a924355
--- /dev/null
+++ b/Tests/FindMatlab/help_text1.m.txt
@@ -0,0 +1,2 @@
+% Dummy matlab extension in cmake
+function ret = cmake_matlab_mex1(X)
diff --git a/Tests/FindMatlab/matlab_wrapper1.cpp b/Tests/FindMatlab/matlab_wrapper1.cpp
new file mode 100644
index 0000000..4149bb9
--- /dev/null
+++ b/Tests/FindMatlab/matlab_wrapper1.cpp
@@ -0,0 +1,26 @@
+
+// simple workaround to some compiler specific problems
+// see http://stackoverflow.com/questions/22367516/mex-compile-error-unknown-type-name-char16-t/23281916#23281916
+#include <algorithm>
+
+#include "mex.h"
+
+// this test should return a matrix of 10 x 10 and should check some of the arguments
+
+void mexFunction(const int nlhs, mxArray *plhs[], const int nrhs, const mxArray *prhs[])
+{
+  if(nrhs != 1)
+  {
+    mexErrMsgTxt("Incorrect arguments");
+  }
+
+  size_t dim1 = mxGetM(prhs[0]);
+  size_t dim2 = mxGetN(prhs[0]);
+
+  if(dim1 == 1 || dim2 == 1)
+  {
+    mexErrMsgIdAndTxt("cmake_matlab:configuration", "Incorrect arguments");
+  }
+
+  plhs[0] = mxCreateNumericMatrix(dim1, dim2, mxGetClassID(prhs[0]), mxREAL);
+}
diff --git a/Tests/FindMatlab/versions_checks/CMakeLists.txt b/Tests/FindMatlab/versions_checks/CMakeLists.txt
new file mode 100644
index 0000000..5d20685
--- /dev/null
+++ b/Tests/FindMatlab/versions_checks/CMakeLists.txt
@@ -0,0 +1,52 @@
+
+cmake_minimum_required (VERSION 2.8.12)
+enable_testing()
+project(versions_checks)
+
+set(MATLAB_FIND_DEBUG TRUE)
+set(MATLAB_ADDITIONAL_VERSIONS
+    "dummy=14.9")
+
+# the success of the following command is dependent on the current configuration
+# in this case, we are only interested in the version macros
+find_package(Matlab)
+
+
+
+if(NOT COMMAND matlab_get_version_from_release_name)
+  message(FATAL_ERROR "The macro matlab_get_version_from_release_name should be defined")
+endif()
+
+if(NOT COMMAND matlab_get_release_name_from_version)
+  message(FATAL_ERROR "The macro matlab_get_release_name_from_version should be defined")
+endif()
+
+
+# matlab_get_release_name_from_version
+matlab_get_release_name_from_version("7.13" release_name)
+if(NOT release_name STREQUAL "R2011b")
+  message(FATAL_ERROR "version 7.13 does not give release R2011b : '${release_name}' != R2011b")
+endif()
+
+matlab_get_release_name_from_version("14.9" release_name)
+if(NOT release_name STREQUAL "dummy")
+  message(FATAL_ERROR "version 14.9 does not give release dummy : '${release_name}' != dummy")
+endif()
+
+matlab_get_release_name_from_version("14.10" release_name)
+if(NOT release_name STREQUAL "")
+  message(FATAL_ERROR "version 14.10 does not give empty release: '${release_name}' != ''")
+endif()
+
+
+# matlab_get_version_from_release_name
+matlab_get_version_from_release_name("R2011a" version)
+if(NOT version STREQUAL "7.12")
+  message(FATAL_ERROR "Release R2011a does not give version 7.12 : '${version}' != 7.12")
+endif()
+
+matlab_get_version_from_release_name("dummy" version)
+#message(FATAL_ERROR "versionversion = ${version}")
+if(NOT version STREQUAL "14.9")
+  message(FATAL_ERROR "Release dummy does not give version 14.9 : '${version}' != 14.9")
+endif()
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 2de82a7..8e4aaec 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -198,3 +198,8 @@ add_RunCMake_test(IfacePaths_SOURCES TEST_DIR IfacePaths)
 if(RPMBUILD)
   add_RunCMake_test(CPackRPM)
 endif()
+
+# Matlab module related tests
+if(CMake_TEST_FindMatlab)
+  add_RunCMake_test(FindMatlab)
+endif()
diff --git a/Tests/RunCMake/FindMatlab/CMakeLists.txt b/Tests/RunCMake/FindMatlab/CMakeLists.txt
new file mode 100644
index 0000000..1b9a957
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/CMakeLists.txt
@@ -0,0 +1,3 @@
+
+cmake_minimum_required(VERSION 2.8.12)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt b/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt b/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
new file mode 100644
index 0000000..95a787f
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*FindMatlab.cmake:[0-9]+ \(message\):
+  \[MATLAB\] This functionality needs the MAIN_PROGRAM component \(not default\)
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1.cmake b/Tests/RunCMake/FindMatlab/MatlabTest1.cmake
new file mode 100644
index 0000000..1cbc1c2
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/MatlabTest1.cmake
@@ -0,0 +1,22 @@
+
+cmake_minimum_required (VERSION 2.8.12)
+enable_testing()
+project(test_should_fail)
+
+find_package(Matlab REQUIRED COMPONENTS MX_LIBRARY)
+
+matlab_add_mex(
+    # target name
+    NAME cmake_matlab_test_wrapper1
+    # output name
+    OUTPUT_NAME cmake_matlab_mex1
+    SRC ${CMAKE_CURRENT_SOURCE_DIR}/matlab_wrapper1.cpp
+  )
+
+# this command should raise a FATAL_ERROR, component MAIN_PROGRAM is missing
+matlab_add_unit_test(
+    NAME ${PROJECT_NAME}_matlabtest-1
+    TIMEOUT 1
+    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake_matlab_unit_tests2.m
+    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+    )
diff --git a/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake b/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
new file mode 100644
index 0000000..33dbb77
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+
+include(RunCMake)
+run_cmake(MatlabTest1)
diff --git a/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m b/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
new file mode 100644
index 0000000..7a8a342
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
@@ -0,0 +1,6 @@
+
+ret = cmake_matlab_mex1(rand(3,3));
+
+if(size(ret) ~= size(rand(3,3)))
+  error('Dimension mismatch!');
+end
diff --git a/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp b/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp
new file mode 100644
index 0000000..4149bb9
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp
@@ -0,0 +1,26 @@
+
+// simple workaround to some compiler specific problems
+// see http://stackoverflow.com/questions/22367516/mex-compile-error-unknown-type-name-char16-t/23281916#23281916
+#include <algorithm>
+
+#include "mex.h"
+
+// this test should return a matrix of 10 x 10 and should check some of the arguments
+
+void mexFunction(const int nlhs, mxArray *plhs[], const int nrhs, const mxArray *prhs[])
+{
+  if(nrhs != 1)
+  {
+    mexErrMsgTxt("Incorrect arguments");
+  }
+
+  size_t dim1 = mxGetM(prhs[0]);
+  size_t dim2 = mxGetN(prhs[0]);
+
+  if(dim1 == 1 || dim2 == 1)
+  {
+    mexErrMsgIdAndTxt("cmake_matlab:configuration", "Incorrect arguments");
+  }
+
+  plhs[0] = mxCreateNumericMatrix(dim1, dim2, mxGetClassID(prhs[0]), mxREAL);
+}

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

Summary of changes:
 Help/release/dev/FindMatlab-rewrite.rst            |    7 +
 Modules/FindMatlab.cmake                           | 1423 ++++++++++++++++++--
 Modules/MatlabTestsRedirect.cmake                  |   80 ++
 Tests/CMakeLists.txt                               |    6 +
 Tests/FindMatlab/basic_checks/CMakeLists.txt       |   57 +
 Tests/FindMatlab/cmake_matlab_unit_tests1.m        |   33 +
 Tests/FindMatlab/cmake_matlab_unit_tests2.m        |    6 +
 Tests/FindMatlab/cmake_matlab_unit_tests3.m        |    5 +
 Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m |   15 +
 Tests/FindMatlab/help_text1.m.txt                  |    2 +
 Tests/FindMatlab/matlab_wrapper1.cpp               |   26 +
 Tests/FindMatlab/versions_checks/CMakeLists.txt    |   52 +
 Tests/RunCMake/CMakeLists.txt                      |    5 +
 .../{CMP0038 => FindMatlab}/CMakeLists.txt         |    2 +-
 .../MatlabTest1-result.txt}                        |    0
 Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt   |    2 +
 Tests/RunCMake/FindMatlab/MatlabTest1.cmake        |   22 +
 Tests/RunCMake/FindMatlab/RunCMakeTest.cmake       |    3 +
 .../RunCMake/FindMatlab/cmake_matlab_unit_tests2.m |    6 +
 Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp      |   26 +
 20 files changed, 1690 insertions(+), 88 deletions(-)
 create mode 100644 Help/release/dev/FindMatlab-rewrite.rst
 create mode 100644 Modules/MatlabTestsRedirect.cmake
 create mode 100644 Tests/FindMatlab/basic_checks/CMakeLists.txt
 create mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests1.m
 create mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests2.m
 create mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests3.m
 create mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
 create mode 100644 Tests/FindMatlab/help_text1.m.txt
 create mode 100644 Tests/FindMatlab/matlab_wrapper1.cpp
 create mode 100644 Tests/FindMatlab/versions_checks/CMakeLists.txt
 copy Tests/RunCMake/{CMP0038 => FindMatlab}/CMakeLists.txt (70%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => FindMatlab/MatlabTest1-result.txt} (100%)
 create mode 100644 Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
 create mode 100644 Tests/RunCMake/FindMatlab/MatlabTest1.cmake
 create mode 100644 Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
 create mode 100644 Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 13 10:55:02 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Feb 2015 10:55:02 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.3-1349-gd922c38
Message-ID: <20150213155502.2A730AAF6C@public.kitware.com>

This is an automated email from 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  d922c38efd6f1dfc0ab877e1993145a9a42fba79 (commit)
       via  5e91eb438847eae47b807528ef694e8e7d868195 (commit)
       via  ba3057efee7bd1ea37fb70d9e57b0c5be36c24d7 (commit)
      from  1e8cab716d3bc5971daf5360e67b12728f34afa2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d922c38efd6f1dfc0ab877e1993145a9a42fba79
commit d922c38efd6f1dfc0ab877e1993145a9a42fba79
Merge: 1e8cab7 5e91eb4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 10:55:01 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 13 10:55:01 2015 -0500

    Merge topic 'FindMatlab-rewrite' into next
    
    5e91eb43 FindMatlab: Quote variable references in macro calls
    ba3057ef FindMatlab: Fix ModuleNotices test for MatlabTestsRedirect


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e91eb438847eae47b807528ef694e8e7d868195
commit 5e91eb438847eae47b807528ef694e8e7d868195
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 10:54:10 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 13 10:54:48 2015 -0500

    FindMatlab: Quote variable references in macro calls
    
    Make sure they are treated as exactly one argument to the macro.

diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index a821826..7b78886 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -967,7 +967,7 @@ if(WIN32)
     endif()
 
     # filtering the results with the registry keys
-    matlab_get_all_valid_matlab_roots_from_registry(${matlab_versions_from_registry} _matlab_possible_roots)
+    matlab_get_all_valid_matlab_roots_from_registry("${matlab_versions_from_registry}" _matlab_possible_roots)
 
 
 
@@ -1057,7 +1057,7 @@ else()
         set(_matlab_full_string "/Applications/MATLAB_${_matlab_current_release}.app")
         if(EXISTS ${_matlab_full_string})
           set(_matlab_current_version)
-          matlab_get_version_from_release_name(${_matlab_current_release} _matlab_current_version)
+          matlab_get_version_from_release_name("${_matlab_current_release}" _matlab_current_version)
           if(MATLAB_FIND_DEBUG)
             message(STATUS "[MATLAB] Found version ${_matlab_current_release} (${_matlab_current_version}) in ${_matlab_full_string}")
           endif()
@@ -1132,7 +1132,7 @@ if(${Matlab_VERSION_STRING} STREQUAL "NOTFOUND")
 
     if(Matlab_MAIN_PROGRAM)
       set(matlab_list_of_all_versions)
-      matlab_get_version_from_matlab_run(${Matlab_MAIN_PROGRAM} matlab_list_of_all_versions)
+      matlab_get_version_from_matlab_run("${Matlab_MAIN_PROGRAM}" matlab_list_of_all_versions)
 
       list(GET matlab_list_of_all_versions 0 MATLAB_VERSION_tmp)
 
@@ -1204,7 +1204,7 @@ unset(_matlab_64Build)
 
 if(NOT DEFINED Matlab_MEX_EXTENSION)
   set(_matlab_mex_extension "")
-  matlab_get_mex_suffix(${Matlab_ROOT_DIR} _matlab_mex_extension)
+  matlab_get_mex_suffix("${Matlab_ROOT_DIR}" _matlab_mex_extension)
 
   # This variable goes to the cache.
   set(Matlab_MEX_EXTENSION ${_matlab_mex_extension} CACHE STRING "Extensions for the mex targets (automatically given by Matlab)")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba3057efee7bd1ea37fb70d9e57b0c5be36c24d7
commit ba3057efee7bd1ea37fb70d9e57b0c5be36c24d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 10:49:39 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 13 10:54:45 2015 -0500

    FindMatlab: Fix ModuleNotices test for MatlabTestsRedirect
    
    Add a note that the module is undocumented.

diff --git a/Modules/MatlabTestsRedirect.cmake b/Modules/MatlabTestsRedirect.cmake
index 29a8bfa..46d1ef8 100644
--- a/Modules/MatlabTestsRedirect.cmake
+++ b/Modules/MatlabTestsRedirect.cmake
@@ -1,3 +1,6 @@
+# This is an undocumented internal helper for the FindMatlab
+# module ``matlab_add_unit_test`` command.
+
 #=============================================================================
 # Copyright 2014-2015 Raffi Enficiaud, Max Planck Society
 #

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

Summary of changes:
 Modules/FindMatlab.cmake          |    8 ++++----
 Modules/MatlabTestsRedirect.cmake |    3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 13 11:03:00 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Feb 2015 11:03:00 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.3-1154-gcc90fd5
Message-ID: <20150213160300.3245AAB18D@public.kitware.com>

This is an automated email from 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  cc90fd58eca493151010b81914f4c9cfafae145c (commit)
       via  bf8f9c29e745933d5732f4481669c38ba8bdc3fc (commit)
      from  8d38ff05e2db3f3bd907f5a3c279fd116010e775 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc90fd58eca493151010b81914f4c9cfafae145c
commit cc90fd58eca493151010b81914f4c9cfafae145c
Merge: 8d38ff0 bf8f9c2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 11:02:58 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 13 11:02:58 2015 -0500

    Merge topic 'xcode-attribute-genex'
    
    bf8f9c29 Xcode: Teach XCODE_ATTRIBUTE target properties about generator expressions


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

Summary of changes:
 Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst                  |    6 ++++++
 Help/release/dev/xcode-attribute-genex.rst                      |    5 +++++
 Source/cmGlobalXCodeGenerator.cxx                               |    5 ++++-
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake                  |    2 ++
 Tests/RunCMake/XcodeProject/XcodeAttributeGenex-check.cmake     |    7 +++++++
 Tests/RunCMake/XcodeProject/XcodeAttributeGenex.cmake           |    4 ++++
 .../XcodeAttributeGenexError-result.txt}                        |    0
 .../XcodeAttributeGenexError-stderr.txt}                        |    0
 Tests/RunCMake/XcodeProject/XcodeAttributeGenexError.cmake      |    4 ++++
 9 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/xcode-attribute-genex.rst
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeAttributeGenex-check.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeAttributeGenex.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => XcodeProject/XcodeAttributeGenexError-result.txt} (100%)
 copy Tests/RunCMake/{install/TARGETS-DESTINATION-bad-stderr.txt => XcodeProject/XcodeAttributeGenexError-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeAttributeGenexError.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 13 11:03:02 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Feb 2015 11:03:02 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.3-1158-gd661618
Message-ID: <20150213160302.4C708AB18C@public.kitware.com>

This is an automated email from 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  d6616181c86770f7dc36343a5bacfafe853ea8e7 (commit)
       via  78757e7ffce9fb6297a2d501989e9b172e6151dc (commit)
       via  fc1cf2654de04ed8f6954dc1907ab1dcb8bb946e (commit)
       via  e5ebeae768a8310b5cfdce0aeff9419e1de51eaa (commit)
      from  cc90fd58eca493151010b81914f4c9cfafae145c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6616181c86770f7dc36343a5bacfafe853ea8e7
commit d6616181c86770f7dc36343a5bacfafe853ea8e7
Merge: cc90fd5 78757e7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 11:03:00 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 13 11:03:00 2015 -0500

    Merge topic 'clean-up-cmFunctionCommand'
    
    78757e7f cmFunctionCommand: Replace loops with cmJoin.
    fc1cf265 cmFunctionCommand: Remove counting variable.
    e5ebeae7 cmFunctionCommand: Split loop in two.


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

Summary of changes:
 Source/cmFunctionCommand.cxx |   25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 13 11:03:04 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Feb 2015 11:03:04 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master, updated. v3.1.3-1160-g0304e54
Message-ID: <20150213160304.6C2B4AB194@public.kitware.com>

This is an automated email from 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  0304e545289bb32a43a7c8973d604dad860f360b (commit)
       via  029d38fa61a666bff89b522904e05a88f903d051 (commit)
      from  d6616181c86770f7dc36343a5bacfafe853ea8e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0304e545289bb32a43a7c8973d604dad860f360b
commit 0304e545289bb32a43a7c8973d604dad860f360b
Merge: d661618 029d38f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 11:03:03 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 13 11:03:03 2015 -0500

    Merge topic 'doc-configure_file-output-location'
    
    029d38fa Help: Revise configure_file documentation (#15403)


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

Summary of changes:
 Help/command/configure_file.rst |  125 +++++++++++++++++++++++++++++----------
 1 file changed, 95 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 13 11:03:20 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Feb 2015 11:03:20 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.3-1353-g2baea07
Message-ID: <20150213160320.625DBAB195@public.kitware.com>

This is an automated email from 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  2baea07bc34071eddb9a54701b1831d96a590e64 (commit)
       via  0304e545289bb32a43a7c8973d604dad860f360b (commit)
       via  d6616181c86770f7dc36343a5bacfafe853ea8e7 (commit)
       via  cc90fd58eca493151010b81914f4c9cfafae145c (commit)
      from  d922c38efd6f1dfc0ab877e1993145a9a42fba79 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2baea07bc34071eddb9a54701b1831d96a590e64
commit 2baea07bc34071eddb9a54701b1831d96a590e64
Merge: d922c38 0304e54
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 11:03:12 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 13 11:03:12 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 13 11:52:07 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Feb 2015 11:52:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.3-1355-g986876b
Message-ID: <20150213165207.B27ABAAE84@public.kitware.com>

This is an automated email from 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  986876baf18dfee425a883741ec1a9b65a203e53 (commit)
       via  d891d47434a181f14554622118c39c954d6a9466 (commit)
      from  2baea07bc34071eddb9a54701b1831d96a590e64 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=986876baf18dfee425a883741ec1a9b65a203e53
commit 986876baf18dfee425a883741ec1a9b65a203e53
Merge: 2baea07 d891d47
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 11:52:06 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 13 11:52:06 2015 -0500

    Merge topic 'test-rpmbuild-cleanup' into next
    
    d891d474 Tests: Consolidate detection of 'rpmbuild'

diff --cc Tests/RunCMake/CMakeLists.txt
index 8e4aaec,f0426e5..7715f1c
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -195,11 -195,6 +195,11 @@@ add_RunCMake_test(IfacePaths_INCLUDE_DI
  set(IfacePaths_SOURCES_ARGS -DTEST_PROP=SOURCES)
  add_RunCMake_test(IfacePaths_SOURCES TEST_DIR IfacePaths)
  
- if(RPMBUILD)
+ if(RPMBUILD_EXECUTABLE)
    add_RunCMake_test(CPackRPM)
  endif()
 +
 +# Matlab module related tests
 +if(CMake_TEST_FindMatlab)
 +  add_RunCMake_test(FindMatlab)
 +endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d891d47434a181f14554622118c39c954d6a9466
commit d891d47434a181f14554622118c39c954d6a9466
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 11:47:47 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 13 11:50:38 2015 -0500

    Tests: Consolidate detection of 'rpmbuild'
    
    Several tests use slight variations of the same logic to enable CPack
    RPM tests.  Consolidate this logic into one check before any tests are
    added.  Look for 'rpmbuild' only on Linux and only when the test build
    tree does not have spaces in the path.  In particular, this will make
    the result available in time for the RunCMake.CPackRPM test to be
    activated even if CMake is configured exactly once.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7e7aa2e..cb45e79 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -102,6 +102,17 @@ if(BUILD_TESTING)
     list(APPEND build_options -DCMAKE_MAKE_PROGRAM:FILEPATH=${CMake_TEST_EXPLICIT_MAKE_PROGRAM})
   endif()
 
+  # Look for rpmbuild to use for tests.
+  # The tool does not work with spaces in the path.
+  if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CURRENT_BINARY_DIR MATCHES " ")
+    find_program(RPMBUILD_EXECUTABLE NAMES rpmbuild)
+  else()
+    set(RPMBUILD_EXECUTABLE "RPMBUILD_EXECUTABLE-NOTFOUND")
+  endif()
+
+  #---------------------------------------------------------------------------
+  # Add tests below here.
+
   if(NOT CMake_TEST_EXTERNAL_CMAKE)
     add_subdirectory(CMakeLib)
   endif()
@@ -826,11 +837,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   set(CTEST_package_X11_TEST ${CTEST_TEST_CPACK})
   set(CTEST_RUN_CPackComponentsForAll ${CTEST_TEST_CPACK})
 
-  if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CURRENT_BINARY_DIR MATCHES " ")
-    find_program(RPMBUILD NAMES rpmbuild)
-  endif()
   # Do not try to build RPM
-  if (NOT RPMBUILD)
+  if (NOT RPMBUILD_EXECUTABLE)
     set(CPACK_BINARY_RPM OFF)
   endif()
 
@@ -912,7 +920,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   if(CTEST_RUN_CPackComponentsForAll)
     # Check whether if rpmbuild command is found
     # before adding RPM tests
-    find_program(RPMBUILD_EXECUTABLE NAMES rpmbuild)
     if(RPMBUILD_EXECUTABLE)
       list(APPEND ACTIVE_CPACK_GENERATORS RPM)
     endif()
@@ -931,11 +938,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     if(APPLE)
       list(APPEND GENLST "DragNDrop")
     endif()
-    if (NOT CMAKE_CURRENT_BINARY_DIR MATCHES " ")
-      list(FIND ACTIVE_CPACK_GENERATORS "RPM" RPM_ACTIVE)
-      if (NOT ${RPM_ACTIVE} EQUAL -1)
-        list(APPEND GENLST "RPM")
-      endif()
+    list(FIND ACTIVE_CPACK_GENERATORS "RPM" RPM_ACTIVE)
+    if (NOT ${RPM_ACTIVE} EQUAL -1)
+      list(APPEND GENLST "RPM")
     endif()
     list(FIND ACTIVE_CPACK_GENERATORS "DEB" DEB_ACTIVE)
     if (NOT ${DEB_ACTIVE} EQUAL -1)
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 2de82a7..f0426e5 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -195,6 +195,6 @@ add_RunCMake_test(IfacePaths_INCLUDE_DIRECTORIES TEST_DIR IfacePaths)
 set(IfacePaths_SOURCES_ARGS -DTEST_PROP=SOURCES)
 add_RunCMake_test(IfacePaths_SOURCES TEST_DIR IfacePaths)
 
-if(RPMBUILD)
+if(RPMBUILD_EXECUTABLE)
   add_RunCMake_test(CPackRPM)
 endif()

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

Summary of changes:
 Tests/CMakeLists.txt          |   25 +++++++++++++++----------
 Tests/RunCMake/CMakeLists.txt |    2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 13 12:46:22 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Feb 2015 12:46:22 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.3-1357-ge8a87f3
Message-ID: <20150213174622.C5C01AAD02@public.kitware.com>

This is an automated email from 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  e8a87f3d46b095501876a1d352f3b17feeb81860 (commit)
       via  ac403f3b77b567195147fcaba063aab73c227c63 (commit)
      from  986876baf18dfee425a883741ec1a9b65a203e53 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8a87f3d46b095501876a1d352f3b17feeb81860
commit e8a87f3d46b095501876a1d352f3b17feeb81860
Merge: 986876b ac403f3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 12:46:22 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 13 12:46:22 2015 -0500

    Merge topic 'FindMatlab-rewrite' into next
    
    ac403f3b FindMatlab: Fix typo in matlab_get_supported_versions


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac403f3b77b567195147fcaba063aab73c227c63
commit ac403f3b77b567195147fcaba063aab73c227c63
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 12:45:37 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 13 12:45:57 2015 -0500

    FindMatlab: Fix typo in matlab_get_supported_versions

diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 7b78886..3af4252 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -309,11 +309,11 @@ endmacro()
 # extracts all the supported versions of Matlab
 # internal use
 macro(matlab_get_supported_versions list_versions)
-  set(${list_releases})
+  set(${list_versions})
   foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
     string(REGEX MATCHALL "(.+)=([0-9]+\\.?[0-9]*)" _matched ${_var})
     if(NOT _matched STREQUAL "")
-      list(APPEND ${list_releases} ${CMAKE_MATCH_2})
+      list(APPEND ${list_versions} ${CMAKE_MATCH_2})
     endif()
     unset(_matched)
     unset(CMAKE_MATCH_1)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 13 13:49:45 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Feb 2015 13:49:45 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.1.3-1359-g9fb71ba
Message-ID: <20150213184945.85ACBAAD53@public.kitware.com>

This is an automated email from 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  9fb71ba4af3d1ab2132dce49bebfda4f124043bc (commit)
       via  6d19ef9b7c78f5ff04dda9a8dd7a84fe8787a23b (commit)
      from  e8a87f3d46b095501876a1d352f3b17feeb81860 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fb71ba4af3d1ab2132dce49bebfda4f124043bc
commit 9fb71ba4af3d1ab2132dce49bebfda4f124043bc
Merge: e8a87f3 6d19ef9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 13:49:44 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 13 13:49:44 2015 -0500

    Merge topic 'doc-3.2-relnotes-fixup' into next
    
    6d19ef9b Help: In 3.2 relnotes move OpenGL/X11 to deprecated/removed section


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d19ef9b7c78f5ff04dda9a8dd7a84fe8787a23b
commit 6d19ef9b7c78f5ff04dda9a8dd7a84fe8787a23b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 13:45:15 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 13 13:45:15 2015 -0500

    Help: In 3.2 relnotes move OpenGL/X11 to deprecated/removed section
    
    It is a possibly incompatible change.

diff --git a/Help/release/3.2.rst b/Help/release/3.2.rst
index ddc3d86..843d65d 100644
--- a/Help/release/3.2.rst
+++ b/Help/release/3.2.rst
@@ -131,12 +131,6 @@ Modules
 
 * The :module:`FindMPI` module learned to find MS-MPI on Windows.
 
-* The :module:`FindOpenGL` module no longer explicitly searches
-  for any dependency on X11 libraries with the :module:`FindX11`
-  module.  Such dependencies should not need to be explicit.
-  Applications using X11 APIs themselves should find and link
-  to X11 libraries explicitly.
-
 * The :module:`FindOpenSSL` module now reports ``crypto`` and ``ssl``
   libraries separately in ``OPENSSL_CRYPTO_LIBRARY`` and
   ``OPENSSL_SSL_LIBRARY``, respectively, to allow applications to
@@ -231,6 +225,12 @@ Deprecated and Removed Features
   compatible.  If files were in a different encoding, including
   Latin 1, they will need to be converted.
 
+* The :module:`FindOpenGL` module no longer explicitly searches
+  for any dependency on X11 libraries with the :module:`FindX11`
+  module.  Such dependencies should not need to be explicit.
+  Applications using X11 APIs themselves should find and link
+  to X11 libraries explicitly.
+
 * The implementation of CMake now relies on some C++ compiler features which
   are not supported by some older compilers.  As a result, those old compilers
   can no longer be used to build CMake itself.  CMake continues to be able to

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

Summary of changes:
 Help/release/3.2.rst |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 13 14:59:19 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Feb 2015 14:59:19 -0500 (EST)
Subject: [Cmake-commits] CMake annotated tag, v3.2.0-rc1, created. v3.2.0-rc1
Message-ID: <20150213195919.5F1C6AAEE6@public.kitware.com>

This is an automated email 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.2.0-rc1 has been created
        at  5d704a0f8705929412f930aada2471b470e721c5 (tag)
   tagging  da92cdab5206d0556822ee12350636300ec73160 (commit)
  replaces  v3.1.2
 tagged by  Brad King
        on  Fri Feb 13 14:57:58 2015 -0500

- Log -----------------------------------------------------------------
CMake 3.2.0-rc1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAABAgAGBQJU3ldGAAoJEOyP7zp7+07aJiEQAJ4e6KZY8pzRlVJIx12c8QHs
zkCo27TZSaBFHasFC2wl2yzzhXBIUi1q8WjUHlFrCjH4WJpk8fksbMMOmtjd4ro8
NiUcXr7Vsz5IAvckP2K1NjTnUQmHatuu4dJ+ANFXS3DdpiDkd6aWiLzhqMNcSkRO
c6kQDxKAKff2t2ZddnTlDtv7r4exfEsbKjlHYuxUkamDHOJPGJYJXL3NZE0f+Mpk
vejEJM0N9kbYyaHXelWIDSY4wgnStdbR3TA1d7HdzapkCIr66AIgCg+NGe7TJULS
DwWPblfMqM+iOYBIEBked6oZX1ldZwcmCY+Jr2lmDmsvG7c13deBIJK13Fc7fo58
4HtzgxOhPYGogsXsGSxx0+896EfrSCk865yHqkFY3yQCIbDDHKJC0JnemL4OUowx
zFK9m4eBf+MpmAxzUSj8NPYCKc95IjYRvxGaBH34Ek9b4ZXg0RZEsFWIgkVgnLWB
vENZ/dwpKVO3E70Wk+jCB7ZLwM71fv+vIkm0BTNxoAgAf0lS/uqwjFaVvZhKTqss
vCAcfALd5T8ZFFKSxcSvMSwJI1+rW6HonmFSxHYZ3W+P1r0conOJwB75mUE06LyQ
ak5pox93oAIFEyBnbT7PNYYBv7dgYog1QNzEtQqMjeoUavRCEuvXJW5Dwa/R7Sgv
x4QbDrgRN/z02RdPvkf9
=+zxo
-----END PGP SIGNATURE-----

Aku Kotkavuo (1):
      FindOpenSSL: Always extract version from detected header (#15075)

Alin Marin Elena (3):
      FindMPI: Factor out compiler wrapper execution into helper
      FindMPI: Workaround Intel MPI 5.0.1 exit code problem (#15182)
      FindMPI: Extract -Xlinker options

Andrew Seidl (1):
      FindCUDA: Add cuSOLVER library from CUDA 7.0

Andr? Klitzing (1):
      CPack: Add support for code signing of bundles on MacOS

Ben Boeckel (28):
      KWIML: Avoid if() quoted auto-dereference
      Avoid if() quoted auto-dereference
      Tests: test -D parsing on the command line
      cmCacheManager: parse -D flags more strictly
      QtDialog: don't install desktop file bits on Apple
      QtDialog: install the 128x128 icon
      ninja: Find alternate Ninja-compatible binaries
      cmCallVisualStudioMacro: fix a shadowing warning
      cmVisualStudio10TargetGenerator: fix a narrowing warning
      Xcode: use a map to look up target pointers (#15201)
      test: test source file properties with case-insensitivity
      test: add a test for clearing regex results
      cmMakefile: store the number of last matches in a CMake var
      ctest --launch: write to cout and cerr in binary
      ctest: count errors from scripts properly
      FindMPI: search for msmpi's mpiexec as well
      ExternalProject: avoid CMP0054 warnings
      ExternalProject: remove extra newlines from log messages
      cmcmd: fix copy/paste typo in '-E tar t' command
      FindMPI: add more search paths for MSMPI
      FindMPI: MSMPI changed the subdirectories it uses
      cmake -E tar: clean up flag documentation
      cmake -E tar: add support for .xz files with 'J'
      cmSystemTools: use an enumeration for compression formats
      cmake -E tar: error out on multiple compression formats
      FindMPI: handle trailing slash from $MSMPI_BIN
      Help: add missing MINGW variable documentation
      ninja: use the minimum of all command line length limits (#14892)

Bill Hoffman (7):
      ctest_submit: Add CDASH_UPLOAD mode to upload files to CDash
      CTestCoverageCollectGCOV: Add module to run gcov
      CPack: Fix packaging of source tarballs with symbolic links
      ctest_submit: Escape URL components in CDASH_UPLOAD mode
      CTestCoverageCollectGCOV: Fix handling of large file counts
      CTestCoverageCollectGCOV: Allow custom flags to gcov
      CTestCoverageCollectGCOV: Add test case

Brad King (595):
      Merge branch 'release'
      Begin post-3.1 development
      Merge branch 'upstream-kwiml' into update-kwiml
      Utilities/Release: Update default binary distribution dir to v3.1
      Merge topic 'UseSWIG-r-support'
      Merge topic 'UseJava-classpath-cross-compile'
      Merge topic 'update-kwiml'
      Merge topic 'ctest-delphi-coverage'
      Merge topic 'remove-redundant-c_str'
      Merge topic 'remove-borland-build'
      Merge topic 'doc-policy-usage'
      Merge topic 'cmake-cmp0054-warnings'
      Merge topic 'cpack-rpm-component-descriptions'
      Merge topic 'release-upload-version'
      Merge topic 'fix-OSX-bundle-rpaths-and-Qt5'
      Merge topic 'cuda-rpath-osx'
      Merge topic 'ExternalProject-no-cygwin-hg-on-windows'
      Merge topic 'FindHg-no-cygwin-hg-on-windows'
      Merge topic 'doc-CMAKE_XCODE_ATTRIBUTE'
      Merge branch 'release'
      Merge topic 'doc-line-lengths'
      Merge topic 'xcode-ios-compiler-id'
      Merge branch 'release'
      Merge topic 'revert-definition-map-lookup'
      Merge topic 'FPHSA-deref'
      Merge branch 'release'
      OS X: Detect deployment target flags from GNU Fortran compilers
      Merge topic 'autorcc-depends'
      Merge topic 'find-boost-no-reroot'
      Merge topic 'cpack-rpm-pre-post-install'
      Merge topic 'osx-gnu-fortran-deployment'
      Merge topic 'compiler-include-encoding'
      ExternalProject: Convert docs to a bracket comment
      ExternalProject: Use explicit markup and definition lists in docs
      Merge topic 'FindCurses-include-CheckLibraryExists'
      Merge topic 'add_javascript_coverage_parser'
      Merge topic 'ExternalProject-format-docs'
      Utilities/Sphinx: Fix html_favicon configuration
      curl: Disable all whitespace checks in third-party code
      curl: Move sources back into upstream layout
      curl: Drop unused testing code
      Merge branch 'curl-upstream' into update-curl
      curl: Drop our CMake infrastructure to make room for the upstream
      Merge branch 'curl-upstream' into update-curl
      curl: Remove unused SIZEOF_LONG_DOUBLE
      curl: Fix warnings on 64-bit Mac OS X build
      curl: Fix spelling errors reported by Lintian
      curl: Drop '-DEV' from version since this is a curl release
      curl: Port to Haiku again
      curl: Remove outdated Haiku preprocessor checks
      curl: Simplify if() conditions on check result variables
      Merge topic 'fix--D-command-line-parsing'
      Merge topic 'cpack-bundle-codesign'
      Merge topic 'wince-tests'
      Merge topic 'doc-fix-html-favicon'
      Merge topic 'unix-icon-install'
      Merge topic 'doc-add_compile_options'
      Merge topic 'dev/alternate-generator-binaries'
      Xcode: Inherit global settings in per-target WARNING_CFLAGS (#15224)
      Merge topic 'xcode-inherit-warning-flags'
      Merge topic 'doc-add_library-typo'
      Merge topic 'CheckStructHasMember-avoid-breakage-on-Wall'
      Merge topic 'VERSION_no_sscanf'
      Merge topic 'ExternalProject_CMAKE_CACHE_DEFAULT_ARGS'
      Merge branch 'release'
      Merge branch 'upstream-kwsys' into update-kwsys
      configure_file: Warn about unknown arguments
      Merge topic 'fix-configure_file-COPYONLY'
      Merge branch 'release'
      Help: Add notes for topic 'ExternalProject_independent-step-targets'
      Help: Add notes for topic 'ctest-delphi-coverage'
      Help: Add notes for topic 'cpack-rpm-component-descriptions'
      Help: Add notes for topic 'cpack-rpm-pre-post-install'
      Help: Add notes for topic 'add_javascript_coverage_parser'
      Help: Add notes for topic 'ExternalProject_CMAKE_CACHE_DEFAULT_ARGS'
      Merge topic 'ExternalProject_CMAKE_CACHE_DEFAULT_ARGS'
      Merge topic 'add_javascript_coverage_parser'
      Merge topic 'cpack-rpm-pre-post-install'
      Merge topic 'cpack-rpm-component-descriptions'
      Merge topic 'ctest-delphi-coverage'
      Merge topic 'update-kwsys'
      Merge topic 'watcom-drop-symfile-option'
      Merge topic 'extra-generators-std-flags'
      Merge topic 'FindIce-no-envvar-markup'
      Merge topic 'fix-missing-SIZE_MAX'
      Merge topic 'ExternalProject_independent-step-targets'
      Merge branch 'release'
      Merge branch 'release-doc-formatting' into doc-formatting
      Merge topic 'doc-formatting'
      Merge branch 'release'
      Merge topic 'doc-FindITK-FindVTK-relnotes'
      Merge topic 'doc-formatting'
      Merge branch 'release'
      Merge topic 'doc-cleanup-xrefs'
      Merge branch 'release'
      curl: Do not use 'dl' on HP-UX
      curl: Select file APIs on Windows
      curl: Drop inclusion of .rc file for static lib
      curl: Fix detection of headers with dependencies
      curl: Use arch-aware CHECK_TYPE_SIZE results
      curl: Fix curl.h inclusion of curlbuild.h from CMake sources
      curl: Configure build to work within CMake
      curl: Restore CMake-specific test and install code
      curl: Restore CMake-specific zlib selection code
      curl: Restore CURL_CA_BUNDLE option
      curl: Restore installation of OpenSSL DLLs
      curl: Skip check for inet_pton on Windows
      curl: Disable warnings to avoid changing 3rd party code
      curl: Skip sanity check that triggers Clang warning
      Tests: Update expected CTestTestFailedSubmit output
      Merge topic 'xcode-ios-compiler-id'
      Merge topic 'genex-target-objects-ordering'
      Merge topic 'fix-gcc-hppa'
      Merge topic 'file-GENERATE-permissions'
      Merge topic 'encoding-curl'
      Merge topic 'make-fortran-preprocessor-assembly-targets'
      Merge topic 'update-curl'
      Merge branch 'release'
      Suppress deprecation warnings for GetVersionEx
      curl: Disable warnings to avoid changing 3rd party code
      Merge topic 'fix_link-line-dedup_regression'
      Merge topic 'ExternalProject-check-hash-before-download'
      Merge branch 'release'
      Merge branch 'upstream-kwsys' into update-kwsys
      Merge topic 'emacs-mode-underscore-in-symbol'
      Merge topic 'doc-CMAKE_INSTALL_PREFIX-link-GNUInstallDirs'
      Merge topic 'doc-index-xrefs'
      Merge topic 'update-kwsys'
      Merge topic 'fix-vs12-GetVersionEx-warning'
      Merge topic 'update-curl'
      Merge topic 'kwsys-SystemInformation-AIX-_SC_AIX_REALMEM'
      Merge branch 'release'
      Tests: Build config-dependent tests in the same config they run
      Help: Add notes for topic 'ExternalProject_UPDATE_DISCONNECTED'
      Merge topic 'ExternalProject_UPDATE_DISCONNECTED'
      Merge topic 'doc-install-SCRIPT-CODE-COMPONENT'
      Merge topic 'refactor-search-path-construction'
      Merge topic 'compile-features-refactor'
      Merge topic 'file-GENERATE-source'
      Merge topic 'add-FindIntl'
      Merge topic 'no-AppleClang-C-features'
      Help: Add notes for topic 'add-FindIntl'
      Merge branch 'release'
      Merge branch 'release'
      Merge topic 'add-FindIntl'
      Help: Revise and format 'add_custom_target' docs
      Help: Document add_custom_command marking outputs GENERATED
      Merge topic 'fix-config-dependent-tests'
      Merge topic 'no-cmake-self-install-when-cross-compiling'
      Merge topic 'doc-add_custom_target'
      Merge topic 'vs-nsight-tegra-version'
      Merge topic 'doc-add_custom_command'
      Tests: Test add_custom_command and add_custom_target error cases
      Merge branch 'release'
      Tests/BuildDepends: Drop unneeded help for Ninja
      Ninja: Use a TARGET_FILE variable to hold the link output file
      Add an option for explicit BYPRODUCTS of custom commands (#14963)
      Ninja: Refactor restat to be a string internally
      ExternalProject: Add options to specify BYPRODUCTS (#14963)
      Merge topic 'string-SUBSTRING-truncate'
      Merge topic 'CPackRPM_SUBSTRING_-1'
      Merge topic 'fix-vs2015-warnings'
      Merge topic 'vs14-is-2015'
      Merge topic 'test-custom-command-errors'
      Merge topic 'console-pool'
      Merge branch 'upstream-kwsys' into update-kwsys
      Merge topic 'update-kwsys'
      Merge topic 'kwsys-SharedForward-vs14'
      Merge branch 'release'
      curl: Check for OpenSSL headers independently
      Merge topic 'ninja-minor-refactoring'
      Merge topic 'doc-target_include_directories-fixup'
      Merge topic 'doc-sphinx-cmake-fixup'
      Merge topic 'FindCurses-no-cur_colr'
      Merge topic 'update-curl'
      Merge topic 'vs-check-phone-store-tools'
      Merge branch 'backport-fix-CMP0054-MSVC' into fix-CMP0054-MSVC
      Merge topic 'FindJava-no-osx-stub'
      Merge topic 'fix-CMP0054-MSVC'
      cmTarget: Use null_ptr code path on all platforms
      Merge topic 'custom-command-byproducts'
      Merge topic 'CPackRPM-cleanup-component-vars'
      Merge topic 'ccmake-hpux'
      Merge topic 'clean-autogen'
      Merge topic 'file-GENERATE-rerun'
      Merge topic 'fix-openmp-fortran'
      Merge topic 'cmTarget-null_ptr-everywhere'
      Merge topic 'default-lang-dialect-for-master'
      Merge topic 'fix-GNU-CXX-dialect-versions'
      Merge topic 'fortran-linker-flags'
      Merge topic 'fix-WCDH-docs'
      Merge topic 'remove-c_str'
      Merge topic 'improve-INTERFACE-property-docs'
      Merge topic 'GetPrerequisites-expansion'
      Help: Add notes for topic 'custom-command-byproducts'
      Merge branch 'release'
      Merge topic 'remove-ancient-msvc-workarounds'
      Merge topic 'doc-drop-borland-workaround'
      Merge topic 'custom-command-byproducts'
      Merge topic 'C-features-Wundef'
      Merge topic 'WCDH-multi-file'
      Merge topic 'ccmake-system-form'
      Merge topic 'remove-developer-forbidden-API'
      Merge topic 'return-test-foreach'
      Merge branch 'release'
      Merge topic 'break-command-strictness'
      Merge branch 'revert-cached-regex-clear' into revert-cached-regex-clear-for-master
      Merge topic 'use-latest-language-dialects'
      Merge topic 'FindwxWidgets-new-versions'
      Merge topic 'revert-cached-regex-clear-for-master'
      Merge topic 'fix-source-case-matching'
      Merge topic 'fix-transitive-OBJECT_SOURCES-context'
      Merge topic 'doc-CMP0053-dedup-char'
      Merge topic 'doc-installed-file-property'
      Merge topic 'target-sources-error-conditions'
      Merge topic 'doc-ctest-j-typo'
      Merge branch 'release'
      FindOpenGL: Drop explicit dependency on X11 (#15268)
      Merge topic 'FindOpenSSL-separate-libs'
      Merge topic 'link-no-empty-response-files'
      Merge topic 'fix-implicit-lib-logging'
      Merge topic 'doc-compile-features-typo'
      Merge topic 'FindOpenGL-no-X11'
      Merge branch 'release'
      Utilities/Release: Add build of binary for Linux x86_64
      add_library: Fix target type check for non-shared-lib platforms
      Help: Add notes for topic 'file-LOCK-command'
      Merge topic 'FindOpenGL-revert-imported-targets'
      Merge topic 'add-continue-command'
      Merge topic 'doc-Nsight-Tegra-toolchain'
      Merge topic 'vs-hlsl-settings'
      Merge topic 'doc-CMAKE_CXX_KNOWN_FEATURES-typo'
      Merge topic 'xcode-target-search-perf'
      Merge topic 'CPackIFW-doc-typos'
      Merge topic 'FindPythonInterp-Fix-1.4'
      Merge topic 'fix-wince-unicode-entry-point'
      Merge topic 'binary-linux-64'
      Merge topic 'icase-source-file-prop'
      Merge topic 'file-LOCK-command'
      Merge branch 'release'
      VS: Fix typo in VS_SHADER_MODEL lookup comment
      CMakeDetermineCompilerABI: Use normal linker flags in ABI project
      try_compile: Pass linker flags into test project (#14066)
      Merge topic 'vs-phone-store-deployment-location'
      Merge branch 'release'
      Merge topic 'doc-mixed-case-commands'
      Merge topic 'vs-hlsl-typo'
      Merge topic 'fix-add_library-check-for-shared'
      Merge topic 'cached-regex-clear-fixed'
      Merge topic 'FindUnixCommands-use-FPHSA'
      VS: Inherit target-level "-wd" flags in source files (#15284)
      Xcode: Fix rebuild with multiple custom command outputs (#15116)
      Makefile: Fix rebuild with multiple custom command outputs (#15116)
      Tests: Cover rebuild with multiple custom command outputs (#15116)
      Merge topic 'Find-Modules-documentation'
      Merge topic 'doc-file-GENERATE-order'
      Merge topic 'xerces-rename'
      Merge branch 'release'
      Add options to build CMake without latest language dialects
      Makefile: Workaround Borland Make bug with multiple outputs
      Merge topic 'try_compile-link-flags'
      Merge topic 'FindMPI-Intel-5.0.1'
      Merge topic 'vs-inherit-wd'
      Merge topic 'ExternalProject_TEST_EXCLUDE_FROM_MAIN'
      Merge topic 'ctest-binary-pipe'
      Merge topic 'file-LOCK-timeout-type'
      Merge topic 'optional-latest-language-dialects'
      Merge topic 'custom-command-multiple-outputs'
      Merge branch 'release'
      Merge branch 'release'
      find_library: Fix repeat call after changing directory content (#15293)
      Help: Drop FeatureSummary example in cmake-developer.7
      Merge branch 'backport-doc-find-module-no-summary' into doc-find-module-no-summary
      Merge topic 'doc-find-module-no-summary'
      Merge topic 'find_library-updated-directory-content'
      Merge topic 'FindLATEX-use-FPHSA'
      Merge topic 'doc-CMP0054-example'
      Merge topic 'drop-double-underscores'
      Merge topic 'FindQt4-fix-major-version-mismatch'
      Merge topic 'catch-ctest-errors-better'
      Merge topic 'find-msmpi'
      Merge branch 'release'
      curl: Use Windows SSL/TLS native implementation
      Tests: Fix OS X version check to use component-wise test
      Merge topic 'FindMPI-parse-Xlinker-flags'
      Merge topic 'suncc-fixes'
      Merge topic 'curl-winssl'
      Merge topic 'assert-no-string-conversion'
      Merge topic 'tests-osx-version'
      Merge topic 'extproj-extra-newlines'
      Merge topic 'cmp0054-warnings-extproj'
      install: Allow absolute EXPORT destination with relative targets (#15258)
      Tests: Allow RunCMake tests to pass generator expressions
      Tests: Simplify RunCMake test extra argument passing
      Help: Mention add_dependencies in add_custom_target DEPENDS option
      Help: Document MAIN_DEPENDENCY limitation in add_custom_command
      Tests: Allow RunCMake expected result code to be a regex
      ctest_memcheck: Do not open empty BC output file name
      Tests: Fix CheckSourceTree test for newer Git
      Merge branch 'release'
      Merge topic 'doc-custom-command-depends'
      Merge topic 'test-CheckSourceTree-update'
      Merge topic 'fix_coverage_scanbuild_errors'
      Merge topic 'test-RunCMake-updates'
      Merge topic 'ctest_memcheck-no-empty-BC-output'
      Merge branch 'upstream-kwsys' into update-kwsys
      curl: Use OS X SSL/TLS native implementation
      Tests: Move CTestTestMemcheck cases into a RunCMake.CTestMemcheck test
      Tests: Move CTestTestMemcheck tools into Tests/CMakeLib
      Merge topic 'curl-darwinssl'
      Merge topic 'test-memcheck-with-RunCMake'
      Merge topic 'doc-INTERFACE-target-type'
      Merge topic 'fix-sha2-cast-constness'
      Merge topic 'vs-nsight-tegra-min-api'
      Merge topic 'update-kwsys'
      Merge branch 'upstream-kwsys' into update-kwsys
      Tests: Run CFBundleTest only with valid configuration
      Merge topic 'install-EXPORT-absolute-prefix'
      Merge topic 'osx-cfbundle-tweaks'
      Merge topic 'update-kwsys'
      Merge topic 'bootstrap-solaris'
      Utilities/Release: Fix name of OS X 10.6+ x86_64-only binary
      Utilities/Release: Build Windows and OS X binaries with native SSL
      Merge topic 'nightly-binary-updates'
      Merge topic 'doc-mingw-makefiles'
      Merge branch 'release'
      Tests: Fix RunCMake.CompileFeatures test NonValidTarget2 case
      Merge topic 'macho-parser'
      Merge topic 'backport-suncc-fixes'
      Help: Add notes for topic 'AppleClang-5.1-features'
      Merge branch 'upstream-kwsys' into update-kwsys
      Merge topic 'add-FindGSL'
      Merge topic 'ctest-coverage-extra-line-error'
      Merge topic 'cleanup-ExpandListArgument-usage'
      Merge topic 'AppleClang-5.1-features'
      Merge topic 'CPackComponent-docs-fix'
      Merge topic 'base64-constref'
      Merge topic 'ninja-fix-crash-on-error'
      Merge topic 'doc-octothorpe-escaping'
      Merge branch 'release'
      Oracle/Sun: Fix Fortran preprocessor rule generation
      Merge topic 'cpack-PackageMaker-package-size'
      Merge topic 'ninja-fix-subdir-objlib-languages'
      Merge topic 'minor-warning-fixes'
      Merge topic 'sunpro-Fortran-preprocess'
      cmCTest: Use size_t for cmsysBase64_Encode return value
      Copyright.txt: Update year range to end in 2015
      Merge topic 'copyright-year'
      Merge topic 'update-kwsys'
      Merge topic 'base64-casts'
      Merge topic 'RunCMake-stderr-default'
      Merge topic 'drop-GNU-2.95'
      Merge topic 'FindCUDA-cross'
      Merge topic 'FindIce-CMP0054'
      Merge topic 'find-msmpi'
      Merge topic 'FindSDL-quoting'
      Merge topic 'fix-error-message-typo-tar-cmd'
      Merge topic 'cpack_invalid_cmake_generator'
      Merge topic 'record-GNU-5-features'
      Merge topic 'WCDH-thread_local-portability'
      XL: Fix link flags for executables on Linux with XL compilers
      Merge branch 'upstream-kwsys' into update-kwsys
      Merge topic 'doc-if-variable-not-defined'
      Merge topic 'doc-CXX_STANDARD-14'
      Help: Add notes for topic 'feature_record_msvc'
      Merge topic 'update-kwsys'
      Merge topic 'kwsys-Terminal-xterm-termite'
      Merge topic 'fix-empty-target-property-queries'
      Merge topic 'refactor-CompileFeatures-test'
      Merge topic 'feature_record_msvc'
      Merge topic 'sln-bom'
      Merge topic 'FindCUDA.cmake/UseCMAKE_CXX_FLAGS_separableCompilation'
      Merge topic 'tests-encoding'
      Merge branch 'release'
      Merge topic 'linux-XL-fortran'
      Merge topic 'sun-better-stdlib'
      Merge topic 'drop-ancient-workarounds'
      Merge topic 'FindOpenSSL-use-header-version'
      Merge topic 'doc-CMAKE_FIND_PACKAGE_NAME'
      Merge topic 'FindLATEX-components'
      Merge topic 'xcode-ios-compiler-id'
      Merge topic 'fix-autouic-regression'
      Merge topic 'Apple-GNU-compiler-features'
      Merge topic 'backport-copyright-year'
      Merge topic 'improve_cobertura'
      Merge topic 'add-xz-support'
      Merge topic 'join-algorithm'
      Merge topic 'linux-XL-fortran'
      jsoncpp: Add .gitattributes to skip whitespace checks
      Merge branch 'jsoncpp-upstream' into import-jsoncpp
      Merge branch 'release'
      Merge topic 'backport-cpack_invalid_cmake_generator'
      zlib: Disable warnings to avoid changing 3rd party code
      Help: Add notes for topic 'find-msmpi'
      Merge branch 'release'
      Revert topic 'feature_record_msvc'
      Tests: Revert workaround for COMPILE_FEATURES genex bug
      Help: Add notes for topic 'Apple-GNU-compiler-features'
      Help: Add notes for topic 'record-GNU-5-features'
      Help: Add notes for topic 'Xcode-clang-compile-features'
      Help: Add notes for topic 'FindGit-local-Github'
      Merge topic 'record-GNU-5-features'
      Merge topic 'find-msmpi'
      Merge topic 'Apple-GNU-compiler-features'
      Help: Add notes for topic 'Apple-compiler-selection'
      ctest_build: Fix logic regression in parent that clips build output
      Merge topic 'revert-feature_record_msvc'
      Merge topic 'FindRuby-zero-version'
      Merge topic 'FindRuby-fix-version'
      Merge topic 'FindBoost-update-versions'
      Merge topic 'cpack-PackageMaker-OSX-10.10'
      Merge topic 'fix-LOCATION-with-TARGET_OBJECTS'
      Merge topic 'fix-COMPILE_FEATURES-genex'
      Merge topic 'delete-algorithm'
      Merge topic 'zlib-suppress-warnings'
      Merge topic 'Xcode-clang-compile-features'
      Merge topic 'safer-msmpi-checks'
      Merge topic 'Apple-compiler-selection'
      Merge topic 'FindGit-local-Github'
      Merge branch 'release'
      ExternalData: Convert docs to a bracket comment
      ExternalData: Split documentation into sections
      ExternalData: Document all variables defined by module
      ExternalData: Re-order documentation
      ExternalData: Improve documentation organization
      ExternalData: Add support for custom download scripts
      Help: Add notes for topic 'ExternalData-custom-download'
      jsoncpp: Include "config.h" before system headers
      jsoncpp: Build the library within CMake
      jsoncpp: Disable warnings to avoid changing 3rd party code
      jsoncpp: Include C headers since we use APIs without std::
      jsoncpp: Add missing <iosfwd> include in json/writer.h
      jsoncpp: Add missing assert before strcmp in json_value.cpp
      jsoncpp: Provide 'isfinite' implementation on ancient glibc
      jsoncpp: Provide 'isfinite' implementation on Solaris
      jsoncpp: Add README-CMake.txt
      libarchive: Constify internal __archive_get_date implementation
      Tests: Teach RunCMake to report command-line on failure
      Merge topic 'fix-ctest_build-output-processing-regression'
      Merge topic 'ExternalData-custom-download'
      Merge topic 'import-jsoncpp'
      Merge topic 'libarchive-constify-internal-get_date'
      Merge topic 'tests-RunCMake-report-command'
      Merge topic 'fix-qcc-compiler-id'
      Merge topic 'windows-utf-8'
      Help: Add notes for topic 'GNU-4.6-compile-features'
      Merge topic 'extend-COMPILE_FEATURES-test'
      Merge topic 'GNU-4.6-compile-features'
      FindJsonCpp: Add module to find JsonCpp package
      Merge topic 'eclipse-fix-cxx-natures'
      Merge topic 'add-FindJsonCpp'
      Merge topic 'emacs-mode-fix-word-at-point'
      Merge topic 'fix-cmake-org-links'
      Merge topic 'FindQt-fixes'
      Merge topic 'remove-AppleClang-51-release-notes'
      Merge topic 'delete-algorithm'
      Merge topic 'use-member-insert'
      Merge topic 'consistent-empty-method'
      Tests: Add RunCMake.CTestSubmit cases covering ctest_submit failures
      Tests: Extend RunCMake.CTestSubmit test to cover 'drop' failures
      Merge branch 'release'
      Merge topic 'test-ctest_submit-fail-with-RunCMake'
      Help: Add notes for topic 'SolarisStudio-compile-features'
      Merge topic 'WriteCompilerDetectionHeader-multi-file-lang'
      Merge topic 'SolarisStudio-compile-features'
      Merge topic 'GNU-4.4-compile-features'
      cmake: Teach "-E tar" to report file name on failure to read from disk
      cmake: Teach "-E tar" command a "--mtime=" option
      Merge topic 'doc-virtual-override-specifiers-links'
      Merge topic 'xcode-target-sort'
      Merge topic 'emacs-mode-fix-word-at-point'
      Merge topic 'find-package-mode-fix-multiarch'
      Merge topic 'doc-unsupported-compilers'
      Merge topic 'cmake-E-tar-mtime'
      jsoncpp: Drop doxygen comments that cause Clang warnings
      jsoncpp: Add headers to help CMake include in-source jsoncpp headers
      cmake: Generate an internal 'Labels.json' file next to 'Labels.txt'
      Merge topic 'cmake-labels-json'
      ctest_submit: Make CDASH_UPLOAD mode arguments more strict
      Add option to build CMake against a system jsoncpp
      Merge branch 'release'
      Merge branch 'upstream-kwsys' into update-kwsys
      Features: Fix CompileFeatures test for C non-features
      Features: Fix CompileFeatures non-feature tests for space in path
      Features: Fix GNU 4.4 and 4.5 C standard level flags
      Tests: Fix obscure RunCMake.CTestSubmit 'drop' case failures
      Merge topic 'test-ctest_submit-fail-with-RunCMake'
      Merge topic 'jsoncpp-third-party'
      Features: Blacklist raw string literals test for GNU 4.4
      Merge topic 'GNU-4.4-compile-features'
      Merge topic 'WriteCompilerDetectionHeader-tests'
      Merge topic 'update-kwsys'
      Merge topic 'FindCUDA-cusolver'
      curl: Add README-CMake.txt
      Merge topic 'cdash_upload_file_mode'
      Merge branch 'release'
      Tests: Remove incorrect indentation from Complex test comment
      curl: Add CURL_CA_PATH option to CMake build process
      cmake: Use a default CA path when not using system curl
      Merge topic 'add-missing-variable-docs'
      Merge topic 'FeatureSummary-fix-doc-typo'
      Merge topic 'GNU-4.4-compile-features'
      Merge topic 'update-curl'
      Merge topic 'FindCUDA-more-advanced-cache-entries'
      Merge topic 'test-complex-remove-bad-indentation'
      Merge topic 'INTERFACE_SYSTEM_INCLUDE_DIRECTORIES-update'
      Help: Add notes for topic 'FindCUDA-cusolver'
      ExternalProject: Allow ALWAYS step property to be switched (#15368)
      Tests/RunCMake: Honor CMAKE_MAKE_PROGRAM
      Merge branch 'upstream-kwsys' into update-kwsys
      Tests: Shorten paths in CompileDefinitions
      Tests: Shorten paths in RunCMake.CompileFeatures
      Merge topic 'curl-default-cainfo'
      Merge topic 'ninja-rsp_file-calculation'
      Merge topic 'update-kwsys'
      Merge topic 'ExternalProject-switch-ALWAYS'
      Merge topic 'FindCUDA-cusolver'
      Merge topic 'try-run-link-libraries'
      Merge topic 'backport-kwsys-directory-check-opendir'
      Merge topic 'tests-RunCMake-make-program'
      cmake: Teach "-E tar" command a "--files-from=" option
      Help: Document 'cmake -E <command>' modes in cmake.1 manual
      Features: Fix test to reject missing expectation definitions
      Tests: Shorten paths in ExternalProjectLocal
      try_compile: Test that CMake re-runs on input change
      Tests/RunCMake: Normalize newlines before checking actual output
      configure_file: Test that CMake re-runs on input change or output missing
      Merge topic 'doc-link_libraries-note'
      Merge topic 'load-initial-cache-from-stderr-to-stdout'
      Merge topic 'cmake-builtin-targets-use-ninja-terminal'
      Merge topic 'cmake-gui-osx'
      Merge topic 'tests-RunCMake-normalize-newlines'
      Merge topic 'test-rerun-cmake'
      Merge topic 'cmake-E-tar-files-from'
      Merge topic 'doc-cmake-E-mode'
      Merge topic 'test-features-enforce-expectation'
      Merge topic 'file-strings-utf-16'
      Merge topic 'shorten-test-paths'
      Merge topic 'drop-win9x-reference'
      Merge topic 'OpenSSL_102'
      Xcode: Add internal API to find xcodebuild
      Xcode: Select make program at build time
      Xcode: Switch to internal CMAKE_MAKE_PROGRAM lookup by generator (#15324)
      Merge topic 'fix-OBJECT_DEPENDS-after-path-normalization'
      Merge topic 'ctest-update-gmake-error-match'
      Merge topic 'vs-shader-flags'
      Merge topic 'xcode-revise-make-program'
      Merge branch 'release-3.1'
      Features: Define meaning for no language standard default
      Ninja: Use "deps = msvc" only for C and CXX (#15253)
      Makefile: Generate .NOTPARALLEL without .PHONY (#14312)
      Merge branch 'backport-fix-cpack-symlink-create-dir' into fix-cpack-symlink-create-dir
      Merge topic 'build-require-libarchive-3'
      Merge topic 'vs-windows-store-default-language'
      Merge topic 'ninja-msvc-only-C-and-CXX'
      Merge topic 'fix-cpack-symlink-create-dir'
      Merge topic 'feature-record-msvc'
      Merge branch 'release-3.1'
      Merge topic 'ctest_submmit-CDASH_UPLOAD-encode-url'
      Merge topic 'GNU-5-CXX14'
      Merge topic 'make-NOTPARALLEL-not-PHONY'
      Merge topic 'rpm_multi_prefix'
      CTestCoverageCollectGCOV: Fix handling of international characters
      Help: Add notes for topic 'CTestCoverageCollectGCOV-refinements'
      Merge topic 'CTestCoverageCollectGCOV-refinements'
      Merge topic 'Qt-AUTOUIC-file-origin'
      Merge topic 'fix-msvc-linker-flags-typo'
      Merge topic 'fix-default-install-config'
      Merge branch 'release-3.1'
      CPack: Fix NSIS default 64-bit Windows install directory (#14211)
      Help: Revise try_compile and try_run documentation (#15358)
      Help: Add link target to cmake-language.7 encoding section
      Help: Consolidate 3.2 release notes
      Help: Organize and revise 3.2 release notes
      Merge branch 'release-3.1'
      Merge topic 'cpack-nsis-win64'
      Merge topic 'doc-try_compile'
      Merge topic 'fix-C-standard-features'
      Merge topic 'update-docs'
      Merge topic 'doc-3.2-relnotes'
      Help: Rename 3.x.0 release notes to 3.x
      Merge topic 'rename-release-notes'
      Help: Drop development topic notes to prepare release
      CMake 3.2.0-rc1 version update
      Do not call setlocale() globally in CMake applications (#15377)
      Add setlocale() calls around use of libarchive APIs (#14934, #15377)
      Merge branch 'backport-no-global-setlocale' into no-global-setlocale
      Merge branch 'no-global-setlocale' into release
      Merge branch 'cpack_rpm_mulit_prefix_fixup' into release
      Merge branch 'makefile-missing-comment' into release
      Merge branch 'bootstrap-sphinx-qthelp' into release
      Merge branch 'fix_timeout_docs' into release
      FindCoin3D: Drop link to project homepage
      Merge branch 'FindCoin3D-drop-link' into release
      Merge branch 'cpack_rpm_mulit_prefix_fixup' into release

Calin Cascaval (1):
      cpack: Fix installed size computation with PackageMaker generator

Christian Manning (2):
      Code Blocks/Eclipse: Use non-default stdlib includes when specified.
      Code Blocks/Eclipse: Add -std= flag matching.

Christoph Gr?ninger (8):
      FindUnixCommand: Use FPHSA to report status in standard way
      FindLATEX: Use FPHSA to report status in standard way
      cmParseDelphiCoverage: Remove superfluous semicolons after methods
      cmCMakeMinimumRequired: Use unsigned int for version numbers
      FindLATEX: Add components handling
      FindLATEX: Add components PDFtoPS and HTLATEX
      FindLATEX: Add components Biber and xindy
      FindLATEX: Add components for XeLaTeX and LuaLaTeX

Chuck Atkins (5):
      liblzma: fix build on platforms with no SIZE_MAX defined.
      Refactor and seperate search path construction for find commands
      Encapsulate search path manipulation functions into a seperate class.
      Use containers of labeled search paths instead of individual members
      Misc. fixes for the Oracle / Sun compiler.

Clinton Stimpson (7):
      Fix failing StringFileTest when using unicode characters.
      Encoding: Use encoding libcurl expects with file: urls.
      Mach-O: Add Mach-O parser for OS X and iOS.
      Mach-O: Use Mach-O parser to extract install names instead of otool.
      Encoding:  Write Visual Studio solution file with BOM.
      Encoding:  Modify tests to work using non-ascii paths.
      Encoding:  Switch to use UTF-8 internally by default on Windows.

Curl Upstream (2):
      curl 7.16.1 (reduced)
      curl 7.38.0 (reduced)

Daniel Scharrer (1):
      FindQt4: Fix handling of QT_VERSION_MAJOR mismatch

Daniele E. Domenichelli (10):
      Tests/Tutorial: Fix when USE_MYMATH is OFF
      ExternalProject: Add CMAKE_CACHE_DEFAULT_ARGS arguments
      ExternalProject: Add unit tests for CMAKE_CACHE_DEFAULT_ARGS
      ExternalProject: Add independent step targets
      ExternalProject: Add ExternalProject_Add_StepDependencies function
      ExternalProject: Add unit tests
      ExternalProject: Always add a command to a step
      ExternalProject: Add UPDATE_DISCONNECTED option
      ExternalProject: Add unit tests for UPDATE_DISCONNECTED
      ExternalProject: Add TEST_EXCLUDE_FROM_MAIN option

Dmitry Polyanitsa (1):
      Add 'ANDROID_API_MIN' target property to set Android Target MIN API

Domen Vrankar (6):
      CPackRPM: Add component based packaging description and summary
      string: Tolerate SUBSTRING length exceeding end index
      CPack invalid CMake generator
      CPackRPM: Allow multiple path relocation prefixes for one package
      CPackRPM: Fix recognition of absolute relocation paths
      CPackRPM: Do not run file(GLOB_RECURSE) without CMP0009 set to NEW

Evgeny Kalishenko (2):
      CPackRPM: Support pre(post) install script requirements
      CPackRPM: Support PREUN and POSTUN requirements

Felix Geyer (1):
      CMakeFindPackageMode: Fix Debian multiarch default guess (#15250)

Frank Park (1):
      FindGit: Search in 'GitHub for Windows' user directory

Fraser Hutchison (1):
      Avoid if() quoted auto-dereference when checking for "MSVC"

Gauthier Lamaison (1):
      CPackRPM: Unset temporary component variables before re-use

Gregor Jasny (7):
      Track nested loop levels in CMake language with a stack of counters
      break: Add policy CMP0055 to check calls strictly
      return: Add test for returning inside a foreach loop
      continue: Add a new CMake language command for loop continuation (#14013)
      cmTarget: Use GetCFBundleDirectory within GetFullNameInternal
      Xcode: Call IsCFBundleOnApple to decide if bundle is being built
      Require libarchive 3.0.0 or later

Guillaume Papin (1):
      FindBoost: fix find_library call when using "re-rooting"

Hannes Mezger (1):
      FindOpenSSL: Report crypto and ssl libraries separately

James Bigler (1):
      FindCUDA: Add relevant CMAKE_{C,CXX}_FLAGS for separable compilation

Jean-Christophe Fillion-Robin (1):
      cmake: Display "loading initial cache" message on stdout

Joseph Snyder (3):
      CTest: Add code coverage parser for Pascal/Delphi
      CTest: Add Javascript coverage parser
      CTest: Remove code to fix scanbuild errors

JsonCpp Upstream (1):
      JsonCpp 1.0.0 (reduced)

Julien Schueller (1):
      UseSWIG: Fix R module prefix

Justin Borodinsky (1):
      file: Teach STRINGS to support UTF-16 and UTF-32 encodings

KWSys Robot (9):
      KWSys 2014-10-31 (88c8cc7f)
      KWSys 2014-11-12 (5843f590)
      KWSys 2014-11-14 (dec9c30b)
      KWSys 2014-12-16 (cc4046a8)
      KWSys 2014-12-18 (87c65319)
      KWSys 2014-12-23 (5a15cb3b)
      KWSys 2015-01-09 (425fa73e)
      KWSys 2015-01-20 (b33e7b96)
      KWSys 2015-01-23 (d4e7f08e)

Kelly Thompson (1):
      FindGSL: Add module to find the GNU Scientific Library

Kevin Wojniak (3):
      cmake-gui: Fix install menu to be available for Qt5 builds on OS X.
      cmake-gui: Change install buttons to activate on clicked instead of pressed.
      cmake-gui: Shrink spacing between search field and checkbox.

Kitware Robot (114):
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp

Lorenz Witte (1):
      UseJava: Fix classpath separator on WIN32 cross compilation (#15206)

Mark Abraham (1):
      FindCUDA: Mark more cache variables as advanced

Matt McCormick (3):
      try_run: Add support for LINK_LIBRARIES option.
      try_run: Add test for bad link libraries.
      try_run: Add tests for LINK_LIBRARIES with mock libraries.

Nils Gladitz (2):
      strings: Remove redundant calls to std::string::c_str()
      Makefile: Fix regression in target-bound custom command COMMENT output

Nuno Sucena Almeida (1):
      bootstrap: Add --sphinx-qthelp option to enable qthelp doc generation

Pascal Bach (1):
      Tests: Run Tutorial steps 1-4 as tests for Windows CE

Peter Collingbourne (7):
      Rename doing_verbatim to doing_nothing
      Add USES_TERMINAL option for custom commands
      Give the interactive cache editor the USES_TERMINAL property
      Ninja: factor out the test for console pool support
      Ninja: Remove unused declaration
      Ninja: Implement USES_TERMINAL using the console pool if available
      Help: Add notes for topic 'console-pool'

Peter Wu (1):
      CheckStructHasMember: Avoid clang -Wall breakage (#15203)

Robert Goulet (3):
      VS: Add source file property to set extra hlsl shader flags
      VS: Add missing newlines to .vcxproj generation
      VS: Set default language in generated Windows Phone and Store projects

Robert Maynard (5):
      Features: Properly evaluate if the compiler supports cxx_final.
      Features: Record for MSVC C++ 2015 and MSVC C 2010-2015.
      Features: Quote all compiler names when comparing with COMPILER_ID
      Features: Enable writing of MSVC compiler feature header.
      Features: Record for MSVC 2010-2015

Roger Leigh (1):
      FindIntl: New module to find Gettext libintl

Rolf Eike Beer (9):
      FPHSA: remove unneeded variable dereferencing
      extend the testing for version comparison
      cmSystemTools: reimplement verson comparison without sscanf()
      CPackRPM: remove unneeded string length calculation
      GetPrerequisites: remove needless variable dereferencing
      GetPrerequisites: join if() clauses
      cmCTestTestHandler: take reference to temporary string instead of doing a copy
      CTest: Fix integer overflow when uploading huge files
      drop reference to removed Windows 9x support

Ruslan Baratov (3):
      cmSystemTools: Add StringToInt helper
      file: Add LOCK subcommand to do file and directory locking
      file: Use 'long' to represent the parsed LOCK TIMEOUT value

Sean McBride (3):
      Rename header guards to not start with double underscore
      Fix some Clang -Wstring-conversion warnings
      sha2: Fix -Wcast-qual warnings by adding const to some casts

Stephen Kelly (150):
      Remove borland workarounds.
      Help: Document that policies are not feature toggles.
      QtAutogen: Extract a GetRccExecutable method.
      QtAutogen: Expand rccfiles into a vector early in the autogen process.
      QtAutogen: Regenerate qrc files if their input changes (#15074)
      file(GENERATE): Use permissions of input file if present.
      Genex: Fix whitespace issue.
      Features: Split the Clang testable features to a separate file.
      file(GENERATE): Evaluate early to allow generating source files
      Features: Reorder the GNU C dialect feature tests
      Features: Use the correct dialect flag when recording features.
      Features: Run GNU feature tests with std=c++14 when available.
      QtAutogen: Don't take a reference to temporary.
      QtAutogen: Use cmHasLiteral{Prefix,Suffix} where possible.
      file(GENERATE): Re-run cmake when appropriate.
      Build CMake with most-recent available language dialect.
      Merge branch 'default-lang-dialect' into step2
      cmTarget: Remove std::min and std::max MSVC6 compatibility code.
      cmFindCommon: Remove MSVC6 workaround for nested struct private access.
      cmStandardIncludes: Remove MSVC6 condition for cmArrayBegin macro.
      cmSystemTools: Remove MSVC6 compatibility define.
      VisualStudio: Remove MSVC6 compatibility macro.
      cmGeneratorTarget: Remove MSVC7 workaround
      Help: Update developer manual with some C++ features now permitted.
      Help: Unify the help text of INTERFACE_ build properties.
      Help: Format the LINK_INTERFACE_LIBRARIES target properies.
      Help: Link to target_link_libraries from target properies.
      Help: Make remaining build property docs consistent.
      Help: Use a property-specific command instead of the generic one.
      Help: Fix typo in genex in documentation.
      Remove some unneeded c_str calls.
      WCDH: Make it possible to generate multiple files.
      Help: Warn that paths should not be used in INTERFACE_ build properties.
      Remove disallowed feature which Borland did not accept.
      Remove note disallowing use of some string and vector API.
      Help: Link to cmake-packages(7) from the Module creation documentation.
      Help: Remove disadvantage creating IMPORTED targets in Find modules.
      Help: Add useful links to IMPORTED targets and usage requirements.
      Help: Remove recommendation about checking minimum CMake version.
      Help: Document IMPORTED_CONFIGURATIONS target property for Find modules.
      Help: Document that IMPORTED targets in Find modules may be UNKNOWN.
      CTest: Expand a string directly into a container.
      cmGeneratorExpression: Remove unused header.
      Remove some temporary vectors for ExpandListArgument.
      Features: Record for AppleClang 5.1
      RunCMake: Expect empty output by default.
      Remove GCC 2.95 support macros in favor of template versions.
      Remove workaround for GCC < 3 ios_base absence.
      WCDH: Add feature portability for thread_local.
      Features: Record cxx_variable_templates for GNU 5.0.
      Features: Test an expectation of whether OVERRIDE_CONTROL is expected
      Features: Test feature propagation with more-common features.
      Features: Test nullptr as a side-effect activation of static_assert.
      Features: Add a comment explaining part of test.
      Drop SGI as a CMake host compiler.
      cmStandardIncludes: Remove comment about Borland.
      Remove Borland-related undef.
      cmStandardIncludes: Drop Comeau-related workaround.
      cmStandardIncludes: Remove iostreams workaround for obsolete Compaq compiler.
      cmStandardIncludes: Remove ANSI_FOR_SCOPE hack.
      cmStandardIncludes: Remove std namespace hack.
      Remove unused cmIStringStream class.
      cmInstallCommand: Remove unused variable.
      cmStandardIncludes: Add a join algorithm for string containers.
      Use the cmJoin algorithm where possible.
      Features: Record for MSVC 2010-2013.
      Features: Record dialect flags for AppleClang 4.0+.
      Features: Record for historical Xcode clang versions.
      SolarisStudio: Use alternative standard library to build CMake.
      Use two-iterator std::set::insert where appropriate.
      Revert "Misc. fixes for the Oracle / Sun compiler."
      Help: Remove documented restriction on insert APIs.
      Use insert instead of a loop in some cases.
      Help: Remove documented restriction on find in conditions.
      Help: Remove documented restriction on template use.
      cmTarget: Use insert instead of std::copy.
      Port all cmOStringStream to std::ostringstream.
      cmStandardIncludes: Remove obsolete cmOStringStream.
      Remove some obsolete stuff.
      Remove VS 6 special case.
      Record compile features for GNU on Apple.
      Add a generic algorithm for deleting items in a container.
      Use the cmDeleteAll algorithm instead of trivial raw loops.
      cmGeneratorExpressionEvaluator: Replace own algorithm with cmDeleteAll.
      cmVariableWatch: Use the cmDeleteAll algorithm with for_each.
      CMakeDetermineCompiler: Factor out xcrun invocation into a macro
      OS X: Resolve compiler in /usr/bin to that reported by Xcode xcrun
      Features: Extend the tests for the COMPILE_FEATURES genex.
      Features: Ensure appropriate return value from feature test macros.
      Features: Update the default_dialect test for old GNU-like compilers.
      Features: Make cxx_noexcept available from GNU 4.6.
      Features: Remove wrong content from else() condition.
      Features: Record C/CXX dialect flags for GNU 4.6.
      Features: Test an old value of __STDC_VERSION__ for GNU < 4.7 compatibility.
      Features: Don't test __cplusplus value for CXX98 on GNU.
      Features: Test __GXX_EXPERIMENTAL_CXX0X__ macro for GNU < 4.7 compatibility.
      Features: Extend the generalized_initializers test for GNU < 4.7.
      Features: Adjust cxx_variadic_templates unit test for GNU < 4.7.
      Features: Adjust the RunCMake test to use more-common features.
      Features: Record for GNU 4.6.
      Features: Ensure that the cxx_auto_type test is correct.
      WCDH: Find a language-specific DetermineCompiler.cmake if present.
      Features: Use variable in cxx_inheriting_constructors test.
      WCDH: Allow compilers to specify features for one language but not the other.
      Features: Adjust cxx_variadic_templates unit test for SolarisStudio.
      WCDH: Generate per-language files in multi-file mode.
      Features: Record for SolarisStudio 12.4.
      Help: Add notes for topic 'WriteCompilerDetectionHeader-multi-file-lang'
      Remove AppleClang-5.1-features.rst release notes.
      Features: Remove outdated comment.
      Features: Test presence of cxx_auto_type with genex.
      cmDeleteAll: Generalize deletion specialization for map types.
      Use the cmDeleteAll algorithm for types derived from std::map.
      Replace 'foo.size() > 0' pattern with !foo.empty().
      Replace 'foo.size() == 0' pattern with foo.empty().
      Replace 'foo.size() != 0' pattern with !foo.empty().
      cmListCommand: Use empty() and expand whitespace.
      Replace !foo.size() pattern with foo.empty().
      Replace foo.size() pattern with !foo.empty().
      Replace 'foo.length() == 0' pattern with foo.empty().
      Replace 'foo.length() > 0' pattern with !foo.empty().
      Replace 'foo.length() >= 1' pattern with !foo.empty()
      Replace foo.length() pattern with !foo.empty().
      Features: Update comment in test to match the code.
      Features: Use a more-common feature in cycle-test.
      Features: Blacklist cxx_constexpr test for GNU 4.5.
      Features: Wrap failure-test in UNIX condition.
      Features: Record for GNU 4.4.
      Convert raw loops to vector member insert.
      Convert raw loops to set member insert.
      cmListCommand: Replace loop with member algorithm.
      cmakemain: Use member insert in command line handling code.
      cmakemain: Initialize vector content with iterators directly.
      WCDH: Fix the C_STANDARD property in the tests.
      WCDH: Test that no C compiler features are defined for CXX compiler.
      Help: Document unsupported compilers in the release notes.
      IncludeDirectories: Respect SYSTEM flag when using CONFIG genex.
      Help: Clarify INTERFACE_SYSTEM_INCLUDE_DIRECTORIES documentation.
      Features: Emit a test failure if 'override' is present but not expected
      Features: Update GNU 5.0 C++14 features.
      QtAutogen: Issue error message with origin file (#15342).
      Help: Add some cross-linking.
      Help: Document build targets automatically added to console pool.
      AppleClang: Remove redundant UNIX condition.
      Features: Add dialect compile flags only if default is known.
      Features: Populate CMAKE_<LANG>_STANDARD_DEFAULT only for supported compilers.
      Features: Allow setting standard dialect below the default.
      Features: Fix C90 feature detection.
      Help: Add 3.2 release notes for file(GENERATE) features
      Help: Add 3.2 release note for AUTORCC dependency tracking

Sylvain Joubert (1):
      Configure some CMake-provided targets with USES_TERMINAL (#14915)

Tim Gallagher (2):
      Makefile: Refactor checks for lang-specific targets and export compile cmds
      Makefile: Add assembly and preprocessed targets for Fortran

Vladislav Vinogradov (1):
      ctest_coverage: Fix error message to report the file name

Zack Galbreath (3):
      Fix incremental linking setting for Fortran + VS
      ctest_coverage: Fix parsing of absolute paths in Cobertura files
      Help: Fix variable reference in TIMEOUT test property docs

?dne Hovda (5):
      FindCurses: Drop search for deprecated HP-UX cur_colr library
      ccmake: Remove incomplete support for cur_colr on old HP-UX
      ccmake: Use standard getmaxyx instead of non-standard getmax[xy]
      ccmake: Cleanup and simplify conditional blocks for HP-UX
      ccmake: Add CMAKE_USE_SYSTEM_FORM option to use libform instead of cmForm

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 13 15:04:07 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Feb 2015 15:04:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-136-g8206e8b
Message-ID: <20150213200407.43EB1AAF52@public.kitware.com>

This is an automated email from 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  8206e8b431241eae44ec000971fab1f49ea070fe (commit)
       via  6d19ef9b7c78f5ff04dda9a8dd7a84fe8787a23b (commit)
      from  0304e545289bb32a43a7c8973d604dad860f360b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8206e8b431241eae44ec000971fab1f49ea070fe
commit 8206e8b431241eae44ec000971fab1f49ea070fe
Merge: 0304e54 6d19ef9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 15:04:06 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 13 15:04:06 2015 -0500

    Merge topic 'doc-3.2-relnotes-fixup'
    
    6d19ef9b Help: In 3.2 relnotes move OpenGL/X11 to deprecated/removed section


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

Summary of changes:
 Help/release/3.2.rst |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 13 15:04:22 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Feb 2015 15:04:22 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-335-g4b05816
Message-ID: <20150213200422.B9261AAF51@public.kitware.com>

This is an automated email from 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  4b058169625067639def6b02b859d4c81d353354 (commit)
       via  8206e8b431241eae44ec000971fab1f49ea070fe (commit)
      from  9fb71ba4af3d1ab2132dce49bebfda4f124043bc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b058169625067639def6b02b859d4c81d353354
commit 4b058169625067639def6b02b859d4c81d353354
Merge: 9fb71ba 8206e8b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 15:04:15 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 13 15:04:15 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 13 15:05:25 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Feb 2015 15:05:25 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-139-gbe3d4b6
Message-ID: <20150213200525.C7108AAF73@public.kitware.com>

This is an automated email from 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  be3d4b665f27b9ea301540d5bf8154491ed815e0 (commit)
       via  9457bf9f4040f72c2d93da8bfb93d2554f37db17 (commit)
       via  481ec779ab560e7fda1012dda665879af26e5a39 (commit)
      from  8206e8b431241eae44ec000971fab1f49ea070fe (commit)

Those revisions listed 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 Feb 13 15:05:25 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Feb 2015 15:05:25 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-339-gc6cbbbe
Message-ID: <20150213200525.E2172AAF74@public.kitware.com>

This is an automated email from 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  c6cbbbeefa6d3e9a6d8d2821a7b1957e7ff07256 (commit)
       via  be3d4b665f27b9ea301540d5bf8154491ed815e0 (commit)
       via  9457bf9f4040f72c2d93da8bfb93d2554f37db17 (commit)
       via  481ec779ab560e7fda1012dda665879af26e5a39 (commit)
      from  4b058169625067639def6b02b859d4c81d353354 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6cbbbeefa6d3e9a6d8d2821a7b1957e7ff07256
commit c6cbbbeefa6d3e9a6d8d2821a7b1957e7ff07256
Merge: 4b05816 be3d4b6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 15:05:17 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 13 15:05:17 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 13 15:05:26 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 13 Feb 2015 15:05:26 -0500 (EST)
Subject: [Cmake-commits] CMake branch, release,
	updated. v3.2.0-rc1-4-g9457bf9
Message-ID: <20150213200526.07643AAF75@public.kitware.com>

This is an automated email from 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  9457bf9f4040f72c2d93da8bfb93d2554f37db17 (commit)
       via  6d19ef9b7c78f5ff04dda9a8dd7a84fe8787a23b (commit)
       via  481ec779ab560e7fda1012dda665879af26e5a39 (commit)
       via  029d38fa61a666bff89b522904e05a88f903d051 (commit)
      from  da92cdab5206d0556822ee12350636300ec73160 (commit)

Those revisions listed 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:
 Help/command/configure_file.rst |  125 +++++++++++++++++++++++++++++----------
 Help/release/3.2.rst            |   12 ++--
 2 files changed, 101 insertions(+), 36 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sat Feb 14 00:01:17 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Sat, 14 Feb 2015 00:01:17 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-140-gfeb7625
Message-ID: <20150214050117.BA029AADE8@public.kitware.com>

This is an automated email from 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  feb76254c5c9c078f0a66e27f6d5a6a964001e44 (commit)
      from  be3d4b665f27b9ea301540d5bf8154491ed815e0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=feb76254c5c9c078f0a66e27f6d5a6a964001e44
commit feb76254c5c9c078f0a66e27f6d5a6a964001e44
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sat Feb 14 00:01:14 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sat Feb 14 00:01:14 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index dcd8191..b905224 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 2)
-set(CMake_VERSION_PATCH 20150213)
+set(CMake_VERSION_PATCH 20150214)
 #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 Feb 15 00:01:10 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Sun, 15 Feb 2015 00:01:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-141-gfd8112e
Message-ID: <20150215050110.C7EF7AA765@public.kitware.com>

This is an automated email from 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  fd8112ea7c594c8e24230f08aa8bebc6117a1cf2 (commit)
      from  feb76254c5c9c078f0a66e27f6d5a6a964001e44 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd8112ea7c594c8e24230f08aa8bebc6117a1cf2
commit fd8112ea7c594c8e24230f08aa8bebc6117a1cf2
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sun Feb 15 00:01:08 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun Feb 15 00:01:08 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index b905224..f69e364 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 2)
-set(CMake_VERSION_PATCH 20150214)
+set(CMake_VERSION_PATCH 20150215)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sun Feb 15 14:56:34 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sun, 15 Feb 2015 14:56:34 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-351-gf0bc184
Message-ID: <20150215195634.114EAAAE22@public.kitware.com>

This is an automated email from 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  f0bc1843730bff040cd5bbdd09e1ccffd47ecb80 (commit)
       via  116459d34fab6327906e901753611636f84a16c1 (commit)
       via  1c7c35c3723abfb91f5e9a986ccd4f7e70683baf (commit)
       via  cebeed248606ba92597b7e32a5b0be1f474f7a91 (commit)
       via  3cfe7a4ca876c496f9b491e4175fd1c9be24f3d7 (commit)
       via  050958a3286f69c577fe5d03407800cbe0367898 (commit)
       via  a77af8f1301b6a9964c187ffff7a1893a80fbe90 (commit)
       via  6a22e40147b7df5285a67b63249562ecbeff112e (commit)
       via  0b5cf0dabd430dfe1289e865b1b51c41066338a7 (commit)
       via  069f2440c471e89dfe2ecf6778bbab16e9fbe491 (commit)
       via  67a26764b536992a966cacab4811c2d30624405c (commit)
       via  1cecd3a53107f7f670cf011201c1da3a33b795b6 (commit)
      from  c6cbbbeefa6d3e9a6d8d2821a7b1957e7ff07256 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0bc1843730bff040cd5bbdd09e1ccffd47ecb80
commit f0bc1843730bff040cd5bbdd09e1ccffd47ecb80
Merge: c6cbbbe 116459d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 14:56:32 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 15 14:56:32 2015 -0500

    Merge topic 'cmListCommand-algorithms' into next
    
    116459d3 cmListCommand: Avoid needlessly erasing from vectors.
    1c7c35c3 cmListCommand: Replace remove duplicates loop with algorithm.
    cebeed24 cmAlgorithms: Add cmRemoveDuplicates algorithm.
    3cfe7a4c cmListCommand: Implement REMOVE_ITEM in terms of cmRemoveMatching.
    050958a3 cmAlgorithms: Add cmRemoveMatching algorithm.
    a77af8f1 cmListCommand: Replace joining loop with cmJoin algorithm.
    6a22e401 cmListCommand: Use cmRemoveIndices for REMOVE_AT subcommand.
    0b5cf0da cmAlgorithms: Implement algorithm for removing indexes.
    069f2440 cmListCommand: Convert loop to find algorithm.
    67a26764 cmListCommand: Implement REVERSE subcommand with std::reverse.
    1cecd3a5 cmListCommand: Use std::find algorithm for FIND subcommand.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=116459d34fab6327906e901753611636f84a16c1
commit 116459d34fab6327906e901753611636f84a16c1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 15:48:51 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 15 20:47:51 2015 +0100

    cmListCommand: Avoid needlessly erasing from vectors.
    
    The entire vector will be destroyed at once at the end of the scope,
    and the remove algorithms already give us the end of the range of
    interesting values, so just use those sentinals.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index e2ebe0a..98dcef1 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -357,13 +357,14 @@ bool cmListCommand
 
   std::vector<std::string> remove(args.begin() + 2, args.end());
   std::sort(remove.begin(), remove.end());
-  remove.erase(std::unique(remove.begin(), remove.end()), remove.end());
-
-  varArgsExpanded.erase(
-      cmRemoveMatching(varArgsExpanded, remove),
-      varArgsExpanded.end());
-
-  std::string value = cmJoin(varArgsExpanded, ";");
+  std::vector<std::string>::const_iterator remEnd =
+      std::unique(remove.begin(), remove.end());
+  std::vector<std::string>::const_iterator remBegin = remove.begin();
+
+  std::vector<std::string>::const_iterator argsEnd =
+      cmRemoveMatching(varArgsExpanded, cmRange(remBegin, remEnd));
+  std::vector<std::string>::const_iterator argsBegin = varArgsExpanded.begin();
+  std::string value = cmJoin(cmRange(argsBegin, argsEnd), ";");
   this->Makefile->AddDefinition(listName, value.c_str());
   return true;
 }
@@ -418,9 +419,11 @@ bool cmListCommand
     return false;
     }
 
-  varArgsExpanded.erase(cmRemoveDuplicates(varArgsExpanded),
-                        varArgsExpanded.end());
-  std::string value = cmJoin(varArgsExpanded, ";");
+  std::vector<std::string>::const_iterator argsEnd =
+      cmRemoveDuplicates(varArgsExpanded);
+  std::vector<std::string>::const_iterator argsBegin =
+      varArgsExpanded.begin();
+  std::string value = cmJoin(cmRange(argsBegin, argsEnd), ";");
 
   this->Makefile->AddDefinition(listName, value.c_str());
   return true;
@@ -503,13 +506,14 @@ bool cmListCommand::HandleRemoveAtCommand(
     }
 
   std::sort(removed.begin(), removed.end());
-  removed.erase(std::unique(removed.begin(), removed.end()), removed.end());
-
-  varArgsExpanded.erase(cmRemoveIndices(varArgsExpanded, removed),
-                        varArgsExpanded.end());
-
-  std::string value = cmJoin(varArgsExpanded, ";");
-
+  std::vector<size_t>::const_iterator remEnd =
+      std::unique(removed.begin(), removed.end());
+  std::vector<size_t>::const_iterator remBegin = removed.begin();
+
+  std::vector<std::string>::const_iterator argsEnd =
+      cmRemoveIndices(varArgsExpanded, cmRange(remBegin, remEnd));
+  std::vector<std::string>::const_iterator argsBegin = varArgsExpanded.begin();
+  std::string value = cmJoin(cmRange(argsBegin, argsEnd), ";");
 
   this->Makefile->AddDefinition(listName, value.c_str());
   return true;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c7c35c3723abfb91f5e9a986ccd4f7e70683baf
commit 1c7c35c3723abfb91f5e9a986ccd4f7e70683baf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 16:22:08 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 15 20:47:51 2015 +0100

    cmListCommand: Replace remove duplicates loop with algorithm.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 50adce6..e2ebe0a 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -418,24 +418,9 @@ bool cmListCommand
     return false;
     }
 
-  std::string value;
-
-
-  std::set<std::string> unique;
-  std::vector<std::string>::iterator it;
-  const char* sep = "";
-  for ( it = varArgsExpanded.begin(); it != varArgsExpanded.end(); ++ it )
-    {
-    if (unique.find(*it) != unique.end())
-      {
-      continue;
-      }
-    unique.insert(*it);
-    value += sep;
-    value += it->c_str();
-    sep = ";";
-    }
-
+  varArgsExpanded.erase(cmRemoveDuplicates(varArgsExpanded),
+                        varArgsExpanded.end());
+  std::string value = cmJoin(varArgsExpanded, ";");
 
   this->Makefile->AddDefinition(listName, value.c_str());
   return true;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cebeed248606ba92597b7e32a5b0be1f474f7a91
commit cebeed248606ba92597b7e32a5b0be1f474f7a91
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 19:08:12 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 15 20:46:25 2015 +0100

    cmAlgorithms: Add cmRemoveDuplicates algorithm.
    
    Start by creating a vector to hold a unique values of the input range.  We
    expect that in most cases, there will be relatively few duplicates, so
    reserving enough memory for a complete copy is worthwhile.  Unlike a solution
    involving a std::set, this algorithm allocates all the memory it needs
    in one go and in one place, so it is more cache friendly.
    
    Populate the unique copy with a lower_bound insert algorithm and record the
    indices of duplicates.  This is the same complexity as the std::set insert
    algorithm, but without the need to allocate memory on the heap and other
    disadvantages of std::set.
    
    Remove the duplicates with the cmRemoveIndices algorithm.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 0f162a2..a996088 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -250,4 +250,33 @@ typename Range::const_iterator cmRemoveMatching(Range &r, MatchRange const& m)
                         ContainerAlgorithms::BinarySearcher<MatchRange>(m));
 }
 
+template<typename Range>
+typename Range::const_iterator cmRemoveDuplicates(Range& r)
+{
+  std::vector<typename Range::value_type> unique;
+  unique.reserve(r.size());
+  std::vector<size_t> indices;
+  size_t count = 0;
+  for(typename Range::const_iterator it = r.begin();
+      it != r.end(); ++it, ++count)
+    {
+    typename Range::iterator low =
+        std::lower_bound(unique.begin(), unique.end(), *it);
+    if (low == unique.end() || *low != *it)
+      {
+      unique.insert(low, *it);
+      }
+    else
+      {
+      indices.push_back(count);
+      }
+    }
+  if (indices.empty())
+    {
+    return r.end();
+    }
+  std::sort(indices.begin(), indices.end());
+  return cmRemoveIndices(r, indices);
+}
+
 #endif

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cfe7a4ca876c496f9b491e4175fd1c9be24f3d7
commit 3cfe7a4ca876c496f9b491e4175fd1c9be24f3d7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 16:00:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 15 19:56:09 2015 +0100

    cmListCommand: Implement REMOVE_ITEM in terms of cmRemoveMatching.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 592681b..50adce6 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -355,23 +355,13 @@ bool cmListCommand
     return false;
     }
 
-  size_t cc;
-  for ( cc = 2; cc < args.size(); ++ cc )
-    {
-    size_t kk = 0;
-    while ( kk < varArgsExpanded.size() )
-      {
-      if ( varArgsExpanded[kk] == args[cc] )
-        {
-        varArgsExpanded.erase(varArgsExpanded.begin()+kk);
-        }
-      else
-        {
-        kk ++;
-        }
-      }
-    }
+  std::vector<std::string> remove(args.begin() + 2, args.end());
+  std::sort(remove.begin(), remove.end());
+  remove.erase(std::unique(remove.begin(), remove.end()), remove.end());
 
+  varArgsExpanded.erase(
+      cmRemoveMatching(varArgsExpanded, remove),
+      varArgsExpanded.end());
 
   std::string value = cmJoin(varArgsExpanded, ";");
   this->Makefile->AddDefinition(listName, value.c_str());

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=050958a3286f69c577fe5d03407800cbe0367898
commit 050958a3286f69c577fe5d03407800cbe0367898
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 18:58:36 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 15 19:56:08 2015 +0100

    cmAlgorithms: Add cmRemoveMatching algorithm.
    
    Implement it in terms of std::remove_if with a binary search through
    a matching range.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 70fdff6..0f162a2 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -154,6 +154,23 @@ Iter RemoveN(Iter i1, Iter i2, size_t n)
   return ContainerAlgorithms::Rotate(i1, i1 + n, i2);
 }
 
+template<typename Range>
+struct BinarySearcher
+{
+  typedef typename Range::value_type argument_type;
+  BinarySearcher(Range const& r)
+    : m_range(r)
+  {
+  }
+
+  bool operator()(argument_type const& item)
+  {
+    return std::binary_search(m_range.begin(), m_range.end(), item);
+  }
+private:
+  Range const& m_range;
+};
+
 }
 
 template<typename Iter1, typename Iter2>
@@ -226,4 +243,11 @@ typename Range::const_iterator cmRemoveIndices(Range& r, InputRange const& rem)
   return writer;
 }
 
+template<typename Range, typename MatchRange>
+typename Range::const_iterator cmRemoveMatching(Range &r, MatchRange const& m)
+{
+  return std::remove_if(r.begin(), r.end(),
+                        ContainerAlgorithms::BinarySearcher<MatchRange>(m));
+}
+
 #endif

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a77af8f1301b6a9964c187ffff7a1893a80fbe90
commit a77af8f1301b6a9964c187ffff7a1893a80fbe90
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 15:46:30 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 15 19:56:07 2015 +0100

    cmListCommand: Replace joining loop with cmJoin algorithm.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 93c6d66..592681b 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -533,14 +533,8 @@ bool cmListCommand::HandleRemoveAtCommand(
   varArgsExpanded.erase(cmRemoveIndices(varArgsExpanded, removed),
                         varArgsExpanded.end());
 
-  std::string value;
-  const char* sep = "";
-  for ( cc = 0; cc < varArgsExpanded.size(); ++ cc )
-    {
-    value += sep;
-    value += varArgsExpanded[cc];
-    sep = ";";
-    }
+  std::string value = cmJoin(varArgsExpanded, ";");
+
 
   this->Makefile->AddDefinition(listName, value.c_str());
   return true;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a22e40147b7df5285a67b63249562ecbeff112e
commit 6a22e40147b7df5285a67b63249562ecbeff112e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 15:23:43 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 15 19:55:28 2015 +0100

    cmListCommand: Use cmRemoveIndices for REMOVE_AT subcommand.
    
    Avoid repeatedly looping over the indices to process elements (even
    without breaking out of the loop when the element is found).

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 826632f..93c6d66 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -527,26 +527,19 @@ bool cmListCommand::HandleRemoveAtCommand(
     removed.push_back(static_cast<size_t>(item));
     }
 
+  std::sort(removed.begin(), removed.end());
+  removed.erase(std::unique(removed.begin(), removed.end()), removed.end());
+
+  varArgsExpanded.erase(cmRemoveIndices(varArgsExpanded, removed),
+                        varArgsExpanded.end());
+
   std::string value;
   const char* sep = "";
   for ( cc = 0; cc < varArgsExpanded.size(); ++ cc )
     {
-    size_t kk;
-    bool found = false;
-    for ( kk = 0; kk < removed.size(); ++ kk )
-      {
-      if ( cc == removed[kk] )
-        {
-        found = true;
-        }
-      }
-
-    if ( !found )
-      {
-      value += sep;
-      value += varArgsExpanded[cc];
-      sep = ";";
-      }
+    value += sep;
+    value += varArgsExpanded[cc];
+    sep = ";";
     }
 
   this->Makefile->AddDefinition(listName, value.c_str());

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b5cf0dabd430dfe1289e865b1b51c41066338a7
commit 0b5cf0dabd430dfe1289e865b1b51c41066338a7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 12 18:47:10 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 15 19:04:31 2015 +0100

    cmAlgorithms: Implement algorithm for removing indexes.
    
    Implement ContainerAlgorithms::RemoveN to remove N elements to the
    end of a container by rotating.  The rotate is implemented in terms
    of the efficient swap algorithm, optimized even more in the standard
    library implementation when the compiler supports the rvalue-references
    feature to move elements.  Implement cmRemoveN with a Range API
    for completeness.
    
    std::rotate in C++11 is specified to return an iterator, but
    c++98 specifies it to return void.  libstdc++ 5.0 will be the first
    version to have the correct return type.  Implement
    ContainerAlgorithms::Rotate in terms of std::rotate and return the
    correct iterator from it.  While std::rotate requires forward iterators,
     this workaround means cmRotate requires bidirectional iterators.  As
    most of CMake uses random access iterators anyway, this should not
    be a problem.
    
    Implement cmRemoveIndices in terms of the RemoveN algorithm, such
    that each element which is not removed is rotated only once.  This
    can not use the cmRemoveN range-API algorithm because that would
    require creating a new range, but the range must be taken by reference
    and so it can't be a temporary.
    
    These remove algorithms are not part of the STL and I couldn't find them
    anywhere else either.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index ad2b9c1..70fdff6 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -138,6 +138,22 @@ private:
   const_iterator End;
 };
 
+template<typename BiDirIt>
+BiDirIt Rotate(BiDirIt first, BiDirIt middle, BiDirIt last)
+{
+  typename std::iterator_traits<BiDirIt>::difference_type dist =
+      std::distance(first, middle);
+  std::rotate(first, middle, last);
+  std::advance(last, -dist);
+  return last;
+}
+
+template<typename Iter>
+Iter RemoveN(Iter i1, Iter i2, size_t n)
+{
+  return ContainerAlgorithms::Rotate(i1, i1 + n, i2);
+}
+
 }
 
 template<typename Iter1, typename Iter2>
@@ -188,4 +204,26 @@ std::string cmJoin(Range const& r, std::string delimiter)
   return cmJoin(r, delimiter.c_str());
 };
 
+template<typename Range>
+typename Range::const_iterator cmRemoveN(Range& r, size_t n)
+{
+  return ContainerAlgorithms::RemoveN(r.begin(), r.end(), n);
+}
+
+template<typename Range, typename InputRange>
+typename Range::const_iterator cmRemoveIndices(Range& r, InputRange const& rem)
+{
+  typename InputRange::const_iterator remIt = rem.begin();
+
+  typename Range::iterator writer = r.begin() + *remIt;
+  ++remIt;
+  size_t count = 1;
+  for ( ; writer != r.end() && remIt != rem.end(); ++count, ++remIt)
+    {
+    writer = ContainerAlgorithms::RemoveN(writer, r.begin() + *remIt, count);
+    }
+  writer = ContainerAlgorithms::RemoveN(writer, r.end(), count);
+  return writer;
+}
+
 #endif

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=069f2440c471e89dfe2ecf6778bbab16e9fbe491
commit 069f2440c471e89dfe2ecf6778bbab16e9fbe491
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 12 20:07:20 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 15 19:04:30 2015 +0100

    cmListCommand: Convert loop to find algorithm.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 22d8b0e..826632f 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -104,19 +104,8 @@ bool cmListCommand::GetList(std::vector<std::string>& list,
     }
   // expand the variable into a list
   cmSystemTools::ExpandListArgument(listString, list, true);
-  // check the list for empty values
-  bool hasEmpty = false;
-  for(std::vector<std::string>::iterator i = list.begin();
-      i != list.end(); ++i)
-    {
-    if(i->empty())
-      {
-      hasEmpty = true;
-      break;
-      }
-    }
   // if no empty elements then just return
-  if(!hasEmpty)
+  if (std::find(list.begin(), list.end(), std::string()) == list.end())
     {
     return true;
     }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67a26764b536992a966cacab4811c2d30624405c
commit 67a26764b536992a966cacab4811c2d30624405c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 18:02:56 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 15 18:57:23 2015 +0100

    cmListCommand: Implement REVERSE subcommand with std::reverse.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index ae13fdf..22d8b0e 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -410,15 +410,8 @@ bool cmListCommand
     return false;
     }
 
-  std::string value;
-  std::vector<std::string>::reverse_iterator it;
-  const char* sep = "";
-  for ( it = varArgsExpanded.rbegin(); it != varArgsExpanded.rend(); ++ it )
-    {
-    value += sep;
-    value += it->c_str();
-    sep = ";";
-    }
+  std::reverse(varArgsExpanded.begin(), varArgsExpanded.end());
+  std::string value = cmJoin(varArgsExpanded, ";");
 
   this->Makefile->AddDefinition(listName, value.c_str());
   return true;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1cecd3a53107f7f670cf011201c1da3a33b795b6
commit 1cecd3a53107f7f670cf011201c1da3a33b795b6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 24 18:43:37 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 15 14:28:50 2015 +0100

    cmListCommand: Use std::find algorithm for FIND subcommand.
    
    Use a ostringstream to account for the input being a variable of type
    size_t as a result of using std::distance.  There is no single
    format string which portably accepts a size_t.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index dd0cfa9..ae13fdf 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -284,18 +284,14 @@ bool cmListCommand::HandleFindCommand(std::vector<std::string> const& args)
     return true;
     }
 
-  std::vector<std::string>::iterator it;
-  unsigned int index = 0;
-  for ( it = varArgsExpanded.begin(); it != varArgsExpanded.end(); ++ it )
+  std::vector<std::string>::iterator it =
+      std::find(varArgsExpanded.begin(), varArgsExpanded.end(), args[2]);
+  if (it != varArgsExpanded.end())
     {
-    if ( *it == args[2] )
-      {
-      char indexString[32];
-      sprintf(indexString, "%d", index);
-      this->Makefile->AddDefinition(variableName, indexString);
-      return true;
-      }
-    index++;
+    std::ostringstream indexStream;
+    indexStream << std::distance(varArgsExpanded.begin(), it);
+    this->Makefile->AddDefinition(variableName, indexStream.str().c_str());
+    return true;
     }
 
   this->Makefile->AddDefinition(variableName, "-1");

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

Summary of changes:
 Source/cmAlgorithms.h    |   91 +++++++++++++++++++++++++++++++++++
 Source/cmListCommand.cxx |  120 +++++++++++++---------------------------------
 2 files changed, 123 insertions(+), 88 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Mon Feb 16 00:01:11 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Mon, 16 Feb 2015 00:01:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-142-gf724ab5
Message-ID: <20150216050111.43F09AB48C@public.kitware.com>

This is an automated email from 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  f724ab5e78ec71b22c8b5dc9e894d3feb288c620 (commit)
      from  fd8112ea7c594c8e24230f08aa8bebc6117a1cf2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f724ab5e78ec71b22c8b5dc9e894d3feb288c620
commit f724ab5e78ec71b22c8b5dc9e894d3feb288c620
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Mon Feb 16 00:01:09 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Feb 16 00:01:09 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index f69e364..46d0888 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 2)
-set(CMake_VERSION_PATCH 20150215)
+set(CMake_VERSION_PATCH 20150216)
 #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 Feb 16 09:21:08 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Feb 2015 09:21:08 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-353-g2134fab
Message-ID: <20150216142108.9B965AAF1B@public.kitware.com>

This is an automated email from 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  2134fab0806beb1f0872e37ff7388e062370c476 (commit)
       via  c23c9083f7c349188df0067fbc685d76983d2b34 (commit)
      from  f0bc1843730bff040cd5bbdd09e1ccffd47ecb80 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2134fab0806beb1f0872e37ff7388e062370c476
commit 2134fab0806beb1f0872e37ff7388e062370c476
Merge: f0bc184 c23c908
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 16 09:21:07 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 16 09:21:07 2015 -0500

    Merge topic 'FindMatlab-rewrite' into next
    
    c23c9083 FindMatlab: Hide 'reg' tool stderr output


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c23c9083f7c349188df0067fbc685d76983d2b34
commit c23c9083f7c349188df0067fbc685d76983d2b34
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 16 09:18:29 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 16 09:18:29 2015 -0500

    FindMatlab: Hide 'reg' tool stderr output

diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 3af4252..c30ca37 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -370,7 +370,9 @@ function(matlab_extract_all_installed_versions_from_registry win64 matlab_versio
   execute_process(
     COMMAND ${MATLAB_REG_EXE_LOCATION} query HKEY_LOCAL_MACHINE\\SOFTWARE\\Mathworks\\MATLAB /f * /k ${APPEND_REG}
     RESULT_VARIABLE resultMatlab
-    OUTPUT_VARIABLE varMatlab)
+    OUTPUT_VARIABLE varMatlab
+    ERROR_VARIABLE errMatlab
+    )
   #message("Matlabs = ${varMatlab} | ${resultMatlab}")
 
 

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 16 09:44:41 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Feb 2015 09:44:41 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-144-g7747e1a
Message-ID: <20150216144441.E16C7A8240@public.kitware.com>

This is an automated email from 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  7747e1a7f6414e1d6308cd2b469246ed8e1a66c5 (commit)
       via  a2ccbffd8b4191f7b8b888fafde85eb5e7dbb2e4 (commit)
      from  f724ab5e78ec71b22c8b5dc9e894d3feb288c620 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7747e1a7f6414e1d6308cd2b469246ed8e1a66c5
commit 7747e1a7f6414e1d6308cd2b469246ed8e1a66c5
Merge: f724ab5 a2ccbff
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 16 09:44:40 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 16 09:44:40 2015 -0500

    Merge topic 'wix-product-fragment'
    
    a2ccbffd CPackWIX: Extend the patching mechanism to allow adding content to <Product>.


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

Summary of changes:
 Modules/CPackWIX.cmake                   |    5 ++++-
 Modules/WIX.template.in                  |    1 +
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |   14 +++++++++++++-
 Source/CPack/WiX/cmCPackWIXGenerator.h   |    4 +++-
 4 files changed, 21 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 16 09:44:43 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Feb 2015 09:44:43 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-146-g7632dae
Message-ID: <20150216144443.8A48AA8240@public.kitware.com>

This is an automated email from 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  7632daebd3b8378a17b302528d0690da97cb8cb5 (commit)
       via  d891d47434a181f14554622118c39c954d6a9466 (commit)
      from  7747e1a7f6414e1d6308cd2b469246ed8e1a66c5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7632daebd3b8378a17b302528d0690da97cb8cb5
commit 7632daebd3b8378a17b302528d0690da97cb8cb5
Merge: 7747e1a d891d47
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 16 09:44:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 16 09:44:42 2015 -0500

    Merge topic 'test-rpmbuild-cleanup'
    
    d891d474 Tests: Consolidate detection of 'rpmbuild'


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

Summary of changes:
 Tests/CMakeLists.txt          |   25 +++++++++++++++----------
 Tests/RunCMake/CMakeLists.txt |    2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 16 09:44:45 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Feb 2015 09:44:45 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-158-gec1ec47
Message-ID: <20150216144445.79011A8321@public.kitware.com>

This is an automated email from 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  ec1ec47193fcab7084e8edd977d3bebd1e8c73cb (commit)
       via  116459d34fab6327906e901753611636f84a16c1 (commit)
       via  1c7c35c3723abfb91f5e9a986ccd4f7e70683baf (commit)
       via  cebeed248606ba92597b7e32a5b0be1f474f7a91 (commit)
       via  3cfe7a4ca876c496f9b491e4175fd1c9be24f3d7 (commit)
       via  050958a3286f69c577fe5d03407800cbe0367898 (commit)
       via  a77af8f1301b6a9964c187ffff7a1893a80fbe90 (commit)
       via  6a22e40147b7df5285a67b63249562ecbeff112e (commit)
       via  0b5cf0dabd430dfe1289e865b1b51c41066338a7 (commit)
       via  069f2440c471e89dfe2ecf6778bbab16e9fbe491 (commit)
       via  67a26764b536992a966cacab4811c2d30624405c (commit)
       via  1cecd3a53107f7f670cf011201c1da3a33b795b6 (commit)
      from  7632daebd3b8378a17b302528d0690da97cb8cb5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec1ec47193fcab7084e8edd977d3bebd1e8c73cb
commit ec1ec47193fcab7084e8edd977d3bebd1e8c73cb
Merge: 7632dae 116459d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 16 09:44:44 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 16 09:44:44 2015 -0500

    Merge topic 'cmListCommand-algorithms'
    
    116459d3 cmListCommand: Avoid needlessly erasing from vectors.
    1c7c35c3 cmListCommand: Replace remove duplicates loop with algorithm.
    cebeed24 cmAlgorithms: Add cmRemoveDuplicates algorithm.
    3cfe7a4c cmListCommand: Implement REMOVE_ITEM in terms of cmRemoveMatching.
    050958a3 cmAlgorithms: Add cmRemoveMatching algorithm.
    a77af8f1 cmListCommand: Replace joining loop with cmJoin algorithm.
    6a22e401 cmListCommand: Use cmRemoveIndices for REMOVE_AT subcommand.
    0b5cf0da cmAlgorithms: Implement algorithm for removing indexes.
    069f2440 cmListCommand: Convert loop to find algorithm.
    67a26764 cmListCommand: Implement REVERSE subcommand with std::reverse.
    1cecd3a5 cmListCommand: Use std::find algorithm for FIND subcommand.


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

Summary of changes:
 Source/cmAlgorithms.h    |   91 +++++++++++++++++++++++++++++++++++
 Source/cmListCommand.cxx |  120 +++++++++++++---------------------------------
 2 files changed, 123 insertions(+), 88 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 16 09:45:09 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Feb 2015 09:45:09 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-360-g3935a01
Message-ID: <20150216144509.0A1D6A825A@public.kitware.com>

This is an automated email from 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  3935a0116c39fe760d7100de04e912be25985d5b (commit)
       via  ec1ec47193fcab7084e8edd977d3bebd1e8c73cb (commit)
       via  7632daebd3b8378a17b302528d0690da97cb8cb5 (commit)
       via  7747e1a7f6414e1d6308cd2b469246ed8e1a66c5 (commit)
       via  f724ab5e78ec71b22c8b5dc9e894d3feb288c620 (commit)
       via  fd8112ea7c594c8e24230f08aa8bebc6117a1cf2 (commit)
       via  feb76254c5c9c078f0a66e27f6d5a6a964001e44 (commit)
      from  2134fab0806beb1f0872e37ff7388e062370c476 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3935a0116c39fe760d7100de04e912be25985d5b
commit 3935a0116c39fe760d7100de04e912be25985d5b
Merge: 2134fab ec1ec47
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 16 09:45:00 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 16 09:45:00 2015 -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 Feb 16 13:00:36 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 16 Feb 2015 13:00:36 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-363-g4607c51
Message-ID: <20150216180036.F0F7AAAD53@public.kitware.com>

This is an automated email from 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  4607c510ae328a90efd2c7af6671315251333553 (commit)
       via  fa8b30ebb57da8ddc3e3616c4d212811abc19335 (commit)
       via  aa2ba12164046cd1812c3f3b67cadca856d51846 (commit)
      from  3935a0116c39fe760d7100de04e912be25985d5b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4607c510ae328a90efd2c7af6671315251333553
commit 4607c510ae328a90efd2c7af6671315251333553
Merge: 3935a01 fa8b30e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 16 13:00:36 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 16 13:00:36 2015 -0500

    Merge topic 'vs7-OutputDirectory' into next
    
    fa8b30eb VS: Fix .vcproj and .vfproj file OutputDirectory generation
    aa2ba121 VS: Use $(ConfigurationName) as CMAKE_CFG_INTDIR in VS 7, 8, 9


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa8b30ebb57da8ddc3e3616c4d212811abc19335
commit fa8b30ebb57da8ddc3e3616c4d212811abc19335
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 16 11:13:43 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 16 11:48:16 2015 -0500

    VS: Fix .vcproj and .vfproj file OutputDirectory generation
    
    Teach cmLocalVisualStudio7Generator to set 'OutputDirectory' using the
    same method as is used to set the 'OutputFile' in the generated project
    file.  Also, OutputDirectory only needs to be set for targets that run the
    linker or librarian.  These two changes make the VS 7 OutputDirectory
    consistent with what cmVisualStudio10TargetGenerator generates for OutDir.
    
    Without this, since the VS Intel Fortran plugin for VS >= 10 still uses
    the VS 7 .vfproj file format, when executing test VSGNUFortran using
    Intel Fortran Compiler 15.xx, the following warning is issued just
    before compilation:
    
      TargetPath(...) does not match the Linker's OutputFile property value (...).
      This may cause your project to build incorrectly.
      To correct this, please make sure that $(OutDir), $(TargetName) and $(TargetExt)
      property values match the value specified in %(Link.OutputFile).
    
    Subsequently, an error is reported during linking.
    
    Inspired-by: Vincent Newsum <vynewsum at gmail.com>

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 88c5284..ed560aa 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -669,8 +669,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
     static_cast<cmGlobalVisualStudio7Generator*>(this->GlobalGenerator);
   fout << "\t\t<Configuration\n"
        << "\t\t\tName=\"" << configName
-       << "|" << gg->GetPlatformName() << "\"\n"
-       << "\t\t\tOutputDirectory=\"" << configName << "\"\n";
+       << "|" << gg->GetPlatformName() << "\"\n";
   // This is an internal type to Visual Studio, it seems that:
   // 4 == static library
   // 2 == dll
@@ -798,6 +797,16 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   std::string intermediateDir = this->GetTargetDirectory(target);
   intermediateDir += "/";
   intermediateDir += configName;
+
+  if (target.GetType() < cmTarget::UTILITY)
+    {
+    std::string const& outDir =
+      target.GetType() == cmTarget::OBJECT_LIBRARY?
+      intermediateDir : target.GetDirectory(configName);
+    fout << "\t\t\tOutputDirectory=\""
+         << this->ConvertToXMLOutputPathSingle(outDir.c_str()) << "\"\n";
+    }
+
   fout << "\t\t\tIntermediateDirectory=\""
        << this->ConvertToXMLOutputPath(intermediateDir.c_str())
        << "\"\n"

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa2ba12164046cd1812c3f3b67cadca856d51846
commit aa2ba12164046cd1812c3f3b67cadca856d51846
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 16 11:11:37 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 16 11:48:04 2015 -0500

    VS: Use $(ConfigurationName) as CMAKE_CFG_INTDIR in VS 7, 8, 9
    
    This will allow us to use a value other than just the config name
    for the project OutputDirectory setting used for $(OutDir).
    
    Also use $(ConfigurationName) instead of $(OutDir) for the link
    directory configuration suffix since that is a hard-coded instance of
    a use case for CMAKE_CFG_INTDIR.

diff --git a/Help/release/dev/vs7-OutputDirectory.rst b/Help/release/dev/vs7-OutputDirectory.rst
new file mode 100644
index 0000000..2725d0c
--- /dev/null
+++ b/Help/release/dev/vs7-OutputDirectory.rst
@@ -0,0 +1,10 @@
+vs7-OutputDirectory
+-------------------
+
+* The :variable:`CMAKE_CFG_INTDIR` variable value for Visual Studio
+  7, 8, and 9 is now ``$(ConfigurationName)`` instead of ``$(OutDir)``.
+  This should have no effect on the intended use cases of the variable.
+
+* With Visual Studio 7, 8, and 9 generators the value of the ``$(OutDir)``
+  placeholder no longer evaluates to the configuration name.  Projects
+  should use ``$(ConfigurationName)`` for that instead.
diff --git a/Help/variable/CMAKE_CFG_INTDIR.rst b/Help/variable/CMAKE_CFG_INTDIR.rst
index 20435e5..55f7b01 100644
--- a/Help/variable/CMAKE_CFG_INTDIR.rst
+++ b/Help/variable/CMAKE_CFG_INTDIR.rst
@@ -12,11 +12,11 @@ values:
 
 ::
 
-  $(IntDir)        = Visual Studio 6
-  $(OutDir)        = Visual Studio 7, 8, 9
-  $(Configuration) = Visual Studio 10
-  $(CONFIGURATION) = Xcode
-  .                = Make-based tools
+  $(IntDir)            = Visual Studio 6
+  $(ConfigurationName) = Visual Studio 7, 8, 9
+  $(Configuration)     = Visual Studio 10
+  $(CONFIGURATION)     = Xcode
+  .                    = Make-based tools
 
 Since these values are evaluated by the native build system, this
 variable is suitable only for use in command lines that will be
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 201a6a6..b591653 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -94,7 +94,8 @@ public:
                                         std::string& dir);
 
   ///! What is the configurations directory variable called?
-  virtual const char* GetCMakeCFGIntDir() const { return "$(OutDir)"; }
+  virtual const char* GetCMakeCFGIntDir() const
+    { return "$(ConfigurationName)"; }
 
   /** Return true if the target project file should have the option
       LinkLibraryDependencies and link to .sln dependencies. */
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 914df5f..88c5284 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1441,7 +1441,8 @@ cmLocalVisualStudio7Generator
 
     // First search a configuration-specific subdirectory and then the
     // original directory.
-    fout << comma << this->ConvertToXMLOutputPath((dir+"/$(OutDir)").c_str())
+    fout << comma
+         << this->ConvertToXMLOutputPath((dir+"/$(ConfigurationName)").c_str())
          << "," << this->ConvertToXMLOutputPath(dir.c_str());
     comma = ",";
     }

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

Summary of changes:
 Help/release/dev/vs7-OutputDirectory.rst |   10 ++++++++++
 Help/variable/CMAKE_CFG_INTDIR.rst       |   10 +++++-----
 Source/cmGlobalVisualStudio7Generator.h  |    3 ++-
 Source/cmLocalVisualStudio7Generator.cxx |   16 +++++++++++++---
 4 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 Help/release/dev/vs7-OutputDirectory.rst


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Tue Feb 17 00:01:10 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Tue, 17 Feb 2015 00:01:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-159-g034f8e0
Message-ID: <20150217050110.A7222AB065@public.kitware.com>

This is an automated email from 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  034f8e0bd9a2b8a319fead5042ee5782a0df03fd (commit)
      from  ec1ec47193fcab7084e8edd977d3bebd1e8c73cb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=034f8e0bd9a2b8a319fead5042ee5782a0df03fd
commit 034f8e0bd9a2b8a319fead5042ee5782a0df03fd
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Tue Feb 17 00:01:08 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Feb 17 00:01:08 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 46d0888..6c4deca 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 2)
-set(CMake_VERSION_PATCH 20150216)
+set(CMake_VERSION_PATCH 20150217)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Feb 17 02:39:50 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 17 Feb 2015 02:39:50 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-365-g6561f10
Message-ID: <20150217073950.B26D8512B@public.kitware.com>

This is an automated email from 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  6561f105fe1c8c5d262c501a086afca0508ca8af (commit)
       via  aaad0bf35263643c42ae715ef2621a9b1fbaed72 (commit)
      from  4607c510ae328a90efd2c7af6671315251333553 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6561f105fe1c8c5d262c501a086afca0508ca8af
commit 6561f105fe1c8c5d262c501a086afca0508ca8af
Merge: 4607c51 aaad0bf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 02:39:49 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 17 02:39:49 2015 -0500

    Merge topic 'fix-GNU-5.0-corruption' into next
    
    aaad0bf3 Work around bug in pre-release GNU CXX 5.0.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aaad0bf35263643c42ae715ef2621a9b1fbaed72
commit aaad0bf35263643c42ae715ef2621a9b1fbaed72
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 08:32:48 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 08:33:24 2015 +0100

    Work around bug in pre-release GNU CXX 5.0.

diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 3c053fa..5444062 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -72,6 +72,12 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^parisc")
   endif()
 endif()
 
+if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND
+    NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65085
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
+endif()
+
 if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")

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

Summary of changes:
 CompileFlags.cmake |    6 ++++++
 1 file changed, 6 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 17 10:09:14 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Feb 2015 10:09:14 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-162-g5c635fa
Message-ID: <20150217150914.A8925B11@public.kitware.com>

This is an automated email from 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  5c635fa62414c408d04046079a5c0dac43f7cce2 (commit)
       via  fa8b30ebb57da8ddc3e3616c4d212811abc19335 (commit)
       via  aa2ba12164046cd1812c3f3b67cadca856d51846 (commit)
      from  034f8e0bd9a2b8a319fead5042ee5782a0df03fd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c635fa62414c408d04046079a5c0dac43f7cce2
commit 5c635fa62414c408d04046079a5c0dac43f7cce2
Merge: 034f8e0 fa8b30e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 10:09:13 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 17 10:09:13 2015 -0500

    Merge topic 'vs7-OutputDirectory'
    
    fa8b30eb VS: Fix .vcproj and .vfproj file OutputDirectory generation
    aa2ba121 VS: Use $(ConfigurationName) as CMAKE_CFG_INTDIR in VS 7, 8, 9


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

Summary of changes:
 Help/release/dev/vs7-OutputDirectory.rst |   10 ++++++++++
 Help/variable/CMAKE_CFG_INTDIR.rst       |   10 +++++-----
 Source/cmGlobalVisualStudio7Generator.h  |    3 ++-
 Source/cmLocalVisualStudio7Generator.cxx |   16 +++++++++++++---
 4 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 Help/release/dev/vs7-OutputDirectory.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 17 10:09:29 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Feb 2015 10:09:29 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-368-g6f6d09a
Message-ID: <20150217150929.7F7312AA9@public.kitware.com>

This is an automated email from 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  6f6d09a1697c3cbf27bf688ccf57787b2e6d9958 (commit)
       via  5c635fa62414c408d04046079a5c0dac43f7cce2 (commit)
       via  034f8e0bd9a2b8a319fead5042ee5782a0df03fd (commit)
      from  6561f105fe1c8c5d262c501a086afca0508ca8af (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f6d09a1697c3cbf27bf688ccf57787b2e6d9958
commit 6f6d09a1697c3cbf27bf688ccf57787b2e6d9958
Merge: 6561f10 5c635fa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 10:09:21 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 17 10:09:21 2015 -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 Feb 17 10:10:53 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Feb 2015 10:10:53 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-370-gc64df1c
Message-ID: <20150217151053.13D95A4F2D@public.kitware.com>

This is an automated email from 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  c64df1c6575e49e0646b7b67a311278345e16595 (commit)
       via  9d414ca2ad8157bc2862fdfbc6dc362271a899b8 (commit)
      from  6f6d09a1697c3cbf27bf688ccf57787b2e6d9958 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c64df1c6575e49e0646b7b67a311278345e16595
commit c64df1c6575e49e0646b7b67a311278345e16595
Merge: 6f6d09a 9d414ca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 10:10:52 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 17 10:10:52 2015 -0500

    Merge topic 'FindMatlab-rewrite' into next
    
    9d414ca2 FindMatlab: Rewrite module and provide a usage API


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d414ca2ad8157bc2862fdfbc6dc362271a899b8
commit 9d414ca2ad8157bc2862fdfbc6dc362271a899b8
Author:     Raffi Enficiaud <raffi.enficiaud at tuebingen.mpg.de>
AuthorDate: Thu Feb 12 17:13:31 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 17 10:10:31 2015 -0500

    FindMatlab: Rewrite module and provide a usage API
    
    Implementation of the new FindMatlab module
    
    - FindMatlab learned about versions and components
    - ability to find Matlab and its version in a more precise and multiplatform way
    - ability to add new mex extension with a macro
    - ability to add a documentation
    - ability to add matlab unit tests (with or without the unit test framework)
    - reworked documentation

diff --git a/Help/release/dev/FindMatlab-rewrite.rst b/Help/release/dev/FindMatlab-rewrite.rst
new file mode 100644
index 0000000..07727b8
--- /dev/null
+++ b/Help/release/dev/FindMatlab-rewrite.rst
@@ -0,0 +1,7 @@
+FindMatlab-rewrite
+------------------
+
+* The :module:`FindMatlab` module was completely rewritten.  It learned
+  about versions and components and to find Matlab in a more precise and
+  multiplatform way.  The module now offers APIs to create mex extensions,
+  documentation, and unit tests.
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 474556e..c30ca37 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -2,20 +2,201 @@
 # FindMatlab
 # ----------
 #
-# this module looks for Matlab
+# Finds Matlab installations and provides Matlab tools and libraries to cmake.
 #
-# Defines:
+# This package first intention is to find the libraries associated with Matlab
+# in order to be able to build Matlab extensions (mex files). It can also be
+# used:
 #
-# ::
+# * run specific commands in Matlab
+# * declare Matlab unit test
+# * retrieve various information from Matlab (mex extensions, versions and
+#   release queries, ...)
 #
-#   MATLAB_INCLUDE_DIR: include path for mex.h, engine.h
-#   MATLAB_LIBRARIES:   required libraries: libmex, etc
-#   MATLAB_MEX_LIBRARY: path to libmex.lib
-#   MATLAB_MX_LIBRARY:  path to libmx.lib
-#   MATLAB_ENG_LIBRARY: path to libeng.lib
+# The module supports the following components:
+#
+# * ``MX_LIBRARY`` and ``ENG_LIBRARY`` respectively the MX and ENG libraries of
+#   Matlab
+# * ``MAIN_PROGRAM`` the Matlab binary program.
+#
+# .. note::
+#
+#   The version given to the :command:`find_package` directive is the Matlab
+#   **version**, which should not be confused with the Matlab *release* name
+#   (eg. `R2014`).
+#   The :command:`matlab_get_version_from_release_name` and
+#   :command:`matlab_get_release_name_from_version` allow a mapping
+#   from the release name to the version.
+#
+# The variable :variable:`MATLAB_USER_ROOT` may be specified in order to give
+# the path of the desired Matlab version. Otherwise, the behaviour is platform
+# specific:
+#
+# * Windows: The installed versions of Matlab are retrieved from the
+#   Windows registry
+# * OS X: The installed versions of Matlab are given by the MATLAB
+#   paths in ``/Application``
+# * Unix: The desired Matlab should be accessible from the PATH.
+#
+# Additional information is provided when :variable:`MATLAB_FIND_DEBUG` is set.
+# When a Matlab binary is found automatically and the ``MATLAB_VERSION``
+# is not given, the version is queried from Matlab directly.
+# On Windows, it can make a window running Matlab appear.
+#
+# The mapping of the release names and the version of Matlab is performed by
+# defining pairs (name, version).  The variable
+# :variable:`MATLAB_ADDITIONAL_VERSIONS` may be provided before the call to
+# the :command:`find_package` in order to handle additional versions.
+#
+# A Matlab scripts can be added to the set of tests using the
+# :command:`matlab_add_unit_test`. By default, the Matlab unit test framework
+# will be used (>= 2013a) to run this script, but regular ``.m`` files
+# returning an exit code can be used as well (0 indicating a success).
+#
+# Module Input Variables
+# ----------------------
+#
+# Users or projects may set the following variables to configure the module
+# behaviour:
+#
+# :variable:`MATLAB_USER_ROOT`
+#   the root of the Matlab installation.
+# :variable:`MATLAB_FIND_DEBUG`
+#   outputs debug information
+# :variable:`MATLAB_ADDITIONAL_VERSIONS`
+#   additional versions of Matlab for the automatic retrieval of the installed
+#   versions.
+#
+# Variables defined by the module
+# -------------------------------
+#
+# Result variables
+# ^^^^^^^^^^^^^^^^
+#
+# ``Matlab_FOUND``
+#   ``TRUE`` if the Matlab installation is found, ``FALSE``
+#   otherwise. All variable below are defined if Matlab is found.
+# ``Matlab_ROOT_DIR``
+#   the root of the Matlab installation determined by the FindMatlab module.
+# ``Matlab_MAIN_PROGRAM``
+#   the Matlab binary program. Available only if the component ``MAIN_PROGRAM``
+#   is given in the :command:`find_package` directive.
+# ``Matlab_INCLUDE_DIRS``
+#  the path of the Matlab libraries headers
+# ``Matlab_MEX_LIBRARY``
+#   library for mex
+# ``Matlab_MX_LIBRARY``
+#   mx library of Matlab (arrays). Available only if the component
+#   ``MX_LIBRARY`` has been requested.
+# ``Matlab_ENG_LIBRARY``
+#   Matlab engine library. Available only if the component ``ENG_LIBRARY``
+#   is requested.
+# ``Matlab_LIBRARIES``
+#   the whole set of libraries of Matlab
+# ``Matlab_MEX_COMPILER``
+#   the mex compiler of Matlab. Currently not used.
+#   Available only if the component ``MEX_COMPILER`` is asked
+#
+# Cached variables
+# ^^^^^^^^^^^^^^^^
+#
+# ``Matlab_VERSION_STRING``
+#   the version of the Matlab installation
+# ``Matlab_MEX_EXTENSION``
+#   the extension of the mex files for the current platform (given by Matlab).
+#
+# Provided macros
+# ---------------
+#
+# :command:`matlab_get_version_from_release_name`
+#   returns the version from the release name
+# :command:`matlab_get_release_name_from_version`
+#   returns the release name from the Matlab version
+#
+# Provided functions
+# ------------------
+#
+# :command:`matlab_add_mex`
+#   adds a target compiling a MEX file.
+# :command:`matlab_add_unit_test`
+#   adds a Matlab unit test file as a test to the project.
+# :command:`matlab_extract_all_installed_versions_from_registry`
+#   parses the registry for all Matlab versions. Available on Windows only.
+#   The part of the registry parsed is dependent on the host processor
+# :command:`matlab_get_all_valid_matlab_roots_from_registry`
+#   returns all the possible Matlab paths, according to a previously
+#   given list. Only the existing/accessible paths are kept. This is mainly
+#   useful for the searching all possible Matlab installation.
+# :command:`matlab_get_mex_suffix`
+#   returns the suffix to be used for the mex files
+#   (platform/architecture dependant)
+# :command:`matlab_get_version_from_matlab_run`
+#   returns the version of Matlab, given the full directory of the Matlab program.
+#
+#
+# Known issues
+# ------------
+#
+# **Symbol clash in a MEX target**
+#   By default, every symbols inside a MEX
+#   file defined with the command :command:`matlab_add_mex` have hidden
+#   visibility, except for the entry point. This is the default behaviour of
+#   the MEX compiler, which lowers the risk of symbol collision between the
+#   libraries shipped with Matlab, and the libraries to which the MEX file is
+#   linking to. This is also the default on Windows platforms.
+#
+#   However, this is not sufficient in certain case, where for instance your
+#   MEX file is linking against libraries that are already loaded by Matlab,
+#   even if those libraries have different SONAMES.
+#   A possible solution is to hide the symbols of the libraries to which the
+#   MEX target is linking to. This can be achieved in GNU GCC compilers with
+#   the linker option ``-Wl,--exclude-libs,ALL``.
+#
+# **Tests using GPU resources**
+#   in case your MEX file is using the GPU and
+#   in order to be able to run unit tests on this MEX file, the GPU resources
+#   should be properly released by Matlab. A possible solution is to make
+#   Matlab aware of the use of the GPU resources in the session, which can be
+#   performed by a command such as ``D = gpuDevice()`` at the beginning of
+#   the test script (or via a fixture).
+#
+#
+# Reference
+# --------------
+#
+# .. variable:: MATLAB_USER_ROOT
+#
+#    The root folder of the Matlab installation. This is set before the call to
+#    :command:`find_package`. If not set, then an automatic search of Matlab
+#    will be performed. If set, it should point to a valid version of Matlab.
+#
+# .. variable:: MATLAB_FIND_DEBUG
+#
+#    If set, the lookup of Matlab and the intermediate configuration steps are
+#    outputted to the console.
+#
+# .. variable:: MATLAB_ADDITIONAL_VERSIONS
+#
+#   If set, specifies additional versions of Matlab that may be looked for.
+#   This variable will be used if :variable:`MATLAB_USER_ROOT` is not set.
+#   The variable should be a list of strings, organised by pairs of release
+#   name and versions, such as follows::
+#
+#     set(MATLAB_ADDITIONAL_VERSIONS
+#         "release_name1=corresponding_version1"
+#         "release_name2=corresponding_version2"
+#         ...
+#         )
+#
+#   Example::
+#
+#     set(MATLAB_ADDITIONAL_VERSIONS
+#         "R2013b=8.2"
+#         "R2013a=8.1"
+#         "R2012b=8.0")
 
 #=============================================================================
-# Copyright 2005-2009 Kitware, Inc.
+# Copyright 2014-2015 Raffi Enficiaud, Max Planck Society
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -27,102 +208,1172 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-set(MATLAB_FOUND 0)
-if(WIN32)
-  if(${CMAKE_GENERATOR} MATCHES "Visual Studio 6")
-    set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/msvc60")
+set(_FindMatlab_SELF_DIR "${CMAKE_CURRENT_LIST_DIR}")
+
+include(FindPackageHandleStandardArgs)
+include(CheckCXXCompilerFlag)
+
+
+# The currently supported versions. Other version can be added by the user by
+# providing MATLAB_ADDITIONAL_VERSIONS
+if(NOT MATLAB_ADDITIONAL_VERSIONS)
+  set(MATLAB_ADDITIONAL_VERSIONS)
+endif()
+
+set(MATLAB_VERSIONS_MAPPING
+  "R2013b=8.2"
+  "R2013a=8.1"
+  "R2012b=8.0"
+  "R2012a=7.14"
+
+  "R2011b=7.13"
+  "R2011a=7.12"
+  "R2010b=7.11"
+
+  ${MATLAB_ADDITIONAL_VERSIONS}
+  )
+
+
+# temporary folder for all Matlab runs
+set(_matlab_temporary_folder ${CMAKE_BINARY_DIR}/Matlab)
+
+if(NOT EXISTS ${_matlab_temporary_folder})
+  file(MAKE_DIRECTORY ${_matlab_temporary_folder})
+endif()
+
+#.rst:
+# .. command:: matlab_get_version_from_release_name
+#
+#   Returns the version of Matlab (17.58) from a release name (R2017k)
+macro (matlab_get_version_from_release_name release_name version_name)
+
+  string(REGEX MATCHALL "${release_name}=([0-9]+\\.?[0-9]*)" _matched ${MATLAB_VERSIONS_MAPPING})
+
+  set(${version_name} "")
+  if(NOT _matched STREQUAL "")
+    set(${version_name} ${CMAKE_MATCH_1})
   else()
-    if(${CMAKE_GENERATOR} MATCHES "Visual Studio 7")
-      # Assume people are generally using 7.1,
-      # if using 7.0 need to link to: ../extern/lib/win32/microsoft/msvc70
-      set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/msvc71")
-    else()
-      if(${CMAKE_GENERATOR} MATCHES "Borland")
-        # Same here, there are also: bcc50 and bcc51 directories
-        set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/bcc54")
-      else()
-        if(MATLAB_FIND_REQUIRED)
-          message(FATAL_ERROR "Generator not compatible: ${CMAKE_GENERATOR}")
-        endif()
+    message(WARNING "The release name ${release_name} is not registered")
+  endif()
+
+endmacro()
+
+
+
+
+
+#.rst:
+# .. command:: matlab_get_release_name_from_version
+#
+#   Returns the release name (R2017k) from the version of Matlab (17.58)
+macro (matlab_get_release_name_from_version version release_name)
+
+  set(${release_name} "")
+  foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
+    string(REGEX MATCHALL "(.+)=${version}" _matched ${_var})
+    if(NOT _matched STREQUAL "")
+      set(${release_name} ${CMAKE_MATCH_1})
+      break()
+    endif()
+  endforeach(_var)
+
+  unset(_var)
+  unset(_matched)
+  if(${release_name} STREQUAL "")
+    message(WARNING "The version ${version} is not registered")
+  endif()
+
+endmacro()
+
+
+
+
+
+# extracts all the supported release names (R2017k...) of Matlab
+# internal use
+macro(matlab_get_supported_releases list_releases)
+  set(${list_releases})
+  foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
+    string(REGEX MATCHALL "(.+)=([0-9]+\\.?[0-9]*)" _matched ${_var})
+    if(NOT _matched STREQUAL "")
+      list(APPEND ${list_releases} ${CMAKE_MATCH_1})
+    endif()
+    unset(_matched)
+    unset(CMAKE_MATCH_1)
+  endforeach(_var)
+  unset(_var)
+endmacro()
+
+
+
+# extracts all the supported versions of Matlab
+# internal use
+macro(matlab_get_supported_versions list_versions)
+  set(${list_versions})
+  foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
+    string(REGEX MATCHALL "(.+)=([0-9]+\\.?[0-9]*)" _matched ${_var})
+    if(NOT _matched STREQUAL "")
+      list(APPEND ${list_versions} ${CMAKE_MATCH_2})
+    endif()
+    unset(_matched)
+    unset(CMAKE_MATCH_1)
+  endforeach(_var)
+  unset(_var)
+endmacro()
+
+
+#.rst:
+# .. command:: matlab_extract_all_installed_versions_from_registry
+#
+#   This function parses the registry and founds the Matlab versions that are
+#   installed. The found versions are returned in `matlab_versions`.
+#   Set `win64` to `TRUE` if the 64 bit version of Matlab should be looked for
+#   The returned list contains all versions under
+#   ``HKLM\\SOFTWARE\\Mathworks\\MATLAB`` or an empty list in case an error
+#   occurred (or nothing found).
+#
+#   .. note::
+#
+#     Only the versions are provided. No check is made over the existence of the
+#     installation referenced in the registry,
+#
+function(matlab_extract_all_installed_versions_from_registry win64 matlab_versions)
+
+  if(NOT CMAKE_HOST_WIN32)
+    message(FATAL_ERROR "This macro can only be called by a windows host (call to reg.exe")
+  endif()
+
+  # list the keys under HKEY_LOCAL_MACHINE\SOFTWARE\mathworks but the call to
+  # reg does not work from cmake, curiously, as is. The command provides the
+  # desired result under the command line though.
+  # Fix: this is because "/reg:64" should appended to the command, otherwise
+  # it gets on the 32 bits software key (curiously again)
+  find_program(MATLAB_REG_EXE_LOCATION "reg")
+
+  # if reg.exe is not found, then it is impossible to use this method.
+  if(NOT MATLAB_REG_EXE_LOCATION)
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] reg.exe not found")
+    endif()
+    set(${matlab_versions} "" PARENT_SCOPE)
+    return()
+  endif()
+
+  if(${win64} AND ${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "64")
+    set(APPEND_REG "/reg:64")
+  else()
+    set(APPEND_REG "/reg:32")
+  endif()
+
+  # /reg:64 should be added on 64 bits capable OSs in order to enable the
+  # redirection of 64 bits applications
+  execute_process(
+    COMMAND ${MATLAB_REG_EXE_LOCATION} query HKEY_LOCAL_MACHINE\\SOFTWARE\\Mathworks\\MATLAB /f * /k ${APPEND_REG}
+    RESULT_VARIABLE resultMatlab
+    OUTPUT_VARIABLE varMatlab
+    ERROR_VARIABLE errMatlab
+    )
+  #message("Matlabs = ${varMatlab} | ${resultMatlab}")
+
+
+  set(matlabs_from_registry)
+  if(${resultMatlab} EQUAL 0)
+
+    string(
+      REGEX MATCHALL "MATLAB\\\\([0-9]+(\\.[0-9]+)?)"
+      matlab_versions_regex ${varMatlab})
+
+    foreach(match IN LISTS matlab_versions_regex)
+      string(
+        REGEX MATCH "MATLAB\\\\(([0-9]+)(\\.([0-9]+))?)"
+        current_match ${match})
+
+      set(_matlab_current_version ${CMAKE_MATCH_1})
+      set(current_matlab_version_major ${CMAKE_MATCH_2})
+      set(current_matlab_version_minor ${CMAKE_MATCH_4})
+      if(NOT current_matlab_version_minor)
+        set(current_matlab_version_minor "0")
       endif()
+
+      list(APPEND matlabs_from_registry ${_matlab_current_version})
+      unset(_matlab_current_version)
+    endforeach(match)
+
+  endif()
+
+  set(${matlab_versions} ${matlabs_from_registry} PARENT_SCOPE)
+
+endfunction()
+
+
+
+# (internal)
+macro(extract_matlab_versions_from_registry_brute_force matlab_versions)
+  # get the supported versions
+  set(matlab_supported_versions)
+  matlab_get_supported_versions(matlab_supported_versions)
+
+
+  # this is a manual population of the versions we want to look for
+  # this can be done as is, but preferably with the call to
+  # matlab_get_supported_versions and variable
+
+  # populating the versions we want to look for
+  # set(matlab_supported_versions)
+
+  # # Matlab 7
+  # set(matlab_major 7)
+  # foreach(current_matlab_minor RANGE 4 20)
+    # list(APPEND matlab_supported_versions "${matlab_major}.${current_matlab_minor}")
+  # endforeach(current_matlab_minor)
+
+  # # Matlab 8
+  # set(matlab_major 8)
+  # foreach(current_matlab_minor RANGE 0 5)
+    # list(APPEND matlab_supported_versions "${matlab_major}.${current_matlab_minor}")
+  # endforeach(current_matlab_minor)
+
+  # # taking into account the possible additional versions provided by the user
+  # if(DEFINED MATLAB_ADDITIONAL_VERSIONS)
+    # list(APPEND matlab_supported_versions MATLAB_ADDITIONAL_VERSIONS)
+  # endif()
+
+
+  # we order from more recent to older
+  list(REMOVE_DUPLICATES matlab_supported_versions)
+  list(SORT matlab_supported_versions)
+  list(REVERSE matlab_supported_versions)
+
+
+  set(${matlab_versions} ${matlab_supported_versions})
+
+
+endmacro()
+
+
+
+
+#.rst:
+# .. command:: matlab_get_all_valid_matlab_roots_from_registry
+#
+#   Populates the Matlab root with valid versions of Matlab.
+#   The returned matlab_roots is organized in pairs
+#   ``(version_number,matlab_root_path)``.
+#
+#   ::
+#
+#     matlab_get_all_valid_matlab_roots_from_registry(
+#         matlab_versions
+#         matlab_roots)
+#
+#   ``matlab_versions``
+#     the versions of each of the Matlab installations
+#   ``matlab_roots``
+#     the location of each of the Matlab installations
+function(matlab_get_all_valid_matlab_roots_from_registry matlab_versions matlab_roots)
+
+  # The matlab_versions comes either from
+  # extract_matlab_versions_from_registry_brute_force or
+  # matlab_extract_all_installed_versions_from_registry.
+
+
+  set(_matlab_roots_list )
+  foreach(_matlab_current_version ${matlab_versions})
+    get_filename_component(
+      current_MATLAB_ROOT
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\${_matlab_current_version};MATLABROOT]"
+      ABSOLUTE)
+
+    if(EXISTS ${current_MATLAB_ROOT})
+      list(APPEND _matlab_roots_list ${_matlab_current_version} ${current_MATLAB_ROOT})
+    endif()
+
+  endforeach(_matlab_current_version)
+  unset(_matlab_current_version)
+  set(${matlab_roots} ${_matlab_roots_list} PARENT_SCOPE)
+  unset(_matlab_roots_list)
+endfunction()
+
+#.rst:
+# .. command:: matlab_get_mex_suffix
+#
+#   Returns the extension of the mex files (the suffixes).
+#   This function should not be called before the appropriate Matlab root has
+#   been found.
+#
+#   ::
+#
+#     matlab_get_mex_suffix(
+#         matlab_root
+#         mex_suffix)
+#
+#   ``matlab_root``
+#     the root of the Matlab installation
+#   ``mex_suffix``
+#     the variable name in which the suffix will be returned.
+function(matlab_get_mex_suffix matlab_root mex_suffix)
+
+  # todo setup the extension properly. Currently I do not know if this is
+  # sufficient for all win32 distributions.
+  # there is also CMAKE_EXECUTABLE_SUFFIX that could be tweaked
+  set(mexext_suffix "")
+  if(WIN32)
+    list(APPEND mexext_suffix ".bat")
+  endif()
+
+  # we first try without suffix, since cmake does not understand a list with
+  # one empty string element
+  find_program(
+    MATLAB_MEXEXTENSIONS_PROG
+    "mexext"
+    PATHS ${matlab_root}/bin
+    DOC "Matlab MEX extension provider"
+    NO_DEFAULT_PATH
+  )
+
+  foreach(current_mexext_suffix IN LISTS mexext_suffix)
+    if(NOT DEFINED MATLAB_MEXEXTENSIONS_PROG OR NOT MATLAB_MEXEXTENSIONS_PROG)
+      # this call should populate the cache automatically
+      find_program(
+        MATLAB_MEXEXTENSIONS_PROG
+        "mexext${current_mexext_suffix}"
+        PATHS ${matlab_root}/bin
+        DOC "Matlab MEX extension provider"
+        NO_DEFAULT_PATH
+      )
     endif()
+  endforeach(current_mexext_suffix)
+
+
+  # the program has been found?
+  if((NOT MATLAB_MEXEXTENSIONS_PROG) OR (NOT EXISTS ${MATLAB_MEXEXTENSIONS_PROG}))
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] Cannot found mexext program. Matlab root is ${matlab_root}")
+    endif()
+    return()
   endif()
-  find_library(MATLAB_MEX_LIBRARY
-    libmex
-    ${MATLAB_ROOT}
+
+  set(_matlab_mex_extension)
+
+
+  execute_process(
+    COMMAND ${MATLAB_MEXEXTENSIONS_PROG}
+    OUTPUT_VARIABLE _matlab_mex_extension)
+  string(STRIP ${_matlab_mex_extension} _matlab_mex_extension)
+
+  set(${mex_suffix} ${_matlab_mex_extension} PARENT_SCOPE)
+endfunction()
+
+
+
+
+#.rst:
+# .. command:: matlab_get_version_from_matlab_run
+#
+#   This function runs Matlab program specified on arguments and extracts its
+#   version.
+#
+#   ::
+#
+#     matlab_get_version_from_matlab_run(
+#         matlab_binary_path
+#         matlab_list_versions)
+#
+#   ``matlab_binary_path``
+#     the location of the `matlab` binary executable
+#   ``matlab_list_versions``
+#     the version extracted from Matlab
+function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_versions)
+
+  set(${matlab_list_versions} "" PARENT_SCOPE)
+
+
+  if(MATLAB_FIND_DEBUG)
+    message(STATUS "[MATLAB] Determining the version of Matlab from ${matlab_binary_program}")
+  endif()
+
+  if(EXISTS ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+    if(MATLAB_FIND_DEBUG)
+      message(STATUS "[MATLAB] Removing previous ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp file")
+    endif()
+    file(REMOVE ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+  endif()
+
+
+  # the log file is needed since on windows the command executes in a new
+  # window and it is not possible to get back the answer of Matlab
+  # the -wait command is needed on windows, otherwise the call returns
+  # immediately after the program launches itself.
+  if(WIN32)
+    set(_matlab_additional_commands "-wait")
+  endif()
+
+  # timeout set to 30 seconds, in case it does not start
+  # note as said before OUTPUT_VARIABLE cannot be used in a platform
+  # independent manner however, not setting it would flush the output of Matlab
+  # in the current console (unix variant)
+  execute_process(
+    COMMAND ${matlab_binary_program} -nosplash -nojvm ${_matlab_additional_commands} -logfile ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp -nodesktop -nodisplay -r "version, exit"
+    OUTPUT_VARIABLE _matlab_version_from_cmd_dummy
+    RESULT_VARIABLE _matlab_result_version_call
+    TIMEOUT 30
     )
-  find_library(MATLAB_MX_LIBRARY
-    libmx
-    ${MATLAB_ROOT}
+
+
+  if(${_matlab_result_version_call})
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] Unable to determine the version of Matlab. Matlab call returned with error ${_matlab_result_version_call}.")
+    endif()
+    return()
+  elseif(NOT EXISTS ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] Unable to determine the version of Matlab. The log file does not exist.")
+    endif()
+    return()
+  endif()
+
+  # if successful, read back the log
+  file(READ ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp _matlab_version_from_cmd)
+  file(REMOVE ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+
+  set(index -1)
+  string(FIND ${_matlab_version_from_cmd} "ans" index)
+  if(index EQUAL -1)
+
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] Cannot find the version of Matlab returned by the run.")
+    endif()
+
+  else()
+    set(matlab_list_of_all_versions_tmp)
+
+    string(SUBSTRING ${_matlab_version_from_cmd} ${index} -1 substring_ans)
+    string(
+      REGEX MATCHALL "ans[\r\n\t ]*=[\r\n\t ]*([0-9]+(\\.[0-9]+)?)"
+      matlab_versions_regex
+      ${substring_ans})
+    foreach(match IN LISTS matlab_versions_regex)
+      string(
+        REGEX MATCH "ans[\r\n\t ]*=[\r\n\t ]*(([0-9]+)(\\.([0-9]+))?)"
+        current_match ${match})
+
+      list(APPEND matlab_list_of_all_versions_tmp ${CMAKE_MATCH_1})
+    endforeach()
+    list(REMOVE_DUPLICATES matlab_list_of_all_versions_tmp)
+    set(${matlab_list_versions} ${matlab_list_of_all_versions_tmp} PARENT_SCOPE)
+
+  endif()
+
+endfunction()
+
+
+#.rst:
+# .. command:: matlab_add_unit_test
+#
+#   Adds a Matlab unit test to the test set of cmake/ctest.
+#   This command requires the component ``MAIN_PROGRAM``.
+#   The unit test uses the Matlab unittest framework (default, available
+#   starting Matlab 2013b+) except if the option ``NO_UNITTEST_FRAMEWORK``
+#   is given.
+#
+#   The function expects one Matlab test script file to be given.
+#   In the case ``NO_UNITTEST_FRAMEWORK`` is given, the unittest script file
+#   should contain the script to be run, plus an exit command with the exit
+#   value. This exit value will be passed to the ctest framework (0 success,
+#   non 0 failure). Additional arguments accepted by :command:`add_test` can be
+#   passed through ``TEST_ARGS`` (eg. ``CONFIGURATION <config> ...``).
+#
+#   ::
+#
+#     matlab_add_unit_test(
+#         NAME <name>
+#         UNITTEST_FILE matlab_file_containing_unittest.m
+#         [UNITTEST_PRECOMMAND matlab_command_to_run]
+#         [TIMEOUT timeout]
+#         [ADDITIONAL_PATH path1 [path2 ...]]
+#         [MATLAB_ADDITIONAL_STARTUP_OPTIONS option1 [option2 ...]]
+#         [TEST_ARGS arg1 [arg2 ...]]
+#         [NO_UNITTEST_FRAMEWORK]
+#         )
+#
+#   The function arguments are:
+#
+#   ``NAME``
+#     name of the unittest in ctest.
+#   ``UNITTEST_FILE``
+#     the matlab unittest file. Its path will be automatically
+#     added to the Matlab path.
+#   ``UNITTEST_PRECOMMAND``
+#     Matlab script command to be ran before the file
+#     containing the test (eg. GPU device initialisation based on CMake
+#     variables).
+#   ``TIMEOUT``
+#     the test timeout in seconds. Defaults to 180 seconds as the
+#     Matlab unit test may hang.
+#   ``ADDITIONAL_PATH``
+#     a list of paths to add to the Matlab path prior to
+#     running the unit test.
+#   ``MATLAB_ADDITIONAL_STARTUP_OPTIONS``
+#     a list of additional option in order
+#     to run Matlab from the command line.
+#   ``TEST_ARGS``
+#     Additional options provided to the add_test command. These
+#     options are added to the default options (eg. "CONFIGURATIONS Release")
+#   ``NO_UNITTEST_FRAMEWORK``
+#     when set, indicates that the test should not
+#     use the unittest framework of Matlab (available for versions >= R2013a).
+#
+function(matlab_add_unit_test)
+
+  if(NOT Matlab_MAIN_PROGRAM)
+    message(FATAL_ERROR "[MATLAB] This functionality needs the MAIN_PROGRAM component (not default)")
+  endif()
+
+  set(options NO_UNITTEST_FRAMEWORK)
+  set(oneValueArgs NAME UNITTEST_PRECOMMAND UNITTEST_FILE TIMEOUT)
+  set(multiValueArgs ADDITIONAL_PATH MATLAB_ADDITIONAL_STARTUP_OPTIONS TEST_ARGS)
+
+  set(prefix _matlab_unittest_prefix)
+  cmake_parse_arguments(${prefix} "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+
+  if(NOT ${prefix}_NAME)
+    message(FATAL_ERROR "[MATLAB] The Matlab test name cannot be empty")
+  endif()
+
+  add_test(NAME ${${prefix}_NAME}
+           COMMAND ${CMAKE_COMMAND}
+            -Dtest_name=${${prefix}_NAME}
+            -Dadditional_paths=${${prefix}_ADDITIONAL_PATH}
+            -Dtest_timeout=${${prefix}_TIMEOUT}
+            -Doutput_directory=${_matlab_temporary_folder}
+            -DMatlab_PROGRAM=${Matlab_MAIN_PROGRAM}
+            -Dno_unittest_framework=${${prefix}_NO_UNITTEST_FRAMEWORK}
+            -DMatlab_ADDITIONNAL_STARTUP_OPTIONS=${${prefix}_MATLAB_ADDITIONAL_STARTUP_OPTIONS}
+            -Dunittest_file_to_run=${${prefix}_UNITTEST_FILE}
+            -Dcmd_to_run_before_test=${${prefix}_UNITTEST_PRECOMMAND}
+            -P ${_FindMatlab_SELF_DIR}/MatlabTestsRedirect.cmake
+           ${${prefix}_TEST_ARGS}
+           ${${prefix}_UNPARSED_ARGUMENTS}
+           )
+endfunction()
+
+
+#.rst:
+# .. command:: matlab_add_mex
+#
+#   Adds a Matlab MEX target.
+#   This commands compiles the given sources with the current tool-chain in
+#   order to produce a MEX file. The final name of the produced output may be
+#   specified, as well as additional link libraries, and a documentation entry
+#   for the MEX file. Remaining arguments of the call are passed to the
+#   :command:`add_library` command.
+#
+#   ::
+#
+#      matlab_add_mex(
+#          NAME <name>
+#          SRC src1 [src2 ...]
+#          [OUTPUT_NAME output_name]
+#          [DOCUMENTATION file.txt]
+#          [LINK_TO target1 target2 ...]
+#          [...]
+#      )
+#
+#   ``NAME``
+#     name of the target.
+#   ``SRC``
+#     list of tje source files.
+#   ``LINK_TO``
+#     a list of additional link dependencies.  The target links to ``libmex``
+#     by default. If ``Matlab_MX_LIBRARY`` is defined, it also
+#     links to ``libmx``.
+#   ``OUTPUT_NAME``
+#     if given, overrides the default name. The default name is
+#     the name of the target without any prefix and
+#     with ``Matlab_MEX_EXTENSION`` suffix.
+#   ``DOCUMENTATION``
+#     if given, the file ``file.txt`` will be considered as
+#     being the documentation file for the MEX file. This file is copied into
+#     the same folder without any processing, with the same name as the final
+#     mex file, and with extension `.m`. In that case, typing ``help <name>``
+#     in Matlab prints the documentation contained in this file.
+#
+#   The documentation file is not processed and should be in the following
+#   format:
+#
+#   ::
+#
+#     % This is the documentation
+#     function ret = mex_target_output_name(input1)
+#
+function(matlab_add_mex )
+
+  if(NOT WIN32)
+    # we do not need all this on Windows
+    # pthread options
+    check_cxx_compiler_flag(-pthread                    HAS_MINUS_PTHREAD)
+    # we should use try_compile instead, the link flags are discarded from
+    # this compiler_flag function.
+    #check_cxx_compiler_flag(-Wl,--exclude-libs,ALL HAS_SYMBOL_HIDING_CAPABILITY)
+
+  endif()
+
+  set(oneValueArgs NAME DOCUMENTATION OUTPUT_NAME)
+  set(multiValueArgs LINK_TO SRC)
+
+  set(prefix _matlab_addmex_prefix)
+  cmake_parse_arguments(${prefix} "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+
+  if(NOT ${prefix}_NAME)
+    message(FATAL_ERROR "[MATLAB] The MEX target name cannot be empty")
+  endif()
+
+  if(NOT ${prefix}_OUTPUT_NAME)
+    set(${prefix}_OUTPUT_NAME ${${prefix}_NAME})
+  endif()
+
+  add_library(${${prefix}_NAME}
+    SHARED
+      ${${prefix}_SRC}
+      ${${prefix}_DOCUMENTATION}
+      ${${prefix}_UNPARSED_ARGUMENTS})
+  target_include_directories(${${prefix}_NAME} PRIVATE ${Matlab_INCLUDE_DIRS})
+
+  if(DEFINED Matlab_MX_LIBRARY)
+    target_link_libraries(${${prefix}_NAME} ${Matlab_MX_LIBRARY})
+  endif()
+
+  target_link_libraries(${${prefix}_NAME} ${Matlab_MEX_LIBRARY} ${${prefix}_LINK_TO})
+  set_target_properties(${${prefix}_NAME}
+      PROPERTIES
+        PREFIX ""
+        OUTPUT_NAME ${${prefix}_OUTPUT_NAME}
+        SUFFIX ".${Matlab_MEX_EXTENSION}")
+
+
+  # documentation
+  if(NOT ${${prefix}_DOCUMENTATION} STREQUAL "")
+    get_target_property(output_name ${${prefix}_NAME} OUTPUT_NAME)
+    add_custom_command(
+      TARGET ${${prefix}_NAME}
+      PRE_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${${prefix}_DOCUMENTATION} $<TARGET_FILE_DIR:${${prefix}_NAME}>/${output_name}.m
+      COMMENT "Copy ${${prefix}_NAME} documentation file into the output folder"
     )
-  find_library(MATLAB_ENG_LIBRARY
-    libeng
-    ${MATLAB_ROOT}
+  endif() # documentation
+
+  # entry point in the mex file + taking care of visibility and symbol clashes.
+  if(WIN32)
+    set_target_properties(${${prefix}_NAME}
+      PROPERTIES
+        DEFINE_SYMBOL "DLL_EXPORT_SYM=__declspec(dllexport)")
+  else()
+
+    if(HAS_MINUS_PTHREAD AND NOT APPLE)
+      # Apparently, compiling with -pthread generated the proper link flags
+      # and some defines at compilation
+      target_compile_options(${${prefix}_NAME} PRIVATE "-pthread")
+    endif()
+
+
+    # if we do not do that, the symbols linked from eg. boost remain weak and
+    # then clash with the ones defined in the matlab process. So by default
+    # the symbols are hidden.
+    # This also means that for shared libraries (like MEX), the entry point
+    # should be explicitly declared with default visibility, otherwise Matlab
+    # cannot find the entry point.
+    # Note that this is particularly meaningful if the MEX wrapper itself
+    # contains symbols that are clashing with Matlab (that are compiled in the
+    # MEX file). In order to propagate the visibility options to the libraries
+    # to which the MEX file is linked against, the -Wl,--exclude-libs,ALL
+    # option should also be specified.
+
+    set_target_properties(${${prefix}_NAME}
+      PROPERTIES
+        CXX_VISIBILITY_PRESET "hidden"
+        C_VISIBILITY_PRESET "hidden"
+        VISIBILITY_INLINES_HIDDEN "hidden"
     )
 
-  find_path(MATLAB_INCLUDE_DIR
-    "mex.h"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/include"
+    #  get_target_property(
+    #    _previous_link_flags
+    #    ${${prefix}_NAME}
+    #    LINK_FLAGS)
+    #  if(NOT _previous_link_flags)
+    #    set(_previous_link_flags)
+    #  endif()
+
+    #  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    #    set_target_properties(${${prefix}_NAME}
+    #      PROPERTIES
+    #        LINK_FLAGS "${_previous_link_flags} -Wl,--exclude-libs,ALL"
+    #        # -Wl,--version-script=${_FindMatlab_SELF_DIR}/MatlabLinuxVisibility.map"
+    #    )
+    #  elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    #    # in this case, all other symbols become hidden.
+    #    set_target_properties(${${prefix}_NAME}
+    #      PROPERTIES
+    #        LINK_FLAGS "${_previous_link_flags} -Wl,-exported_symbol,_mexFunction"
+    #        #-Wl,-exported_symbols_list,${_FindMatlab_SELF_DIR}/MatlabOSXVisilibity.map"
+    #    )
+    #  endif()
+
+
+
+    set_target_properties(${${prefix}_NAME}
+      PROPERTIES
+        DEFINE_SYMBOL "DLL_EXPORT_SYM=__attribute__ ((visibility (\"default\")))"
     )
+
+
+  endif()
+
+endfunction()
+
+
+
+
+
+
+
+
+# this variable will get all Matlab installations found in the current system.
+set(_matlab_possible_roots)
+
+
+# listing the Matlab versions installed on the WIN machine if MATLAB_USER_ROOT
+# is not set
+if(WIN32)
+
+  # for windows
+
+
+  if(NOT MATLAB_USER_ROOT)
+    # if MATLAB_USER_ROOT not specified, we look for Matlab installation in
+    # the registry
+    # if unsuccessful, we look for all known revision and filter the existing
+    # ones.
+
+    # testing if we are able to extract the needed information from the registry
+    set(matlab_versions_from_registry)
+    matlab_extract_all_installed_versions_from_registry(CMAKE_CL_64 matlab_versions_from_registry)
+
+    # the returned list is empty, doing the search on all known versions
+    if(NOT matlab_versions_from_registry)
+
+      if(MATLAB_FIND_DEBUG)
+        message(STATUS "[MATLAB] Search for Matlab from the registry unsuccessful, testing all supported versions")
+      endif()
+
+      extract_matlab_versions_from_registry_brute_force(matlab_versions_from_registry)
+    endif()
+
+    # filtering the results with the registry keys
+    matlab_get_all_valid_matlab_roots_from_registry("${matlab_versions_from_registry}" _matlab_possible_roots)
+
+
+
+  elseif(NOT EXISTS ${MATLAB_USER_ROOT})
+
+    # if MATLAB_USER_ROOT specified but erroneous
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] the specified path for MATLAB_USER_ROOT does not exist (${MATLAB_USER_ROOT})")
+    endif()
+  else()
+    list(APPEND _matlab_possible_roots "NOTFOUND" ${MATLAB_USER_ROOT}) # empty version
+  endif()
+
+
 else()
-  if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-    # Regular x86
-    set(MATLAB_ROOT
-      /usr/local/matlab-7sp1/bin/glnx86/
-      /opt/matlab-7sp1/bin/glnx86/
-      $ENV{HOME}/matlab-7sp1/bin/glnx86/
-      $ENV{HOME}/redhat-matlab/bin/glnx86/
-      )
+  # for linux/osx
+
+  if(NOT MATLAB_USER_ROOT)
+
+    # if MATLAB_USER_ROOT not specified, we look for Matlab from the command
+    # line PATH
+    # maybe using CMAKE_PROGRAM_PATH to add some more hints
+    if(NOT Matlab_MAIN_PROGRAM)
+      # if we get there a second time and the folder matlab is created here,
+      # and then the find_program does not find it,
+      # the get_filename_component (... PROGRAM) finds this directory instead.
+    find_program(
+        Matlab_MAIN_PROGRAM
+      "matlab")
+    endif()
+
+    if(NOT Matlab_MAIN_PROGRAM)
+      #execute_process(COMMAND which matlab OUTPUT_VARIABLE _which_matlab
+      # RESULT_VARIABLE _which_matlab_result)
+      get_filename_component(Matlab_MAIN_PROGRAM "matlab" PROGRAM)
+
+      # "bug" of cmake: if we call get_filename_component with PROGRAM, it can
+      # return us a directory
+      if((NOT EXISTS ${Matlab_MAIN_PROGRAM}) OR (IS_DIRECTORY ${Matlab_MAIN_PROGRAM}))
+        execute_process(
+          COMMAND "which matlab"
+          OUTPUT_VARIABLE Matlab_MAIN_PROGRAM)
+      endif()
+
+      if(EXISTS ${Matlab_MAIN_PROGRAM})
+        get_filename_component(Matlab_MAIN_PROGRAM "${Matlab_MAIN_PROGRAM}" REALPATH)
+        get_filename_component(Matlab_MAIN_PROGRAM "${Matlab_MAIN_PROGRAM}" ABSOLUTE)
+        if(MATLAB_FIND_DEBUG)
+          message(STATUS "[MATLAB] matlab program result from the command line ${Matlab_MAIN_PROGRAM}")
+        endif()
+      else()
+        unset(Matlab_MAIN_PROGRAM)
+      endif()
+
+    endif()
+
+    if(Matlab_MAIN_PROGRAM AND EXISTS ${Matlab_MAIN_PROGRAM})
+      if(MATLAB_FIND_DEBUG)
+        message(STATUS "[MATLAB] found from the command line at ${Matlab_MAIN_PROGRAM}")
+      endif()
+
+      # resolve symlinks
+      get_filename_component(_matlab_current_location "${Matlab_MAIN_PROGRAM}" REALPATH)
+      if(${CMAKE_VERSION} VERSION_LESS "2.8.12")
+        set(_directory_alias PATH)
+      else()
+        set(_directory_alias DIRECTORY)
+      endif()
+      # get the directory (the command below has to be run twice)
+      get_filename_component(_matlab_current_location "${_matlab_current_location}" ${_directory_alias})
+      get_filename_component(_matlab_current_location "${_matlab_current_location}" ${_directory_alias}) # Matlab should be in bin
+      list(APPEND _matlab_possible_roots "NOTFOUND" ${_matlab_current_location}) # empty version
+    endif()
+
+    # on mac, we look for the /Application paths
+    # this corresponds to the behaviour on Windows. On Linux, we do not have
+    # any other guess.
+    if((NOT _matlab_possible_roots) AND APPLE)
+
+      matlab_get_supported_releases(_matlab_releases)
+      if(MATLAB_FIND_DEBUG)
+        message(STATUS "[MATLAB] Matlab supported versions ${_matlab_releases}. If more version should be supported "
+                     "the variable MATLAB_ADDITIONAL_VERSIONS can be set according to the documentation")
+      endif()
+
+      foreach(_matlab_current_release IN LISTS _matlab_releases)
+        set(_matlab_full_string "/Applications/MATLAB_${_matlab_current_release}.app")
+        if(EXISTS ${_matlab_full_string})
+          set(_matlab_current_version)
+          matlab_get_version_from_release_name("${_matlab_current_release}" _matlab_current_version)
+          if(MATLAB_FIND_DEBUG)
+            message(STATUS "[MATLAB] Found version ${_matlab_current_release} (${_matlab_current_version}) in ${_matlab_full_string}")
+          endif()
+          list(APPEND _matlab_possible_roots ${_matlab_current_version})
+          list(APPEND _matlab_possible_roots ${_matlab_full_string})
+          unset(_matlab_current_version)
+        endif()
+
+        unset(_matlab_full_string)
+      endforeach(_matlab_current_release)
+      unset(_matlab_current_release)
+      unset(_matlab_releases)
+    endif()
+
+    # we need to clear Matlab_MAIN_PROGRAM here
+    unset(Matlab_MAIN_PROGRAM CACHE)
+    unset(Matlab_MAIN_PROGRAM)
+
+  elseif(NOT EXISTS ${MATLAB_USER_ROOT})
+    # if MATLAB_USER_ROOT specified but erroneous
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] the specified path for MATLAB_USER_ROOT does not exist (${MATLAB_USER_ROOT})")
+    endif()
   else()
-    # AMD64:
-    set(MATLAB_ROOT
-      /usr/local/matlab-7sp1/bin/glnxa64/
-      /opt/matlab-7sp1/bin/glnxa64/
-      $ENV{HOME}/matlab7_64/bin/glnxa64/
-      $ENV{HOME}/matlab-7sp1/bin/glnxa64/
-      $ENV{HOME}/redhat-matlab/bin/glnxa64/
-      )
+    list(APPEND _matlab_possible_roots "NOTFOUND" ${MATLAB_USER_ROOT}) # empty version
   endif()
-  find_library(MATLAB_MEX_LIBRARY
-    mex
-    ${MATLAB_ROOT}
-    )
-  find_library(MATLAB_MX_LIBRARY
-    mx
-    ${MATLAB_ROOT}
-    )
-  find_library(MATLAB_ENG_LIBRARY
-    eng
-    ${MATLAB_ROOT}
-    )
-  find_path(MATLAB_INCLUDE_DIR
-    "mex.h"
-    "/usr/local/matlab-7sp1/extern/include/"
-    "/opt/matlab-7sp1/extern/include/"
-    "$ENV{HOME}/matlab-7sp1/extern/include/"
-    "$ENV{HOME}/redhat-matlab/extern/include/"
+endif()
+
+
+if(MATLAB_FIND_DEBUG)
+  message(STATUS "[MATLAB] Matlab root folders are ${_matlab_possible_roots}")
+endif()
+
+
+
+if(DEFINED Matlab_ROOT_DIR)
+  unset(Matlab_ROOT_DIR)
+endif()
+
+# take the first possible Matlab root
+if(_matlab_possible_roots)
+  list(GET _matlab_possible_roots 0 Matlab_VERSION_STRING)
+  list(GET _matlab_possible_roots 1 Matlab_ROOT_DIR)
+  list(LENGTH _matlab_possible_roots numbers_of_matlab_roots)
+
+  # adding a warning in case of ambiguity
+  if(numbers_of_matlab_roots GREATER 2 AND MATLAB_FIND_DEBUG)
+    message(WARNING "[MATLAB] Found several distributions of Matlab. Setting the current version to ${Matlab_VERSION_STRING} (located ${Matlab_ROOT_DIR})."
+                    " If this is not the desired behaviour, provide the -DMATLAB_ROOT on the command line")
+  endif()
+endif()
+
+
+if((NOT (DEFINED Matlab_VERSION_STRING)) OR (NOT Matlab_VERSION_STRING))
+  set(Matlab_VERSION_STRING "NOTFOUND")
+endif()
+
+if(${Matlab_VERSION_STRING} STREQUAL "NOTFOUND")
+  if((NOT Matlab_MAIN_PROGRAM) OR (NOT EXISTS ${Matlab_MAIN_PROGRAM}))
+    if(MATLAB_FIND_DEBUG)
+      message(STATUS "[MATLAB] Unknown version, looking for Matlab under ${Matlab_ROOT_DIR}")
+    endif()
+    find_program(
+      Matlab_MAIN_PROGRAM
+      matlab
+      PATHS ${Matlab_ROOT_DIR} ${Matlab_ROOT_DIR}/bin
+      DOC "Matlab main program"
+      NO_DEFAULT_PATH
     )
 
+
+
+    if(Matlab_MAIN_PROGRAM)
+      set(matlab_list_of_all_versions)
+      matlab_get_version_from_matlab_run("${Matlab_MAIN_PROGRAM}" matlab_list_of_all_versions)
+
+      list(GET matlab_list_of_all_versions 0 MATLAB_VERSION_tmp)
+
+      # set the version into the cache
+      set(Matlab_VERSION_STRING ${MATLAB_VERSION_tmp} CACHE STRING "Matlab version (automatically determined)")
+      list(LENGTH list_of_all_versions list_of_all_versions_length)
+      if((${list_of_all_versions_length} GREATER 1) AND MATLAB_FIND_DEBUG)
+        message(WARNING "[MATLAB] Found several versions, taking the first one (versions found ${list_of_all_versions})")
+      endif()
+    endif()
+  endif()
+endif()
+
+
+if(MATLAB_FIND_DEBUG)
+  message(STATUS "[MATLAB] Current version is ${Matlab_VERSION_STRING} located ${Matlab_ROOT_DIR}")
+endif()
+
+
+
+if(Matlab_ROOT_DIR)
+  file(TO_CMAKE_PATH ${Matlab_ROOT_DIR} Matlab_ROOT_DIR)
+endif()
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+  set(_matlab_64Build FALSE)
+else()
+  set(_matlab_64Build TRUE)
+endif()
+
+if(APPLE)
+  set(_matlab_bin_prefix "mac") # i should be for intel
+  set(_matlab_bin_suffix_32bits "i")
+  set(_matlab_bin_suffix_64bits "i64")
+elseif(UNIX)
+  set(_matlab_bin_prefix "gln")
+  set(_matlab_bin_suffix_32bits "x86")
+  set(_matlab_bin_suffix_64bits "xa64")
+else()
+  set(_matlab_bin_prefix "win")
+  set(_matlab_bin_suffix_32bits "32")
+  set(_matlab_bin_suffix_64bits "64")
+endif()
+
+
+
+set(MATLAB_INCLUDE_DIR_TO_LOOK ${Matlab_ROOT_DIR}/extern/include)
+if(_matlab_64Build)
+  set(_matlab_current_suffix ${_matlab_bin_suffix_64bits})
+else()
+  set(_matlab_current_suffix ${_matlab_bin_suffix_32bits})
+endif()
+
+set(Matlab_BINARIES_DIR
+    ${Matlab_ROOT_DIR}/bin/${_matlab_bin_prefix}${_matlab_current_suffix})
+set(Matlab_EXTERN_LIBRARY_DIR
+    ${Matlab_ROOT_DIR}/extern/lib/${_matlab_bin_prefix}${_matlab_current_suffix})
+
+if(WIN32)
+  set(_matlab_lib_dir_for_search ${Matlab_EXTERN_LIBRARY_DIR}/microsoft)
+  set(_matlab_lib_prefix_for_search "lib")
+else()
+  set(_matlab_lib_dir_for_search ${Matlab_BINARIES_DIR})
+  set(_matlab_lib_prefix_for_search "lib")
+endif()
+
+unset(_matlab_64Build)
+
+
+if(NOT DEFINED Matlab_MEX_EXTENSION)
+  set(_matlab_mex_extension "")
+  matlab_get_mex_suffix("${Matlab_ROOT_DIR}" _matlab_mex_extension)
+
+  # This variable goes to the cache.
+  set(Matlab_MEX_EXTENSION ${_matlab_mex_extension} CACHE STRING "Extensions for the mex targets (automatically given by Matlab)")
+  unset(_matlab_mex_extension)
 endif()
 
-# This is common to UNIX and Win32:
-set(MATLAB_LIBRARIES
-  ${MATLAB_MEX_LIBRARY}
-  ${MATLAB_MX_LIBRARY}
-  ${MATLAB_ENG_LIBRARY}
-)
 
-if(MATLAB_INCLUDE_DIR AND MATLAB_LIBRARIES)
-  set(MATLAB_FOUND 1)
+if(MATLAB_FIND_DEBUG)
+  message(STATUS "[MATLAB] [DEBUG]_matlab_lib_prefix_for_search = ${_matlab_lib_prefix_for_search} | _matlab_lib_dir_for_search = ${_matlab_lib_dir_for_search}")
 endif()
 
-mark_as_advanced(
-  MATLAB_LIBRARIES
-  MATLAB_MEX_LIBRARY
-  MATLAB_MX_LIBRARY
-  MATLAB_ENG_LIBRARY
-  MATLAB_INCLUDE_DIR
-  MATLAB_FOUND
-  MATLAB_ROOT
+
+
+# internal
+# This small stub around find_library is to prevent any pollution of CMAKE_FIND_LIBRARY_PREFIXES in the global scope.
+# This is the function to be used below instead of the find_library directives.
+function(_Matlab_find_library _matlab_library_prefix)
+  set(CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES} ${_matlab_library_prefix})
+  find_library(${ARGN})
+endfunction()
+
+
+set(_matlab_required_variables)
+
+
+# the MEX library/header are required
+find_path(
+  Matlab_INCLUDE_DIRS
+  mex.h
+  PATHS ${MATLAB_INCLUDE_DIR_TO_LOOK}
+  NO_DEFAULT_PATH
+  )
+list(APPEND _matlab_required_variables Matlab_INCLUDE_DIRS)
+
+_Matlab_find_library(
+  ${_matlab_lib_prefix_for_search}
+  Matlab_MEX_LIBRARY
+  mex
+  PATHS ${_matlab_lib_dir_for_search}
+  NO_DEFAULT_PATH
 )
 
+
+list(APPEND _matlab_required_variables Matlab_MEX_LIBRARY)
+
+# the MEX extension is required
+list(APPEND _matlab_required_variables Matlab_MEX_EXTENSION)
+
+# the matlab root is required
+list(APPEND _matlab_required_variables Matlab_ROOT_DIR)
+
+
+# component Mex Compiler
+list(FIND Matlab_FIND_COMPONENTS MEX_COMPILER _matlab_find_mex_compiler)
+if(_matlab_find_mex_compiler GREATER -1)
+  find_program(
+    Matlab_MEX_COMPILER
+    "mex"
+    PATHS ${Matlab_BINARIES_DIR}
+    DOC "Matlab MEX compiler"
+    NO_DEFAULT_PATH
+  )
+
+  if(Matlab_MEX_COMPILER)
+    set(Matlab_MEX_COMPILER_FOUND TRUE)
+  endif()
+endif()
+unset(_matlab_find_mex_compiler)
+
+# component Matlab program
+list(FIND Matlab_FIND_COMPONENTS MAIN_PROGRAM _matlab_find_matlab_program)
+if(_matlab_find_matlab_program GREATER -1)
+  # todo cleanup with code above
+  if(NOT DEFINED Matlab_MAIN_PROGRAM)
+    find_program(
+      Matlab_MAIN_PROGRAM
+      matlab
+      PATHS ${Matlab_ROOT_DIR} ${Matlab_ROOT_DIR}/bin
+      DOC "Matlab main program"
+      NO_DEFAULT_PATH
+    )
+  endif()
+  if(Matlab_MAIN_PROGRAM)
+    set(Matlab_MAIN_PROGRAM_FOUND TRUE)
+  endif()
+
+endif()
+unset(_matlab_find_matlab_program)
+
+# Component MX library
+list(FIND Matlab_FIND_COMPONENTS MX_LIBRARY _matlab_find_mx)
+if(_matlab_find_mx GREATER -1)
+  _Matlab_find_library(
+    ${_matlab_lib_prefix_for_search}
+    Matlab_MX_LIBRARY
+    mx
+    PATHS ${_matlab_lib_dir_for_search}
+    NO_DEFAULT_PATH
+  )
+
+  if(Matlab_MX_LIBRARY)
+    set(Matlab_MX_LIBRARY_FOUND TRUE)
+  endif()
+endif()
+unset(_matlab_find_mx)
+
+
+# Component ENG library
+list(FIND Matlab_FIND_COMPONENTS ENG_LIBRARY _matlab_find_eng)
+if(_matlab_find_eng GREATER -1)
+  _Matlab_find_library(
+    ${_matlab_lib_prefix_for_search}
+    Matlab_ENG_LIBRARY
+    eng
+    PATHS ${_matlab_lib_dir_for_search}
+    NO_DEFAULT_PATH
+  )
+  if(Matlab_ENG_LIBRARY)
+    set(Matlab_ENG_LIBRARY_FOUND TRUE)
+  endif()
+endif()
+unset(_matlab_find_eng)
+
+
+
+
+
+unset(_matlab_lib_dir_for_search)
+
+
+set(Matlab_LIBRARIES ${Matlab_MEX_LIBRARY} ${Matlab_MX_LIBRARY} ${Matlab_ENG_LIBRARY})
+
+if(CMAKE_VERSION VERSION_LESS "2.8.11")
+  find_package_handle_standard_args(
+    Matlab
+    REQUIRED_VARS ${_matlab_required_variables}
+    VERSION_VAR Matlab_VERSION_STRING)
+else()
+  find_package_handle_standard_args(
+    Matlab
+    FOUND_VAR Matlab_FOUND
+    REQUIRED_VARS ${_matlab_required_variables} #MATLAB_REQUIRED_PROGRAMS MATLAB_REQUIRED_LIBRARIES MATLAB_REQUIRED_INCLUDE_DIRS
+    VERSION_VAR Matlab_VERSION_STRING
+    HANDLE_COMPONENTS)
+endif()
+
+unset(_matlab_required_variables)
+unset(_matlab_bin_prefix)
+unset(_matlab_bin_suffix_32bits)
+unset(_matlab_bin_suffix_64bits)
+unset(_matlab_current_suffix)
+unset(_matlab_lib_dir_for_search)
+unset(_matlab_lib_prefix_for_search)
+
+if(Matlab_INCLUDE_DIRS AND Matlab_LIBRARIES)
+  mark_as_advanced(
+    Matlab_LIBRARIES
+    Matlab_MEX_LIBRARY
+    Matlab_MX_LIBRARY
+    Matlab_ENG_LIBRARY
+    Matlab_INCLUDE_DIRS
+    Matlab_FOUND
+    MATLAB_USER_ROOT
+    Matlab_ROOT_DIR
+    Matlab_VERSION_STRING
+    Matlab_MAIN_PROGRAM
+    Matlab_MEX_EXTENSION
+    Matlab_BINARIES_DIR
+  )
+endif()
diff --git a/Modules/MatlabTestsRedirect.cmake b/Modules/MatlabTestsRedirect.cmake
new file mode 100644
index 0000000..46d1ef8
--- /dev/null
+++ b/Modules/MatlabTestsRedirect.cmake
@@ -0,0 +1,83 @@
+# This is an undocumented internal helper for the FindMatlab
+# module ``matlab_add_unit_test`` command.
+
+#=============================================================================
+# Copyright 2014-2015 Raffi Enficiaud, Max Planck Society
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+
+# Usage: cmake
+#   -Dtest_timeout=180
+#   -Dworking_directory="."
+#   -Doutput_directory=
+#   -Dadditional_paths=""
+#   -Dno_unittest_framework=""
+#   -DMatlab_PROGRAM=matlab_exe_location
+#   -DMatlab_ADDITIONNAL_STARTUP_OPTIONS=""
+#   -Dtest_name=name_of_the_test
+#   -Dcmd_to_run_before_test=""
+#   -Dunittest_file_to_run
+#   -P FindMatlab_TestsRedirect.cmake
+
+set(Matlab_UNIT_TESTS_CMD -nosplash -nojvm -nodesktop -nodisplay ${Matlab_ADDITIONNAL_STARTUP_OPTIONS})
+if(WIN32)
+  set(Matlab_UNIT_TESTS_CMD ${Matlab_UNIT_TESTS_CMD} -wait)
+endif()
+
+if(NOT test_timeout)
+  set(test_timeout 180)
+endif()
+
+if(NOT cmd_to_run_before_test)
+  set(cmd_to_run_before_test)
+endif()
+
+get_filename_component(unittest_file_directory   "${unittest_file_to_run}" DIRECTORY)
+get_filename_component(unittest_file_to_run_name "${unittest_file_to_run}" NAME_WE)
+
+set(concat_string '${unittest_file_directory}')
+foreach(s IN LISTS additional_paths)
+  if(NOT "${s}" STREQUAL "")
+    set(concat_string "${concat_string}, '${s}'")
+  endif()
+endforeach()
+
+set(unittest_to_run "runtests('${unittest_file_to_run_name}'), exit(max([ans(1,:).Failed]))")
+if(no_unittest_framework)
+  set(unittest_to_run "try, ${unittest_file_to_run_name}, catch err, disp('An exception has been thrown during the execution'), disp(err), disp(err.stack), exit(1), end, exit(0)")
+endif()
+
+set(Matlab_SCRIPT_TO_RUN
+    "addpath(${concat_string}), path, ${cmd_to_run_before_test}, ${unittest_to_run}"
+   )
+
+set(Matlab_LOG_FILE ${output_directory}/${test_name}.log)
+
+execute_process(
+  COMMAND ${Matlab_PROGRAM} ${Matlab_UNIT_TESTS_CMD} -logfile ${Matlab_LOG_FILE} -r ${Matlab_SCRIPT_TO_RUN}
+  RESULT_VARIABLE res
+  TIMEOUT ${test_timeout}
+  OUTPUT_QUIET # we do not want the output twice
+  )
+
+if(NOT EXISTS ${Matlab_LOG_FILE})
+  message( FATAL_ERROR "[MATLAB] ERROR: cannot find the log file ${Matlab_LOG_FILE}")
+endif()
+
+# print the output in any case.
+file(READ ${Matlab_LOG_FILE} matlab_log_content)
+message("Matlab test ${name_of_the_test} output:\n${matlab_log_content}") # if we put FATAL_ERROR here, the file is indented.
+
+
+if(NOT (res EQUAL 0))
+  message( FATAL_ERROR "[MATLAB] TEST FAILED" )
+endif()
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7e7aa2e..5c7e7af 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1251,6 +1251,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     add_subdirectory(FindJsonCpp)
   endif()
 
+  # Matlab module
+  if(CMake_TEST_FindMatlab)
+    ADD_TEST_MACRO(FindMatlab.basic_checks      ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>)
+    ADD_TEST_MACRO(FindMatlab.versions_checks   ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>)
+  endif()
+
   find_package(GTK2 QUIET)
   if(GTK2_FOUND)
     add_subdirectory(FindGTK2)
diff --git a/Tests/FindMatlab/basic_checks/CMakeLists.txt b/Tests/FindMatlab/basic_checks/CMakeLists.txt
new file mode 100644
index 0000000..acf71ea
--- /dev/null
+++ b/Tests/FindMatlab/basic_checks/CMakeLists.txt
@@ -0,0 +1,57 @@
+
+cmake_minimum_required (VERSION 2.8.12)
+enable_testing()
+project(basic_checks)
+
+set(MATLAB_FIND_DEBUG TRUE)
+
+# the success of the following command is dependent on the current configuration:
+# - on 32bits builds (cmake is building with 32 bits), it looks for 32 bits Matlab
+# - on 64bits builds (cmake is building with 64 bits), it looks for 64 bits Matlab
+find_package(Matlab REQUIRED COMPONENTS MX_LIBRARY MAIN_PROGRAM)
+
+
+
+matlab_add_mex(
+    # target name
+    NAME cmake_matlab_test_wrapper1
+    # output name
+    OUTPUT_NAME cmake_matlab_mex1
+    SRC ${CMAKE_CURRENT_SOURCE_DIR}/../matlab_wrapper1.cpp
+    DOCUMENTATION ${CMAKE_CURRENT_SOURCE_DIR}/../help_text1.m.txt
+  )
+
+
+matlab_add_unit_test(
+    NAME ${PROJECT_NAME}_matlabtest-1
+    TIMEOUT 30
+    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests1.m
+    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+    )
+
+matlab_add_unit_test(
+    NAME ${PROJECT_NAME}_matlabtest-2
+    TIMEOUT 15
+    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests_timeout.m
+    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+    )
+set_tests_properties(${PROJECT_NAME}_matlabtest-2 PROPERTIES WILL_FAIL TRUE)
+
+
+# testing the test without the unittest framework of Matlab
+matlab_add_unit_test(
+    NAME ${PROJECT_NAME}_matlabtest-3
+    TIMEOUT 30
+    NO_UNITTEST_FRAMEWORK
+    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests2.m
+    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+    )
+
+matlab_add_unit_test(
+    NAME ${PROJECT_NAME}_matlabtest-4
+    TIMEOUT 30
+    NO_UNITTEST_FRAMEWORK
+    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests3.m
+    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+    )
+set_tests_properties(${PROJECT_NAME}_matlabtest-4 PROPERTIES WILL_FAIL TRUE)
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests1.m b/Tests/FindMatlab/cmake_matlab_unit_tests1.m
new file mode 100644
index 0000000..2371c3a
--- /dev/null
+++ b/Tests/FindMatlab/cmake_matlab_unit_tests1.m
@@ -0,0 +1,33 @@
+
+classdef cmake_matlab_unit_tests1 < matlab.unittest.TestCase
+  % some simple unit test for CMake Matlab wrapper
+  properties
+  end
+
+  methods (Test)
+    function testDummyCall(testCase)
+      % very simple call test
+      cmake_matlab_mex1(rand(3,3));
+    end
+
+    function testDummyCall2(testCase)
+      % very simple call test 2
+      ret = cmake_matlab_mex1(rand(3,3));
+      testCase.verifyEqual(size(ret), size(rand(3,3)));
+
+      testCase.verifyEqual(size(cmake_matlab_mex1(rand(4,3))), [4,3] );
+    end
+
+    function testFailTest(testCase)
+      testCase.verifyError(@() cmake_matlab_mex1(10), 'cmake_matlab:configuration');
+      testCase.verifyError(@() cmake_matlab_mex1([10]), 'cmake_matlab:configuration');
+    end
+
+    function testHelpContent(testCase)
+      % testing the help feature
+      testCase.verifySubstring(evalc('help cmake_matlab_mex1'), 'Dummy matlab extension in cmake');
+    end
+
+
+  end
+end
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests2.m b/Tests/FindMatlab/cmake_matlab_unit_tests2.m
new file mode 100644
index 0000000..7a8a342
--- /dev/null
+++ b/Tests/FindMatlab/cmake_matlab_unit_tests2.m
@@ -0,0 +1,6 @@
+
+ret = cmake_matlab_mex1(rand(3,3));
+
+if(size(ret) ~= size(rand(3,3)))
+  error('Dimension mismatch!');
+end
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests3.m b/Tests/FindMatlab/cmake_matlab_unit_tests3.m
new file mode 100644
index 0000000..2639325
--- /dev/null
+++ b/Tests/FindMatlab/cmake_matlab_unit_tests3.m
@@ -0,0 +1,5 @@
+
+cmake_matlab_mex1(10);
+
+% should not reach this point
+exit(0);
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m b/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
new file mode 100644
index 0000000..66be1bb
--- /dev/null
+++ b/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
@@ -0,0 +1,15 @@
+
+classdef cmake_matlab_unit_tests_timeout < matlab.unittest.TestCase
+  % timeout tests
+
+  properties
+  end
+
+  methods (Test)
+    function testCallHangsShouldBeTimedOut(testCase)
+      cmake_matlab_mex1(rand(3,3));
+      disp('Will now wait.');
+      input('Testing the cmake Matlab package timeout - do not press anything');
+    end
+  end
+end
diff --git a/Tests/FindMatlab/help_text1.m.txt b/Tests/FindMatlab/help_text1.m.txt
new file mode 100644
index 0000000..a924355
--- /dev/null
+++ b/Tests/FindMatlab/help_text1.m.txt
@@ -0,0 +1,2 @@
+% Dummy matlab extension in cmake
+function ret = cmake_matlab_mex1(X)
diff --git a/Tests/FindMatlab/matlab_wrapper1.cpp b/Tests/FindMatlab/matlab_wrapper1.cpp
new file mode 100644
index 0000000..4149bb9
--- /dev/null
+++ b/Tests/FindMatlab/matlab_wrapper1.cpp
@@ -0,0 +1,26 @@
+
+// simple workaround to some compiler specific problems
+// see http://stackoverflow.com/questions/22367516/mex-compile-error-unknown-type-name-char16-t/23281916#23281916
+#include <algorithm>
+
+#include "mex.h"
+
+// this test should return a matrix of 10 x 10 and should check some of the arguments
+
+void mexFunction(const int nlhs, mxArray *plhs[], const int nrhs, const mxArray *prhs[])
+{
+  if(nrhs != 1)
+  {
+    mexErrMsgTxt("Incorrect arguments");
+  }
+
+  size_t dim1 = mxGetM(prhs[0]);
+  size_t dim2 = mxGetN(prhs[0]);
+
+  if(dim1 == 1 || dim2 == 1)
+  {
+    mexErrMsgIdAndTxt("cmake_matlab:configuration", "Incorrect arguments");
+  }
+
+  plhs[0] = mxCreateNumericMatrix(dim1, dim2, mxGetClassID(prhs[0]), mxREAL);
+}
diff --git a/Tests/FindMatlab/versions_checks/CMakeLists.txt b/Tests/FindMatlab/versions_checks/CMakeLists.txt
new file mode 100644
index 0000000..5d20685
--- /dev/null
+++ b/Tests/FindMatlab/versions_checks/CMakeLists.txt
@@ -0,0 +1,52 @@
+
+cmake_minimum_required (VERSION 2.8.12)
+enable_testing()
+project(versions_checks)
+
+set(MATLAB_FIND_DEBUG TRUE)
+set(MATLAB_ADDITIONAL_VERSIONS
+    "dummy=14.9")
+
+# the success of the following command is dependent on the current configuration
+# in this case, we are only interested in the version macros
+find_package(Matlab)
+
+
+
+if(NOT COMMAND matlab_get_version_from_release_name)
+  message(FATAL_ERROR "The macro matlab_get_version_from_release_name should be defined")
+endif()
+
+if(NOT COMMAND matlab_get_release_name_from_version)
+  message(FATAL_ERROR "The macro matlab_get_release_name_from_version should be defined")
+endif()
+
+
+# matlab_get_release_name_from_version
+matlab_get_release_name_from_version("7.13" release_name)
+if(NOT release_name STREQUAL "R2011b")
+  message(FATAL_ERROR "version 7.13 does not give release R2011b : '${release_name}' != R2011b")
+endif()
+
+matlab_get_release_name_from_version("14.9" release_name)
+if(NOT release_name STREQUAL "dummy")
+  message(FATAL_ERROR "version 14.9 does not give release dummy : '${release_name}' != dummy")
+endif()
+
+matlab_get_release_name_from_version("14.10" release_name)
+if(NOT release_name STREQUAL "")
+  message(FATAL_ERROR "version 14.10 does not give empty release: '${release_name}' != ''")
+endif()
+
+
+# matlab_get_version_from_release_name
+matlab_get_version_from_release_name("R2011a" version)
+if(NOT version STREQUAL "7.12")
+  message(FATAL_ERROR "Release R2011a does not give version 7.12 : '${version}' != 7.12")
+endif()
+
+matlab_get_version_from_release_name("dummy" version)
+#message(FATAL_ERROR "versionversion = ${version}")
+if(NOT version STREQUAL "14.9")
+  message(FATAL_ERROR "Release dummy does not give version 14.9 : '${version}' != 14.9")
+endif()
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 2de82a7..8e4aaec 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -198,3 +198,8 @@ add_RunCMake_test(IfacePaths_SOURCES TEST_DIR IfacePaths)
 if(RPMBUILD)
   add_RunCMake_test(CPackRPM)
 endif()
+
+# Matlab module related tests
+if(CMake_TEST_FindMatlab)
+  add_RunCMake_test(FindMatlab)
+endif()
diff --git a/Tests/RunCMake/FindMatlab/CMakeLists.txt b/Tests/RunCMake/FindMatlab/CMakeLists.txt
new file mode 100644
index 0000000..1b9a957
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/CMakeLists.txt
@@ -0,0 +1,3 @@
+
+cmake_minimum_required(VERSION 2.8.12)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt b/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt b/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
new file mode 100644
index 0000000..95a787f
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*FindMatlab.cmake:[0-9]+ \(message\):
+  \[MATLAB\] This functionality needs the MAIN_PROGRAM component \(not default\)
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1.cmake b/Tests/RunCMake/FindMatlab/MatlabTest1.cmake
new file mode 100644
index 0000000..1cbc1c2
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/MatlabTest1.cmake
@@ -0,0 +1,22 @@
+
+cmake_minimum_required (VERSION 2.8.12)
+enable_testing()
+project(test_should_fail)
+
+find_package(Matlab REQUIRED COMPONENTS MX_LIBRARY)
+
+matlab_add_mex(
+    # target name
+    NAME cmake_matlab_test_wrapper1
+    # output name
+    OUTPUT_NAME cmake_matlab_mex1
+    SRC ${CMAKE_CURRENT_SOURCE_DIR}/matlab_wrapper1.cpp
+  )
+
+# this command should raise a FATAL_ERROR, component MAIN_PROGRAM is missing
+matlab_add_unit_test(
+    NAME ${PROJECT_NAME}_matlabtest-1
+    TIMEOUT 1
+    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake_matlab_unit_tests2.m
+    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+    )
diff --git a/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake b/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
new file mode 100644
index 0000000..33dbb77
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+
+include(RunCMake)
+run_cmake(MatlabTest1)
diff --git a/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m b/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
new file mode 100644
index 0000000..7a8a342
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
@@ -0,0 +1,6 @@
+
+ret = cmake_matlab_mex1(rand(3,3));
+
+if(size(ret) ~= size(rand(3,3)))
+  error('Dimension mismatch!');
+end
diff --git a/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp b/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp
new file mode 100644
index 0000000..4149bb9
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp
@@ -0,0 +1,26 @@
+
+// simple workaround to some compiler specific problems
+// see http://stackoverflow.com/questions/22367516/mex-compile-error-unknown-type-name-char16-t/23281916#23281916
+#include <algorithm>
+
+#include "mex.h"
+
+// this test should return a matrix of 10 x 10 and should check some of the arguments
+
+void mexFunction(const int nlhs, mxArray *plhs[], const int nrhs, const mxArray *prhs[])
+{
+  if(nrhs != 1)
+  {
+    mexErrMsgTxt("Incorrect arguments");
+  }
+
+  size_t dim1 = mxGetM(prhs[0]);
+  size_t dim2 = mxGetN(prhs[0]);
+
+  if(dim1 == 1 || dim2 == 1)
+  {
+    mexErrMsgIdAndTxt("cmake_matlab:configuration", "Incorrect arguments");
+  }
+
+  plhs[0] = mxCreateNumericMatrix(dim1, dim2, mxGetClassID(prhs[0]), mxREAL);
+}

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 17 10:12:37 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Feb 2015 10:12:37 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-372-g9e5df9c
Message-ID: <20150217151237.D2BC8A83B1@public.kitware.com>

This is an automated email from 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  9e5df9c8cba2b0b0a01a95ce44387650a2e1322a (commit)
       via  1635af55f08c58ddd58bd30cf446a5704f9a6fef (commit)
      from  c64df1c6575e49e0646b7b67a311278345e16595 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e5df9c8cba2b0b0a01a95ce44387650a2e1322a
commit 9e5df9c8cba2b0b0a01a95ce44387650a2e1322a
Merge: c64df1c 1635af5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 10:12:36 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 17 10:12:36 2015 -0500

    Merge topic 'FindMatlab-rewrite' into next
    
    1635af55 Revert "FindMatlab: Rewrite module and provide a usage API"

diff --cc Tests/RunCMake/CMakeLists.txt
index 7715f1c,2de82a7..f0426e5
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -195,11 -195,6 +195,6 @@@ add_RunCMake_test(IfacePaths_INCLUDE_DI
  set(IfacePaths_SOURCES_ARGS -DTEST_PROP=SOURCES)
  add_RunCMake_test(IfacePaths_SOURCES TEST_DIR IfacePaths)
  
 -if(RPMBUILD)
 +if(RPMBUILD_EXECUTABLE)
    add_RunCMake_test(CPackRPM)
  endif()
- 
- # Matlab module related tests
- if(CMake_TEST_FindMatlab)
-   add_RunCMake_test(FindMatlab)
- endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1635af55f08c58ddd58bd30cf446a5704f9a6fef
commit 1635af55f08c58ddd58bd30cf446a5704f9a6fef
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 10:10:58 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 17 10:10:58 2015 -0500

    Revert "FindMatlab: Rewrite module and provide a usage API"
    
    This reverts commit 9d414ca2ad8157bc2862fdfbc6dc362271a899b8.
    The module will need to be revised to address test failures.

diff --git a/Help/release/dev/FindMatlab-rewrite.rst b/Help/release/dev/FindMatlab-rewrite.rst
deleted file mode 100644
index 07727b8..0000000
--- a/Help/release/dev/FindMatlab-rewrite.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-FindMatlab-rewrite
-------------------
-
-* The :module:`FindMatlab` module was completely rewritten.  It learned
-  about versions and components and to find Matlab in a more precise and
-  multiplatform way.  The module now offers APIs to create mex extensions,
-  documentation, and unit tests.
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index c30ca37..474556e 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -2,201 +2,20 @@
 # FindMatlab
 # ----------
 #
-# Finds Matlab installations and provides Matlab tools and libraries to cmake.
+# this module looks for Matlab
 #
-# This package first intention is to find the libraries associated with Matlab
-# in order to be able to build Matlab extensions (mex files). It can also be
-# used:
+# Defines:
 #
-# * run specific commands in Matlab
-# * declare Matlab unit test
-# * retrieve various information from Matlab (mex extensions, versions and
-#   release queries, ...)
+# ::
 #
-# The module supports the following components:
-#
-# * ``MX_LIBRARY`` and ``ENG_LIBRARY`` respectively the MX and ENG libraries of
-#   Matlab
-# * ``MAIN_PROGRAM`` the Matlab binary program.
-#
-# .. note::
-#
-#   The version given to the :command:`find_package` directive is the Matlab
-#   **version**, which should not be confused with the Matlab *release* name
-#   (eg. `R2014`).
-#   The :command:`matlab_get_version_from_release_name` and
-#   :command:`matlab_get_release_name_from_version` allow a mapping
-#   from the release name to the version.
-#
-# The variable :variable:`MATLAB_USER_ROOT` may be specified in order to give
-# the path of the desired Matlab version. Otherwise, the behaviour is platform
-# specific:
-#
-# * Windows: The installed versions of Matlab are retrieved from the
-#   Windows registry
-# * OS X: The installed versions of Matlab are given by the MATLAB
-#   paths in ``/Application``
-# * Unix: The desired Matlab should be accessible from the PATH.
-#
-# Additional information is provided when :variable:`MATLAB_FIND_DEBUG` is set.
-# When a Matlab binary is found automatically and the ``MATLAB_VERSION``
-# is not given, the version is queried from Matlab directly.
-# On Windows, it can make a window running Matlab appear.
-#
-# The mapping of the release names and the version of Matlab is performed by
-# defining pairs (name, version).  The variable
-# :variable:`MATLAB_ADDITIONAL_VERSIONS` may be provided before the call to
-# the :command:`find_package` in order to handle additional versions.
-#
-# A Matlab scripts can be added to the set of tests using the
-# :command:`matlab_add_unit_test`. By default, the Matlab unit test framework
-# will be used (>= 2013a) to run this script, but regular ``.m`` files
-# returning an exit code can be used as well (0 indicating a success).
-#
-# Module Input Variables
-# ----------------------
-#
-# Users or projects may set the following variables to configure the module
-# behaviour:
-#
-# :variable:`MATLAB_USER_ROOT`
-#   the root of the Matlab installation.
-# :variable:`MATLAB_FIND_DEBUG`
-#   outputs debug information
-# :variable:`MATLAB_ADDITIONAL_VERSIONS`
-#   additional versions of Matlab for the automatic retrieval of the installed
-#   versions.
-#
-# Variables defined by the module
-# -------------------------------
-#
-# Result variables
-# ^^^^^^^^^^^^^^^^
-#
-# ``Matlab_FOUND``
-#   ``TRUE`` if the Matlab installation is found, ``FALSE``
-#   otherwise. All variable below are defined if Matlab is found.
-# ``Matlab_ROOT_DIR``
-#   the root of the Matlab installation determined by the FindMatlab module.
-# ``Matlab_MAIN_PROGRAM``
-#   the Matlab binary program. Available only if the component ``MAIN_PROGRAM``
-#   is given in the :command:`find_package` directive.
-# ``Matlab_INCLUDE_DIRS``
-#  the path of the Matlab libraries headers
-# ``Matlab_MEX_LIBRARY``
-#   library for mex
-# ``Matlab_MX_LIBRARY``
-#   mx library of Matlab (arrays). Available only if the component
-#   ``MX_LIBRARY`` has been requested.
-# ``Matlab_ENG_LIBRARY``
-#   Matlab engine library. Available only if the component ``ENG_LIBRARY``
-#   is requested.
-# ``Matlab_LIBRARIES``
-#   the whole set of libraries of Matlab
-# ``Matlab_MEX_COMPILER``
-#   the mex compiler of Matlab. Currently not used.
-#   Available only if the component ``MEX_COMPILER`` is asked
-#
-# Cached variables
-# ^^^^^^^^^^^^^^^^
-#
-# ``Matlab_VERSION_STRING``
-#   the version of the Matlab installation
-# ``Matlab_MEX_EXTENSION``
-#   the extension of the mex files for the current platform (given by Matlab).
-#
-# Provided macros
-# ---------------
-#
-# :command:`matlab_get_version_from_release_name`
-#   returns the version from the release name
-# :command:`matlab_get_release_name_from_version`
-#   returns the release name from the Matlab version
-#
-# Provided functions
-# ------------------
-#
-# :command:`matlab_add_mex`
-#   adds a target compiling a MEX file.
-# :command:`matlab_add_unit_test`
-#   adds a Matlab unit test file as a test to the project.
-# :command:`matlab_extract_all_installed_versions_from_registry`
-#   parses the registry for all Matlab versions. Available on Windows only.
-#   The part of the registry parsed is dependent on the host processor
-# :command:`matlab_get_all_valid_matlab_roots_from_registry`
-#   returns all the possible Matlab paths, according to a previously
-#   given list. Only the existing/accessible paths are kept. This is mainly
-#   useful for the searching all possible Matlab installation.
-# :command:`matlab_get_mex_suffix`
-#   returns the suffix to be used for the mex files
-#   (platform/architecture dependant)
-# :command:`matlab_get_version_from_matlab_run`
-#   returns the version of Matlab, given the full directory of the Matlab program.
-#
-#
-# Known issues
-# ------------
-#
-# **Symbol clash in a MEX target**
-#   By default, every symbols inside a MEX
-#   file defined with the command :command:`matlab_add_mex` have hidden
-#   visibility, except for the entry point. This is the default behaviour of
-#   the MEX compiler, which lowers the risk of symbol collision between the
-#   libraries shipped with Matlab, and the libraries to which the MEX file is
-#   linking to. This is also the default on Windows platforms.
-#
-#   However, this is not sufficient in certain case, where for instance your
-#   MEX file is linking against libraries that are already loaded by Matlab,
-#   even if those libraries have different SONAMES.
-#   A possible solution is to hide the symbols of the libraries to which the
-#   MEX target is linking to. This can be achieved in GNU GCC compilers with
-#   the linker option ``-Wl,--exclude-libs,ALL``.
-#
-# **Tests using GPU resources**
-#   in case your MEX file is using the GPU and
-#   in order to be able to run unit tests on this MEX file, the GPU resources
-#   should be properly released by Matlab. A possible solution is to make
-#   Matlab aware of the use of the GPU resources in the session, which can be
-#   performed by a command such as ``D = gpuDevice()`` at the beginning of
-#   the test script (or via a fixture).
-#
-#
-# Reference
-# --------------
-#
-# .. variable:: MATLAB_USER_ROOT
-#
-#    The root folder of the Matlab installation. This is set before the call to
-#    :command:`find_package`. If not set, then an automatic search of Matlab
-#    will be performed. If set, it should point to a valid version of Matlab.
-#
-# .. variable:: MATLAB_FIND_DEBUG
-#
-#    If set, the lookup of Matlab and the intermediate configuration steps are
-#    outputted to the console.
-#
-# .. variable:: MATLAB_ADDITIONAL_VERSIONS
-#
-#   If set, specifies additional versions of Matlab that may be looked for.
-#   This variable will be used if :variable:`MATLAB_USER_ROOT` is not set.
-#   The variable should be a list of strings, organised by pairs of release
-#   name and versions, such as follows::
-#
-#     set(MATLAB_ADDITIONAL_VERSIONS
-#         "release_name1=corresponding_version1"
-#         "release_name2=corresponding_version2"
-#         ...
-#         )
-#
-#   Example::
-#
-#     set(MATLAB_ADDITIONAL_VERSIONS
-#         "R2013b=8.2"
-#         "R2013a=8.1"
-#         "R2012b=8.0")
+#   MATLAB_INCLUDE_DIR: include path for mex.h, engine.h
+#   MATLAB_LIBRARIES:   required libraries: libmex, etc
+#   MATLAB_MEX_LIBRARY: path to libmex.lib
+#   MATLAB_MX_LIBRARY:  path to libmx.lib
+#   MATLAB_ENG_LIBRARY: path to libeng.lib
 
 #=============================================================================
-# Copyright 2014-2015 Raffi Enficiaud, Max Planck Society
+# Copyright 2005-2009 Kitware, Inc.
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -208,1172 +27,102 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-set(_FindMatlab_SELF_DIR "${CMAKE_CURRENT_LIST_DIR}")
-
-include(FindPackageHandleStandardArgs)
-include(CheckCXXCompilerFlag)
-
-
-# The currently supported versions. Other version can be added by the user by
-# providing MATLAB_ADDITIONAL_VERSIONS
-if(NOT MATLAB_ADDITIONAL_VERSIONS)
-  set(MATLAB_ADDITIONAL_VERSIONS)
-endif()
-
-set(MATLAB_VERSIONS_MAPPING
-  "R2013b=8.2"
-  "R2013a=8.1"
-  "R2012b=8.0"
-  "R2012a=7.14"
-
-  "R2011b=7.13"
-  "R2011a=7.12"
-  "R2010b=7.11"
-
-  ${MATLAB_ADDITIONAL_VERSIONS}
-  )
-
-
-# temporary folder for all Matlab runs
-set(_matlab_temporary_folder ${CMAKE_BINARY_DIR}/Matlab)
-
-if(NOT EXISTS ${_matlab_temporary_folder})
-  file(MAKE_DIRECTORY ${_matlab_temporary_folder})
-endif()
-
-#.rst:
-# .. command:: matlab_get_version_from_release_name
-#
-#   Returns the version of Matlab (17.58) from a release name (R2017k)
-macro (matlab_get_version_from_release_name release_name version_name)
-
-  string(REGEX MATCHALL "${release_name}=([0-9]+\\.?[0-9]*)" _matched ${MATLAB_VERSIONS_MAPPING})
-
-  set(${version_name} "")
-  if(NOT _matched STREQUAL "")
-    set(${version_name} ${CMAKE_MATCH_1})
-  else()
-    message(WARNING "The release name ${release_name} is not registered")
-  endif()
-
-endmacro()
-
-
-
-
-
-#.rst:
-# .. command:: matlab_get_release_name_from_version
-#
-#   Returns the release name (R2017k) from the version of Matlab (17.58)
-macro (matlab_get_release_name_from_version version release_name)
-
-  set(${release_name} "")
-  foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
-    string(REGEX MATCHALL "(.+)=${version}" _matched ${_var})
-    if(NOT _matched STREQUAL "")
-      set(${release_name} ${CMAKE_MATCH_1})
-      break()
-    endif()
-  endforeach(_var)
-
-  unset(_var)
-  unset(_matched)
-  if(${release_name} STREQUAL "")
-    message(WARNING "The version ${version} is not registered")
-  endif()
-
-endmacro()
-
-
-
-
-
-# extracts all the supported release names (R2017k...) of Matlab
-# internal use
-macro(matlab_get_supported_releases list_releases)
-  set(${list_releases})
-  foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
-    string(REGEX MATCHALL "(.+)=([0-9]+\\.?[0-9]*)" _matched ${_var})
-    if(NOT _matched STREQUAL "")
-      list(APPEND ${list_releases} ${CMAKE_MATCH_1})
-    endif()
-    unset(_matched)
-    unset(CMAKE_MATCH_1)
-  endforeach(_var)
-  unset(_var)
-endmacro()
-
-
-
-# extracts all the supported versions of Matlab
-# internal use
-macro(matlab_get_supported_versions list_versions)
-  set(${list_versions})
-  foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
-    string(REGEX MATCHALL "(.+)=([0-9]+\\.?[0-9]*)" _matched ${_var})
-    if(NOT _matched STREQUAL "")
-      list(APPEND ${list_versions} ${CMAKE_MATCH_2})
-    endif()
-    unset(_matched)
-    unset(CMAKE_MATCH_1)
-  endforeach(_var)
-  unset(_var)
-endmacro()
-
-
-#.rst:
-# .. command:: matlab_extract_all_installed_versions_from_registry
-#
-#   This function parses the registry and founds the Matlab versions that are
-#   installed. The found versions are returned in `matlab_versions`.
-#   Set `win64` to `TRUE` if the 64 bit version of Matlab should be looked for
-#   The returned list contains all versions under
-#   ``HKLM\\SOFTWARE\\Mathworks\\MATLAB`` or an empty list in case an error
-#   occurred (or nothing found).
-#
-#   .. note::
-#
-#     Only the versions are provided. No check is made over the existence of the
-#     installation referenced in the registry,
-#
-function(matlab_extract_all_installed_versions_from_registry win64 matlab_versions)
-
-  if(NOT CMAKE_HOST_WIN32)
-    message(FATAL_ERROR "This macro can only be called by a windows host (call to reg.exe")
-  endif()
-
-  # list the keys under HKEY_LOCAL_MACHINE\SOFTWARE\mathworks but the call to
-  # reg does not work from cmake, curiously, as is. The command provides the
-  # desired result under the command line though.
-  # Fix: this is because "/reg:64" should appended to the command, otherwise
-  # it gets on the 32 bits software key (curiously again)
-  find_program(MATLAB_REG_EXE_LOCATION "reg")
-
-  # if reg.exe is not found, then it is impossible to use this method.
-  if(NOT MATLAB_REG_EXE_LOCATION)
-    if(MATLAB_FIND_DEBUG)
-      message(WARNING "[MATLAB] reg.exe not found")
-    endif()
-    set(${matlab_versions} "" PARENT_SCOPE)
-    return()
-  endif()
-
-  if(${win64} AND ${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "64")
-    set(APPEND_REG "/reg:64")
+set(MATLAB_FOUND 0)
+if(WIN32)
+  if(${CMAKE_GENERATOR} MATCHES "Visual Studio 6")
+    set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/msvc60")
   else()
-    set(APPEND_REG "/reg:32")
-  endif()
-
-  # /reg:64 should be added on 64 bits capable OSs in order to enable the
-  # redirection of 64 bits applications
-  execute_process(
-    COMMAND ${MATLAB_REG_EXE_LOCATION} query HKEY_LOCAL_MACHINE\\SOFTWARE\\Mathworks\\MATLAB /f * /k ${APPEND_REG}
-    RESULT_VARIABLE resultMatlab
-    OUTPUT_VARIABLE varMatlab
-    ERROR_VARIABLE errMatlab
-    )
-  #message("Matlabs = ${varMatlab} | ${resultMatlab}")
-
-
-  set(matlabs_from_registry)
-  if(${resultMatlab} EQUAL 0)
-
-    string(
-      REGEX MATCHALL "MATLAB\\\\([0-9]+(\\.[0-9]+)?)"
-      matlab_versions_regex ${varMatlab})
-
-    foreach(match IN LISTS matlab_versions_regex)
-      string(
-        REGEX MATCH "MATLAB\\\\(([0-9]+)(\\.([0-9]+))?)"
-        current_match ${match})
-
-      set(_matlab_current_version ${CMAKE_MATCH_1})
-      set(current_matlab_version_major ${CMAKE_MATCH_2})
-      set(current_matlab_version_minor ${CMAKE_MATCH_4})
-      if(NOT current_matlab_version_minor)
-        set(current_matlab_version_minor "0")
+    if(${CMAKE_GENERATOR} MATCHES "Visual Studio 7")
+      # Assume people are generally using 7.1,
+      # if using 7.0 need to link to: ../extern/lib/win32/microsoft/msvc70
+      set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/msvc71")
+    else()
+      if(${CMAKE_GENERATOR} MATCHES "Borland")
+        # Same here, there are also: bcc50 and bcc51 directories
+        set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/bcc54")
+      else()
+        if(MATLAB_FIND_REQUIRED)
+          message(FATAL_ERROR "Generator not compatible: ${CMAKE_GENERATOR}")
+        endif()
       endif()
-
-      list(APPEND matlabs_from_registry ${_matlab_current_version})
-      unset(_matlab_current_version)
-    endforeach(match)
-
-  endif()
-
-  set(${matlab_versions} ${matlabs_from_registry} PARENT_SCOPE)
-
-endfunction()
-
-
-
-# (internal)
-macro(extract_matlab_versions_from_registry_brute_force matlab_versions)
-  # get the supported versions
-  set(matlab_supported_versions)
-  matlab_get_supported_versions(matlab_supported_versions)
-
-
-  # this is a manual population of the versions we want to look for
-  # this can be done as is, but preferably with the call to
-  # matlab_get_supported_versions and variable
-
-  # populating the versions we want to look for
-  # set(matlab_supported_versions)
-
-  # # Matlab 7
-  # set(matlab_major 7)
-  # foreach(current_matlab_minor RANGE 4 20)
-    # list(APPEND matlab_supported_versions "${matlab_major}.${current_matlab_minor}")
-  # endforeach(current_matlab_minor)
-
-  # # Matlab 8
-  # set(matlab_major 8)
-  # foreach(current_matlab_minor RANGE 0 5)
-    # list(APPEND matlab_supported_versions "${matlab_major}.${current_matlab_minor}")
-  # endforeach(current_matlab_minor)
-
-  # # taking into account the possible additional versions provided by the user
-  # if(DEFINED MATLAB_ADDITIONAL_VERSIONS)
-    # list(APPEND matlab_supported_versions MATLAB_ADDITIONAL_VERSIONS)
-  # endif()
-
-
-  # we order from more recent to older
-  list(REMOVE_DUPLICATES matlab_supported_versions)
-  list(SORT matlab_supported_versions)
-  list(REVERSE matlab_supported_versions)
-
-
-  set(${matlab_versions} ${matlab_supported_versions})
-
-
-endmacro()
-
-
-
-
-#.rst:
-# .. command:: matlab_get_all_valid_matlab_roots_from_registry
-#
-#   Populates the Matlab root with valid versions of Matlab.
-#   The returned matlab_roots is organized in pairs
-#   ``(version_number,matlab_root_path)``.
-#
-#   ::
-#
-#     matlab_get_all_valid_matlab_roots_from_registry(
-#         matlab_versions
-#         matlab_roots)
-#
-#   ``matlab_versions``
-#     the versions of each of the Matlab installations
-#   ``matlab_roots``
-#     the location of each of the Matlab installations
-function(matlab_get_all_valid_matlab_roots_from_registry matlab_versions matlab_roots)
-
-  # The matlab_versions comes either from
-  # extract_matlab_versions_from_registry_brute_force or
-  # matlab_extract_all_installed_versions_from_registry.
-
-
-  set(_matlab_roots_list )
-  foreach(_matlab_current_version ${matlab_versions})
-    get_filename_component(
-      current_MATLAB_ROOT
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\${_matlab_current_version};MATLABROOT]"
-      ABSOLUTE)
-
-    if(EXISTS ${current_MATLAB_ROOT})
-      list(APPEND _matlab_roots_list ${_matlab_current_version} ${current_MATLAB_ROOT})
-    endif()
-
-  endforeach(_matlab_current_version)
-  unset(_matlab_current_version)
-  set(${matlab_roots} ${_matlab_roots_list} PARENT_SCOPE)
-  unset(_matlab_roots_list)
-endfunction()
-
-#.rst:
-# .. command:: matlab_get_mex_suffix
-#
-#   Returns the extension of the mex files (the suffixes).
-#   This function should not be called before the appropriate Matlab root has
-#   been found.
-#
-#   ::
-#
-#     matlab_get_mex_suffix(
-#         matlab_root
-#         mex_suffix)
-#
-#   ``matlab_root``
-#     the root of the Matlab installation
-#   ``mex_suffix``
-#     the variable name in which the suffix will be returned.
-function(matlab_get_mex_suffix matlab_root mex_suffix)
-
-  # todo setup the extension properly. Currently I do not know if this is
-  # sufficient for all win32 distributions.
-  # there is also CMAKE_EXECUTABLE_SUFFIX that could be tweaked
-  set(mexext_suffix "")
-  if(WIN32)
-    list(APPEND mexext_suffix ".bat")
-  endif()
-
-  # we first try without suffix, since cmake does not understand a list with
-  # one empty string element
-  find_program(
-    MATLAB_MEXEXTENSIONS_PROG
-    "mexext"
-    PATHS ${matlab_root}/bin
-    DOC "Matlab MEX extension provider"
-    NO_DEFAULT_PATH
-  )
-
-  foreach(current_mexext_suffix IN LISTS mexext_suffix)
-    if(NOT DEFINED MATLAB_MEXEXTENSIONS_PROG OR NOT MATLAB_MEXEXTENSIONS_PROG)
-      # this call should populate the cache automatically
-      find_program(
-        MATLAB_MEXEXTENSIONS_PROG
-        "mexext${current_mexext_suffix}"
-        PATHS ${matlab_root}/bin
-        DOC "Matlab MEX extension provider"
-        NO_DEFAULT_PATH
-      )
     endif()
-  endforeach(current_mexext_suffix)
-
-
-  # the program has been found?
-  if((NOT MATLAB_MEXEXTENSIONS_PROG) OR (NOT EXISTS ${MATLAB_MEXEXTENSIONS_PROG}))
-    if(MATLAB_FIND_DEBUG)
-      message(WARNING "[MATLAB] Cannot found mexext program. Matlab root is ${matlab_root}")
-    endif()
-    return()
   endif()
-
-  set(_matlab_mex_extension)
-
-
-  execute_process(
-    COMMAND ${MATLAB_MEXEXTENSIONS_PROG}
-    OUTPUT_VARIABLE _matlab_mex_extension)
-  string(STRIP ${_matlab_mex_extension} _matlab_mex_extension)
-
-  set(${mex_suffix} ${_matlab_mex_extension} PARENT_SCOPE)
-endfunction()
-
-
-
-
-#.rst:
-# .. command:: matlab_get_version_from_matlab_run
-#
-#   This function runs Matlab program specified on arguments and extracts its
-#   version.
-#
-#   ::
-#
-#     matlab_get_version_from_matlab_run(
-#         matlab_binary_path
-#         matlab_list_versions)
-#
-#   ``matlab_binary_path``
-#     the location of the `matlab` binary executable
-#   ``matlab_list_versions``
-#     the version extracted from Matlab
-function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_versions)
-
-  set(${matlab_list_versions} "" PARENT_SCOPE)
-
-
-  if(MATLAB_FIND_DEBUG)
-    message(STATUS "[MATLAB] Determining the version of Matlab from ${matlab_binary_program}")
-  endif()
-
-  if(EXISTS ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
-    if(MATLAB_FIND_DEBUG)
-      message(STATUS "[MATLAB] Removing previous ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp file")
-    endif()
-    file(REMOVE ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
-  endif()
-
-
-  # the log file is needed since on windows the command executes in a new
-  # window and it is not possible to get back the answer of Matlab
-  # the -wait command is needed on windows, otherwise the call returns
-  # immediately after the program launches itself.
-  if(WIN32)
-    set(_matlab_additional_commands "-wait")
-  endif()
-
-  # timeout set to 30 seconds, in case it does not start
-  # note as said before OUTPUT_VARIABLE cannot be used in a platform
-  # independent manner however, not setting it would flush the output of Matlab
-  # in the current console (unix variant)
-  execute_process(
-    COMMAND ${matlab_binary_program} -nosplash -nojvm ${_matlab_additional_commands} -logfile ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp -nodesktop -nodisplay -r "version, exit"
-    OUTPUT_VARIABLE _matlab_version_from_cmd_dummy
-    RESULT_VARIABLE _matlab_result_version_call
-    TIMEOUT 30
+  find_library(MATLAB_MEX_LIBRARY
+    libmex
+    ${MATLAB_ROOT}
     )
-
-
-  if(${_matlab_result_version_call})
-    if(MATLAB_FIND_DEBUG)
-      message(WARNING "[MATLAB] Unable to determine the version of Matlab. Matlab call returned with error ${_matlab_result_version_call}.")
-    endif()
-    return()
-  elseif(NOT EXISTS ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
-    if(MATLAB_FIND_DEBUG)
-      message(WARNING "[MATLAB] Unable to determine the version of Matlab. The log file does not exist.")
-    endif()
-    return()
-  endif()
-
-  # if successful, read back the log
-  file(READ ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp _matlab_version_from_cmd)
-  file(REMOVE ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
-
-  set(index -1)
-  string(FIND ${_matlab_version_from_cmd} "ans" index)
-  if(index EQUAL -1)
-
-    if(MATLAB_FIND_DEBUG)
-      message(WARNING "[MATLAB] Cannot find the version of Matlab returned by the run.")
-    endif()
-
-  else()
-    set(matlab_list_of_all_versions_tmp)
-
-    string(SUBSTRING ${_matlab_version_from_cmd} ${index} -1 substring_ans)
-    string(
-      REGEX MATCHALL "ans[\r\n\t ]*=[\r\n\t ]*([0-9]+(\\.[0-9]+)?)"
-      matlab_versions_regex
-      ${substring_ans})
-    foreach(match IN LISTS matlab_versions_regex)
-      string(
-        REGEX MATCH "ans[\r\n\t ]*=[\r\n\t ]*(([0-9]+)(\\.([0-9]+))?)"
-        current_match ${match})
-
-      list(APPEND matlab_list_of_all_versions_tmp ${CMAKE_MATCH_1})
-    endforeach()
-    list(REMOVE_DUPLICATES matlab_list_of_all_versions_tmp)
-    set(${matlab_list_versions} ${matlab_list_of_all_versions_tmp} PARENT_SCOPE)
-
-  endif()
-
-endfunction()
-
-
-#.rst:
-# .. command:: matlab_add_unit_test
-#
-#   Adds a Matlab unit test to the test set of cmake/ctest.
-#   This command requires the component ``MAIN_PROGRAM``.
-#   The unit test uses the Matlab unittest framework (default, available
-#   starting Matlab 2013b+) except if the option ``NO_UNITTEST_FRAMEWORK``
-#   is given.
-#
-#   The function expects one Matlab test script file to be given.
-#   In the case ``NO_UNITTEST_FRAMEWORK`` is given, the unittest script file
-#   should contain the script to be run, plus an exit command with the exit
-#   value. This exit value will be passed to the ctest framework (0 success,
-#   non 0 failure). Additional arguments accepted by :command:`add_test` can be
-#   passed through ``TEST_ARGS`` (eg. ``CONFIGURATION <config> ...``).
-#
-#   ::
-#
-#     matlab_add_unit_test(
-#         NAME <name>
-#         UNITTEST_FILE matlab_file_containing_unittest.m
-#         [UNITTEST_PRECOMMAND matlab_command_to_run]
-#         [TIMEOUT timeout]
-#         [ADDITIONAL_PATH path1 [path2 ...]]
-#         [MATLAB_ADDITIONAL_STARTUP_OPTIONS option1 [option2 ...]]
-#         [TEST_ARGS arg1 [arg2 ...]]
-#         [NO_UNITTEST_FRAMEWORK]
-#         )
-#
-#   The function arguments are:
-#
-#   ``NAME``
-#     name of the unittest in ctest.
-#   ``UNITTEST_FILE``
-#     the matlab unittest file. Its path will be automatically
-#     added to the Matlab path.
-#   ``UNITTEST_PRECOMMAND``
-#     Matlab script command to be ran before the file
-#     containing the test (eg. GPU device initialisation based on CMake
-#     variables).
-#   ``TIMEOUT``
-#     the test timeout in seconds. Defaults to 180 seconds as the
-#     Matlab unit test may hang.
-#   ``ADDITIONAL_PATH``
-#     a list of paths to add to the Matlab path prior to
-#     running the unit test.
-#   ``MATLAB_ADDITIONAL_STARTUP_OPTIONS``
-#     a list of additional option in order
-#     to run Matlab from the command line.
-#   ``TEST_ARGS``
-#     Additional options provided to the add_test command. These
-#     options are added to the default options (eg. "CONFIGURATIONS Release")
-#   ``NO_UNITTEST_FRAMEWORK``
-#     when set, indicates that the test should not
-#     use the unittest framework of Matlab (available for versions >= R2013a).
-#
-function(matlab_add_unit_test)
-
-  if(NOT Matlab_MAIN_PROGRAM)
-    message(FATAL_ERROR "[MATLAB] This functionality needs the MAIN_PROGRAM component (not default)")
-  endif()
-
-  set(options NO_UNITTEST_FRAMEWORK)
-  set(oneValueArgs NAME UNITTEST_PRECOMMAND UNITTEST_FILE TIMEOUT)
-  set(multiValueArgs ADDITIONAL_PATH MATLAB_ADDITIONAL_STARTUP_OPTIONS TEST_ARGS)
-
-  set(prefix _matlab_unittest_prefix)
-  cmake_parse_arguments(${prefix} "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-
-  if(NOT ${prefix}_NAME)
-    message(FATAL_ERROR "[MATLAB] The Matlab test name cannot be empty")
-  endif()
-
-  add_test(NAME ${${prefix}_NAME}
-           COMMAND ${CMAKE_COMMAND}
-            -Dtest_name=${${prefix}_NAME}
-            -Dadditional_paths=${${prefix}_ADDITIONAL_PATH}
-            -Dtest_timeout=${${prefix}_TIMEOUT}
-            -Doutput_directory=${_matlab_temporary_folder}
-            -DMatlab_PROGRAM=${Matlab_MAIN_PROGRAM}
-            -Dno_unittest_framework=${${prefix}_NO_UNITTEST_FRAMEWORK}
-            -DMatlab_ADDITIONNAL_STARTUP_OPTIONS=${${prefix}_MATLAB_ADDITIONAL_STARTUP_OPTIONS}
-            -Dunittest_file_to_run=${${prefix}_UNITTEST_FILE}
-            -Dcmd_to_run_before_test=${${prefix}_UNITTEST_PRECOMMAND}
-            -P ${_FindMatlab_SELF_DIR}/MatlabTestsRedirect.cmake
-           ${${prefix}_TEST_ARGS}
-           ${${prefix}_UNPARSED_ARGUMENTS}
-           )
-endfunction()
-
-
-#.rst:
-# .. command:: matlab_add_mex
-#
-#   Adds a Matlab MEX target.
-#   This commands compiles the given sources with the current tool-chain in
-#   order to produce a MEX file. The final name of the produced output may be
-#   specified, as well as additional link libraries, and a documentation entry
-#   for the MEX file. Remaining arguments of the call are passed to the
-#   :command:`add_library` command.
-#
-#   ::
-#
-#      matlab_add_mex(
-#          NAME <name>
-#          SRC src1 [src2 ...]
-#          [OUTPUT_NAME output_name]
-#          [DOCUMENTATION file.txt]
-#          [LINK_TO target1 target2 ...]
-#          [...]
-#      )
-#
-#   ``NAME``
-#     name of the target.
-#   ``SRC``
-#     list of tje source files.
-#   ``LINK_TO``
-#     a list of additional link dependencies.  The target links to ``libmex``
-#     by default. If ``Matlab_MX_LIBRARY`` is defined, it also
-#     links to ``libmx``.
-#   ``OUTPUT_NAME``
-#     if given, overrides the default name. The default name is
-#     the name of the target without any prefix and
-#     with ``Matlab_MEX_EXTENSION`` suffix.
-#   ``DOCUMENTATION``
-#     if given, the file ``file.txt`` will be considered as
-#     being the documentation file for the MEX file. This file is copied into
-#     the same folder without any processing, with the same name as the final
-#     mex file, and with extension `.m`. In that case, typing ``help <name>``
-#     in Matlab prints the documentation contained in this file.
-#
-#   The documentation file is not processed and should be in the following
-#   format:
-#
-#   ::
-#
-#     % This is the documentation
-#     function ret = mex_target_output_name(input1)
-#
-function(matlab_add_mex )
-
-  if(NOT WIN32)
-    # we do not need all this on Windows
-    # pthread options
-    check_cxx_compiler_flag(-pthread                    HAS_MINUS_PTHREAD)
-    # we should use try_compile instead, the link flags are discarded from
-    # this compiler_flag function.
-    #check_cxx_compiler_flag(-Wl,--exclude-libs,ALL HAS_SYMBOL_HIDING_CAPABILITY)
-
-  endif()
-
-  set(oneValueArgs NAME DOCUMENTATION OUTPUT_NAME)
-  set(multiValueArgs LINK_TO SRC)
-
-  set(prefix _matlab_addmex_prefix)
-  cmake_parse_arguments(${prefix} "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-
-  if(NOT ${prefix}_NAME)
-    message(FATAL_ERROR "[MATLAB] The MEX target name cannot be empty")
-  endif()
-
-  if(NOT ${prefix}_OUTPUT_NAME)
-    set(${prefix}_OUTPUT_NAME ${${prefix}_NAME})
-  endif()
-
-  add_library(${${prefix}_NAME}
-    SHARED
-      ${${prefix}_SRC}
-      ${${prefix}_DOCUMENTATION}
-      ${${prefix}_UNPARSED_ARGUMENTS})
-  target_include_directories(${${prefix}_NAME} PRIVATE ${Matlab_INCLUDE_DIRS})
-
-  if(DEFINED Matlab_MX_LIBRARY)
-    target_link_libraries(${${prefix}_NAME} ${Matlab_MX_LIBRARY})
-  endif()
-
-  target_link_libraries(${${prefix}_NAME} ${Matlab_MEX_LIBRARY} ${${prefix}_LINK_TO})
-  set_target_properties(${${prefix}_NAME}
-      PROPERTIES
-        PREFIX ""
-        OUTPUT_NAME ${${prefix}_OUTPUT_NAME}
-        SUFFIX ".${Matlab_MEX_EXTENSION}")
-
-
-  # documentation
-  if(NOT ${${prefix}_DOCUMENTATION} STREQUAL "")
-    get_target_property(output_name ${${prefix}_NAME} OUTPUT_NAME)
-    add_custom_command(
-      TARGET ${${prefix}_NAME}
-      PRE_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${${prefix}_DOCUMENTATION} $<TARGET_FILE_DIR:${${prefix}_NAME}>/${output_name}.m
-      COMMENT "Copy ${${prefix}_NAME} documentation file into the output folder"
+  find_library(MATLAB_MX_LIBRARY
+    libmx
+    ${MATLAB_ROOT}
     )
-  endif() # documentation
-
-  # entry point in the mex file + taking care of visibility and symbol clashes.
-  if(WIN32)
-    set_target_properties(${${prefix}_NAME}
-      PROPERTIES
-        DEFINE_SYMBOL "DLL_EXPORT_SYM=__declspec(dllexport)")
-  else()
-
-    if(HAS_MINUS_PTHREAD AND NOT APPLE)
-      # Apparently, compiling with -pthread generated the proper link flags
-      # and some defines at compilation
-      target_compile_options(${${prefix}_NAME} PRIVATE "-pthread")
-    endif()
-
-
-    # if we do not do that, the symbols linked from eg. boost remain weak and
-    # then clash with the ones defined in the matlab process. So by default
-    # the symbols are hidden.
-    # This also means that for shared libraries (like MEX), the entry point
-    # should be explicitly declared with default visibility, otherwise Matlab
-    # cannot find the entry point.
-    # Note that this is particularly meaningful if the MEX wrapper itself
-    # contains symbols that are clashing with Matlab (that are compiled in the
-    # MEX file). In order to propagate the visibility options to the libraries
-    # to which the MEX file is linked against, the -Wl,--exclude-libs,ALL
-    # option should also be specified.
-
-    set_target_properties(${${prefix}_NAME}
-      PROPERTIES
-        CXX_VISIBILITY_PRESET "hidden"
-        C_VISIBILITY_PRESET "hidden"
-        VISIBILITY_INLINES_HIDDEN "hidden"
+  find_library(MATLAB_ENG_LIBRARY
+    libeng
+    ${MATLAB_ROOT}
     )
 
-    #  get_target_property(
-    #    _previous_link_flags
-    #    ${${prefix}_NAME}
-    #    LINK_FLAGS)
-    #  if(NOT _previous_link_flags)
-    #    set(_previous_link_flags)
-    #  endif()
-
-    #  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    #    set_target_properties(${${prefix}_NAME}
-    #      PROPERTIES
-    #        LINK_FLAGS "${_previous_link_flags} -Wl,--exclude-libs,ALL"
-    #        # -Wl,--version-script=${_FindMatlab_SELF_DIR}/MatlabLinuxVisibility.map"
-    #    )
-    #  elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    #    # in this case, all other symbols become hidden.
-    #    set_target_properties(${${prefix}_NAME}
-    #      PROPERTIES
-    #        LINK_FLAGS "${_previous_link_flags} -Wl,-exported_symbol,_mexFunction"
-    #        #-Wl,-exported_symbols_list,${_FindMatlab_SELF_DIR}/MatlabOSXVisilibity.map"
-    #    )
-    #  endif()
-
-
-
-    set_target_properties(${${prefix}_NAME}
-      PROPERTIES
-        DEFINE_SYMBOL "DLL_EXPORT_SYM=__attribute__ ((visibility (\"default\")))"
+  find_path(MATLAB_INCLUDE_DIR
+    "mex.h"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/include"
     )
-
-
-  endif()
-
-endfunction()
-
-
-
-
-
-
-
-
-# this variable will get all Matlab installations found in the current system.
-set(_matlab_possible_roots)
-
-
-# listing the Matlab versions installed on the WIN machine if MATLAB_USER_ROOT
-# is not set
-if(WIN32)
-
-  # for windows
-
-
-  if(NOT MATLAB_USER_ROOT)
-    # if MATLAB_USER_ROOT not specified, we look for Matlab installation in
-    # the registry
-    # if unsuccessful, we look for all known revision and filter the existing
-    # ones.
-
-    # testing if we are able to extract the needed information from the registry
-    set(matlab_versions_from_registry)
-    matlab_extract_all_installed_versions_from_registry(CMAKE_CL_64 matlab_versions_from_registry)
-
-    # the returned list is empty, doing the search on all known versions
-    if(NOT matlab_versions_from_registry)
-
-      if(MATLAB_FIND_DEBUG)
-        message(STATUS "[MATLAB] Search for Matlab from the registry unsuccessful, testing all supported versions")
-      endif()
-
-      extract_matlab_versions_from_registry_brute_force(matlab_versions_from_registry)
-    endif()
-
-    # filtering the results with the registry keys
-    matlab_get_all_valid_matlab_roots_from_registry("${matlab_versions_from_registry}" _matlab_possible_roots)
-
-
-
-  elseif(NOT EXISTS ${MATLAB_USER_ROOT})
-
-    # if MATLAB_USER_ROOT specified but erroneous
-    if(MATLAB_FIND_DEBUG)
-      message(WARNING "[MATLAB] the specified path for MATLAB_USER_ROOT does not exist (${MATLAB_USER_ROOT})")
-    endif()
-  else()
-    list(APPEND _matlab_possible_roots "NOTFOUND" ${MATLAB_USER_ROOT}) # empty version
-  endif()
-
-
 else()
-  # for linux/osx
-
-  if(NOT MATLAB_USER_ROOT)
-
-    # if MATLAB_USER_ROOT not specified, we look for Matlab from the command
-    # line PATH
-    # maybe using CMAKE_PROGRAM_PATH to add some more hints
-    if(NOT Matlab_MAIN_PROGRAM)
-      # if we get there a second time and the folder matlab is created here,
-      # and then the find_program does not find it,
-      # the get_filename_component (... PROGRAM) finds this directory instead.
-    find_program(
-        Matlab_MAIN_PROGRAM
-      "matlab")
-    endif()
-
-    if(NOT Matlab_MAIN_PROGRAM)
-      #execute_process(COMMAND which matlab OUTPUT_VARIABLE _which_matlab
-      # RESULT_VARIABLE _which_matlab_result)
-      get_filename_component(Matlab_MAIN_PROGRAM "matlab" PROGRAM)
-
-      # "bug" of cmake: if we call get_filename_component with PROGRAM, it can
-      # return us a directory
-      if((NOT EXISTS ${Matlab_MAIN_PROGRAM}) OR (IS_DIRECTORY ${Matlab_MAIN_PROGRAM}))
-        execute_process(
-          COMMAND "which matlab"
-          OUTPUT_VARIABLE Matlab_MAIN_PROGRAM)
-      endif()
-
-      if(EXISTS ${Matlab_MAIN_PROGRAM})
-        get_filename_component(Matlab_MAIN_PROGRAM "${Matlab_MAIN_PROGRAM}" REALPATH)
-        get_filename_component(Matlab_MAIN_PROGRAM "${Matlab_MAIN_PROGRAM}" ABSOLUTE)
-        if(MATLAB_FIND_DEBUG)
-          message(STATUS "[MATLAB] matlab program result from the command line ${Matlab_MAIN_PROGRAM}")
-        endif()
-      else()
-        unset(Matlab_MAIN_PROGRAM)
-      endif()
-
-    endif()
-
-    if(Matlab_MAIN_PROGRAM AND EXISTS ${Matlab_MAIN_PROGRAM})
-      if(MATLAB_FIND_DEBUG)
-        message(STATUS "[MATLAB] found from the command line at ${Matlab_MAIN_PROGRAM}")
-      endif()
-
-      # resolve symlinks
-      get_filename_component(_matlab_current_location "${Matlab_MAIN_PROGRAM}" REALPATH)
-      if(${CMAKE_VERSION} VERSION_LESS "2.8.12")
-        set(_directory_alias PATH)
-      else()
-        set(_directory_alias DIRECTORY)
-      endif()
-      # get the directory (the command below has to be run twice)
-      get_filename_component(_matlab_current_location "${_matlab_current_location}" ${_directory_alias})
-      get_filename_component(_matlab_current_location "${_matlab_current_location}" ${_directory_alias}) # Matlab should be in bin
-      list(APPEND _matlab_possible_roots "NOTFOUND" ${_matlab_current_location}) # empty version
-    endif()
-
-    # on mac, we look for the /Application paths
-    # this corresponds to the behaviour on Windows. On Linux, we do not have
-    # any other guess.
-    if((NOT _matlab_possible_roots) AND APPLE)
-
-      matlab_get_supported_releases(_matlab_releases)
-      if(MATLAB_FIND_DEBUG)
-        message(STATUS "[MATLAB] Matlab supported versions ${_matlab_releases}. If more version should be supported "
-                     "the variable MATLAB_ADDITIONAL_VERSIONS can be set according to the documentation")
-      endif()
-
-      foreach(_matlab_current_release IN LISTS _matlab_releases)
-        set(_matlab_full_string "/Applications/MATLAB_${_matlab_current_release}.app")
-        if(EXISTS ${_matlab_full_string})
-          set(_matlab_current_version)
-          matlab_get_version_from_release_name("${_matlab_current_release}" _matlab_current_version)
-          if(MATLAB_FIND_DEBUG)
-            message(STATUS "[MATLAB] Found version ${_matlab_current_release} (${_matlab_current_version}) in ${_matlab_full_string}")
-          endif()
-          list(APPEND _matlab_possible_roots ${_matlab_current_version})
-          list(APPEND _matlab_possible_roots ${_matlab_full_string})
-          unset(_matlab_current_version)
-        endif()
-
-        unset(_matlab_full_string)
-      endforeach(_matlab_current_release)
-      unset(_matlab_current_release)
-      unset(_matlab_releases)
-    endif()
-
-    # we need to clear Matlab_MAIN_PROGRAM here
-    unset(Matlab_MAIN_PROGRAM CACHE)
-    unset(Matlab_MAIN_PROGRAM)
-
-  elseif(NOT EXISTS ${MATLAB_USER_ROOT})
-    # if MATLAB_USER_ROOT specified but erroneous
-    if(MATLAB_FIND_DEBUG)
-      message(WARNING "[MATLAB] the specified path for MATLAB_USER_ROOT does not exist (${MATLAB_USER_ROOT})")
-    endif()
+  if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    # Regular x86
+    set(MATLAB_ROOT
+      /usr/local/matlab-7sp1/bin/glnx86/
+      /opt/matlab-7sp1/bin/glnx86/
+      $ENV{HOME}/matlab-7sp1/bin/glnx86/
+      $ENV{HOME}/redhat-matlab/bin/glnx86/
+      )
   else()
-    list(APPEND _matlab_possible_roots "NOTFOUND" ${MATLAB_USER_ROOT}) # empty version
-  endif()
-endif()
-
-
-if(MATLAB_FIND_DEBUG)
-  message(STATUS "[MATLAB] Matlab root folders are ${_matlab_possible_roots}")
-endif()
-
-
-
-if(DEFINED Matlab_ROOT_DIR)
-  unset(Matlab_ROOT_DIR)
-endif()
-
-# take the first possible Matlab root
-if(_matlab_possible_roots)
-  list(GET _matlab_possible_roots 0 Matlab_VERSION_STRING)
-  list(GET _matlab_possible_roots 1 Matlab_ROOT_DIR)
-  list(LENGTH _matlab_possible_roots numbers_of_matlab_roots)
-
-  # adding a warning in case of ambiguity
-  if(numbers_of_matlab_roots GREATER 2 AND MATLAB_FIND_DEBUG)
-    message(WARNING "[MATLAB] Found several distributions of Matlab. Setting the current version to ${Matlab_VERSION_STRING} (located ${Matlab_ROOT_DIR})."
-                    " If this is not the desired behaviour, provide the -DMATLAB_ROOT on the command line")
-  endif()
-endif()
-
-
-if((NOT (DEFINED Matlab_VERSION_STRING)) OR (NOT Matlab_VERSION_STRING))
-  set(Matlab_VERSION_STRING "NOTFOUND")
-endif()
-
-if(${Matlab_VERSION_STRING} STREQUAL "NOTFOUND")
-  if((NOT Matlab_MAIN_PROGRAM) OR (NOT EXISTS ${Matlab_MAIN_PROGRAM}))
-    if(MATLAB_FIND_DEBUG)
-      message(STATUS "[MATLAB] Unknown version, looking for Matlab under ${Matlab_ROOT_DIR}")
-    endif()
-    find_program(
-      Matlab_MAIN_PROGRAM
-      matlab
-      PATHS ${Matlab_ROOT_DIR} ${Matlab_ROOT_DIR}/bin
-      DOC "Matlab main program"
-      NO_DEFAULT_PATH
-    )
-
-
-
-    if(Matlab_MAIN_PROGRAM)
-      set(matlab_list_of_all_versions)
-      matlab_get_version_from_matlab_run("${Matlab_MAIN_PROGRAM}" matlab_list_of_all_versions)
-
-      list(GET matlab_list_of_all_versions 0 MATLAB_VERSION_tmp)
-
-      # set the version into the cache
-      set(Matlab_VERSION_STRING ${MATLAB_VERSION_tmp} CACHE STRING "Matlab version (automatically determined)")
-      list(LENGTH list_of_all_versions list_of_all_versions_length)
-      if((${list_of_all_versions_length} GREATER 1) AND MATLAB_FIND_DEBUG)
-        message(WARNING "[MATLAB] Found several versions, taking the first one (versions found ${list_of_all_versions})")
-      endif()
-    endif()
-  endif()
-endif()
-
-
-if(MATLAB_FIND_DEBUG)
-  message(STATUS "[MATLAB] Current version is ${Matlab_VERSION_STRING} located ${Matlab_ROOT_DIR}")
-endif()
-
-
-
-if(Matlab_ROOT_DIR)
-  file(TO_CMAKE_PATH ${Matlab_ROOT_DIR} Matlab_ROOT_DIR)
-endif()
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-  set(_matlab_64Build FALSE)
-else()
-  set(_matlab_64Build TRUE)
-endif()
-
-if(APPLE)
-  set(_matlab_bin_prefix "mac") # i should be for intel
-  set(_matlab_bin_suffix_32bits "i")
-  set(_matlab_bin_suffix_64bits "i64")
-elseif(UNIX)
-  set(_matlab_bin_prefix "gln")
-  set(_matlab_bin_suffix_32bits "x86")
-  set(_matlab_bin_suffix_64bits "xa64")
-else()
-  set(_matlab_bin_prefix "win")
-  set(_matlab_bin_suffix_32bits "32")
-  set(_matlab_bin_suffix_64bits "64")
-endif()
-
-
-
-set(MATLAB_INCLUDE_DIR_TO_LOOK ${Matlab_ROOT_DIR}/extern/include)
-if(_matlab_64Build)
-  set(_matlab_current_suffix ${_matlab_bin_suffix_64bits})
-else()
-  set(_matlab_current_suffix ${_matlab_bin_suffix_32bits})
-endif()
-
-set(Matlab_BINARIES_DIR
-    ${Matlab_ROOT_DIR}/bin/${_matlab_bin_prefix}${_matlab_current_suffix})
-set(Matlab_EXTERN_LIBRARY_DIR
-    ${Matlab_ROOT_DIR}/extern/lib/${_matlab_bin_prefix}${_matlab_current_suffix})
-
-if(WIN32)
-  set(_matlab_lib_dir_for_search ${Matlab_EXTERN_LIBRARY_DIR}/microsoft)
-  set(_matlab_lib_prefix_for_search "lib")
-else()
-  set(_matlab_lib_dir_for_search ${Matlab_BINARIES_DIR})
-  set(_matlab_lib_prefix_for_search "lib")
-endif()
-
-unset(_matlab_64Build)
-
-
-if(NOT DEFINED Matlab_MEX_EXTENSION)
-  set(_matlab_mex_extension "")
-  matlab_get_mex_suffix("${Matlab_ROOT_DIR}" _matlab_mex_extension)
-
-  # This variable goes to the cache.
-  set(Matlab_MEX_EXTENSION ${_matlab_mex_extension} CACHE STRING "Extensions for the mex targets (automatically given by Matlab)")
-  unset(_matlab_mex_extension)
-endif()
-
-
-if(MATLAB_FIND_DEBUG)
-  message(STATUS "[MATLAB] [DEBUG]_matlab_lib_prefix_for_search = ${_matlab_lib_prefix_for_search} | _matlab_lib_dir_for_search = ${_matlab_lib_dir_for_search}")
-endif()
-
-
-
-# internal
-# This small stub around find_library is to prevent any pollution of CMAKE_FIND_LIBRARY_PREFIXES in the global scope.
-# This is the function to be used below instead of the find_library directives.
-function(_Matlab_find_library _matlab_library_prefix)
-  set(CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES} ${_matlab_library_prefix})
-  find_library(${ARGN})
-endfunction()
-
-
-set(_matlab_required_variables)
-
-
-# the MEX library/header are required
-find_path(
-  Matlab_INCLUDE_DIRS
-  mex.h
-  PATHS ${MATLAB_INCLUDE_DIR_TO_LOOK}
-  NO_DEFAULT_PATH
-  )
-list(APPEND _matlab_required_variables Matlab_INCLUDE_DIRS)
-
-_Matlab_find_library(
-  ${_matlab_lib_prefix_for_search}
-  Matlab_MEX_LIBRARY
-  mex
-  PATHS ${_matlab_lib_dir_for_search}
-  NO_DEFAULT_PATH
-)
-
-
-list(APPEND _matlab_required_variables Matlab_MEX_LIBRARY)
-
-# the MEX extension is required
-list(APPEND _matlab_required_variables Matlab_MEX_EXTENSION)
-
-# the matlab root is required
-list(APPEND _matlab_required_variables Matlab_ROOT_DIR)
-
-
-# component Mex Compiler
-list(FIND Matlab_FIND_COMPONENTS MEX_COMPILER _matlab_find_mex_compiler)
-if(_matlab_find_mex_compiler GREATER -1)
-  find_program(
-    Matlab_MEX_COMPILER
-    "mex"
-    PATHS ${Matlab_BINARIES_DIR}
-    DOC "Matlab MEX compiler"
-    NO_DEFAULT_PATH
-  )
-
-  if(Matlab_MEX_COMPILER)
-    set(Matlab_MEX_COMPILER_FOUND TRUE)
+    # AMD64:
+    set(MATLAB_ROOT
+      /usr/local/matlab-7sp1/bin/glnxa64/
+      /opt/matlab-7sp1/bin/glnxa64/
+      $ENV{HOME}/matlab7_64/bin/glnxa64/
+      $ENV{HOME}/matlab-7sp1/bin/glnxa64/
+      $ENV{HOME}/redhat-matlab/bin/glnxa64/
+      )
   endif()
-endif()
-unset(_matlab_find_mex_compiler)
-
-# component Matlab program
-list(FIND Matlab_FIND_COMPONENTS MAIN_PROGRAM _matlab_find_matlab_program)
-if(_matlab_find_matlab_program GREATER -1)
-  # todo cleanup with code above
-  if(NOT DEFINED Matlab_MAIN_PROGRAM)
-    find_program(
-      Matlab_MAIN_PROGRAM
-      matlab
-      PATHS ${Matlab_ROOT_DIR} ${Matlab_ROOT_DIR}/bin
-      DOC "Matlab main program"
-      NO_DEFAULT_PATH
+  find_library(MATLAB_MEX_LIBRARY
+    mex
+    ${MATLAB_ROOT}
     )
-  endif()
-  if(Matlab_MAIN_PROGRAM)
-    set(Matlab_MAIN_PROGRAM_FOUND TRUE)
-  endif()
-
-endif()
-unset(_matlab_find_matlab_program)
-
-# Component MX library
-list(FIND Matlab_FIND_COMPONENTS MX_LIBRARY _matlab_find_mx)
-if(_matlab_find_mx GREATER -1)
-  _Matlab_find_library(
-    ${_matlab_lib_prefix_for_search}
-    Matlab_MX_LIBRARY
+  find_library(MATLAB_MX_LIBRARY
     mx
-    PATHS ${_matlab_lib_dir_for_search}
-    NO_DEFAULT_PATH
-  )
-
-  if(Matlab_MX_LIBRARY)
-    set(Matlab_MX_LIBRARY_FOUND TRUE)
-  endif()
-endif()
-unset(_matlab_find_mx)
-
-
-# Component ENG library
-list(FIND Matlab_FIND_COMPONENTS ENG_LIBRARY _matlab_find_eng)
-if(_matlab_find_eng GREATER -1)
-  _Matlab_find_library(
-    ${_matlab_lib_prefix_for_search}
-    Matlab_ENG_LIBRARY
+    ${MATLAB_ROOT}
+    )
+  find_library(MATLAB_ENG_LIBRARY
     eng
-    PATHS ${_matlab_lib_dir_for_search}
-    NO_DEFAULT_PATH
-  )
-  if(Matlab_ENG_LIBRARY)
-    set(Matlab_ENG_LIBRARY_FOUND TRUE)
-  endif()
-endif()
-unset(_matlab_find_eng)
-
-
-
-
-
-unset(_matlab_lib_dir_for_search)
+    ${MATLAB_ROOT}
+    )
+  find_path(MATLAB_INCLUDE_DIR
+    "mex.h"
+    "/usr/local/matlab-7sp1/extern/include/"
+    "/opt/matlab-7sp1/extern/include/"
+    "$ENV{HOME}/matlab-7sp1/extern/include/"
+    "$ENV{HOME}/redhat-matlab/extern/include/"
+    )
 
+endif()
 
-set(Matlab_LIBRARIES ${Matlab_MEX_LIBRARY} ${Matlab_MX_LIBRARY} ${Matlab_ENG_LIBRARY})
+# This is common to UNIX and Win32:
+set(MATLAB_LIBRARIES
+  ${MATLAB_MEX_LIBRARY}
+  ${MATLAB_MX_LIBRARY}
+  ${MATLAB_ENG_LIBRARY}
+)
 
-if(CMAKE_VERSION VERSION_LESS "2.8.11")
-  find_package_handle_standard_args(
-    Matlab
-    REQUIRED_VARS ${_matlab_required_variables}
-    VERSION_VAR Matlab_VERSION_STRING)
-else()
-  find_package_handle_standard_args(
-    Matlab
-    FOUND_VAR Matlab_FOUND
-    REQUIRED_VARS ${_matlab_required_variables} #MATLAB_REQUIRED_PROGRAMS MATLAB_REQUIRED_LIBRARIES MATLAB_REQUIRED_INCLUDE_DIRS
-    VERSION_VAR Matlab_VERSION_STRING
-    HANDLE_COMPONENTS)
+if(MATLAB_INCLUDE_DIR AND MATLAB_LIBRARIES)
+  set(MATLAB_FOUND 1)
 endif()
 
-unset(_matlab_required_variables)
-unset(_matlab_bin_prefix)
-unset(_matlab_bin_suffix_32bits)
-unset(_matlab_bin_suffix_64bits)
-unset(_matlab_current_suffix)
-unset(_matlab_lib_dir_for_search)
-unset(_matlab_lib_prefix_for_search)
+mark_as_advanced(
+  MATLAB_LIBRARIES
+  MATLAB_MEX_LIBRARY
+  MATLAB_MX_LIBRARY
+  MATLAB_ENG_LIBRARY
+  MATLAB_INCLUDE_DIR
+  MATLAB_FOUND
+  MATLAB_ROOT
+)
 
-if(Matlab_INCLUDE_DIRS AND Matlab_LIBRARIES)
-  mark_as_advanced(
-    Matlab_LIBRARIES
-    Matlab_MEX_LIBRARY
-    Matlab_MX_LIBRARY
-    Matlab_ENG_LIBRARY
-    Matlab_INCLUDE_DIRS
-    Matlab_FOUND
-    MATLAB_USER_ROOT
-    Matlab_ROOT_DIR
-    Matlab_VERSION_STRING
-    Matlab_MAIN_PROGRAM
-    Matlab_MEX_EXTENSION
-    Matlab_BINARIES_DIR
-  )
-endif()
diff --git a/Modules/MatlabTestsRedirect.cmake b/Modules/MatlabTestsRedirect.cmake
deleted file mode 100644
index 46d1ef8..0000000
--- a/Modules/MatlabTestsRedirect.cmake
+++ /dev/null
@@ -1,83 +0,0 @@
-# This is an undocumented internal helper for the FindMatlab
-# module ``matlab_add_unit_test`` command.
-
-#=============================================================================
-# Copyright 2014-2015 Raffi Enficiaud, Max Planck Society
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-
-# Usage: cmake
-#   -Dtest_timeout=180
-#   -Dworking_directory="."
-#   -Doutput_directory=
-#   -Dadditional_paths=""
-#   -Dno_unittest_framework=""
-#   -DMatlab_PROGRAM=matlab_exe_location
-#   -DMatlab_ADDITIONNAL_STARTUP_OPTIONS=""
-#   -Dtest_name=name_of_the_test
-#   -Dcmd_to_run_before_test=""
-#   -Dunittest_file_to_run
-#   -P FindMatlab_TestsRedirect.cmake
-
-set(Matlab_UNIT_TESTS_CMD -nosplash -nojvm -nodesktop -nodisplay ${Matlab_ADDITIONNAL_STARTUP_OPTIONS})
-if(WIN32)
-  set(Matlab_UNIT_TESTS_CMD ${Matlab_UNIT_TESTS_CMD} -wait)
-endif()
-
-if(NOT test_timeout)
-  set(test_timeout 180)
-endif()
-
-if(NOT cmd_to_run_before_test)
-  set(cmd_to_run_before_test)
-endif()
-
-get_filename_component(unittest_file_directory   "${unittest_file_to_run}" DIRECTORY)
-get_filename_component(unittest_file_to_run_name "${unittest_file_to_run}" NAME_WE)
-
-set(concat_string '${unittest_file_directory}')
-foreach(s IN LISTS additional_paths)
-  if(NOT "${s}" STREQUAL "")
-    set(concat_string "${concat_string}, '${s}'")
-  endif()
-endforeach()
-
-set(unittest_to_run "runtests('${unittest_file_to_run_name}'), exit(max([ans(1,:).Failed]))")
-if(no_unittest_framework)
-  set(unittest_to_run "try, ${unittest_file_to_run_name}, catch err, disp('An exception has been thrown during the execution'), disp(err), disp(err.stack), exit(1), end, exit(0)")
-endif()
-
-set(Matlab_SCRIPT_TO_RUN
-    "addpath(${concat_string}), path, ${cmd_to_run_before_test}, ${unittest_to_run}"
-   )
-
-set(Matlab_LOG_FILE ${output_directory}/${test_name}.log)
-
-execute_process(
-  COMMAND ${Matlab_PROGRAM} ${Matlab_UNIT_TESTS_CMD} -logfile ${Matlab_LOG_FILE} -r ${Matlab_SCRIPT_TO_RUN}
-  RESULT_VARIABLE res
-  TIMEOUT ${test_timeout}
-  OUTPUT_QUIET # we do not want the output twice
-  )
-
-if(NOT EXISTS ${Matlab_LOG_FILE})
-  message( FATAL_ERROR "[MATLAB] ERROR: cannot find the log file ${Matlab_LOG_FILE}")
-endif()
-
-# print the output in any case.
-file(READ ${Matlab_LOG_FILE} matlab_log_content)
-message("Matlab test ${name_of_the_test} output:\n${matlab_log_content}") # if we put FATAL_ERROR here, the file is indented.
-
-
-if(NOT (res EQUAL 0))
-  message( FATAL_ERROR "[MATLAB] TEST FAILED" )
-endif()
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 5c7e7af..7e7aa2e 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1251,12 +1251,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     add_subdirectory(FindJsonCpp)
   endif()
 
-  # Matlab module
-  if(CMake_TEST_FindMatlab)
-    ADD_TEST_MACRO(FindMatlab.basic_checks      ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>)
-    ADD_TEST_MACRO(FindMatlab.versions_checks   ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>)
-  endif()
-
   find_package(GTK2 QUIET)
   if(GTK2_FOUND)
     add_subdirectory(FindGTK2)
diff --git a/Tests/FindMatlab/basic_checks/CMakeLists.txt b/Tests/FindMatlab/basic_checks/CMakeLists.txt
deleted file mode 100644
index acf71ea..0000000
--- a/Tests/FindMatlab/basic_checks/CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-
-cmake_minimum_required (VERSION 2.8.12)
-enable_testing()
-project(basic_checks)
-
-set(MATLAB_FIND_DEBUG TRUE)
-
-# the success of the following command is dependent on the current configuration:
-# - on 32bits builds (cmake is building with 32 bits), it looks for 32 bits Matlab
-# - on 64bits builds (cmake is building with 64 bits), it looks for 64 bits Matlab
-find_package(Matlab REQUIRED COMPONENTS MX_LIBRARY MAIN_PROGRAM)
-
-
-
-matlab_add_mex(
-    # target name
-    NAME cmake_matlab_test_wrapper1
-    # output name
-    OUTPUT_NAME cmake_matlab_mex1
-    SRC ${CMAKE_CURRENT_SOURCE_DIR}/../matlab_wrapper1.cpp
-    DOCUMENTATION ${CMAKE_CURRENT_SOURCE_DIR}/../help_text1.m.txt
-  )
-
-
-matlab_add_unit_test(
-    NAME ${PROJECT_NAME}_matlabtest-1
-    TIMEOUT 30
-    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests1.m
-    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
-    )
-
-matlab_add_unit_test(
-    NAME ${PROJECT_NAME}_matlabtest-2
-    TIMEOUT 15
-    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests_timeout.m
-    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
-    )
-set_tests_properties(${PROJECT_NAME}_matlabtest-2 PROPERTIES WILL_FAIL TRUE)
-
-
-# testing the test without the unittest framework of Matlab
-matlab_add_unit_test(
-    NAME ${PROJECT_NAME}_matlabtest-3
-    TIMEOUT 30
-    NO_UNITTEST_FRAMEWORK
-    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests2.m
-    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
-    )
-
-matlab_add_unit_test(
-    NAME ${PROJECT_NAME}_matlabtest-4
-    TIMEOUT 30
-    NO_UNITTEST_FRAMEWORK
-    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests3.m
-    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
-    )
-set_tests_properties(${PROJECT_NAME}_matlabtest-4 PROPERTIES WILL_FAIL TRUE)
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests1.m b/Tests/FindMatlab/cmake_matlab_unit_tests1.m
deleted file mode 100644
index 2371c3a..0000000
--- a/Tests/FindMatlab/cmake_matlab_unit_tests1.m
+++ /dev/null
@@ -1,33 +0,0 @@
-
-classdef cmake_matlab_unit_tests1 < matlab.unittest.TestCase
-  % some simple unit test for CMake Matlab wrapper
-  properties
-  end
-
-  methods (Test)
-    function testDummyCall(testCase)
-      % very simple call test
-      cmake_matlab_mex1(rand(3,3));
-    end
-
-    function testDummyCall2(testCase)
-      % very simple call test 2
-      ret = cmake_matlab_mex1(rand(3,3));
-      testCase.verifyEqual(size(ret), size(rand(3,3)));
-
-      testCase.verifyEqual(size(cmake_matlab_mex1(rand(4,3))), [4,3] );
-    end
-
-    function testFailTest(testCase)
-      testCase.verifyError(@() cmake_matlab_mex1(10), 'cmake_matlab:configuration');
-      testCase.verifyError(@() cmake_matlab_mex1([10]), 'cmake_matlab:configuration');
-    end
-
-    function testHelpContent(testCase)
-      % testing the help feature
-      testCase.verifySubstring(evalc('help cmake_matlab_mex1'), 'Dummy matlab extension in cmake');
-    end
-
-
-  end
-end
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests2.m b/Tests/FindMatlab/cmake_matlab_unit_tests2.m
deleted file mode 100644
index 7a8a342..0000000
--- a/Tests/FindMatlab/cmake_matlab_unit_tests2.m
+++ /dev/null
@@ -1,6 +0,0 @@
-
-ret = cmake_matlab_mex1(rand(3,3));
-
-if(size(ret) ~= size(rand(3,3)))
-  error('Dimension mismatch!');
-end
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests3.m b/Tests/FindMatlab/cmake_matlab_unit_tests3.m
deleted file mode 100644
index 2639325..0000000
--- a/Tests/FindMatlab/cmake_matlab_unit_tests3.m
+++ /dev/null
@@ -1,5 +0,0 @@
-
-cmake_matlab_mex1(10);
-
-% should not reach this point
-exit(0);
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m b/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
deleted file mode 100644
index 66be1bb..0000000
--- a/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
+++ /dev/null
@@ -1,15 +0,0 @@
-
-classdef cmake_matlab_unit_tests_timeout < matlab.unittest.TestCase
-  % timeout tests
-
-  properties
-  end
-
-  methods (Test)
-    function testCallHangsShouldBeTimedOut(testCase)
-      cmake_matlab_mex1(rand(3,3));
-      disp('Will now wait.');
-      input('Testing the cmake Matlab package timeout - do not press anything');
-    end
-  end
-end
diff --git a/Tests/FindMatlab/help_text1.m.txt b/Tests/FindMatlab/help_text1.m.txt
deleted file mode 100644
index a924355..0000000
--- a/Tests/FindMatlab/help_text1.m.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-% Dummy matlab extension in cmake
-function ret = cmake_matlab_mex1(X)
diff --git a/Tests/FindMatlab/matlab_wrapper1.cpp b/Tests/FindMatlab/matlab_wrapper1.cpp
deleted file mode 100644
index 4149bb9..0000000
--- a/Tests/FindMatlab/matlab_wrapper1.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// simple workaround to some compiler specific problems
-// see http://stackoverflow.com/questions/22367516/mex-compile-error-unknown-type-name-char16-t/23281916#23281916
-#include <algorithm>
-
-#include "mex.h"
-
-// this test should return a matrix of 10 x 10 and should check some of the arguments
-
-void mexFunction(const int nlhs, mxArray *plhs[], const int nrhs, const mxArray *prhs[])
-{
-  if(nrhs != 1)
-  {
-    mexErrMsgTxt("Incorrect arguments");
-  }
-
-  size_t dim1 = mxGetM(prhs[0]);
-  size_t dim2 = mxGetN(prhs[0]);
-
-  if(dim1 == 1 || dim2 == 1)
-  {
-    mexErrMsgIdAndTxt("cmake_matlab:configuration", "Incorrect arguments");
-  }
-
-  plhs[0] = mxCreateNumericMatrix(dim1, dim2, mxGetClassID(prhs[0]), mxREAL);
-}
diff --git a/Tests/FindMatlab/versions_checks/CMakeLists.txt b/Tests/FindMatlab/versions_checks/CMakeLists.txt
deleted file mode 100644
index 5d20685..0000000
--- a/Tests/FindMatlab/versions_checks/CMakeLists.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-
-cmake_minimum_required (VERSION 2.8.12)
-enable_testing()
-project(versions_checks)
-
-set(MATLAB_FIND_DEBUG TRUE)
-set(MATLAB_ADDITIONAL_VERSIONS
-    "dummy=14.9")
-
-# the success of the following command is dependent on the current configuration
-# in this case, we are only interested in the version macros
-find_package(Matlab)
-
-
-
-if(NOT COMMAND matlab_get_version_from_release_name)
-  message(FATAL_ERROR "The macro matlab_get_version_from_release_name should be defined")
-endif()
-
-if(NOT COMMAND matlab_get_release_name_from_version)
-  message(FATAL_ERROR "The macro matlab_get_release_name_from_version should be defined")
-endif()
-
-
-# matlab_get_release_name_from_version
-matlab_get_release_name_from_version("7.13" release_name)
-if(NOT release_name STREQUAL "R2011b")
-  message(FATAL_ERROR "version 7.13 does not give release R2011b : '${release_name}' != R2011b")
-endif()
-
-matlab_get_release_name_from_version("14.9" release_name)
-if(NOT release_name STREQUAL "dummy")
-  message(FATAL_ERROR "version 14.9 does not give release dummy : '${release_name}' != dummy")
-endif()
-
-matlab_get_release_name_from_version("14.10" release_name)
-if(NOT release_name STREQUAL "")
-  message(FATAL_ERROR "version 14.10 does not give empty release: '${release_name}' != ''")
-endif()
-
-
-# matlab_get_version_from_release_name
-matlab_get_version_from_release_name("R2011a" version)
-if(NOT version STREQUAL "7.12")
-  message(FATAL_ERROR "Release R2011a does not give version 7.12 : '${version}' != 7.12")
-endif()
-
-matlab_get_version_from_release_name("dummy" version)
-#message(FATAL_ERROR "versionversion = ${version}")
-if(NOT version STREQUAL "14.9")
-  message(FATAL_ERROR "Release dummy does not give version 14.9 : '${version}' != 14.9")
-endif()
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 8e4aaec..2de82a7 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -198,8 +198,3 @@ add_RunCMake_test(IfacePaths_SOURCES TEST_DIR IfacePaths)
 if(RPMBUILD)
   add_RunCMake_test(CPackRPM)
 endif()
-
-# Matlab module related tests
-if(CMake_TEST_FindMatlab)
-  add_RunCMake_test(FindMatlab)
-endif()
diff --git a/Tests/RunCMake/FindMatlab/CMakeLists.txt b/Tests/RunCMake/FindMatlab/CMakeLists.txt
deleted file mode 100644
index 1b9a957..0000000
--- a/Tests/RunCMake/FindMatlab/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-cmake_minimum_required(VERSION 2.8.12)
-include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt b/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt b/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
deleted file mode 100644
index 95a787f..0000000
--- a/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*FindMatlab.cmake:[0-9]+ \(message\):
-  \[MATLAB\] This functionality needs the MAIN_PROGRAM component \(not default\)
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1.cmake b/Tests/RunCMake/FindMatlab/MatlabTest1.cmake
deleted file mode 100644
index 1cbc1c2..0000000
--- a/Tests/RunCMake/FindMatlab/MatlabTest1.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-
-cmake_minimum_required (VERSION 2.8.12)
-enable_testing()
-project(test_should_fail)
-
-find_package(Matlab REQUIRED COMPONENTS MX_LIBRARY)
-
-matlab_add_mex(
-    # target name
-    NAME cmake_matlab_test_wrapper1
-    # output name
-    OUTPUT_NAME cmake_matlab_mex1
-    SRC ${CMAKE_CURRENT_SOURCE_DIR}/matlab_wrapper1.cpp
-  )
-
-# this command should raise a FATAL_ERROR, component MAIN_PROGRAM is missing
-matlab_add_unit_test(
-    NAME ${PROJECT_NAME}_matlabtest-1
-    TIMEOUT 1
-    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake_matlab_unit_tests2.m
-    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
-    )
diff --git a/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake b/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
deleted file mode 100644
index 33dbb77..0000000
--- a/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-
-include(RunCMake)
-run_cmake(MatlabTest1)
diff --git a/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m b/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
deleted file mode 100644
index 7a8a342..0000000
--- a/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
+++ /dev/null
@@ -1,6 +0,0 @@
-
-ret = cmake_matlab_mex1(rand(3,3));
-
-if(size(ret) ~= size(rand(3,3)))
-  error('Dimension mismatch!');
-end
diff --git a/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp b/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp
deleted file mode 100644
index 4149bb9..0000000
--- a/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// simple workaround to some compiler specific problems
-// see http://stackoverflow.com/questions/22367516/mex-compile-error-unknown-type-name-char16-t/23281916#23281916
-#include <algorithm>
-
-#include "mex.h"
-
-// this test should return a matrix of 10 x 10 and should check some of the arguments
-
-void mexFunction(const int nlhs, mxArray *plhs[], const int nrhs, const mxArray *prhs[])
-{
-  if(nrhs != 1)
-  {
-    mexErrMsgTxt("Incorrect arguments");
-  }
-
-  size_t dim1 = mxGetM(prhs[0]);
-  size_t dim2 = mxGetN(prhs[0]);
-
-  if(dim1 == 1 || dim2 == 1)
-  {
-    mexErrMsgIdAndTxt("cmake_matlab:configuration", "Incorrect arguments");
-  }
-
-  plhs[0] = mxCreateNumericMatrix(dim1, dim2, mxGetClassID(prhs[0]), mxREAL);
-}

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

Summary of changes:
 Help/release/dev/FindMatlab-rewrite.rst            |    7 -
 Modules/FindMatlab.cmake                           | 1425 ++------------------
 Modules/MatlabTestsRedirect.cmake                  |   83 --
 Tests/CMakeLists.txt                               |    6 -
 Tests/FindMatlab/basic_checks/CMakeLists.txt       |   57 -
 Tests/FindMatlab/cmake_matlab_unit_tests1.m        |   33 -
 Tests/FindMatlab/cmake_matlab_unit_tests2.m        |    6 -
 Tests/FindMatlab/cmake_matlab_unit_tests3.m        |    5 -
 Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m |   15 -
 Tests/FindMatlab/help_text1.m.txt                  |    2 -
 Tests/FindMatlab/matlab_wrapper1.cpp               |   26 -
 Tests/FindMatlab/versions_checks/CMakeLists.txt    |   52 -
 Tests/RunCMake/CMakeLists.txt                      |    5 -
 Tests/RunCMake/FindMatlab/CMakeLists.txt           |    3 -
 Tests/RunCMake/FindMatlab/MatlabTest1-result.txt   |    1 -
 Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt   |    2 -
 Tests/RunCMake/FindMatlab/MatlabTest1.cmake        |   22 -
 Tests/RunCMake/FindMatlab/RunCMakeTest.cmake       |    3 -
 .../RunCMake/FindMatlab/cmake_matlab_unit_tests2.m |    6 -
 Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp      |   26 -
 20 files changed, 87 insertions(+), 1698 deletions(-)
 delete mode 100644 Help/release/dev/FindMatlab-rewrite.rst
 delete mode 100644 Modules/MatlabTestsRedirect.cmake
 delete mode 100644 Tests/FindMatlab/basic_checks/CMakeLists.txt
 delete mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests1.m
 delete mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests2.m
 delete mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests3.m
 delete mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
 delete mode 100644 Tests/FindMatlab/help_text1.m.txt
 delete mode 100644 Tests/FindMatlab/matlab_wrapper1.cpp
 delete mode 100644 Tests/FindMatlab/versions_checks/CMakeLists.txt
 delete mode 100644 Tests/RunCMake/FindMatlab/CMakeLists.txt
 delete mode 100644 Tests/RunCMake/FindMatlab/MatlabTest1-result.txt
 delete mode 100644 Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
 delete mode 100644 Tests/RunCMake/FindMatlab/MatlabTest1.cmake
 delete mode 100644 Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
 delete mode 100644 Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
 delete mode 100644 Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 17 10:48:51 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Feb 2015 10:48:51 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-374-ge5f2828
Message-ID: <20150217154851.4A30CAA8FA@public.kitware.com>

This is an automated email from 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  e5f2828eed88f28a8ea27474996dc39bf0179f2b (commit)
       via  ec7b892e29e52fb5fa791e4fe956422c4ab4946f (commit)
      from  9e5df9c8cba2b0b0a01a95ce44387650a2e1322a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5f2828eed88f28a8ea27474996dc39bf0179f2b
commit e5f2828eed88f28a8ea27474996dc39bf0179f2b
Merge: 9e5df9c ec7b892
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 10:48:50 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 17 10:48:50 2015 -0500

    Merge topic 'doc-user-interaction' into next
    
    ec7b892e fixup! Help: Add a new user manual for user interaction.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec7b892e29e52fb5fa791e4fe956422c4ab4946f
commit ec7b892e29e52fb5fa791e4fe956422c4ab4946f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 10:47:48 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 17 10:48:25 2015 -0500

    fixup! Help: Add a new user manual for user interaction.

diff --git a/Help/manual/cmake-user-interaction.7.rst b/Help/manual/cmake-user-interaction.7.rst
index 85e506e..e50f4b3 100644
--- a/Help/manual/cmake-user-interaction.7.rst
+++ b/Help/manual/cmake-user-interaction.7.rst
@@ -197,7 +197,7 @@ user because they are paths and options specific to the users system.
 When it is first executed, CMake generates a cache file in the build
 directory containing key-value pairs for such artifacts.  The cache file
 can be viewed or edited by the user by running the :manual:`cmake-gui(1)`
-or :manual:`ccmake(1)` tool.  The tools provide user interface for
+or :manual:`ccmake(1)` tool.  The tools provide an interactive interface for
 re-configuring the provided software and re-generating the buildsystem, as
 is needed after editing cached values.  Each cache entry may have an
 associated short help text which is displayed in the user interface tools.
@@ -209,7 +209,8 @@ type ``BOOL`` can be edited by a checkbox in a user interface, a
 to a ``STRING`` should also provide a way to locate filesystem paths using
 a file dialog.  An entry of type ``STRING`` may provide a restricted list of
 allowed values which are then provided in a drop-down menu in
-the :manual:`cmake-gui(1)` user interface.
+the :manual:`cmake-gui(1)` user interface (see the :prop_cache:`STRINGS`
+cache property).
 
 On the command line, the ``-D`` option to the :manual:`cmake(1)` tool is
 used to specify cache entries, and the ``-U`` option is used to clear

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

Summary of changes:
 Help/manual/cmake-user-interaction.7.rst |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Feb 17 13:34:39 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 17 Feb 2015 13:34:39 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-376-ge0c5b99
Message-ID: <20150217183439.98D9EAB0CE@public.kitware.com>

This is an automated email from 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  e0c5b99a7f0b970446633448b32b18d92d063d61 (commit)
       via  9454b9c10fba540595a995821db61d633e57ce9d (commit)
      from  e5f2828eed88f28a8ea27474996dc39bf0179f2b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0c5b99a7f0b970446633448b32b18d92d063d61
commit e0c5b99a7f0b970446633448b32b18d92d063d61
Merge: e5f2828 9454b9c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 13:34:38 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 17 13:34:38 2015 -0500

    Merge topic 'fix-GNU-5.0-corruption' into next
    
    9454b9c1 Revert "Work around bug in pre-release GNU CXX 5.0."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9454b9c10fba540595a995821db61d633e57ce9d
commit 9454b9c10fba540595a995821db61d633e57ce9d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 19:34:16 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 19:34:16 2015 +0100

    Revert "Work around bug in pre-release GNU CXX 5.0."
    
    This reverts commit aaad0bf35263643c42ae715ef2621a9b1fbaed72.

diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 5444062..3c053fa 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -72,12 +72,6 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^parisc")
   endif()
 endif()
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND
-    NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
-  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65085
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
-endif()
-
 if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")

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

Summary of changes:
 CompileFlags.cmake |    6 ------
 1 file changed, 6 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 17 13:40:22 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 17 Feb 2015 13:40:22 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-387-gff7bdd5
Message-ID: <20150217184022.9C21C2278@public.kitware.com>

This is an automated email from 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  ff7bdd5e81b172fb44f6a3b3eb395290becc5e18 (commit)
       via  991325c3003de285ed9d8c9aff320adf32e78f1e (commit)
       via  c28877321f938811323dc22b9b4673e037ac1b2e (commit)
       via  a5b2edbe07ec18054bf3119a3ec62839c017fde3 (commit)
       via  1899e73c3ed168374c027444f899a81d65b64812 (commit)
       via  92f56cce857dcfca4a5e3277128b86318934085c (commit)
       via  1a6191a05d77d90c068b748a455945932e0fdce2 (commit)
       via  aacb3d504383b82d5158ce5daa219dddc8fe1e27 (commit)
       via  e0a190a543eaa44c2eb18d7757fb477ca5f548a3 (commit)
       via  cbab2ff445f83b3af1e3f1063994b53b84a9ffe4 (commit)
       via  7c8e085c2a48e56421df3e77188f65b0c40134c0 (commit)
      from  e0c5b99a7f0b970446633448b32b18d92d063d61 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff7bdd5e81b172fb44f6a3b3eb395290becc5e18
commit ff7bdd5e81b172fb44f6a3b3eb395290becc5e18
Merge: e0c5b99 991325c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:40:21 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 17 13:40:21 2015 -0500

    Merge topic 'compiler-version-Fortran' into next
    
    991325c3 Help: Add notes for topic 'compiler-version-Fortran'
    c2887732 Fortran: Test that CMAKE_Fortran_COMPILER_VERSION is set (#15372)
    a5b2edbe Fortran: Detect G95 compiler version
    1899e73c Fortran: Detect PGI compiler version
    92f56cce Fortran: Detect XL and VisualAge compiler versions
    1a6191a0 Fortran: Detect GNU compiler version
    aacb3d50 Fortran: Detect PathScale compiler version
    e0a190a5 Fortran: Detect SunPro compiler version
    cbab2ff4 Fortran: Detect Intel compiler version
    7c8e085c Fortran: Add infrastructure to detect compiler version (#15372)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=991325c3003de285ed9d8c9aff320adf32e78f1e
commit 991325c3003de285ed9d8c9aff320adf32e78f1e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:38:31 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 17 13:39:08 2015 -0500

    Help: Add notes for topic 'compiler-version-Fortran'

diff --git a/Help/release/dev/compiler-version-Fortran.rst b/Help/release/dev/compiler-version-Fortran.rst
new file mode 100644
index 0000000..e10b206
--- /dev/null
+++ b/Help/release/dev/compiler-version-Fortran.rst
@@ -0,0 +1,6 @@
+compiler-version-Fortran
+------------------------
+
+* The version of some Fortran compilers is now detected and stored in the
+  :variable:`CMAKE_Fortran_COMPILER_VERSION <CMAKE_<LANG>_COMPILER_VERSION>`
+  variable.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c28877321f938811323dc22b9b4673e037ac1b2e
commit c28877321f938811323dc22b9b4673e037ac1b2e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:37:23 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 17 13:38:59 2015 -0500

    Fortran: Test that CMAKE_Fortran_COMPILER_VERSION is set (#15372)
    
    Update the CMakeOnly.CompilerIdFortran test to require that the variable
    is set instead of just warning.  We already require it for C and CXX.

diff --git a/Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt b/Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt
index 3a2bdeb..02e4668 100644
--- a/Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt
+++ b/Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt
@@ -4,19 +4,11 @@ project(CompilerIdFortran Fortran)
 foreach(v
     CMAKE_Fortran_COMPILER
     CMAKE_Fortran_COMPILER_ID
-    )
-  if(${v})
-    message(STATUS "${v}=[${${v}}]")
-  else()
-    message(SEND_ERROR "${v} not set!")
-  endif()
-endforeach()
-foreach(v
     CMAKE_Fortran_COMPILER_VERSION
     )
   if(${v})
     message(STATUS "${v}=[${${v}}]")
   else()
-    message(WARNING "${v} not set!")
+    message(SEND_ERROR "${v} not set!")
   endif()
 endforeach()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5b2edbe07ec18054bf3119a3ec62839c017fde3
commit a5b2edbe07ec18054bf3119a3ec62839c017fde3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:32:28 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 17 13:32:45 2015 -0500

    Fortran: Detect G95 compiler version
    
    The __G95__ and __G95_MINOR__ preprocessor symbols encode the compiler
    version as decimal digits.

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 98ec7f3..2533d3f 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -47,6 +47,8 @@
         PRINT *, 'INFO:compiler[Cray]'
 #elif defined(__G95__)
         PRINT *, 'INFO:compiler[G95]'
+# define COMPILER_VERSION_MAJOR DEC(__G95__)
+# define COMPILER_VERSION_MINOR DEC(__G95_MINOR__)
 #elif defined(__PATHSCALE__)
         PRINT *, 'INFO:compiler[PathScale]'
 # define COMPILER_VERSION_MAJOR DEC(__PATHCC__)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1899e73c3ed168374c027444f899a81d65b64812
commit 1899e73c3ed168374c027444f899a81d65b64812
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:31:45 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 17 13:32:11 2015 -0500

    Fortran: Detect PGI compiler version
    
    Port logic from the "Compiler/PGI-DetermineCompiler" module into
    "CMakeFortranCompilerId.F.in".

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 4c172a8..98ec7f3 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -79,6 +79,11 @@
 # endif
 #elif defined(__PGI)
         PRINT *, 'INFO:compiler[PGI]'
+# define COMPILER_VERSION_MAJOR DEC(__PGIC__)
+# define COMPILER_VERSION_MINOR DEC(__PGIC_MINOR__)
+# if defined(__PGIC_PATCHLEVEL__)
+#  define COMPILER_VERSION_PATCH DEC(__PGIC_PATCHLEVEL__)
+# endif
 #elif defined(_SGI_COMPILER_VERSION) || defined(_COMPILER_VERSION)
         PRINT *, 'INFO:compiler[MIPSpro]'
 #       if 0

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92f56cce857dcfca4a5e3277128b86318934085c
commit 92f56cce857dcfca4a5e3277128b86318934085c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:30:19 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 17 13:30:55 2015 -0500

    Fortran: Detect XL and VisualAge compiler versions
    
    Port logic from the "Compiler/XL-*-DetermineCompiler" and
    "Compiler/VisualAge-*-DetermineCompiler" modules into
    "CMakeFortranCompilerId.F.in".

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 14ce395..4c172a8 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -68,8 +68,14 @@
         PRINT *, 'INFO:compiler[zOS]'
 # elif __IBMC__ >= 800
         PRINT *, 'INFO:compiler[XL]'
+#  define COMPILER_VERSION_MAJOR DEC(__IBMC__/100)
+#  define COMPILER_VERSION_MINOR DEC(__IBMC__/10 % 10)
+#  define COMPILER_VERSION_PATCH DEC(__IBMC__    % 10)
 # else
         PRINT *, 'INFO:compiler[VisualAge]'
+#  define COMPILER_VERSION_MAJOR DEC(__IBMC__/100)
+#  define COMPILER_VERSION_MINOR DEC(__IBMC__/10 % 10)
+#  define COMPILER_VERSION_PATCH DEC(__IBMC__    % 10)
 # endif
 #elif defined(__PGI)
         PRINT *, 'INFO:compiler[PGI]'

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a6191a05d77d90c068b748a455945932e0fdce2
commit 1a6191a05d77d90c068b748a455945932e0fdce2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:29:33 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 17 13:29:33 2015 -0500

    Fortran: Detect GNU compiler version
    
    Port logic from the "Compiler/GNU-DetermineCompiler" module into
    "CMakeFortranCompilerId.F.in".

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index fcffaa2..14ce395 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -58,6 +58,11 @@
         PRINT *, 'INFO:compiler[Absoft]'
 #elif defined(__GNUC__)
         PRINT *, 'INFO:compiler[GNU]'
+# define COMPILER_VERSION_MAJOR DEC(__GNUC__)
+# define COMPILER_VERSION_MINOR DEC(__GNUC_MINOR__)
+# if defined(__GNUC_PATCHLEVEL__)
+#  define COMPILER_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__)
+# endif
 #elif defined(__IBMC__)
 # if defined(__COMPILER_VER__)
         PRINT *, 'INFO:compiler[zOS]'

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aacb3d504383b82d5158ce5daa219dddc8fe1e27
commit aacb3d504383b82d5158ce5daa219dddc8fe1e27
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:28:45 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 17 13:28:45 2015 -0500

    Fortran: Detect PathScale compiler version
    
    Port logic from the "Compiler/PathScale-DetermineCompiler" module into
    "CMakeFortranCompilerId.F.in".

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 5e8f646..fcffaa2 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -49,6 +49,11 @@
         PRINT *, 'INFO:compiler[G95]'
 #elif defined(__PATHSCALE__)
         PRINT *, 'INFO:compiler[PathScale]'
+# define COMPILER_VERSION_MAJOR DEC(__PATHCC__)
+# define COMPILER_VERSION_MINOR DEC(__PATHCC_MINOR__)
+# if defined(__PATHCC_PATCHLEVEL__)
+#  define COMPILER_VERSION_PATCH DEC(__PATHCC_PATCHLEVEL__)
+# endif
 #elif defined(__ABSOFT__)
         PRINT *, 'INFO:compiler[Absoft]'
 #elif defined(__GNUC__)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0a190a543eaa44c2eb18d7757fb477ca5f548a3
commit e0a190a543eaa44c2eb18d7757fb477ca5f548a3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:27:22 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 17 13:27:51 2015 -0500

    Fortran: Detect SunPro compiler version
    
    Port logic from "Compiler/SunPro-*DetermineCompiler" modules into
    "CMakeFortranCompilerId.F.in".

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 956576d..5e8f646 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -33,8 +33,16 @@
         PRINT *, 'INFO:simulate_version[013.00]'
 #  endif
 # endif
-#elif defined(__SUNPRO_F90) || defined(__SUNPRO_F95)
+#elif defined(__SUNPRO_F95)
         PRINT *, 'INFO:compiler[SunPro]'
+# define COMPILER_VERSION_MAJOR HEX(__SUNPRO_F95>>8)
+# define COMPILER_VERSION_MINOR HEX(__SUNPRO_F95>>4 & 0xF)
+# define COMPILER_VERSION_PATCH HEX(__SUNPRO_F95    & 0xF)
+#elif defined(__SUNPRO_F90)
+        PRINT *, 'INFO:compiler[SunPro]'
+# define COMPILER_VERSION_MAJOR HEX(__SUNPRO_F90>>8)
+# define COMPILER_VERSION_MINOR HEX(__SUNPRO_F90>>4 & 0xF)
+# define COMPILER_VERSION_PATCH HEX(__SUNPRO_F90    & 0xF)
 #elif defined(_CRAYFTN)
         PRINT *, 'INFO:compiler[Cray]'
 #elif defined(__G95__)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbab2ff445f83b3af1e3f1063994b53b84a9ffe4
commit cbab2ff445f83b3af1e3f1063994b53b84a9ffe4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:26:14 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 17 13:26:48 2015 -0500

    Fortran: Detect Intel compiler version
    
    Port logic from the "Compiler/Intel-DetermineCompiler" module into
    "CMakeFortranCompilerId.F.in".

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 955ca85..956576d 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -4,6 +4,17 @@
 #endif
 #if defined(__INTEL_COMPILER) || defined(__ICC)
         PRINT *, 'INFO:compiler[Intel]'
+# define COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER/100)
+# define COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER/10 % 10)
+# if defined(__INTEL_COMPILER_UPDATE)
+#  define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER_UPDATE)
+# else
+#  define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER   % 10)
+# endif
+# if defined(__INTEL_COMPILER_BUILD_DATE)
+#  define COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE)
+# endif
+
 # if defined(_MSC_VER)
         PRINT *, 'INFO:simulate[MSVC]'
 #  if _MSC_VER >= 1800

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c8e085c2a48e56421df3e77188f65b0c40134c0
commit 7c8e085c2a48e56421df3e77188f65b0c40134c0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:24:31 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 17 13:24:31 2015 -0500

    Fortran: Add infrastructure to detect compiler version (#15372)
    
    Fortran does not offer syntax to compose a string literal at
    preprocessing time from numeric compuations.  Instead encode each digit
    of each component as a separate INFO string and compose them in CMake
    code after extraction.  Support MAJOR, MINOR, PATCH, and TWEAK
    components with up to 8 digits each.

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index dfed00e..9db38b7 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -409,12 +409,28 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
     # Read the compiler identification string from the executable file.
     set(COMPILER_ID)
     set(COMPILER_VERSION)
+    set(COMPILER_VERSION_MAJOR 0)
+    set(COMPILER_VERSION_MINOR 0)
+    set(COMPILER_VERSION_PATCH 0)
+    set(COMPILER_VERSION_TWEAK 0)
+    set(HAVE_COMPILER_VERSION_MAJOR 0)
+    set(HAVE_COMPILER_VERSION_MINOR 0)
+    set(HAVE_COMPILER_VERSION_PATCH 0)
+    set(HAVE_COMPILER_VERSION_TWEAK 0)
+    set(DIGIT_VALUE_1 1)
+    set(DIGIT_VALUE_2 10)
+    set(DIGIT_VALUE_3 100)
+    set(DIGIT_VALUE_4 1000)
+    set(DIGIT_VALUE_5 10000)
+    set(DIGIT_VALUE_6 100000)
+    set(DIGIT_VALUE_7 1000000)
+    set(DIGIT_VALUE_8 10000000)
     set(PLATFORM_ID)
     set(ARCHITECTURE_ID)
     set(SIMULATE_ID)
     set(SIMULATE_VERSION)
     file(STRINGS ${file}
-      CMAKE_${lang}_COMPILER_ID_STRINGS LIMIT_COUNT 6 REGEX "INFO:[A-Za-z0-9_]+\\[[^]]*\\]")
+      CMAKE_${lang}_COMPILER_ID_STRINGS LIMIT_COUNT 38 REGEX "INFO:[A-Za-z0-9_]+\\[[^]]*\\]")
     set(COMPILER_ID_TWICE)
     foreach(info ${CMAKE_${lang}_COMPILER_ID_STRINGS})
       if("${info}" MATCHES "INFO:compiler\\[([^]\"]*)\\]")
@@ -433,6 +449,13 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
         string(REGEX REPLACE "^0+([0-9])" "\\1" COMPILER_VERSION "${CMAKE_MATCH_1}")
         string(REGEX REPLACE "\\.0+([0-9])" ".\\1" COMPILER_VERSION "${COMPILER_VERSION}")
       endif()
+      if("${info}" MATCHES "INFO:compiler_version_([A-Z]+)_digit_([0-9])\\[([0-9])\\]")
+        set(comp ${CMAKE_MATCH_1})
+        set(digit ${CMAKE_MATCH_2})
+        set(value ${CMAKE_MATCH_3})
+        math(EXPR COMPILER_VERSION_${comp} "${COMPILER_VERSION_${comp}} + ${value} * ${DIGIT_VALUE_${digit}}")
+        set(HAVE_COMPILER_VERSION_${comp} 1)
+      endif()
       if("${info}" MATCHES "INFO:simulate\\[([^]\"]*)\\]")
         set(SIMULATE_ID "${CMAKE_MATCH_1}")
       endif()
@@ -445,6 +468,20 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
       endif()
     endforeach()
 
+    # Construct compiler version from components if needed.
+    if(NOT DEFINED COMPILER_VERSION AND HAVE_COMPILER_VERSION_MAJOR)
+      set(COMPILER_VERSION "${COMPILER_VERSION_MAJOR}")
+      if(HAVE_COMPILER_VERSION_MINOR)
+        set(COMPILER_VERSION "${COMPILER_VERSION}.${COMPILER_VERSION_MINOR}")
+        if(HAVE_COMPILER_VERSION_PATCH)
+          set(COMPILER_VERSION "${COMPILER_VERSION}.${COMPILER_VERSION_PATCH}")
+          if(HAVE_COMPILER_VERSION_TWEAK)
+            set(COMPILER_VERSION "${COMPILER_VERSION}.${COMPILER_VERSION_TWEAK}")
+          endif()
+        endif()
+      endif()
+    endif()
+
     # Detect the exact architecture from the PE header.
     if(WIN32)
       # The offset to the PE signature is stored at 0x3c.
diff --git a/Modules/CMakeDetermineFortranCompiler.cmake b/Modules/CMakeDetermineFortranCompiler.cmake
index a4bb86c..3a27127 100644
--- a/Modules/CMakeDetermineFortranCompiler.cmake
+++ b/Modules/CMakeDetermineFortranCompiler.cmake
@@ -119,6 +119,47 @@ if(NOT CMAKE_Fortran_COMPILER_ID_RUN)
   set(CMAKE_Fortran_COMPILER_ID_VENDOR_FLAGS_NAG "-V")
   set(CMAKE_Fortran_COMPILER_ID_VENDOR_REGEX_NAG "NAG Fortran Compiler")
 
+  set(_version_info "")
+  foreach(m MAJOR MINOR PATCH TWEAK)
+    set(_COMP "_${m}")
+    set(_version_info "${_version_info}
+#if defined(COMPILER_VERSION${_COMP})")
+    foreach(d 1 2 3 4 5 6 7 8)
+      set(_version_info "${_version_info}
+# undef DEC
+# undef HEX
+# define DEC(n) DEC_${d}(n)
+# define HEX(n) HEX_${d}(n)
+# if COMPILER_VERSION${_COMP} == 0
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[0]'
+# elif COMPILER_VERSION${_COMP} == 1
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[1]'
+# elif COMPILER_VERSION${_COMP} == 2
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[2]'
+# elif COMPILER_VERSION${_COMP} == 3
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[3]'
+# elif COMPILER_VERSION${_COMP} == 4
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[4]'
+# elif COMPILER_VERSION${_COMP} == 5
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[5]'
+# elif COMPILER_VERSION${_COMP} == 6
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[6]'
+# elif COMPILER_VERSION${_COMP} == 7
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[7]'
+# elif COMPILER_VERSION${_COMP} == 8
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[8]'
+# elif COMPILER_VERSION${_COMP} == 9
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[9]'
+# endif
+")
+    endforeach()
+    set(_version_info "${_version_info}
+#endif")
+  endforeach()
+  set(CMAKE_Fortran_COMPILER_ID_VERSION_INFO "${_version_info}")
+  unset(_version_info)
+  unset(_COMP)
+
   # Try to identify the compiler.
   set(CMAKE_Fortran_COMPILER_ID)
   include(${CMAKE_ROOT}/Modules/CMakeDetermineCompilerId.cmake)
diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 5349505..955ca85 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -134,4 +134,26 @@
         PRINT *, 'INFO:arch[X86]'
 # endif
 #endif
+
+#if 0
+! Encode compiler version digits
+#endif
+#define DEC_8(n) (((n) / 10000000) % 10)
+#define DEC_7(n) (((n) / 1000000)  % 10)
+#define DEC_6(n) (((n) / 100000)   % 10)
+#define DEC_5(n) (((n) / 10000)    % 10)
+#define DEC_4(n) (((n) / 1000)     % 10)
+#define DEC_3(n) (((n) / 100)      % 10)
+#define DEC_2(n) (((n) / 10)       % 10)
+#define DEC_1(n) (((n)    )        % 10)
+#define HEX_8(n) ((n)>>28 & 0xF)
+#define HEX_7(n) ((n)>>24 & 0xF)
+#define HEX_6(n) ((n)>>20 & 0xF)
+#define HEX_5(n) ((n)>>16 & 0xF)
+#define HEX_4(n) ((n)>>12 & 0xF)
+#define HEX_3(n) ((n)>>8  & 0xF)
+#define HEX_2(n) ((n)>>4  & 0xF)
+#define HEX_1(n) ((n)     & 0xF)
+ at CMAKE_Fortran_COMPILER_ID_VERSION_INFO@
+
       END

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

Summary of changes:
 Help/release/dev/compiler-version-Fortran.rst    |    6 ++
 Modules/CMakeDetermineCompilerId.cmake           |   39 ++++++++++++-
 Modules/CMakeDetermineFortranCompiler.cmake      |   41 ++++++++++++++
 Modules/CMakeFortranCompilerId.F.in              |   66 +++++++++++++++++++++-
 Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt |   10 +---
 5 files changed, 151 insertions(+), 11 deletions(-)
 create mode 100644 Help/release/dev/compiler-version-Fortran.rst


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Feb 17 14:39:47 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 17 Feb 2015 14:39:47 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-401-g93f32ef
Message-ID: <20150217193947.83C8B2278@public.kitware.com>

This is an automated email from 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  93f32ef43a61c80e5084b0c8e03bf8db7b1ffaea (commit)
       via  6652afe66961bcbb5ff17dd7b8a3a91da62f2712 (commit)
       via  75661fdfd94fef4b8f1e8112aa75d76d1cc366e6 (commit)
       via  10e53e230811b94701d86e8c78e38df5abf69ee8 (commit)
       via  74906322585034968142e1d1663f604e2c97332c (commit)
       via  2acd04c96624ce530edcb0ca991bddad7f70023e (commit)
       via  2d833232a35715e412a40ee6207137ecfee7da36 (commit)
       via  26602cf56c4697a589f320809afa7a127268d09f (commit)
       via  cfb8483412761e567f64343ccc008b44150a901b (commit)
       via  6010f93632c8de9405bc97e40fc06f5949c09976 (commit)
       via  0550b9e330d75dfcb02257c998706759574cd9c0 (commit)
       via  1ee4721f7c7d0d889e00c0a2cdb799e71a4b5574 (commit)
       via  62429a1e54ec443edda35074bc66805d6e602f89 (commit)
       via  c697c1fafef16f00e4ec6a72d12eb3a43c01879a (commit)
      from  ff7bdd5e81b172fb44f6a3b3eb395290becc5e18 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93f32ef43a61c80e5084b0c8e03bf8db7b1ffaea
commit 93f32ef43a61c80e5084b0c8e03bf8db7b1ffaea
Merge: ff7bdd5 6652afe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 14:39:45 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 17 14:39:45 2015 -0500

    Merge topic 'minor-cleanups' into next
    
    6652afe6 CTest: Use clear instead of erase-all.
    75661fdf cmListCommand: Move size variable out of loop.
    10e53e23 cmAlgorithms: Add missing const to functors.
    74906322 cmAlgorithms: Remove sort of already-sorted container.
    2acd04c9 cmcmd: Remove some comment copy-pasta.
    2d833232 cmCoreTryCompile: Remove variable assignment.
    26602cf5 cmLocalGenerator: Move variable population inside of condition.
    cfb84834 Update comment to match recent dashboard testing.
    6010f936 Revert "cmGlobalGenerator: Fix value type pushed into autogens vector"
    0550b9e3 Revert "Attempt to fix the compile of cmake on Sun CC."
    1ee4721f Help: Fix formatting of command parameter.
    62429a1e cmGlobalGenerator: Remove unneeded pointer check.
    c697c1fa cmTarget: Remove template argument workaround.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6652afe66961bcbb5ff17dd7b8a3a91da62f2712
commit 6652afe66961bcbb5ff17dd7b8a3a91da62f2712
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 13:42:17 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 20:18:59 2015 +0100

    CTest: Use clear instead of erase-all.

diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx
index d90aeb7..4cdce71 100644
--- a/Source/CTest/cmCTestBuildAndTestHandler.cxx
+++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx
@@ -32,8 +32,7 @@ cmCTestBuildAndTestHandler::cmCTestBuildAndTestHandler()
 //----------------------------------------------------------------------
 void cmCTestBuildAndTestHandler::Initialize()
 {
-  this->BuildTargets.erase(
-    this->BuildTargets.begin(), this->BuildTargets.end());
+  this->BuildTargets.clear();
   this->Superclass::Initialize();
 }
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75661fdfd94fef4b8f1e8112aa75d76d1cc366e6
commit 75661fdfd94fef4b8f1e8112aa75d76d1cc366e6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 25 15:20:56 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 20:18:58 2015 +0100

    cmListCommand: Move size variable out of loop.
    
    Re-use it where possible in two instances.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 98dcef1..0c6adfd 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -202,12 +202,12 @@ bool cmListCommand::HandleGetCommand(std::vector<std::string> const& args)
   std::string value;
   size_t cc;
   const char* sep = "";
+  size_t nitem = varArgsExpanded.size();
   for ( cc = 2; cc < args.size()-1; cc ++ )
     {
     int item = atoi(args[cc].c_str());
     value += sep;
     sep = ";";
-    size_t nitem = varArgsExpanded.size();
     if ( item < 0 )
       {
       item = (int)nitem + item;
@@ -216,8 +216,8 @@ bool cmListCommand::HandleGetCommand(std::vector<std::string> const& args)
       {
       std::ostringstream str;
       str << "index: " << item << " out of range (-"
-          << varArgsExpanded.size() << ", "
-          << varArgsExpanded.size()-1 << ")";
+          << nitem << ", "
+          << nitem - 1 << ")";
       this->SetError(str.str());
       return false;
       }
@@ -485,10 +485,10 @@ bool cmListCommand::HandleRemoveAtCommand(
 
   size_t cc;
   std::vector<size_t> removed;
+  size_t nitem = varArgsExpanded.size();
   for ( cc = 2; cc < args.size(); ++ cc )
     {
     int item = atoi(args[cc].c_str());
-    size_t nitem = varArgsExpanded.size();
     if ( item < 0 )
       {
       item = (int)nitem + item;
@@ -497,8 +497,8 @@ bool cmListCommand::HandleRemoveAtCommand(
       {
       std::ostringstream str;
       str << "index: " << item << " out of range (-"
-          << varArgsExpanded.size() << ", "
-          << varArgsExpanded.size()-1 << ")";
+          << nitem << ", "
+          << nitem - 1 << ")";
       this->SetError(str.str());
       return false;
       }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10e53e230811b94701d86e8c78e38df5abf69ee8
commit 10e53e230811b94701d86e8c78e38df5abf69ee8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 19:32:52 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 20:18:57 2015 +0100

    cmAlgorithms: Add missing const to functors.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index dc4f275..8491838 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -99,7 +99,7 @@ template<typename Container,
     bool valueTypeIsPair = cmIsPair<typename Container::value_type>::value>
 struct DefaultDeleter
 {
-  void operator()(typename Container::value_type value) {
+  void operator()(typename Container::value_type value) const {
     delete value;
   }
 };
@@ -107,7 +107,7 @@ struct DefaultDeleter
 template<typename Container>
 struct DefaultDeleter<Container, /* valueTypeIsPair = */ true>
 {
-  void operator()(typename Container::value_type value) {
+  void operator()(typename Container::value_type value) const {
     delete value.second;
   }
 };
@@ -163,7 +163,7 @@ struct BinarySearcher
   {
   }
 
-  bool operator()(argument_type const& item)
+  bool operator()(argument_type const& item) const
   {
     return std::binary_search(m_range.begin(), m_range.end(), item);
   }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74906322585034968142e1d1663f604e2c97332c
commit 74906322585034968142e1d1663f604e2c97332c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 09:02:03 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 20:18:57 2015 +0100

    cmAlgorithms: Remove sort of already-sorted container.
    
    The indices is populated by an increasing number.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index a996088..dc4f275 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -275,7 +275,6 @@ typename Range::const_iterator cmRemoveDuplicates(Range& r)
     {
     return r.end();
     }
-  std::sort(indices.begin(), indices.end());
   return cmRemoveIndices(r, indices);
 }
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2acd04c96624ce530edcb0ca991bddad7f70023e
commit 2acd04c96624ce530edcb0ca991bddad7f70023e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 12 22:14:08 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 20:18:56 2015 +0100

    cmcmd: Remove some comment copy-pasta.

diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 5c93975..6a7dc6e 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -287,8 +287,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
       }
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
-    // Command to create a symbolic link.  Fails on platforms not
-    // supporting them.
     else if (args[1] == "environment" )
       {
       std::vector<std::string> env = cmSystemTools::GetEnvironmentVariables();
@@ -352,8 +350,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
       {
       for (std::string::size_type cc = 2; cc < args.size(); cc ++)
         {
-        // Complain if the file could not be removed, still exists,
-        // and the -f option was not given.
         if(!cmSystemTools::Touch(args[cc], true))
           {
           return 1;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d833232a35715e412a40ee6207137ecfee7da36
commit 2d833232a35715e412a40ee6207137ecfee7da36
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 12 21:03:34 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 19:23:27 2015 +0100

    cmCoreTryCompile: Remove variable assignment.
    
    The variable is not a reference, and we return in the same scope
    after assigning, so it has no effect.

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index d9369e6..8e20c14 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -685,8 +685,7 @@ void cmCoreTryCompile::FindOutputFile(const std::string& targetName)
     command += tmpOutputFile;
     if(cmSystemTools::FileExists(command.c_str()))
       {
-      tmpOutputFile = cmSystemTools::CollapseFullPath(command);
-      this->OutputFile = tmpOutputFile;
+      this->OutputFile = cmSystemTools::CollapseFullPath(command);
       return;
       }
     }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26602cf56c4697a589f320809afa7a127268d09f
commit 26602cf56c4697a589f320809afa7a127268d09f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 08:08:26 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 19:21:36 2015 +0100

    cmLocalGenerator: Move variable population inside of condition.
    
    It is only used in the condition, so no need to look for uses
    elsewhere when reading the code.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 35956ad..6a6135b 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1952,14 +1952,13 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
   // Write the library flags to the build rule.
   fout << linkLibs;
 
-  // Get the RPATH entries.
-  std::vector<std::string> runtimeDirs;
-  cli.GetRPath(runtimeDirs, relink);
-
   // Check what kind of rpath flags to use.
   if(cli.GetRuntimeSep().empty())
     {
     // Each rpath entry gets its own option ("-R a -R b -R c")
+    std::vector<std::string> runtimeDirs;
+    cli.GetRPath(runtimeDirs, relink);
+
     std::string rpath;
     for(std::vector<std::string>::iterator ri = runtimeDirs.begin();
         ri != runtimeDirs.end(); ++ri)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfb8483412761e567f64343ccc008b44150a901b
commit cfb8483412761e567f64343ccc008b44150a901b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 19:48:21 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 19:20:23 2015 +0100

    Update comment to match recent dashboard testing.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 8a83c3e..69bc2a1 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -520,8 +520,8 @@ if(APPLE)
   target_link_libraries(CMakeLib "-framework CoreFoundation")
 endif()
 
-# On some platforms we need the rpcrt4 library for the VS 7 generators.
 if(CMAKE_BUILD_ON_VISUAL_STUDIO OR MINGW)
+  # We need the rpcrt4 library for at least the VS7-VC10 generators.
   target_link_libraries(CMakeLib rpcrt4)
 endif()
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6010f93632c8de9405bc97e40fc06f5949c09976
commit 6010f93632c8de9405bc97e40fc06f5949c09976
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 1 13:41:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 19:19:06 2015 +0100

    Revert "cmGlobalGenerator: Fix value type pushed into autogens vector"
    
    This reverts commit ae6fc555a7e8929f6d96545bd1137c8bd378566d.
    
    Use the more-natural make_pair algorithm.  The compiler motivating
    the need for this is not supported as a host anymore.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 227462d..1de4a59 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1387,7 +1387,7 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens)
           cmQtAutoGenerators autogen;
           if(autogen.InitializeAutogenTarget(&target))
             {
-            autogens.push_back(AutogensType::value_type(autogen, &target));
+            autogens.push_back(std::make_pair(autogen, &target));
             }
           }
         }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0550b9e330d75dfcb02257c998706759574cd9c0
commit 0550b9e330d75dfcb02257c998706759574cd9c0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 1 13:41:48 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 19:18:12 2015 +0100

    Revert "Attempt to fix the compile of cmake on Sun CC."
    
    This reverts commit a573a856581118d7a9d8dd7be1f613ba7b1ddb04.
    
    The workaround is not needed on supported SolarisStudio compilers.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 6692a92..ba18faa 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -24,10 +24,7 @@
 #include <errno.h>
 
 //----------------------------------------------------------------------------
-#if !defined(__SUNPRO_CC) || __SUNPRO_CC > 0x510
-static
-#endif
-void reportError(cmGeneratorExpressionContext *context,
+static void reportError(cmGeneratorExpressionContext *context,
                         const std::string &expr, const std::string &result)
 {
   context->HadError = true;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ee4721f7c7d0d889e00c0a2cdb799e71a4b5574
commit 1ee4721f7c7d0d889e00c0a2cdb799e71a4b5574
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 20:01:46 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 19:18:11 2015 +0100

    Help: Fix formatting of command parameter.

diff --git a/Help/command/target_compile_definitions.rst b/Help/command/target_compile_definitions.rst
index 3c9fe87..8bd3233 100644
--- a/Help/command/target_compile_definitions.rst
+++ b/Help/command/target_compile_definitions.rst
@@ -9,7 +9,7 @@ Add compile definitions to a target.
     <INTERFACE|PUBLIC|PRIVATE> [items1...]
     [<INTERFACE|PUBLIC|PRIVATE> [items2...] ...])
 
-Specify compile definitions to use when compiling a given <target.  The
+Specify compile definitions to use when compiling a given ``<target>``.  The
 named ``<target>`` must have been created by a command such as
 :command:`add_executable` or :command:`add_library` and must not be an
 :ref:`Imported Target <Imported Targets>`.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62429a1e54ec443edda35074bc66805d6e602f89
commit 62429a1e54ec443edda35074bc66805d6e602f89
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 20:00:19 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 19:18:11 2015 +0100

    cmGlobalGenerator: Remove unneeded pointer check.
    
    Deleting nullptr is ok.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 6d0fedc..227462d 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -74,11 +74,7 @@ cmGlobalGenerator::cmGlobalGenerator()
 cmGlobalGenerator::~cmGlobalGenerator()
 {
   this->ClearGeneratorMembers();
-
-  if (this->ExtraGenerator)
-    {
-    delete this->ExtraGenerator;
-    }
+  delete this->ExtraGenerator;
 }
 
 bool cmGlobalGenerator::SetGeneratorPlatform(std::string const& p,

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c697c1fafef16f00e4ec6a72d12eb3a43c01879a
commit c697c1fafef16f00e4ec6a72d12eb3a43c01879a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 19:51:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 19:18:11 2015 +0100

    cmTarget: Remove template argument workaround.
    
    Pre-C++98 compilers required that the template argument be
    used in the function parameters.  Those compilers are no longer
    supported as hosts, so drop the workaround.

diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index e18250c..7bffa42 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -28,34 +28,6 @@ Some implementations have a ``std::auto_ptr`` which can not be used as a
 return value from a function. ``std::auto_ptr`` may not be used. Use
 ``cmsys::auto_ptr`` instead.
 
-Template Parameter Defaults
----------------------------
-
-On ancient compilers, C++ template must use template parameters in function
-arguments.  If no parameter of that type is needed, the common workaround is
-to add a defaulted pointer to the type to the templated function. However,
-this does not work with other ancient compilers:
-
-.. code-block:: c++
-
-  template<typename PropertyType>
-  PropertyType getTypedProperty(cmTarget* tgt, const char* prop,
-                                PropertyType* = 0) // Wrong
-    {
-
-    }
-
-.. code-block:: c++
-
-  template<typename PropertyType>
-  PropertyType getTypedProperty(cmTarget* tgt, const char* prop,
-                                PropertyType*) // Ok
-    {
-
-    }
-
-and invoke it with the value ``0`` explicitly in all cases.
-
 size_t
 ------
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 526a923..1ad0d48 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4711,13 +4711,11 @@ bool cmTarget::IsNullImpliedByLinkLibraries(const std::string &p) const
 
 //----------------------------------------------------------------------------
 template<typename PropertyType>
-PropertyType getTypedProperty(cmTarget const* tgt, const std::string& prop,
-                              PropertyType *);
+PropertyType getTypedProperty(cmTarget const* tgt, const std::string& prop);
 
 //----------------------------------------------------------------------------
 template<>
-bool getTypedProperty<bool>(cmTarget const* tgt, const std::string& prop,
-                            bool *)
+bool getTypedProperty<bool>(cmTarget const* tgt, const std::string& prop)
 {
   return tgt->GetPropertyAsBool(prop);
 }
@@ -4725,8 +4723,7 @@ bool getTypedProperty<bool>(cmTarget const* tgt, const std::string& prop,
 //----------------------------------------------------------------------------
 template<>
 const char *getTypedProperty<const char *>(cmTarget const* tgt,
-                                           const std::string& prop,
-                                           const char **)
+                                           const std::string& prop)
 {
   return tgt->GetProperty(prop);
 }
@@ -4937,8 +4934,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
                                           CompatibleType t,
                                           PropertyType *)
 {
-  PropertyType propContent = getTypedProperty<PropertyType>(tgt, p,
-                                                            0);
+  PropertyType propContent = getTypedProperty<PropertyType>(tgt, p);
   const bool explicitlySet = tgt->GetProperties()
                                   .find(p)
                                   != tgt->GetProperties().end();
@@ -4991,7 +4987,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
                             != theTarget->GetProperties().end();
     PropertyType ifacePropContent =
                     getTypedProperty<PropertyType>(theTarget,
-                              interfaceProperty, 0);
+                              interfaceProperty);
 
     std::string reportEntry;
     if (ifaceIsSet)

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

Summary of changes:
 Help/command/target_compile_definitions.rst |    2 +-
 Help/manual/cmake-developer.7.rst           |   28 ---------------------------
 Source/CMakeLists.txt                       |    2 +-
 Source/CTest/cmCTestBuildAndTestHandler.cxx |    3 +--
 Source/cmAlgorithms.h                       |    7 +++----
 Source/cmCoreTryCompile.cxx                 |    3 +--
 Source/cmGeneratorExpressionEvaluator.cxx   |    5 +----
 Source/cmGlobalGenerator.cxx                |    8 ++------
 Source/cmListCommand.cxx                    |   12 ++++++------
 Source/cmLocalGenerator.cxx                 |    7 +++----
 Source/cmTarget.cxx                         |   14 +++++---------
 Source/cmcmd.cxx                            |    4 ----
 12 files changed, 24 insertions(+), 71 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Wed Feb 18 00:01:11 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Wed, 18 Feb 2015 00:01:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-163-g4fb9e84
Message-ID: <20150218050111.D3D45AAE29@public.kitware.com>

This is an automated email from 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  4fb9e847c0c757ff6e1ee430bbb9fc2b6b4e2ae6 (commit)
      from  5c635fa62414c408d04046079a5c0dac43f7cce2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4fb9e847c0c757ff6e1ee430bbb9fc2b6b4e2ae6
commit 4fb9e847c0c757ff6e1ee430bbb9fc2b6b4e2ae6
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Wed Feb 18 00:01:09 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Feb 18 00:01:09 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 6c4deca..3689443 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 2)
-set(CMake_VERSION_PATCH 20150217)
+set(CMake_VERSION_PATCH 20150218)
 #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 Feb 18 09:06:16 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 18 Feb 2015 09:06:16 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-403-gcf2cd52
Message-ID: <20150218140616.12D5BAAD2B@public.kitware.com>

This is an automated email from 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  cf2cd52726972ae5be42a2a6b4cc89c9faa6726e (commit)
       via  5dae6cfc937abd4dad8169057aaf7c72378de6c6 (commit)
      from  93f32ef43a61c80e5084b0c8e03bf8db7b1ffaea (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf2cd52726972ae5be42a2a6b4cc89c9faa6726e
commit cf2cd52726972ae5be42a2a6b4cc89c9faa6726e
Merge: 93f32ef 5dae6cf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 09:06:13 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 18 09:06:13 2015 -0500

    Merge topic 'FindMatlab-rewrite' into next
    
    5dae6cfc FindMatlab: Rewrite module and provide a usage API


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5dae6cfc937abd4dad8169057aaf7c72378de6c6
commit 5dae6cfc937abd4dad8169057aaf7c72378de6c6
Author:     Raffi Enficiaud <raffi.enficiaud at tuebingen.mpg.de>
AuthorDate: Thu Feb 12 17:13:31 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 18 09:05:51 2015 -0500

    FindMatlab: Rewrite module and provide a usage API
    
    Implementation of the new FindMatlab module
    
    - FindMatlab learned about versions and components
    - ability to find Matlab and its version in a more precise and multiplatform way
    - ability to add new mex extension with a macro
    - ability to add a documentation
    - ability to add matlab unit tests (with or without the unit test framework)
    - reworked documentation

diff --git a/Help/release/dev/FindMatlab-rewrite.rst b/Help/release/dev/FindMatlab-rewrite.rst
new file mode 100644
index 0000000..07727b8
--- /dev/null
+++ b/Help/release/dev/FindMatlab-rewrite.rst
@@ -0,0 +1,7 @@
+FindMatlab-rewrite
+------------------
+
+* The :module:`FindMatlab` module was completely rewritten.  It learned
+  about versions and components and to find Matlab in a more precise and
+  multiplatform way.  The module now offers APIs to create mex extensions,
+  documentation, and unit tests.
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 474556e..6185935 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -2,20 +2,199 @@
 # FindMatlab
 # ----------
 #
-# this module looks for Matlab
+# Finds Matlab installations and provides Matlab tools and libraries to cmake.
 #
-# Defines:
+# This package first intention is to find the libraries associated with Matlab
+# in order to be able to build Matlab extensions (mex files). It can also be
+# used:
 #
-# ::
+# * run specific commands in Matlab
+# * declare Matlab unit test
+# * retrieve various information from Matlab (mex extensions, versions and
+#   release queries, ...)
 #
-#   MATLAB_INCLUDE_DIR: include path for mex.h, engine.h
-#   MATLAB_LIBRARIES:   required libraries: libmex, etc
-#   MATLAB_MEX_LIBRARY: path to libmex.lib
-#   MATLAB_MX_LIBRARY:  path to libmx.lib
-#   MATLAB_ENG_LIBRARY: path to libeng.lib
+# The module supports the following components:
+#
+# * ``MX_LIBRARY`` and ``ENG_LIBRARY`` respectively the MX and ENG libraries of
+#   Matlab
+# * ``MAIN_PROGRAM`` the Matlab binary program.
+#
+# .. note::
+#
+#   The version given to the :command:`find_package` directive is the Matlab
+#   **version**, which should not be confused with the Matlab *release* name
+#   (eg. `R2014`).
+#   The :command:`matlab_get_version_from_release_name` and
+#   :command:`matlab_get_release_name_from_version` allow a mapping
+#   from the release name to the version.
+#
+# The variable :variable:`MATLAB_USER_ROOT` may be specified in order to give
+# the path of the desired Matlab version. Otherwise, the behaviour is platform
+# specific:
+#
+# * Windows: The installed versions of Matlab are retrieved from the
+#   Windows registry
+# * OS X: The installed versions of Matlab are given by the MATLAB
+#   paths in ``/Application``
+# * Unix: The desired Matlab should be accessible from the PATH.
+#
+# Additional information is provided when :variable:`MATLAB_FIND_DEBUG` is set.
+# When a Matlab binary is found automatically and the ``MATLAB_VERSION``
+# is not given, the version is queried from Matlab directly.
+# On Windows, it can make a window running Matlab appear.
+#
+# The mapping of the release names and the version of Matlab is performed by
+# defining pairs (name, version).  The variable
+# :variable:`MATLAB_ADDITIONAL_VERSIONS` may be provided before the call to
+# the :command:`find_package` in order to handle additional versions.
+#
+# A Matlab scripts can be added to the set of tests using the
+# :command:`matlab_add_unit_test`. By default, the Matlab unit test framework
+# will be used (>= 2013a) to run this script, but regular ``.m`` files
+# returning an exit code can be used as well (0 indicating a success).
+#
+# Module Input Variables
+# ----------------------
+#
+# Users or projects may set the following variables to configure the module
+# behaviour:
+#
+# :variable:`MATLAB_USER_ROOT`
+#   the root of the Matlab installation.
+# :variable:`MATLAB_FIND_DEBUG`
+#   outputs debug information
+# :variable:`MATLAB_ADDITIONAL_VERSIONS`
+#   additional versions of Matlab for the automatic retrieval of the installed
+#   versions.
+#
+# Variables defined by the module
+# -------------------------------
+#
+# Result variables
+# ^^^^^^^^^^^^^^^^
+#
+# ``Matlab_FOUND``
+#   ``TRUE`` if the Matlab installation is found, ``FALSE``
+#   otherwise. All variable below are defined if Matlab is found.
+# ``Matlab_ROOT_DIR``
+#   the root of the Matlab installation determined by the FindMatlab module.
+# ``Matlab_MAIN_PROGRAM``
+#   the Matlab binary program. Available only if the component ``MAIN_PROGRAM``
+#   is given in the :command:`find_package` directive.
+# ``Matlab_INCLUDE_DIRS``
+#  the path of the Matlab libraries headers
+# ``Matlab_MEX_LIBRARY``
+#   library for mex
+# ``Matlab_MX_LIBRARY``
+#   mx library of Matlab (arrays). Available only if the component
+#   ``MX_LIBRARY`` has been requested.
+# ``Matlab_ENG_LIBRARY``
+#   Matlab engine library. Available only if the component ``ENG_LIBRARY``
+#   is requested.
+# ``Matlab_LIBRARIES``
+#   the whole set of libraries of Matlab
+# ``Matlab_MEX_COMPILER``
+#   the mex compiler of Matlab. Currently not used.
+#   Available only if the component ``MEX_COMPILER`` is asked
+#
+# Cached variables
+# ^^^^^^^^^^^^^^^^
+#
+# ``Matlab_MEX_EXTENSION``
+#   the extension of the mex files for the current platform (given by Matlab).
+#
+# Provided macros
+# ---------------
+#
+# :command:`matlab_get_version_from_release_name`
+#   returns the version from the release name
+# :command:`matlab_get_release_name_from_version`
+#   returns the release name from the Matlab version
+#
+# Provided functions
+# ------------------
+#
+# :command:`matlab_add_mex`
+#   adds a target compiling a MEX file.
+# :command:`matlab_add_unit_test`
+#   adds a Matlab unit test file as a test to the project.
+# :command:`matlab_extract_all_installed_versions_from_registry`
+#   parses the registry for all Matlab versions. Available on Windows only.
+#   The part of the registry parsed is dependent on the host processor
+# :command:`matlab_get_all_valid_matlab_roots_from_registry`
+#   returns all the possible Matlab paths, according to a previously
+#   given list. Only the existing/accessible paths are kept. This is mainly
+#   useful for the searching all possible Matlab installation.
+# :command:`matlab_get_mex_suffix`
+#   returns the suffix to be used for the mex files
+#   (platform/architecture dependant)
+# :command:`matlab_get_version_from_matlab_run`
+#   returns the version of Matlab, given the full directory of the Matlab program.
+#
+#
+# Known issues
+# ------------
+#
+# **Symbol clash in a MEX target**
+#   By default, every symbols inside a MEX
+#   file defined with the command :command:`matlab_add_mex` have hidden
+#   visibility, except for the entry point. This is the default behaviour of
+#   the MEX compiler, which lowers the risk of symbol collision between the
+#   libraries shipped with Matlab, and the libraries to which the MEX file is
+#   linking to. This is also the default on Windows platforms.
+#
+#   However, this is not sufficient in certain case, where for instance your
+#   MEX file is linking against libraries that are already loaded by Matlab,
+#   even if those libraries have different SONAMES.
+#   A possible solution is to hide the symbols of the libraries to which the
+#   MEX target is linking to. This can be achieved in GNU GCC compilers with
+#   the linker option ``-Wl,--exclude-libs,ALL``.
+#
+# **Tests using GPU resources**
+#   in case your MEX file is using the GPU and
+#   in order to be able to run unit tests on this MEX file, the GPU resources
+#   should be properly released by Matlab. A possible solution is to make
+#   Matlab aware of the use of the GPU resources in the session, which can be
+#   performed by a command such as ``D = gpuDevice()`` at the beginning of
+#   the test script (or via a fixture).
+#
+#
+# Reference
+# --------------
+#
+# .. variable:: MATLAB_USER_ROOT
+#
+#    The root folder of the Matlab installation. This is set before the call to
+#    :command:`find_package`. If not set, then an automatic search of Matlab
+#    will be performed. If set, it should point to a valid version of Matlab.
+#
+# .. variable:: MATLAB_FIND_DEBUG
+#
+#    If set, the lookup of Matlab and the intermediate configuration steps are
+#    outputted to the console.
+#
+# .. variable:: MATLAB_ADDITIONAL_VERSIONS
+#
+#   If set, specifies additional versions of Matlab that may be looked for.
+#   This variable will be used if :variable:`MATLAB_USER_ROOT` is not set.
+#   The variable should be a list of strings, organised by pairs of release
+#   name and versions, such as follows::
+#
+#     set(MATLAB_ADDITIONAL_VERSIONS
+#         "release_name1=corresponding_version1"
+#         "release_name2=corresponding_version2"
+#         ...
+#         )
+#
+#   Example::
+#
+#     set(MATLAB_ADDITIONAL_VERSIONS
+#         "R2013b=8.2"
+#         "R2013a=8.1"
+#         "R2012b=8.0")
 
 #=============================================================================
-# Copyright 2005-2009 Kitware, Inc.
+# Copyright 2014-2015 Raffi Enficiaud, Max Planck Society
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -27,102 +206,1204 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-set(MATLAB_FOUND 0)
-if(WIN32)
-  if(${CMAKE_GENERATOR} MATCHES "Visual Studio 6")
-    set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/msvc60")
+set(_FindMatlab_SELF_DIR "${CMAKE_CURRENT_LIST_DIR}")
+
+include(FindPackageHandleStandardArgs)
+include(CheckCXXCompilerFlag)
+
+
+# The currently supported versions. Other version can be added by the user by
+# providing MATLAB_ADDITIONAL_VERSIONS
+if(NOT MATLAB_ADDITIONAL_VERSIONS)
+  set(MATLAB_ADDITIONAL_VERSIONS)
+endif()
+
+set(MATLAB_VERSIONS_MAPPING
+  "R2013b=8.2"
+  "R2013a=8.1"
+  "R2012b=8.0"
+  "R2012a=7.14"
+
+  "R2011b=7.13"
+  "R2011a=7.12"
+  "R2010b=7.11"
+
+  ${MATLAB_ADDITIONAL_VERSIONS}
+  )
+
+
+# temporary folder for all Matlab runs
+set(_matlab_temporary_folder ${CMAKE_BINARY_DIR}/Matlab)
+
+if(NOT EXISTS ${_matlab_temporary_folder})
+  file(MAKE_DIRECTORY ${_matlab_temporary_folder})
+endif()
+
+#.rst:
+# .. command:: matlab_get_version_from_release_name
+#
+#   Returns the version of Matlab (17.58) from a release name (R2017k)
+macro (matlab_get_version_from_release_name release_name version_name)
+
+  string(REGEX MATCHALL "${release_name}=([0-9]+\\.?[0-9]*)" _matched ${MATLAB_VERSIONS_MAPPING})
+
+  set(${version_name} "")
+  if(NOT _matched STREQUAL "")
+    set(${version_name} ${CMAKE_MATCH_1})
   else()
-    if(${CMAKE_GENERATOR} MATCHES "Visual Studio 7")
-      # Assume people are generally using 7.1,
-      # if using 7.0 need to link to: ../extern/lib/win32/microsoft/msvc70
-      set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/msvc71")
-    else()
-      if(${CMAKE_GENERATOR} MATCHES "Borland")
-        # Same here, there are also: bcc50 and bcc51 directories
-        set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/bcc54")
-      else()
-        if(MATLAB_FIND_REQUIRED)
-          message(FATAL_ERROR "Generator not compatible: ${CMAKE_GENERATOR}")
-        endif()
+    message(WARNING "The release name ${release_name} is not registered")
+  endif()
+
+endmacro()
+
+
+
+
+
+#.rst:
+# .. command:: matlab_get_release_name_from_version
+#
+#   Returns the release name (R2017k) from the version of Matlab (17.58)
+macro (matlab_get_release_name_from_version version release_name)
+
+  set(${release_name} "")
+  foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
+    string(REGEX MATCHALL "(.+)=${version}" _matched ${_var})
+    if(NOT _matched STREQUAL "")
+      set(${release_name} ${CMAKE_MATCH_1})
+      break()
+    endif()
+  endforeach(_var)
+
+  unset(_var)
+  unset(_matched)
+  if(${release_name} STREQUAL "")
+    message(WARNING "The version ${version} is not registered")
+  endif()
+
+endmacro()
+
+
+
+
+
+# extracts all the supported release names (R2017k...) of Matlab
+# internal use
+macro(matlab_get_supported_releases list_releases)
+  set(${list_releases})
+  foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
+    string(REGEX MATCHALL "(.+)=([0-9]+\\.?[0-9]*)" _matched ${_var})
+    if(NOT _matched STREQUAL "")
+      list(APPEND ${list_releases} ${CMAKE_MATCH_1})
+    endif()
+    unset(_matched)
+    unset(CMAKE_MATCH_1)
+  endforeach(_var)
+  unset(_var)
+endmacro()
+
+
+
+# extracts all the supported versions of Matlab
+# internal use
+macro(matlab_get_supported_versions list_versions)
+  set(${list_versions})
+  foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
+    string(REGEX MATCHALL "(.+)=([0-9]+\\.?[0-9]*)" _matched ${_var})
+    if(NOT _matched STREQUAL "")
+      list(APPEND ${list_versions} ${CMAKE_MATCH_2})
+    endif()
+    unset(_matched)
+    unset(CMAKE_MATCH_1)
+  endforeach(_var)
+  unset(_var)
+endmacro()
+
+
+#.rst:
+# .. command:: matlab_extract_all_installed_versions_from_registry
+#
+#   This function parses the registry and founds the Matlab versions that are
+#   installed. The found versions are returned in `matlab_versions`.
+#   Set `win64` to `TRUE` if the 64 bit version of Matlab should be looked for
+#   The returned list contains all versions under
+#   ``HKLM\\SOFTWARE\\Mathworks\\MATLAB`` or an empty list in case an error
+#   occurred (or nothing found).
+#
+#   .. note::
+#
+#     Only the versions are provided. No check is made over the existence of the
+#     installation referenced in the registry,
+#
+function(matlab_extract_all_installed_versions_from_registry win64 matlab_versions)
+
+  if(NOT CMAKE_HOST_WIN32)
+    message(FATAL_ERROR "This macro can only be called by a windows host (call to reg.exe")
+  endif()
+
+  # list the keys under HKEY_LOCAL_MACHINE\SOFTWARE\mathworks but the call to
+  # reg does not work from cmake, curiously, as is. The command provides the
+  # desired result under the command line though.
+  # Fix: this is because "/reg:64" should appended to the command, otherwise
+  # it gets on the 32 bits software key (curiously again)
+  find_program(MATLAB_REG_EXE_LOCATION "reg")
+
+  # if reg.exe is not found, then it is impossible to use this method.
+  if(NOT MATLAB_REG_EXE_LOCATION)
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] reg.exe not found")
+    endif()
+    set(${matlab_versions} "" PARENT_SCOPE)
+    return()
+  endif()
+
+  if(${win64} AND ${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "64")
+    set(APPEND_REG "/reg:64")
+  else()
+    set(APPEND_REG "/reg:32")
+  endif()
+
+  # /reg:64 should be added on 64 bits capable OSs in order to enable the
+  # redirection of 64 bits applications
+  execute_process(
+    COMMAND ${MATLAB_REG_EXE_LOCATION} query HKEY_LOCAL_MACHINE\\SOFTWARE\\Mathworks\\MATLAB /f * /k ${APPEND_REG}
+    RESULT_VARIABLE resultMatlab
+    OUTPUT_VARIABLE varMatlab
+    ERROR_VARIABLE errMatlab
+    )
+  #message("Matlabs = ${varMatlab} | ${resultMatlab}")
+
+
+  set(matlabs_from_registry)
+  if(${resultMatlab} EQUAL 0)
+
+    string(
+      REGEX MATCHALL "MATLAB\\\\([0-9]+(\\.[0-9]+)?)"
+      matlab_versions_regex ${varMatlab})
+
+    foreach(match IN LISTS matlab_versions_regex)
+      string(
+        REGEX MATCH "MATLAB\\\\(([0-9]+)(\\.([0-9]+))?)"
+        current_match ${match})
+
+      set(_matlab_current_version ${CMAKE_MATCH_1})
+      set(current_matlab_version_major ${CMAKE_MATCH_2})
+      set(current_matlab_version_minor ${CMAKE_MATCH_4})
+      if(NOT current_matlab_version_minor)
+        set(current_matlab_version_minor "0")
       endif()
+
+      list(APPEND matlabs_from_registry ${_matlab_current_version})
+      unset(_matlab_current_version)
+    endforeach(match)
+
+  endif()
+
+  set(${matlab_versions} ${matlabs_from_registry} PARENT_SCOPE)
+
+endfunction()
+
+
+
+# (internal)
+macro(extract_matlab_versions_from_registry_brute_force matlab_versions)
+  # get the supported versions
+  set(matlab_supported_versions)
+  matlab_get_supported_versions(matlab_supported_versions)
+
+
+  # this is a manual population of the versions we want to look for
+  # this can be done as is, but preferably with the call to
+  # matlab_get_supported_versions and variable
+
+  # populating the versions we want to look for
+  # set(matlab_supported_versions)
+
+  # # Matlab 7
+  # set(matlab_major 7)
+  # foreach(current_matlab_minor RANGE 4 20)
+    # list(APPEND matlab_supported_versions "${matlab_major}.${current_matlab_minor}")
+  # endforeach(current_matlab_minor)
+
+  # # Matlab 8
+  # set(matlab_major 8)
+  # foreach(current_matlab_minor RANGE 0 5)
+    # list(APPEND matlab_supported_versions "${matlab_major}.${current_matlab_minor}")
+  # endforeach(current_matlab_minor)
+
+  # # taking into account the possible additional versions provided by the user
+  # if(DEFINED MATLAB_ADDITIONAL_VERSIONS)
+    # list(APPEND matlab_supported_versions MATLAB_ADDITIONAL_VERSIONS)
+  # endif()
+
+
+  # we order from more recent to older
+  list(REMOVE_DUPLICATES matlab_supported_versions)
+  list(SORT matlab_supported_versions)
+  list(REVERSE matlab_supported_versions)
+
+
+  set(${matlab_versions} ${matlab_supported_versions})
+
+
+endmacro()
+
+
+
+
+#.rst:
+# .. command:: matlab_get_all_valid_matlab_roots_from_registry
+#
+#   Populates the Matlab root with valid versions of Matlab.
+#   The returned matlab_roots is organized in pairs
+#   ``(version_number,matlab_root_path)``.
+#
+#   ::
+#
+#     matlab_get_all_valid_matlab_roots_from_registry(
+#         matlab_versions
+#         matlab_roots)
+#
+#   ``matlab_versions``
+#     the versions of each of the Matlab installations
+#   ``matlab_roots``
+#     the location of each of the Matlab installations
+function(matlab_get_all_valid_matlab_roots_from_registry matlab_versions matlab_roots)
+
+  # The matlab_versions comes either from
+  # extract_matlab_versions_from_registry_brute_force or
+  # matlab_extract_all_installed_versions_from_registry.
+
+
+  set(_matlab_roots_list )
+  foreach(_matlab_current_version ${matlab_versions})
+    get_filename_component(
+      current_MATLAB_ROOT
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\${_matlab_current_version};MATLABROOT]"
+      ABSOLUTE)
+
+    if(EXISTS ${current_MATLAB_ROOT})
+      list(APPEND _matlab_roots_list ${_matlab_current_version} ${current_MATLAB_ROOT})
+    endif()
+
+  endforeach(_matlab_current_version)
+  unset(_matlab_current_version)
+  set(${matlab_roots} ${_matlab_roots_list} PARENT_SCOPE)
+  unset(_matlab_roots_list)
+endfunction()
+
+#.rst:
+# .. command:: matlab_get_mex_suffix
+#
+#   Returns the extension of the mex files (the suffixes).
+#   This function should not be called before the appropriate Matlab root has
+#   been found.
+#
+#   ::
+#
+#     matlab_get_mex_suffix(
+#         matlab_root
+#         mex_suffix)
+#
+#   ``matlab_root``
+#     the root of the Matlab installation
+#   ``mex_suffix``
+#     the variable name in which the suffix will be returned.
+function(matlab_get_mex_suffix matlab_root mex_suffix)
+
+  # todo setup the extension properly. Currently I do not know if this is
+  # sufficient for all win32 distributions.
+  # there is also CMAKE_EXECUTABLE_SUFFIX that could be tweaked
+  set(mexext_suffix "")
+  if(WIN32)
+    list(APPEND mexext_suffix ".bat")
+  endif()
+
+  # we first try without suffix, since cmake does not understand a list with
+  # one empty string element
+  find_program(
+    MATLAB_MEXEXTENSIONS_PROG
+    "mexext"
+    PATHS ${matlab_root}/bin
+    DOC "Matlab MEX extension provider"
+    NO_DEFAULT_PATH
+  )
+
+  foreach(current_mexext_suffix IN LISTS mexext_suffix)
+    if(NOT DEFINED MATLAB_MEXEXTENSIONS_PROG OR NOT MATLAB_MEXEXTENSIONS_PROG)
+      # this call should populate the cache automatically
+      find_program(
+        MATLAB_MEXEXTENSIONS_PROG
+        "mexext${current_mexext_suffix}"
+        PATHS ${matlab_root}/bin
+        DOC "Matlab MEX extension provider"
+        NO_DEFAULT_PATH
+      )
     endif()
+  endforeach(current_mexext_suffix)
+
+
+  # the program has been found?
+  if((NOT MATLAB_MEXEXTENSIONS_PROG) OR (NOT EXISTS ${MATLAB_MEXEXTENSIONS_PROG}))
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] Cannot found mexext program. Matlab root is ${matlab_root}")
+    endif()
+    return()
   endif()
-  find_library(MATLAB_MEX_LIBRARY
-    libmex
-    ${MATLAB_ROOT}
+
+  set(_matlab_mex_extension)
+
+
+  execute_process(
+    COMMAND ${MATLAB_MEXEXTENSIONS_PROG}
+    OUTPUT_VARIABLE _matlab_mex_extension)
+  string(STRIP ${_matlab_mex_extension} _matlab_mex_extension)
+
+  set(${mex_suffix} ${_matlab_mex_extension} PARENT_SCOPE)
+endfunction()
+
+
+
+
+#.rst:
+# .. command:: matlab_get_version_from_matlab_run
+#
+#   This function runs Matlab program specified on arguments and extracts its
+#   version.
+#
+#   ::
+#
+#     matlab_get_version_from_matlab_run(
+#         matlab_binary_path
+#         matlab_list_versions)
+#
+#   ``matlab_binary_path``
+#     the location of the `matlab` binary executable
+#   ``matlab_list_versions``
+#     the version extracted from Matlab
+function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_versions)
+
+  set(${matlab_list_versions} "" PARENT_SCOPE)
+
+
+  if(MATLAB_FIND_DEBUG)
+    message(STATUS "[MATLAB] Determining the version of Matlab from ${matlab_binary_program}")
+  endif()
+
+  if(EXISTS ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+    if(MATLAB_FIND_DEBUG)
+      message(STATUS "[MATLAB] Removing previous ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp file")
+    endif()
+    file(REMOVE ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+  endif()
+
+
+  # the log file is needed since on windows the command executes in a new
+  # window and it is not possible to get back the answer of Matlab
+  # the -wait command is needed on windows, otherwise the call returns
+  # immediately after the program launches itself.
+  if(WIN32)
+    set(_matlab_additional_commands "-wait")
+  endif()
+
+  # timeout set to 30 seconds, in case it does not start
+  # note as said before OUTPUT_VARIABLE cannot be used in a platform
+  # independent manner however, not setting it would flush the output of Matlab
+  # in the current console (unix variant)
+  execute_process(
+    COMMAND ${matlab_binary_program} -nosplash -nojvm ${_matlab_additional_commands} -logfile ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp -nodesktop -nodisplay -r "version, exit"
+    OUTPUT_VARIABLE _matlab_version_from_cmd_dummy
+    RESULT_VARIABLE _matlab_result_version_call
+    TIMEOUT 30
     )
-  find_library(MATLAB_MX_LIBRARY
-    libmx
-    ${MATLAB_ROOT}
+
+
+  if(${_matlab_result_version_call})
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] Unable to determine the version of Matlab. Matlab call returned with error ${_matlab_result_version_call}.")
+    endif()
+    return()
+  elseif(NOT EXISTS ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] Unable to determine the version of Matlab. The log file does not exist.")
+    endif()
+    return()
+  endif()
+
+  # if successful, read back the log
+  file(READ ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp _matlab_version_from_cmd)
+  file(REMOVE ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+
+  set(index -1)
+  string(FIND ${_matlab_version_from_cmd} "ans" index)
+  if(index EQUAL -1)
+
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] Cannot find the version of Matlab returned by the run.")
+    endif()
+
+  else()
+    set(matlab_list_of_all_versions_tmp)
+
+    string(SUBSTRING ${_matlab_version_from_cmd} ${index} -1 substring_ans)
+    string(
+      REGEX MATCHALL "ans[\r\n\t ]*=[\r\n\t ]*([0-9]+(\\.[0-9]+)?)"
+      matlab_versions_regex
+      ${substring_ans})
+    foreach(match IN LISTS matlab_versions_regex)
+      string(
+        REGEX MATCH "ans[\r\n\t ]*=[\r\n\t ]*(([0-9]+)(\\.([0-9]+))?)"
+        current_match ${match})
+
+      list(APPEND matlab_list_of_all_versions_tmp ${CMAKE_MATCH_1})
+    endforeach()
+    list(REMOVE_DUPLICATES matlab_list_of_all_versions_tmp)
+    set(${matlab_list_versions} ${matlab_list_of_all_versions_tmp} PARENT_SCOPE)
+
+  endif()
+
+endfunction()
+
+
+#.rst:
+# .. command:: matlab_add_unit_test
+#
+#   Adds a Matlab unit test to the test set of cmake/ctest.
+#   This command requires the component ``MAIN_PROGRAM``.
+#   The unit test uses the Matlab unittest framework (default, available
+#   starting Matlab 2013b+) except if the option ``NO_UNITTEST_FRAMEWORK``
+#   is given.
+#
+#   The function expects one Matlab test script file to be given.
+#   In the case ``NO_UNITTEST_FRAMEWORK`` is given, the unittest script file
+#   should contain the script to be run, plus an exit command with the exit
+#   value. This exit value will be passed to the ctest framework (0 success,
+#   non 0 failure). Additional arguments accepted by :command:`add_test` can be
+#   passed through ``TEST_ARGS`` (eg. ``CONFIGURATION <config> ...``).
+#
+#   ::
+#
+#     matlab_add_unit_test(
+#         NAME <name>
+#         UNITTEST_FILE matlab_file_containing_unittest.m
+#         [UNITTEST_PRECOMMAND matlab_command_to_run]
+#         [TIMEOUT timeout]
+#         [ADDITIONAL_PATH path1 [path2 ...]]
+#         [MATLAB_ADDITIONAL_STARTUP_OPTIONS option1 [option2 ...]]
+#         [TEST_ARGS arg1 [arg2 ...]]
+#         [NO_UNITTEST_FRAMEWORK]
+#         )
+#
+#   The function arguments are:
+#
+#   ``NAME``
+#     name of the unittest in ctest.
+#   ``UNITTEST_FILE``
+#     the matlab unittest file. Its path will be automatically
+#     added to the Matlab path.
+#   ``UNITTEST_PRECOMMAND``
+#     Matlab script command to be ran before the file
+#     containing the test (eg. GPU device initialisation based on CMake
+#     variables).
+#   ``TIMEOUT``
+#     the test timeout in seconds. Defaults to 180 seconds as the
+#     Matlab unit test may hang.
+#   ``ADDITIONAL_PATH``
+#     a list of paths to add to the Matlab path prior to
+#     running the unit test.
+#   ``MATLAB_ADDITIONAL_STARTUP_OPTIONS``
+#     a list of additional option in order
+#     to run Matlab from the command line.
+#   ``TEST_ARGS``
+#     Additional options provided to the add_test command. These
+#     options are added to the default options (eg. "CONFIGURATIONS Release")
+#   ``NO_UNITTEST_FRAMEWORK``
+#     when set, indicates that the test should not
+#     use the unittest framework of Matlab (available for versions >= R2013a).
+#
+function(matlab_add_unit_test)
+
+  if(NOT Matlab_MAIN_PROGRAM)
+    message(FATAL_ERROR "[MATLAB] This functionality needs the MAIN_PROGRAM component (not default)")
+  endif()
+
+  set(options NO_UNITTEST_FRAMEWORK)
+  set(oneValueArgs NAME UNITTEST_PRECOMMAND UNITTEST_FILE TIMEOUT)
+  set(multiValueArgs ADDITIONAL_PATH MATLAB_ADDITIONAL_STARTUP_OPTIONS TEST_ARGS)
+
+  set(prefix _matlab_unittest_prefix)
+  cmake_parse_arguments(${prefix} "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+
+  if(NOT ${prefix}_NAME)
+    message(FATAL_ERROR "[MATLAB] The Matlab test name cannot be empty")
+  endif()
+
+  add_test(NAME ${${prefix}_NAME}
+           COMMAND ${CMAKE_COMMAND}
+            -Dtest_name=${${prefix}_NAME}
+            -Dadditional_paths=${${prefix}_ADDITIONAL_PATH}
+            -Dtest_timeout=${${prefix}_TIMEOUT}
+            -Doutput_directory=${_matlab_temporary_folder}
+            -DMatlab_PROGRAM=${Matlab_MAIN_PROGRAM}
+            -Dno_unittest_framework=${${prefix}_NO_UNITTEST_FRAMEWORK}
+            -DMatlab_ADDITIONNAL_STARTUP_OPTIONS=${${prefix}_MATLAB_ADDITIONAL_STARTUP_OPTIONS}
+            -Dunittest_file_to_run=${${prefix}_UNITTEST_FILE}
+            -Dcmd_to_run_before_test=${${prefix}_UNITTEST_PRECOMMAND}
+            -P ${_FindMatlab_SELF_DIR}/MatlabTestsRedirect.cmake
+           ${${prefix}_TEST_ARGS}
+           ${${prefix}_UNPARSED_ARGUMENTS}
+           )
+endfunction()
+
+
+#.rst:
+# .. command:: matlab_add_mex
+#
+#   Adds a Matlab MEX target.
+#   This commands compiles the given sources with the current tool-chain in
+#   order to produce a MEX file. The final name of the produced output may be
+#   specified, as well as additional link libraries, and a documentation entry
+#   for the MEX file. Remaining arguments of the call are passed to the
+#   :command:`add_library` command.
+#
+#   ::
+#
+#      matlab_add_mex(
+#          NAME <name>
+#          SRC src1 [src2 ...]
+#          [OUTPUT_NAME output_name]
+#          [DOCUMENTATION file.txt]
+#          [LINK_TO target1 target2 ...]
+#          [...]
+#      )
+#
+#   ``NAME``
+#     name of the target.
+#   ``SRC``
+#     list of tje source files.
+#   ``LINK_TO``
+#     a list of additional link dependencies.  The target links to ``libmex``
+#     by default. If ``Matlab_MX_LIBRARY`` is defined, it also
+#     links to ``libmx``.
+#   ``OUTPUT_NAME``
+#     if given, overrides the default name. The default name is
+#     the name of the target without any prefix and
+#     with ``Matlab_MEX_EXTENSION`` suffix.
+#   ``DOCUMENTATION``
+#     if given, the file ``file.txt`` will be considered as
+#     being the documentation file for the MEX file. This file is copied into
+#     the same folder without any processing, with the same name as the final
+#     mex file, and with extension `.m`. In that case, typing ``help <name>``
+#     in Matlab prints the documentation contained in this file.
+#
+#   The documentation file is not processed and should be in the following
+#   format:
+#
+#   ::
+#
+#     % This is the documentation
+#     function ret = mex_target_output_name(input1)
+#
+function(matlab_add_mex )
+
+  if(NOT WIN32)
+    # we do not need all this on Windows
+    # pthread options
+    check_cxx_compiler_flag(-pthread                    HAS_MINUS_PTHREAD)
+    # we should use try_compile instead, the link flags are discarded from
+    # this compiler_flag function.
+    #check_cxx_compiler_flag(-Wl,--exclude-libs,ALL HAS_SYMBOL_HIDING_CAPABILITY)
+
+  endif()
+
+  set(oneValueArgs NAME DOCUMENTATION OUTPUT_NAME)
+  set(multiValueArgs LINK_TO SRC)
+
+  set(prefix _matlab_addmex_prefix)
+  cmake_parse_arguments(${prefix} "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+
+  if(NOT ${prefix}_NAME)
+    message(FATAL_ERROR "[MATLAB] The MEX target name cannot be empty")
+  endif()
+
+  if(NOT ${prefix}_OUTPUT_NAME)
+    set(${prefix}_OUTPUT_NAME ${${prefix}_NAME})
+  endif()
+
+  add_library(${${prefix}_NAME}
+    SHARED
+      ${${prefix}_SRC}
+      ${${prefix}_DOCUMENTATION}
+      ${${prefix}_UNPARSED_ARGUMENTS})
+  target_include_directories(${${prefix}_NAME} PRIVATE ${Matlab_INCLUDE_DIRS})
+
+  if(DEFINED Matlab_MX_LIBRARY)
+    target_link_libraries(${${prefix}_NAME} ${Matlab_MX_LIBRARY})
+  endif()
+
+  target_link_libraries(${${prefix}_NAME} ${Matlab_MEX_LIBRARY} ${${prefix}_LINK_TO})
+  set_target_properties(${${prefix}_NAME}
+      PROPERTIES
+        PREFIX ""
+        OUTPUT_NAME ${${prefix}_OUTPUT_NAME}
+        SUFFIX ".${Matlab_MEX_EXTENSION}")
+
+
+  # documentation
+  if(NOT ${${prefix}_DOCUMENTATION} STREQUAL "")
+    get_target_property(output_name ${${prefix}_NAME} OUTPUT_NAME)
+    add_custom_command(
+      TARGET ${${prefix}_NAME}
+      PRE_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${${prefix}_DOCUMENTATION} $<TARGET_FILE_DIR:${${prefix}_NAME}>/${output_name}.m
+      COMMENT "Copy ${${prefix}_NAME} documentation file into the output folder"
     )
-  find_library(MATLAB_ENG_LIBRARY
-    libeng
-    ${MATLAB_ROOT}
+  endif() # documentation
+
+  # entry point in the mex file + taking care of visibility and symbol clashes.
+  if(WIN32)
+    set_target_properties(${${prefix}_NAME}
+      PROPERTIES
+        DEFINE_SYMBOL "DLL_EXPORT_SYM=__declspec(dllexport)")
+  else()
+
+    if(HAS_MINUS_PTHREAD AND NOT APPLE)
+      # Apparently, compiling with -pthread generated the proper link flags
+      # and some defines at compilation
+      target_compile_options(${${prefix}_NAME} PRIVATE "-pthread")
+    endif()
+
+
+    # if we do not do that, the symbols linked from eg. boost remain weak and
+    # then clash with the ones defined in the matlab process. So by default
+    # the symbols are hidden.
+    # This also means that for shared libraries (like MEX), the entry point
+    # should be explicitly declared with default visibility, otherwise Matlab
+    # cannot find the entry point.
+    # Note that this is particularly meaningful if the MEX wrapper itself
+    # contains symbols that are clashing with Matlab (that are compiled in the
+    # MEX file). In order to propagate the visibility options to the libraries
+    # to which the MEX file is linked against, the -Wl,--exclude-libs,ALL
+    # option should also be specified.
+
+    set_target_properties(${${prefix}_NAME}
+      PROPERTIES
+        CXX_VISIBILITY_PRESET "hidden"
+        C_VISIBILITY_PRESET "hidden"
+        VISIBILITY_INLINES_HIDDEN "hidden"
     )
 
-  find_path(MATLAB_INCLUDE_DIR
-    "mex.h"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/include"
+    #  get_target_property(
+    #    _previous_link_flags
+    #    ${${prefix}_NAME}
+    #    LINK_FLAGS)
+    #  if(NOT _previous_link_flags)
+    #    set(_previous_link_flags)
+    #  endif()
+
+    #  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    #    set_target_properties(${${prefix}_NAME}
+    #      PROPERTIES
+    #        LINK_FLAGS "${_previous_link_flags} -Wl,--exclude-libs,ALL"
+    #        # -Wl,--version-script=${_FindMatlab_SELF_DIR}/MatlabLinuxVisibility.map"
+    #    )
+    #  elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    #    # in this case, all other symbols become hidden.
+    #    set_target_properties(${${prefix}_NAME}
+    #      PROPERTIES
+    #        LINK_FLAGS "${_previous_link_flags} -Wl,-exported_symbol,_mexFunction"
+    #        #-Wl,-exported_symbols_list,${_FindMatlab_SELF_DIR}/MatlabOSXVisilibity.map"
+    #    )
+    #  endif()
+
+
+
+    set_target_properties(${${prefix}_NAME}
+      PROPERTIES
+        DEFINE_SYMBOL "DLL_EXPORT_SYM=__attribute__ ((visibility (\"default\")))"
     )
+
+
+  endif()
+
+endfunction()
+
+
+
+
+
+
+
+
+# this variable will get all Matlab installations found in the current system.
+set(_matlab_possible_roots)
+
+
+# listing the Matlab versions installed on the WIN machine if MATLAB_USER_ROOT
+# is not set
+if(WIN32)
+
+  # for windows
+
+
+  if(NOT MATLAB_USER_ROOT)
+    # if MATLAB_USER_ROOT not specified, we look for Matlab installation in
+    # the registry
+    # if unsuccessful, we look for all known revision and filter the existing
+    # ones.
+
+    # testing if we are able to extract the needed information from the registry
+    set(matlab_versions_from_registry)
+    matlab_extract_all_installed_versions_from_registry(CMAKE_CL_64 matlab_versions_from_registry)
+
+    # the returned list is empty, doing the search on all known versions
+    if(NOT matlab_versions_from_registry)
+
+      if(MATLAB_FIND_DEBUG)
+        message(STATUS "[MATLAB] Search for Matlab from the registry unsuccessful, testing all supported versions")
+      endif()
+
+      extract_matlab_versions_from_registry_brute_force(matlab_versions_from_registry)
+    endif()
+
+    # filtering the results with the registry keys
+    matlab_get_all_valid_matlab_roots_from_registry("${matlab_versions_from_registry}" _matlab_possible_roots)
+
+
+
+  elseif(NOT EXISTS ${MATLAB_USER_ROOT})
+
+    # if MATLAB_USER_ROOT specified but erroneous
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] the specified path for MATLAB_USER_ROOT does not exist (${MATLAB_USER_ROOT})")
+    endif()
+  else()
+    list(APPEND _matlab_possible_roots "NOTFOUND" ${MATLAB_USER_ROOT}) # empty version
+  endif()
+
+
 else()
-  if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-    # Regular x86
-    set(MATLAB_ROOT
-      /usr/local/matlab-7sp1/bin/glnx86/
-      /opt/matlab-7sp1/bin/glnx86/
-      $ENV{HOME}/matlab-7sp1/bin/glnx86/
-      $ENV{HOME}/redhat-matlab/bin/glnx86/
-      )
+  # for linux/osx
+
+  if(NOT MATLAB_USER_ROOT)
+
+    # if MATLAB_USER_ROOT not specified, we look for Matlab from the command
+    # line PATH
+    # maybe using CMAKE_PROGRAM_PATH to add some more hints
+
+    set(_matlab_main_tmp "")
+    if(Matlab_MAIN_PROGRAM)
+      set(_matlab_main_tmp ${Matlab_MAIN_PROGRAM})
+    endif()
+
+    if(NOT _matlab_main_tmp)
+      # if we get there a second time and the folder matlab is created here,
+      # and then the find_program does not find it,
+      # the get_filename_component (... PROGRAM) finds this directory instead.
+      find_program(
+        _matlab_main_tmp
+        "matlab")
+
+      if(NOT _matlab_main_tmp)
+        #execute_process(COMMAND which matlab OUTPUT_VARIABLE _which_matlab
+        # RESULT_VARIABLE _which_matlab_result)
+        get_filename_component(_matlab_main_tmp "matlab" PROGRAM)
+
+        # "bug" of cmake: if we call get_filename_component with PROGRAM, it can
+        # return us a directory
+        if((NOT EXISTS ${_matlab_main_tmp}) OR (IS_DIRECTORY ${_matlab_main_tmp}))
+          execute_process(
+            COMMAND "which matlab"
+            OUTPUT_VARIABLE _matlab_main_tmp)
+         endif()
+      endif()
+
+
+      if(EXISTS ${_matlab_main_tmp})
+        if(MATLAB_FIND_DEBUG)
+          message(STATUS "[MATLAB] matlab found from PATH: ${_matlab_main_tmp}")
+        endif()
+      else()
+        # found candidate is not good, we remove it
+        unset(_matlab_main_tmp)
+        unset(_matlab_main_tmp CACHE)
+      endif()
+
+    endif() # if(NOT _matlab_main_tmp)
+
+    if(_matlab_main_tmp AND EXISTS ${_matlab_main_tmp})
+
+      # resolve symlinks
+      get_filename_component(_matlab_current_location "${_matlab_main_tmp}" REALPATH)
+      set(_directory_alias DIRECTORY)
+
+      # get the directory (the command below has to be run twice)
+      get_filename_component(_matlab_current_location "${_matlab_current_location}" ${_directory_alias})
+      get_filename_component(_matlab_current_location "${_matlab_current_location}" ${_directory_alias}) # Matlab should be in bin
+      list(APPEND _matlab_possible_roots "NOTFOUND" ${_matlab_current_location}) # empty version
+    endif()
+
+
+    # on mac, we look for the /Application paths
+    # this corresponds to the behaviour on Windows. On Linux, we do not have
+    # any other guess.
+    if((NOT _matlab_possible_roots) AND APPLE)
+
+      matlab_get_supported_releases(_matlab_releases)
+      if(MATLAB_FIND_DEBUG)
+        message(STATUS "[MATLAB] Matlab supported versions ${_matlab_releases}. If more version should be supported "
+                     "the variable MATLAB_ADDITIONAL_VERSIONS can be set according to the documentation")
+      endif()
+
+      foreach(_matlab_current_release IN LISTS _matlab_releases)
+        set(_matlab_full_string "/Applications/MATLAB_${_matlab_current_release}.app")
+        if(EXISTS ${_matlab_full_string})
+          set(_matlab_current_version)
+          matlab_get_version_from_release_name("${_matlab_current_release}" _matlab_current_version)
+          if(MATLAB_FIND_DEBUG)
+            message(STATUS "[MATLAB] Found version ${_matlab_current_release} (${_matlab_current_version}) in ${_matlab_full_string}")
+          endif()
+          list(APPEND _matlab_possible_roots ${_matlab_current_version})
+          list(APPEND _matlab_possible_roots ${_matlab_full_string})
+          unset(_matlab_current_version)
+        endif()
+
+        unset(_matlab_full_string)
+      endforeach(_matlab_current_release)
+      unset(_matlab_current_release)
+      unset(_matlab_releases)
+    endif()
+
+    # we need to clear _matlab_main_tmp here
+    unset(_matlab_main_tmp CACHE)
+    unset(_matlab_main_tmp)
+
+  elseif(NOT EXISTS ${MATLAB_USER_ROOT})
+    # if MATLAB_USER_ROOT specified but erroneous
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] the specified path for MATLAB_USER_ROOT does not exist (${MATLAB_USER_ROOT})")
+    endif()
   else()
-    # AMD64:
-    set(MATLAB_ROOT
-      /usr/local/matlab-7sp1/bin/glnxa64/
-      /opt/matlab-7sp1/bin/glnxa64/
-      $ENV{HOME}/matlab7_64/bin/glnxa64/
-      $ENV{HOME}/matlab-7sp1/bin/glnxa64/
-      $ENV{HOME}/redhat-matlab/bin/glnxa64/
-      )
+    list(APPEND _matlab_possible_roots "NOTFOUND" ${MATLAB_USER_ROOT}) # empty version
   endif()
-  find_library(MATLAB_MEX_LIBRARY
-    mex
-    ${MATLAB_ROOT}
-    )
-  find_library(MATLAB_MX_LIBRARY
-    mx
-    ${MATLAB_ROOT}
-    )
-  find_library(MATLAB_ENG_LIBRARY
-    eng
-    ${MATLAB_ROOT}
-    )
-  find_path(MATLAB_INCLUDE_DIR
-    "mex.h"
-    "/usr/local/matlab-7sp1/extern/include/"
-    "/opt/matlab-7sp1/extern/include/"
-    "$ENV{HOME}/matlab-7sp1/extern/include/"
-    "$ENV{HOME}/redhat-matlab/extern/include/"
+endif()
+
+
+if(MATLAB_FIND_DEBUG)
+  message(STATUS "[MATLAB] Matlab root folders are ${_matlab_possible_roots}")
+endif()
+
+
+
+if(DEFINED Matlab_ROOT_DIR)
+  unset(Matlab_ROOT_DIR)
+endif()
+
+# take the first possible Matlab root
+if(_matlab_possible_roots)
+  list(GET _matlab_possible_roots 0 Matlab_VERSION_STRING)
+  list(GET _matlab_possible_roots 1 Matlab_ROOT_DIR)
+  list(LENGTH _matlab_possible_roots numbers_of_matlab_roots)
+
+  # adding a warning in case of ambiguity
+  if(numbers_of_matlab_roots GREATER 2 AND MATLAB_FIND_DEBUG)
+    message(WARNING "[MATLAB] Found several distributions of Matlab. Setting the current version to ${Matlab_VERSION_STRING} (located ${Matlab_ROOT_DIR})."
+                    " If this is not the desired behaviour, provide the -DMATLAB_USER_ROOT on the command line")
+  endif()
+endif()
+
+
+if((NOT (DEFINED Matlab_VERSION_STRING)) OR (NOT Matlab_VERSION_STRING))
+  set(Matlab_VERSION_STRING "NOTFOUND")
+endif()
+
+
+
+# if the version is not trivial, we query matlab for that
+# we keep track of the location of matlab that induced this version
+set(Matlab_VERSION_STRING_AUTO_DETECT "" CACHE INTERNAL "internal matlab location for the discovered version")
+
+set(_matlab_version_should_be_recomputed FALSE)
+if(${Matlab_VERSION_STRING} STREQUAL "NOTFOUND")
+  set(_matlab_version_should_be_recomputed TRUE)
+elseif((NOT Matlab_MAIN_PROGRAM) OR (NOT EXISTS ${Matlab_MAIN_PROGRAM}))
+  set(_matlab_version_should_be_recomputed TRUE)
+else()
+  # just in case the variable is modified to a symlink
+  get_filename_component(_matlab_main_tmp "${Matlab_MAIN_PROGRAM}" REALPATH)
+  if(NOT (_matlab_main_tmp STREQUAL Matlab_VERSION_STRING_AUTO_DETECT))
+    set(_matlab_version_should_be_recomputed TRUE)
+  endif()
+endif()
+
+if(_matlab_version_should_be_recomputed)
+  if(MATLAB_FIND_DEBUG)
+    message(STATUS "[MATLAB] querying for version from Matlab root = ${Matlab_ROOT_DIR}")
+  endif()
+
+  if(NOT Matlab_MAIN_PROGRAM)
+    set(_matlab_main_tmp ${Matlab_MAIN_PROGRAM})
+  else()
+    find_program(
+      _matlab_main_tmp
+      matlab
+      PATHS ${Matlab_ROOT_DIR} ${Matlab_ROOT_DIR}/bin
+      DOC "Matlab main program"
+      NO_DEFAULT_PATH
     )
+  endif()
+
+  if(_matlab_main_tmp)
+    set(matlab_list_of_all_versions)
+    matlab_get_version_from_matlab_run(${_matlab_main_tmp} matlab_list_of_all_versions)
 
+    list(GET matlab_list_of_all_versions 0 MATLAB_VERSION_tmp)
+
+    # set the version into the cache
+    set(Matlab_VERSION_STRING ${MATLAB_VERSION_tmp} CACHE INTERNAL "Matlab version (automatically determined)" FORCE)
+    list(LENGTH list_of_all_versions list_of_all_versions_length)
+    if((${list_of_all_versions_length} GREATER 1) AND MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] Found several versions, taking the first one (versions found ${list_of_all_versions})")
+    endif()
+
+    # update the location of Matlab that produced this value
+    # we store the real path for comparison
+    get_filename_component(_matlab_main_tmp1 "${_matlab_main_tmp}" REALPATH)
+    set(Matlab_VERSION_STRING_AUTO_DETECT ${_matlab_main_tmp1} CACHE INTERNAL "internal matlab location for the discovered version" FORCE)
+
+    # these are internal variables
+    unset(_matlab_main_tmp)
+    unset(_matlab_main_tmp CACHE)
+    unset(_matlab_main_tmp1)
+  endif()
 endif()
 
-# This is common to UNIX and Win32:
-set(MATLAB_LIBRARIES
-  ${MATLAB_MEX_LIBRARY}
-  ${MATLAB_MX_LIBRARY}
-  ${MATLAB_ENG_LIBRARY}
-)
 
-if(MATLAB_INCLUDE_DIR AND MATLAB_LIBRARIES)
-  set(MATLAB_FOUND 1)
+if(MATLAB_FIND_DEBUG)
+  message(STATUS "[MATLAB] Current version is ${Matlab_VERSION_STRING} located ${Matlab_ROOT_DIR}")
+endif()
+
+
+
+if(Matlab_ROOT_DIR)
+  file(TO_CMAKE_PATH ${Matlab_ROOT_DIR} Matlab_ROOT_DIR)
+endif()
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+  set(_matlab_64Build FALSE)
+else()
+  set(_matlab_64Build TRUE)
+endif()
+
+if(APPLE)
+  set(_matlab_bin_prefix "mac") # i should be for intel
+  set(_matlab_bin_suffix_32bits "i")
+  set(_matlab_bin_suffix_64bits "i64")
+elseif(UNIX)
+  set(_matlab_bin_prefix "gln")
+  set(_matlab_bin_suffix_32bits "x86")
+  set(_matlab_bin_suffix_64bits "xa64")
+else()
+  set(_matlab_bin_prefix "win")
+  set(_matlab_bin_suffix_32bits "32")
+  set(_matlab_bin_suffix_64bits "64")
+endif()
+
+
+
+set(MATLAB_INCLUDE_DIR_TO_LOOK ${Matlab_ROOT_DIR}/extern/include)
+if(_matlab_64Build)
+  set(_matlab_current_suffix ${_matlab_bin_suffix_64bits})
+else()
+  set(_matlab_current_suffix ${_matlab_bin_suffix_32bits})
+endif()
+
+set(Matlab_BINARIES_DIR
+    ${Matlab_ROOT_DIR}/bin/${_matlab_bin_prefix}${_matlab_current_suffix})
+set(Matlab_EXTERN_LIBRARY_DIR
+    ${Matlab_ROOT_DIR}/extern/lib/${_matlab_bin_prefix}${_matlab_current_suffix})
+
+if(WIN32)
+  set(_matlab_lib_dir_for_search ${Matlab_EXTERN_LIBRARY_DIR}/microsoft)
+  set(_matlab_lib_prefix_for_search "lib")
+else()
+  set(_matlab_lib_dir_for_search ${Matlab_BINARIES_DIR})
+  set(_matlab_lib_prefix_for_search "lib")
 endif()
 
-mark_as_advanced(
-  MATLAB_LIBRARIES
-  MATLAB_MEX_LIBRARY
-  MATLAB_MX_LIBRARY
-  MATLAB_ENG_LIBRARY
-  MATLAB_INCLUDE_DIR
-  MATLAB_FOUND
-  MATLAB_ROOT
+unset(_matlab_64Build)
+
+
+if(NOT DEFINED Matlab_MEX_EXTENSION)
+  set(_matlab_mex_extension "")
+  matlab_get_mex_suffix("${Matlab_ROOT_DIR}" _matlab_mex_extension)
+
+  # This variable goes to the cache.
+  set(Matlab_MEX_EXTENSION ${_matlab_mex_extension} CACHE STRING "Extensions for the mex targets (automatically given by Matlab)")
+  unset(_matlab_mex_extension)
+endif()
+
+
+if(MATLAB_FIND_DEBUG)
+  message(STATUS "[MATLAB] [DEBUG]_matlab_lib_prefix_for_search = ${_matlab_lib_prefix_for_search} | _matlab_lib_dir_for_search = ${_matlab_lib_dir_for_search}")
+endif()
+
+
+
+# internal
+# This small stub around find_library is to prevent any pollution of CMAKE_FIND_LIBRARY_PREFIXES in the global scope.
+# This is the function to be used below instead of the find_library directives.
+function(_Matlab_find_library _matlab_library_prefix)
+  set(CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES} ${_matlab_library_prefix})
+  find_library(${ARGN})
+endfunction()
+
+
+set(_matlab_required_variables)
+
+
+# the MEX library/header are required
+find_path(
+  Matlab_INCLUDE_DIRS
+  mex.h
+  PATHS ${MATLAB_INCLUDE_DIR_TO_LOOK}
+  NO_DEFAULT_PATH
+  )
+list(APPEND _matlab_required_variables Matlab_INCLUDE_DIRS)
+
+_Matlab_find_library(
+  ${_matlab_lib_prefix_for_search}
+  Matlab_MEX_LIBRARY
+  mex
+  PATHS ${_matlab_lib_dir_for_search}
+  NO_DEFAULT_PATH
 )
 
+
+list(APPEND _matlab_required_variables Matlab_MEX_LIBRARY)
+
+# the MEX extension is required
+list(APPEND _matlab_required_variables Matlab_MEX_EXTENSION)
+
+# the matlab root is required
+list(APPEND _matlab_required_variables Matlab_ROOT_DIR)
+
+
+# component Mex Compiler
+list(FIND Matlab_FIND_COMPONENTS MEX_COMPILER _matlab_find_mex_compiler)
+if(_matlab_find_mex_compiler GREATER -1)
+  find_program(
+    Matlab_MEX_COMPILER
+    "mex"
+    PATHS ${Matlab_BINARIES_DIR}
+    DOC "Matlab MEX compiler"
+    NO_DEFAULT_PATH
+  )
+
+  if(Matlab_MEX_COMPILER)
+    set(Matlab_MEX_COMPILER_FOUND TRUE)
+  endif()
+endif()
+unset(_matlab_find_mex_compiler)
+
+# component Matlab program
+list(FIND Matlab_FIND_COMPONENTS MAIN_PROGRAM _matlab_find_matlab_program)
+if(_matlab_find_matlab_program GREATER -1)
+  # todo cleanup with code above
+  if(NOT DEFINED Matlab_MAIN_PROGRAM)
+    find_program(
+      Matlab_MAIN_PROGRAM
+      matlab
+      PATHS ${Matlab_ROOT_DIR} ${Matlab_ROOT_DIR}/bin
+      DOC "Matlab main program"
+      NO_DEFAULT_PATH
+    )
+  endif()
+  if(Matlab_MAIN_PROGRAM)
+    set(Matlab_MAIN_PROGRAM_FOUND TRUE)
+  endif()
+
+endif()
+unset(_matlab_find_matlab_program)
+
+# Component MX library
+list(FIND Matlab_FIND_COMPONENTS MX_LIBRARY _matlab_find_mx)
+if(_matlab_find_mx GREATER -1)
+  _Matlab_find_library(
+    ${_matlab_lib_prefix_for_search}
+    Matlab_MX_LIBRARY
+    mx
+    PATHS ${_matlab_lib_dir_for_search}
+    NO_DEFAULT_PATH
+  )
+
+  if(Matlab_MX_LIBRARY)
+    set(Matlab_MX_LIBRARY_FOUND TRUE)
+  endif()
+endif()
+unset(_matlab_find_mx)
+
+
+# Component ENG library
+list(FIND Matlab_FIND_COMPONENTS ENG_LIBRARY _matlab_find_eng)
+if(_matlab_find_eng GREATER -1)
+  _Matlab_find_library(
+    ${_matlab_lib_prefix_for_search}
+    Matlab_ENG_LIBRARY
+    eng
+    PATHS ${_matlab_lib_dir_for_search}
+    NO_DEFAULT_PATH
+  )
+  if(Matlab_ENG_LIBRARY)
+    set(Matlab_ENG_LIBRARY_FOUND TRUE)
+  endif()
+endif()
+unset(_matlab_find_eng)
+
+
+
+
+
+unset(_matlab_lib_dir_for_search)
+
+
+set(Matlab_LIBRARIES ${Matlab_MEX_LIBRARY} ${Matlab_MX_LIBRARY} ${Matlab_ENG_LIBRARY})
+
+if(CMAKE_VERSION VERSION_LESS "2.8.11")
+  find_package_handle_standard_args(
+    Matlab
+    REQUIRED_VARS ${_matlab_required_variables}
+    VERSION_VAR Matlab_VERSION_STRING)
+else()
+  find_package_handle_standard_args(
+    Matlab
+    FOUND_VAR Matlab_FOUND
+    REQUIRED_VARS ${_matlab_required_variables} #MATLAB_REQUIRED_PROGRAMS MATLAB_REQUIRED_LIBRARIES MATLAB_REQUIRED_INCLUDE_DIRS
+    VERSION_VAR Matlab_VERSION_STRING
+    HANDLE_COMPONENTS)
+endif()
+
+unset(_matlab_required_variables)
+unset(_matlab_bin_prefix)
+unset(_matlab_bin_suffix_32bits)
+unset(_matlab_bin_suffix_64bits)
+unset(_matlab_current_suffix)
+unset(_matlab_lib_dir_for_search)
+unset(_matlab_lib_prefix_for_search)
+
+if(Matlab_INCLUDE_DIRS AND Matlab_LIBRARIES)
+  mark_as_advanced(
+    Matlab_LIBRARIES
+    Matlab_MEX_LIBRARY
+    Matlab_MX_LIBRARY
+    Matlab_ENG_LIBRARY
+    Matlab_INCLUDE_DIRS
+    Matlab_FOUND
+    MATLAB_USER_ROOT
+    Matlab_ROOT_DIR
+    Matlab_VERSION_STRING
+    Matlab_MAIN_PROGRAM
+    Matlab_MEX_EXTENSION
+    Matlab_BINARIES_DIR
+  )
+endif()
diff --git a/Modules/MatlabTestsRedirect.cmake b/Modules/MatlabTestsRedirect.cmake
new file mode 100644
index 0000000..46d1ef8
--- /dev/null
+++ b/Modules/MatlabTestsRedirect.cmake
@@ -0,0 +1,83 @@
+# This is an undocumented internal helper for the FindMatlab
+# module ``matlab_add_unit_test`` command.
+
+#=============================================================================
+# Copyright 2014-2015 Raffi Enficiaud, Max Planck Society
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+
+# Usage: cmake
+#   -Dtest_timeout=180
+#   -Dworking_directory="."
+#   -Doutput_directory=
+#   -Dadditional_paths=""
+#   -Dno_unittest_framework=""
+#   -DMatlab_PROGRAM=matlab_exe_location
+#   -DMatlab_ADDITIONNAL_STARTUP_OPTIONS=""
+#   -Dtest_name=name_of_the_test
+#   -Dcmd_to_run_before_test=""
+#   -Dunittest_file_to_run
+#   -P FindMatlab_TestsRedirect.cmake
+
+set(Matlab_UNIT_TESTS_CMD -nosplash -nojvm -nodesktop -nodisplay ${Matlab_ADDITIONNAL_STARTUP_OPTIONS})
+if(WIN32)
+  set(Matlab_UNIT_TESTS_CMD ${Matlab_UNIT_TESTS_CMD} -wait)
+endif()
+
+if(NOT test_timeout)
+  set(test_timeout 180)
+endif()
+
+if(NOT cmd_to_run_before_test)
+  set(cmd_to_run_before_test)
+endif()
+
+get_filename_component(unittest_file_directory   "${unittest_file_to_run}" DIRECTORY)
+get_filename_component(unittest_file_to_run_name "${unittest_file_to_run}" NAME_WE)
+
+set(concat_string '${unittest_file_directory}')
+foreach(s IN LISTS additional_paths)
+  if(NOT "${s}" STREQUAL "")
+    set(concat_string "${concat_string}, '${s}'")
+  endif()
+endforeach()
+
+set(unittest_to_run "runtests('${unittest_file_to_run_name}'), exit(max([ans(1,:).Failed]))")
+if(no_unittest_framework)
+  set(unittest_to_run "try, ${unittest_file_to_run_name}, catch err, disp('An exception has been thrown during the execution'), disp(err), disp(err.stack), exit(1), end, exit(0)")
+endif()
+
+set(Matlab_SCRIPT_TO_RUN
+    "addpath(${concat_string}), path, ${cmd_to_run_before_test}, ${unittest_to_run}"
+   )
+
+set(Matlab_LOG_FILE ${output_directory}/${test_name}.log)
+
+execute_process(
+  COMMAND ${Matlab_PROGRAM} ${Matlab_UNIT_TESTS_CMD} -logfile ${Matlab_LOG_FILE} -r ${Matlab_SCRIPT_TO_RUN}
+  RESULT_VARIABLE res
+  TIMEOUT ${test_timeout}
+  OUTPUT_QUIET # we do not want the output twice
+  )
+
+if(NOT EXISTS ${Matlab_LOG_FILE})
+  message( FATAL_ERROR "[MATLAB] ERROR: cannot find the log file ${Matlab_LOG_FILE}")
+endif()
+
+# print the output in any case.
+file(READ ${Matlab_LOG_FILE} matlab_log_content)
+message("Matlab test ${name_of_the_test} output:\n${matlab_log_content}") # if we put FATAL_ERROR here, the file is indented.
+
+
+if(NOT (res EQUAL 0))
+  message( FATAL_ERROR "[MATLAB] TEST FAILED" )
+endif()
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index cb45e79..a8e4822 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1256,6 +1256,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     add_subdirectory(FindJsonCpp)
   endif()
 
+  # Matlab module
+  if(CMake_TEST_FindMatlab)
+    ADD_TEST_MACRO(FindMatlab.basic_checks      ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>)
+    ADD_TEST_MACRO(FindMatlab.versions_checks   ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>)
+  endif()
+
   find_package(GTK2 QUIET)
   if(GTK2_FOUND)
     add_subdirectory(FindGTK2)
diff --git a/Tests/FindMatlab/basic_checks/CMakeLists.txt b/Tests/FindMatlab/basic_checks/CMakeLists.txt
new file mode 100644
index 0000000..acf71ea
--- /dev/null
+++ b/Tests/FindMatlab/basic_checks/CMakeLists.txt
@@ -0,0 +1,57 @@
+
+cmake_minimum_required (VERSION 2.8.12)
+enable_testing()
+project(basic_checks)
+
+set(MATLAB_FIND_DEBUG TRUE)
+
+# the success of the following command is dependent on the current configuration:
+# - on 32bits builds (cmake is building with 32 bits), it looks for 32 bits Matlab
+# - on 64bits builds (cmake is building with 64 bits), it looks for 64 bits Matlab
+find_package(Matlab REQUIRED COMPONENTS MX_LIBRARY MAIN_PROGRAM)
+
+
+
+matlab_add_mex(
+    # target name
+    NAME cmake_matlab_test_wrapper1
+    # output name
+    OUTPUT_NAME cmake_matlab_mex1
+    SRC ${CMAKE_CURRENT_SOURCE_DIR}/../matlab_wrapper1.cpp
+    DOCUMENTATION ${CMAKE_CURRENT_SOURCE_DIR}/../help_text1.m.txt
+  )
+
+
+matlab_add_unit_test(
+    NAME ${PROJECT_NAME}_matlabtest-1
+    TIMEOUT 30
+    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests1.m
+    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+    )
+
+matlab_add_unit_test(
+    NAME ${PROJECT_NAME}_matlabtest-2
+    TIMEOUT 15
+    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests_timeout.m
+    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+    )
+set_tests_properties(${PROJECT_NAME}_matlabtest-2 PROPERTIES WILL_FAIL TRUE)
+
+
+# testing the test without the unittest framework of Matlab
+matlab_add_unit_test(
+    NAME ${PROJECT_NAME}_matlabtest-3
+    TIMEOUT 30
+    NO_UNITTEST_FRAMEWORK
+    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests2.m
+    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+    )
+
+matlab_add_unit_test(
+    NAME ${PROJECT_NAME}_matlabtest-4
+    TIMEOUT 30
+    NO_UNITTEST_FRAMEWORK
+    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests3.m
+    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+    )
+set_tests_properties(${PROJECT_NAME}_matlabtest-4 PROPERTIES WILL_FAIL TRUE)
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests1.m b/Tests/FindMatlab/cmake_matlab_unit_tests1.m
new file mode 100644
index 0000000..2371c3a
--- /dev/null
+++ b/Tests/FindMatlab/cmake_matlab_unit_tests1.m
@@ -0,0 +1,33 @@
+
+classdef cmake_matlab_unit_tests1 < matlab.unittest.TestCase
+  % some simple unit test for CMake Matlab wrapper
+  properties
+  end
+
+  methods (Test)
+    function testDummyCall(testCase)
+      % very simple call test
+      cmake_matlab_mex1(rand(3,3));
+    end
+
+    function testDummyCall2(testCase)
+      % very simple call test 2
+      ret = cmake_matlab_mex1(rand(3,3));
+      testCase.verifyEqual(size(ret), size(rand(3,3)));
+
+      testCase.verifyEqual(size(cmake_matlab_mex1(rand(4,3))), [4,3] );
+    end
+
+    function testFailTest(testCase)
+      testCase.verifyError(@() cmake_matlab_mex1(10), 'cmake_matlab:configuration');
+      testCase.verifyError(@() cmake_matlab_mex1([10]), 'cmake_matlab:configuration');
+    end
+
+    function testHelpContent(testCase)
+      % testing the help feature
+      testCase.verifySubstring(evalc('help cmake_matlab_mex1'), 'Dummy matlab extension in cmake');
+    end
+
+
+  end
+end
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests2.m b/Tests/FindMatlab/cmake_matlab_unit_tests2.m
new file mode 100644
index 0000000..7a8a342
--- /dev/null
+++ b/Tests/FindMatlab/cmake_matlab_unit_tests2.m
@@ -0,0 +1,6 @@
+
+ret = cmake_matlab_mex1(rand(3,3));
+
+if(size(ret) ~= size(rand(3,3)))
+  error('Dimension mismatch!');
+end
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests3.m b/Tests/FindMatlab/cmake_matlab_unit_tests3.m
new file mode 100644
index 0000000..2639325
--- /dev/null
+++ b/Tests/FindMatlab/cmake_matlab_unit_tests3.m
@@ -0,0 +1,5 @@
+
+cmake_matlab_mex1(10);
+
+% should not reach this point
+exit(0);
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m b/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
new file mode 100644
index 0000000..66be1bb
--- /dev/null
+++ b/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
@@ -0,0 +1,15 @@
+
+classdef cmake_matlab_unit_tests_timeout < matlab.unittest.TestCase
+  % timeout tests
+
+  properties
+  end
+
+  methods (Test)
+    function testCallHangsShouldBeTimedOut(testCase)
+      cmake_matlab_mex1(rand(3,3));
+      disp('Will now wait.');
+      input('Testing the cmake Matlab package timeout - do not press anything');
+    end
+  end
+end
diff --git a/Tests/FindMatlab/help_text1.m.txt b/Tests/FindMatlab/help_text1.m.txt
new file mode 100644
index 0000000..a924355
--- /dev/null
+++ b/Tests/FindMatlab/help_text1.m.txt
@@ -0,0 +1,2 @@
+% Dummy matlab extension in cmake
+function ret = cmake_matlab_mex1(X)
diff --git a/Tests/FindMatlab/matlab_wrapper1.cpp b/Tests/FindMatlab/matlab_wrapper1.cpp
new file mode 100644
index 0000000..4149bb9
--- /dev/null
+++ b/Tests/FindMatlab/matlab_wrapper1.cpp
@@ -0,0 +1,26 @@
+
+// simple workaround to some compiler specific problems
+// see http://stackoverflow.com/questions/22367516/mex-compile-error-unknown-type-name-char16-t/23281916#23281916
+#include <algorithm>
+
+#include "mex.h"
+
+// this test should return a matrix of 10 x 10 and should check some of the arguments
+
+void mexFunction(const int nlhs, mxArray *plhs[], const int nrhs, const mxArray *prhs[])
+{
+  if(nrhs != 1)
+  {
+    mexErrMsgTxt("Incorrect arguments");
+  }
+
+  size_t dim1 = mxGetM(prhs[0]);
+  size_t dim2 = mxGetN(prhs[0]);
+
+  if(dim1 == 1 || dim2 == 1)
+  {
+    mexErrMsgIdAndTxt("cmake_matlab:configuration", "Incorrect arguments");
+  }
+
+  plhs[0] = mxCreateNumericMatrix(dim1, dim2, mxGetClassID(prhs[0]), mxREAL);
+}
diff --git a/Tests/FindMatlab/versions_checks/CMakeLists.txt b/Tests/FindMatlab/versions_checks/CMakeLists.txt
new file mode 100644
index 0000000..5d20685
--- /dev/null
+++ b/Tests/FindMatlab/versions_checks/CMakeLists.txt
@@ -0,0 +1,52 @@
+
+cmake_minimum_required (VERSION 2.8.12)
+enable_testing()
+project(versions_checks)
+
+set(MATLAB_FIND_DEBUG TRUE)
+set(MATLAB_ADDITIONAL_VERSIONS
+    "dummy=14.9")
+
+# the success of the following command is dependent on the current configuration
+# in this case, we are only interested in the version macros
+find_package(Matlab)
+
+
+
+if(NOT COMMAND matlab_get_version_from_release_name)
+  message(FATAL_ERROR "The macro matlab_get_version_from_release_name should be defined")
+endif()
+
+if(NOT COMMAND matlab_get_release_name_from_version)
+  message(FATAL_ERROR "The macro matlab_get_release_name_from_version should be defined")
+endif()
+
+
+# matlab_get_release_name_from_version
+matlab_get_release_name_from_version("7.13" release_name)
+if(NOT release_name STREQUAL "R2011b")
+  message(FATAL_ERROR "version 7.13 does not give release R2011b : '${release_name}' != R2011b")
+endif()
+
+matlab_get_release_name_from_version("14.9" release_name)
+if(NOT release_name STREQUAL "dummy")
+  message(FATAL_ERROR "version 14.9 does not give release dummy : '${release_name}' != dummy")
+endif()
+
+matlab_get_release_name_from_version("14.10" release_name)
+if(NOT release_name STREQUAL "")
+  message(FATAL_ERROR "version 14.10 does not give empty release: '${release_name}' != ''")
+endif()
+
+
+# matlab_get_version_from_release_name
+matlab_get_version_from_release_name("R2011a" version)
+if(NOT version STREQUAL "7.12")
+  message(FATAL_ERROR "Release R2011a does not give version 7.12 : '${version}' != 7.12")
+endif()
+
+matlab_get_version_from_release_name("dummy" version)
+#message(FATAL_ERROR "versionversion = ${version}")
+if(NOT version STREQUAL "14.9")
+  message(FATAL_ERROR "Release dummy does not give version 14.9 : '${version}' != 14.9")
+endif()
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index f0426e5..7715f1c 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -198,3 +198,8 @@ add_RunCMake_test(IfacePaths_SOURCES TEST_DIR IfacePaths)
 if(RPMBUILD_EXECUTABLE)
   add_RunCMake_test(CPackRPM)
 endif()
+
+# Matlab module related tests
+if(CMake_TEST_FindMatlab)
+  add_RunCMake_test(FindMatlab)
+endif()
diff --git a/Tests/RunCMake/FindMatlab/CMakeLists.txt b/Tests/RunCMake/FindMatlab/CMakeLists.txt
new file mode 100644
index 0000000..1b9a957
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/CMakeLists.txt
@@ -0,0 +1,3 @@
+
+cmake_minimum_required(VERSION 2.8.12)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt b/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt b/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
new file mode 100644
index 0000000..95a787f
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*FindMatlab.cmake:[0-9]+ \(message\):
+  \[MATLAB\] This functionality needs the MAIN_PROGRAM component \(not default\)
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1.cmake b/Tests/RunCMake/FindMatlab/MatlabTest1.cmake
new file mode 100644
index 0000000..1cbc1c2
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/MatlabTest1.cmake
@@ -0,0 +1,22 @@
+
+cmake_minimum_required (VERSION 2.8.12)
+enable_testing()
+project(test_should_fail)
+
+find_package(Matlab REQUIRED COMPONENTS MX_LIBRARY)
+
+matlab_add_mex(
+    # target name
+    NAME cmake_matlab_test_wrapper1
+    # output name
+    OUTPUT_NAME cmake_matlab_mex1
+    SRC ${CMAKE_CURRENT_SOURCE_DIR}/matlab_wrapper1.cpp
+  )
+
+# this command should raise a FATAL_ERROR, component MAIN_PROGRAM is missing
+matlab_add_unit_test(
+    NAME ${PROJECT_NAME}_matlabtest-1
+    TIMEOUT 1
+    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake_matlab_unit_tests2.m
+    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
+    )
diff --git a/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake b/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
new file mode 100644
index 0000000..33dbb77
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+
+include(RunCMake)
+run_cmake(MatlabTest1)
diff --git a/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m b/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
new file mode 100644
index 0000000..7a8a342
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
@@ -0,0 +1,6 @@
+
+ret = cmake_matlab_mex1(rand(3,3));
+
+if(size(ret) ~= size(rand(3,3)))
+  error('Dimension mismatch!');
+end
diff --git a/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp b/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp
new file mode 100644
index 0000000..4149bb9
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp
@@ -0,0 +1,26 @@
+
+// simple workaround to some compiler specific problems
+// see http://stackoverflow.com/questions/22367516/mex-compile-error-unknown-type-name-char16-t/23281916#23281916
+#include <algorithm>
+
+#include "mex.h"
+
+// this test should return a matrix of 10 x 10 and should check some of the arguments
+
+void mexFunction(const int nlhs, mxArray *plhs[], const int nrhs, const mxArray *prhs[])
+{
+  if(nrhs != 1)
+  {
+    mexErrMsgTxt("Incorrect arguments");
+  }
+
+  size_t dim1 = mxGetM(prhs[0]);
+  size_t dim2 = mxGetN(prhs[0]);
+
+  if(dim1 == 1 || dim2 == 1)
+  {
+    mexErrMsgIdAndTxt("cmake_matlab:configuration", "Incorrect arguments");
+  }
+
+  plhs[0] = mxCreateNumericMatrix(dim1, dim2, mxGetClassID(prhs[0]), mxREAL);
+}

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

Summary of changes:
 Help/release/dev/FindMatlab-rewrite.rst            |    7 +
 Modules/FindMatlab.cmake                           | 1455 ++++++++++++++++++--
 Modules/MatlabTestsRedirect.cmake                  |   83 ++
 Tests/CMakeLists.txt                               |    6 +
 Tests/FindMatlab/basic_checks/CMakeLists.txt       |   57 +
 Tests/FindMatlab/cmake_matlab_unit_tests1.m        |   33 +
 Tests/FindMatlab/cmake_matlab_unit_tests2.m        |    6 +
 Tests/FindMatlab/cmake_matlab_unit_tests3.m        |    5 +
 Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m |   15 +
 Tests/FindMatlab/help_text1.m.txt                  |    2 +
 Tests/FindMatlab/matlab_wrapper1.cpp               |   26 +
 Tests/FindMatlab/versions_checks/CMakeLists.txt    |   52 +
 Tests/RunCMake/CMakeLists.txt                      |    5 +
 .../{CMP0038 => FindMatlab}/CMakeLists.txt         |    2 +-
 .../MatlabTest1-result.txt}                        |    0
 Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt   |    2 +
 Tests/RunCMake/FindMatlab/MatlabTest1.cmake        |   22 +
 Tests/RunCMake/FindMatlab/RunCMakeTest.cmake       |    3 +
 .../RunCMake/FindMatlab/cmake_matlab_unit_tests2.m |    6 +
 Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp      |   26 +
 20 files changed, 1725 insertions(+), 88 deletions(-)
 create mode 100644 Help/release/dev/FindMatlab-rewrite.rst
 create mode 100644 Modules/MatlabTestsRedirect.cmake
 create mode 100644 Tests/FindMatlab/basic_checks/CMakeLists.txt
 create mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests1.m
 create mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests2.m
 create mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests3.m
 create mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
 create mode 100644 Tests/FindMatlab/help_text1.m.txt
 create mode 100644 Tests/FindMatlab/matlab_wrapper1.cpp
 create mode 100644 Tests/FindMatlab/versions_checks/CMakeLists.txt
 copy Tests/RunCMake/{CMP0038 => FindMatlab}/CMakeLists.txt (70%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => FindMatlab/MatlabTest1-result.txt} (100%)
 create mode 100644 Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
 create mode 100644 Tests/RunCMake/FindMatlab/MatlabTest1.cmake
 create mode 100644 Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
 create mode 100644 Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 18 09:17:53 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 18 Feb 2015 09:17:53 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-405-gddcb4f0
Message-ID: <20150218141754.051CDAAD2F@public.kitware.com>

This is an automated email from 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  ddcb4f0f656c001fa8081b8e8a04151532c542e6 (commit)
       via  b88c2ee0924bdf3405bf1710a11c8999cc61c6e2 (commit)
      from  cf2cd52726972ae5be42a2a6b4cc89c9faa6726e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ddcb4f0f656c001fa8081b8e8a04151532c542e6
commit ddcb4f0f656c001fa8081b8e8a04151532c542e6
Merge: cf2cd52 b88c2ee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 09:17:53 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 18 09:17:53 2015 -0500

    Merge topic 'FindJNI-awt-arch' into next
    
    b88c2ee0 FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b88c2ee0924bdf3405bf1710a11c8999cc61c6e2
commit b88c2ee0924bdf3405bf1710a11c8999cc61c6e2
Author:     Tiago St?rmer Daitx <tdaitx at gmail.com>
AuthorDate: Wed Feb 18 04:09:41 2015 -0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 18 09:17:34 2015 -0500

    FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)
    
    JDK9's directory structure changes and no jdk/jre exists.  The arch
    lib path is now jdk/lib/<arch> (instead of jdk/jre/lib/<arch>).

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 3dcb0d0..d248fe1 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -114,6 +114,7 @@ if(_JAVA_HOME)
   JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
     ${_JAVA_HOME}/jre/lib/{libarch}
     ${_JAVA_HOME}/jre/lib
+    ${_JAVA_HOME}/lib/{libarch}
     ${_JAVA_HOME}/lib
     ${_JAVA_HOME}
     )

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 18 09:19:36 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 18 Feb 2015 09:19:36 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-407-ga5ab0a6
Message-ID: <20150218141936.4177EAADAE@public.kitware.com>

This is an automated email from 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  a5ab0a69a2a01df8a14a7dfaf060493f4fdb45db (commit)
       via  bce4e20f78bbaa708b621ff1feabcc975ac6345f (commit)
      from  ddcb4f0f656c001fa8081b8e8a04151532c542e6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5ab0a69a2a01df8a14a7dfaf060493f4fdb45db
commit a5ab0a69a2a01df8a14a7dfaf060493f4fdb45db
Merge: ddcb4f0 bce4e20
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 09:19:35 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 18 09:19:35 2015 -0500

    Merge topic 'FindJNI-awt-arch' into next
    
    bce4e20f FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bce4e20f78bbaa708b621ff1feabcc975ac6345f
commit bce4e20f78bbaa708b621ff1feabcc975ac6345f
Author:     Tiago St?rmer Daitx <tdaitx at gmail.com>
AuthorDate: Wed Feb 18 04:09:41 2015 -0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 18 09:19:17 2015 -0500

    FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)
    
    JDK9's directory structure changes and no jdk/jre exists.  The arch
    lib path is now jdk/lib/<arch> (instead of jdk/jre/lib/<arch>).

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 3dcb0d0..d248fe1 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -114,6 +114,7 @@ if(_JAVA_HOME)
   JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
     ${_JAVA_HOME}/jre/lib/{libarch}
     ${_JAVA_HOME}/jre/lib
+    ${_JAVA_HOME}/lib/{libarch}
     ${_JAVA_HOME}/lib
     ${_JAVA_HOME}
     )

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 18 09:30:20 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 18 Feb 2015 09:30:20 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-409-gf6651af
Message-ID: <20150218143020.26C03AB092@public.kitware.com>

This is an automated email from 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  f6651af5d1ea6ba9699a66183285528be2723ac6 (commit)
       via  7e6608fe646729f7f14eedb55bd26d97a36223f7 (commit)
      from  a5ab0a69a2a01df8a14a7dfaf060493f4fdb45db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6651af5d1ea6ba9699a66183285528be2723ac6
commit f6651af5d1ea6ba9699a66183285528be2723ac6
Merge: a5ab0a6 7e6608f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 09:30:19 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 18 09:30:19 2015 -0500

    Merge topic 'binary-release-no-OpenSSL-on-Win-or-OSX' into next
    
    7e6608fe Utilities/Release: Build OS X and Win binaries without OpenSSL


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e6608fe646729f7f14eedb55bd26d97a36223f7
commit 7e6608fe646729f7f14eedb55bd26d97a36223f7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 09:29:03 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 18 09:29:50 2015 -0500

    Utilities/Release: Build OS X and Win binaries without OpenSSL
    
    This will tell our curl to use the OS-native TLS/SSL APIs.

diff --git a/Utilities/Release/dash2win64_release.cmake b/Utilities/Release/dash2win64_release.cmake
index 345870b..2511db4 100644
--- a/Utilities/Release/dash2win64_release.cmake
+++ b/Utilities/Release/dash2win64_release.cmake
@@ -7,13 +7,8 @@ set(CPACK_BINARY_GENERATORS "NSIS ZIP")
 set(CPACK_SOURCE_GENERATORS "ZIP")
 set(MAKE_PROGRAM "make")
 set(MAKE "${MAKE_PROGRAM} -j8")
-if(CMAKE_CREATE_VERSION STREQUAL "nightly")
-  set(CMAKE_USE_OPENSSL OFF)
-else()
-  set(CMAKE_USE_OPENSSL ON)
-endif()
 set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release
-CMAKE_USE_OPENSSL:BOOL=${CMAKE_USE_OPENSSL}
+CMAKE_USE_OPENSSL:BOOL=OFF
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
 CMAKE_Fortran_COMPILER:FILEPATH=FALSE
 CMAKE_GENERATOR:INTERNAL=Unix Makefiles
diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake
index 910fcbd..bc95982 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -8,13 +8,8 @@ set(MAKE "${MAKE_PROGRAM} -j5")
 set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ")
 set(CPACK_SOURCE_GENERATORS "TGZ TZ")
 set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size
-if(CMAKE_CREATE_VERSION STREQUAL "nightly")
-  set(CMAKE_USE_OPENSSL OFF)
-else()
-  set(CMAKE_USE_OPENSSL ON)
-endif()
 set(INITIAL_CACHE "
-CMAKE_USE_OPENSSL:BOOL=${CMAKE_USE_OPENSSL}
+CMAKE_USE_OPENSSL:BOOL=OFF
 OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcrypto.a
 OPENSSL_INCLUDE_DIR:PATH=/Users/kitware/openssl-1.0.1g-install/include
 OPENSSL_SSL_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libssl.a

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

Summary of changes:
 Utilities/Release/dash2win64_release.cmake   |    7 +------
 Utilities/Release/dashmacmini5_release.cmake |    7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 18 10:55:55 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 18 Feb 2015 10:55:55 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-412-g11fb11a
Message-ID: <20150218155555.B5232AAF26@public.kitware.com>

This is an automated email from 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  11fb11ab1de4f238e89b7836a54b97a10291b4a1 (commit)
       via  7dea738b73f6427e8af0093b2e9b185a8d90ead6 (commit)
       via  4fb9e847c0c757ff6e1ee430bbb9fc2b6b4e2ae6 (commit)
      from  f6651af5d1ea6ba9699a66183285528be2723ac6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11fb11ab1de4f238e89b7836a54b97a10291b4a1
commit 11fb11ab1de4f238e89b7836a54b97a10291b4a1
Merge: f6651af 7dea738
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 10:55:53 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 18 10:55:53 2015 -0500

    Merge topic 'find-command-prefix-from-PATH' into next
    
    7dea738b Teach find_(library|file|path) to get prefixes from PATH (#15370)
    4fb9e847 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7dea738b73f6427e8af0093b2e9b185a8d90ead6
commit 7dea738b73f6427e8af0093b2e9b185a8d90ead6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 10:54:45 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 18 10:54:45 2015 -0500

    Teach find_(library|file|path) to get prefixes from PATH (#15370)

diff --git a/Help/command/FIND_XXX.txt b/Help/command/FIND_XXX.txt
index 5889e90..9358329 100644
--- a/Help/command/FIND_XXX.txt
+++ b/Help/command/FIND_XXX.txt
@@ -53,6 +53,10 @@ If NO_DEFAULT_PATH is not specified, the search process is as follows:
 .. |CMAKE_PREFIX_PATH_XXX_SUBDIR| replace::
    <prefix>/|XXX_SUBDIR| for each <prefix> in CMAKE_PREFIX_PATH
 
+.. |SYSTEM_ENVIRONMENT_PREFIX_PATH_XXX_SUBDIR| replace::
+   <prefix>/|XXX_SUBDIR| for each <prefix>/[s]bin in PATH, and
+   <entry>/|XXX_SUBDIR| for other entries in PATH
+
 .. |CMAKE_SYSTEM_PREFIX_PATH_XXX_SUBDIR| replace::
    <prefix>/|XXX_SUBDIR| for each <prefix> in CMAKE_SYSTEM_PREFIX_PATH
 
diff --git a/Help/command/find_file.rst b/Help/command/find_file.rst
index db7e151..be309a5 100644
--- a/Help/command/find_file.rst
+++ b/Help/command/find_file.rst
@@ -13,7 +13,10 @@ find_file
 .. |CMAKE_XXX_PATH| replace:: CMAKE_INCLUDE_PATH
 .. |CMAKE_XXX_MAC_PATH| replace:: CMAKE_FRAMEWORK_PATH
 
-.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: PATH and INCLUDE
+.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: Directories in INCLUDE,
+   <prefix>/include/<arch> if CMAKE_LIBRARY_ARCHITECTURE is set, and
+   |SYSTEM_ENVIRONMENT_PREFIX_PATH_XXX_SUBDIR|,
+   and the directories in PATH itself.
 
 .. |CMAKE_SYSTEM_PREFIX_PATH_XXX| replace::
    <prefix>/include/<arch> if CMAKE_LIBRARY_ARCHITECTURE is set, and
diff --git a/Help/command/find_library.rst b/Help/command/find_library.rst
index 91342ba..09df688 100644
--- a/Help/command/find_library.rst
+++ b/Help/command/find_library.rst
@@ -13,7 +13,10 @@ find_library
 .. |CMAKE_XXX_PATH| replace:: CMAKE_LIBRARY_PATH
 .. |CMAKE_XXX_MAC_PATH| replace:: CMAKE_FRAMEWORK_PATH
 
-.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: PATH and LIB
+.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: Directories in LIB,
+   <prefix>/lib/<arch> if CMAKE_LIBRARY_ARCHITECTURE is set, and
+   |SYSTEM_ENVIRONMENT_PREFIX_PATH_XXX_SUBDIR|,
+   and the directories in PATH itself.
 
 .. |CMAKE_SYSTEM_PREFIX_PATH_XXX| replace::
    <prefix>/lib/<arch> if CMAKE_LIBRARY_ARCHITECTURE is set, and
diff --git a/Help/command/find_path.rst b/Help/command/find_path.rst
index 95d49e7..b5a6e37 100644
--- a/Help/command/find_path.rst
+++ b/Help/command/find_path.rst
@@ -13,7 +13,10 @@ find_path
 .. |CMAKE_XXX_PATH| replace:: CMAKE_INCLUDE_PATH
 .. |CMAKE_XXX_MAC_PATH| replace:: CMAKE_FRAMEWORK_PATH
 
-.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: PATH and INCLUDE
+.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: Directories in INCLUDE,
+   <prefix>/include/<arch> if CMAKE_LIBRARY_ARCHITECTURE is set, and
+   |SYSTEM_ENVIRONMENT_PREFIX_PATH_XXX_SUBDIR|,
+   and the directories in PATH itself.
 
 .. |CMAKE_SYSTEM_PREFIX_PATH_XXX| replace::
    <prefix>/include/<arch> if CMAKE_LIBRARY_ARCHITECTURE is set, and
diff --git a/Help/release/dev/find-command-prefix-from-PATH.rst b/Help/release/dev/find-command-prefix-from-PATH.rst
new file mode 100644
index 0000000..f9aae2a
--- /dev/null
+++ b/Help/release/dev/find-command-prefix-from-PATH.rst
@@ -0,0 +1,6 @@
+find-command-prefix-from-PATH
+-----------------------------
+
+* The :command:`find_library`, :command:`find_path`, and :command:`find_file`
+  commands now search in installation prefixes derived from the ``PATH``
+  environment variable.
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 6e55533..4336e1c 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -275,6 +275,7 @@ void cmFindBase::FillSystemEnvironmentPath()
   if(!this->EnvironmentPath.empty())
     {
     paths.AddEnvPath(this->EnvironmentPath);
+    paths.AddEnvPrefixPath("PATH", true);
     }
   // Add PATH
   paths.AddEnvPath("PATH");
diff --git a/Source/cmSearchPath.cxx b/Source/cmSearchPath.cxx
index 861dbf1..1e777ab 100644
--- a/Source/cmSearchPath.cxx
+++ b/Source/cmSearchPath.cxx
@@ -136,10 +136,30 @@ void cmSearchPath::AddCMakePrefixPath(const std::string& variable)
 }
 
 //----------------------------------------------------------------------------
-void cmSearchPath::AddEnvPrefixPath(const std::string& variable)
+static std::string cmSearchPathStripBin(std::string const& s)
+{
+  // If the path is a PREFIX/bin case then add its parent instead.
+  if((cmHasLiteralSuffix(s, "/bin")) ||
+     (cmHasLiteralSuffix(s, "/sbin")))
+    {
+    return cmSystemTools::GetFilenamePath(s);
+    }
+  else
+    {
+    return s;
+    }
+}
+
+//----------------------------------------------------------------------------
+void cmSearchPath::AddEnvPrefixPath(const std::string& variable, bool stripBin)
 {
   std::vector<std::string> expanded;
   cmSystemTools::GetPath(expanded, variable.c_str());
+  if (stripBin)
+    {
+    std::transform(expanded.begin(), expanded.end(), expanded.begin(),
+                   cmSearchPathStripBin);
+    }
   this->AddPrefixPaths(expanded);
 }
 
diff --git a/Source/cmSearchPath.h b/Source/cmSearchPath.h
index 51a6149..41c680d 100644
--- a/Source/cmSearchPath.h
+++ b/Source/cmSearchPath.h
@@ -42,7 +42,7 @@ public:
   void AddCMakePath(const std::string& variable);
   void AddEnvPath(const std::string& variable);
   void AddCMakePrefixPath(const std::string& variable);
-  void AddEnvPrefixPath(const std::string& variable);
+  void AddEnvPrefixPath(const std::string& variable, bool stripBin = false);
   void AddSuffixes(const std::vector<std::string>& suffixes);
 
 protected:
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index f0426e5..fd01201 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -131,8 +131,10 @@ add_RunCMake_test(export)
 add_RunCMake_test(cmake_minimum_required)
 add_RunCMake_test(continue)
 add_RunCMake_test(file)
+add_RunCMake_test(find_file)
 add_RunCMake_test(find_library)
 add_RunCMake_test(find_package)
+add_RunCMake_test(find_path)
 add_RunCMake_test(get_filename_component)
 add_RunCMake_test(get_property)
 add_RunCMake_test(if)
diff --git a/Tests/RunCMake/find_file/CMakeLists.txt b/Tests/RunCMake/find_file/CMakeLists.txt
new file mode 100644
index 0000000..ef2163c
--- /dev/null
+++ b/Tests/RunCMake/find_file/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.1)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/find_file/PrefixInPATH-stdout.txt b/Tests/RunCMake/find_file/PrefixInPATH-stdout.txt
new file mode 100644
index 0000000..d73bc1d
--- /dev/null
+++ b/Tests/RunCMake/find_file/PrefixInPATH-stdout.txt
@@ -0,0 +1,4 @@
+-- PrefixInPATH_INCLUDE_DIR='PrefixInPATH_INCLUDE_DIR-NOTFOUND'
+-- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h'
+-- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h'
+-- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h'
diff --git a/Tests/RunCMake/find_file/PrefixInPATH.cmake b/Tests/RunCMake/find_file/PrefixInPATH.cmake
new file mode 100644
index 0000000..79106e9
--- /dev/null
+++ b/Tests/RunCMake/find_file/PrefixInPATH.cmake
@@ -0,0 +1,6 @@
+foreach(path "/does_not_exist" "" "/bin" "/sbin")
+  unset(PrefixInPATH_INCLUDE_DIR CACHE)
+  set(ENV{PATH} "${CMAKE_CURRENT_SOURCE_DIR}${path}")
+  find_file(PrefixInPATH_INCLUDE_DIR NAMES PrefixInPATH.h)
+  message(STATUS "PrefixInPATH_INCLUDE_DIR='${PrefixInPATH_INCLUDE_DIR}'")
+endforeach()
diff --git a/Tests/RunCMake/find_file/RunCMakeTest.cmake b/Tests/RunCMake/find_file/RunCMakeTest.cmake
new file mode 100644
index 0000000..014f397
--- /dev/null
+++ b/Tests/RunCMake/find_file/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(PrefixInPATH)
diff --git a/Tests/RunCMake/find_file/include/PrefixInPATH.h b/Tests/RunCMake/find_file/include/PrefixInPATH.h
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_library/PrefixInPATH-stdout.txt b/Tests/RunCMake/find_library/PrefixInPATH-stdout.txt
new file mode 100644
index 0000000..1ab884c
--- /dev/null
+++ b/Tests/RunCMake/find_library/PrefixInPATH-stdout.txt
@@ -0,0 +1,4 @@
+-- PrefixInPATH_LIBRARY='PrefixInPATH_LIBRARY-NOTFOUND'
+-- PrefixInPATH_LIBRARY='.*/Tests/RunCMake/find_library/lib/libPrefixInPATH.a'
+-- PrefixInPATH_LIBRARY='.*/Tests/RunCMake/find_library/lib/libPrefixInPATH.a'
+-- PrefixInPATH_LIBRARY='.*/Tests/RunCMake/find_library/lib/libPrefixInPATH.a'
diff --git a/Tests/RunCMake/find_library/PrefixInPATH.cmake b/Tests/RunCMake/find_library/PrefixInPATH.cmake
new file mode 100644
index 0000000..6e37359
--- /dev/null
+++ b/Tests/RunCMake/find_library/PrefixInPATH.cmake
@@ -0,0 +1,9 @@
+list(APPEND CMAKE_FIND_LIBRARY_PREFIXES lib)
+list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .a)
+
+foreach(path "/does_not_exist" "" "/bin" "/sbin")
+  unset(PrefixInPATH_LIBRARY CACHE)
+  set(ENV{PATH} "${CMAKE_CURRENT_SOURCE_DIR}${path}")
+  find_library(PrefixInPATH_LIBRARY NAMES PrefixInPATH)
+  message(STATUS "PrefixInPATH_LIBRARY='${PrefixInPATH_LIBRARY}'")
+endforeach()
diff --git a/Tests/RunCMake/find_library/RunCMakeTest.cmake b/Tests/RunCMake/find_library/RunCMakeTest.cmake
index 4000679..136031c 100644
--- a/Tests/RunCMake/find_library/RunCMakeTest.cmake
+++ b/Tests/RunCMake/find_library/RunCMakeTest.cmake
@@ -1,3 +1,4 @@
 include(RunCMake)
 
 run_cmake(Created)
+run_cmake(PrefixInPATH)
diff --git a/Tests/RunCMake/find_library/lib/libPrefixInPATH.a b/Tests/RunCMake/find_library/lib/libPrefixInPATH.a
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_path/CMakeLists.txt b/Tests/RunCMake/find_path/CMakeLists.txt
new file mode 100644
index 0000000..ef2163c
--- /dev/null
+++ b/Tests/RunCMake/find_path/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.1)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/find_path/PrefixInPATH-stdout.txt b/Tests/RunCMake/find_path/PrefixInPATH-stdout.txt
new file mode 100644
index 0000000..bb2ceb7
--- /dev/null
+++ b/Tests/RunCMake/find_path/PrefixInPATH-stdout.txt
@@ -0,0 +1,4 @@
+-- PrefixInPATH_INCLUDE_DIR='PrefixInPATH_INCLUDE_DIR-NOTFOUND'
+-- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_path/include'
+-- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_path/include'
+-- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_path/include'
diff --git a/Tests/RunCMake/find_path/PrefixInPATH.cmake b/Tests/RunCMake/find_path/PrefixInPATH.cmake
new file mode 100644
index 0000000..a321910
--- /dev/null
+++ b/Tests/RunCMake/find_path/PrefixInPATH.cmake
@@ -0,0 +1,6 @@
+foreach(path "/does_not_exist" "" "/bin" "/sbin")
+  unset(PrefixInPATH_INCLUDE_DIR CACHE)
+  set(ENV{PATH} "${CMAKE_CURRENT_SOURCE_DIR}${path}")
+  find_path(PrefixInPATH_INCLUDE_DIR NAMES PrefixInPATH.h)
+  message(STATUS "PrefixInPATH_INCLUDE_DIR='${PrefixInPATH_INCLUDE_DIR}'")
+endforeach()
diff --git a/Tests/RunCMake/find_path/RunCMakeTest.cmake b/Tests/RunCMake/find_path/RunCMakeTest.cmake
new file mode 100644
index 0000000..014f397
--- /dev/null
+++ b/Tests/RunCMake/find_path/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(PrefixInPATH)
diff --git a/Tests/RunCMake/find_path/include/PrefixInPATH.h b/Tests/RunCMake/find_path/include/PrefixInPATH.h
new file mode 100644
index 0000000..e69de29

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

Summary of changes:
 Help/command/FIND_XXX.txt                          |    4 ++++
 Help/command/find_file.rst                         |    5 ++++-
 Help/command/find_library.rst                      |    5 ++++-
 Help/command/find_path.rst                         |    5 ++++-
 Help/release/dev/find-command-prefix-from-PATH.rst |    6 ++++++
 Source/CMakeVersion.cmake                          |    2 +-
 Source/cmFindBase.cxx                              |    1 +
 Source/cmSearchPath.cxx                            |   22 +++++++++++++++++++-
 Source/cmSearchPath.h                              |    2 +-
 Tests/RunCMake/CMakeLists.txt                      |    2 ++
 .../RunCMake/{CMP0055 => find_file}/CMakeLists.txt |    0
 Tests/RunCMake/find_file/PrefixInPATH-stdout.txt   |    4 ++++
 Tests/RunCMake/find_file/PrefixInPATH.cmake        |    6 ++++++
 Tests/RunCMake/find_file/RunCMakeTest.cmake        |    3 +++
 .../RunCMake/find_file/include/PrefixInPATH.h      |    0
 .../RunCMake/find_library/PrefixInPATH-stdout.txt  |    4 ++++
 Tests/RunCMake/find_library/PrefixInPATH.cmake     |    9 ++++++++
 Tests/RunCMake/find_library/RunCMakeTest.cmake     |    1 +
 .../RunCMake/find_library/lib/libPrefixInPATH.a    |    0
 .../RunCMake/{CMP0055 => find_path}/CMakeLists.txt |    0
 Tests/RunCMake/find_path/PrefixInPATH-stdout.txt   |    4 ++++
 Tests/RunCMake/find_path/PrefixInPATH.cmake        |    6 ++++++
 Tests/RunCMake/find_path/RunCMakeTest.cmake        |    3 +++
 .../RunCMake/find_path/include/PrefixInPATH.h      |    0
 24 files changed, 88 insertions(+), 6 deletions(-)
 create mode 100644 Help/release/dev/find-command-prefix-from-PATH.rst
 copy Tests/RunCMake/{CMP0055 => find_file}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/find_file/PrefixInPATH-stdout.txt
 create mode 100644 Tests/RunCMake/find_file/PrefixInPATH.cmake
 create mode 100644 Tests/RunCMake/find_file/RunCMakeTest.cmake
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/find_file/include/PrefixInPATH.h (100%)
 create mode 100644 Tests/RunCMake/find_library/PrefixInPATH-stdout.txt
 create mode 100644 Tests/RunCMake/find_library/PrefixInPATH.cmake
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/find_library/lib/libPrefixInPATH.a (100%)
 copy Tests/RunCMake/{CMP0055 => find_path}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/find_path/PrefixInPATH-stdout.txt
 create mode 100644 Tests/RunCMake/find_path/PrefixInPATH.cmake
 create mode 100644 Tests/RunCMake/find_path/RunCMakeTest.cmake
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/find_path/include/PrefixInPATH.h (100%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 18 12:33:07 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 18 Feb 2015 12:33:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-414-g3d21e5a
Message-ID: <20150218173307.E01E7AB0B2@public.kitware.com>

This is an automated email from 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  3d21e5a7192f03d66bfc9962ec7b7017303daea2 (commit)
       via  d1cf09e3c2ded58d08288a42c0eb9038727c22c7 (commit)
      from  11fb11ab1de4f238e89b7836a54b97a10291b4a1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d21e5a7192f03d66bfc9962ec7b7017303daea2
commit 3d21e5a7192f03d66bfc9962ec7b7017303daea2
Merge: 11fb11a d1cf09e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 12:33:07 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 18 12:33:07 2015 -0500

    Merge topic 'CMakeParseImplicitLinkInfo-CMP0054' into next
    
    d1cf09e3 CMakeParseImplicitLinkInfo: Avoid if() auto-deref in quoted arg


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1cf09e3c2ded58d08288a42c0eb9038727c22c7
commit d1cf09e3c2ded58d08288a42c0eb9038727c22c7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 12:30:59 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 18 12:32:47 2015 -0500

    CMakeParseImplicitLinkInfo: Avoid if() auto-deref in quoted arg
    
    When matching implicit library names, use a sentinel "x" to avoid
    ever expanding the library name as a variable.  This was detected
    by a CMP0054 warning.

diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake b/Modules/CMakeParseImplicitLinkInfo.cmake
index fcc13da..8abc465 100644
--- a/Modules/CMakeParseImplicitLinkInfo.cmake
+++ b/Modules/CMakeParseImplicitLinkInfo.cmake
@@ -124,7 +124,7 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj
   # We remove items that are not language-specific.
   set(implicit_libs "")
   foreach(lib IN LISTS implicit_libs_tmp)
-    if("${lib}" MATCHES "^(crt.*\\.o|gcc.*|System.*)$")
+    if("x${lib}" MATCHES "^x(crt.*\\.o|gcc.*|System.*)$")
       set(log "${log}  remove lib [${lib}]\n")
     elseif(IS_ABSOLUTE "${lib}")
       get_filename_component(abs "${lib}" ABSOLUTE)

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 18 12:45:30 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 18 Feb 2015 12:45:30 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-416-g29a45d5
Message-ID: <20150218174530.B7459A810E@public.kitware.com>

This is an automated email from 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  29a45d5906f8c4d13414c659dc7f0b03eb3213b1 (commit)
       via  8f432479c6fcdf2e315a503c129a9a534c7a4c45 (commit)
      from  3d21e5a7192f03d66bfc9962ec7b7017303daea2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29a45d5906f8c4d13414c659dc7f0b03eb3213b1
commit 29a45d5906f8c4d13414c659dc7f0b03eb3213b1
Merge: 3d21e5a 8f43247
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 12:45:29 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 18 12:45:29 2015 -0500

    Merge topic 'compiler-version-Fortran' into next
    
    8f432479 fixup! Fortran: Add infrastructure to detect compiler version


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f432479c6fcdf2e315a503c129a9a534c7a4c45
commit 8f432479c6fcdf2e315a503c129a9a534c7a4c45
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 12:43:21 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 18 12:43:23 2015 -0500

    fixup! Fortran: Add infrastructure to detect compiler version
    
    The compiler may put all INFO strings together so we need to match
    each one explicitly.

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 9db38b7..d22a867 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -449,13 +449,15 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
         string(REGEX REPLACE "^0+([0-9])" "\\1" COMPILER_VERSION "${CMAKE_MATCH_1}")
         string(REGEX REPLACE "\\.0+([0-9])" ".\\1" COMPILER_VERSION "${COMPILER_VERSION}")
       endif()
-      if("${info}" MATCHES "INFO:compiler_version_([A-Z]+)_digit_([0-9])\\[([0-9])\\]")
-        set(comp ${CMAKE_MATCH_1})
-        set(digit ${CMAKE_MATCH_2})
-        set(value ${CMAKE_MATCH_3})
-        math(EXPR COMPILER_VERSION_${comp} "${COMPILER_VERSION_${comp}} + ${value} * ${DIGIT_VALUE_${digit}}")
-        set(HAVE_COMPILER_VERSION_${comp} 1)
-      endif()
+      foreach(comp MAJOR MINOR PATCH TWEAK)
+        foreach(digit 1 2 3 4 5 6 7 8 9)
+          if("${info}" MATCHES "INFO:compiler_version_${comp}_digit_${digit}\\[([0-9])\\]")
+            set(value ${CMAKE_MATCH_1})
+            math(EXPR COMPILER_VERSION_${comp} "${COMPILER_VERSION_${comp}} + ${value} * ${DIGIT_VALUE_${digit}}")
+            set(HAVE_COMPILER_VERSION_${comp} 1)
+          endif()
+        endforeach()
+      endforeach()
       if("${info}" MATCHES "INFO:simulate\\[([^]\"]*)\\]")
         set(SIMULATE_ID "${CMAKE_MATCH_1}")
       endif()

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

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 18 12:47:26 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 18 Feb 2015 12:47:26 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-418-g77031a5
Message-ID: <20150218174726.DA655A9301@public.kitware.com>

This is an automated email from 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  77031a5070d629430d60e2fd43d5f6fd5e1e00dc (commit)
       via  a0f17fbe9cc8c8d30d8c1a4df50c4af5fc4e63d1 (commit)
      from  29a45d5906f8c4d13414c659dc7f0b03eb3213b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77031a5070d629430d60e2fd43d5f6fd5e1e00dc
commit 77031a5070d629430d60e2fd43d5f6fd5e1e00dc
Merge: 29a45d5 a0f17fb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 12:47:26 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 18 12:47:26 2015 -0500

    Merge topic 'mingw-no-find_library-dll' into next
    
    a0f17fbe Windows-GNU: Do not tell find_library to treat '.dll' as linkable


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0f17fbe9cc8c8d30d8c1a4df50c4af5fc4e63d1
commit a0f17fbe9cc8c8d30d8c1a4df50c4af5fc4e63d1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 09:37:14 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 18 09:40:25 2015 -0500

    Windows-GNU: Do not tell find_library to treat '.dll' as linkable
    
    Modern software distributions always use a separate ".dll.a" or ".lib"
    import library for linking.

diff --git a/Help/release/dev/mingw-no-find_library-dll.rst b/Help/release/dev/mingw-no-find_library-dll.rst
new file mode 100644
index 0000000..1b0c19b
--- /dev/null
+++ b/Help/release/dev/mingw-no-find_library-dll.rst
@@ -0,0 +1,8 @@
+mingw-no-find_library-dll
+-------------------------
+
+* When building with GNU tools on Windows (MinGW tools), the
+  :command:`find_library` command will no longer consider
+  ``.dll`` files to be linkable libraries.  All dynamic link
+  libraries are expected to provide separate ``.dll.a`` or
+  ``.lib`` import libraries.
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index ffc5657..a7653cf 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -35,7 +35,7 @@ endif()
 
 if(MINGW)
   set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
-  set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib")
+  set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a" ".lib")
   set(CMAKE_C_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32")
   set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
 endif()

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

Summary of changes:
 Help/release/dev/mingw-no-find_library-dll.rst |    8 ++++++++
 Modules/Platform/Windows-GNU.cmake             |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/mingw-no-find_library-dll.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 18 12:49:32 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 18 Feb 2015 12:49:32 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-177-g93a38a2
Message-ID: <20150218174932.1D7F6A9E46@public.kitware.com>

This is an automated email from 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  93a38a2abccf9041fa86a7a6cf3439b1b0480ad1 (commit)
       via  6652afe66961bcbb5ff17dd7b8a3a91da62f2712 (commit)
       via  75661fdfd94fef4b8f1e8112aa75d76d1cc366e6 (commit)
       via  10e53e230811b94701d86e8c78e38df5abf69ee8 (commit)
       via  74906322585034968142e1d1663f604e2c97332c (commit)
       via  2acd04c96624ce530edcb0ca991bddad7f70023e (commit)
       via  2d833232a35715e412a40ee6207137ecfee7da36 (commit)
       via  26602cf56c4697a589f320809afa7a127268d09f (commit)
       via  cfb8483412761e567f64343ccc008b44150a901b (commit)
       via  6010f93632c8de9405bc97e40fc06f5949c09976 (commit)
       via  0550b9e330d75dfcb02257c998706759574cd9c0 (commit)
       via  1ee4721f7c7d0d889e00c0a2cdb799e71a4b5574 (commit)
       via  62429a1e54ec443edda35074bc66805d6e602f89 (commit)
       via  c697c1fafef16f00e4ec6a72d12eb3a43c01879a (commit)
      from  4fb9e847c0c757ff6e1ee430bbb9fc2b6b4e2ae6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93a38a2abccf9041fa86a7a6cf3439b1b0480ad1
commit 93a38a2abccf9041fa86a7a6cf3439b1b0480ad1
Merge: 4fb9e84 6652afe
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 12:49:29 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 18 12:49:29 2015 -0500

    Merge topic 'minor-cleanups'
    
    6652afe6 CTest: Use clear instead of erase-all.
    75661fdf cmListCommand: Move size variable out of loop.
    10e53e23 cmAlgorithms: Add missing const to functors.
    74906322 cmAlgorithms: Remove sort of already-sorted container.
    2acd04c9 cmcmd: Remove some comment copy-pasta.
    2d833232 cmCoreTryCompile: Remove variable assignment.
    26602cf5 cmLocalGenerator: Move variable population inside of condition.
    cfb84834 Update comment to match recent dashboard testing.
    6010f936 Revert "cmGlobalGenerator: Fix value type pushed into autogens vector"
    0550b9e3 Revert "Attempt to fix the compile of cmake on Sun CC."
    1ee4721f Help: Fix formatting of command parameter.
    62429a1e cmGlobalGenerator: Remove unneeded pointer check.
    c697c1fa cmTarget: Remove template argument workaround.


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

Summary of changes:
 Help/command/target_compile_definitions.rst |    2 +-
 Help/manual/cmake-developer.7.rst           |   28 ---------------------------
 Source/CMakeLists.txt                       |    2 +-
 Source/CTest/cmCTestBuildAndTestHandler.cxx |    3 +--
 Source/cmAlgorithms.h                       |    7 +++----
 Source/cmCoreTryCompile.cxx                 |    3 +--
 Source/cmGeneratorExpressionEvaluator.cxx   |    5 +----
 Source/cmGlobalGenerator.cxx                |    8 ++------
 Source/cmListCommand.cxx                    |   12 ++++++------
 Source/cmLocalGenerator.cxx                 |    7 +++----
 Source/cmTarget.cxx                         |   14 +++++---------
 Source/cmcmd.cxx                            |    4 ----
 12 files changed, 24 insertions(+), 71 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 18 12:49:45 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 18 Feb 2015 12:49:45 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-420-g5176fba
Message-ID: <20150218174945.B75DFA9E46@public.kitware.com>

This is an automated email from 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  5176fba24d5666f2c1bec468a41c416dbdd99167 (commit)
       via  93a38a2abccf9041fa86a7a6cf3439b1b0480ad1 (commit)
      from  77031a5070d629430d60e2fd43d5f6fd5e1e00dc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5176fba24d5666f2c1bec468a41c416dbdd99167
commit 5176fba24d5666f2c1bec468a41c416dbdd99167
Merge: 77031a5 93a38a2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 12:49:39 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 18 12:49:39 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Feb 18 18:24:45 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 18 Feb 2015 18:24:45 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-435-g08a867e
Message-ID: <20150218232445.1828AAAE92@public.kitware.com>

This is an automated email from 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  08a867e5cdb2832180539d57f2ec28e4b0a4faba (commit)
       via  301091557d3d93589075159d7a9d18d01c07b359 (commit)
       via  8c944e8263ded6f14af1d151f44eb9b48a84ac98 (commit)
       via  c8a451328e624c59afc4a9fd8fab06f274eff4a7 (commit)
       via  b7b4ffe7cb77397923fd56b78f994ae057dc74ff (commit)
       via  41488e6aa5161adbcf50597842d2dc43ae186792 (commit)
       via  0cf5953ef267c2713b41ce878343c9be643ced0a (commit)
       via  10c2ddfabf9168555c8b417d00daaa138df479f2 (commit)
       via  d0906b1677a518037193145f40288bb996ba188f (commit)
       via  f1dcc821fe84e59a37119fd204afde366e6984c0 (commit)
       via  8f3f372a9cff17d22e2ba0bd5fcf684e671d60e2 (commit)
       via  f20a4257f2889387fcbf540b29b16f10843f2f9e (commit)
       via  ee269f4f16300b0427c1e1baef94b85ccc4ea13f (commit)
       via  470cff497bc26d48ee05de0b260af2546bb7698c (commit)
       via  e6ca1b82744154fa048634abdc353e4118a11979 (commit)
      from  5176fba24d5666f2c1bec468a41c416dbdd99167 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08a867e5cdb2832180539d57f2ec28e4b0a4faba
commit 08a867e5cdb2832180539d57f2ec28e4b0a4faba
Merge: 5176fba 3010915
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 18:24:40 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 18 18:24:40 2015 -0500

    Merge topic 'use-algorithms' into next
    
    30109155 cmGlobalGenerator: Convert set insert algorithm to vector algorithms.
    8c944e82 Convert some raw loops to cmWrap.
    c8a45132 cmAlgorithms: Add cmWrap.
    b7b4ffe7 Use cmJoin where possible.
    41488e6a cmCacheManager: Replace loop with algorithm.
    0cf5953e cmGlobalGenerator: Replace loop with algorithm.
    10c2ddfa cmTarget: Port loop to algorithm.
    d0906b16 cmGlobalGenerator: Replace set::insert algorithm with cmRemoveDuplicates.
    f1dcc821 cmGeneratorTarget: Replace set insert algorithm with cmRemoveDuplicates.
    8f3f372a cmLocalGenerator: Convert loop to algorithm.
    f20a4257 cmMakefile: Add flag to result and manipulate in place.
    ee269f4f cmMakefile: Replace two loops with std::replace.
    470cff49 cmMakefile: Replace loop with composed algorithm.
    e6ca1b82 cmCTest: Convert loop to member insert.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=301091557d3d93589075159d7a9d18d01c07b359
commit 301091557d3d93589075159d7a9d18d01c07b359
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 23:29:18 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:23:26 2015 +0100

    cmGlobalGenerator: Convert set insert algorithm to vector algorithms.
    
    Adjust test for new error output.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index ac4489a..3baffd3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -3022,7 +3022,7 @@ void cmGlobalGenerator::AddEvaluationFile(const std::string &inputFile,
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::ProcessEvaluationFiles()
 {
-  std::set<std::string> generatedFiles;
+  std::vector<std::string> generatedFiles;
   for(std::vector<cmGeneratorExpressionEvaluationFile*>::const_iterator
       li = this->EvaluationFiles.begin();
       li != this->EvaluationFiles.end();
@@ -3034,16 +3034,24 @@ void cmGlobalGenerator::ProcessEvaluationFiles()
       return;
       }
     std::vector<std::string> files = (*li)->GetFiles();
-    for(std::vector<std::string>::const_iterator fi = files.begin();
-        fi != files.end(); ++fi)
+    std::sort(files.begin(), files.end());
+
+    std::vector<std::string> intersection;
+    std::set_intersection(files.begin(), files.end(),
+                          generatedFiles.begin(), generatedFiles.end(),
+                          std::back_inserter(intersection));
+    if (!intersection.empty())
       {
-      if (!generatedFiles.insert(*fi).second)
-        {
-        cmSystemTools::Error("File to be generated by multiple different "
-          "commands: ", fi->c_str());
-        return;
-        }
+      cmSystemTools::Error("Files to be generated by multiple different "
+        "commands: ", cmWrap("\"", intersection, "\"", " ").c_str());
+      return;
       }
+
+        generatedFiles.insert(generatedFiles.end(),
+                              files.begin(), files.end());
+    std::vector<std::string>::iterator newIt =
+        generatedFiles.end() - files.size();
+    std::inplace_merge(generatedFiles.begin(), newIt, generatedFiles.end());
     }
 }
 
diff --git a/Tests/RunCMake/File_Generate/CommandConflict-stderr.txt b/Tests/RunCMake/File_Generate/CommandConflict-stderr.txt
index da97ba4..4fa3f20 100644
--- a/Tests/RunCMake/File_Generate/CommandConflict-stderr.txt
+++ b/Tests/RunCMake/File_Generate/CommandConflict-stderr.txt
@@ -1 +1 @@
-CMake Error: File to be generated by multiple different commands: .*CommandConflict-build/output_.*.txt
+CMake Error: Files to be generated by multiple different commands: ".*CommandConflict-build/output_.*.txt"

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c944e8263ded6f14af1d151f44eb9b48a84ac98
commit 8c944e8263ded6f14af1d151f44eb9b48a84ac98
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 22:14:26 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:20:05 2015 +0100

    Convert some raw loops to cmWrap.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 8652690..be28b2f 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -705,10 +705,7 @@ void cmComputeLinkDepends::DisplayConstraintGraph()
     {
     EdgeList const& nl = this->EntryConstraintGraph[i];
     e << "item " << i << " is [" << this->EntryList[i].Item << "]\n";
-    for(EdgeList::const_iterator j = nl.begin(); j != nl.end(); ++j)
-      {
-      e << "  item " << *j << " must follow it\n";
-      }
+    e << cmWrap("  item ", nl, " must follow it", "\n") << "\n";
     }
   fprintf(stderr, "%s\n", e.str().c_str());
 }
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index bcd2d81..e9390e4 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -683,11 +683,9 @@ void cmCoreTryCompile::FindOutputFile(const std::string& targetName)
 
   std::ostringstream emsg;
   emsg << "Unable to find the executable at any of:\n";
-  for (unsigned int i = 0; i < searchDirs.size(); ++i)
-    {
-    emsg << "  " << this->BinaryDirectory << searchDirs[i]
-         << tmpOutputFile << "\n";
-    }
+  emsg << cmWrap("  " + this->BinaryDirectory,
+                 searchDirs,
+                 tmpOutputFile, "\n") << "\n";
   this->FindErrorMessage = emsg.str();
   return;
 }
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index fd3aa0b..6fe055a 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -355,11 +355,7 @@ void cmFindBase::PrintFindStuff()
   std::cerr << "SearchPathSuffixes  ";
   std::cerr << cmJoin(this->SearchPathSuffixes, "\n") << "\n";
   std::cerr << "SearchPaths\n";
-  for(std::vector<std::string>::const_iterator i = this->SearchPaths.begin();
-      i != this->SearchPaths.end(); ++i)
-    {
-    std::cerr << "[" << *i << "]\n";
-    }
+  std::cerr << cmWrap("[", this->SearchPaths, "]", "\n") << "\n";
 }
 
 bool cmFindBase::CheckForVariableInCache()
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index fd9b236..26bd4b9 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -329,10 +329,7 @@ bool cmFindPackageCommand
     {
     std::ostringstream e;
     e << "called with components that are both required and optional:\n";
-    for(unsigned int i=0; i<doubledComponents.size(); ++i)
-      {
-      e << "  " << doubledComponents[i] << "\n";
-      }
+    e << cmWrap("  ", doubledComponents, "", "\n") << "\n";
     this->SetError(e.str());
     return false;
     }
@@ -808,13 +805,8 @@ bool cmFindPackageCommand::HandlePackageMode()
           {
           e << "Could not find a package configuration file provided by \""
             << this->Name << "\"" << requestedVersionString
-            << " with any of the following names:\n";
-          for(std::vector<std::string>::const_iterator ci =
-                this->Configs.begin();
-              ci != this->Configs.end(); ++ci)
-            {
-            e << "  " << *ci << "\n";
-            }
+            << " with any of the following names:\n"
+            << cmWrap("  ", this->Configs, "", "\n") << "\n";
           }
 
         e << "Add the installation prefix of \"" << this->Name << "\" to "
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 6fd569e..813e97d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -213,13 +213,7 @@ cmMakefile::~cmMakefile()
 void cmMakefile::PrintStringVector(const char* s,
                                    const std::vector<std::string>& v) const
 {
-  std::cout << s << ": ( \n";
-  for(std::vector<std::string>::const_iterator i = v.begin();
-      i != v.end(); ++i)
-    {
-    std::cout << *i << " ";
-    }
-  std::cout << " )\n";
+  std::cout << s << ": ( \n" << cmWrap("\"", v, "\"", " ") << ")\n";
 }
 
 void cmMakefile
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index c913ea9..37f9a8f 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -213,27 +213,14 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
     // Echo string
     else if (args[1] == "echo" )
       {
-      unsigned int cc;
-      const char* space = "";
-      for ( cc = 2; cc < args.size(); cc ++ )
-        {
-        std::cout << space << args[cc];
-        space = " ";
-        }
-      std::cout << std::endl;
+      std::cout << cmJoin(cmRange(args).advance(2), " ") << std::endl;
       return 0;
       }
 
     // Echo string no new line
     else if (args[1] == "echo_append" )
       {
-      unsigned int cc;
-      const char* space = "";
-      for ( cc = 2; cc < args.size(); cc ++ )
-        {
-        std::cout << space << args[cc];
-        space = " ";
-        }
+      std::cout << cmJoin(cmRange(args).advance(2), " ");
       return 0;
       }
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8a451328e624c59afc4a9fd8fab06f274eff4a7
commit c8a451328e624c59afc4a9fd8fab06f274eff4a7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 23:50:36 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 18 23:58:00 2015 +0100

    cmAlgorithms: Add cmWrap.
    
    Port some existing cmJoin to use it.
    
    cmJoin is cumbersome to use in cases where the objective is to
    somehow 'quote' each item and then join it with a separator.  In that
    case, the joiner string is harder to read and reason about.  cmWrap
    aims to solve that.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 8491838..54dc14a 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -278,4 +278,15 @@ typename Range::const_iterator cmRemoveDuplicates(Range& r)
   return cmRemoveIndices(r, indices);
 }
 
+template<typename Range>
+std::string cmWrap(std::string prefix, Range const& r, std::string suffix,
+                   std::string sep)
+{
+   if (r.empty())
+     {
+     return std::string();
+     }
+  return prefix + cmJoin(r, (suffix + sep + prefix).c_str()) + suffix;
+}
+
 #endif
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index a7cfda7..391a965 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -724,12 +724,7 @@ cmLocalUnixMakefileGenerator3
     }
 
   // Write the list of commands.
-  for(std::vector<std::string>::const_iterator i = commands.begin();
-      i != commands.end(); ++i)
-    {
-    replace = *i;
-    os << "\t" << replace << "\n";
-    }
+  os << cmWrap("\t", commands, "", "\n") << "\n";
   if(symbolic && !this->WatcomWMake)
     {
     os << ".PHONY : " << cmMakeSafe(tgt) << "\n";
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index bf496e9..bc5be33 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -835,7 +835,7 @@ cmSystemTools::PrintSingleCommand(std::vector<std::string> const& command)
     return std::string();
     }
 
-  return "\"" + cmJoin(command, "\" \"") + "\"";
+  return cmWrap("\"", command, "\"", " ");
 }
 
 bool cmSystemTools::DoesFileExistWithExtensions(
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 81582f5..c913ea9 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -463,9 +463,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
         return 1;
         }
 
-      std::string command = "\"";
-      command += cmJoin(cmRange(args).advance(3), "\" \"");
-      command += "\"";
+      std::string command = cmWrap("\"", cmRange(args).advance(3), "\"", " ");
       int retval = 0;
       int timeout = 0;
       if ( cmSystemTools::RunSingleCommand(command.c_str(), 0, &retval,

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7b4ffe7cb77397923fd56b78f994ae057dc74ff
commit b7b4ffe7cb77397923fd56b78f994ae057dc74ff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 12 20:53:43 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 18 23:58:00 2015 +0100

    Use cmJoin where possible.

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 8e20c14..bcd2d81 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -260,14 +260,10 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
         err << "Unknown extension \"" << ext << "\" for file\n"
             << "  " << *si << "\n"
             << "try_compile() works only for enabled languages.  "
-            << "Currently these are:\n ";
+            << "Currently these are:\n  ";
         std::vector<std::string> langs;
         gg->GetEnabledLanguages(langs);
-        for(std::vector<std::string>::iterator l = langs.begin();
-            l != langs.end(); ++l)
-          {
-          err << " " << *l;
-          }
+        err << cmJoin(langs, " ");
         err << "\nSee project() command to enable other languages.";
         this->Makefile->IssueMessage(cmake::FATAL_ERROR, err.str());
         return -1;
@@ -373,12 +369,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
     // handle any compile flags we need to pass on
     if (!compileDefs.empty())
       {
-      fprintf(fout, "add_definitions( ");
-      for (size_t i = 0; i < compileDefs.size(); ++i)
-        {
-        fprintf(fout,"%s ",compileDefs[i].c_str());
-        }
-      fprintf(fout, ")\n");
+      fprintf(fout, "add_definitions(%s)\n", cmJoin(compileDefs, " ").c_str());
       }
 
     /* Use a random file name to avoid rapid creation and deletion
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 6e55533..fd3aa0b 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -350,19 +350,10 @@ void cmFindBase::PrintFindStuff()
   std::cerr << "NoCMakeSystemPath " << this->NoCMakeSystemPath << "\n";
   std::cerr << "EnvironmentPath " << this->EnvironmentPath << "\n";
   std::cerr << "CMakePathName " << this->CMakePathName << "\n";
-  std::cerr << "Names  ";
-  for(unsigned int i =0; i < this->Names.size(); ++i)
-    {
-    std::cerr << this->Names[i] << " ";
-    }
-  std::cerr << "\n";
+  std::cerr << "Names  " << cmJoin(this->Names, " ") << "\n";
   std::cerr << "\n";
   std::cerr << "SearchPathSuffixes  ";
-  for(unsigned int i =0; i < this->SearchPathSuffixes.size(); ++i)
-    {
-    std::cerr << this->SearchPathSuffixes[i] << "\n";
-    }
-  std::cerr << "\n";
+  std::cerr << cmJoin(this->SearchPathSuffixes, "\n") << "\n";
   std::cerr << "SearchPaths\n";
   for(std::vector<std::string>::const_iterator i = this->SearchPaths.begin();
       i != this->SearchPaths.end(); ++i)
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index c275e6b..a7cfda7 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1330,13 +1330,7 @@ cmLocalUnixMakefileGenerator3
                       this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
     fout << "\n"
          << "# Per-language clean rules from dependency scanning.\n"
-         << "foreach(lang";
-    for(std::set<std::string>::const_iterator l = languages.begin();
-        l != languages.end(); ++l)
-      {
-      fout << " " << *l;
-      }
-    fout << ")\n"
+         << "foreach(lang" << cmJoin(languages, " ") << ")\n"
          << "  include(" << this->GetTargetDirectory(target)
          << "/cmake_clean_${lang}.cmake OPTIONAL)\n"
          << "endforeach()\n";
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 6a7dc6e..81582f5 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -1329,12 +1329,7 @@ bool cmcmd::RunCommand(const char* comment,
   if(verbose)
     {
     std::cout << comment << ":\n";
-    for(std::vector<std::string>::iterator i = command.begin();
-        i != command.end(); ++i)
-      {
-      std::cout << *i << " ";
-      }
-    std::cout << "\n";
+    std::cout << cmJoin(command, " ") << "\n";
     }
   std::string output;
   int retCode =0;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41488e6aa5161adbcf50597842d2dc43ae186792
commit 41488e6aa5161adbcf50597842d2dc43ae186792
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 19:50:09 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 18 23:58:00 2015 +0100

    cmCacheManager: Replace loop with algorithm.

diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 45e92ce..0c77891 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -186,11 +186,7 @@ void cmCacheManager::CleanCMakeFiles(const std::string& path)
   cmsys::Glob globIt;
   globIt.FindFiles(glob);
   std::vector<std::string> files = globIt.GetFiles();
-  for(std::vector<std::string>::iterator i = files.begin();
-      i != files.end(); ++i)
-    {
-    cmSystemTools::RemoveFile(*i);
-    }
+  std::for_each(files.begin(), files.end(), cmSystemTools::RemoveFile);
 }
 
 bool cmCacheManager::LoadCache(const std::string& path,

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cf5953ef267c2713b41ce878343c9be643ced0a
commit 0cf5953ef267c2713b41ce878343c9be643ced0a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 12 22:29:11 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 18 23:58:00 2015 +0100

    cmGlobalGenerator: Replace loop with algorithm.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index c976c69..ac4489a 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2571,17 +2571,12 @@ bool cmGlobalGenerator::IsReservedTarget(std::string const& name)
     "test", "RUN_TESTS",
     "package", "PACKAGE",
     "package_source",
-    "ZERO_CHECK",
-    0
+    "ZERO_CHECK"
   };
 
-  for(const char** reservedTarget = reservedTargets;
-    *reservedTarget; ++reservedTarget)
-    {
-    if(name == *reservedTarget) return true;
-    }
-
-  return false;
+  return std::find(cmArrayBegin(reservedTargets),
+                   cmArrayEnd(reservedTargets), name)
+      != cmArrayEnd(reservedTargets);
 }
 
 void cmGlobalGenerator::SetExternalMakefileProjectGenerator(

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10c2ddfabf9168555c8b417d00daaa138df479f2
commit 10c2ddfabf9168555c8b417d00daaa138df479f2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 13:40:56 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 18 23:58:00 2015 +0100

    cmTarget: Port loop to algorithm.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 1ad0d48..7673554 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1542,12 +1542,8 @@ void cmTarget::DeleteDependencyForVS6( DependencyMap& depMap,
   if( map_itr != depMap.end() )
     {
     DependencyList& depList = map_itr->second;
-    DependencyList::iterator itr;
-    while( (itr = std::find(depList.begin(), depList.end(), dep)) !=
-           depList.end() )
-      {
-      depList.erase( itr );
-      }
+    depList.erase(std::remove(depList.begin(), depList.end(), dep),
+                  depList.end());
     }
 }
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0906b1677a518037193145f40288bb996ba188f
commit d0906b1677a518037193145f40288bb996ba188f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 22:45:01 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 18 23:58:00 2015 +0100

    cmGlobalGenerator: Replace set::insert algorithm with cmRemoveDuplicates.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 1de4a59..c976c69 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2937,14 +2937,11 @@ void cmGlobalGenerator::WriteSummary(cmTarget* target)
       {
       target->GetSourceFiles(sources, *ci);
       }
-    std::set<cmSourceFile*> emitted;
+    std::vector<cmSourceFile*>::const_iterator sourcesEnd
+        = cmRemoveDuplicates(sources);
     for(std::vector<cmSourceFile*>::const_iterator si = sources.begin();
-        si != sources.end(); ++si)
+        si != sourcesEnd; ++si)
       {
-      if (!emitted.insert(*si).second)
-        {
-        continue;
-        }
       Json::Value& lj_source = lj_sources.append(Json::objectValue);
       cmSourceFile* sf = *si;
       std::string const& sfp = sf->GetFullPath();

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1dcc821fe84e59a37119fd204afde366e6984c0
commit f1dcc821fe84e59a37119fd204afde366e6984c0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 21:58:07 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 18 23:58:00 2015 +0100

    cmGeneratorTarget: Replace set insert algorithm with cmRemoveDuplicates.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index a4f099b..44c9e9a 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -528,23 +528,22 @@ cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs,
   std::vector<cmSourceFile const*> objectFiles;
   this->GetExternalObjects(objectFiles, config);
   std::vector<cmTarget*> objectLibraries;
-  std::set<cmTarget*> emitted;
   for(std::vector<cmSourceFile const*>::const_iterator
       it = objectFiles.begin(); it != objectFiles.end(); ++it)
     {
     std::string objLib = (*it)->GetObjectLibrary();
     if (cmTarget* tgt = this->Makefile->FindTargetToUse(objLib))
       {
-      if (emitted.insert(tgt).second)
-        {
-        objectLibraries.push_back(tgt);
-        }
+      objectLibraries.push_back(tgt);
       }
     }
 
+  std::vector<cmTarget*>::const_iterator end
+      = cmRemoveDuplicates(objectLibraries);
+
   for(std::vector<cmTarget*>::const_iterator
         ti = objectLibraries.begin();
-      ti != objectLibraries.end(); ++ti)
+      ti != end; ++ti)
     {
     cmTarget* objLib = *ti;
     cmGeneratorTarget* ogt =

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f3f372a9cff17d22e2ba0bd5fcf684e671d60e2
commit 8f3f372a9cff17d22e2ba0bd5fcf684e671d60e2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 12 23:45:25 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 18 23:58:00 2015 +0100

    cmLocalGenerator: Convert loop to algorithm.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6a6135b..3ad3d64 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2801,11 +2801,7 @@ std::string cmLocalGenerator::ConvertToOutputFormat(const std::string& source,
     if(this->WindowsShell)
       {
       std::string::size_type pos = 0;
-      while((pos = result.find('/', pos)) != std::string::npos)
-        {
-        result[pos] = '\\';
-        pos++;
-        }
+      std::replace(result.begin(), result.end(), '/', '\\');
       }
     result = this->EscapeForShell(result, true, false, output == WATCOMQUOTE);
     }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f20a4257f2889387fcbf540b29b16f10843f2f9e
commit f20a4257f2889387fcbf540b29b16f10843f2f9e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 00:44:45 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 18 23:57:59 2015 +0100

    cmMakefile: Add flag to result and manipulate in place.
    
    Rather than creating a string, manipulating it, and then
    copying it to the result.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0d0c60a..6fd569e 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1340,11 +1340,11 @@ void cmMakefile::AddDefineFlag(const char* flag)
 void cmMakefile::AddDefineFlag(const char* flag, std::string& dflags)
 {
   // remove any \n\r
-  std::string ret = flag;
-  std::replace(ret.begin(), ret.end(), '\n', ' ');
-  std::replace(ret.begin(), ret.end(), '\r', ' ');
-  dflags += " ";
-  dflags += ret;
+  std::string::size_type initSize = dflags.size();
+  dflags += std::string(" ") + flag;
+  std::string::iterator flagStart = dflags.begin() + initSize + 1;
+  std::replace(flagStart, dflags.end(), '\n', ' ');
+  std::replace(flagStart, dflags.end(), '\r', ' ');
 }
 
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee269f4f16300b0427c1e1baef94b85ccc4ea13f
commit ee269f4f16300b0427c1e1baef94b85ccc4ea13f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 00:40:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 18 23:45:19 2015 +0100

    cmMakefile: Replace two loops with std::replace.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2085a97..0d0c60a 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1341,19 +1341,8 @@ void cmMakefile::AddDefineFlag(const char* flag, std::string& dflags)
 {
   // remove any \n\r
   std::string ret = flag;
-  std::string::size_type pos = 0;
-  while((pos = ret.find('\n', pos)) != std::string::npos)
-    {
-    ret[pos] = ' ';
-    pos++;
-    }
-  pos = 0;
-  while((pos = ret.find('\r', pos)) != std::string::npos)
-    {
-    ret[pos] = ' ';
-    pos++;
-    }
-
+  std::replace(ret.begin(), ret.end(), '\n', ' ');
+  std::replace(ret.begin(), ret.end(), '\r', ' ');
   dflags += " ";
   dflags += ret;
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=470cff497bc26d48ee05de0b260af2546bb7698c
commit 470cff497bc26d48ee05de0b260af2546bb7698c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 27 22:39:46 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 18 23:45:18 2015 +0100

    cmMakefile: Replace loop with composed algorithm.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ac5fec9..2085a97 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1472,18 +1472,11 @@ bool cmMakefile::ParseDefineFlag(std::string const& def, bool remove)
       cmSystemTools::ExpandListArgument(cdefs, defs);
 
       // Recompose the list without the definition.
-      std::string ndefs;
-      const char* sep = "";
-      for(std::vector<std::string>::const_iterator di = defs.begin();
-          di != defs.end(); ++di)
-        {
-        if(*di != define)
-          {
-          ndefs += sep;
-          sep = ";";
-          ndefs += *di;
-          }
-        }
+      std::vector<std::string>::const_iterator defEnd =
+          std::remove(defs.begin(), defs.end(), define);
+      std::vector<std::string>::const_iterator defBegin =
+          defs.begin();
+      std::string ndefs = cmJoin(cmRange(defBegin, defEnd), ";");
 
       // Store the new list.
       this->SetProperty("COMPILE_DEFINITIONS", ndefs.c_str());

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6ca1b82744154fa048634abdc353e4118a11979
commit e6ca1b82744154fa048634abdc353e4118a11979
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 12 20:47:53 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 18 21:36:35 2015 +0100

    cmCTest: Convert loop to member insert.

diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index f08b87c..69573ac 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -2256,10 +2256,9 @@ int cmCTest::Run(std::vector<std::string> &args, std::string* output)
   bool SRArgumentSpecified = false;
 
   // copy the command line
-  for(size_t i=0; i < args.size(); ++i)
-    {
-    this->InitialCommandLineArguments.push_back(args[i]);
-    }
+  this->InitialCommandLineArguments.insert(
+      this->InitialCommandLineArguments.end(),
+      args.begin(), args.end());
 
   // process the command line arguments
   for(size_t i=1; i < args.size(); ++i)

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

Summary of changes:
 Source/cmAlgorithms.h                              |   11 +++++
 Source/cmCTest.cxx                                 |    7 ++-
 Source/cmCacheManager.cxx                          |    6 +--
 Source/cmComputeLinkDepends.cxx                    |    5 +-
 Source/cmCoreTryCompile.cxx                        |   23 +++-------
 Source/cmFindBase.cxx                              |   19 ++------
 Source/cmFindPackageCommand.cxx                    |   14 ++----
 Source/cmGeneratorTarget.cxx                       |   11 ++---
 Source/cmGlobalGenerator.cxx                       |   48 ++++++++++----------
 Source/cmLocalGenerator.cxx                        |    6 +--
 Source/cmLocalUnixMakefileGenerator3.cxx           |   15 +-----
 Source/cmMakefile.cxx                              |   46 +++++--------------
 Source/cmSystemTools.cxx                           |    2 +-
 Source/cmTarget.cxx                                |    8 +---
 Source/cmcmd.cxx                                   |   28 ++----------
 .../File_Generate/CommandConflict-stderr.txt       |    2 +-
 16 files changed, 79 insertions(+), 172 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Feb 18 18:59:06 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 18 Feb 2015 18:59:06 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-445-g6cd2d27
Message-ID: <20150218235907.4F71BAAD00@public.kitware.com>

This is an automated email from 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  6cd2d2711b401c157d5c63d647a065bc97cca174 (commit)
       via  fa518feb6f9ebba7ed82c4e6d93574b8f6cc1b99 (commit)
       via  777e43700164b2e334a4e615d42cad0282eb7761 (commit)
       via  db6150b7f37ea92e772b80dbbfdd40993b74ea68 (commit)
       via  7aad0f5dc414c70a1bf3954e47ba985f746c0877 (commit)
       via  8d8cf44ba0bac59ebe210dfd9d20df970795d410 (commit)
       via  0c1550496eb9a3a2194d97a38947652e42ae1dde (commit)
       via  20168c6965660704a736c112f859fd982ae96fc8 (commit)
       via  6ef78aa78a51b1a1678f251bd14818acbba004d4 (commit)
       via  925a00bb7f61f375432cc4b271cb71e7c53cd810 (commit)
      from  08a867e5cdb2832180539d57f2ec28e4b0a4faba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cd2d2711b401c157d5c63d647a065bc97cca174
commit 6cd2d2711b401c157d5c63d647a065bc97cca174
Merge: 08a867e fa518fe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 18:59:04 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 18 18:59:04 2015 -0500

    Merge topic 'use-algorithms' into next
    
    fa518feb Remove unused.
    777e4370 Replace loops with algorithms.
    db6150b7 cmAlgorithms: Add cmReverseRange adaptor.
    7aad0f5d cmAlgorithms: Add cmFindNot algorithm.
    8d8cf44b cmRST: Replace two erase with a rotate and larger erase.
    0c155049 cmAlgorithms: Update concept requirement to FowardIterator
    20168c69 cmAlgorithms: Move cmRotate out of 'implementation detail' namespace.
    6ef78aa7 cmRST: Move two algorithms beside each other.
    925a00bb cmRST: Use std::min where appropriate.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa518feb6f9ebba7ed82c4e6d93574b8f6cc1b99
commit fa518feb6f9ebba7ed82c4e6d93574b8f6cc1b99
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 19 00:57:31 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:58:40 2015 +0100

    Remove unused.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 3ad3d64..2accf47 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2800,7 +2800,6 @@ std::string cmLocalGenerator::ConvertToOutputFormat(const std::string& source,
       }
     if(this->WindowsShell)
       {
-      std::string::size_type pos = 0;
       std::replace(result.begin(), result.end(), '/', '\\');
       }
     result = this->EscapeForShell(result, true, false, output == WATCOMQUOTE);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=777e43700164b2e334a4e615d42cad0282eb7761
commit 777e43700164b2e334a4e615d42cad0282eb7761
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 2 02:13:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:55:51 2015 +0100

    Replace loops with algorithms.

diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index 480da0d..b7330ce 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -484,19 +484,13 @@ void cmRST::UnindentLines(std::vector<std::string>& lines)
       }
     }
 
-  // Drop leading blank lines.
-  size_t leadingEmpty = 0;
-  for(size_t i = 0; i < lines.size() && lines[i].empty(); ++i)
-    {
-    ++leadingEmpty;
-    }
+  std::vector<std::string>::const_iterator it = lines.begin();
+  size_t leadingEmpty = std::distance(it, cmFindNot(lines, std::string()));
+
+  std::vector<std::string>::const_reverse_iterator rit = lines.rbegin();
+  size_t trailingEmpty = std::distance(rit,
+                            cmFindNot(cmReverseRange(lines), std::string()));
 
-  // Drop trailing blank lines.
-  size_t trailingEmpty = 0;
-  for(size_t i = lines.size(); i > 0 && lines[i-1].empty(); --i)
-    {
-    ++trailingEmpty;
-    }
   lines.erase(cmRotate(lines.begin(),
               lines.begin() + leadingEmpty,
               lines.end() - trailingEmpty), lines.end());

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db6150b7f37ea92e772b80dbbfdd40993b74ea68
commit db6150b7f37ea92e772b80dbbfdd40993b74ea68
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 22:04:25 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:55:51 2015 +0100

    cmAlgorithms: Add cmReverseRange adaptor.
    
    Use it to implement list(REVERSE).

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 9721e3e..05cdfeb 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -297,4 +297,12 @@ typename Range::const_iterator cmFindNot(Range const& r, T const& t)
                       std::bind1st(std::not_equal_to<T>(), t));
 }
 
+template<typename Range>
+ContainerAlgorithms::Range<typename Range::const_reverse_iterator>
+cmReverseRange(Range const& range)
+{
+  return ContainerAlgorithms::Range<typename Range::const_reverse_iterator>(
+      range.rbegin(), range.rend());
+}
+
 #endif
diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 0c6adfd..17617aa 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -390,8 +390,7 @@ bool cmListCommand
     return false;
     }
 
-  std::reverse(varArgsExpanded.begin(), varArgsExpanded.end());
-  std::string value = cmJoin(varArgsExpanded, ";");
+  std::string value = cmJoin(cmReverseRange(varArgsExpanded), ";");
 
   this->Makefile->AddDefinition(listName, value.c_str());
   return true;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7aad0f5dc414c70a1bf3954e47ba985f746c0877
commit 7aad0f5dc414c70a1bf3954e47ba985f746c0877
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 23:53:41 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:36:34 2015 +0100

    cmAlgorithms: Add cmFindNot algorithm.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 6f8711f..9721e3e 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -289,4 +289,12 @@ std::string cmWrap(std::string prefix, Range const& r, std::string suffix,
   return prefix + cmJoin(r, (suffix + sep + prefix).c_str()) + suffix;
 }
 
+
+template<typename Range, typename T>
+typename Range::const_iterator cmFindNot(Range const& r, T const& t)
+{
+  return std::find_if(r.begin(), r.end(),
+                      std::bind1st(std::not_equal_to<T>(), t));
+}
+
 #endif

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d8cf44ba0bac59ebe210dfd9d20df970795d410
commit 8d8cf44ba0bac59ebe210dfd9d20df970795d410
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 30 00:03:24 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:36:33 2015 +0100

    cmRST: Replace two erase with a rotate and larger erase.

diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index 14e8ad9..480da0d 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -497,6 +497,7 @@ void cmRST::UnindentLines(std::vector<std::string>& lines)
     {
     ++trailingEmpty;
     }
-  lines.erase(lines.begin(), lines.begin()+leadingEmpty);
-  lines.erase(lines.end()-trailingEmpty, lines.end());
+  lines.erase(cmRotate(lines.begin(),
+              lines.begin() + leadingEmpty,
+              lines.end() - trailingEmpty), lines.end());
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c1550496eb9a3a2194d97a38947652e42ae1dde
commit 0c1550496eb9a3a2194d97a38947652e42ae1dde
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 21:59:26 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:36:33 2015 +0100

    cmAlgorithms: Update concept requirement to FowardIterator

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index f480b86..6f8711f 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -81,14 +81,14 @@ private:
   const std::string m_test;
 };
 
-template<typename BiDirIt>
-BiDirIt cmRotate(BiDirIt first, BiDirIt middle, BiDirIt last)
+template<typename FwdIt>
+FwdIt cmRotate(FwdIt first, FwdIt middle, FwdIt last)
 {
-  typename std::iterator_traits<BiDirIt>::difference_type dist =
-      std::distance(first, middle);
+  typename std::iterator_traits<FwdIt>::difference_type dist =
+      std::distance(middle, last);
   std::rotate(first, middle, last);
-  std::advance(last, -dist);
-  return last;
+  std::advance(first, dist);
+  return first;
 }
 
 namespace ContainerAlgorithms {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20168c6965660704a736c112f859fd982ae96fc8
commit 20168c6965660704a736c112f859fd982ae96fc8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 23:39:38 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:36:33 2015 +0100

    cmAlgorithms: Move cmRotate out of 'implementation detail' namespace.
    
    This should be generally usable in cmake.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 54dc14a..f480b86 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -81,6 +81,16 @@ private:
   const std::string m_test;
 };
 
+template<typename BiDirIt>
+BiDirIt cmRotate(BiDirIt first, BiDirIt middle, BiDirIt last)
+{
+  typename std::iterator_traits<BiDirIt>::difference_type dist =
+      std::distance(first, middle);
+  std::rotate(first, middle, last);
+  std::advance(last, -dist);
+  return last;
+}
+
 namespace ContainerAlgorithms {
 
 template<typename T>
@@ -138,20 +148,10 @@ private:
   const_iterator End;
 };
 
-template<typename BiDirIt>
-BiDirIt Rotate(BiDirIt first, BiDirIt middle, BiDirIt last)
-{
-  typename std::iterator_traits<BiDirIt>::difference_type dist =
-      std::distance(first, middle);
-  std::rotate(first, middle, last);
-  std::advance(last, -dist);
-  return last;
-}
-
 template<typename Iter>
 Iter RemoveN(Iter i1, Iter i2, size_t n)
 {
-  return ContainerAlgorithms::Rotate(i1, i1 + n, i2);
+  return cmRotate(i1, i1 + n, i2);
 }
 
 template<typename Range>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ef78aa78a51b1a1678f251bd14818acbba004d4
commit 6ef78aa78a51b1a1678f251bd14818acbba004d4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 30 00:01:06 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:36:33 2015 +0100

    cmRST: Move two algorithms beside each other.

diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index da72ab7..14e8ad9 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -490,7 +490,6 @@ void cmRST::UnindentLines(std::vector<std::string>& lines)
     {
     ++leadingEmpty;
     }
-  lines.erase(lines.begin(), lines.begin()+leadingEmpty);
 
   // Drop trailing blank lines.
   size_t trailingEmpty = 0;
@@ -498,5 +497,6 @@ void cmRST::UnindentLines(std::vector<std::string>& lines)
     {
     ++trailingEmpty;
     }
+  lines.erase(lines.begin(), lines.begin()+leadingEmpty);
   lines.erase(lines.end()-trailingEmpty, lines.end());
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=925a00bb7f61f375432cc4b271cb71e7c53cd810
commit 925a00bb7f61f375432cc4b271cb71e7c53cd810
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 23:43:55 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:36:33 2015 +0100

    cmRST: Use std::min where appropriate.

diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index d20d999..da72ab7 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -463,10 +463,7 @@ void cmRST::UnindentLines(std::vector<std::string>& lines)
       }
 
     // Truncate indentation to match that on this line.
-    if(line.size() < indentEnd)
-      {
-      indentEnd = line.size();
-      }
+    indentEnd = std::min(indentEnd, line.size());
     for(std::string::size_type j = 0; j != indentEnd; ++j)
       {
       if(line[j] != indentText[j])

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

Summary of changes:
 Source/cmAlgorithms.h       |   38 +++++++++++++++++++++++++++-----------
 Source/cmListCommand.cxx    |    3 +--
 Source/cmLocalGenerator.cxx |    1 -
 Source/cmRST.cxx            |   28 ++++++++++------------------
 4 files changed, 38 insertions(+), 32 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Feb 18 18:59:44 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 18 Feb 2015 18:59:44 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-464-g3b31afe
Message-ID: <20150218235946.5ECD5AADC2@public.kitware.com>

This is an automated email from 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  3b31afe292561dbc67b42c855c2921a6b24284f5 (commit)
       via  f9bcc78f4d7d9eb3c47c2c83c72c1e85e6019382 (commit)
       via  e929515d7ce73f08b9dc72e3db7e8554344343b9 (commit)
       via  f57c9fec2b78acba11cb8716a2ca9681fb5b4b98 (commit)
       via  398806c2cc5241589133a8767b046fe7a7cb36e6 (commit)
       via  b3482e3e886170e45f465523afb2cf8866def7b1 (commit)
       via  617d1996a0671cd37d7a3bfbc6567dc606ff743b (commit)
       via  65b0042e1d79f3486db07e973f41f165a676ee81 (commit)
       via  e1dc07e182b0cb15b20394c79f37794e6df99e62 (commit)
       via  2c6bff053f294d31b4f1edb80e428f4c8ec3d572 (commit)
       via  8ad705f14040ae252b938830aeeb9124ebc5af72 (commit)
       via  7703057d02ac901c018fc1bc62b985bd3399f5b4 (commit)
       via  cc2345200e5c5f7910486f9350a3fcc724910afa (commit)
       via  155f2a3477fc675e3a2f501633006cbbff550768 (commit)
       via  86c09fe543002e0d89842f89e22a44127da7ee55 (commit)
       via  77d69c5cb6e758d6e7a6ada2f2c9f435e15010bb (commit)
       via  9c225767873ce64a745e865c6f1c3372a8ab45d9 (commit)
       via  ee5bc006ebee898729b81237719106704a2bb38a (commit)
       via  b3a0c6e08f36efc5f3cd4c1a0d9614a789f91e38 (commit)
      from  6cd2d2711b401c157d5c63d647a065bc97cca174 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b31afe292561dbc67b42c855c2921a6b24284f5
commit 3b31afe292561dbc67b42c855c2921a6b24284f5
Merge: 6cd2d27 f9bcc78
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 18:59:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 18 18:59:42 2015 -0500

    Merge topic 'use-algorithms' into next
    
    f9bcc78f Replace loops with algorithms.
    e929515d cmAlgorithms: Add cmReverseRange adaptor.
    f57c9fec cmAlgorithms: Add cmFindNot algorithm.
    398806c2 cmRST: Replace two erase with a rotate and larger erase.
    b3482e3e cmAlgorithms: Update concept requirement to FowardIterator
    617d1996 cmAlgorithms: Move cmRotate out of 'implementation detail' namespace.
    65b0042e cmRST: Move two algorithms beside each other.
    e1dc07e1 cmRST: Use std::min where appropriate.
    2c6bff05 cmGlobalGenerator: Convert set insert algorithm to vector algorithms.
    8ad705f1 Convert some raw loops to cmWrap.
    7703057d cmAlgorithms: Add cmWrap.
    cc234520 Use cmJoin where possible.
    155f2a34 cmCacheManager: Replace loop with algorithm.
    86c09fe5 cmGlobalGenerator: Replace loop with algorithm.
    77d69c5c cmTarget: Port loop to algorithm.
    9c225767 cmGlobalGenerator: Replace set::insert algorithm with cmRemoveDuplicates.
    ...


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9bcc78f4d7d9eb3c47c2c83c72c1e85e6019382
commit f9bcc78f4d7d9eb3c47c2c83c72c1e85e6019382
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 2 02:13:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:21 2015 +0100

    Replace loops with algorithms.

diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index 480da0d..b7330ce 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -484,19 +484,13 @@ void cmRST::UnindentLines(std::vector<std::string>& lines)
       }
     }
 
-  // Drop leading blank lines.
-  size_t leadingEmpty = 0;
-  for(size_t i = 0; i < lines.size() && lines[i].empty(); ++i)
-    {
-    ++leadingEmpty;
-    }
+  std::vector<std::string>::const_iterator it = lines.begin();
+  size_t leadingEmpty = std::distance(it, cmFindNot(lines, std::string()));
+
+  std::vector<std::string>::const_reverse_iterator rit = lines.rbegin();
+  size_t trailingEmpty = std::distance(rit,
+                            cmFindNot(cmReverseRange(lines), std::string()));
 
-  // Drop trailing blank lines.
-  size_t trailingEmpty = 0;
-  for(size_t i = lines.size(); i > 0 && lines[i-1].empty(); --i)
-    {
-    ++trailingEmpty;
-    }
   lines.erase(cmRotate(lines.begin(),
               lines.begin() + leadingEmpty,
               lines.end() - trailingEmpty), lines.end());

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e929515d7ce73f08b9dc72e3db7e8554344343b9
commit e929515d7ce73f08b9dc72e3db7e8554344343b9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 22:04:25 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:21 2015 +0100

    cmAlgorithms: Add cmReverseRange adaptor.
    
    Use it to implement list(REVERSE).

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 9721e3e..05cdfeb 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -297,4 +297,12 @@ typename Range::const_iterator cmFindNot(Range const& r, T const& t)
                       std::bind1st(std::not_equal_to<T>(), t));
 }
 
+template<typename Range>
+ContainerAlgorithms::Range<typename Range::const_reverse_iterator>
+cmReverseRange(Range const& range)
+{
+  return ContainerAlgorithms::Range<typename Range::const_reverse_iterator>(
+      range.rbegin(), range.rend());
+}
+
 #endif
diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 0c6adfd..17617aa 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -390,8 +390,7 @@ bool cmListCommand
     return false;
     }
 
-  std::reverse(varArgsExpanded.begin(), varArgsExpanded.end());
-  std::string value = cmJoin(varArgsExpanded, ";");
+  std::string value = cmJoin(cmReverseRange(varArgsExpanded), ";");
 
   this->Makefile->AddDefinition(listName, value.c_str());
   return true;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f57c9fec2b78acba11cb8716a2ca9681fb5b4b98
commit f57c9fec2b78acba11cb8716a2ca9681fb5b4b98
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 23:53:41 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:21 2015 +0100

    cmAlgorithms: Add cmFindNot algorithm.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 6f8711f..9721e3e 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -289,4 +289,12 @@ std::string cmWrap(std::string prefix, Range const& r, std::string suffix,
   return prefix + cmJoin(r, (suffix + sep + prefix).c_str()) + suffix;
 }
 
+
+template<typename Range, typename T>
+typename Range::const_iterator cmFindNot(Range const& r, T const& t)
+{
+  return std::find_if(r.begin(), r.end(),
+                      std::bind1st(std::not_equal_to<T>(), t));
+}
+
 #endif

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=398806c2cc5241589133a8767b046fe7a7cb36e6
commit 398806c2cc5241589133a8767b046fe7a7cb36e6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 30 00:03:24 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:21 2015 +0100

    cmRST: Replace two erase with a rotate and larger erase.

diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index 14e8ad9..480da0d 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -497,6 +497,7 @@ void cmRST::UnindentLines(std::vector<std::string>& lines)
     {
     ++trailingEmpty;
     }
-  lines.erase(lines.begin(), lines.begin()+leadingEmpty);
-  lines.erase(lines.end()-trailingEmpty, lines.end());
+  lines.erase(cmRotate(lines.begin(),
+              lines.begin() + leadingEmpty,
+              lines.end() - trailingEmpty), lines.end());
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3482e3e886170e45f465523afb2cf8866def7b1
commit b3482e3e886170e45f465523afb2cf8866def7b1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 21:59:26 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:21 2015 +0100

    cmAlgorithms: Update concept requirement to FowardIterator

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index f480b86..6f8711f 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -81,14 +81,14 @@ private:
   const std::string m_test;
 };
 
-template<typename BiDirIt>
-BiDirIt cmRotate(BiDirIt first, BiDirIt middle, BiDirIt last)
+template<typename FwdIt>
+FwdIt cmRotate(FwdIt first, FwdIt middle, FwdIt last)
 {
-  typename std::iterator_traits<BiDirIt>::difference_type dist =
-      std::distance(first, middle);
+  typename std::iterator_traits<FwdIt>::difference_type dist =
+      std::distance(middle, last);
   std::rotate(first, middle, last);
-  std::advance(last, -dist);
-  return last;
+  std::advance(first, dist);
+  return first;
 }
 
 namespace ContainerAlgorithms {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=617d1996a0671cd37d7a3bfbc6567dc606ff743b
commit 617d1996a0671cd37d7a3bfbc6567dc606ff743b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 23:39:38 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:21 2015 +0100

    cmAlgorithms: Move cmRotate out of 'implementation detail' namespace.
    
    This should be generally usable in cmake.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 54dc14a..f480b86 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -81,6 +81,16 @@ private:
   const std::string m_test;
 };
 
+template<typename BiDirIt>
+BiDirIt cmRotate(BiDirIt first, BiDirIt middle, BiDirIt last)
+{
+  typename std::iterator_traits<BiDirIt>::difference_type dist =
+      std::distance(first, middle);
+  std::rotate(first, middle, last);
+  std::advance(last, -dist);
+  return last;
+}
+
 namespace ContainerAlgorithms {
 
 template<typename T>
@@ -138,20 +148,10 @@ private:
   const_iterator End;
 };
 
-template<typename BiDirIt>
-BiDirIt Rotate(BiDirIt first, BiDirIt middle, BiDirIt last)
-{
-  typename std::iterator_traits<BiDirIt>::difference_type dist =
-      std::distance(first, middle);
-  std::rotate(first, middle, last);
-  std::advance(last, -dist);
-  return last;
-}
-
 template<typename Iter>
 Iter RemoveN(Iter i1, Iter i2, size_t n)
 {
-  return ContainerAlgorithms::Rotate(i1, i1 + n, i2);
+  return cmRotate(i1, i1 + n, i2);
 }
 
 template<typename Range>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65b0042e1d79f3486db07e973f41f165a676ee81
commit 65b0042e1d79f3486db07e973f41f165a676ee81
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 30 00:01:06 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:20 2015 +0100

    cmRST: Move two algorithms beside each other.

diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index da72ab7..14e8ad9 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -490,7 +490,6 @@ void cmRST::UnindentLines(std::vector<std::string>& lines)
     {
     ++leadingEmpty;
     }
-  lines.erase(lines.begin(), lines.begin()+leadingEmpty);
 
   // Drop trailing blank lines.
   size_t trailingEmpty = 0;
@@ -498,5 +497,6 @@ void cmRST::UnindentLines(std::vector<std::string>& lines)
     {
     ++trailingEmpty;
     }
+  lines.erase(lines.begin(), lines.begin()+leadingEmpty);
   lines.erase(lines.end()-trailingEmpty, lines.end());
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1dc07e182b0cb15b20394c79f37794e6df99e62
commit e1dc07e182b0cb15b20394c79f37794e6df99e62
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 23:43:55 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:20 2015 +0100

    cmRST: Use std::min where appropriate.

diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index d20d999..da72ab7 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -463,10 +463,7 @@ void cmRST::UnindentLines(std::vector<std::string>& lines)
       }
 
     // Truncate indentation to match that on this line.
-    if(line.size() < indentEnd)
-      {
-      indentEnd = line.size();
-      }
+    indentEnd = std::min(indentEnd, line.size());
     for(std::string::size_type j = 0; j != indentEnd; ++j)
       {
       if(line[j] != indentText[j])

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c6bff053f294d31b4f1edb80e428f4c8ec3d572
commit 2c6bff053f294d31b4f1edb80e428f4c8ec3d572
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 23:29:18 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:20 2015 +0100

    cmGlobalGenerator: Convert set insert algorithm to vector algorithms.
    
    Adjust test for new error output.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index ac4489a..3baffd3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -3022,7 +3022,7 @@ void cmGlobalGenerator::AddEvaluationFile(const std::string &inputFile,
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::ProcessEvaluationFiles()
 {
-  std::set<std::string> generatedFiles;
+  std::vector<std::string> generatedFiles;
   for(std::vector<cmGeneratorExpressionEvaluationFile*>::const_iterator
       li = this->EvaluationFiles.begin();
       li != this->EvaluationFiles.end();
@@ -3034,16 +3034,24 @@ void cmGlobalGenerator::ProcessEvaluationFiles()
       return;
       }
     std::vector<std::string> files = (*li)->GetFiles();
-    for(std::vector<std::string>::const_iterator fi = files.begin();
-        fi != files.end(); ++fi)
+    std::sort(files.begin(), files.end());
+
+    std::vector<std::string> intersection;
+    std::set_intersection(files.begin(), files.end(),
+                          generatedFiles.begin(), generatedFiles.end(),
+                          std::back_inserter(intersection));
+    if (!intersection.empty())
       {
-      if (!generatedFiles.insert(*fi).second)
-        {
-        cmSystemTools::Error("File to be generated by multiple different "
-          "commands: ", fi->c_str());
-        return;
-        }
+      cmSystemTools::Error("Files to be generated by multiple different "
+        "commands: ", cmWrap("\"", intersection, "\"", " ").c_str());
+      return;
       }
+
+        generatedFiles.insert(generatedFiles.end(),
+                              files.begin(), files.end());
+    std::vector<std::string>::iterator newIt =
+        generatedFiles.end() - files.size();
+    std::inplace_merge(generatedFiles.begin(), newIt, generatedFiles.end());
     }
 }
 
diff --git a/Tests/RunCMake/File_Generate/CommandConflict-stderr.txt b/Tests/RunCMake/File_Generate/CommandConflict-stderr.txt
index da97ba4..4fa3f20 100644
--- a/Tests/RunCMake/File_Generate/CommandConflict-stderr.txt
+++ b/Tests/RunCMake/File_Generate/CommandConflict-stderr.txt
@@ -1 +1 @@
-CMake Error: File to be generated by multiple different commands: .*CommandConflict-build/output_.*.txt
+CMake Error: Files to be generated by multiple different commands: ".*CommandConflict-build/output_.*.txt"

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ad705f14040ae252b938830aeeb9124ebc5af72
commit 8ad705f14040ae252b938830aeeb9124ebc5af72
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 22:14:26 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:20 2015 +0100

    Convert some raw loops to cmWrap.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 8652690..be28b2f 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -705,10 +705,7 @@ void cmComputeLinkDepends::DisplayConstraintGraph()
     {
     EdgeList const& nl = this->EntryConstraintGraph[i];
     e << "item " << i << " is [" << this->EntryList[i].Item << "]\n";
-    for(EdgeList::const_iterator j = nl.begin(); j != nl.end(); ++j)
-      {
-      e << "  item " << *j << " must follow it\n";
-      }
+    e << cmWrap("  item ", nl, " must follow it", "\n") << "\n";
     }
   fprintf(stderr, "%s\n", e.str().c_str());
 }
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index bcd2d81..e9390e4 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -683,11 +683,9 @@ void cmCoreTryCompile::FindOutputFile(const std::string& targetName)
 
   std::ostringstream emsg;
   emsg << "Unable to find the executable at any of:\n";
-  for (unsigned int i = 0; i < searchDirs.size(); ++i)
-    {
-    emsg << "  " << this->BinaryDirectory << searchDirs[i]
-         << tmpOutputFile << "\n";
-    }
+  emsg << cmWrap("  " + this->BinaryDirectory,
+                 searchDirs,
+                 tmpOutputFile, "\n") << "\n";
   this->FindErrorMessage = emsg.str();
   return;
 }
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index fd3aa0b..6fe055a 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -355,11 +355,7 @@ void cmFindBase::PrintFindStuff()
   std::cerr << "SearchPathSuffixes  ";
   std::cerr << cmJoin(this->SearchPathSuffixes, "\n") << "\n";
   std::cerr << "SearchPaths\n";
-  for(std::vector<std::string>::const_iterator i = this->SearchPaths.begin();
-      i != this->SearchPaths.end(); ++i)
-    {
-    std::cerr << "[" << *i << "]\n";
-    }
+  std::cerr << cmWrap("[", this->SearchPaths, "]", "\n") << "\n";
 }
 
 bool cmFindBase::CheckForVariableInCache()
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index fd9b236..26bd4b9 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -329,10 +329,7 @@ bool cmFindPackageCommand
     {
     std::ostringstream e;
     e << "called with components that are both required and optional:\n";
-    for(unsigned int i=0; i<doubledComponents.size(); ++i)
-      {
-      e << "  " << doubledComponents[i] << "\n";
-      }
+    e << cmWrap("  ", doubledComponents, "", "\n") << "\n";
     this->SetError(e.str());
     return false;
     }
@@ -808,13 +805,8 @@ bool cmFindPackageCommand::HandlePackageMode()
           {
           e << "Could not find a package configuration file provided by \""
             << this->Name << "\"" << requestedVersionString
-            << " with any of the following names:\n";
-          for(std::vector<std::string>::const_iterator ci =
-                this->Configs.begin();
-              ci != this->Configs.end(); ++ci)
-            {
-            e << "  " << *ci << "\n";
-            }
+            << " with any of the following names:\n"
+            << cmWrap("  ", this->Configs, "", "\n") << "\n";
           }
 
         e << "Add the installation prefix of \"" << this->Name << "\" to "
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 6fd569e..813e97d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -213,13 +213,7 @@ cmMakefile::~cmMakefile()
 void cmMakefile::PrintStringVector(const char* s,
                                    const std::vector<std::string>& v) const
 {
-  std::cout << s << ": ( \n";
-  for(std::vector<std::string>::const_iterator i = v.begin();
-      i != v.end(); ++i)
-    {
-    std::cout << *i << " ";
-    }
-  std::cout << " )\n";
+  std::cout << s << ": ( \n" << cmWrap("\"", v, "\"", " ") << ")\n";
 }
 
 void cmMakefile
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index c913ea9..37f9a8f 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -213,27 +213,14 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
     // Echo string
     else if (args[1] == "echo" )
       {
-      unsigned int cc;
-      const char* space = "";
-      for ( cc = 2; cc < args.size(); cc ++ )
-        {
-        std::cout << space << args[cc];
-        space = " ";
-        }
-      std::cout << std::endl;
+      std::cout << cmJoin(cmRange(args).advance(2), " ") << std::endl;
       return 0;
       }
 
     // Echo string no new line
     else if (args[1] == "echo_append" )
       {
-      unsigned int cc;
-      const char* space = "";
-      for ( cc = 2; cc < args.size(); cc ++ )
-        {
-        std::cout << space << args[cc];
-        space = " ";
-        }
+      std::cout << cmJoin(cmRange(args).advance(2), " ");
       return 0;
       }
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7703057d02ac901c018fc1bc62b985bd3399f5b4
commit 7703057d02ac901c018fc1bc62b985bd3399f5b4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 23:50:36 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:20 2015 +0100

    cmAlgorithms: Add cmWrap.
    
    Port some existing cmJoin to use it.
    
    cmJoin is cumbersome to use in cases where the objective is to
    somehow 'quote' each item and then join it with a separator.  In that
    case, the joiner string is harder to read and reason about.  cmWrap
    aims to solve that.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 8491838..54dc14a 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -278,4 +278,15 @@ typename Range::const_iterator cmRemoveDuplicates(Range& r)
   return cmRemoveIndices(r, indices);
 }
 
+template<typename Range>
+std::string cmWrap(std::string prefix, Range const& r, std::string suffix,
+                   std::string sep)
+{
+   if (r.empty())
+     {
+     return std::string();
+     }
+  return prefix + cmJoin(r, (suffix + sep + prefix).c_str()) + suffix;
+}
+
 #endif
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index a7cfda7..391a965 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -724,12 +724,7 @@ cmLocalUnixMakefileGenerator3
     }
 
   // Write the list of commands.
-  for(std::vector<std::string>::const_iterator i = commands.begin();
-      i != commands.end(); ++i)
-    {
-    replace = *i;
-    os << "\t" << replace << "\n";
-    }
+  os << cmWrap("\t", commands, "", "\n") << "\n";
   if(symbolic && !this->WatcomWMake)
     {
     os << ".PHONY : " << cmMakeSafe(tgt) << "\n";
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index bf496e9..bc5be33 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -835,7 +835,7 @@ cmSystemTools::PrintSingleCommand(std::vector<std::string> const& command)
     return std::string();
     }
 
-  return "\"" + cmJoin(command, "\" \"") + "\"";
+  return cmWrap("\"", command, "\"", " ");
 }
 
 bool cmSystemTools::DoesFileExistWithExtensions(
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 81582f5..c913ea9 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -463,9 +463,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
         return 1;
         }
 
-      std::string command = "\"";
-      command += cmJoin(cmRange(args).advance(3), "\" \"");
-      command += "\"";
+      std::string command = cmWrap("\"", cmRange(args).advance(3), "\"", " ");
       int retval = 0;
       int timeout = 0;
       if ( cmSystemTools::RunSingleCommand(command.c_str(), 0, &retval,

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc2345200e5c5f7910486f9350a3fcc724910afa
commit cc2345200e5c5f7910486f9350a3fcc724910afa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 12 20:53:43 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:20 2015 +0100

    Use cmJoin where possible.

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 8e20c14..bcd2d81 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -260,14 +260,10 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
         err << "Unknown extension \"" << ext << "\" for file\n"
             << "  " << *si << "\n"
             << "try_compile() works only for enabled languages.  "
-            << "Currently these are:\n ";
+            << "Currently these are:\n  ";
         std::vector<std::string> langs;
         gg->GetEnabledLanguages(langs);
-        for(std::vector<std::string>::iterator l = langs.begin();
-            l != langs.end(); ++l)
-          {
-          err << " " << *l;
-          }
+        err << cmJoin(langs, " ");
         err << "\nSee project() command to enable other languages.";
         this->Makefile->IssueMessage(cmake::FATAL_ERROR, err.str());
         return -1;
@@ -373,12 +369,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
     // handle any compile flags we need to pass on
     if (!compileDefs.empty())
       {
-      fprintf(fout, "add_definitions( ");
-      for (size_t i = 0; i < compileDefs.size(); ++i)
-        {
-        fprintf(fout,"%s ",compileDefs[i].c_str());
-        }
-      fprintf(fout, ")\n");
+      fprintf(fout, "add_definitions(%s)\n", cmJoin(compileDefs, " ").c_str());
       }
 
     /* Use a random file name to avoid rapid creation and deletion
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 6e55533..fd3aa0b 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -350,19 +350,10 @@ void cmFindBase::PrintFindStuff()
   std::cerr << "NoCMakeSystemPath " << this->NoCMakeSystemPath << "\n";
   std::cerr << "EnvironmentPath " << this->EnvironmentPath << "\n";
   std::cerr << "CMakePathName " << this->CMakePathName << "\n";
-  std::cerr << "Names  ";
-  for(unsigned int i =0; i < this->Names.size(); ++i)
-    {
-    std::cerr << this->Names[i] << " ";
-    }
-  std::cerr << "\n";
+  std::cerr << "Names  " << cmJoin(this->Names, " ") << "\n";
   std::cerr << "\n";
   std::cerr << "SearchPathSuffixes  ";
-  for(unsigned int i =0; i < this->SearchPathSuffixes.size(); ++i)
-    {
-    std::cerr << this->SearchPathSuffixes[i] << "\n";
-    }
-  std::cerr << "\n";
+  std::cerr << cmJoin(this->SearchPathSuffixes, "\n") << "\n";
   std::cerr << "SearchPaths\n";
   for(std::vector<std::string>::const_iterator i = this->SearchPaths.begin();
       i != this->SearchPaths.end(); ++i)
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index c275e6b..a7cfda7 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1330,13 +1330,7 @@ cmLocalUnixMakefileGenerator3
                       this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
     fout << "\n"
          << "# Per-language clean rules from dependency scanning.\n"
-         << "foreach(lang";
-    for(std::set<std::string>::const_iterator l = languages.begin();
-        l != languages.end(); ++l)
-      {
-      fout << " " << *l;
-      }
-    fout << ")\n"
+         << "foreach(lang" << cmJoin(languages, " ") << ")\n"
          << "  include(" << this->GetTargetDirectory(target)
          << "/cmake_clean_${lang}.cmake OPTIONAL)\n"
          << "endforeach()\n";
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 6a7dc6e..81582f5 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -1329,12 +1329,7 @@ bool cmcmd::RunCommand(const char* comment,
   if(verbose)
     {
     std::cout << comment << ":\n";
-    for(std::vector<std::string>::iterator i = command.begin();
-        i != command.end(); ++i)
-      {
-      std::cout << *i << " ";
-      }
-    std::cout << "\n";
+    std::cout << cmJoin(command, " ") << "\n";
     }
   std::string output;
   int retCode =0;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=155f2a3477fc675e3a2f501633006cbbff550768
commit 155f2a3477fc675e3a2f501633006cbbff550768
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 19:50:09 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:20 2015 +0100

    cmCacheManager: Replace loop with algorithm.

diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 45e92ce..0c77891 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -186,11 +186,7 @@ void cmCacheManager::CleanCMakeFiles(const std::string& path)
   cmsys::Glob globIt;
   globIt.FindFiles(glob);
   std::vector<std::string> files = globIt.GetFiles();
-  for(std::vector<std::string>::iterator i = files.begin();
-      i != files.end(); ++i)
-    {
-    cmSystemTools::RemoveFile(*i);
-    }
+  std::for_each(files.begin(), files.end(), cmSystemTools::RemoveFile);
 }
 
 bool cmCacheManager::LoadCache(const std::string& path,

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86c09fe543002e0d89842f89e22a44127da7ee55
commit 86c09fe543002e0d89842f89e22a44127da7ee55
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 12 22:29:11 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:19 2015 +0100

    cmGlobalGenerator: Replace loop with algorithm.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index c976c69..ac4489a 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2571,17 +2571,12 @@ bool cmGlobalGenerator::IsReservedTarget(std::string const& name)
     "test", "RUN_TESTS",
     "package", "PACKAGE",
     "package_source",
-    "ZERO_CHECK",
-    0
+    "ZERO_CHECK"
   };
 
-  for(const char** reservedTarget = reservedTargets;
-    *reservedTarget; ++reservedTarget)
-    {
-    if(name == *reservedTarget) return true;
-    }
-
-  return false;
+  return std::find(cmArrayBegin(reservedTargets),
+                   cmArrayEnd(reservedTargets), name)
+      != cmArrayEnd(reservedTargets);
 }
 
 void cmGlobalGenerator::SetExternalMakefileProjectGenerator(

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77d69c5cb6e758d6e7a6ada2f2c9f435e15010bb
commit 77d69c5cb6e758d6e7a6ada2f2c9f435e15010bb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 13:40:56 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:19 2015 +0100

    cmTarget: Port loop to algorithm.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 1ad0d48..7673554 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1542,12 +1542,8 @@ void cmTarget::DeleteDependencyForVS6( DependencyMap& depMap,
   if( map_itr != depMap.end() )
     {
     DependencyList& depList = map_itr->second;
-    DependencyList::iterator itr;
-    while( (itr = std::find(depList.begin(), depList.end(), dep)) !=
-           depList.end() )
-      {
-      depList.erase( itr );
-      }
+    depList.erase(std::remove(depList.begin(), depList.end(), dep),
+                  depList.end());
     }
 }
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c225767873ce64a745e865c6f1c3372a8ab45d9
commit 9c225767873ce64a745e865c6f1c3372a8ab45d9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 22:45:01 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:19 2015 +0100

    cmGlobalGenerator: Replace set::insert algorithm with cmRemoveDuplicates.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 1de4a59..c976c69 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2937,14 +2937,11 @@ void cmGlobalGenerator::WriteSummary(cmTarget* target)
       {
       target->GetSourceFiles(sources, *ci);
       }
-    std::set<cmSourceFile*> emitted;
+    std::vector<cmSourceFile*>::const_iterator sourcesEnd
+        = cmRemoveDuplicates(sources);
     for(std::vector<cmSourceFile*>::const_iterator si = sources.begin();
-        si != sources.end(); ++si)
+        si != sourcesEnd; ++si)
       {
-      if (!emitted.insert(*si).second)
-        {
-        continue;
-        }
       Json::Value& lj_source = lj_sources.append(Json::objectValue);
       cmSourceFile* sf = *si;
       std::string const& sfp = sf->GetFullPath();

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee5bc006ebee898729b81237719106704a2bb38a
commit ee5bc006ebee898729b81237719106704a2bb38a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 21:58:07 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:19 2015 +0100

    cmGeneratorTarget: Replace set insert algorithm with cmRemoveDuplicates.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index a4f099b..44c9e9a 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -528,23 +528,22 @@ cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs,
   std::vector<cmSourceFile const*> objectFiles;
   this->GetExternalObjects(objectFiles, config);
   std::vector<cmTarget*> objectLibraries;
-  std::set<cmTarget*> emitted;
   for(std::vector<cmSourceFile const*>::const_iterator
       it = objectFiles.begin(); it != objectFiles.end(); ++it)
     {
     std::string objLib = (*it)->GetObjectLibrary();
     if (cmTarget* tgt = this->Makefile->FindTargetToUse(objLib))
       {
-      if (emitted.insert(tgt).second)
-        {
-        objectLibraries.push_back(tgt);
-        }
+      objectLibraries.push_back(tgt);
       }
     }
 
+  std::vector<cmTarget*>::const_iterator end
+      = cmRemoveDuplicates(objectLibraries);
+
   for(std::vector<cmTarget*>::const_iterator
         ti = objectLibraries.begin();
-      ti != objectLibraries.end(); ++ti)
+      ti != end; ++ti)
     {
     cmTarget* objLib = *ti;
     cmGeneratorTarget* ogt =

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3a0c6e08f36efc5f3cd4c1a0d9614a789f91e38
commit b3a0c6e08f36efc5f3cd4c1a0d9614a789f91e38
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 12 23:45:25 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 19 00:59:19 2015 +0100

    cmLocalGenerator: Convert loop to algorithm.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6a6135b..2accf47 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2800,12 +2800,7 @@ std::string cmLocalGenerator::ConvertToOutputFormat(const std::string& source,
       }
     if(this->WindowsShell)
       {
-      std::string::size_type pos = 0;
-      while((pos = result.find('/', pos)) != std::string::npos)
-        {
-        result[pos] = '\\';
-        pos++;
-        }
+      std::replace(result.begin(), result.end(), '/', '\\');
       }
     result = this->EscapeForShell(result, true, false, output == WATCOMQUOTE);
     }

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

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Thu Feb 19 00:01:12 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Thu, 19 Feb 2015 00:01:12 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-178-gf7fc99c
Message-ID: <20150219050112.10377AA9DA@public.kitware.com>

This is an automated email from 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  f7fc99cec6a1db6c53dbf5158b2fb95534704b37 (commit)
      from  93a38a2abccf9041fa86a7a6cf3439b1b0480ad1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7fc99cec6a1db6c53dbf5158b2fb95534704b37
commit f7fc99cec6a1db6c53dbf5158b2fb95534704b37
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Thu Feb 19 00:01:10 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Feb 19 00:01:10 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 3689443..92f6278 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 2)
-set(CMake_VERSION_PATCH 20150218)
+set(CMake_VERSION_PATCH 20150219)
 #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 Feb 19 08:42:07 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 19 Feb 2015 08:42:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-466-g0c2d530
Message-ID: <20150219134207.39862A5824@public.kitware.com>

This is an automated email from 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  0c2d53012ef21d58db4bc242b500422ce19dc9e7 (commit)
       via  1416d214b3a840627e37b1e2d56a3e8095e4bf32 (commit)
      from  3b31afe292561dbc67b42c855c2921a6b24284f5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c2d53012ef21d58db4bc242b500422ce19dc9e7
commit 0c2d53012ef21d58db4bc242b500422ce19dc9e7
Merge: 3b31afe 1416d21
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 08:42:06 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 19 08:42:06 2015 -0500

    Merge topic 'FindMatlab-rewrite' into next
    
    1416d214 FindMatlab: Further revisions


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1416d214b3a840627e37b1e2d56a3e8095e4bf32
commit 1416d214b3a840627e37b1e2d56a3e8095e4bf32
Author:     Raffi Enficiaud <raffi.enficiaud at tuebingen.mpg.de>
AuthorDate: Thu Feb 19 14:36:27 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 08:40:53 2015 -0500

    FindMatlab: Further revisions
    
    - Adding R2014a
    - Stripping the output of the which commando
    - Simplifying the registry query
    - Silencing the stderr of the execute_process commands
    - Condition on the recomputation of the version fixed
    - Fixed the space issues for the matlab temporary folder

diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 6185935..9686a76 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -219,6 +219,7 @@ if(NOT MATLAB_ADDITIONAL_VERSIONS)
 endif()
 
 set(MATLAB_VERSIONS_MAPPING
+  "R2014a=8.3"
   "R2013b=8.2"
   "R2013a=8.1"
   "R2012b=8.0"
@@ -235,8 +236,8 @@ set(MATLAB_VERSIONS_MAPPING
 # temporary folder for all Matlab runs
 set(_matlab_temporary_folder ${CMAKE_BINARY_DIR}/Matlab)
 
-if(NOT EXISTS ${_matlab_temporary_folder})
-  file(MAKE_DIRECTORY ${_matlab_temporary_folder})
+if(NOT EXISTS "${_matlab_temporary_folder}")
+  file(MAKE_DIRECTORY "${_matlab_temporary_folder}")
 endif()
 
 #.rst:
@@ -341,21 +342,6 @@ function(matlab_extract_all_installed_versions_from_registry win64 matlab_versio
     message(FATAL_ERROR "This macro can only be called by a windows host (call to reg.exe")
   endif()
 
-  # list the keys under HKEY_LOCAL_MACHINE\SOFTWARE\mathworks but the call to
-  # reg does not work from cmake, curiously, as is. The command provides the
-  # desired result under the command line though.
-  # Fix: this is because "/reg:64" should appended to the command, otherwise
-  # it gets on the 32 bits software key (curiously again)
-  find_program(MATLAB_REG_EXE_LOCATION "reg")
-
-  # if reg.exe is not found, then it is impossible to use this method.
-  if(NOT MATLAB_REG_EXE_LOCATION)
-    if(MATLAB_FIND_DEBUG)
-      message(WARNING "[MATLAB] reg.exe not found")
-    endif()
-    set(${matlab_versions} "" PARENT_SCOPE)
-    return()
-  endif()
 
   if(${win64} AND ${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "64")
     set(APPEND_REG "/reg:64")
@@ -366,7 +352,7 @@ function(matlab_extract_all_installed_versions_from_registry win64 matlab_versio
   # /reg:64 should be added on 64 bits capable OSs in order to enable the
   # redirection of 64 bits applications
   execute_process(
-    COMMAND ${MATLAB_REG_EXE_LOCATION} query HKEY_LOCAL_MACHINE\\SOFTWARE\\Mathworks\\MATLAB /f * /k ${APPEND_REG}
+    COMMAND reg query HKEY_LOCAL_MACHINE\\SOFTWARE\\Mathworks\\MATLAB /f * /k ${APPEND_REG}
     RESULT_VARIABLE resultMatlab
     OUTPUT_VARIABLE varMatlab
     ERROR_VARIABLE errMatlab
@@ -523,7 +509,7 @@ function(matlab_get_mex_suffix matlab_root mex_suffix)
   # one empty string element
   find_program(
     MATLAB_MEXEXTENSIONS_PROG
-    "mexext"
+    NAMES mexext
     PATHS ${matlab_root}/bin
     DOC "Matlab MEX extension provider"
     NO_DEFAULT_PATH
@@ -556,7 +542,8 @@ function(matlab_get_mex_suffix matlab_root mex_suffix)
 
   execute_process(
     COMMAND ${MATLAB_MEXEXTENSIONS_PROG}
-    OUTPUT_VARIABLE _matlab_mex_extension)
+    OUTPUT_VARIABLE _matlab_mex_extension
+    ERROR_VARIABLE _matlab_mex_extension_error)
   string(STRIP ${_matlab_mex_extension} _matlab_mex_extension)
 
   set(${mex_suffix} ${_matlab_mex_extension} PARENT_SCOPE)
@@ -590,11 +577,11 @@ function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_ve
     message(STATUS "[MATLAB] Determining the version of Matlab from ${matlab_binary_program}")
   endif()
 
-  if(EXISTS ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+  if(EXISTS "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp")
     if(MATLAB_FIND_DEBUG)
       message(STATUS "[MATLAB] Removing previous ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp file")
     endif()
-    file(REMOVE ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+    file(REMOVE "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp")
   endif()
 
 
@@ -611,10 +598,12 @@ function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_ve
   # independent manner however, not setting it would flush the output of Matlab
   # in the current console (unix variant)
   execute_process(
-    COMMAND ${matlab_binary_program} -nosplash -nojvm ${_matlab_additional_commands} -logfile ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp -nodesktop -nodisplay -r "version, exit"
+    COMMAND "${matlab_binary_program}" -nosplash -nojvm ${_matlab_additional_commands} -logfile "matlabVersionLog.cmaketmp" -nodesktop -nodisplay -r "version, exit"
     OUTPUT_VARIABLE _matlab_version_from_cmd_dummy
     RESULT_VARIABLE _matlab_result_version_call
+    ERROR_VARIABLE _matlab_result_version_call_error
     TIMEOUT 30
+    WORKING_DIRECTORY "${_matlab_temporary_folder}"
     )
 
 
@@ -623,7 +612,7 @@ function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_ve
       message(WARNING "[MATLAB] Unable to determine the version of Matlab. Matlab call returned with error ${_matlab_result_version_call}.")
     endif()
     return()
-  elseif(NOT EXISTS ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+  elseif(NOT EXISTS "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp")
     if(MATLAB_FIND_DEBUG)
       message(WARNING "[MATLAB] Unable to determine the version of Matlab. The log file does not exist.")
     endif()
@@ -631,8 +620,8 @@ function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_ve
   endif()
 
   # if successful, read back the log
-  file(READ ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp _matlab_version_from_cmd)
-  file(REMOVE ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp)
+  file(READ "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp" _matlab_version_from_cmd)
+  file(REMOVE "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp")
 
   set(index -1)
   string(FIND ${_matlab_version_from_cmd} "ans" index)
@@ -997,28 +986,20 @@ else()
     endif()
 
     if(NOT _matlab_main_tmp)
-      # if we get there a second time and the folder matlab is created here,
-      # and then the find_program does not find it,
-      # the get_filename_component (... PROGRAM) finds this directory instead.
+
       find_program(
         _matlab_main_tmp
-        "matlab")
+        NAMES matlab)
 
       if(NOT _matlab_main_tmp)
-        #execute_process(COMMAND which matlab OUTPUT_VARIABLE _which_matlab
-        # RESULT_VARIABLE _which_matlab_result)
-        get_filename_component(_matlab_main_tmp "matlab" PROGRAM)
-
-        # "bug" of cmake: if we call get_filename_component with PROGRAM, it can
-        # return us a directory
-        if((NOT EXISTS ${_matlab_main_tmp}) OR (IS_DIRECTORY ${_matlab_main_tmp}))
-          execute_process(
-            COMMAND "which matlab"
-            OUTPUT_VARIABLE _matlab_main_tmp)
-         endif()
+        execute_process(
+          COMMAND "which" matlab
+          OUTPUT_VARIABLE _matlab_main_tmp
+          ERROR_VARIABLE _matlab_main_tmp_err)
+        # the output should be cleaned up
+        string(STRIP "${_matlab_main_tmp}" _matlab_main_tmp)
       endif()
 
-
       if(EXISTS ${_matlab_main_tmp})
         if(MATLAB_FIND_DEBUG)
           message(STATUS "[MATLAB] matlab found from PATH: ${_matlab_main_tmp}")
@@ -1032,7 +1013,6 @@ else()
     endif() # if(NOT _matlab_main_tmp)
 
     if(_matlab_main_tmp AND EXISTS ${_matlab_main_tmp})
-
       # resolve symlinks
       get_filename_component(_matlab_current_location "${_matlab_main_tmp}" REALPATH)
       set(_directory_alias DIRECTORY)
@@ -1141,7 +1121,7 @@ if(_matlab_version_should_be_recomputed)
     message(STATUS "[MATLAB] querying for version from Matlab root = ${Matlab_ROOT_DIR}")
   endif()
 
-  if(NOT Matlab_MAIN_PROGRAM)
+  if(Matlab_MAIN_PROGRAM)
     set(_matlab_main_tmp ${Matlab_MAIN_PROGRAM})
   else()
     find_program(
@@ -1155,7 +1135,7 @@ if(_matlab_version_should_be_recomputed)
 
   if(_matlab_main_tmp)
     set(matlab_list_of_all_versions)
-    matlab_get_version_from_matlab_run(${_matlab_main_tmp} matlab_list_of_all_versions)
+    matlab_get_version_from_matlab_run("${_matlab_main_tmp}" matlab_list_of_all_versions)
 
     list(GET matlab_list_of_all_versions 0 MATLAB_VERSION_tmp)
 
diff --git a/Modules/MatlabTestsRedirect.cmake b/Modules/MatlabTestsRedirect.cmake
index 46d1ef8..804101c 100644
--- a/Modules/MatlabTestsRedirect.cmake
+++ b/Modules/MatlabTestsRedirect.cmake
@@ -60,13 +60,14 @@ set(Matlab_SCRIPT_TO_RUN
     "addpath(${concat_string}), path, ${cmd_to_run_before_test}, ${unittest_to_run}"
    )
 
-set(Matlab_LOG_FILE ${output_directory}/${test_name}.log)
+set(Matlab_LOG_FILE "${output_directory}/${test_name}.log")
 
 execute_process(
-  COMMAND ${Matlab_PROGRAM} ${Matlab_UNIT_TESTS_CMD} -logfile ${Matlab_LOG_FILE} -r ${Matlab_SCRIPT_TO_RUN}
+  COMMAND "${Matlab_PROGRAM}" ${Matlab_UNIT_TESTS_CMD} -logfile "${test_name}.log" -r "${Matlab_SCRIPT_TO_RUN}"
   RESULT_VARIABLE res
   TIMEOUT ${test_timeout}
   OUTPUT_QUIET # we do not want the output twice
+  WORKING_DIRECTORY "${output_directory}"
   )
 
 if(NOT EXISTS ${Matlab_LOG_FILE})

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

Summary of changes:
 Modules/FindMatlab.cmake          |   70 +++++++++++++------------------------
 Modules/MatlabTestsRedirect.cmake |    5 +--
 2 files changed, 28 insertions(+), 47 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 19 09:15:06 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 19 Feb 2015 09:15:06 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-468-g3ff5f78
Message-ID: <20150219141506.6F5E2AA023@public.kitware.com>

This is an automated email from 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  3ff5f7862607201bfe3b43f9abc6fe17197de9fb (commit)
       via  1ade687d8dbe2952bc12dabeaaaaf0abec5b98cf (commit)
      from  0c2d53012ef21d58db4bc242b500422ce19dc9e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ff5f7862607201bfe3b43f9abc6fe17197de9fb
commit 3ff5f7862607201bfe3b43f9abc6fe17197de9fb
Merge: 0c2d530 1ade687
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 09:15:05 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 19 09:15:05 2015 -0500

    Merge topic 'cmake-gui-reset-generator-toolset-and-platform' into next
    
    1ade687d cmake-gui: Reset generator platform and toolset on configure (#15411)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ade687d8dbe2952bc12dabeaaaaf0abec5b98cf
commit 1ade687d8dbe2952bc12dabeaaaaf0abec5b98cf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 09:09:58 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 09:14:38 2015 -0500

    cmake-gui: Reset generator platform and toolset on configure (#15411)
    
    At the start of each configure step we already reset the generator
    selection (CMAKE_GENERATOR) to match that loaded for the current
    project.  Add missing code to reset the generator platform and toolset
    (CMAKE_GENERATOR_PLATFORM and CMAKE_GENERATOR_TOOLSET) also so that they
    do not leak across projects.

diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx
index b833648..996aa75 100644
--- a/Source/QtDialog/QCMake.cxx
+++ b/Source/QtDialog/QCMake.cxx
@@ -147,6 +147,8 @@ void QCMake::configure()
   this->CMakeInstance->SetStartOutputDirectory(this->BinaryDirectory.toLocal8Bit().data());
   this->CMakeInstance->SetGlobalGenerator(
     this->CMakeInstance->CreateGlobalGenerator(this->Generator.toLocal8Bit().data()));
+  this->CMakeInstance->SetGeneratorPlatform("");
+  this->CMakeInstance->SetGeneratorToolset("");
   this->CMakeInstance->LoadCache();
   this->CMakeInstance->SetSuppressDevWarnings(this->SuppressDevWarnings);
   this->CMakeInstance->SetWarnUninitialized(this->WarnUninitializedMode);

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 19 09:27:27 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 19 Feb 2015 09:27:27 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-479-gda5ef0d
Message-ID: <20150219142727.D85F8AAFC5@public.kitware.com>

This is an automated email from 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  da5ef0dec88800e832c11de73fd372a0370af2d6 (commit)
       via  4cf3589ed6b71dbc2bf95bc16d079ef469511538 (commit)
       via  f611406fe9045e2861ccc8a9fd8b9daa39982553 (commit)
       via  c6e1f4647576801b27fbb25652fe3e947564be27 (commit)
       via  0033faac1d5641c370646e089ca19cd527a8d842 (commit)
       via  302d47b1fe19fb794800faa548d4cb9a8e89220a (commit)
       via  8c8b77a5dede8d1ad3110124b93973db8d879d79 (commit)
       via  49562a77f7223befa21a5b72625dc10f807ce788 (commit)
       via  aa77b631d9fc94e7ba69929560d4592e1ab12a04 (commit)
       via  2e09c4230f601ef5d744a2e43643e214a149ba39 (commit)
       via  e6ebc814dfa022680038a3855eb1eee56f6015f0 (commit)
      from  3ff5f7862607201bfe3b43f9abc6fe17197de9fb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da5ef0dec88800e832c11de73fd372a0370af2d6
commit da5ef0dec88800e832c11de73fd372a0370af2d6
Merge: 3ff5f78 4cf3589
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 09:27:26 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 19 09:27:26 2015 -0500

    Merge topic 'compiler-version-Fortran' into next
    
    4cf3589e Help: Add notes for topic 'compiler-version-Fortran'
    f611406f Fortran: Test that CMAKE_Fortran_COMPILER_VERSION is set (#15372)
    c6e1f464 Fortran: Detect G95 compiler version
    0033faac Fortran: Detect PGI compiler version
    302d47b1 Fortran: Detect XL and VisualAge compiler versions
    8c8b77a5 Fortran: Detect GNU compiler version
    49562a77 Fortran: Detect PathScale compiler version
    aa77b631 Fortran: Detect SunPro compiler version
    2e09c423 Fortran: Detect Intel compiler version
    e6ebc814 Fortran: Add infrastructure to detect compiler version (#15372)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cf3589ed6b71dbc2bf95bc16d079ef469511538
commit 4cf3589ed6b71dbc2bf95bc16d079ef469511538
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:38:31 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 09:26:29 2015 -0500

    Help: Add notes for topic 'compiler-version-Fortran'

diff --git a/Help/release/dev/compiler-version-Fortran.rst b/Help/release/dev/compiler-version-Fortran.rst
new file mode 100644
index 0000000..e10b206
--- /dev/null
+++ b/Help/release/dev/compiler-version-Fortran.rst
@@ -0,0 +1,6 @@
+compiler-version-Fortran
+------------------------
+
+* The version of some Fortran compilers is now detected and stored in the
+  :variable:`CMAKE_Fortran_COMPILER_VERSION <CMAKE_<LANG>_COMPILER_VERSION>`
+  variable.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f611406fe9045e2861ccc8a9fd8b9daa39982553
commit f611406fe9045e2861ccc8a9fd8b9daa39982553
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:37:23 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 09:26:28 2015 -0500

    Fortran: Test that CMAKE_Fortran_COMPILER_VERSION is set (#15372)
    
    Update the CMakeOnly.CompilerIdFortran test to require that the variable
    is set instead of just warning.  We already require it for C and CXX.

diff --git a/Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt b/Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt
index 3a2bdeb..02e4668 100644
--- a/Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt
+++ b/Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt
@@ -4,19 +4,11 @@ project(CompilerIdFortran Fortran)
 foreach(v
     CMAKE_Fortran_COMPILER
     CMAKE_Fortran_COMPILER_ID
-    )
-  if(${v})
-    message(STATUS "${v}=[${${v}}]")
-  else()
-    message(SEND_ERROR "${v} not set!")
-  endif()
-endforeach()
-foreach(v
     CMAKE_Fortran_COMPILER_VERSION
     )
   if(${v})
     message(STATUS "${v}=[${${v}}]")
   else()
-    message(WARNING "${v} not set!")
+    message(SEND_ERROR "${v} not set!")
   endif()
 endforeach()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6e1f4647576801b27fbb25652fe3e947564be27
commit c6e1f4647576801b27fbb25652fe3e947564be27
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:32:28 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 09:26:28 2015 -0500

    Fortran: Detect G95 compiler version
    
    The __G95__ and __G95_MINOR__ preprocessor symbols encode the compiler
    version as decimal digits.

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 98ec7f3..2533d3f 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -47,6 +47,8 @@
         PRINT *, 'INFO:compiler[Cray]'
 #elif defined(__G95__)
         PRINT *, 'INFO:compiler[G95]'
+# define COMPILER_VERSION_MAJOR DEC(__G95__)
+# define COMPILER_VERSION_MINOR DEC(__G95_MINOR__)
 #elif defined(__PATHSCALE__)
         PRINT *, 'INFO:compiler[PathScale]'
 # define COMPILER_VERSION_MAJOR DEC(__PATHCC__)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0033faac1d5641c370646e089ca19cd527a8d842
commit 0033faac1d5641c370646e089ca19cd527a8d842
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:31:45 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 09:26:28 2015 -0500

    Fortran: Detect PGI compiler version
    
    Port logic from the "Compiler/PGI-DetermineCompiler" module into
    "CMakeFortranCompilerId.F.in".

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 4c172a8..98ec7f3 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -79,6 +79,11 @@
 # endif
 #elif defined(__PGI)
         PRINT *, 'INFO:compiler[PGI]'
+# define COMPILER_VERSION_MAJOR DEC(__PGIC__)
+# define COMPILER_VERSION_MINOR DEC(__PGIC_MINOR__)
+# if defined(__PGIC_PATCHLEVEL__)
+#  define COMPILER_VERSION_PATCH DEC(__PGIC_PATCHLEVEL__)
+# endif
 #elif defined(_SGI_COMPILER_VERSION) || defined(_COMPILER_VERSION)
         PRINT *, 'INFO:compiler[MIPSpro]'
 #       if 0

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=302d47b1fe19fb794800faa548d4cb9a8e89220a
commit 302d47b1fe19fb794800faa548d4cb9a8e89220a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:30:19 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 09:26:28 2015 -0500

    Fortran: Detect XL and VisualAge compiler versions
    
    Port logic from the "Compiler/XL-*-DetermineCompiler" and
    "Compiler/VisualAge-*-DetermineCompiler" modules into
    "CMakeFortranCompilerId.F.in".

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 14ce395..4c172a8 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -68,8 +68,14 @@
         PRINT *, 'INFO:compiler[zOS]'
 # elif __IBMC__ >= 800
         PRINT *, 'INFO:compiler[XL]'
+#  define COMPILER_VERSION_MAJOR DEC(__IBMC__/100)
+#  define COMPILER_VERSION_MINOR DEC(__IBMC__/10 % 10)
+#  define COMPILER_VERSION_PATCH DEC(__IBMC__    % 10)
 # else
         PRINT *, 'INFO:compiler[VisualAge]'
+#  define COMPILER_VERSION_MAJOR DEC(__IBMC__/100)
+#  define COMPILER_VERSION_MINOR DEC(__IBMC__/10 % 10)
+#  define COMPILER_VERSION_PATCH DEC(__IBMC__    % 10)
 # endif
 #elif defined(__PGI)
         PRINT *, 'INFO:compiler[PGI]'

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c8b77a5dede8d1ad3110124b93973db8d879d79
commit 8c8b77a5dede8d1ad3110124b93973db8d879d79
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:29:33 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 09:26:28 2015 -0500

    Fortran: Detect GNU compiler version
    
    Port logic from the "Compiler/GNU-DetermineCompiler" module into
    "CMakeFortranCompilerId.F.in".

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index fcffaa2..14ce395 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -58,6 +58,11 @@
         PRINT *, 'INFO:compiler[Absoft]'
 #elif defined(__GNUC__)
         PRINT *, 'INFO:compiler[GNU]'
+# define COMPILER_VERSION_MAJOR DEC(__GNUC__)
+# define COMPILER_VERSION_MINOR DEC(__GNUC_MINOR__)
+# if defined(__GNUC_PATCHLEVEL__)
+#  define COMPILER_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__)
+# endif
 #elif defined(__IBMC__)
 # if defined(__COMPILER_VER__)
         PRINT *, 'INFO:compiler[zOS]'

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49562a77f7223befa21a5b72625dc10f807ce788
commit 49562a77f7223befa21a5b72625dc10f807ce788
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:28:45 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 09:26:27 2015 -0500

    Fortran: Detect PathScale compiler version
    
    Port logic from the "Compiler/PathScale-DetermineCompiler" module into
    "CMakeFortranCompilerId.F.in".

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 5e8f646..fcffaa2 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -49,6 +49,11 @@
         PRINT *, 'INFO:compiler[G95]'
 #elif defined(__PATHSCALE__)
         PRINT *, 'INFO:compiler[PathScale]'
+# define COMPILER_VERSION_MAJOR DEC(__PATHCC__)
+# define COMPILER_VERSION_MINOR DEC(__PATHCC_MINOR__)
+# if defined(__PATHCC_PATCHLEVEL__)
+#  define COMPILER_VERSION_PATCH DEC(__PATHCC_PATCHLEVEL__)
+# endif
 #elif defined(__ABSOFT__)
         PRINT *, 'INFO:compiler[Absoft]'
 #elif defined(__GNUC__)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa77b631d9fc94e7ba69929560d4592e1ab12a04
commit aa77b631d9fc94e7ba69929560d4592e1ab12a04
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:27:22 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 09:26:27 2015 -0500

    Fortran: Detect SunPro compiler version
    
    Port logic from "Compiler/SunPro-*DetermineCompiler" modules into
    "CMakeFortranCompilerId.F.in".

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 956576d..5e8f646 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -33,8 +33,16 @@
         PRINT *, 'INFO:simulate_version[013.00]'
 #  endif
 # endif
-#elif defined(__SUNPRO_F90) || defined(__SUNPRO_F95)
+#elif defined(__SUNPRO_F95)
         PRINT *, 'INFO:compiler[SunPro]'
+# define COMPILER_VERSION_MAJOR HEX(__SUNPRO_F95>>8)
+# define COMPILER_VERSION_MINOR HEX(__SUNPRO_F95>>4 & 0xF)
+# define COMPILER_VERSION_PATCH HEX(__SUNPRO_F95    & 0xF)
+#elif defined(__SUNPRO_F90)
+        PRINT *, 'INFO:compiler[SunPro]'
+# define COMPILER_VERSION_MAJOR HEX(__SUNPRO_F90>>8)
+# define COMPILER_VERSION_MINOR HEX(__SUNPRO_F90>>4 & 0xF)
+# define COMPILER_VERSION_PATCH HEX(__SUNPRO_F90    & 0xF)
 #elif defined(_CRAYFTN)
         PRINT *, 'INFO:compiler[Cray]'
 #elif defined(__G95__)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e09c4230f601ef5d744a2e43643e214a149ba39
commit 2e09c4230f601ef5d744a2e43643e214a149ba39
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:26:14 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 09:26:27 2015 -0500

    Fortran: Detect Intel compiler version
    
    Port logic from the "Compiler/Intel-DetermineCompiler" module into
    "CMakeFortranCompilerId.F.in".

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 955ca85..956576d 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -4,6 +4,17 @@
 #endif
 #if defined(__INTEL_COMPILER) || defined(__ICC)
         PRINT *, 'INFO:compiler[Intel]'
+# define COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER/100)
+# define COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER/10 % 10)
+# if defined(__INTEL_COMPILER_UPDATE)
+#  define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER_UPDATE)
+# else
+#  define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER   % 10)
+# endif
+# if defined(__INTEL_COMPILER_BUILD_DATE)
+#  define COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE)
+# endif
+
 # if defined(_MSC_VER)
         PRINT *, 'INFO:simulate[MSVC]'
 #  if _MSC_VER >= 1800

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6ebc814dfa022680038a3855eb1eee56f6015f0
commit e6ebc814dfa022680038a3855eb1eee56f6015f0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 17 13:24:31 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 09:26:27 2015 -0500

    Fortran: Add infrastructure to detect compiler version (#15372)
    
    Fortran does not offer syntax to compose a string literal at
    preprocessing time from numeric compuations.  Instead encode each digit
    of each component as a separate INFO string and compose them in CMake
    code after extraction.  Support MAJOR, MINOR, PATCH, and TWEAK
    components with up to 8 digits each.

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index dfed00e..d22a867 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -409,12 +409,28 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
     # Read the compiler identification string from the executable file.
     set(COMPILER_ID)
     set(COMPILER_VERSION)
+    set(COMPILER_VERSION_MAJOR 0)
+    set(COMPILER_VERSION_MINOR 0)
+    set(COMPILER_VERSION_PATCH 0)
+    set(COMPILER_VERSION_TWEAK 0)
+    set(HAVE_COMPILER_VERSION_MAJOR 0)
+    set(HAVE_COMPILER_VERSION_MINOR 0)
+    set(HAVE_COMPILER_VERSION_PATCH 0)
+    set(HAVE_COMPILER_VERSION_TWEAK 0)
+    set(DIGIT_VALUE_1 1)
+    set(DIGIT_VALUE_2 10)
+    set(DIGIT_VALUE_3 100)
+    set(DIGIT_VALUE_4 1000)
+    set(DIGIT_VALUE_5 10000)
+    set(DIGIT_VALUE_6 100000)
+    set(DIGIT_VALUE_7 1000000)
+    set(DIGIT_VALUE_8 10000000)
     set(PLATFORM_ID)
     set(ARCHITECTURE_ID)
     set(SIMULATE_ID)
     set(SIMULATE_VERSION)
     file(STRINGS ${file}
-      CMAKE_${lang}_COMPILER_ID_STRINGS LIMIT_COUNT 6 REGEX "INFO:[A-Za-z0-9_]+\\[[^]]*\\]")
+      CMAKE_${lang}_COMPILER_ID_STRINGS LIMIT_COUNT 38 REGEX "INFO:[A-Za-z0-9_]+\\[[^]]*\\]")
     set(COMPILER_ID_TWICE)
     foreach(info ${CMAKE_${lang}_COMPILER_ID_STRINGS})
       if("${info}" MATCHES "INFO:compiler\\[([^]\"]*)\\]")
@@ -433,6 +449,15 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
         string(REGEX REPLACE "^0+([0-9])" "\\1" COMPILER_VERSION "${CMAKE_MATCH_1}")
         string(REGEX REPLACE "\\.0+([0-9])" ".\\1" COMPILER_VERSION "${COMPILER_VERSION}")
       endif()
+      foreach(comp MAJOR MINOR PATCH TWEAK)
+        foreach(digit 1 2 3 4 5 6 7 8 9)
+          if("${info}" MATCHES "INFO:compiler_version_${comp}_digit_${digit}\\[([0-9])\\]")
+            set(value ${CMAKE_MATCH_1})
+            math(EXPR COMPILER_VERSION_${comp} "${COMPILER_VERSION_${comp}} + ${value} * ${DIGIT_VALUE_${digit}}")
+            set(HAVE_COMPILER_VERSION_${comp} 1)
+          endif()
+        endforeach()
+      endforeach()
       if("${info}" MATCHES "INFO:simulate\\[([^]\"]*)\\]")
         set(SIMULATE_ID "${CMAKE_MATCH_1}")
       endif()
@@ -445,6 +470,20 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
       endif()
     endforeach()
 
+    # Construct compiler version from components if needed.
+    if(NOT DEFINED COMPILER_VERSION AND HAVE_COMPILER_VERSION_MAJOR)
+      set(COMPILER_VERSION "${COMPILER_VERSION_MAJOR}")
+      if(HAVE_COMPILER_VERSION_MINOR)
+        set(COMPILER_VERSION "${COMPILER_VERSION}.${COMPILER_VERSION_MINOR}")
+        if(HAVE_COMPILER_VERSION_PATCH)
+          set(COMPILER_VERSION "${COMPILER_VERSION}.${COMPILER_VERSION_PATCH}")
+          if(HAVE_COMPILER_VERSION_TWEAK)
+            set(COMPILER_VERSION "${COMPILER_VERSION}.${COMPILER_VERSION_TWEAK}")
+          endif()
+        endif()
+      endif()
+    endif()
+
     # Detect the exact architecture from the PE header.
     if(WIN32)
       # The offset to the PE signature is stored at 0x3c.
diff --git a/Modules/CMakeDetermineFortranCompiler.cmake b/Modules/CMakeDetermineFortranCompiler.cmake
index a4bb86c..3a27127 100644
--- a/Modules/CMakeDetermineFortranCompiler.cmake
+++ b/Modules/CMakeDetermineFortranCompiler.cmake
@@ -119,6 +119,47 @@ if(NOT CMAKE_Fortran_COMPILER_ID_RUN)
   set(CMAKE_Fortran_COMPILER_ID_VENDOR_FLAGS_NAG "-V")
   set(CMAKE_Fortran_COMPILER_ID_VENDOR_REGEX_NAG "NAG Fortran Compiler")
 
+  set(_version_info "")
+  foreach(m MAJOR MINOR PATCH TWEAK)
+    set(_COMP "_${m}")
+    set(_version_info "${_version_info}
+#if defined(COMPILER_VERSION${_COMP})")
+    foreach(d 1 2 3 4 5 6 7 8)
+      set(_version_info "${_version_info}
+# undef DEC
+# undef HEX
+# define DEC(n) DEC_${d}(n)
+# define HEX(n) HEX_${d}(n)
+# if COMPILER_VERSION${_COMP} == 0
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[0]'
+# elif COMPILER_VERSION${_COMP} == 1
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[1]'
+# elif COMPILER_VERSION${_COMP} == 2
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[2]'
+# elif COMPILER_VERSION${_COMP} == 3
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[3]'
+# elif COMPILER_VERSION${_COMP} == 4
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[4]'
+# elif COMPILER_VERSION${_COMP} == 5
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[5]'
+# elif COMPILER_VERSION${_COMP} == 6
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[6]'
+# elif COMPILER_VERSION${_COMP} == 7
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[7]'
+# elif COMPILER_VERSION${_COMP} == 8
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[8]'
+# elif COMPILER_VERSION${_COMP} == 9
+        PRINT *, 'INFO:compiler_version${_COMP}_digit_${d}[9]'
+# endif
+")
+    endforeach()
+    set(_version_info "${_version_info}
+#endif")
+  endforeach()
+  set(CMAKE_Fortran_COMPILER_ID_VERSION_INFO "${_version_info}")
+  unset(_version_info)
+  unset(_COMP)
+
   # Try to identify the compiler.
   set(CMAKE_Fortran_COMPILER_ID)
   include(${CMAKE_ROOT}/Modules/CMakeDetermineCompilerId.cmake)
diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 5349505..955ca85 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -134,4 +134,26 @@
         PRINT *, 'INFO:arch[X86]'
 # endif
 #endif
+
+#if 0
+! Encode compiler version digits
+#endif
+#define DEC_8(n) (((n) / 10000000) % 10)
+#define DEC_7(n) (((n) / 1000000)  % 10)
+#define DEC_6(n) (((n) / 100000)   % 10)
+#define DEC_5(n) (((n) / 10000)    % 10)
+#define DEC_4(n) (((n) / 1000)     % 10)
+#define DEC_3(n) (((n) / 100)      % 10)
+#define DEC_2(n) (((n) / 10)       % 10)
+#define DEC_1(n) (((n)    )        % 10)
+#define HEX_8(n) ((n)>>28 & 0xF)
+#define HEX_7(n) ((n)>>24 & 0xF)
+#define HEX_6(n) ((n)>>20 & 0xF)
+#define HEX_5(n) ((n)>>16 & 0xF)
+#define HEX_4(n) ((n)>>12 & 0xF)
+#define HEX_3(n) ((n)>>8  & 0xF)
+#define HEX_2(n) ((n)>>4  & 0xF)
+#define HEX_1(n) ((n)     & 0xF)
+ at CMAKE_Fortran_COMPILER_ID_VERSION_INFO@
+
       END

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 19 09:32:26 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 19 Feb 2015 09:32:26 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-180-gd7bc3ff
Message-ID: <20150219143226.652ABAB05A@public.kitware.com>

This is an automated email from 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  d7bc3ff690b65a1b9c06a7858244d027f0020f66 (commit)
       via  bce4e20f78bbaa708b621ff1feabcc975ac6345f (commit)
      from  f7fc99cec6a1db6c53dbf5158b2fb95534704b37 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7bc3ff690b65a1b9c06a7858244d027f0020f66
commit d7bc3ff690b65a1b9c06a7858244d027f0020f66
Merge: f7fc99c bce4e20
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 09:32:25 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 19 09:32:25 2015 -0500

    Merge topic 'FindJNI-awt-arch'
    
    bce4e20f FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 19 09:32:28 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 19 Feb 2015 09:32:28 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-182-g4982109
Message-ID: <20150219143228.4F14FAB059@public.kitware.com>

This is an automated email from 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  49821094fac389fb79838a921a627351d7fd157b (commit)
       via  7e6608fe646729f7f14eedb55bd26d97a36223f7 (commit)
      from  d7bc3ff690b65a1b9c06a7858244d027f0020f66 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49821094fac389fb79838a921a627351d7fd157b
commit 49821094fac389fb79838a921a627351d7fd157b
Merge: d7bc3ff 7e6608f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 09:32:27 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 19 09:32:27 2015 -0500

    Merge topic 'binary-release-no-OpenSSL-on-Win-or-OSX'
    
    7e6608fe Utilities/Release: Build OS X and Win binaries without OpenSSL


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

Summary of changes:
 Utilities/Release/dash2win64_release.cmake   |    7 +------
 Utilities/Release/dashmacmini5_release.cmake |    7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 19 09:32:30 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 19 Feb 2015 09:32:30 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-193-g6f9c4d1
Message-ID: <20150219143230.56000AB064@public.kitware.com>

This is an automated email from 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  6f9c4d17f89838a822baab5e99571c20113174f9 (commit)
       via  4cf3589ed6b71dbc2bf95bc16d079ef469511538 (commit)
       via  f611406fe9045e2861ccc8a9fd8b9daa39982553 (commit)
       via  c6e1f4647576801b27fbb25652fe3e947564be27 (commit)
       via  0033faac1d5641c370646e089ca19cd527a8d842 (commit)
       via  302d47b1fe19fb794800faa548d4cb9a8e89220a (commit)
       via  8c8b77a5dede8d1ad3110124b93973db8d879d79 (commit)
       via  49562a77f7223befa21a5b72625dc10f807ce788 (commit)
       via  aa77b631d9fc94e7ba69929560d4592e1ab12a04 (commit)
       via  2e09c4230f601ef5d744a2e43643e214a149ba39 (commit)
       via  e6ebc814dfa022680038a3855eb1eee56f6015f0 (commit)
      from  49821094fac389fb79838a921a627351d7fd157b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f9c4d17f89838a822baab5e99571c20113174f9
commit 6f9c4d17f89838a822baab5e99571c20113174f9
Merge: 4982109 4cf3589
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 09:32:29 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 19 09:32:29 2015 -0500

    Merge topic 'compiler-version-Fortran'
    
    4cf3589e Help: Add notes for topic 'compiler-version-Fortran'
    f611406f Fortran: Test that CMAKE_Fortran_COMPILER_VERSION is set (#15372)
    c6e1f464 Fortran: Detect G95 compiler version
    0033faac Fortran: Detect PGI compiler version
    302d47b1 Fortran: Detect XL and VisualAge compiler versions
    8c8b77a5 Fortran: Detect GNU compiler version
    49562a77 Fortran: Detect PathScale compiler version
    aa77b631 Fortran: Detect SunPro compiler version
    2e09c423 Fortran: Detect Intel compiler version
    e6ebc814 Fortran: Add infrastructure to detect compiler version (#15372)


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

Summary of changes:
 Help/release/dev/compiler-version-Fortran.rst    |    6 ++
 Modules/CMakeDetermineCompilerId.cmake           |   41 +++++++++++++-
 Modules/CMakeDetermineFortranCompiler.cmake      |   41 ++++++++++++++
 Modules/CMakeFortranCompilerId.F.in              |   66 +++++++++++++++++++++-
 Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt |   10 +---
 5 files changed, 153 insertions(+), 11 deletions(-)
 create mode 100644 Help/release/dev/compiler-version-Fortran.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 19 09:32:32 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 19 Feb 2015 09:32:32 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-195-g05c54c5
Message-ID: <20150219143232.961DAAB067@public.kitware.com>

This is an automated email from 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  05c54c5bc7e3fb29d4d9366035410b69cc6ca494 (commit)
       via  a0f17fbe9cc8c8d30d8c1a4df50c4af5fc4e63d1 (commit)
      from  6f9c4d17f89838a822baab5e99571c20113174f9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05c54c5bc7e3fb29d4d9366035410b69cc6ca494
commit 05c54c5bc7e3fb29d4d9366035410b69cc6ca494
Merge: 6f9c4d1 a0f17fb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 09:32:31 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 19 09:32:31 2015 -0500

    Merge topic 'mingw-no-find_library-dll'
    
    a0f17fbe Windows-GNU: Do not tell find_library to treat '.dll' as linkable


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

Summary of changes:
 Help/release/dev/mingw-no-find_library-dll.rst |    8 ++++++++
 Modules/Platform/Windows-GNU.cmake             |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/mingw-no-find_library-dll.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 19 09:32:34 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 19 Feb 2015 09:32:34 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-197-g2f0b9c6
Message-ID: <20150219143234.87905AB065@public.kitware.com>

This is an automated email from 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  2f0b9c67fcedc73bb398e2fea35d9a5cf5123ff8 (commit)
       via  d1cf09e3c2ded58d08288a42c0eb9038727c22c7 (commit)
      from  05c54c5bc7e3fb29d4d9366035410b69cc6ca494 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f0b9c67fcedc73bb398e2fea35d9a5cf5123ff8
commit 2f0b9c67fcedc73bb398e2fea35d9a5cf5123ff8
Merge: 05c54c5 d1cf09e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 09:32:33 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 19 09:32:33 2015 -0500

    Merge topic 'CMakeParseImplicitLinkInfo-CMP0054'
    
    d1cf09e3 CMakeParseImplicitLinkInfo: Avoid if() auto-deref in quoted arg


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 19 09:33:00 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 19 Feb 2015 09:33:00 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-486-g3328284
Message-ID: <20150219143300.D4742AB065@public.kitware.com>

This is an automated email from 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  3328284961ecf7d404efca02b94d7747ed71997c (commit)
       via  2f0b9c67fcedc73bb398e2fea35d9a5cf5123ff8 (commit)
       via  05c54c5bc7e3fb29d4d9366035410b69cc6ca494 (commit)
       via  6f9c4d17f89838a822baab5e99571c20113174f9 (commit)
       via  49821094fac389fb79838a921a627351d7fd157b (commit)
       via  d7bc3ff690b65a1b9c06a7858244d027f0020f66 (commit)
       via  f7fc99cec6a1db6c53dbf5158b2fb95534704b37 (commit)
      from  da5ef0dec88800e832c11de73fd372a0370af2d6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3328284961ecf7d404efca02b94d7747ed71997c
commit 3328284961ecf7d404efca02b94d7747ed71997c
Merge: da5ef0d 2f0b9c6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 09:32:53 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 09:32:53 2015 -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 Feb 19 09:35:48 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 19 Feb 2015 09:35:48 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-200-gd5ad641
Message-ID: <20150219143548.586C9AB14B@public.kitware.com>

This is an automated email from 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  d5ad641ac3fa161e67759d6feebd9d895ef68bf0 (commit)
       via  05e4fc6b2a664dee4229742577cf4d065ecec713 (commit)
       via  8371cd7893f4a10eefe9f806ce5ac0cdff152b08 (commit)
      from  2f0b9c67fcedc73bb398e2fea35d9a5cf5123ff8 (commit)

Those revisions listed 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 Feb 19 09:35:48 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 19 Feb 2015 09:35:48 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-490-g6e5b15c
Message-ID: <20150219143548.74C63AB14C@public.kitware.com>

This is an automated email from 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  6e5b15cb50a68da73cfb75aba5fda9d820707817 (commit)
       via  d5ad641ac3fa161e67759d6feebd9d895ef68bf0 (commit)
       via  05e4fc6b2a664dee4229742577cf4d065ecec713 (commit)
       via  8371cd7893f4a10eefe9f806ce5ac0cdff152b08 (commit)
      from  3328284961ecf7d404efca02b94d7747ed71997c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e5b15cb50a68da73cfb75aba5fda9d820707817
commit 6e5b15cb50a68da73cfb75aba5fda9d820707817
Merge: 3328284 d5ad641
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 09:35:13 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 09:35:13 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 19 09:35:48 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 19 Feb 2015 09:35:48 -0500 (EST)
Subject: [Cmake-commits] CMake branch, release,
	updated. v3.2.0-rc1-8-g05e4fc6
Message-ID: <20150219143548.8D1EBAB14D@public.kitware.com>

This is an automated email from 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  05e4fc6b2a664dee4229742577cf4d065ecec713 (commit)
       via  7e6608fe646729f7f14eedb55bd26d97a36223f7 (commit)
       via  8371cd7893f4a10eefe9f806ce5ac0cdff152b08 (commit)
       via  bce4e20f78bbaa708b621ff1feabcc975ac6345f (commit)
      from  9457bf9f4040f72c2d93da8bfb93d2554f37db17 (commit)

Those revisions listed 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/FindJNI.cmake                        |    1 +
 Utilities/Release/dash2win64_release.cmake   |    7 +------
 Utilities/Release/dashmacmini5_release.cmake |    7 +------
 3 files changed, 3 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 19 09:59:41 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 19 Feb 2015 09:59:41 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-492-g47227ed
Message-ID: <20150219145941.4F6BEAAE93@public.kitware.com>

This is an automated email from 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  47227ed33e343a5c30f88b92be1d79d654359cab (commit)
       via  46596c10169b40ed1bdf2b9300f1cc70c2642de9 (commit)
      from  6e5b15cb50a68da73cfb75aba5fda9d820707817 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47227ed33e343a5c30f88b92be1d79d654359cab
commit 47227ed33e343a5c30f88b92be1d79d654359cab
Merge: 6e5b15c 46596c1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 09:59:40 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 19 09:59:40 2015 -0500

    Merge topic 'find-command-prefix-from-PATH' into next
    
    46596c10 Tests: Fix RunCMake.find_* tests to save and restore PATH


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46596c10169b40ed1bdf2b9300f1cc70c2642de9
commit 46596c10169b40ed1bdf2b9300f1cc70c2642de9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 09:58:04 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 09:58:04 2015 -0500

    Tests: Fix RunCMake.find_* tests to save and restore PATH
    
    On some machines we need the system tools to be available in PATH.

diff --git a/Tests/RunCMake/find_file/PrefixInPATH.cmake b/Tests/RunCMake/find_file/PrefixInPATH.cmake
index 79106e9..1e33c08 100644
--- a/Tests/RunCMake/find_file/PrefixInPATH.cmake
+++ b/Tests/RunCMake/find_file/PrefixInPATH.cmake
@@ -1,6 +1,8 @@
+set(ENV_PATH "$ENV{PATH}")
 foreach(path "/does_not_exist" "" "/bin" "/sbin")
   unset(PrefixInPATH_INCLUDE_DIR CACHE)
   set(ENV{PATH} "${CMAKE_CURRENT_SOURCE_DIR}${path}")
   find_file(PrefixInPATH_INCLUDE_DIR NAMES PrefixInPATH.h)
   message(STATUS "PrefixInPATH_INCLUDE_DIR='${PrefixInPATH_INCLUDE_DIR}'")
 endforeach()
+set(ENV{PATH} "${ENV_PATH}")
diff --git a/Tests/RunCMake/find_library/PrefixInPATH.cmake b/Tests/RunCMake/find_library/PrefixInPATH.cmake
index 6e37359..f1b8b18 100644
--- a/Tests/RunCMake/find_library/PrefixInPATH.cmake
+++ b/Tests/RunCMake/find_library/PrefixInPATH.cmake
@@ -1,9 +1,11 @@
 list(APPEND CMAKE_FIND_LIBRARY_PREFIXES lib)
 list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .a)
 
+set(ENV_PATH "$ENV{PATH}")
 foreach(path "/does_not_exist" "" "/bin" "/sbin")
   unset(PrefixInPATH_LIBRARY CACHE)
   set(ENV{PATH} "${CMAKE_CURRENT_SOURCE_DIR}${path}")
   find_library(PrefixInPATH_LIBRARY NAMES PrefixInPATH)
   message(STATUS "PrefixInPATH_LIBRARY='${PrefixInPATH_LIBRARY}'")
 endforeach()
+set(ENV{PATH} "${ENV_PATH}")
diff --git a/Tests/RunCMake/find_path/PrefixInPATH.cmake b/Tests/RunCMake/find_path/PrefixInPATH.cmake
index a321910..614d64f 100644
--- a/Tests/RunCMake/find_path/PrefixInPATH.cmake
+++ b/Tests/RunCMake/find_path/PrefixInPATH.cmake
@@ -1,6 +1,8 @@
+set(ENV_PATH "$ENV{PATH}")
 foreach(path "/does_not_exist" "" "/bin" "/sbin")
   unset(PrefixInPATH_INCLUDE_DIR CACHE)
   set(ENV{PATH} "${CMAKE_CURRENT_SOURCE_DIR}${path}")
   find_path(PrefixInPATH_INCLUDE_DIR NAMES PrefixInPATH.h)
   message(STATUS "PrefixInPATH_INCLUDE_DIR='${PrefixInPATH_INCLUDE_DIR}'")
 endforeach()
+set(ENV{PATH} "${ENV_PATH}")

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

Summary of changes:
 Tests/RunCMake/find_file/PrefixInPATH.cmake    |    2 ++
 Tests/RunCMake/find_library/PrefixInPATH.cmake |    2 ++
 Tests/RunCMake/find_path/PrefixInPATH.cmake    |    2 ++
 3 files changed, 6 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 19 10:04:00 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 19 Feb 2015 10:04:00 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-494-ge4ad85c
Message-ID: <20150219150400.5791FAAFF0@public.kitware.com>

This is an automated email from 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  e4ad85cb200ae211795681dc627dafc947433712 (commit)
       via  ffc06c12397e7cda7307afcfc8a79ebda4a786a6 (commit)
      from  47227ed33e343a5c30f88b92be1d79d654359cab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4ad85cb200ae211795681dc627dafc947433712
commit e4ad85cb200ae211795681dc627dafc947433712
Merge: 47227ed ffc06c1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 10:03:59 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 19 10:03:59 2015 -0500

    Merge topic 'find-command-prefix-from-PATH' into next
    
    ffc06c12 Teach find_(library|file|path) to get prefixes from PATH (#15370)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffc06c12397e7cda7307afcfc8a79ebda4a786a6
commit ffc06c12397e7cda7307afcfc8a79ebda4a786a6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 10:54:45 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 10:03:17 2015 -0500

    Teach find_(library|file|path) to get prefixes from PATH (#15370)
    
    The find_package command already knows how to compute installation
    prefixes from PATH.  Use the same approach to establish prefixes for
    find_library, find_file, and find_path to use to look in directories
    like "<prefix>/lib[/<arch>]" and "<prefix>/include" for libraries and
    headers.  This will reduce the amount of configuration end users need to
    do to establish a work environment rooted under a specific prefix.

diff --git a/Help/command/FIND_XXX.txt b/Help/command/FIND_XXX.txt
index 5889e90..9358329 100644
--- a/Help/command/FIND_XXX.txt
+++ b/Help/command/FIND_XXX.txt
@@ -53,6 +53,10 @@ If NO_DEFAULT_PATH is not specified, the search process is as follows:
 .. |CMAKE_PREFIX_PATH_XXX_SUBDIR| replace::
    <prefix>/|XXX_SUBDIR| for each <prefix> in CMAKE_PREFIX_PATH
 
+.. |SYSTEM_ENVIRONMENT_PREFIX_PATH_XXX_SUBDIR| replace::
+   <prefix>/|XXX_SUBDIR| for each <prefix>/[s]bin in PATH, and
+   <entry>/|XXX_SUBDIR| for other entries in PATH
+
 .. |CMAKE_SYSTEM_PREFIX_PATH_XXX_SUBDIR| replace::
    <prefix>/|XXX_SUBDIR| for each <prefix> in CMAKE_SYSTEM_PREFIX_PATH
 
diff --git a/Help/command/find_file.rst b/Help/command/find_file.rst
index db7e151..be309a5 100644
--- a/Help/command/find_file.rst
+++ b/Help/command/find_file.rst
@@ -13,7 +13,10 @@ find_file
 .. |CMAKE_XXX_PATH| replace:: CMAKE_INCLUDE_PATH
 .. |CMAKE_XXX_MAC_PATH| replace:: CMAKE_FRAMEWORK_PATH
 
-.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: PATH and INCLUDE
+.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: Directories in INCLUDE,
+   <prefix>/include/<arch> if CMAKE_LIBRARY_ARCHITECTURE is set, and
+   |SYSTEM_ENVIRONMENT_PREFIX_PATH_XXX_SUBDIR|,
+   and the directories in PATH itself.
 
 .. |CMAKE_SYSTEM_PREFIX_PATH_XXX| replace::
    <prefix>/include/<arch> if CMAKE_LIBRARY_ARCHITECTURE is set, and
diff --git a/Help/command/find_library.rst b/Help/command/find_library.rst
index 91342ba..09df688 100644
--- a/Help/command/find_library.rst
+++ b/Help/command/find_library.rst
@@ -13,7 +13,10 @@ find_library
 .. |CMAKE_XXX_PATH| replace:: CMAKE_LIBRARY_PATH
 .. |CMAKE_XXX_MAC_PATH| replace:: CMAKE_FRAMEWORK_PATH
 
-.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: PATH and LIB
+.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: Directories in LIB,
+   <prefix>/lib/<arch> if CMAKE_LIBRARY_ARCHITECTURE is set, and
+   |SYSTEM_ENVIRONMENT_PREFIX_PATH_XXX_SUBDIR|,
+   and the directories in PATH itself.
 
 .. |CMAKE_SYSTEM_PREFIX_PATH_XXX| replace::
    <prefix>/lib/<arch> if CMAKE_LIBRARY_ARCHITECTURE is set, and
diff --git a/Help/command/find_path.rst b/Help/command/find_path.rst
index 95d49e7..b5a6e37 100644
--- a/Help/command/find_path.rst
+++ b/Help/command/find_path.rst
@@ -13,7 +13,10 @@ find_path
 .. |CMAKE_XXX_PATH| replace:: CMAKE_INCLUDE_PATH
 .. |CMAKE_XXX_MAC_PATH| replace:: CMAKE_FRAMEWORK_PATH
 
-.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: PATH and INCLUDE
+.. |SYSTEM_ENVIRONMENT_PATH_XXX| replace:: Directories in INCLUDE,
+   <prefix>/include/<arch> if CMAKE_LIBRARY_ARCHITECTURE is set, and
+   |SYSTEM_ENVIRONMENT_PREFIX_PATH_XXX_SUBDIR|,
+   and the directories in PATH itself.
 
 .. |CMAKE_SYSTEM_PREFIX_PATH_XXX| replace::
    <prefix>/include/<arch> if CMAKE_LIBRARY_ARCHITECTURE is set, and
diff --git a/Help/release/dev/find-command-prefix-from-PATH.rst b/Help/release/dev/find-command-prefix-from-PATH.rst
new file mode 100644
index 0000000..f9aae2a
--- /dev/null
+++ b/Help/release/dev/find-command-prefix-from-PATH.rst
@@ -0,0 +1,6 @@
+find-command-prefix-from-PATH
+-----------------------------
+
+* The :command:`find_library`, :command:`find_path`, and :command:`find_file`
+  commands now search in installation prefixes derived from the ``PATH``
+  environment variable.
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 6e55533..4336e1c 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -275,6 +275,7 @@ void cmFindBase::FillSystemEnvironmentPath()
   if(!this->EnvironmentPath.empty())
     {
     paths.AddEnvPath(this->EnvironmentPath);
+    paths.AddEnvPrefixPath("PATH", true);
     }
   // Add PATH
   paths.AddEnvPath("PATH");
diff --git a/Source/cmSearchPath.cxx b/Source/cmSearchPath.cxx
index 861dbf1..1e777ab 100644
--- a/Source/cmSearchPath.cxx
+++ b/Source/cmSearchPath.cxx
@@ -136,10 +136,30 @@ void cmSearchPath::AddCMakePrefixPath(const std::string& variable)
 }
 
 //----------------------------------------------------------------------------
-void cmSearchPath::AddEnvPrefixPath(const std::string& variable)
+static std::string cmSearchPathStripBin(std::string const& s)
+{
+  // If the path is a PREFIX/bin case then add its parent instead.
+  if((cmHasLiteralSuffix(s, "/bin")) ||
+     (cmHasLiteralSuffix(s, "/sbin")))
+    {
+    return cmSystemTools::GetFilenamePath(s);
+    }
+  else
+    {
+    return s;
+    }
+}
+
+//----------------------------------------------------------------------------
+void cmSearchPath::AddEnvPrefixPath(const std::string& variable, bool stripBin)
 {
   std::vector<std::string> expanded;
   cmSystemTools::GetPath(expanded, variable.c_str());
+  if (stripBin)
+    {
+    std::transform(expanded.begin(), expanded.end(), expanded.begin(),
+                   cmSearchPathStripBin);
+    }
   this->AddPrefixPaths(expanded);
 }
 
diff --git a/Source/cmSearchPath.h b/Source/cmSearchPath.h
index 51a6149..41c680d 100644
--- a/Source/cmSearchPath.h
+++ b/Source/cmSearchPath.h
@@ -42,7 +42,7 @@ public:
   void AddCMakePath(const std::string& variable);
   void AddEnvPath(const std::string& variable);
   void AddCMakePrefixPath(const std::string& variable);
-  void AddEnvPrefixPath(const std::string& variable);
+  void AddEnvPrefixPath(const std::string& variable, bool stripBin = false);
   void AddSuffixes(const std::vector<std::string>& suffixes);
 
 protected:
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index f0426e5..fd01201 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -131,8 +131,10 @@ add_RunCMake_test(export)
 add_RunCMake_test(cmake_minimum_required)
 add_RunCMake_test(continue)
 add_RunCMake_test(file)
+add_RunCMake_test(find_file)
 add_RunCMake_test(find_library)
 add_RunCMake_test(find_package)
+add_RunCMake_test(find_path)
 add_RunCMake_test(get_filename_component)
 add_RunCMake_test(get_property)
 add_RunCMake_test(if)
diff --git a/Tests/RunCMake/find_file/CMakeLists.txt b/Tests/RunCMake/find_file/CMakeLists.txt
new file mode 100644
index 0000000..ef2163c
--- /dev/null
+++ b/Tests/RunCMake/find_file/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.1)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/find_file/PrefixInPATH-stdout.txt b/Tests/RunCMake/find_file/PrefixInPATH-stdout.txt
new file mode 100644
index 0000000..d73bc1d
--- /dev/null
+++ b/Tests/RunCMake/find_file/PrefixInPATH-stdout.txt
@@ -0,0 +1,4 @@
+-- PrefixInPATH_INCLUDE_DIR='PrefixInPATH_INCLUDE_DIR-NOTFOUND'
+-- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h'
+-- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h'
+-- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_file/include/PrefixInPATH.h'
diff --git a/Tests/RunCMake/find_file/PrefixInPATH.cmake b/Tests/RunCMake/find_file/PrefixInPATH.cmake
new file mode 100644
index 0000000..1e33c08
--- /dev/null
+++ b/Tests/RunCMake/find_file/PrefixInPATH.cmake
@@ -0,0 +1,8 @@
+set(ENV_PATH "$ENV{PATH}")
+foreach(path "/does_not_exist" "" "/bin" "/sbin")
+  unset(PrefixInPATH_INCLUDE_DIR CACHE)
+  set(ENV{PATH} "${CMAKE_CURRENT_SOURCE_DIR}${path}")
+  find_file(PrefixInPATH_INCLUDE_DIR NAMES PrefixInPATH.h)
+  message(STATUS "PrefixInPATH_INCLUDE_DIR='${PrefixInPATH_INCLUDE_DIR}'")
+endforeach()
+set(ENV{PATH} "${ENV_PATH}")
diff --git a/Tests/RunCMake/find_file/RunCMakeTest.cmake b/Tests/RunCMake/find_file/RunCMakeTest.cmake
new file mode 100644
index 0000000..014f397
--- /dev/null
+++ b/Tests/RunCMake/find_file/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(PrefixInPATH)
diff --git a/Tests/RunCMake/find_file/include/PrefixInPATH.h b/Tests/RunCMake/find_file/include/PrefixInPATH.h
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_library/PrefixInPATH-stdout.txt b/Tests/RunCMake/find_library/PrefixInPATH-stdout.txt
new file mode 100644
index 0000000..1ab884c
--- /dev/null
+++ b/Tests/RunCMake/find_library/PrefixInPATH-stdout.txt
@@ -0,0 +1,4 @@
+-- PrefixInPATH_LIBRARY='PrefixInPATH_LIBRARY-NOTFOUND'
+-- PrefixInPATH_LIBRARY='.*/Tests/RunCMake/find_library/lib/libPrefixInPATH.a'
+-- PrefixInPATH_LIBRARY='.*/Tests/RunCMake/find_library/lib/libPrefixInPATH.a'
+-- PrefixInPATH_LIBRARY='.*/Tests/RunCMake/find_library/lib/libPrefixInPATH.a'
diff --git a/Tests/RunCMake/find_library/PrefixInPATH.cmake b/Tests/RunCMake/find_library/PrefixInPATH.cmake
new file mode 100644
index 0000000..f1b8b18
--- /dev/null
+++ b/Tests/RunCMake/find_library/PrefixInPATH.cmake
@@ -0,0 +1,11 @@
+list(APPEND CMAKE_FIND_LIBRARY_PREFIXES lib)
+list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .a)
+
+set(ENV_PATH "$ENV{PATH}")
+foreach(path "/does_not_exist" "" "/bin" "/sbin")
+  unset(PrefixInPATH_LIBRARY CACHE)
+  set(ENV{PATH} "${CMAKE_CURRENT_SOURCE_DIR}${path}")
+  find_library(PrefixInPATH_LIBRARY NAMES PrefixInPATH)
+  message(STATUS "PrefixInPATH_LIBRARY='${PrefixInPATH_LIBRARY}'")
+endforeach()
+set(ENV{PATH} "${ENV_PATH}")
diff --git a/Tests/RunCMake/find_library/RunCMakeTest.cmake b/Tests/RunCMake/find_library/RunCMakeTest.cmake
index 4000679..136031c 100644
--- a/Tests/RunCMake/find_library/RunCMakeTest.cmake
+++ b/Tests/RunCMake/find_library/RunCMakeTest.cmake
@@ -1,3 +1,4 @@
 include(RunCMake)
 
 run_cmake(Created)
+run_cmake(PrefixInPATH)
diff --git a/Tests/RunCMake/find_library/lib/libPrefixInPATH.a b/Tests/RunCMake/find_library/lib/libPrefixInPATH.a
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_path/CMakeLists.txt b/Tests/RunCMake/find_path/CMakeLists.txt
new file mode 100644
index 0000000..ef2163c
--- /dev/null
+++ b/Tests/RunCMake/find_path/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.1)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/find_path/PrefixInPATH-stdout.txt b/Tests/RunCMake/find_path/PrefixInPATH-stdout.txt
new file mode 100644
index 0000000..bb2ceb7
--- /dev/null
+++ b/Tests/RunCMake/find_path/PrefixInPATH-stdout.txt
@@ -0,0 +1,4 @@
+-- PrefixInPATH_INCLUDE_DIR='PrefixInPATH_INCLUDE_DIR-NOTFOUND'
+-- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_path/include'
+-- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_path/include'
+-- PrefixInPATH_INCLUDE_DIR='.*/Tests/RunCMake/find_path/include'
diff --git a/Tests/RunCMake/find_path/PrefixInPATH.cmake b/Tests/RunCMake/find_path/PrefixInPATH.cmake
new file mode 100644
index 0000000..614d64f
--- /dev/null
+++ b/Tests/RunCMake/find_path/PrefixInPATH.cmake
@@ -0,0 +1,8 @@
+set(ENV_PATH "$ENV{PATH}")
+foreach(path "/does_not_exist" "" "/bin" "/sbin")
+  unset(PrefixInPATH_INCLUDE_DIR CACHE)
+  set(ENV{PATH} "${CMAKE_CURRENT_SOURCE_DIR}${path}")
+  find_path(PrefixInPATH_INCLUDE_DIR NAMES PrefixInPATH.h)
+  message(STATUS "PrefixInPATH_INCLUDE_DIR='${PrefixInPATH_INCLUDE_DIR}'")
+endforeach()
+set(ENV{PATH} "${ENV_PATH}")
diff --git a/Tests/RunCMake/find_path/RunCMakeTest.cmake b/Tests/RunCMake/find_path/RunCMakeTest.cmake
new file mode 100644
index 0000000..014f397
--- /dev/null
+++ b/Tests/RunCMake/find_path/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(PrefixInPATH)
diff --git a/Tests/RunCMake/find_path/include/PrefixInPATH.h b/Tests/RunCMake/find_path/include/PrefixInPATH.h
new file mode 100644
index 0000000..e69de29

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 19 11:52:36 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 19 Feb 2015 11:52:36 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-499-g5a76ddf
Message-ID: <20150219165236.4112DAAA4A@public.kitware.com>

This is an automated email from 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  5a76ddf4c32aab2ec92266dd93bf79dfc16f3c98 (commit)
       via  1d82105e29fc6f0bb71a474f876a7553b397cc26 (commit)
       via  d7662141a771f105e64b56543d99ee43e7d00849 (commit)
       via  9b50388b0989fab1d77fbb3d48e648c86427d808 (commit)
       via  76e7c22b3c37f382d6232ee95fe77e39e7aa269d (commit)
      from  e4ad85cb200ae211795681dc627dafc947433712 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a76ddf4c32aab2ec92266dd93bf79dfc16f3c98
commit 5a76ddf4c32aab2ec92266dd93bf79dfc16f3c98
Merge: e4ad85c 1d82105
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 11:52:32 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 19 11:52:32 2015 -0500

    Merge topic 'test-RunCMake-refactor-ctest' into next
    
    1d82105e Tests: Rename RunCMake.{CTestMemcheck => ctest_memcheck}
    d7662141 Tests: Rename RunCMake.{CTestSubmit => ctest_submit}
    9b50388b Tests: Split RunCTest helper out of RunCMake.CTest(Submit|Memcheck)
    76e7c22b Tests: Rename RunCMake.CTestMemcheck internals to match CTestSubmit

diff --cc Tests/RunCMake/CMakeLists.txt
index 4994896,59c6918..3cc386f
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -130,11 -129,10 +129,12 @@@ add_RunCMake_test(build_command
  add_RunCMake_test(export)
  add_RunCMake_test(cmake_minimum_required)
  add_RunCMake_test(continue)
+ add_RunCMake_test(ctest_submit)
  add_RunCMake_test(file)
 +add_RunCMake_test(find_file)
  add_RunCMake_test(find_library)
  add_RunCMake_test(find_package)
 +add_RunCMake_test(find_path)
  add_RunCMake_test(get_filename_component)
  add_RunCMake_test(get_property)
  add_RunCMake_test(if)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1d82105e29fc6f0bb71a474f876a7553b397cc26
commit 1d82105e29fc6f0bb71a474f876a7553b397cc26
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 11:35:51 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 11:35:51 2015 -0500

    Tests: Rename RunCMake.{CTestMemcheck => ctest_memcheck}
    
    Follow the convention of naming tests after the command they test.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 44e6ec4..59c6918 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -66,7 +66,7 @@ add_RunCMake_test(CMP0055)
 add_RunCMake_test(CTest)
 
 if(NOT CMake_TEST_EXTERNAL_CMAKE)
-  add_RunCMake_test(CTestMemcheck
+  add_RunCMake_test(ctest_memcheck
     -DPSEUDO_BC=$<TARGET_FILE:pseudo_BC>
     -DPSEUDO_PURIFY=$<TARGET_FILE:pseudo_purify>
     -DPSEUDO_VALGRIND=$<TARGET_FILE:pseudo_valgrind>
diff --git a/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-stderr.txt
deleted file mode 100644
index 725270c..0000000
--- a/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stderr.txt
deleted file mode 100644
index 634e331..0000000
--- a/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-build/Testing/Temporary/MemoryChecker.1.log
-.*Error parsing XML in stream at line 1: no element found
-Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-stderr.txt
deleted file mode 100644
index 520222f..0000000
--- a/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-stderr.txt
deleted file mode 100644
index 29c6ec7..0000000
--- a/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stderr.txt
deleted file mode 100644
index 2506f35..0000000
--- a/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-build/Testing/Temporary/MemoryChecker.1.log
-Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-stderr.txt
deleted file mode 100644
index ca23692..0000000
--- a/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
deleted file mode 100644
index fd684da..0000000
--- a/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stderr.txt
deleted file mode 100644
index 1a2ee5c..0000000
--- a/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-build/Testing/Temporary/MemoryChecker.1.log
-Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stdout.txt
deleted file mode 100644
index 9a6a1d6..0000000
--- a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
-Memory check project .*/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-build
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stderr.txt
deleted file mode 100644
index d8d1ff0..0000000
--- a/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Cannot find memory checker suppression file: .*/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-build/does-not-exist
-Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stdout.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stdout.txt
deleted file mode 100644
index d46912e..0000000
--- a/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
-Memory check project .*/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-build$
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stderr.txt b/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stderr.txt
deleted file mode 100644
index 321a2a5..0000000
--- a/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Cannot find memory tester output file: .*/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-build/Testing/Temporary/MemoryChecker.1.log
-Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/NotExist-stdout.txt b/Tests/RunCMake/CTestMemcheck/NotExist-stdout.txt
deleted file mode 100644
index 9e92266..0000000
--- a/Tests/RunCMake/CTestMemcheck/NotExist-stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
-Memory check project .*/Tests/RunCMake/CTestMemcheck/NotExist-build$
diff --git a/Tests/RunCMake/CTestMemcheck/Unknown-stderr.txt b/Tests/RunCMake/CTestMemcheck/Unknown-stderr.txt
deleted file mode 100644
index 2beea2d..0000000
--- a/Tests/RunCMake/CTestMemcheck/Unknown-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Do not understand memory checker: .*/cmake.*
-Error in read script: .*/Tests/RunCMake/CTestMemcheck/Unknown/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/Unknown-stdout.txt b/Tests/RunCMake/CTestMemcheck/Unknown-stdout.txt
deleted file mode 100644
index 7ea1af0..0000000
--- a/Tests/RunCMake/CTestMemcheck/Unknown-stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
-Memory check project .*/Tests/RunCMake/CTestMemcheck/Unknown-build$
diff --git a/Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in b/Tests/RunCMake/ctest_memcheck/CMakeLists.txt.in
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in
rename to Tests/RunCMake/ctest_memcheck/CMakeLists.txt.in
diff --git a/Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in b/Tests/RunCMake/ctest_memcheck/CTestConfig.cmake.in
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in
rename to Tests/RunCMake/ctest_memcheck/CTestConfig.cmake.in
diff --git a/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-result.txt b/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-result.txt
diff --git a/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt
new file mode 100644
index 0000000..00f4779
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt
@@ -0,0 +1,2 @@
+Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
+Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-stdout.txt
rename to Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stdout.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyBC-result.txt b/Tests/RunCMake/ctest_memcheck/DummyBC-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyBC-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyBC-result.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyBC-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyBC-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyBC-stderr.txt
rename to Tests/RunCMake/ctest_memcheck/DummyBC-stderr.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyBC-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyBC-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyBC-stdout.txt
rename to Tests/RunCMake/ctest_memcheck/DummyBC-stdout.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-result.txt b/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-result.txt
diff --git a/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt
new file mode 100644
index 0000000..5c582ac
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt
@@ -0,0 +1,3 @@
+Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-build/Testing/Temporary/MemoryChecker.1.log
+.*Error parsing XML in stream at line 1: no element found
+Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stdout.txt
rename to Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stdout.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-result.txt b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-result.txt
diff --git a/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt
new file mode 100644
index 0000000..c099340
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt
@@ -0,0 +1,2 @@
+Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
+Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-stdout.txt
rename to Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stdout.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-result.txt b/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-result.txt
diff --git a/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt
new file mode 100644
index 0000000..6c42ec1
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt
@@ -0,0 +1,2 @@
+Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
+Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-stdout.txt
rename to Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stdout.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyPurify-result.txt b/Tests/RunCMake/ctest_memcheck/DummyPurify-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyPurify-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyPurify-result.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyPurify-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyPurify-stderr.txt
rename to Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyPurify-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyPurify-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyPurify-stdout.txt
rename to Tests/RunCMake/ctest_memcheck/DummyPurify-stdout.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-result.txt b/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-result.txt
diff --git a/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt
new file mode 100644
index 0000000..41120b5
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt
@@ -0,0 +1,2 @@
+Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-build/Testing/Temporary/MemoryChecker.1.log
+Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stdout.txt
rename to Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stdout.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-result.txt b/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-result.txt
diff --git a/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt
new file mode 100644
index 0000000..cb353ad
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt
@@ -0,0 +1,2 @@
+Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
+Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-stdout.txt
rename to Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stdout.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-result.txt b/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-result.txt
diff --git a/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
new file mode 100644
index 0000000..7ce798c
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
@@ -0,0 +1,2 @@
+Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
+Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-stdout.txt
rename to Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stdout.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrind-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrind-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrind-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrind-result.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrind-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrind-stderr.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrind-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrind-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrind-stdout.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrind-stdout.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-result.txt
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt
new file mode 100644
index 0000000..97bb833
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt
@@ -0,0 +1,2 @@
+Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-build/Testing/Temporary/MemoryChecker.1.log
+Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stdout.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stdout.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-result.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt
similarity index 50%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stderr.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt
index 2d078ef..0c997ff 100644
--- a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt
@@ -1,3 +1,3 @@
 Problem running command: .*memcheck_fail.*
 Problem executing post-memcheck command\(s\).
-Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost/test.cmake
+Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindFailPost-stdout.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stdout.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-result.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt
similarity index 50%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stderr.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt
index 43ccb2e..1d1b1e7 100644
--- a/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt
@@ -1,3 +1,3 @@
 Problem running command: .*memcheck_fail.*
 Problem executing pre-memcheck command\(s\).
-Error in read script: .*/Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre/test.cmake
+Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stdout.txt
new file mode 100644
index 0000000..8d8b7e9
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stdout.txt
@@ -0,0 +1 @@
+Memory check project .*/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-build
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-result.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stderr.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stdout.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stdout.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-result.txt
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt
new file mode 100644
index 0000000..65beb81
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt
@@ -0,0 +1,2 @@
+Cannot find memory checker suppression file: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-build/does-not-exist
+Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stdout.txt
new file mode 100644
index 0000000..4c58df4
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stdout.txt
@@ -0,0 +1 @@
+Memory check project .*/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-build$
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-result.txt
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt
new file mode 100644
index 0000000..e2a836f
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt
@@ -0,0 +1,2 @@
+Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-build/Testing/Temporary/MemoryChecker.1.log
+Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile/test.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stdout.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stdout.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-result.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stderr.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stdout.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stdout.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-result.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-result.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-result.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stderr.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt
diff --git a/Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stdout.txt
rename to Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stdout.txt
diff --git a/Tests/RunCMake/CTestMemcheck/NotExist-result.txt b/Tests/RunCMake/ctest_memcheck/NotExist-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/NotExist-result.txt
rename to Tests/RunCMake/ctest_memcheck/NotExist-result.txt
diff --git a/Tests/RunCMake/CTestMemcheck/NotExist-stderr.txt b/Tests/RunCMake/ctest_memcheck/NotExist-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/NotExist-stderr.txt
rename to Tests/RunCMake/ctest_memcheck/NotExist-stderr.txt
diff --git a/Tests/RunCMake/ctest_memcheck/NotExist-stdout.txt b/Tests/RunCMake/ctest_memcheck/NotExist-stdout.txt
new file mode 100644
index 0000000..0e58936
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/NotExist-stdout.txt
@@ -0,0 +1 @@
+Memory check project .*/Tests/RunCMake/ctest_memcheck/NotExist-build$
diff --git a/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake
rename to Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/Unknown-result.txt b/Tests/RunCMake/ctest_memcheck/Unknown-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/Unknown-result.txt
rename to Tests/RunCMake/ctest_memcheck/Unknown-result.txt
diff --git a/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt b/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt
new file mode 100644
index 0000000..99df8b3
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt
@@ -0,0 +1,2 @@
+Do not understand memory checker: .*/cmake.*
+Error in read script: .*/Tests/RunCMake/ctest_memcheck/Unknown/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/Unknown-stdout.txt b/Tests/RunCMake/ctest_memcheck/Unknown-stdout.txt
new file mode 100644
index 0000000..0208e80
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/Unknown-stdout.txt
@@ -0,0 +1 @@
+Memory check project .*/Tests/RunCMake/ctest_memcheck/Unknown-build$
diff --git a/Tests/RunCMake/CTestMemcheck/test.cmake.in b/Tests/RunCMake/ctest_memcheck/test.cmake.in
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/test.cmake.in
rename to Tests/RunCMake/ctest_memcheck/test.cmake.in
diff --git a/Tests/RunCMake/CTestMemcheck/testAddressSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/testAddressSanitizer.cmake
rename to Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/testLeakSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/testLeakSanitizer.cmake
rename to Tests/RunCMake/ctest_memcheck/testLeakSanitizer.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/testMemorySanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/testMemorySanitizer.cmake
rename to Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/testThreadSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/testThreadSanitizer.cmake
rename to Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake
diff --git a/Tests/RunCMake/CTestMemcheck/testUndefinedBehaviorSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake
similarity index 100%
rename from Tests/RunCMake/CTestMemcheck/testUndefinedBehaviorSanitizer.cmake
rename to Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7662141a771f105e64b56543d99ee43e7d00849
commit d7662141a771f105e64b56543d99ee43e7d00849
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 11:33:32 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 11:33:32 2015 -0500

    Tests: Rename RunCMake.{CTestSubmit => ctest_submit}
    
    Follow the convention of naming tests after the command they test.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 2de82a7..44e6ec4 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -64,7 +64,6 @@ add_RunCMake_test(CMP0053)
 add_RunCMake_test(CMP0054)
 add_RunCMake_test(CMP0055)
 add_RunCMake_test(CTest)
-add_RunCMake_test(CTestSubmit)
 
 if(NOT CMake_TEST_EXTERNAL_CMAKE)
   add_RunCMake_test(CTestMemcheck
@@ -130,6 +129,7 @@ add_RunCMake_test(build_command)
 add_RunCMake_test(export)
 add_RunCMake_test(cmake_minimum_required)
 add_RunCMake_test(continue)
+add_RunCMake_test(ctest_submit)
 add_RunCMake_test(file)
 add_RunCMake_test(find_library)
 add_RunCMake_test(find_package)
diff --git a/Tests/RunCMake/CTestSubmit/BadArg-stderr.txt b/Tests/RunCMake/CTestSubmit/BadArg-stderr.txt
deleted file mode 100644
index 68812ab..0000000
--- a/Tests/RunCMake/CTestSubmit/BadArg-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/BadArg/test.cmake:[0-9]+ \(ctest_submit\):
-  ctest_submit called with unknown argument "bad-arg".
diff --git a/Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt b/Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt
deleted file mode 100644
index 703224b..0000000
--- a/Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/BadFILES/test.cmake:[0-9]+ \(ctest_submit\):
-  File "bad-file" does not exist.  Cannot submit a non-existent file.
diff --git a/Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt b/Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt
deleted file mode 100644
index 4e491a9..0000000
--- a/Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/BadPARTS/test.cmake:[0-9]+ \(ctest_submit\):
-  Part name "bad-part" is invalid.
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadFILES-stderr.txt b/Tests/RunCMake/CTestSubmit/CDashUploadFILES-stderr.txt
deleted file mode 100644
index 48177e2..0000000
--- a/Tests/RunCMake/CTestSubmit/CDashUploadFILES-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/CDashUploadFILES/test.cmake:[0-9]+ \(ctest_submit\):
-  ctest_submit called with unknown argument "FILES".
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadPARTS-stderr.txt b/Tests/RunCMake/CTestSubmit/CDashUploadPARTS-stderr.txt
deleted file mode 100644
index 497ead2..0000000
--- a/Tests/RunCMake/CTestSubmit/CDashUploadPARTS-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/CDashUploadPARTS/test.cmake:[0-9]+ \(ctest_submit\):
-  ctest_submit called with unknown argument "PARTS".
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt b/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt
deleted file mode 100644
index 8c4e6b1..0000000
--- a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT/test.cmake:[0-9]+ \(ctest_submit\):
-  ctest_submit called with unknown argument "RETRY_COUNT".
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt b/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt
deleted file mode 100644
index 6c56399..0000000
--- a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY/test.cmake:[0-9]+ \(ctest_submit\):
-  ctest_submit called with unknown argument "RETRY_DELAY".
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt
deleted file mode 100644
index b451315..0000000
--- a/Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Missing arguments for submit via cp:
-.*
-   Problems when submitting via CP
-Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-cp/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt
deleted file mode 100644
index a622fac..0000000
--- a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Error message was: .*
-   Problems when submitting via FTP
-Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-ftp/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt
deleted file mode 100644
index 6870d2e..0000000
--- a/Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Error message was: .*
-   Problems when submitting via HTTP
-Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-http/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt
deleted file mode 100644
index a3c0cd5..0000000
--- a/Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Error message was: .*
-   Problems when submitting via HTTP
-Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-https/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt
deleted file mode 100644
index 42b8f50..0000000
--- a/Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-   Problems when submitting via SCP
-Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-scp/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/PARTSCDashUpload-stderr.txt b/Tests/RunCMake/CTestSubmit/PARTSCDashUpload-stderr.txt
deleted file mode 100644
index dfa7e33..0000000
--- a/Tests/RunCMake/CTestSubmit/PARTSCDashUpload-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/PARTSCDashUpload/test.cmake:[0-9]+ \(ctest_submit\):
-  Part name "CDASH_UPLOAD" is invalid.
diff --git a/Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-stderr.txt b/Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-stderr.txt
deleted file mode 100644
index 42becaf..0000000
--- a/Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/PARTSCDashUploadType/test.cmake:[0-9]+ \(ctest_submit\):
-  Part name "CDASH_UPLOAD_TYPE" is invalid.
diff --git a/Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-stderr.txt b/Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-stderr.txt
deleted file mode 100644
index d56793e..0000000
--- a/Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE/test.cmake:[0-9]+ \(ctest_submit\):
-  Called with more than one value for RETURN_VALUE
diff --git a/Tests/RunCMake/CTestSubmit/BadArg-result.txt b/Tests/RunCMake/ctest_submit/BadArg-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/BadArg-result.txt
rename to Tests/RunCMake/ctest_submit/BadArg-result.txt
diff --git a/Tests/RunCMake/ctest_submit/BadArg-stderr.txt b/Tests/RunCMake/ctest_submit/BadArg-stderr.txt
new file mode 100644
index 0000000..7eeef0a
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/BadArg-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/BadArg/test.cmake:[0-9]+ \(ctest_submit\):
+  ctest_submit called with unknown argument "bad-arg".
diff --git a/Tests/RunCMake/CTestSubmit/BadFILES-result.txt b/Tests/RunCMake/ctest_submit/BadFILES-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/BadFILES-result.txt
rename to Tests/RunCMake/ctest_submit/BadFILES-result.txt
diff --git a/Tests/RunCMake/ctest_submit/BadFILES-stderr.txt b/Tests/RunCMake/ctest_submit/BadFILES-stderr.txt
new file mode 100644
index 0000000..ab84ab9
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/BadFILES-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/BadFILES/test.cmake:[0-9]+ \(ctest_submit\):
+  File "bad-file" does not exist.  Cannot submit a non-existent file.
diff --git a/Tests/RunCMake/CTestSubmit/BadPARTS-result.txt b/Tests/RunCMake/ctest_submit/BadPARTS-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/BadPARTS-result.txt
rename to Tests/RunCMake/ctest_submit/BadPARTS-result.txt
diff --git a/Tests/RunCMake/ctest_submit/BadPARTS-stderr.txt b/Tests/RunCMake/ctest_submit/BadPARTS-stderr.txt
new file mode 100644
index 0000000..3db54f3
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/BadPARTS-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/BadPARTS/test.cmake:[0-9]+ \(ctest_submit\):
+  Part name "bad-part" is invalid.
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadFILES-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadFILES-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CDashUploadFILES-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadFILES-result.txt
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadFILES-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadFILES-stderr.txt
new file mode 100644
index 0000000..0106fee
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashUploadFILES-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadFILES/test.cmake:[0-9]+ \(ctest_submit\):
+  ctest_submit called with unknown argument "FILES".
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadFTP-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadFTP-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CDashUploadFTP-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadFTP-result.txt
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadFTP-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadFTP-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CDashUploadFTP-stderr.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadFTP-stderr.txt
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadNone-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadNone-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CDashUploadNone-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadNone-result.txt
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadNone-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadNone-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CDashUploadNone-stderr.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadNone-stderr.txt
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadPARTS-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadPARTS-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CDashUploadPARTS-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadPARTS-result.txt
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadPARTS-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadPARTS-stderr.txt
new file mode 100644
index 0000000..fe94cb7
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashUploadPARTS-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadPARTS/test.cmake:[0-9]+ \(ctest_submit\):
+  ctest_submit called with unknown argument "PARTS".
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-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/CTestSubmit/CDashUploadRETRY_DELAY-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-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/CTestSubmit/CMakeLists.txt.in b/Tests/RunCMake/ctest_submit/CMakeLists.txt.in
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CMakeLists.txt.in
rename to Tests/RunCMake/ctest_submit/CMakeLists.txt.in
diff --git a/Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in b/Tests/RunCMake/ctest_submit/CTestConfig.cmake.in
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in
rename to Tests/RunCMake/ctest_submit/CTestConfig.cmake.in
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-cp-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-cp-result.txt
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt
new file mode 100644
index 0000000..c3c084d
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt
@@ -0,0 +1,4 @@
+Missing arguments for submit via cp:
+.*
+   Problems when submitting via CP
+Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-cp/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-cp-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-cp-stdout.txt
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-ftp-result.txt
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
new file mode 100644
index 0000000..73df5c1
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
@@ -0,0 +1,3 @@
+Error message was: .*
+   Problems when submitting via FTP
+Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-ftp/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-ftp-stdout.txt
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-http-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-http-result.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-http-result.txt
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
new file mode 100644
index 0000000..c1a9126
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
@@ -0,0 +1,3 @@
+Error message was: .*
+   Problems when submitting via HTTP
+Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-http/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-http-stdout.txt
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-https-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-https-result.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-https-result.txt
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
new file mode 100644
index 0000000..11db01a
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
@@ -0,0 +1,3 @@
+Error message was: .*
+   Problems when submitting via HTTP
+Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-https/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-https-stdout.txt
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-scp-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-scp-result.txt
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt
new file mode 100644
index 0000000..0790297
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt
@@ -0,0 +1,2 @@
+   Problems when submitting via SCP
+Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-scp/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-scp-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-scp-stdout.txt
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-result.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-result.txt
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt
similarity index 54%
rename from Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt
index 020b615..23ea92c 100644
--- a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt
@@ -1,2 +1,2 @@
    (Problems when submitting via XML-RPC|Submission method "xmlrpc" not compiled into CTest!)
-Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc/test.cmake
+Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stdout.txt
diff --git a/Tests/RunCMake/CTestSubmit/PARTSCDashUpload-result.txt b/Tests/RunCMake/ctest_submit/PARTSCDashUpload-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/PARTSCDashUpload-result.txt
rename to Tests/RunCMake/ctest_submit/PARTSCDashUpload-result.txt
diff --git a/Tests/RunCMake/ctest_submit/PARTSCDashUpload-stderr.txt b/Tests/RunCMake/ctest_submit/PARTSCDashUpload-stderr.txt
new file mode 100644
index 0000000..ad4c8cb
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/PARTSCDashUpload-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/PARTSCDashUpload/test.cmake:[0-9]+ \(ctest_submit\):
+  Part name "CDASH_UPLOAD" is invalid.
diff --git a/Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-result.txt b/Tests/RunCMake/ctest_submit/PARTSCDashUploadType-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-result.txt
rename to Tests/RunCMake/ctest_submit/PARTSCDashUploadType-result.txt
diff --git a/Tests/RunCMake/ctest_submit/PARTSCDashUploadType-stderr.txt b/Tests/RunCMake/ctest_submit/PARTSCDashUploadType-stderr.txt
new file mode 100644
index 0000000..8d8a852
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/PARTSCDashUploadType-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/PARTSCDashUploadType/test.cmake:[0-9]+ \(ctest_submit\):
+  Part name "CDASH_UPLOAD_TYPE" is invalid.
diff --git a/Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-result.txt b/Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-result.txt
rename to Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-result.txt
diff --git a/Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-stderr.txt b/Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-stderr.txt
new file mode 100644
index 0000000..6e17c75
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE/test.cmake:[0-9]+ \(ctest_submit\):
+  Called with more than one value for RETURN_VALUE
diff --git a/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake
rename to Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
diff --git a/Tests/RunCMake/CTestSubmit/test.cmake.in b/Tests/RunCMake/ctest_submit/test.cmake.in
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/test.cmake.in
rename to Tests/RunCMake/ctest_submit/test.cmake.in

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b50388b0989fab1d77fbb3d48e648c86427d808
commit 9b50388b0989fab1d77fbb3d48e648c86427d808
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 11:07:34 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 11:26:44 2015 -0500

    Tests: Split RunCTest helper out of RunCMake.CTest(Submit|Memcheck)
    
    Provide the "run_ctest" macro for use in other tests that also
    want to cover running "ctest" scripts.

diff --git a/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake b/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake
index 005745e..b1793fa 100644
--- a/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake
@@ -1,23 +1,11 @@
-include(RunCMake)
+include(RunCTest)
 
 set(SITE test-site)
 set(BUILDNAME test-build)
 set(COVERAGE_COMMAND "")
 
 function(run_mc_test CASE_NAME CHECKER_COMMAND)
-  configure_file(${RunCMake_SOURCE_DIR}/test.cmake.in
-                 ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake @ONLY)
-  configure_file(${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in
-                 ${RunCMake_BINARY_DIR}/${CASE_NAME}/CTestConfig.cmake @ONLY)
-  configure_file(${RunCMake_SOURCE_DIR}/CMakeLists.txt.in
-                 ${RunCMake_BINARY_DIR}/${CASE_NAME}/CMakeLists.txt @ONLY)
-  run_cmake_command(${CASE_NAME} ${CMAKE_CTEST_COMMAND}
-    -C Debug
-    -S ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake
-    -V
-    --output-log ${RunCMake_BINARY_DIR}/${CASE_NAME}-build/testOutput.log
-    ${ARGN}
-    )
+  run_ctest(${CASE_NAME} ${ARGN})
 endfunction()
 
 unset(CTEST_EXTRA_CONFIG)
diff --git a/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake b/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake
index 797365d..c004e97 100644
--- a/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake
@@ -1,26 +1,10 @@
-include(RunCMake)
+include(RunCTest)
 
 # Default case parameters.
 set(CASE_DROP_METHOD "http")
 set(CASE_DROP_SITE "-no-site-")
 set(CASE_CTEST_SUBMIT_ARGS "")
 
-function(run_ctest CASE_NAME)
-  configure_file(${RunCMake_SOURCE_DIR}/test.cmake.in
-                 ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake @ONLY)
-  configure_file(${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in
-                 ${RunCMake_BINARY_DIR}/${CASE_NAME}/CTestConfig.cmake @ONLY)
-  configure_file(${RunCMake_SOURCE_DIR}/CMakeLists.txt.in
-                 ${RunCMake_BINARY_DIR}/${CASE_NAME}/CMakeLists.txt @ONLY)
-  run_cmake_command(${CASE_NAME} ${CMAKE_CTEST_COMMAND}
-    -C Debug
-    -S ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake
-    -V
-    --output-log ${RunCMake_BINARY_DIR}/${CASE_NAME}-build/testOutput.log
-    ${ARGN}
-    )
-endfunction()
-
 #-----------------------------------------------------------------------------
 # Test bad argument combinations.
 
diff --git a/Tests/RunCMake/README.rst b/Tests/RunCMake/README.rst
index e801a86..4aae4ae 100644
--- a/Tests/RunCMake/README.rst
+++ b/Tests/RunCMake/README.rst
@@ -22,6 +22,16 @@ but do not actually build anything.  To add a test:
 
    to fully customize the test case command-line.
 
+   Alternatively, if the test is to cover running ``ctest -S`` then use::
+
+    include(RunCTest)
+    run_ctest(SubTest1)
+    ...
+    run_ctest(SubTestN)
+
+   and create ``test.cmake.in``, ``CTestConfig.cmake.in``, and
+   ``CMakeLists.txt.in`` files to be configured for each case.
+
 4. Create file ``<Test>/CMakeLists.txt`` in the directory containing::
 
     cmake_minimum_required(...)
diff --git a/Tests/RunCMake/RunCTest.cmake b/Tests/RunCMake/RunCTest.cmake
new file mode 100644
index 0000000..e94432b
--- /dev/null
+++ b/Tests/RunCMake/RunCTest.cmake
@@ -0,0 +1,17 @@
+include(RunCMake)
+
+function(run_ctest CASE_NAME)
+  configure_file(${RunCMake_SOURCE_DIR}/test.cmake.in
+                 ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake @ONLY)
+  configure_file(${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in
+                 ${RunCMake_BINARY_DIR}/${CASE_NAME}/CTestConfig.cmake @ONLY)
+  configure_file(${RunCMake_SOURCE_DIR}/CMakeLists.txt.in
+                 ${RunCMake_BINARY_DIR}/${CASE_NAME}/CMakeLists.txt @ONLY)
+  run_cmake_command(${CASE_NAME} ${CMAKE_CTEST_COMMAND}
+    -C Debug
+    -S ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake
+    -V
+    --output-log ${RunCMake_BINARY_DIR}/${CASE_NAME}-build/testOutput.log
+    ${ARGN}
+    )
+endfunction()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76e7c22b3c37f382d6232ee95fe77e39e7aa269d
commit 76e7c22b3c37f382d6232ee95fe77e39e7aa269d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 19 11:21:55 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 11:26:43 2015 -0500

    Tests: Rename RunCMake.CTestMemcheck internals to match CTestSubmit

diff --git a/Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in b/Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in
index d15d148..3b8edf4 100644
--- a/Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in
+++ b/Tests/RunCMake/CTestMemcheck/CMakeLists.txt.in
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.9)
-project(CTestTestMemcheck at SUBTEST_NAME@ NONE)
+project(CTestTestMemcheck at CASE_NAME@ NONE)
 include(CTest)
 
 add_test(NAME RunCMake COMMAND "${CMAKE_COMMAND}" --version)
diff --git a/Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in b/Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in
index 19c76c2..6d4a718 100644
--- a/Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in
+++ b/Tests/RunCMake/CTestMemcheck/CTestConfig.cmake.in
@@ -1,4 +1,4 @@
-set (CTEST_PROJECT_NAME "CTestTestMemcheck at SUBTEST_NAME@")
+set (CTEST_PROJECT_NAME "CTestTestMemcheck at CASE_NAME@")
 set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set (CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")
diff --git a/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake b/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake
index 6485de8..005745e 100644
--- a/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestMemcheck/RunCMakeTest.cmake
@@ -4,18 +4,18 @@ set(SITE test-site)
 set(BUILDNAME test-build)
 set(COVERAGE_COMMAND "")
 
-function(run_mc_test SUBTEST_NAME CHECKER_COMMAND)
+function(run_mc_test CASE_NAME CHECKER_COMMAND)
   configure_file(${RunCMake_SOURCE_DIR}/test.cmake.in
-                 ${RunCMake_BINARY_DIR}/${SUBTEST_NAME}/test.cmake @ONLY)
+                 ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake @ONLY)
   configure_file(${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in
-                 ${RunCMake_BINARY_DIR}/${SUBTEST_NAME}/CTestConfig.cmake @ONLY)
+                 ${RunCMake_BINARY_DIR}/${CASE_NAME}/CTestConfig.cmake @ONLY)
   configure_file(${RunCMake_SOURCE_DIR}/CMakeLists.txt.in
-                 ${RunCMake_BINARY_DIR}/${SUBTEST_NAME}/CMakeLists.txt @ONLY)
-  run_cmake_command(${SUBTEST_NAME} ${CMAKE_CTEST_COMMAND}
+                 ${RunCMake_BINARY_DIR}/${CASE_NAME}/CMakeLists.txt @ONLY)
+  run_cmake_command(${CASE_NAME} ${CMAKE_CTEST_COMMAND}
     -C Debug
-    -S ${RunCMake_BINARY_DIR}/${SUBTEST_NAME}/test.cmake
+    -S ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake
     -V
-    --output-log ${RunCMake_BINARY_DIR}/${SUBTEST_NAME}-build/testOutput.log
+    --output-log ${RunCMake_BINARY_DIR}/${CASE_NAME}-build/testOutput.log
     ${ARGN}
     )
 endfunction()
diff --git a/Tests/RunCMake/CTestMemcheck/test.cmake.in b/Tests/RunCMake/CTestMemcheck/test.cmake.in
index 622d709..f9c1ba9 100644
--- a/Tests/RunCMake/CTestMemcheck/test.cmake.in
+++ b/Tests/RunCMake/CTestMemcheck/test.cmake.in
@@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.8.9)
 
 # Settings:
 set(CTEST_SITE                          "@SITE@")
-set(CTEST_BUILD_NAME                    "CTestTest- at BUILDNAME@-Memcheck at SUBTEST_NAME@")
+set(CTEST_BUILD_NAME                    "CTestTest- at BUILDNAME@-Memcheck at CASE_NAME@")
 
-set(CTEST_SOURCE_DIRECTORY              "@RunCMake_BINARY_DIR@/@SUBTEST_NAME@")
-set(CTEST_BINARY_DIRECTORY              "@RunCMake_BINARY_DIR@/@SUBTEST_NAME at -build")
+set(CTEST_SOURCE_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME@")
+set(CTEST_BINARY_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME at -build")
 set(CTEST_CMAKE_GENERATOR               "@RunCMake_GENERATOR@")
 set(CTEST_CMAKE_GENERATOR_PLATFORM      "@RunCMake_GENERATOR_PLATFORM@")
 set(CTEST_CMAKE_GENERATOR_TOOLSET       "@RunCMake_GENERATOR_TOOLSET@")

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt                        |    4 ++--
 .../CTestMemcheck/DummyAddressSanitizer-stderr.txt   |    2 --
 .../CTestMemcheck/DummyBCNoLogFile-stderr.txt        |    3 ---
 .../CTestMemcheck/DummyLeakSanitizer-stderr.txt      |    2 --
 .../CTestMemcheck/DummyMemorySanitizer-stderr.txt    |    2 --
 .../CTestMemcheck/DummyPurifyNoLogFile-stderr.txt    |    2 --
 .../CTestMemcheck/DummyThreadSanitizer-stderr.txt    |    2 --
 .../DummyUndefinedBehaviorSanitizer-stderr.txt       |    2 --
 .../DummyValgrindCustomOptions-stderr.txt            |    2 --
 .../CTestMemcheck/DummyValgrindFailPre-stdout.txt    |    1 -
 .../DummyValgrindInvalidSupFile-stderr.txt           |    2 --
 .../DummyValgrindInvalidSupFile-stdout.txt           |    1 -
 .../CTestMemcheck/DummyValgrindNoLogFile-stderr.txt  |    2 --
 Tests/RunCMake/CTestMemcheck/NotExist-stdout.txt     |    1 -
 Tests/RunCMake/CTestMemcheck/Unknown-stderr.txt      |    2 --
 Tests/RunCMake/CTestMemcheck/Unknown-stdout.txt      |    1 -
 Tests/RunCMake/CTestSubmit/BadArg-stderr.txt         |    2 --
 Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt       |    2 --
 Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt       |    2 --
 .../RunCMake/CTestSubmit/CDashUploadFILES-stderr.txt |    2 --
 .../RunCMake/CTestSubmit/CDashUploadPARTS-stderr.txt |    2 --
 .../CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt    |    2 --
 .../CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt    |    2 --
 Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt    |    4 ----
 Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt   |    3 ---
 Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt  |    3 ---
 Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt |    3 ---
 Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt   |    2 --
 .../RunCMake/CTestSubmit/PARTSCDashUpload-stderr.txt |    2 --
 .../CTestSubmit/PARTSCDashUploadType-stderr.txt      |    2 --
 .../CTestSubmit/RepeatRETURN_VALUE-stderr.txt        |    2 --
 Tests/RunCMake/README.rst                            |   10 ++++++++++
 Tests/RunCMake/RunCTest.cmake                        |   17 +++++++++++++++++
 .../CMakeLists.txt.in                                |    2 +-
 .../CTestConfig.cmake.in                             |    2 +-
 .../DummyAddressSanitizer-result.txt                 |    0
 .../ctest_memcheck/DummyAddressSanitizer-stderr.txt  |    2 ++
 .../DummyAddressSanitizer-stdout.txt                 |    0
 .../DummyBC-result.txt                               |    0
 .../DummyBC-stderr.txt                               |    0
 .../DummyBC-stdout.txt                               |    0
 .../DummyBCNoLogFile-result.txt                      |    0
 .../ctest_memcheck/DummyBCNoLogFile-stderr.txt       |    3 +++
 .../DummyBCNoLogFile-stdout.txt                      |    0
 .../DummyLeakSanitizer-result.txt                    |    0
 .../ctest_memcheck/DummyLeakSanitizer-stderr.txt     |    2 ++
 .../DummyLeakSanitizer-stdout.txt                    |    0
 .../DummyMemorySanitizer-result.txt                  |    0
 .../ctest_memcheck/DummyMemorySanitizer-stderr.txt   |    2 ++
 .../DummyMemorySanitizer-stdout.txt                  |    0
 .../DummyPurify-result.txt                           |    0
 .../DummyPurify-stderr.txt                           |    0
 .../DummyPurify-stdout.txt                           |    0
 .../DummyPurifyNoLogFile-result.txt                  |    0
 .../ctest_memcheck/DummyPurifyNoLogFile-stderr.txt   |    2 ++
 .../DummyPurifyNoLogFile-stdout.txt                  |    0
 .../DummyThreadSanitizer-result.txt                  |    0
 .../ctest_memcheck/DummyThreadSanitizer-stderr.txt   |    2 ++
 .../DummyThreadSanitizer-stdout.txt                  |    0
 .../DummyUndefinedBehaviorSanitizer-result.txt       |    0
 .../DummyUndefinedBehaviorSanitizer-stderr.txt       |    2 ++
 .../DummyUndefinedBehaviorSanitizer-stdout.txt       |    0
 .../DummyValgrind-result.txt                         |    0
 .../DummyValgrind-stderr.txt                         |    0
 .../DummyValgrind-stdout.txt                         |    0
 .../DummyValgrindCustomOptions-result.txt            |    0
 .../DummyValgrindCustomOptions-stderr.txt            |    2 ++
 .../DummyValgrindCustomOptions-stdout.txt            |    0
 .../DummyValgrindFailPost-result.txt                 |    0
 .../DummyValgrindFailPost-stderr.txt                 |    2 +-
 .../DummyValgrindFailPost-stdout.txt                 |    0
 .../DummyValgrindFailPre-result.txt                  |    0
 .../DummyValgrindFailPre-stderr.txt                  |    2 +-
 .../ctest_memcheck/DummyValgrindFailPre-stdout.txt   |    1 +
 .../DummyValgrindIgnoreMemcheck-result.txt           |    0
 .../DummyValgrindIgnoreMemcheck-stderr.txt           |    0
 .../DummyValgrindIgnoreMemcheck-stdout.txt           |    0
 .../DummyValgrindInvalidSupFile-result.txt           |    0
 .../DummyValgrindInvalidSupFile-stderr.txt           |    2 ++
 .../DummyValgrindInvalidSupFile-stdout.txt           |    1 +
 .../DummyValgrindNoLogFile-result.txt                |    0
 .../ctest_memcheck/DummyValgrindNoLogFile-stderr.txt |    2 ++
 .../DummyValgrindNoLogFile-stdout.txt                |    0
 .../DummyValgrindPrePost-result.txt                  |    0
 .../DummyValgrindPrePost-stderr.txt                  |    0
 .../DummyValgrindPrePost-stdout.txt                  |    0
 .../DummyValgrindTwoTargets-result.txt               |    0
 .../DummyValgrindTwoTargets-stderr.txt               |    0
 .../DummyValgrindTwoTargets-stdout.txt               |    0
 .../NotExist-result.txt                              |    0
 .../NotExist-stderr.txt                              |    0
 Tests/RunCMake/ctest_memcheck/NotExist-stdout.txt    |    1 +
 .../RunCMakeTest.cmake                               |   18 +++---------------
 .../Unknown-result.txt                               |    0
 Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt     |    2 ++
 Tests/RunCMake/ctest_memcheck/Unknown-stdout.txt     |    1 +
 .../{CTestMemcheck => ctest_memcheck}/test.cmake.in  |    6 +++---
 .../testAddressSanitizer.cmake                       |    0
 .../testLeakSanitizer.cmake                          |    0
 .../testMemorySanitizer.cmake                        |    0
 .../testThreadSanitizer.cmake                        |    0
 .../testUndefinedBehaviorSanitizer.cmake             |    0
 .../{CTestSubmit => ctest_submit}/BadArg-result.txt  |    0
 Tests/RunCMake/ctest_submit/BadArg-stderr.txt        |    2 ++
 .../BadFILES-result.txt                              |    0
 Tests/RunCMake/ctest_submit/BadFILES-stderr.txt      |    2 ++
 .../BadPARTS-result.txt                              |    0
 Tests/RunCMake/ctest_submit/BadPARTS-stderr.txt      |    2 ++
 .../CDashUploadFILES-result.txt                      |    0
 .../ctest_submit/CDashUploadFILES-stderr.txt         |    2 ++
 .../CDashUploadFTP-result.txt                        |    0
 .../CDashUploadFTP-stderr.txt                        |    0
 .../CDashUploadNone-result.txt                       |    0
 .../CDashUploadNone-stderr.txt                       |    0
 .../CDashUploadPARTS-result.txt                      |    0
 .../ctest_submit/CDashUploadPARTS-stderr.txt         |    2 ++
 .../CDashUploadRETRY_COUNT-result.txt                |    0
 .../ctest_submit/CDashUploadRETRY_COUNT-stderr.txt   |    2 ++
 .../CDashUploadRETRY_DELAY-result.txt                |    0
 .../ctest_submit/CDashUploadRETRY_DELAY-stderr.txt   |    2 ++
 .../{CTestSubmit => ctest_submit}/CMakeLists.txt.in  |    0
 .../CTestConfig.cmake.in                             |    0
 .../FailDrop-cp-result.txt                           |    0
 Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt   |    4 ++++
 .../FailDrop-cp-stdout.txt                           |    0
 .../FailDrop-ftp-result.txt                          |    0
 Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt  |    3 +++
 .../FailDrop-ftp-stdout.txt                          |    0
 .../FailDrop-http-result.txt                         |    0
 Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt |    3 +++
 .../FailDrop-http-stdout.txt                         |    0
 .../FailDrop-https-result.txt                        |    0
 .../RunCMake/ctest_submit/FailDrop-https-stderr.txt  |    3 +++
 .../FailDrop-https-stdout.txt                        |    0
 .../FailDrop-scp-result.txt                          |    0
 Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt  |    2 ++
 .../FailDrop-scp-stdout.txt                          |    0
 .../FailDrop-xmlrpc-result.txt                       |    0
 .../FailDrop-xmlrpc-stderr.txt                       |    2 +-
 .../FailDrop-xmlrpc-stdout.txt                       |    0
 .../PARTSCDashUpload-result.txt                      |    0
 .../ctest_submit/PARTSCDashUpload-stderr.txt         |    2 ++
 .../PARTSCDashUploadType-result.txt                  |    0
 .../ctest_submit/PARTSCDashUploadType-stderr.txt     |    2 ++
 .../RepeatRETURN_VALUE-result.txt                    |    0
 .../ctest_submit/RepeatRETURN_VALUE-stderr.txt       |    2 ++
 .../{CTestSubmit => ctest_submit}/RunCMakeTest.cmake |   18 +-----------------
 .../{CTestSubmit => ctest_submit}/test.cmake.in      |    0
 148 files changed, 103 insertions(+), 104 deletions(-)
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stdout.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stdout.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/NotExist-stdout.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/Unknown-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/Unknown-stdout.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/BadArg-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadFILES-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadPARTS-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/PARTSCDashUpload-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-stderr.txt
 create mode 100644 Tests/RunCMake/RunCTest.cmake
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/CMakeLists.txt.in (75%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/CTestConfig.cmake.in (81%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyAddressSanitizer-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyAddressSanitizer-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyBC-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyBC-stderr.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyBC-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyBCNoLogFile-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyBCNoLogFile-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyLeakSanitizer-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyLeakSanitizer-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyMemorySanitizer-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyMemorySanitizer-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyPurify-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyPurify-stderr.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyPurify-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyPurifyNoLogFile-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyPurifyNoLogFile-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyThreadSanitizer-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyThreadSanitizer-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyUndefinedBehaviorSanitizer-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyUndefinedBehaviorSanitizer-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrind-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrind-stderr.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrind-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindCustomOptions-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindCustomOptions-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindFailPost-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindFailPost-stderr.txt (50%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindFailPost-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindFailPre-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindFailPre-stderr.txt (50%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stdout.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindIgnoreMemcheck-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindIgnoreMemcheck-stderr.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindIgnoreMemcheck-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindInvalidSupFile-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stdout.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindNoLogFile-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindNoLogFile-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindPrePost-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindPrePost-stderr.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindPrePost-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindTwoTargets-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindTwoTargets-stderr.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindTwoTargets-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/NotExist-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/NotExist-stderr.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/NotExist-stdout.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/RunCMakeTest.cmake (88%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/Unknown-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_memcheck/Unknown-stdout.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/test.cmake.in (94%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/testAddressSanitizer.cmake (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/testLeakSanitizer.cmake (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/testMemorySanitizer.cmake (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/testThreadSanitizer.cmake (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/testUndefinedBehaviorSanitizer.cmake (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/BadArg-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/BadArg-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/BadFILES-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/BadFILES-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/BadPARTS-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/BadPARTS-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadFILES-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadFILES-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadFTP-result.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadFTP-stderr.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadNone-result.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadNone-stderr.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadPARTS-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadPARTS-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadRETRY_COUNT-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadRETRY_DELAY-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CMakeLists.txt.in (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CTestConfig.cmake.in (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-cp-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-cp-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-ftp-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-ftp-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-http-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-http-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-https-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-https-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-scp-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-scp-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-xmlrpc-result.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-xmlrpc-stderr.txt (54%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-xmlrpc-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/PARTSCDashUpload-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/PARTSCDashUpload-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/PARTSCDashUploadType-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/PARTSCDashUploadType-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/RepeatRETURN_VALUE-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/RunCMakeTest.cmake (70%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/test.cmake.in (100%)


hooks/post-receive
-- 
CMake

From zack.galbreath at kitware.com  Thu Feb 19 14:53:40 2015
From: zack.galbreath at kitware.com (Zack Galbreath)
Date: Thu, 19 Feb 2015 14:53:40 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-510-ga9f6737
Message-ID: <20150219195340.7FCE5AA99E@public.kitware.com>

This is an automated email from 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  a9f67370534c230c6e47b0bfaf335841b1c479aa (commit)
       via  7f0ac6470749e7137d9ff9d1d68672e35fb8a405 (commit)
       via  a72d0fa80bc2cfe8ddf93c45fec8686fcbab1273 (commit)
       via  15a48f82f39d5ad88753e872e2d78a45fdf24598 (commit)
       via  2216725bcdb36e430ca573276fee319a4db82912 (commit)
       via  cc3e2e4a2571370453f94d6bcac5eecdb97c322e (commit)
       via  b2d3baa92279e3e3ff8a34b21b38ded2ab20d738 (commit)
       via  8a06c19c0c01bdd0c5db03ab5f078b165ccf2f11 (commit)
       via  003ab492daa04919821edd85b0707966c88faa0c (commit)
       via  3dad5695df0dcc7a6457770b978ae9292415fb8b (commit)
       via  004b6b1198eb26f3ac6add170605a1072f64ee1b (commit)
      from  5a76ddf4c32aab2ec92266dd93bf79dfc16f3c98 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9f67370534c230c6e47b0bfaf335841b1c479aa
commit a9f67370534c230c6e47b0bfaf335841b1c479aa
Merge: 5a76ddf 7f0ac64
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Thu Feb 19 14:53:37 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 19 14:53:37 2015 -0500

    Merge topic 'ctest-output-options' into next
    
    7f0ac647 ctest_upload: Add QUIET option
    a72d0fa8 ctest_memcheck: Add QUIET option
    15a48f82 ctest_coverage: Add QUIET option
    2216725b ctest_test: Add QUIET option
    cc3e2e4a ctest_build: Add QUIET option
    b2d3baa9 ctest_configure: Add QUIET option
    8a06c19c ctest_update: Add QUIET option
    003ab492 ctest_start: Add QUIET option
    3dad5695 ctest_submit: Add QUIET option
    004b6b11 CTest: Add cmCTestOptionalLog macro

diff --cc Tests/RunCMake/CMakeLists.txt
index 3cc386f,f654dbc..14ca715
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -129,12 -129,18 +129,20 @@@ add_RunCMake_test(build_command
  add_RunCMake_test(export)
  add_RunCMake_test(cmake_minimum_required)
  add_RunCMake_test(continue)
+ add_RunCMake_test(ctest_build)
+ add_RunCMake_test(ctest_configure)
+ if(COVERAGE_COMMAND)
+   add_RunCMake_test(ctest_coverage -DCOVERAGE_COMMAND=${COVERAGE_COMMAND})
+ endif()
+ add_RunCMake_test(ctest_start)
  add_RunCMake_test(ctest_submit)
+ add_RunCMake_test(ctest_test)
+ add_RunCMake_test(ctest_upload)
  add_RunCMake_test(file)
 +add_RunCMake_test(find_file)
  add_RunCMake_test(find_library)
  add_RunCMake_test(find_package)
 +add_RunCMake_test(find_path)
  add_RunCMake_test(get_filename_component)
  add_RunCMake_test(get_property)
  add_RunCMake_test(if)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f0ac6470749e7137d9ff9d1d68672e35fb8a405
commit 7f0ac6470749e7137d9ff9d1d68672e35fb8a405
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 18 09:15:29 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 11:48:36 2015 -0500

    ctest_upload: Add QUIET option

diff --git a/Help/command/ctest_upload.rst b/Help/command/ctest_upload.rst
index 9156af5..fcd9fe4 100644
--- a/Help/command/ctest_upload.rst
+++ b/Help/command/ctest_upload.rst
@@ -5,7 +5,10 @@ Upload files to a dashboard server.
 
 ::
 
-  ctest_upload(FILES ...)
+  ctest_upload(FILES ... [QUIET])
 
 Pass a list of files to be sent along with the build results to the
 dashboard server.
+
+The QUIET option suppresses any CTest-specific non-error output
+that would have been printed to the console otherwise.
diff --git a/Source/CTest/cmCTestUploadCommand.cxx b/Source/CTest/cmCTestUploadCommand.cxx
index 5613751..f5000dd 100644
--- a/Source/CTest/cmCTestUploadCommand.cxx
+++ b/Source/CTest/cmCTestUploadCommand.cxx
@@ -26,6 +26,7 @@ cmCTestGenericHandler* cmCTestUploadCommand::InitializeHandler()
     }
   static_cast<cmCTestUploadHandler*>(handler)->SetFiles(this->Files);
 
+  handler->SetQuiet(this->Quiet);
   return handler;
 }
 
@@ -38,6 +39,12 @@ bool cmCTestUploadCommand::CheckArgumentKeyword(std::string const& arg)
     this->ArgumentDoing = ArgumentDoingFiles;
     return true;
     }
+  if(arg == "QUIET")
+    {
+    this->ArgumentDoing = ArgumentDoingNone;
+    this->Quiet = true;
+    return true;
+    }
   return false;
 }
 
diff --git a/Source/CTest/cmCTestUploadHandler.cxx b/Source/CTest/cmCTestUploadHandler.cxx
index e33c387..579190a 100644
--- a/Source/CTest/cmCTestUploadHandler.cxx
+++ b/Source/CTest/cmCTestUploadHandler.cxx
@@ -64,8 +64,8 @@ int cmCTestUploadHandler::ProcessHandler()
 
   for ( it = this->Files.begin(); it != this->Files.end(); it ++ )
     {
-    cmCTestLog(this->CTest, OUTPUT,
-               "\tUpload file: " << *it << std::endl);
+    cmCTestOptionalLog(this->CTest, OUTPUT,
+      "\tUpload file: " << *it << std::endl, this->Quiet);
     ofs << "<File filename=\"" << cmXMLSafe(*it) << "\">\n"
        << "<Content encoding=\"base64\">\n";
     ofs << this->CTest->Base64EncodeFile(*it);
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 83a88ad..f654dbc 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -137,6 +137,7 @@ endif()
 add_RunCMake_test(ctest_start)
 add_RunCMake_test(ctest_submit)
 add_RunCMake_test(ctest_test)
+add_RunCMake_test(ctest_upload)
 add_RunCMake_test(file)
 add_RunCMake_test(find_library)
 add_RunCMake_test(find_package)
diff --git a/Tests/RunCMake/ctest_upload/CMakeLists.txt.in b/Tests/RunCMake/ctest_upload/CMakeLists.txt.in
new file mode 100644
index 0000000..1fab71b
--- /dev/null
+++ b/Tests/RunCMake/ctest_upload/CMakeLists.txt.in
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1)
+project(CTestUpload at CASE_NAME@ NONE)
+include(CTest)
+add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
diff --git a/Tests/RunCMake/ctest_upload/CTestConfig.cmake.in b/Tests/RunCMake/ctest_upload/CTestConfig.cmake.in
new file mode 100644
index 0000000..52665a8
--- /dev/null
+++ b/Tests/RunCMake/ctest_upload/CTestConfig.cmake.in
@@ -0,0 +1 @@
+set(CTEST_PROJECT_NAME "CTestUpload at CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_upload/RunCMakeTest.cmake b/Tests/RunCMake/ctest_upload/RunCMakeTest.cmake
new file mode 100644
index 0000000..b33d278
--- /dev/null
+++ b/Tests/RunCMake/ctest_upload/RunCMakeTest.cmake
@@ -0,0 +1,10 @@
+include(RunCTest)
+
+set(CASE_CTEST_UPLOAD_ARGS "")
+
+function(run_ctest_upload CASE_NAME)
+  set(CASE_CTEST_UPLOAD_ARGS "${ARGN}")
+  run_ctest(${CASE_NAME})
+endfunction()
+
+run_ctest_upload(UploadQuiet QUIET)
diff --git a/Tests/RunCMake/ctest_upload/UploadQuiet-stdout.txt b/Tests/RunCMake/ctest_upload/UploadQuiet-stdout.txt
new file mode 100644
index 0000000..20e13b8
--- /dev/null
+++ b/Tests/RunCMake/ctest_upload/UploadQuiet-stdout.txt
@@ -0,0 +1 @@
+Use Experimental tag: [0-9-]+$
diff --git a/Tests/RunCMake/ctest_upload/test.cmake.in b/Tests/RunCMake/ctest_upload/test.cmake.in
new file mode 100644
index 0000000..f13bdd1
--- /dev/null
+++ b/Tests/RunCMake/ctest_upload/test.cmake.in
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.1)
+
+set(CTEST_SITE                          "test-site")
+set(CTEST_BUILD_NAME                    "test-build-name")
+set(CTEST_SOURCE_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME@")
+set(CTEST_BINARY_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME at -build")
+set(CTEST_CMAKE_GENERATOR               "@RunCMake_GENERATOR@")
+set(CTEST_CMAKE_GENERATOR_PLATFORM      "@RunCMake_GENERATOR_PLATFORM@")
+set(CTEST_CMAKE_GENERATOR_TOOLSET       "@RunCMake_GENERATOR_TOOLSET@")
+set(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
+
+set(ctest_upload_args "@CASE_CTEST_UPLOAD_ARGS@")
+ctest_start(Experimental)
+ctest_upload(FILES "${CTEST_SOURCE_DIRECTORY}/CMakeLists.txt" ${ctest_upload_args})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a72d0fa80bc2cfe8ddf93c45fec8686fcbab1273
commit a72d0fa80bc2cfe8ddf93c45fec8686fcbab1273
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 17 17:15:00 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 11:48:00 2015 -0500

    ctest_memcheck: Add QUIET option

diff --git a/Help/command/ctest_memcheck.rst b/Help/command/ctest_memcheck.rst
index ca47ed0..56a2490 100644
--- a/Help/command/ctest_memcheck.rst
+++ b/Help/command/ctest_memcheck.rst
@@ -26,3 +26,7 @@ the number of tests to be run in parallel.
 The APPEND option marks results for append to those previously
 submitted to a dashboard server since the last ctest_start.  Append
 semantics are defined by the dashboard server in use.
+
+The QUIET option suppresses any CTest-specific non-error messages
+that would have otherwise been printed to the console.  Output from
+the underlying tests are not affected.
diff --git a/Source/CTest/cmCTestMemCheckCommand.cxx b/Source/CTest/cmCTestMemCheckCommand.cxx
index f144066..b379d32 100644
--- a/Source/CTest/cmCTestMemCheckCommand.cxx
+++ b/Source/CTest/cmCTestMemCheckCommand.cxx
@@ -21,16 +21,20 @@ cmCTestGenericHandler* cmCTestMemCheckCommand::InitializeActualHandler()
     = this->CTest->GetInitializedHandler("memcheck");
 
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "MemoryCheckType", "CTEST_MEMORYCHECK_TYPE");
+    "MemoryCheckType", "CTEST_MEMORYCHECK_TYPE", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "MemoryCheckSanitizerOptions", "CTEST_MEMORYCHECK_SANITIZER_OPTIONS");
+    "MemoryCheckSanitizerOptions", "CTEST_MEMORYCHECK_SANITIZER_OPTIONS",
+    this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "MemoryCheckCommand", "CTEST_MEMORYCHECK_COMMAND");
+    "MemoryCheckCommand", "CTEST_MEMORYCHECK_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "MemoryCheckCommandOptions", "CTEST_MEMORYCHECK_COMMAND_OPTIONS");
+    "MemoryCheckCommandOptions", "CTEST_MEMORYCHECK_COMMAND_OPTIONS",
+    this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "MemoryCheckSuppressionFile", "CTEST_MEMORYCHECK_SUPPRESSIONS_FILE");
+    "MemoryCheckSuppressionFile", "CTEST_MEMORYCHECK_SUPPRESSIONS_FILE",
+    this->Quiet);
 
+  handler->SetQuiet(this->Quiet);
   return handler;
 }
 
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index d4ff24f..061f3fd 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -251,8 +251,8 @@ void cmCTestMemCheckHandler::GenerateTestCommand(
     memcheckcommand += " " + memTesterEnvironmentVariable;
     args.push_back(memTesterEnvironmentVariable);
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Memory check command: "
-    << memcheckcommand << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "Memory check command: " << memcheckcommand << std::endl, this->Quiet);
 }
 
 //----------------------------------------------------------------------
@@ -347,7 +347,8 @@ void cmCTestMemCheckHandler::PopulateCustomVectors(cmMakefile *mf)
                              "CTEST_CUSTOM_MEMCHECK_IGNORE",
                              this->CustomTestsIgnore);
   std::string cmake = cmSystemTools::GetCMakeCommand();
-  this->CTest->SetCTestConfiguration("CMakeCommand", cmake.c_str());
+  this->CTest->SetCTestConfiguration("CMakeCommand", cmake.c_str(),
+    this->Quiet);
 }
 
 //----------------------------------------------------------------------
@@ -400,8 +401,8 @@ void cmCTestMemCheckHandler::GenerateDartOutput(std::ostream& os)
       << "</Test>" << std::endl;
     }
   os << "\t</TestList>\n";
-  cmCTestLog(this->CTest, HANDLER_OUTPUT,
-    "-- Processing memory checking output: ");
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+    "-- Processing memory checking output: ", this->Quiet);
   size_t total = this->TestResults.size();
   size_t step = total / 10;
   size_t current = 0;
@@ -451,13 +452,14 @@ void cmCTestMemCheckHandler::GenerateDartOutput(std::ostream& os)
     this->WriteTestResultFooter(os, result);
     if ( current < cc )
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "#" << std::flush);
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "#" << std::flush,
+        this->Quiet);
       current += step;
       }
     }
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl);
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "Memory checking results:"
-    << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, std::endl, this->Quiet);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "Memory checking results:"
+    << std::endl, this->Quiet);
   os << "\t<DefectList>" << std::endl;
   for ( cc = 0; cc < this->GlobalResults.size(); cc ++ )
     {
@@ -468,9 +470,9 @@ void cmCTestMemCheckHandler::GenerateDartOutput(std::ostream& os)
 #endif
       std::cerr.width(35);
 #define cerr no_cerr
-      cmCTestLog(this->CTest, HANDLER_OUTPUT,
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
         this->ResultStringsLong[cc] << " - "
-        << this->GlobalResults[cc] << std::endl);
+        << this->GlobalResults[cc] << std::endl, this->Quiet);
       os << "\t\t<Defect Type=\"" << this->ResultStringsLong[cc]
         << "\"/>" << std::endl;
       }
@@ -594,10 +596,10 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
     }
   if(this->MemoryTester.empty())
     {
-    cmCTestLog(this->CTest, WARNING,
+    cmCTestOptionalLog(this->CTest, WARNING,
                "Memory checker (MemoryCheckCommand) "
                "not set, or cannot find the specified program."
-               << std::endl);
+               << std::endl, this->Quiet);
     return false;
     }
 
@@ -981,17 +983,18 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput(
     "locked by a different thread");
   std::vector<std::string::size_type> nonValGrindOutput;
   double sttime = cmSystemTools::GetTime();
-  cmCTestLog(this->CTest, DEBUG, "Start test: " << lines.size() << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG,
+    "Start test: " << lines.size() << std::endl, this->Quiet);
   std::string::size_type totalOutputSize = 0;
   for ( cc = 0; cc < lines.size(); cc ++ )
     {
-    cmCTestLog(this->CTest, DEBUG, "test line "
-               << lines[cc] << std::endl);
+    cmCTestOptionalLog(this->CTest, DEBUG, "test line "
+               << lines[cc] << std::endl, this->Quiet);
 
     if ( valgrindLine.find(lines[cc]) )
       {
-      cmCTestLog(this->CTest, DEBUG, "valgrind  line "
-                 << lines[cc] << std::endl);
+      cmCTestOptionalLog(this->CTest, DEBUG, "valgrind  line "
+                 << lines[cc] << std::endl, this->Quiet);
       int failure = cmCTestMemCheckHandler::NO_MEMORY_FAULT;
       if ( vgFIM.find(lines[cc]) )
         {
@@ -1075,10 +1078,10 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput(
         nonValGrindOutput.begin(); i != nonValGrindOutput.end(); ++i)
     {
     totalOutputSize += lines[*i].size();
-    cmCTestLog(this->CTest, DEBUG, "before xml safe "
-               << lines[*i] << std::endl);
-    cmCTestLog(this->CTest, DEBUG, "after  xml safe "
-               <<  cmXMLSafe(lines[*i]) << std::endl);
+    cmCTestOptionalLog(this->CTest, DEBUG, "before xml safe "
+               << lines[*i] << std::endl, this->Quiet);
+    cmCTestOptionalLog(this->CTest, DEBUG, "after  xml safe "
+               <<  cmXMLSafe(lines[*i]) << std::endl, this->Quiet);
     ostr << cmXMLSafe(lines[*i]) << std::endl;
     if(!unlimitedOutput && totalOutputSize >
        static_cast<size_t>(this->CustomMaximumFailedTestOutputSize))
@@ -1091,8 +1094,8 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput(
       break;  // stop the copy of output if we are full
       }
     }
-  cmCTestLog(this->CTest, DEBUG, "End test (elapsed: "
-             << (cmSystemTools::GetTime() - sttime) << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG, "End test (elapsed: "
+             << (cmSystemTools::GetTime() - sttime) << std::endl, this->Quiet);
   log = ostr.str();
   if ( defects )
     {
@@ -1112,7 +1115,8 @@ bool cmCTestMemCheckHandler::ProcessMemCheckBoundsCheckerOutput(
   double sttime = cmSystemTools::GetTime();
   std::vector<std::string> lines;
   cmSystemTools::Split(str.c_str(), lines);
-  cmCTestLog(this->CTest, DEBUG, "Start test: " << lines.size() << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG,
+    "Start test: " << lines.size() << std::endl, this->Quiet);
   std::vector<std::string>::size_type cc;
   for ( cc = 0; cc < lines.size(); cc ++ )
     {
@@ -1148,8 +1152,8 @@ bool cmCTestMemCheckHandler::ProcessMemCheckBoundsCheckerOutput(
     results[parser.Errors[cc]]++;
     defects++;
     }
-  cmCTestLog(this->CTest, DEBUG, "End test (elapsed: "
-    << (cmSystemTools::GetTime() - sttime) << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG, "End test (elapsed: "
+    << (cmSystemTools::GetTime() - sttime) << std::endl, this->Quiet);
   if(defects)
     {
     // only put the output of Bounds Checker if there were
@@ -1165,9 +1169,9 @@ void
 cmCTestMemCheckHandler::PostProcessTest(cmCTestTestResult& res,
                                         int test)
 {
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
              "PostProcessTest memcheck results for : "
-             << res.Name << std::endl);
+             << res.Name << std::endl, this->Quiet);
   if(this->MemoryTesterStyle
      == cmCTestMemCheckHandler::BOUNDS_CHECKER)
     {
@@ -1192,9 +1196,9 @@ void
 cmCTestMemCheckHandler::PostProcessBoundsCheckerTest(cmCTestTestResult& res,
                                                      int test)
 {
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
              "PostProcessBoundsCheckerTest for : "
-             << res.Name << std::endl);
+             << res.Name << std::endl, this->Quiet);
   std::vector<std::string> files;
   this->TestOutputFileNames(test, files);
   if (files.empty())
@@ -1226,11 +1230,11 @@ cmCTestMemCheckHandler::PostProcessBoundsCheckerTest(cmCTestTestResult& res,
   }
   cmSystemTools::Delay(1000);
   cmSystemTools::RemoveFile(this->BoundsCheckerDPBDFile);
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Remove: "
-    << this->BoundsCheckerDPBDFile << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Remove: "
+    << this->BoundsCheckerDPBDFile << std::endl, this->Quiet);
   cmSystemTools::RemoveFile(this->BoundsCheckerXMLFile);
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Remove: "
-    << this->BoundsCheckerXMLFile << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Remove: "
+    << this->BoundsCheckerXMLFile << std::endl, this->Quiet);
 }
 
 void
@@ -1260,7 +1264,8 @@ cmCTestMemCheckHandler::AppendMemTesterOutput(cmCTestTestResult& res,
   if(this->LogWithPID)
     {
     cmSystemTools::RemoveFile(ofile);
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Remove: "<< ofile <<"\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Remove: "<< ofile <<"\n", this->Quiet);
     }
 }
 
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 314c8ad..03131fd 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -386,10 +386,11 @@ void cmCTestRunTest::MemCheckPostProcess()
     {
     return;
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, this->Index
-             << ": process test output now: "
-             << this->TestProperties->Name << " "
-             << this->TestResult.Name << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, this->Index
+    << ": process test output now: "
+    << this->TestProperties->Name << " "
+    << this->TestResult.Name << std::endl,
+    this->TestHandler->GetQuiet());
   cmCTestMemCheckHandler * handler = static_cast<cmCTestMemCheckHandler*>
     (this->TestHandler);
   handler->PostProcessTest(this->TestResult, this->Index);
@@ -661,8 +662,9 @@ bool cmCTestRunTest::ForkProcess(double testTimeOut, bool explicitTimeout,
     {
     timeout = 0;
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, this->Index << ": "
-             << "Test timeout computed to be: " << timeout << "\n");
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, this->Index << ": "
+    << "Test timeout computed to be: " << timeout << "\n",
+    this->TestHandler->GetQuiet());
 
   this->TestProcess->SetTimeout(timeout);
 
diff --git a/Tests/RunCMake/ctest_memcheck/DummyQuiet-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyQuiet-stdout.txt
new file mode 100644
index 0000000..58f55a5
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyQuiet-stdout.txt
@@ -0,0 +1 @@
+0 tests failed out of 1$
diff --git a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
index b1793fa..6c96a26 100644
--- a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
@@ -130,3 +130,4 @@ run_mc_test(DummyValgrindNoLogFile "${PSEUDO_VALGRIND_NOLOG}")
 run_mc_test(DummyBCNoLogFile "${PSEUDO_BC_NOLOG}")
 run_mc_test(NotExist "\${CTEST_BINARY_DIRECTORY}/no-memcheck-exe")
 run_mc_test(Unknown "\${CMAKE_COMMAND}")
+run_mc_test(DummyQuiet "${PSEUDO_VALGRIND}" -DMEMCHECK_ARGS=QUIET)
diff --git a/Tests/RunCMake/ctest_memcheck/test.cmake.in b/Tests/RunCMake/ctest_memcheck/test.cmake.in
index f9c1ba9..8431fa6 100644
--- a/Tests/RunCMake/ctest_memcheck/test.cmake.in
+++ b/Tests/RunCMake/ctest_memcheck/test.cmake.in
@@ -21,4 +21,4 @@ set(CTEST_MEMORYCHECK_TYPE "${MEMCHECK_TYPE}")
 CTEST_START(Experimental)
 CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
 CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
-CTEST_MEMCHECK(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+CTEST_MEMCHECK(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res ${MEMCHECK_ARGS})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15a48f82f39d5ad88753e872e2d78a45fdf24598
commit 15a48f82f39d5ad88753e872e2d78a45fdf24598
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 17 15:57:26 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 11:47:10 2015 -0500

    ctest_coverage: Add QUIET option

diff --git a/Help/command/ctest_coverage.rst b/Help/command/ctest_coverage.rst
index 4c90f9c..bac5c1c 100644
--- a/Help/command/ctest_coverage.rst
+++ b/Help/command/ctest_coverage.rst
@@ -18,3 +18,8 @@ files labeled with at least one of the labels specified.
 The APPEND option marks results for append to those previously
 submitted to a dashboard server since the last ctest_start.  Append
 semantics are defined by the dashboard server in use.
+
+The QUIET option suppresses any CTest-specific non-error output
+that would have been printed to the console otherwise.  The summary
+indicating how many lines of code were covered is unaffected by this
+option.
diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index a607c52..4519627 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -45,6 +45,10 @@
 #     Specify options to be passed to gcov.  The ``gcov`` command
 #     is run as ``gcov <options>... -o <gcov-dir> <file>.gcda``.
 #     If not specified, the default option is just ``-b``.
+#
+#   ``QUIET``
+#     Suppress non-error messages that otherwise would have been
+#     printed out by this function.
 
 #=============================================================================
 # Copyright 2014-2015 Kitware, Inc.
@@ -60,7 +64,7 @@
 #  License text for the above reference.)
 include(CMakeParseArguments)
 function(ctest_coverage_collect_gcov)
-  set(options "")
+  set(options QUIET)
   set(oneValueArgs TARBALL SOURCE BUILD GCOV_COMMAND)
   set(multiValueArgs GCOV_OPTIONS)
   cmake_parse_arguments(GCOV  "${options}" "${oneValueArgs}"
@@ -106,8 +110,10 @@ function(ctest_coverage_collect_gcov)
   # return early if no coverage files were found
   list(LENGTH gcda_files len)
   if(len EQUAL 0)
-    message("ctest_coverage_collect_gcov: No .gcda files found, "
-      "ignoring coverage request.")
+    if (NOT GCOV_QUIET)
+      message("ctest_coverage_collect_gcov: No .gcda files found, "
+        "ignoring coverage request.")
+    endif()
     return()
   endif()
   # setup the dir for the coverage files
@@ -130,7 +136,9 @@ function(ctest_coverage_collect_gcov)
       WORKING_DIRECTORY ${coverage_dir})
   endforeach()
   if(NOT "${res}" EQUAL 0)
-    message(STATUS "Error running gcov: ${res} ${out}")
+    if (NOT GCOV_QUIET)
+      message(STATUS "Error running gcov: ${res} ${out}")
+    endif()
   endif()
   # create json file with project information
   file(WRITE ${coverage_dir}/data.json
@@ -151,8 +159,15 @@ function(ctest_coverage_collect_gcov)
 ${coverage_dir}/data.json
 ${label_files}
 ")
+
+  if (GCOV_QUIET)
+    set(tar_opts "cfj")
+  else()
+    set(tar_opts "cvfj")
+  endif()
+
   execute_process(COMMAND
-    ${CMAKE_COMMAND} -E tar cvfj ${GCOV_TARBALL}
+    ${CMAKE_COMMAND} -E tar ${tar_opts} ${GCOV_TARBALL}
     "--mtime=1970-01-01 0:0:0 UTC"
     --files-from=${coverage_dir}/coverage_file_list.txt
     WORKING_DIRECTORY ${binary_dir})
diff --git a/Source/CTest/cmCTestCoverageCommand.cxx b/Source/CTest/cmCTestCoverageCommand.cxx
index 41f016b..f1f935b 100644
--- a/Source/CTest/cmCTestCoverageCommand.cxx
+++ b/Source/CTest/cmCTestCoverageCommand.cxx
@@ -24,9 +24,9 @@ cmCTestCoverageCommand::cmCTestCoverageCommand()
 cmCTestGenericHandler* cmCTestCoverageCommand::InitializeHandler()
 {
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "CoverageCommand", "CTEST_COVERAGE_COMMAND");
+    "CoverageCommand", "CTEST_COVERAGE_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "CoverageExtraFlags", "CTEST_COVERAGE_EXTRA_FLAGS");
+    "CoverageExtraFlags", "CTEST_COVERAGE_EXTRA_FLAGS", this->Quiet);
   cmCTestCoverageHandler* handler = static_cast<cmCTestCoverageHandler*>(
     this->CTest->GetInitializedHandler("coverage"));
   if ( !handler )
@@ -41,6 +41,7 @@ cmCTestGenericHandler* cmCTestCoverageCommand::InitializeHandler()
     handler->SetLabelFilter(this->Labels);
     }
 
+  handler->SetQuiet(this->Quiet);
   return handler;
 }
 
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 1226d22..790e488 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -176,8 +176,8 @@ bool cmCTestCoverageHandler::StartCoverageLogFile(
 {
   char covLogFilename[1024];
   sprintf(covLogFilename, "CoverageLog-%d", logFileCount);
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Open file: "
-    << covLogFilename << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Open file: "
+    << covLogFilename << std::endl, this->Quiet);
   if(!this->StartResultingXML(cmCTest::PartCoverage,
                               covLogFilename, covLogFile))
     {
@@ -209,8 +209,8 @@ void cmCTestCoverageHandler::EndCoverageLogFile(cmGeneratedFileStream& ostr,
   this->CTest->EndXML(ostr);
   char covLogFilename[1024];
   sprintf(covLogFilename, "CoverageLog-%d.xml", logFileCount);
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Close file: "
-    << covLogFilename << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Close file: "
+    << covLogFilename << std::endl, this->Quiet);
   ostr.Close();
 }
 
@@ -230,8 +230,8 @@ bool cmCTestCoverageHandler::ShouldIDoCoverage(const char* file,
     {
     if ( sit->find(file) )
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "  File " << file
-        << " is excluded in CTestCustom.ctest" << std::endl;);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "  File " << file
+        << " is excluded in CTestCustom.ctest" << std::endl;, this->Quiet);
       return false;
       }
     }
@@ -272,8 +272,8 @@ bool cmCTestCoverageHandler::ShouldIDoCoverage(const char* file,
       fFile.c_str(), checkDir.c_str());
   if (!ndc.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Found: " << ndc
-      << " so skip coverage of " << file << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Found: " << ndc
+      << " so skip coverage of " << file << std::endl, this->Quiet);
     return false;
     }
 
@@ -311,8 +311,8 @@ bool cmCTestCoverageHandler::ShouldIDoCoverage(const char* file,
     fFile.c_str(), checkDir.c_str());
   if (!ndc.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Found: " << ndc
-      << " so skip coverage of: " << file << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Found: " << ndc
+      << " so skip coverage of: " << file << std::endl, this->Quiet);
     return false;
     }
   // Ok, nothing in source tree, nothing in binary tree
@@ -356,13 +356,15 @@ int cmCTestCoverageHandler::ProcessHandler()
   cmSystemTools::ConvertToUnixSlashes(sourceDir);
   cmSystemTools::ConvertToUnixSlashes(binaryDir);
 
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "Performing coverage" << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+    "Performing coverage" << std::endl, this->Quiet);
 
   cmCTestCoverageHandlerContainer cont;
   cont.Error = error;
   cont.SourceDir = sourceDir;
   cont.BinaryDir = binaryDir;
   cont.OFS = &ofs;
+  cont.Quiet = this->Quiet;
 
   // setup the regex exclude stuff
   this->CustomCoverageExcludeRegex.clear();
@@ -442,9 +444,9 @@ int cmCTestCoverageHandler::ProcessHandler()
 
   if ( file_count == 0 )
     {
-    cmCTestLog(this->CTest, WARNING,
+    cmCTestOptionalLog(this->CTest, WARNING,
       " Cannot find any coverage files. Ignoring Coverage request."
-      << std::endl);
+      << std::endl, this->Quiet);
     return error;
     }
   cmGeneratedFileStream covSumFile;
@@ -476,10 +478,11 @@ int cmCTestCoverageHandler::ProcessHandler()
   long total_untested = 0;
   //std::string fullSourceDir = sourceDir + "/";
   //std::string fullBinaryDir = binaryDir + "/";
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl);
-  cmCTestLog(this->CTest, HANDLER_OUTPUT,
-    "   Accumulating results (each . represents one file):" << std::endl);
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "    ");
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, std::endl, this->Quiet);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+    "   Accumulating results (each . represents one file):" << std::endl,
+    this->Quiet);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "    ", this->Quiet);
 
   std::vector<std::string> errorsWhileAccumulating;
 
@@ -488,14 +491,16 @@ int cmCTestCoverageHandler::ProcessHandler()
     fileIterator != cont.TotalCoverage.end();
     ++fileIterator )
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "." << std::flush);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "." << std::flush,
+      this->Quiet);
     file_count ++;
     if ( file_count % 50 == 0 )
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, " processed: " << file_count
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, " processed: "
+        << file_count
         << " out of "
-        << cont.TotalCoverage.size() << std::endl);
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "    ");
+        << cont.TotalCoverage.size() << std::endl, this->Quiet);
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "    ", this->Quiet);
       }
 
     const std::string fullFileName = fileIterator->first;
@@ -504,15 +509,15 @@ int cmCTestCoverageHandler::ProcessHandler()
         sourceDir.c_str(), binaryDir.c_str());
     if ( !shouldIDoCoverage )
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
         ".NoDartCoverage found, so skip coverage check for: "
         << fullFileName
-        << std::endl);
+        << std::endl, this->Quiet);
       continue;
       }
 
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-      "Process file: " << fullFileName << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Process file: " << fullFileName << std::endl, this->Quiet);
 
     if ( !cmSystemTools::FileExists(fullFileName.c_str()) )
       {
@@ -556,8 +561,9 @@ int cmCTestCoverageHandler::ProcessHandler()
 
     cmCTestCoverageHandlerContainer::SingleFileCoverageVector::size_type cc;
     std::string line;
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-      "Actually performing coverage for: " << fullFileName << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Actually performing coverage for: " << fullFileName << std::endl,
+      this->Quiet);
     for ( cc= 0; cc < fcov.size(); cc ++ )
       {
       if ( !cmSystemTools::GetLineFromStream(ifs, line) &&
@@ -641,8 +647,8 @@ int cmCTestCoverageHandler::ProcessHandler()
       }
     int untested = 0;
     std::string line;
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-      "Actually performing coverage for: " << *i << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Actually performing coverage for: " << *i << std::endl, this->Quiet);
     while (cmSystemTools::GetLineFromStream(ifs, line))
       {
       covLogFile << "\t\t<Line Number=\"" << untested << "\" Count=\"0\">"
@@ -736,8 +742,8 @@ int cmCTestCoverageHandler::ProcessHandler()
 //----------------------------------------------------------------------
 void cmCTestCoverageHandler::PopulateCustomVectors(cmMakefile *mf)
 {
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-    " Add coverage exclude regular expressions." << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    " Add coverage exclude regular expressions." << std::endl, this->Quiet);
   this->CTest->PopulateCustomVector(mf, "CTEST_CUSTOM_COVERAGE_EXCLUDE",
                                 this->CustomCoverageExclude);
   this->CTest->PopulateCustomVector(mf, "CTEST_EXTRA_COVERAGE_GLOB",
@@ -747,14 +753,14 @@ void cmCTestCoverageHandler::PopulateCustomVectors(cmMakefile *mf)
     it != this->CustomCoverageExclude.end();
     ++ it )
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " Add coverage exclude: "
-      << *it << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      " Add coverage exclude: " << *it << std::endl, this->Quiet);
     }
   for ( it = this->ExtraCoverageGlobs.begin();
     it != this->ExtraCoverageGlobs.end(); ++it)
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " Add coverage glob: "
-      << *it << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      " Add coverage glob: " << *it << std::endl, this->Quiet);
     }
 }
 
@@ -812,16 +818,16 @@ int cmCTestCoverageHandler::HandleCoberturaCoverage(
 
   if(cmSystemTools::FileExists(coverageXMLFile.c_str()))
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
                "Parsing Cobertura XML file: " << coverageXMLFile
-               << std::endl);
+               << std::endl, this->Quiet);
     cov.ReadCoverageXML(coverageXMLFile.c_str());
     }
   else
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
                "Cannot find Cobertura XML file: " << coverageXMLFile
-               << std::endl);
+               << std::endl, this->Quiet);
     }
   return static_cast<int>(cont->TotalCoverage.size());
 }
@@ -836,33 +842,33 @@ int cmCTestCoverageHandler::HandleMumpsCoverage(
     "/gtm_coverage.mcov";
   if(cmSystemTools::FileExists(coverageFile.c_str()))
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
                "Parsing Cache Coverage: " << coverageFile
-               << std::endl);
+               << std::endl, this->Quiet);
     cov.ReadCoverageFile(coverageFile.c_str());
     return static_cast<int>(cont->TotalCoverage.size());
     }
   else
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-               " Cannot find foobar GTM coverage file: " << coverageFile
-               << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+               " Cannot find GTM coverage file: " << coverageFile
+               << std::endl, this->Quiet);
     }
   cmParseCacheCoverage ccov(*cont, this->CTest);
   coverageFile = this->CTest->GetBinaryDir() +
     "/cache_coverage.cmcov";
   if(cmSystemTools::FileExists(coverageFile.c_str()))
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
                "Parsing Cache Coverage: " << coverageFile
-               << std::endl);
+               << std::endl, this->Quiet);
     ccov.ReadCoverageFile(coverageFile.c_str());
     }
   else
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
                " Cannot find Cache coverage file: " << coverageFile
-               << std::endl);
+               << std::endl, this->Quiet);
     }
   return static_cast<int>(cont->TotalCoverage.size());
 }
@@ -912,15 +918,15 @@ int cmCTestCoverageHandler::HandleJacocoCoverage(
   files=g.GetFiles();
   if (!files.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-      "Found Jacoco Files, Performing Coverage" << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Found Jacoco Files, Performing Coverage" << std::endl, this->Quiet);
     cov.LoadCoverageData(files);
     }
   else
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       " Cannot find Jacoco coverage files: " << coverageFile
-      << std::endl);
+      << std::endl, this->Quiet);
     }
   return static_cast<int>(cont->TotalCoverage.size());
 }
@@ -945,15 +951,16 @@ int cmCTestCoverageHandler::HandleDelphiCoverage(
   files=g.GetFiles();
   if (!files.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-      "Found Delphi HTML Files, Performing Coverage" << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Found Delphi HTML Files, Performing Coverage" << std::endl,
+      this->Quiet);
     cov.LoadCoverageData(files);
     }
   else
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       " Cannot find Delphi coverage files: " << coverageFile
-      << std::endl);
+      << std::endl, this->Quiet);
     }
   return static_cast<int>(cont->TotalCoverage.size());
 }
@@ -975,15 +982,16 @@ int cmCTestCoverageHandler::HandleBlanketJSCoverage(
   files=g.GetFiles();
   if (!files.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-      "Found BlanketJS output JSON, Performing Coverage" << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Found BlanketJS output JSON, Performing Coverage" << std::endl,
+      this->Quiet);
     cov.LoadCoverageData(files);
     }
   else
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
        " Cannot find BlanketJS coverage files: " << coverageFile
-       << std::endl);
+       << std::endl, this->Quiet);
     }
   return static_cast<int>(cont->TotalCoverage.size());
   }
@@ -1039,9 +1047,9 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
 
   if (files.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       " Cannot find any GCov coverage files."
-      << std::endl);
+      << std::endl, this->Quiet);
     // No coverage files is a valid thing, so the exit code is 0
     return 0;
     }
@@ -1057,9 +1065,10 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
   std::set<std::string> missingFiles;
 
   std::string actualSourceFile = "";
-  cmCTestLog(this->CTest, HANDLER_OUTPUT,
-    "   Processing coverage (each . represents one file):" << std::endl);
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "    ");
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+    "   Processing coverage (each . represents one file):" << std::endl,
+    this->Quiet);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "    ", this->Quiet);
   int file_count = 0;
 
   // make sure output from gcov is in English!
@@ -1072,7 +1081,8 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
   //
   for ( it = files.begin(); it != files.end(); ++ it )
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "." << std::flush);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "." << std::flush,
+      this->Quiet);
 
     // Call gcov to get coverage data for this *.gcda file:
     //
@@ -1082,8 +1092,8 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
       "-o \"" + fileDir + "\" " +
       "\"" + *it + "\"";
 
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, command.c_str()
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, command.c_str()
+      << std::endl, this->Quiet);
 
     std::string output = "";
     std::string errors = "";
@@ -1111,12 +1121,12 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << cont->Error << std::endl);
       }
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "--------------------------------------------------------------"
       << std::endl
       << output << std::endl
       << "--------------------------------------------------------------"
-      << std::endl);
+      << std::endl, this->Quiet);
 
     std::vector<std::string> lines;
     std::vector<std::string>::iterator line;
@@ -1128,8 +1138,8 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
       std::string sourceFile;
       std::string gcovFile;
 
-      cmCTestLog(this->CTest, DEBUG, "Line: [" << *line << "]"
-        << std::endl);
+      cmCTestOptionalLog(this->CTest, DEBUG, "Line: [" << *line << "]"
+        << std::endl, this->Quiet);
 
       if (line->empty())
         {
@@ -1229,8 +1239,8 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           break;
           }
 
-        cmCTestLog(this->CTest, WARNING, "Warning: " << st2re4.match(1)
-          << " had unexpected EOF" << std::endl);
+        cmCTestOptionalLog(this->CTest, WARNING, "Warning: " << st2re4.match(1)
+          << " had unexpected EOF" << std::endl, this->Quiet);
         }
       else if ( st2re5.find(line->c_str() ) )
         {
@@ -1246,8 +1256,8 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           break;
           }
 
-        cmCTestLog(this->CTest, WARNING, "Warning: Cannot open file: "
-          << st2re5.match(1) << std::endl);
+        cmCTestOptionalLog(this->CTest, WARNING, "Warning: Cannot open file: "
+          << st2re5.match(1) << std::endl, this->Quiet);
         }
       else if ( st2re6.find(line->c_str() ) )
         {
@@ -1263,8 +1273,9 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           break;
           }
 
-        cmCTestLog(this->CTest, WARNING, "Warning: File: " << st2re6.match(1)
-          << " is newer than " << st2re6.match(2) << std::endl);
+        cmCTestOptionalLog(this->CTest, WARNING, "Warning: File: "
+          << st2re6.match(1)
+          << " is newer than " << st2re6.match(2) << std::endl, this->Quiet);
         }
       else
         {
@@ -1291,8 +1302,8 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
         cmCTestCoverageHandlerContainer::SingleFileCoverageVector& vec
           = cont->TotalCoverage[actualSourceFile];
 
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   in gcovFile: "
-          << gcovFile << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+          "   in gcovFile: " << gcovFile << std::endl, this->Quiet);
 
         cmsys::ifstream ifile(gcovFile.c_str());
         if ( ! ifile )
@@ -1366,8 +1377,8 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
         //
         if ( IsFileInDir(sourceFile, cont->SourceDir) )
           {
-          cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   produced s: "
-            << sourceFile << std::endl);
+          cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+            "   produced s: " << sourceFile << std::endl, this->Quiet);
           *cont->OFS << "  produced in source dir: " << sourceFile
             << std::endl;
           actualSourceFile
@@ -1375,8 +1386,8 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           }
         else if ( IsFileInDir(sourceFile, cont->BinaryDir) )
           {
-          cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   produced b: "
-            << sourceFile << std::endl);
+          cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+            "   produced b: " << sourceFile << std::endl, this->Quiet);
           *cont->OFS << "  produced in binary dir: " << sourceFile
             << std::endl;
           actualSourceFile
@@ -1387,19 +1398,19 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           {
           if ( missingFiles.find(sourceFile) == missingFiles.end() )
             {
-            cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-              "Something went wrong" << std::endl);
-            cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+            cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+              "Something went wrong" << std::endl, this->Quiet);
+            cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
               "Cannot find file: ["
-              << sourceFile << "]" << std::endl);
-            cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+              << sourceFile << "]" << std::endl, this->Quiet);
+            cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
               " in source dir: ["
               << cont->SourceDir << "]"
-              << std::endl);
-            cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+              << std::endl, this->Quiet);
+            cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
               " or binary dir: ["
               << cont->BinaryDir.size() << "]"
-              << std::endl);
+              << std::endl, this->Quiet);
             *cont->OFS << "  Something went wrong. Cannot find file: "
               << sourceFile
               << " in source dir: " << cont->SourceDir
@@ -1415,9 +1426,10 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
 
     if ( file_count % 50 == 0 )
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, " processed: " << file_count
-        << " out of " << files.size() << std::endl);
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "    ");
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, " processed: "
+        << file_count
+        << " out of " << files.size() << std::endl, this->Quiet);
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "    ", this->Quiet);
       }
     }
 
@@ -1435,22 +1447,22 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
     = this->CTest->GetCTestConfiguration("CoverageExtraFlags");
   if ( lcovCommand != "codecov" )
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
                " Not a valid Intel Coverage command."
-               << std::endl);
+               << std::endl, this->Quiet);
     return 0;
     }
   // There is only percentage completed output from LCOV
   std::string st2lcovOutputRex3 = "[0-9]+%";
   cmsys::RegularExpression st2re3(st2lcovOutputRex3.c_str());
 
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
     " This is coverage command: " << lcovCommand
-    << std::endl);
+    << std::endl, this->Quiet);
 
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
     " These are coverage command flags: " << lcovExtraFlags
-    << std::endl);
+    << std::endl, this->Quiet);
 
   std::vector<std::string> files;
   this->FindLCovFiles(files);
@@ -1458,9 +1470,9 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
 
   if (files.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       " Cannot find any LCov coverage files."
-      << std::endl);
+      << std::endl, this->Quiet);
     // No coverage files is a valid thing, so the exit code is 0
     return 0;
     }
@@ -1471,9 +1483,10 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
   std::set<std::string> missingFiles;
 
   std::string actualSourceFile = "";
-  cmCTestLog(this->CTest, HANDLER_OUTPUT,
-    "   Processing coverage (each . represents one file):" << std::endl);
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "    ");
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+    "   Processing coverage (each . represents one file):" << std::endl,
+    this->Quiet);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "    ", this->Quiet);
   int file_count = 0;
 
   // make sure output from lcov is in English!
@@ -1484,16 +1497,17 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
   // directory. It collects all *.dyn files to generate .dpi file.
   for ( it = files.begin(); it != files.end(); ++ it )
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "." << std::flush);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "." << std::flush,
+      this->Quiet);
     std::string fileDir = cmSystemTools::GetFilenamePath(*it);
     cmSystemTools::ChangeDirectory(fileDir);
     std::string command = "\"" + lcovCommand + "\" " +
       lcovExtraFlags + " ";
 
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Current coverage dir: "
-               << fileDir << std::endl);
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, command.c_str()
-               << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Current coverage dir: " << fileDir << std::endl, this->Quiet);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, command.c_str()
+      << std::endl, this->Quiet);
 
     std::string output = "";
     std::string errors = "";
@@ -1521,12 +1535,12 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << cont->Error << std::endl);
       }
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "--------------------------------------------------------------"
       << std::endl
       << output << std::endl
       << "--------------------------------------------------------------"
-      << std::endl);
+      << std::endl, this->Quiet);
 
     std::vector<std::string> lines;
     std::vector<std::string>::iterator line;
@@ -1554,8 +1568,8 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
       std::string daGlob;
       daGlob = dir;
       daGlob += "/*.LCOV";
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                 "   looking for LCOV files in: " << daGlob << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        "   looking for LCOV files in: " << daGlob << std::endl, this->Quiet);
       gl.FindFiles(daGlob);
       // Keep a list of all LCOV files
       lcovFiles.insert(lcovFiles.end(), gl.GetFiles().begin(),
@@ -1590,13 +1604,13 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
         for(std::vector<std::string>::iterator t = lcovFiles.begin();
             t != lcovFiles.end(); ++t)
           {
-          cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Found LCOV File: "
-                     << *t << std::endl);
+          cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+            "Found LCOV File: " << *t << std::endl, this->Quiet);
           }
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "SourceFile: "
-                   << sourceFile << std::endl);
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "lCovFile: "
-                   << lcovFile << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "SourceFile: "
+          << sourceFile << std::endl, this->Quiet);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "lCovFile: "
+        << lcovFile << std::endl, this->Quiet);
 
         // If we have some LCOV files to process
         if ( !lcovFile.empty() && !actualSourceFile.empty() )
@@ -1604,8 +1618,8 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
           cmCTestCoverageHandlerContainer::SingleFileCoverageVector& vec
             = cont->TotalCoverage[actualSourceFile];
 
-          cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   in lcovFile: "
-                     << lcovFile << std::endl);
+          cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+            "   in lcovFile: " << lcovFile << std::endl, this->Quiet);
 
           cmsys::ifstream ifile(lcovFile.c_str());
           if ( ! ifile )
@@ -1620,8 +1634,8 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
 
             // Skip the first line
             cmSystemTools::GetLineFromStream(ifile, nl);
-            cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                       "File is ready, start reading." << std::endl);
+            cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+              "File is ready, start reading." << std::endl, this->Quiet);
             while ( cmSystemTools::GetLineFromStream(ifile, nl) )
               {
               cnt ++;
@@ -1679,9 +1693,10 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
 
     if ( file_count % 50 == 0 )
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, " processed: " << file_count
-                 << " out of " << files.size() << std::endl);
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "    ");
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+        " processed: " << file_count << " out of " << files.size()
+        << std::endl, this->Quiet);
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "    ", this->Quiet);
       }
     }
 
@@ -1707,8 +1722,8 @@ void cmCTestCoverageHandler::FindGCovFiles(std::vector<std::string>& files)
 
     // Coverage files appear next to their object files in the target
     // support directory.
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-               "   globbing for coverage in: " << lmi->first << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "   globbing for coverage in: " << lmi->first << std::endl, this->Quiet);
     std::string daGlob = lmi->first;
     daGlob += "/*.da";
     gl.FindFiles(daGlob);
@@ -1740,12 +1755,12 @@ void cmCTestCoverageHandler::FindLCovFiles(std::vector<std::string>& files)
   std::string daGlob;
   daGlob = prevBinaryDir;
   daGlob += "/*.dpi";
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             "   looking for dpi files in: " << daGlob << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "   looking for dpi files in: " << daGlob << std::endl, this->Quiet);
   gl.FindFiles(daGlob);
   files.insert(files.end(), gl.GetFiles().begin(), gl.GetFiles().end());
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             "Now searching in: " << daGlob << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "Now searching in: " << daGlob << std::endl, this->Quiet);
 }
 
 //----------------------------------------------------------------------
@@ -1761,9 +1776,9 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
 
   if (files.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       " Cannot find any Python Trace.py coverage files."
-      << std::endl);
+      << std::endl, this->Quiet);
     // No coverage files is a valid thing, so the exit code is 0
     return 0;
     }
@@ -1791,13 +1806,13 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
 
     std::string actualSourceFile
       = cmSystemTools::CollapseFullPath(fileName);
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "   Check coverage for file: " << actualSourceFile
-      << std::endl);
+      << std::endl, this->Quiet);
     cmCTestCoverageHandlerContainer::SingleFileCoverageVector* vec
       = &cont->TotalCoverage[actualSourceFile];
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-      "   in file: " << *fileIt << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "   in file: " << *fileIt << std::endl, this->Quiet);
     cmsys::ifstream ifile(fileIt->c_str());
     if ( ! ifile )
       {
@@ -1850,9 +1865,9 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
           // So, this will be set to 0.
           cov = 0;
           }
-        cmCTestLog(this->CTest, DEBUG, "Prefix: " << prefix
+        cmCTestOptionalLog(this->CTest, DEBUG, "Prefix: " << prefix
           << " cov: " << cov
-          << std::endl);
+          << std::endl, this->Quiet);
         // Read the line number starting at the 10th character of the gcov
         // output line
         long lineIdx = cnt;
@@ -1945,18 +1960,16 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
   // for each file run covbr on that file to get the coverage
   // information for that file
   std::string outputFile;
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                 "run covbr: "
-                 << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "run covbr: " << std::endl, this->Quiet);
 
   if(!this->RunBullseyeCommand(cont, "covbr", 0, outputFile))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error running covbr for." << "\n");
     return -1;
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             "covbr output in  " << outputFile
-             << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "covbr output in  " << outputFile << std::endl, this->Quiet);
   // open the output file
   cmsys::ifstream fin(outputFile.c_str());
   if(!fin)
@@ -2002,10 +2015,8 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
       // only allow 100 files in each log file
       if ( count != 0 && count % 100 == 0 )
         {
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                   "start a new log file: "
-                   << count
-                   << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+          "start a new log file: " << count << std::endl, this->Quiet);
         this->EndCoverageLogFile(covLogFile, logFileCount);
         logFileCount ++;
         if ( !this->StartCoverageLogFile(covLogFile, logFileCount) )
@@ -2021,10 +2032,9 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
         {
         // we have a new file so count it in the output
         count++;
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                   "Produce coverage for file: "
-                   << file << " " << count
-                   << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+          "Produce coverage for file: " << file << " " << count
+          << std::endl, this->Quiet);
         // start the file output
         covLogFile << "\t<File Name=\""
                    << cmXMLSafe(i->first)
@@ -2083,13 +2093,13 @@ int cmCTestCoverageHandler::RunBullseyeCommand(
     }
   if(arg)
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-               "Run : " << program << " " << arg << "\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Run : " << program << " " << arg << "\n", this->Quiet);
     }
   else
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-               "Run : " << program << "\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Run : " << program << "\n", this->Quiet);
     }
   // create a process object and start it
   cmCTestRunProcess runCoverageSrc;
@@ -2215,17 +2225,17 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
                                   cont->BinaryDir.c_str());
       if ( !shouldIDoCoverage )
         {
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                   ".NoDartCoverage found, so skip coverage check for: "
-                   << file
-                   << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+          ".NoDartCoverage found, so skip coverage check for: "
+          << file
+          << std::endl, this->Quiet);
         continue;
         }
 
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                 "Doing coverage for: "
-                 << file
-                 << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        "Doing coverage for: "
+        << file
+        << std::endl, this->Quiet);
 
       coveredFiles.push_back(sourceFile);
       coveredFilesFullPath.push_back(file);
@@ -2328,23 +2338,23 @@ int cmCTestCoverageHandler::HandleBullseyeCoverage(
   const char* covfile = cmSystemTools::GetEnv("COVFILE");
   if(!covfile || strlen(covfile) == 0)
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-               " COVFILE environment variable not found, not running "
-               " bullseye\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      " COVFILE environment variable not found, not running "
+      " bullseye\n", this->Quiet);
     return 0;
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             " run covsrc with COVFILE=["
-             << covfile
-             << "]" << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    " run covsrc with COVFILE=["
+    << covfile
+    << "]" << std::endl, this->Quiet);
   if(!this->RunBullseyeSourceSummary(cont))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Error running bullseye summary.\n");
     return 0;
     }
-  cmCTestLog(this->CTest, DEBUG, "HandleBullseyeCoverage return 1 "
-             << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG, "HandleBullseyeCoverage return 1 "
+  << std::endl, this->Quiet);
   return 1;
 }
 
@@ -2438,8 +2448,8 @@ void cmCTestCoverageHandler::LoadLabels()
   std::string fileList = this->CTest->GetBinaryDir();
   fileList += cmake::GetCMakeFilesDirectory();
   fileList += "/TargetDirectories.txt";
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             " target directory list [" << fileList << "]\n");
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    " target directory list [" << fileList << "]\n", this->Quiet);
   cmsys::ifstream finList(fileList.c_str());
   std::string line;
   while(cmSystemTools::GetLineFromStream(finList, line))
@@ -2460,8 +2470,8 @@ void cmCTestCoverageHandler::LoadLabels(const char* dir)
     return;
     }
 
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             " loading labels from [" << fname << "]\n");
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    " loading labels from [" << fname << "]\n", this->Quiet);
   bool inTarget = true;
   std::string source;
   std::string line;
diff --git a/Source/CTest/cmCTestCoverageHandler.h b/Source/CTest/cmCTestCoverageHandler.h
index 4aec795..3258ddb 100644
--- a/Source/CTest/cmCTestCoverageHandler.h
+++ b/Source/CTest/cmCTestCoverageHandler.h
@@ -30,9 +30,10 @@ public:
   typedef std::map<std::string, SingleFileCoverageVector> TotalCoverageMap;
   TotalCoverageMap TotalCoverage;
   std::ostream* OFS;
+  bool Quiet;
 };
 /** \class cmCTestCoverageHandler
- * \brief A class that handles coverage computaiton for ctest
+ * \brief A class that handles coverage computation for ctest
  *
  */
 class cmCTestCoverageHandler : public cmCTestGenericHandler
diff --git a/Source/CTest/cmParseBlanketJSCoverage.cxx b/Source/CTest/cmParseBlanketJSCoverage.cxx
index 85d066b..1edd01f 100644
--- a/Source/CTest/cmParseBlanketJSCoverage.cxx
+++ b/Source/CTest/cmParseBlanketJSCoverage.cxx
@@ -138,12 +138,12 @@ bool cmParseBlanketJSCoverage::LoadCoverageData(std::vector<std::string> files)
   {
   size_t i=0;
   std::string path;
-      cmCTestLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
-       "Found " << files.size() <<" Files" << std::endl);
+      cmCTestOptionalLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
+       "Found " << files.size() <<" Files" << std::endl, this->Coverage.Quiet);
   for(i=0;i<files.size();i++)
     {
-    cmCTestLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
-       "Reading JSON File " << files[i]  << std::endl);
+    cmCTestOptionalLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
+       "Reading JSON File " << files[i]  << std::endl, this->Coverage.Quiet);
 
     if(!this->ReadJSONFile(files[i]))
       {
@@ -157,8 +157,8 @@ bool cmParseBlanketJSCoverage::ReadJSONFile(std::string file)
   {
   cmParseBlanketJSCoverage::JSONParser parser
      (this->Coverage);
-  cmCTestLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
-       "Parsing " << file << std::endl);
+  cmCTestOptionalLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
+       "Parsing " << file << std::endl, this->Coverage.Quiet);
   parser.ParseFile(file);
   return true;
   }
diff --git a/Source/CTest/cmParseCacheCoverage.cxx b/Source/CTest/cmParseCacheCoverage.cxx
index 3642308..92bf88e 100644
--- a/Source/CTest/cmParseCacheCoverage.cxx
+++ b/Source/CTest/cmParseCacheCoverage.cxx
@@ -71,9 +71,9 @@ void cmParseCacheCoverage::RemoveUnCoveredFiles()
       }
     if(nothing)
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
                  "No coverage found in: " << ci->first
-                 << std::endl);
+                 << std::endl, this->Coverage.Quiet);
       this->Coverage.TotalCoverage.erase(ci++);
       }
     else
diff --git a/Source/CTest/cmParseCoberturaCoverage.cxx b/Source/CTest/cmParseCoberturaCoverage.cxx
index e19b199..3ed5cb0 100644
--- a/Source/CTest/cmParseCoberturaCoverage.cxx
+++ b/Source/CTest/cmParseCoberturaCoverage.cxx
@@ -50,8 +50,8 @@ protected:
      if (this->InSources && this->InSource)
        {
        this->FilePaths.push_back(tmp);
-       cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Adding Source: "
-                   << tmp << std::endl);
+       cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+         "Adding Source: " << tmp << std::endl, this->Coverage.Quiet);
        }
   }
 
@@ -74,8 +74,9 @@ protected:
       {
         if(strcmp(atts[tagCount], "filename") == 0)
         {
-          cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Reading file: "
-                     << atts[tagCount+1]<< std::endl);
+          cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+            "Reading file: " << atts[tagCount+1]<< std::endl,
+            this->Coverage.Quiet);
           std::string filename = atts[tagCount+1];
           this->CurFileName = "";
 
@@ -113,9 +114,9 @@ protected:
             fin.open(this->CurFileName.c_str());
             if (!fin)
             {
-              cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                         "Skipping system file " << filename <<
-                         std::endl);
+              cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+                "Skipping system file " << filename << std::endl,
+                this->Coverage.Quiet);
 
               this->SkipThisClass = true;
               break;
diff --git a/Source/CTest/cmParseDelphiCoverage.cxx b/Source/CTest/cmParseDelphiCoverage.cxx
index 4dfdfac..e453fe1 100644
--- a/Source/CTest/cmParseDelphiCoverage.cxx
+++ b/Source/CTest/cmParseDelphiCoverage.cxx
@@ -122,8 +122,9 @@ public:
       lastoffset = line.find('(',pos);
       if(lastoffset==line.npos)
         {
-        cmCTestLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
-           endnamepos << "File not found  " << lastoffset  << std::endl);
+        cmCTestOptionalLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
+           endnamepos << "File not found  " << lastoffset  << std::endl,
+           this->Coverage.Quiet);
         return false;
         }
       endnamepos = line.find(')',lastoffset);
@@ -131,8 +132,9 @@ public:
          (endnamepos-1)-lastoffset);
       if(filename.find(".pas") != filename.npos)
         {
-        cmCTestLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
-           "Coverage found for file:  " << filename  << std::endl);
+        cmCTestOptionalLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
+           "Coverage found for file:  " << filename  << std::endl,
+           this->Coverage.Quiet);
         break;
         }
       pos = lastoffset+1;
@@ -153,8 +155,9 @@ public:
       *  If that doesn't find any matching files
       *  return a failure.
       */
-      cmCTestLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
-         "Unable to find file matching" << glob << std::endl);
+      cmCTestOptionalLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
+         "Unable to find file matching" << glob << std::endl,
+         this->Coverage.Quiet);
       return false;
       }
     FileLinesType&  coverageVector =
@@ -229,8 +232,8 @@ bool cmParseDelphiCoverage::LoadCoverageData(
     {
     path = files[i];
 
-    cmCTestLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
-       "Reading HTML File " << path  << std::endl);
+    cmCTestOptionalLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
+       "Reading HTML File " << path  << std::endl, this->Coverage.Quiet);
     if(cmSystemTools::GetFilenameLastExtension(path) == ".html")
       {
       if(!this->ReadDelphiHTML(path.c_str()))
diff --git a/Source/CTest/cmParseJacocoCoverage.cxx b/Source/CTest/cmParseJacocoCoverage.cxx
index 780debc..ec4cfad 100644
--- a/Source/CTest/cmParseJacocoCoverage.cxx
+++ b/Source/CTest/cmParseJacocoCoverage.cxx
@@ -49,8 +49,9 @@ class cmParseJacocoCoverage::XMLParser: public cmXMLParser
       else if(name == "sourcefile")
         {
         this->FileName = atts[1];
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Reading file: "
-                     << this->FileName << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+          "Reading file: " << this->FileName << std::endl,
+          this->Coverage.Quiet);
           for(size_t i=0;i < FilePaths.size();i++)
             {
             std::string finalpath = FilePaths[i] + "/" + this->FileName;
@@ -148,8 +149,8 @@ bool cmParseJacocoCoverage::LoadCoverageData(
     {
     path = files[i];
 
-    cmCTestLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
-      "Reading XML File " << path  << std::endl);
+    cmCTestOptionalLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
+      "Reading XML File " << path  << std::endl, this->Coverage.Quiet);
     if(cmSystemTools::GetFilenameLastExtension(path) == ".xml")
       {
       if(!this->ReadJacocoXML(path.c_str()))
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 4861202..83a88ad 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -131,6 +131,9 @@ add_RunCMake_test(cmake_minimum_required)
 add_RunCMake_test(continue)
 add_RunCMake_test(ctest_build)
 add_RunCMake_test(ctest_configure)
+if(COVERAGE_COMMAND)
+  add_RunCMake_test(ctest_coverage -DCOVERAGE_COMMAND=${COVERAGE_COMMAND})
+endif()
 add_RunCMake_test(ctest_start)
 add_RunCMake_test(ctest_submit)
 add_RunCMake_test(ctest_test)
diff --git a/Tests/RunCMake/ctest_coverage/CMakeLists.txt.in b/Tests/RunCMake/ctest_coverage/CMakeLists.txt.in
new file mode 100644
index 0000000..1babd72
--- /dev/null
+++ b/Tests/RunCMake/ctest_coverage/CMakeLists.txt.in
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1)
+project(CTestCoverage at CASE_NAME@ NONE)
+include(CTest)
+add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
diff --git a/Tests/RunCMake/ctest_coverage/CTestConfig.cmake.in b/Tests/RunCMake/ctest_coverage/CTestConfig.cmake.in
new file mode 100644
index 0000000..1f679d5
--- /dev/null
+++ b/Tests/RunCMake/ctest_coverage/CTestConfig.cmake.in
@@ -0,0 +1 @@
+set(CTEST_PROJECT_NAME "CTestCoverage at CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_coverage/CoverageQuiet-stdout.txt b/Tests/RunCMake/ctest_coverage/CoverageQuiet-stdout.txt
new file mode 100644
index 0000000..3b09eac
--- /dev/null
+++ b/Tests/RunCMake/ctest_coverage/CoverageQuiet-stdout.txt
@@ -0,0 +1 @@
+sec$
diff --git a/Tests/RunCMake/ctest_coverage/RunCMakeTest.cmake b/Tests/RunCMake/ctest_coverage/RunCMakeTest.cmake
new file mode 100644
index 0000000..dd443fc
--- /dev/null
+++ b/Tests/RunCMake/ctest_coverage/RunCMakeTest.cmake
@@ -0,0 +1,10 @@
+include(RunCTest)
+
+set(CASE_CTEST_COVERAGE_ARGS "")
+
+function(run_ctest_coverage CASE_NAME)
+  set(CASE_CTEST_COVERAGE_ARGS "${ARGN}")
+  run_ctest(${CASE_NAME})
+endfunction()
+
+run_ctest_coverage(CoverageQuiet QUIET)
diff --git a/Tests/RunCMake/ctest_coverage/test.cmake.in b/Tests/RunCMake/ctest_coverage/test.cmake.in
new file mode 100644
index 0000000..1788e66
--- /dev/null
+++ b/Tests/RunCMake/ctest_coverage/test.cmake.in
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.1)
+
+set(CTEST_SITE                          "test-site")
+set(CTEST_BUILD_NAME                    "test-build-name")
+set(CTEST_SOURCE_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME@")
+set(CTEST_BINARY_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME at -build")
+set(CTEST_CMAKE_GENERATOR               "@RunCMake_GENERATOR@")
+set(CTEST_CMAKE_GENERATOR_PLATFORM      "@RunCMake_GENERATOR_PLATFORM@")
+set(CTEST_CMAKE_GENERATOR_TOOLSET       "@RunCMake_GENERATOR_TOOLSET@")
+set(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
+set(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
+
+set(ctest_coverage_args "@CASE_CTEST_COVERAGE_ARGS@")
+ctest_start(Experimental)
+ctest_configure()
+ctest_build()
+ctest_test()
+ctest_coverage(${ctest_coverage_args})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2216725bcdb36e430ca573276fee319a4db82912
commit 2216725bcdb36e430ca573276fee319a4db82912
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 17 14:23:56 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 11:45:54 2015 -0500

    ctest_test: Add QUIET option

diff --git a/Help/command/ctest_test.rst b/Help/command/ctest_test.rst
index 5f28083..ee76e91 100644
--- a/Help/command/ctest_test.rst
+++ b/Help/command/ctest_test.rst
@@ -31,3 +31,9 @@ tests should all stop running.
 The APPEND option marks results for append to those previously
 submitted to a dashboard server since the last ctest_start.  Append
 semantics are defined by the dashboard server in use.
+
+The QUIET option suppresses any CTest-specific non-error messages
+that would have otherwise been printed to the console.  Output from
+the underlying test command is not affected.  Summary info detailing
+the percentage of passing tests is also unaffected by the QUIET
+option.
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index f223127..eb33d8e 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -113,7 +113,8 @@ void cmCTestMultiProcessHandler::RunTests()
 //---------------------------------------------------------
 void cmCTestMultiProcessHandler::StartTestProcess(int test)
 {
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "test " << test << "\n");
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "test " << test << "\n", this->Quiet);
   this->TestRunningMap[test] = true; // mark the test as running
   // now remove the test itself
   this->EraseTest(test);
@@ -639,39 +640,44 @@ void cmCTestMultiProcessHandler::PrintTestList()
 
     if(!p.Labels.empty()) //print the labels
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Labels:");
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Labels:",
+        this->Quiet);
       }
     for(std::vector<std::string>::iterator label = p.Labels.begin();
         label != p.Labels.end(); ++label)
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " " << *label);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " " << *label,
+        this->Quiet);
       }
     if(!p.Labels.empty()) //print the labels
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, std::endl,
+        this->Quiet);
       }
 
     if (this->TestHandler->MemCheck)
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "  Memory Check");
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "  Memory Check",
+        this->Quiet);
       }
      else
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "  Test");
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "  Test", this->Quiet);
       }
     std::ostringstream indexStr;
     indexStr << " #" << p.Index << ":";
-    cmCTestLog(this->CTest, HANDLER_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
       std::setw(3 + getNumWidth(this->TestHandler->GetMaxIndex()))
-      << indexStr.str());
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, " ");
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, p.Name.c_str() << std::endl);
+      << indexStr.str(), this->Quiet);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, " ", this->Quiet);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      p.Name.c_str() << std::endl, this->Quiet);
     //pop working dir
     cmSystemTools::ChangeDirectory(current_dir);
     }
 
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl << "Total Tests: "
-    << this->Total << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, std::endl << "Total Tests: "
+    << this->Total << std::endl, this->Quiet);
 }
 
 void cmCTestMultiProcessHandler::PrintLabels()
@@ -686,16 +692,19 @@ void cmCTestMultiProcessHandler::PrintLabels()
 
   if(!allLabels.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "All Labels:" << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "All Labels:" << std::endl, this->Quiet);
     }
   else
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "No Labels Exist" << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "No Labels Exist" << std::endl, this->Quiet);
     }
   for(std::set<std::string>::iterator label = allLabels.begin();
       label != allLabels.end(); ++label)
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "  " << *label << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "  " << *label << std::endl, this->Quiet);
     }
 }
 
@@ -758,8 +767,8 @@ int cmCTestMultiProcessHandler::FindMaxIndex()
 //Returns true if no cycles exist in the dependency graph
 bool cmCTestMultiProcessHandler::CheckCycles()
 {
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             "Checking test dependency graph..." << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+             "Checking test dependency graph..." << std::endl, this->Quiet);
   for(TestMap::iterator it = this->Tests.begin();
       it != this->Tests.end(); ++it)
     {
@@ -794,7 +803,7 @@ bool cmCTestMultiProcessHandler::CheckCycles()
         }
       }
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             "Checking test dependency graph end" << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+             "Checking test dependency graph end" << std::endl, this->Quiet);
   return true;
 }
diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h
index 605de31..6440fbc 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.h
+++ b/Source/CTest/cmCTestMultiProcessHandler.h
@@ -57,6 +57,8 @@ public:
 
   cmCTestTestHandler * GetTestHandler()
   { return this->TestHandler; }
+
+  void SetQuiet(bool b) { this->Quiet = b; }
 protected:
   // Start the next test or tests as many as are allowed by
   // ParallelLevel
@@ -118,6 +120,7 @@ protected:
   cmCTestTestHandler * TestHandler;
   cmCTest* CTest;
   bool HasCycles;
+  bool Quiet;
 };
 
 #endif
diff --git a/Source/CTest/cmCTestTestCommand.cxx b/Source/CTest/cmCTestTestCommand.cxx
index d209094..8b357ac 100644
--- a/Source/CTest/cmCTestTestCommand.cxx
+++ b/Source/CTest/cmCTestTestCommand.cxx
@@ -103,6 +103,7 @@ cmCTestGenericHandler* cmCTestTestCommand::InitializeHandler()
     {
     this->CTest->SetStopTime(this->Values[ctt_STOP_TIME]);
     }
+  handler->SetQuiet(this->Quiet);
   return handler;
 }
 
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 925e3c9..0e84fbf 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -527,10 +527,10 @@ int cmCTestTestHandler::ProcessHandler()
 
   this->TestResults.clear();
 
-  cmCTestLog(this->CTest, HANDLER_OUTPUT,
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
              (this->MemCheck ? "Memory check" : "Test")
              << " project " << cmSystemTools::GetCurrentWorkingDirectory()
-             << std::endl);
+             << std::endl, this->Quiet);
   if ( ! this->PreProcessHandler() )
     {
     return -1;
@@ -567,13 +567,13 @@ int cmCTestTestHandler::ProcessHandler()
     if (this->HandlerVerbose && !passed.empty() &&
       (this->UseIncludeRegExpFlag || this->UseExcludeRegExpFlag))
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, std::endl
-        << "The following tests passed:" << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, std::endl
+        << "The following tests passed:" << std::endl, this->Quiet);
       for(std::vector<std::string>::iterator j = passed.begin();
           j != passed.end(); ++j)
         {
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "\t" << *j
-          << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "\t" << *j
+          << std::endl, this->Quiet);
         }
       }
 
@@ -593,8 +593,8 @@ int cmCTestTestHandler::ProcessHandler()
       }
     char realBuf[1024];
     sprintf(realBuf, "%6.2f sec", (double)(clock_finish - clock_start));
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "\nTotal Test time (real) = "
-               << realBuf << "\n" );
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "\nTotal Test time (real) = " << realBuf << "\n", this->Quiet );
 
     if (!failed.empty())
       {
@@ -614,11 +614,11 @@ int cmCTestTestHandler::ProcessHandler()
         if ( ftit->Status != cmCTestTestHandler::COMPLETED )
           {
           ofs << ftit->TestCount << ":" << ftit->Name << std::endl;
-          cmCTestLog(this->CTest, HANDLER_OUTPUT, "\t" << std::setw(3)
+          cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "\t" << std::setw(3)
                      << ftit->TestCount << " - "
                      << ftit->Name << " ("
                      << this->GetTestStatus(ftit->Status) << ")"
-                     << std::endl);
+                     << std::endl, this->Quiet);
           }
         }
       }
@@ -700,7 +700,8 @@ void cmCTestTestHandler::PrintLabelSummary()
   // now print times
   if(!labels.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "\nLabel Time Summary:");
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "\nLabel Time Summary:",
+      this->Quiet);
     }
   for(std::set<std::string>::const_iterator i = labels.begin();
       i != labels.end(); ++i)
@@ -709,8 +710,8 @@ void cmCTestTestHandler::PrintLabelSummary()
     label.resize(maxlen +3, ' ');
     char buf[1024];
     sprintf(buf, "%6.2f sec", labelTimes[*i]);
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "\n"
-               << label << " = " << buf );
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "\n"
+               << label << " = " << buf, this->Quiet );
     if ( this->LogFile )
       {
       *this->LogFile << "\n" << *i << " = "
@@ -723,7 +724,7 @@ void cmCTestTestHandler::PrintLabelSummary()
       {
       *this->LogFile << "\n";
       }
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "\n", this->Quiet);
     }
 
 }
@@ -1063,6 +1064,7 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<std::string> &passed,
   parallel->SetCTest(this->CTest);
   parallel->SetParallelLevel(this->CTest->GetParallelLevel());
   parallel->SetTestHandler(this);
+  parallel->SetQuiet(this->Quiet);
 
   *this->LogFile << "Start testing: "
     << this->CTest->CurrentTime() << std::endl
@@ -1334,8 +1336,8 @@ int cmCTestTestHandler::ExecuteCommands(std::vector<std::string>& vec)
   for ( it = vec.begin(); it != vec.end(); ++it )
     {
     int retVal = 0;
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << *it
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " <<
+      *it << std::endl, this->Quiet);
     if ( !cmSystemTools::RunSingleCommand(it->c_str(), 0, &retVal, 0,
                                           cmSystemTools::OUTPUT_MERGE
         /*this->Verbose*/) || retVal != 0 )
@@ -1541,8 +1543,7 @@ std::string cmCTestTestHandler
     for(std::vector<std::string>::iterator i = failed.begin();
         i != failed.end(); ++i)
       {
-      cmCTestLog(ctest, HANDLER_OUTPUT,
-                 i->c_str() << "\n");
+      cmCTestLog(ctest, HANDLER_OUTPUT, i->c_str() << "\n");
       }
     }
 
@@ -1571,8 +1572,8 @@ void cmCTestTestHandler::GetListOfTests()
     {
     this->ExcludeTestsRegularExpression.compile(this->ExcludeRegExp.c_str());
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-    "Constructing a list of tests" << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "Constructing a list of tests" << std::endl, this->Quiet);
   cmake cm;
   cmGlobalGenerator gg;
   gg.SetCMakeInstance(&cm);
@@ -1628,8 +1629,8 @@ void cmCTestTestHandler::GetListOfTests()
     {
     return;
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-    "Done constructing a list of tests" << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "Done constructing a list of tests" << std::endl, this->Quiet);
 }
 
 //----------------------------------------------------------------------
@@ -2016,8 +2017,8 @@ std::string cmCTestTestHandler::GenerateRegressionImages(
           << "><Value>File " << filename
           << " not found</Value></NamedMeasurement>"
           << std::endl;
-        cmCTestLog(this->CTest, HANDLER_OUTPUT, "File \"" << filename
-          << "\" not found." << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "File \"" << filename
+          << "\" not found." << std::endl, this->Quiet);
         }
       cxml.erase(measurementfile.start(),
         measurementfile.end() - measurementfile.start());
@@ -2265,7 +2266,8 @@ bool cmCTestTestHandler::SetTestsProperties(
 bool cmCTestTestHandler::AddTest(const std::vector<std::string>& args)
 {
   const std::string& testname = args[0];
-  cmCTestLog(this->CTest, DEBUG, "Add test: " << args[0] << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG, "Add test: " << args[0] << std::endl,
+    this->Quiet);
 
   if (this->UseExcludeRegExpFlag &&
     this->UseExcludeRegExpFirst &&
@@ -2288,8 +2290,8 @@ bool cmCTestTestHandler::AddTest(const std::vector<std::string>& args)
       }
     if ( found )
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Ignore memcheck: "
-        << *it << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        "Ignore memcheck: " << *it << std::endl, this->Quiet);
       return true;
       }
     }
@@ -2308,8 +2310,8 @@ bool cmCTestTestHandler::AddTest(const std::vector<std::string>& args)
       }
     if ( found )
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Ignore test: "
-        << *it << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Ignore test: "
+        << *it << std::endl, this->Quiet);
       return true;
       }
     }
@@ -2318,8 +2320,8 @@ bool cmCTestTestHandler::AddTest(const std::vector<std::string>& args)
   test.Name = testname;
   test.Args = args;
   test.Directory = cmSystemTools::GetCurrentWorkingDirectory();
-  cmCTestLog(this->CTest, DEBUG, "Set test directory: "
-    << test.Directory << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG, "Set test directory: "
+    << test.Directory << std::endl, this->Quiet);
 
   test.IsInBasedOnREOptions = true;
   test.WillFail = false;
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 9bce7a3..4861202 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -133,6 +133,7 @@ add_RunCMake_test(ctest_build)
 add_RunCMake_test(ctest_configure)
 add_RunCMake_test(ctest_start)
 add_RunCMake_test(ctest_submit)
+add_RunCMake_test(ctest_test)
 add_RunCMake_test(file)
 add_RunCMake_test(find_library)
 add_RunCMake_test(find_package)
diff --git a/Tests/RunCMake/ctest_test/CMakeLists.txt.in b/Tests/RunCMake/ctest_test/CMakeLists.txt.in
new file mode 100644
index 0000000..cedf379
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/CMakeLists.txt.in
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1)
+project(CTestTest at CASE_NAME@ NONE)
+include(CTest)
+add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
diff --git a/Tests/RunCMake/ctest_test/CTestConfig.cmake.in b/Tests/RunCMake/ctest_test/CTestConfig.cmake.in
new file mode 100644
index 0000000..9004419
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/CTestConfig.cmake.in
@@ -0,0 +1 @@
+set(CTEST_PROJECT_NAME "CTestTest at CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
new file mode 100644
index 0000000..d906290
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
@@ -0,0 +1,10 @@
+include(RunCTest)
+
+set(CASE_CTEST_TEST_ARGS "")
+
+function(run_ctest_test CASE_NAME)
+  set(CASE_CTEST_TEST_ARGS "${ARGN}")
+  run_ctest(${CASE_NAME})
+endfunction()
+
+run_ctest_test(TestQuiet QUIET)
diff --git a/Tests/RunCMake/ctest_test/TestQuiet-stdout.txt b/Tests/RunCMake/ctest_test/TestQuiet-stdout.txt
new file mode 100644
index 0000000..14613c5
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestQuiet-stdout.txt
@@ -0,0 +1,2 @@
+   0 Compiler warnings
+    Start 1: RunCMakeVersion
diff --git a/Tests/RunCMake/ctest_test/test.cmake.in b/Tests/RunCMake/ctest_test/test.cmake.in
new file mode 100644
index 0000000..1350abe
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/test.cmake.in
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.1)
+
+set(CTEST_SITE                          "test-site")
+set(CTEST_BUILD_NAME                    "test-build-name")
+set(CTEST_SOURCE_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME@")
+set(CTEST_BINARY_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME at -build")
+set(CTEST_CMAKE_GENERATOR               "@RunCMake_GENERATOR@")
+set(CTEST_CMAKE_GENERATOR_PLATFORM      "@RunCMake_GENERATOR_PLATFORM@")
+set(CTEST_CMAKE_GENERATOR_TOOLSET       "@RunCMake_GENERATOR_TOOLSET@")
+set(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
+
+set(ctest_test_args "@CASE_CTEST_TEST_ARGS@")
+ctest_start(Experimental)
+ctest_configure()
+ctest_build()
+ctest_test(${ctest_test_args})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc3e2e4a2571370453f94d6bcac5eecdb97c322e
commit cc3e2e4a2571370453f94d6bcac5eecdb97c322e
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 17 13:41:40 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 11:45:30 2015 -0500

    ctest_build: Add QUIET option

diff --git a/Help/command/ctest_build.rst b/Help/command/ctest_build.rst
index 4a95cdd..e7a54d1 100644
--- a/Help/command/ctest_build.rst
+++ b/Help/command/ctest_build.rst
@@ -23,6 +23,11 @@ The APPEND option marks results for append to those previously
 submitted to a dashboard server since the last ctest_start.  Append
 semantics are defined by the dashboard server in use.
 
+The QUIET option suppresses any CTest-specific non-error output
+that would have been printed to the console otherwise.  The summary
+of warnings / errors, as well as the output from the native build tool
+is unaffected by this option.
+
 If set, the contents of the variable CTEST_BUILD_FLAGS are passed as
 additional arguments to the underlying build command. This can e.g. be
 used to trigger a parallel build using the -j option of make. See
diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx
index c4df741..2b36b0a 100644
--- a/Source/CTest/cmCTestBuildCommand.cxx
+++ b/Source/CTest/cmCTestBuildCommand.cxx
@@ -58,7 +58,8 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler()
     = this->Makefile->GetDefinition("CTEST_BUILD_COMMAND");
   if ( ctestBuildCommand && *ctestBuildCommand )
     {
-    this->CTest->SetCTestConfiguration("MakeCommand", ctestBuildCommand);
+    this->CTest->SetCTestConfiguration("MakeCommand", ctestBuildCommand,
+      this->Quiet);
     }
   else
     {
@@ -141,10 +142,10 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler()
         GenerateCMakeBuildCommand(cmakeBuildTarget ? cmakeBuildTarget : "",
           cmakeBuildConfiguration,
           cmakeBuildAdditionalFlags ? cmakeBuildAdditionalFlags : "", true);
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                 "SetMakeCommand:"
-                 << buildCommand << "\n");
-      this->CTest->SetCTestConfiguration("MakeCommand", buildCommand.c_str());
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        "SetMakeCommand:" << buildCommand << "\n", this->Quiet);
+      this->CTest->SetCTestConfiguration("MakeCommand", buildCommand.c_str(),
+        this->Quiet);
       }
     else
       {
@@ -168,9 +169,11 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler()
   if(const char* useLaunchers =
      this->Makefile->GetDefinition("CTEST_USE_LAUNCHERS"))
     {
-    this->CTest->SetCTestConfiguration("UseLaunchers", useLaunchers);
+    this->CTest->SetCTestConfiguration("UseLaunchers", useLaunchers,
+      this->Quiet);
     }
 
+  handler->SetQuiet(this->Quiet);
   return handler;
 }
 
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index f941408..fe27e2b 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -286,9 +286,9 @@ std::string cmCTestBuildHandler::GetMakeCommand()
 {
   std::string makeCommand
     = this->CTest->GetCTestConfiguration("MakeCommand");
-  cmCTestLog(this->CTest,
-             HANDLER_VERBOSE_OUTPUT, "MakeCommand:" << makeCommand <<
-             "\n");
+  cmCTestOptionalLog(this->CTest,
+    HANDLER_VERBOSE_OUTPUT, "MakeCommand:" << makeCommand << "\n",
+    this->Quiet);
 
   std::string configType = this->CTest->GetConfigType();
   if (configType == "")
@@ -312,7 +312,8 @@ std::string cmCTestBuildHandler::GetMakeCommand()
 //functions and commented...
 int cmCTestBuildHandler::ProcessHandler()
 {
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "Build project" << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "Build project" << std::endl,
+    this->Quiet);
 
   // do we have time for this
   if (this->CTest->GetRemainingTimeAllowed() < 120)
@@ -401,12 +402,12 @@ int cmCTestBuildHandler::ProcessHandler()
 
 #define cmCTestBuildHandlerPopulateRegexVector(strings, regexes) \
   regexes.clear(); \
-    cmCTestLog(this->CTest, DEBUG, this << "Add " #regexes \
-    << std::endl); \
+    cmCTestOptionalLog(this->CTest, DEBUG, this << "Add " #regexes \
+    << std::endl, this->Quiet); \
   for ( it = strings.begin(); it != strings.end(); ++it ) \
     { \
-    cmCTestLog(this->CTest, DEBUG, "Add " #strings ": " \
-    << *it << std::endl); \
+    cmCTestOptionalLog(this->CTest, DEBUG, "Add " #strings ": " \
+    << *it << std::endl, this->Quiet); \
     regexes.push_back(it->c_str()); \
     }
   cmCTestBuildHandlerPopulateRegexVector(
@@ -472,8 +473,8 @@ int cmCTestBuildHandler::ProcessHandler()
     }
   else
     {
-    cmCTestLog(this->CTest, DEBUG, "Build with command: " << makeCommand
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, DEBUG, "Build with command: " <<
+      makeCommand << std::endl, this->Quiet);
     }
 
   // Remember end build time and calculate elapsed time
@@ -906,13 +907,16 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
     }
   argv.push_back(0);
 
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command:");
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command:",
+    this->Quiet);
   std::vector<const char*>::iterator ait;
   for ( ait = argv.begin(); ait != argv.end() && *ait; ++ ait )
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " \"" << *ait << "\"");
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " \"" << *ait <<
+      "\"", this->Quiet);
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, std::endl,
+    this->Quiet);
 
   // Optionally use make rule launchers to record errors and warnings.
   LaunchHelper launchHelper(this);
@@ -932,12 +936,12 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
 
   char* data;
   int length;
-  cmCTestLog(this->CTest, HANDLER_OUTPUT,
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
     "   Each symbol represents " << tick_len << " bytes of output."
     << std::endl
     << (this->UseCTestLaunch? "" :
         "   '!' represents an error and '*' a warning.\n")
-    << "    " << std::flush);
+    << "    " << std::flush, this->Quiet);
 
   // Initialize building structures
   this->BuildProcessingQueue.clear();
@@ -980,8 +984,9 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
   this->ProcessBuffer(0, 0, tick, tick_len, ofs, &this->BuildProcessingQueue);
   this->ProcessBuffer(0, 0, tick, tick_len, ofs,
     &this->BuildProcessingErrorQueue);
-  cmCTestLog(this->CTest, OUTPUT, " Size of output: "
-    << ((this->BuildOutputLogSize + 512) / 1024) << "K" << std::endl);
+  cmCTestOptionalLog(this->CTest, OUTPUT, " Size of output: "
+    << ((this->BuildOutputLogSize + 512) / 1024) << "K" << std::endl,
+    this->Quiet);
 
   // Properly handle output of the build command
   cmsysProcess_WaitForExit(cp, 0);
@@ -992,8 +997,8 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
     if (retVal)
       {
       *retVal = cmsysProcess_GetExitValue(cp);
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-      "Command exited with the value: " << *retVal << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Command exited with the value: " << *retVal << std::endl, this->Quiet);
       // if a non zero return value
       if (*retVal)
         {
@@ -1017,13 +1022,14 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
     if (retVal)
       {
       *retVal = cmsysProcess_GetExitException(cp);
-      cmCTestLog(this->CTest, WARNING, "There was an exception: " << *retVal
-                 << std::endl);
+      cmCTestOptionalLog(this->CTest, WARNING, "There was an exception: " <<
+        *retVal << std::endl, this->Quiet);
       }
     }
   else if(result == cmsysProcess_State_Expired)
     {
-    cmCTestLog(this->CTest, WARNING, "There was a timeout" << std::endl);
+    cmCTestOptionalLog(this->CTest, WARNING, "There was a timeout" <<
+      std::endl, this->Quiet);
     }
   else if(result == cmsysProcess_State_Error)
     {
@@ -1185,13 +1191,14 @@ void cmCTestBuildHandler::ProcessBuffer(const char* data, int length,
   while ( this->BuildOutputLogSize > (tick * tick_len) )
     {
     tick ++;
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, this->LastTickChar);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, this->LastTickChar,
+      this->Quiet);
     tickDisplayed = true;
     if ( tick % tick_line_len == 0 && tick > 0 )
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "  Size: "
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "  Size: "
         << ((this->BuildOutputLogSize + 512) / 1024) << "K" << std::endl
-        << "    ");
+        << "    ", this->Quiet);
       }
     }
   if ( tickDisplayed )
@@ -1216,7 +1223,8 @@ int cmCTestBuildHandler::ProcessSingleLine(const char* data)
     return b_REGULAR_LINE;
     }
 
-  cmCTestLog(this->CTest, DEBUG, "Line: [" << data << "]" << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG, "Line: [" << data << "]" <<
+    std::endl, this->Quiet);
 
   std::vector<cmsys::RegularExpression>::iterator it;
 
@@ -1236,9 +1244,9 @@ int cmCTestBuildHandler::ProcessSingleLine(const char* data)
       if ( it->find(data) )
         {
         errorLine = 1;
-        cmCTestLog(this->CTest, DEBUG, "  Error Line: " << data
+        cmCTestOptionalLog(this->CTest, DEBUG, "  Error Line: " << data
           << " (matches: " << this->CustomErrorMatches[wrxCnt] << ")"
-          << std::endl);
+          << std::endl, this->Quiet);
         break;
         }
       wrxCnt ++;
@@ -1252,9 +1260,9 @@ int cmCTestBuildHandler::ProcessSingleLine(const char* data)
       if ( it->find(data) )
         {
         errorLine = 0;
-        cmCTestLog(this->CTest, DEBUG, "  Not an error Line: " << data
+        cmCTestOptionalLog(this->CTest, DEBUG, "  Not an error Line: " << data
           << " (matches: " << this->CustomErrorExceptions[wrxCnt] << ")"
-          << std::endl);
+          << std::endl, this->Quiet);
         break;
         }
       wrxCnt ++;
@@ -1271,10 +1279,10 @@ int cmCTestBuildHandler::ProcessSingleLine(const char* data)
       if ( it->find(data) )
         {
         warningLine = 1;
-        cmCTestLog(this->CTest, DEBUG,
+        cmCTestOptionalLog(this->CTest, DEBUG,
           "  Warning Line: " << data
           << " (matches: " << this->CustomWarningMatches[wrxCnt] << ")"
-          << std::endl);
+          << std::endl, this->Quiet);
         break;
         }
       wrxCnt ++;
@@ -1289,9 +1297,9 @@ int cmCTestBuildHandler::ProcessSingleLine(const char* data)
       if ( it->find(data) )
         {
         warningLine = 0;
-        cmCTestLog(this->CTest, DEBUG, "  Not a warning Line: " << data
+        cmCTestOptionalLog(this->CTest, DEBUG, "  Not a warning Line: " << data
           << " (matches: " << this->CustomWarningExceptions[wrxCnt] << ")"
-          << std::endl);
+          << std::endl, this->Quiet);
         break;
         }
       wrxCnt ++;
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d39dbcf..9bce7a3 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -129,6 +129,7 @@ add_RunCMake_test(build_command)
 add_RunCMake_test(export)
 add_RunCMake_test(cmake_minimum_required)
 add_RunCMake_test(continue)
+add_RunCMake_test(ctest_build)
 add_RunCMake_test(ctest_configure)
 add_RunCMake_test(ctest_start)
 add_RunCMake_test(ctest_submit)
diff --git a/Tests/RunCMake/ctest_build/BuildQuiet-stdout.txt b/Tests/RunCMake/ctest_build/BuildQuiet-stdout.txt
new file mode 100644
index 0000000..2e59d99
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/BuildQuiet-stdout.txt
@@ -0,0 +1,12 @@
+Run dashboard with model Experimental
+   Source directory: .*/Tests/RunCMake/ctest_build/BuildQuiet
+   Build directory: .*/Tests/RunCMake/ctest_build/BuildQuiet-build
+   Reading ctest configuration file: .*/Tests/RunCMake/ctest_build/BuildQuiet/CTestConfig.cmake
+   Site: test-site
+   Build name: test-build-name
+   Use Experimental tag: [0-9-]+
+Configure project
+   Each . represents 1024 bytes of output
+    . Size of output: 0K
+   0 Compiler errors
+   0 Compiler warnings
diff --git a/Tests/RunCMake/ctest_build/CMakeLists.txt.in b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
new file mode 100644
index 0000000..9ba08e9
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1)
+project(CTestBuild at CASE_NAME@ NONE)
+include(CTest)
+add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
diff --git a/Tests/RunCMake/ctest_build/CTestConfig.cmake.in b/Tests/RunCMake/ctest_build/CTestConfig.cmake.in
new file mode 100644
index 0000000..097f82c
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/CTestConfig.cmake.in
@@ -0,0 +1 @@
+set(CTEST_PROJECT_NAME "CTestBuild at CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
new file mode 100644
index 0000000..5826fe4
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
@@ -0,0 +1,10 @@
+include(RunCTest)
+
+set(CASE_CTEST_BUILD_ARGS "")
+
+function(run_ctest_build CASE_NAME)
+  set(CASE_CTEST_BUILD_ARGS "${ARGN}")
+  run_ctest(${CASE_NAME})
+endfunction()
+
+run_ctest_build(BuildQuiet QUIET)
diff --git a/Tests/RunCMake/ctest_build/test.cmake.in b/Tests/RunCMake/ctest_build/test.cmake.in
new file mode 100644
index 0000000..38c8ea1
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/test.cmake.in
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.1)
+
+set(CTEST_SITE                          "test-site")
+set(CTEST_BUILD_NAME                    "test-build-name")
+set(CTEST_SOURCE_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME@")
+set(CTEST_BINARY_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME at -build")
+set(CTEST_CMAKE_GENERATOR               "@RunCMake_GENERATOR@")
+set(CTEST_CMAKE_GENERATOR_PLATFORM      "@RunCMake_GENERATOR_PLATFORM@")
+set(CTEST_CMAKE_GENERATOR_TOOLSET       "@RunCMake_GENERATOR_TOOLSET@")
+set(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
+
+set(ctest_build_args "@CASE_CTEST_BUILD_ARGS@")
+ctest_start(Experimental)
+ctest_configure()
+ctest_build(${ctest_build_args})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2d3baa92279e3e3ff8a34b21b38ded2ab20d738
commit b2d3baa92279e3e3ff8a34b21b38ded2ab20d738
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 17 12:38:52 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 11:45:11 2015 -0500

    ctest_configure: Add QUIET option

diff --git a/Help/command/ctest_configure.rst b/Help/command/ctest_configure.rst
index 2c4e305..61d9320 100644
--- a/Help/command/ctest_configure.rst
+++ b/Help/command/ctest_configure.rst
@@ -6,7 +6,7 @@ Configure the project build tree.
 ::
 
   ctest_configure([BUILD build_dir] [SOURCE source_dir] [APPEND]
-                  [OPTIONS options] [RETURN_VALUE res])
+                  [OPTIONS options] [RETURN_VALUE res] [QUIET])
 
 Configures the given build directory and stores results in
 Configure.xml.  If no BUILD is given, the CTEST_BINARY_DIRECTORY
@@ -19,3 +19,7 @@ build tool.
 The APPEND option marks results for append to those previously
 submitted to a dashboard server since the last ctest_start.  Append
 semantics are defined by the dashboard server in use.
+
+The QUIET option suppresses any CTest-specific non-error messages
+that would have otherwise been printed to the console.  Output from
+the underlying configure command is not affected.
diff --git a/Source/CTest/cmCTestConfigureCommand.cxx b/Source/CTest/cmCTestConfigureCommand.cxx
index 0f13263..ba4dab2 100644
--- a/Source/CTest/cmCTestConfigureCommand.cxx
+++ b/Source/CTest/cmCTestConfigureCommand.cxx
@@ -45,7 +45,7 @@ cmCTestGenericHandler* cmCTestConfigureCommand::InitializeHandler()
   if ( ctestConfigureCommand && *ctestConfigureCommand )
     {
     this->CTest->SetCTestConfiguration("ConfigureCommand",
-      ctestConfigureCommand);
+      ctestConfigureCommand, this->Quiet);
     }
   else
     {
@@ -141,7 +141,7 @@ cmCTestGenericHandler* cmCTestConfigureCommand::InitializeHandler()
       cmakeConfigureCommand += "\"";
 
       this->CTest->SetCTestConfiguration("ConfigureCommand",
-        cmakeConfigureCommand.c_str());
+        cmakeConfigureCommand.c_str(), this->Quiet);
       }
     else
       {
@@ -160,5 +160,6 @@ cmCTestGenericHandler* cmCTestConfigureCommand::InitializeHandler()
       "internal CTest error. Cannot instantiate configure handler");
     return 0;
     }
+  handler->SetQuiet(this->Quiet);
   return handler;
 }
diff --git a/Source/CTest/cmCTestConfigureHandler.cxx b/Source/CTest/cmCTestConfigureHandler.cxx
index 506433f..3b444f2 100644
--- a/Source/CTest/cmCTestConfigureHandler.cxx
+++ b/Source/CTest/cmCTestConfigureHandler.cxx
@@ -35,7 +35,8 @@ void cmCTestConfigureHandler::Initialize()
 //functions and commented...
 int cmCTestConfigureHandler::ProcessHandler()
 {
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "Configure project" << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+    "Configure project" << std::endl, this->Quiet);
   std::string cCommand
     = this->CTest->GetCTestConfiguration("ConfigureCommand");
   if (cCommand.empty())
@@ -75,8 +76,8 @@ int cmCTestConfigureHandler::ProcessHandler()
 
     cmGeneratedFileStream ofs;
     this->StartLogFile("Configure", ofs);
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Configure with command: "
-      << cCommand << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Configure with command: " << cCommand << std::endl, this->Quiet);
     res = this->CTest->RunMakeCommand(cCommand.c_str(), output,
       &retVal, buildDirectory.c_str(),
       0, ofs);
@@ -101,7 +102,7 @@ int cmCTestConfigureHandler::ProcessHandler()
         }
       os << "<ConfigureCommand>" << cCommand << "</ConfigureCommand>"
         << std::endl;
-      cmCTestLog(this->CTest, DEBUG, "End" << std::endl);
+      cmCTestOptionalLog(this->CTest, DEBUG, "End" << std::endl, this->Quiet);
       os << "<Log>" << cmXMLSafe(output) << "</Log>" << std::endl;
       std::string end_time = this->CTest->CurrentTime();
       os << "\t<ConfigureStatus>" << retVal << "</ConfigureStatus>\n"
@@ -119,8 +120,8 @@ int cmCTestConfigureHandler::ProcessHandler()
     }
   else
     {
-    cmCTestLog(this->CTest, DEBUG, "Configure with command: " << cCommand
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, DEBUG,
+      "Configure with command: " << cCommand << std::endl, this->Quiet);
     }
   if (! res || retVal )
     {
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index a9b8bf3..d39dbcf 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -129,6 +129,7 @@ add_RunCMake_test(build_command)
 add_RunCMake_test(export)
 add_RunCMake_test(cmake_minimum_required)
 add_RunCMake_test(continue)
+add_RunCMake_test(ctest_configure)
 add_RunCMake_test(ctest_start)
 add_RunCMake_test(ctest_submit)
 add_RunCMake_test(file)
diff --git a/Tests/RunCMake/ctest_configure/CMakeLists.txt.in b/Tests/RunCMake/ctest_configure/CMakeLists.txt.in
new file mode 100644
index 0000000..2fb21d4
--- /dev/null
+++ b/Tests/RunCMake/ctest_configure/CMakeLists.txt.in
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1)
+project(CTestConfigure at CASE_NAME@ NONE)
+include(CTest)
+add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
diff --git a/Tests/RunCMake/ctest_configure/CTestConfig.cmake.in b/Tests/RunCMake/ctest_configure/CTestConfig.cmake.in
new file mode 100644
index 0000000..7e30ab9
--- /dev/null
+++ b/Tests/RunCMake/ctest_configure/CTestConfig.cmake.in
@@ -0,0 +1 @@
+set(CTEST_PROJECT_NAME "CTestConfigure at CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_configure/ConfigureQuiet-stdout.txt b/Tests/RunCMake/ctest_configure/ConfigureQuiet-stdout.txt
new file mode 100644
index 0000000..015644d
--- /dev/null
+++ b/Tests/RunCMake/ctest_configure/ConfigureQuiet-stdout.txt
@@ -0,0 +1,9 @@
+Run dashboard with model Experimental
+   Source directory: .*/Tests/RunCMake/ctest_configure/ConfigureQuiet
+   Build directory: .*/Tests/RunCMake/ctest_configure/ConfigureQuiet-build
+   Reading ctest configuration file: .*/Tests/RunCMake/ctest_configure/ConfigureQuiet/CTestConfig.cmake
+   Site: test-site
+   Build name: test-build-name
+   Use Experimental tag: [0-9-]+
+   Each . represents 1024 bytes of output
+    . Size of output: 0K
diff --git a/Tests/RunCMake/ctest_configure/RunCMakeTest.cmake b/Tests/RunCMake/ctest_configure/RunCMakeTest.cmake
new file mode 100644
index 0000000..fc1b02c
--- /dev/null
+++ b/Tests/RunCMake/ctest_configure/RunCMakeTest.cmake
@@ -0,0 +1,10 @@
+include(RunCTest)
+
+set(CASE_CTEST_CONFIGURE_ARGS "")
+
+function(run_ctest_configure CASE_NAME)
+  set(CASE_CTEST_CONFIGURE_ARGS "${ARGN}")
+  run_ctest(${CASE_NAME})
+endfunction()
+
+run_ctest_configure(ConfigureQuiet QUIET)
diff --git a/Tests/RunCMake/ctest_configure/test.cmake.in b/Tests/RunCMake/ctest_configure/test.cmake.in
new file mode 100644
index 0000000..72d199a
--- /dev/null
+++ b/Tests/RunCMake/ctest_configure/test.cmake.in
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.1)
+
+set(CTEST_SITE                          "test-site")
+set(CTEST_BUILD_NAME                    "test-build-name")
+set(CTEST_SOURCE_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME@")
+set(CTEST_BINARY_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME at -build")
+set(CTEST_CMAKE_GENERATOR               "@RunCMake_GENERATOR@")
+set(CTEST_CMAKE_GENERATOR_PLATFORM      "@RunCMake_GENERATOR_PLATFORM@")
+set(CTEST_CMAKE_GENERATOR_TOOLSET       "@RunCMake_GENERATOR_TOOLSET@")
+set(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
+
+set(ctest_configure_args "@CASE_CTEST_CONFIGURE_ARGS@")
+ctest_start(Experimental)
+ctest_configure(${ctest_configure_args})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a06c19c0c01bdd0c5db03ab5f078b165ccf2f11
commit 8a06c19c0c01bdd0c5db03ab5f078b165ccf2f11
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 17 11:45:46 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 11:44:46 2015 -0500

    ctest_update: Add QUIET option

diff --git a/Help/command/ctest_update.rst b/Help/command/ctest_update.rst
index d34e192..01e357b 100644
--- a/Help/command/ctest_update.rst
+++ b/Help/command/ctest_update.rst
@@ -5,9 +5,14 @@ Update the work tree from version control.
 
 ::
 
-  ctest_update([SOURCE source] [RETURN_VALUE res])
+  ctest_update([SOURCE source] [RETURN_VALUE res] [QUIET])
 
 Updates the given source directory and stores results in Update.xml.
 If no SOURCE is given, the CTEST_SOURCE_DIRECTORY variable is used.
 The RETURN_VALUE option specifies a variable in which to store the
 result, which is the number of files updated or -1 on error.
+
+If QUIET is specified then CTest will suppress most non-error
+messages that it would have otherwise printed to the console.
+CTest will still report the new revision of the repository
+and any conflicting files that were found.
diff --git a/Source/CTest/cmCTestUpdateCommand.cxx b/Source/CTest/cmCTestUpdateCommand.cxx
index f87466d..dfda9f1 100644
--- a/Source/CTest/cmCTestUpdateCommand.cxx
+++ b/Source/CTest/cmCTestUpdateCommand.cxx
@@ -20,55 +20,56 @@ cmCTestGenericHandler* cmCTestUpdateCommand::InitializeHandler()
     {
     this->CTest->SetCTestConfiguration("SourceDirectory",
       cmSystemTools::CollapseFullPath(
-        this->Values[ct_SOURCE]).c_str());
+        this->Values[ct_SOURCE]).c_str(), this->Quiet);
     }
   else
     {
     this->CTest->SetCTestConfiguration("SourceDirectory",
       cmSystemTools::CollapseFullPath(
-        this->Makefile->GetDefinition("CTEST_SOURCE_DIRECTORY")).c_str());
+        this->Makefile->GetDefinition("CTEST_SOURCE_DIRECTORY")).c_str(),
+      this->Quiet);
     }
   std::string source_dir
     = this->CTest->GetCTestConfiguration("SourceDirectory");
 
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "UpdateCommand", "CTEST_UPDATE_COMMAND");
+    "UpdateCommand", "CTEST_UPDATE_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "UpdateOptions", "CTEST_UPDATE_OPTIONS");
+    "UpdateOptions", "CTEST_UPDATE_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "CVSCommand", "CTEST_CVS_COMMAND");
+    "CVSCommand", "CTEST_CVS_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "CVSUpdateOptions", "CTEST_CVS_UPDATE_OPTIONS");
+    "CVSUpdateOptions", "CTEST_CVS_UPDATE_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "SVNCommand", "CTEST_SVN_COMMAND");
+    "SVNCommand", "CTEST_SVN_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "SVNUpdateOptions", "CTEST_SVN_UPDATE_OPTIONS");
+    "SVNUpdateOptions", "CTEST_SVN_UPDATE_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "SVNOptions", "CTEST_SVN_OPTIONS");
+    "SVNOptions", "CTEST_SVN_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "BZRCommand", "CTEST_BZR_COMMAND");
+    "BZRCommand", "CTEST_BZR_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "BZRUpdateOptions", "CTEST_BZR_UPDATE_OPTIONS");
+    "BZRUpdateOptions", "CTEST_BZR_UPDATE_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "GITCommand", "CTEST_GIT_COMMAND");
+    "GITCommand", "CTEST_GIT_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "GITUpdateOptions", "CTEST_GIT_UPDATE_OPTIONS");
+    "GITUpdateOptions", "CTEST_GIT_UPDATE_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "GITUpdateCustom", "CTEST_GIT_UPDATE_CUSTOM");
+    "GITUpdateCustom", "CTEST_GIT_UPDATE_CUSTOM", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "UpdateVersionOnly", "CTEST_UPDATE_VERSION_ONLY");
+    "UpdateVersionOnly", "CTEST_UPDATE_VERSION_ONLY", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "HGCommand", "CTEST_HG_COMMAND");
+    "HGCommand", "CTEST_HG_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "HGUpdateOptions", "CTEST_HG_UPDATE_OPTIONS");
+    "HGUpdateOptions", "CTEST_HG_UPDATE_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "P4Command", "CTEST_P4_COMMAND");
+    "P4Command", "CTEST_P4_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "P4UpdateOptions", "CTEST_P4_UPDATE_OPTIONS");
+    "P4UpdateOptions", "CTEST_P4_UPDATE_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "P4Client", "CTEST_P4_CLIENT");
+    "P4Client", "CTEST_P4_CLIENT", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "P4Options", "CTEST_P4_OPTIONS");
+    "P4Options", "CTEST_P4_OPTIONS", this->Quiet);
 
   cmCTestGenericHandler* handler
     = this->CTest->GetInitializedHandler("update");
@@ -84,6 +85,7 @@ cmCTestGenericHandler* cmCTestUpdateCommand::InitializeHandler()
     return 0;
     }
   handler->SetOption("SourceDirectory", source_dir.c_str());
+  handler->SetQuiet(this->Quiet);
   return handler;
 }
 
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx
index 4c37c8b..b18786a 100644
--- a/Source/CTest/cmCTestUpdateHandler.cxx
+++ b/Source/CTest/cmCTestUpdateHandler.cxx
@@ -122,11 +122,13 @@ void cmCTestUpdateHandler::Initialize()
 //----------------------------------------------------------------------
 int cmCTestUpdateHandler::DetermineType(const char* cmd, const char* type)
 {
-  cmCTestLog(this->CTest, DEBUG, "Determine update type from command: " << cmd
-    << " and type: " << type << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG,
+    "Determine update type from command: " << cmd << " and type: " << type <<
+    std::endl, this->Quiet);
   if ( type && *type )
     {
-    cmCTestLog(this->CTest, DEBUG, "Type specified: " << type << std::endl);
+    cmCTestOptionalLog(this->CTest, DEBUG, "Type specified: " << type <<
+      std::endl, this->Quiet);
     std::string stype = cmSystemTools::LowerCase(type);
     if ( stype.find("cvs") != std::string::npos )
       {
@@ -155,8 +157,8 @@ int cmCTestUpdateHandler::DetermineType(const char* cmd, const char* type)
     }
   else
     {
-    cmCTestLog(this->CTest, DEBUG, "Type not specified, check command: "
-      << cmd << std::endl);
+    cmCTestOptionalLog(this->CTest, DEBUG,
+      "Type not specified, check command: " << cmd << std::endl, this->Quiet);
     std::string stype = cmSystemTools::LowerCase(cmd);
     if ( stype.find("cvs") != std::string::npos )
       {
@@ -211,18 +213,19 @@ int cmCTestUpdateHandler::ProcessHandler()
     this->StartLogFile("Update", ofs);
     }
 
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Updating the repository: "
-    << sourceDirectory << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+    "   Updating the repository: " << sourceDirectory << std::endl,
+    this->Quiet);
 
   if(!this->SelectVCS())
     {
     return -1;
     }
 
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Use "
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Use "
     << cmCTestUpdateHandlerUpdateToString(this->UpdateType)
     << " repository type"
-    << std::endl;);
+    << std::endl;, this->Quiet);
 
   // Create an object to interact with the VCS tool.
   cmsys::auto_ptr<cmCTestVC> vc;
@@ -283,23 +286,23 @@ int cmCTestUpdateHandler::ProcessHandler()
   int numUpdated = vc->GetPathCount(cmCTestVC::PathUpdated);
   if(numUpdated)
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT,
-               "   Found " << numUpdated << " updated files\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "   Found " << numUpdated << " updated files\n", this->Quiet);
     }
   if(int numModified = vc->GetPathCount(cmCTestVC::PathModified))
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT,
-               "   Found " << numModified << " locally modified files\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "   Found " << numModified << " locally modified files\n", this->Quiet);
     localModifications += numModified;
     }
   if(int numConflicting = vc->GetPathCount(cmCTestVC::PathConflicting))
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT,
-               "   Found " << numConflicting << " conflicting files\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+    "   Found " << numConflicting << " conflicting files\n", this->Quiet);
     localModifications += numConflicting;
     }
 
-  cmCTestLog(this->CTest, DEBUG, "End" << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG, "End" << std::endl, this->Quiet);
   std::string end_time = this->CTest->CurrentTime();
   os << "\t<EndDateTime>" << end_time << "</EndDateTime>\n"
      << "\t<EndTime>" << static_cast<unsigned int>(cmSystemTools::GetTime())
@@ -331,8 +334,8 @@ int cmCTestUpdateHandler::ProcessHandler()
 int cmCTestUpdateHandler::DetectVCS(const char* dir)
 {
   std::string sourceDirectory = dir;
-  cmCTestLog(this->CTest, DEBUG, "Check directory: "
-    << sourceDirectory << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG, "Check directory: "
+    << sourceDirectory << std::endl, this->Quiet);
   sourceDirectory += "/.svn";
   if ( cmSystemTools::FileExists(sourceDirectory.c_str()) )
     {
diff --git a/Tests/CTestUpdateCommon.cmake b/Tests/CTestUpdateCommon.cmake
index 97153f0..77b3398 100644
--- a/Tests/CTestUpdateCommon.cmake
+++ b/Tests/CTestUpdateCommon.cmake
@@ -13,6 +13,9 @@ function(run_child)
     message(FATAL_ERROR "Child failed (${FAILED}), output is\n  ${OUTPUT}\n"
       "Command = [${ARGN}]\n")
   endif()
+
+  # Pass output back up to the parent scope for possible further inspection.
+  set(OUTPUT "${OUTPUT}" PARENT_SCOPE)
 endfunction()
 
 #-----------------------------------------------------------------------------
@@ -269,6 +272,9 @@ function(run_dashboard_script bin_dir)
       Updated{subdir/bar.txt}
       )
   endif()
+
+  # Pass console output up to the parent, in case they'd like to inspect it.
+  set(OUTPUT "${OUTPUT}" PARENT_SCOPE)
 endfunction()
 
 #-----------------------------------------------------------------------------
diff --git a/Tests/CTestUpdateGIT.cmake.in b/Tests/CTestUpdateGIT.cmake.in
index 41b732b..5987a30 100644
--- a/Tests/CTestUpdateGIT.cmake.in
+++ b/Tests/CTestUpdateGIT.cmake.in
@@ -334,3 +334,36 @@ set(CTEST_UPDATE_VERSION_ONLY TRUE)
 # Run the dashboard script with CTest.
 set(NO_UPDATE 1)
 run_dashboard_script(dash-binary-no-update)
+
+rewind_source(dash-source)
+
+#-----------------------------------------------------------------------------
+# Test ctest_update(QUIET)
+set(NO_UPDATE 0)
+message("Running CTest Dashboard Script (update quietly)...")
+
+create_dashboard_script(dash-binary-quiet
+  "# git command configuration
+set(CTEST_GIT_COMMAND \"${GIT}\")
+set(CTEST_GIT_UPDATE_OPTIONS)
+set(CTEST_GIT_UPDATE_CUSTOM \${CTEST_GIT_COMMAND} pull origin master)
+")
+
+# We need to modify the created dashboard script to include our "QUIET"
+# option.
+set(filename "${TOP}/dash-binary-quiet.cmake")
+file(READ "${filename}" contents)
+string(REPLACE
+  [=[ctest_update(SOURCE ${CTEST_SOURCE_DIRECTORY})]=]
+  [=[ctest_update(SOURCE ${CTEST_SOURCE_DIRECTORY} QUIET)]=]
+  contents
+  "${contents}")
+file(WRITE "${filename}" "${contents}")
+
+# Run the dashboard script with CTest.
+run_dashboard_script(dash-binary-quiet)
+
+# Make sure the output seems quiet.
+if("${OUTPUT}" MATCHES "Updating the repository")
+  message(FATAL_ERROR "Found 'Updating the repository' in quiet output")
+endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=003ab492daa04919821edd85b0707966c88faa0c
commit 003ab492daa04919821edd85b0707966c88faa0c
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 17 09:58:25 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 11:44:44 2015 -0500

    ctest_start: Add QUIET option
    
    This suppresses all non-error messages that would have otherwise
    been printed by this function.

diff --git a/Help/command/ctest_start.rst b/Help/command/ctest_start.rst
index d7472db..b5c7b34 100644
--- a/Help/command/ctest_start.rst
+++ b/Help/command/ctest_start.rst
@@ -5,7 +5,7 @@ Starts the testing for a given model
 
 ::
 
-  ctest_start(Model [TRACK <track>] [APPEND] [source [binary]])
+  ctest_start(Model [TRACK <track>] [APPEND] [source [binary]] [QUIET])
 
 Starts the testing for a given model.  The command should be called
 after the binary directory is initialized.  If the 'source' and
@@ -14,7 +14,8 @@ after the binary directory is initialized.  If the 'source' and
 If the track is
 specified, the submissions will go to the specified track.  If APPEND
 is used, the existing TAG is used rather than creating a new one based
-on the current time stamp.
+on the current time stamp.  If QUIET is used, CTest will suppress any
+non-error messages that it otherwise would have printed to the console.
 
 If the :variable:`CTEST_CHECKOUT_COMMAND` variable
 (or the :variable:`CTEST_CVS_CHECKOUT` variable)
diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx
index 8ea6cef..e19e4f4 100644
--- a/Source/CTest/cmCTestStartCommand.cxx
+++ b/Source/CTest/cmCTestStartCommand.cxx
@@ -20,6 +20,7 @@
 cmCTestStartCommand::cmCTestStartCommand()
 {
   this->CreateNewTag = true;
+  this->Quiet = false;
 }
 
 bool cmCTestStartCommand
@@ -57,6 +58,14 @@ bool cmCTestStartCommand
       this->CreateNewTag = false;
       }
     }
+  if (cnt < args.size())
+    {
+    if (args[cnt] == "QUIET")
+      {
+      cnt ++;
+      this->Quiet = true;
+      }
+    }
 
   if ( cnt < args.size() )
     {
@@ -95,18 +104,20 @@ bool cmCTestStartCommand
 
   std::string sourceDir = cmSystemTools::CollapseFullPath(src_dir);
   std::string binaryDir = cmSystemTools::CollapseFullPath(bld_dir);
-  this->CTest->SetCTestConfiguration("SourceDirectory", sourceDir.c_str());
-  this->CTest->SetCTestConfiguration("BuildDirectory", binaryDir.c_str());
+  this->CTest->SetCTestConfiguration("SourceDirectory", sourceDir.c_str(),
+    this->Quiet);
+  this->CTest->SetCTestConfiguration("BuildDirectory", binaryDir.c_str(),
+    this->Quiet);
 
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "Run dashboard with model "
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "Run dashboard with model "
     << smodel << std::endl
     << "   Source directory: " << src_dir << std::endl
-    << "   Build directory: " << bld_dir << std::endl);
+    << "   Build directory: " << bld_dir << std::endl, this->Quiet);
   const char* track = this->CTest->GetSpecificTrack();
   if ( track )
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT,
-      "   Track: " << track << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "   Track: " << track << std::endl, this->Quiet);
     }
 
   // Log startup actions.
diff --git a/Source/CTest/cmCTestStartCommand.h b/Source/CTest/cmCTestStartCommand.h
index 3b8843f..eed1962 100644
--- a/Source/CTest/cmCTestStartCommand.h
+++ b/Source/CTest/cmCTestStartCommand.h
@@ -34,6 +34,7 @@ public:
     ni->CTest = this->CTest;
     ni->CTestScriptHandler = this->CTestScriptHandler;
     ni->CreateNewTag = this->CreateNewTag;
+    ni->Quiet = this->Quiet;
     return ni;
     }
 
@@ -53,6 +54,14 @@ public:
     }
 
   /**
+   * Should this invocation of ctest_start output non-error messages?
+   */
+  bool ShouldBeQuiet()
+    {
+    return this->Quiet;
+    }
+
+  /**
    * The name of the command as specified in CMakeList.txt.
    */
   virtual std::string GetName() const { return "ctest_start";}
@@ -62,6 +71,7 @@ public:
 private:
   bool InitialCheckout(std::ostream& ofs, std::string const& sourceDir);
   bool CreateNewTag;
+  bool Quiet;
 };
 
 
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 9975802..d7fe22d 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -463,7 +463,13 @@ cmCTest::Part cmCTest::GetPartFromName(const char* name)
 //----------------------------------------------------------------------
 int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command)
 {
-  cmCTestLog(this, DEBUG, "Here: " << __LINE__ << std::endl);
+  bool quiet = false;
+  if (command && command->ShouldBeQuiet())
+    {
+    quiet = true;
+    }
+
+  cmCTestOptionalLog(this, DEBUG, "Here: " << __LINE__ << std::endl, quiet);
   if(!this->InteractiveDebugMode)
     {
     this->BlockTestErrorDiagnostics();
@@ -478,24 +484,23 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command)
 
   this->UpdateCTestConfiguration();
 
-  cmCTestLog(this, DEBUG, "Here: " << __LINE__ << std::endl);
+  cmCTestOptionalLog(this, DEBUG, "Here: " << __LINE__ << std::endl, quiet);
   if ( this->ProduceXML )
     {
-    cmCTestLog(this, DEBUG, "Here: " << __LINE__ << std::endl);
-    cmCTestLog(this, OUTPUT,
-               "   Site: " << this->GetCTestConfiguration("Site") << std::endl
-               << "   Build name: "
-               << cmCTest::SafeBuildIdField(
-                 this->GetCTestConfiguration("BuildName"))
-               << std::endl);
-    cmCTestLog(this, DEBUG, "Produce XML is on" << std::endl);
+    cmCTestOptionalLog(this, DEBUG, "Here: " << __LINE__ << std::endl, quiet);
+    cmCTestOptionalLog(this, OUTPUT,
+      "   Site: " << this->GetCTestConfiguration("Site") << std::endl <<
+      "   Build name: " << cmCTest::SafeBuildIdField(
+      this->GetCTestConfiguration("BuildName")) << std::endl, quiet);
+    cmCTestOptionalLog(this, DEBUG, "Produce XML is on" << std::endl, quiet);
     if ( this->TestModel == cmCTest::NIGHTLY &&
          this->GetCTestConfiguration("NightlyStartTime").empty() )
       {
-      cmCTestLog(this, WARNING,
-                 "WARNING: No nightly start time found please set in"
-                 " CTestConfig.cmake or DartConfig.cmake" << std::endl);
-      cmCTestLog(this, DEBUG, "Here: " << __LINE__ << std::endl);
+      cmCTestOptionalLog(this, WARNING,
+        "WARNING: No nightly start time found please set in CTestConfig.cmake"
+        " or DartConfig.cmake" << std::endl, quiet);
+      cmCTestOptionalLog(this, DEBUG, "Here: " << __LINE__ << std::endl,
+        quiet);
       return 0;
       }
     }
@@ -507,8 +512,8 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command)
   cmMakefile *mf = lg->GetMakefile();
   if ( !this->ReadCustomConfigurationFileTree(this->BinaryDir.c_str(), mf) )
     {
-    cmCTestLog(this, DEBUG, "Cannot find custom configuration file tree"
-      << std::endl);
+    cmCTestOptionalLog(this, DEBUG,
+      "Cannot find custom configuration file tree" << std::endl, quiet);
     return 0;
     }
 
@@ -583,9 +588,10 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command)
         }
       if (tag.empty() || (0 != command) || this->Parts[PartStart])
         {
-        cmCTestLog(this, DEBUG, "TestModel: " << this->GetTestModelString()
-          << std::endl);
-        cmCTestLog(this, DEBUG, "TestModel: " << this->TestModel << std::endl);
+        cmCTestOptionalLog(this, DEBUG, "TestModel: " <<
+          this->GetTestModelString() << std::endl, quiet);
+        cmCTestOptionalLog(this, DEBUG, "TestModel: " <<
+          this->TestModel << std::endl, quiet);
         if ( this->TestModel == cmCTest::NIGHTLY )
           {
           lctime = this->GetNightlyTime(
@@ -609,8 +615,8 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command)
         ofs.close();
         if ( 0 == command )
           {
-          cmCTestLog(this, OUTPUT, "Create new tag: " << tag << " - "
-            << this->GetTestModelString() << std::endl);
+          cmCTestOptionalLog(this, OUTPUT, "Create new tag: " << tag << " - "
+            << this->GetTestModelString() << std::endl, quiet);
           }
         }
       }
@@ -630,8 +636,8 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command)
         return 0;
         }
 
-      cmCTestLog(this, OUTPUT, "  Use existing tag: " << tag << " - "
-        << this->GetTestModelString() << std::endl);
+      cmCTestOptionalLog(this, OUTPUT, "  Use existing tag: " << tag << " - "
+        << this->GetTestModelString() << std::endl, quiet);
       }
 
     this->CurrentTag = tag;
@@ -675,8 +681,8 @@ bool cmCTest::InitializeFromCommand(cmCTestStartCommand* command)
 
   if ( !fname.empty() )
     {
-    cmCTestLog(this, OUTPUT, "   Reading ctest configuration file: "
-      << fname << std::endl);
+    cmCTestOptionalLog(this, OUTPUT, "   Reading ctest configuration file: "
+      << fname << std::endl, command->ShouldBeQuiet());
     bool readit = mf->ReadListFile(mf->GetCurrentListFile(),
       fname.c_str() );
     if(!readit)
@@ -689,19 +695,20 @@ bool cmCTest::InitializeFromCommand(cmCTestStartCommand* command)
     }
   else
     {
-    cmCTestLog(this, WARNING,
+    cmCTestOptionalLog(this, WARNING,
       "Cannot locate CTest configuration: in BuildDirectory: "
-      << bld_dir_fname << std::endl);
-    cmCTestLog(this, WARNING,
+      << bld_dir_fname << std::endl, command->ShouldBeQuiet());
+    cmCTestOptionalLog(this, WARNING,
       "Cannot locate CTest configuration: in SourceDirectory: "
-      << src_dir_fname << std::endl);
+      << src_dir_fname << std::endl, command->ShouldBeQuiet());
     }
 
   this->SetCTestConfigurationFromCMakeVariable(mf, "NightlyStartTime",
-    "CTEST_NIGHTLY_START_TIME");
-  this->SetCTestConfigurationFromCMakeVariable(mf, "Site", "CTEST_SITE");
+    "CTEST_NIGHTLY_START_TIME", command->ShouldBeQuiet());
+  this->SetCTestConfigurationFromCMakeVariable(mf, "Site", "CTEST_SITE",
+    command->ShouldBeQuiet());
   this->SetCTestConfigurationFromCMakeVariable(mf, "BuildName",
-    "CTEST_BUILD_NAME");
+    "CTEST_BUILD_NAME", command->ShouldBeQuiet());
   const char* dartVersion = mf->GetDefinition("CTEST_DART_SERVER_VERSION");
   if ( dartVersion )
     {
@@ -720,8 +727,9 @@ bool cmCTest::InitializeFromCommand(cmCTestStartCommand* command)
     {
     return false;
     }
-  cmCTestLog(this, OUTPUT, "   Use " << this->GetTestModelString()
-    << " tag: " << this->GetCurrentTag() << std::endl);
+  cmCTestOptionalLog(this, OUTPUT, "   Use " << this->GetTestModelString()
+    << " tag: " << this->GetCurrentTag() << std::endl,
+    command->ShouldBeQuiet());
   return true;
 }
 
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 59c6918..a9b8bf3 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -129,6 +129,7 @@ add_RunCMake_test(build_command)
 add_RunCMake_test(export)
 add_RunCMake_test(cmake_minimum_required)
 add_RunCMake_test(continue)
+add_RunCMake_test(ctest_start)
 add_RunCMake_test(ctest_submit)
 add_RunCMake_test(file)
 add_RunCMake_test(find_library)
diff --git a/Tests/RunCMake/ctest_start/CMakeLists.txt.in b/Tests/RunCMake/ctest_start/CMakeLists.txt.in
new file mode 100644
index 0000000..913239c
--- /dev/null
+++ b/Tests/RunCMake/ctest_start/CMakeLists.txt.in
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1)
+project(CTestStart at CASE_NAME@ NONE)
+include(CTest)
+add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
diff --git a/Tests/RunCMake/ctest_start/CTestConfig.cmake.in b/Tests/RunCMake/ctest_start/CTestConfig.cmake.in
new file mode 100644
index 0000000..e75d14f
--- /dev/null
+++ b/Tests/RunCMake/ctest_start/CTestConfig.cmake.in
@@ -0,0 +1 @@
+set(CTEST_PROJECT_NAME "CTestStart at CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_start/RunCMakeTest.cmake b/Tests/RunCMake/ctest_start/RunCMakeTest.cmake
new file mode 100644
index 0000000..f765a0f
--- /dev/null
+++ b/Tests/RunCMake/ctest_start/RunCMakeTest.cmake
@@ -0,0 +1,10 @@
+include(RunCTest)
+
+set(CASE_CTEST_START_ARGS "")
+
+function(run_ctest_start CASE_NAME)
+  set(CASE_CTEST_START_ARGS "${ARGN}")
+  run_ctest(${CASE_NAME})
+endfunction()
+
+run_ctest_start(StartQuiet Experimental QUIET)
diff --git a/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt b/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/ctest_start/StartQuiet-stdout.txt b/Tests/RunCMake/ctest_start/StartQuiet-stdout.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/ctest_start/StartQuiet-stdout.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/ctest_start/test.cmake.in b/Tests/RunCMake/ctest_start/test.cmake.in
new file mode 100644
index 0000000..21e3fad
--- /dev/null
+++ b/Tests/RunCMake/ctest_start/test.cmake.in
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.1)
+
+set(CTEST_SITE                          "test-site")
+set(CTEST_BUILD_NAME                    "test-build-name")
+set(CTEST_SOURCE_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME@")
+set(CTEST_BINARY_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME at -build")
+set(CTEST_CMAKE_GENERATOR               "@RunCMake_GENERATOR@")
+set(CTEST_CMAKE_GENERATOR_PLATFORM      "@RunCMake_GENERATOR_PLATFORM@")
+set(CTEST_CMAKE_GENERATOR_TOOLSET       "@RunCMake_GENERATOR_TOOLSET@")
+set(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
+
+set(ctest_start_args "@CASE_CTEST_START_ARGS@")
+ctest_start(${ctest_start_args})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3dad5695df0dcc7a6457770b978ae9292415fb8b
commit 3dad5695df0dcc7a6457770b978ae9292415fb8b
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Mon Feb 16 16:02:14 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 11:38:45 2015 -0500

    ctest_submit: Add QUIET option
    
    Specifying this option prevents CTest from printing any non-error
    messages to the console for this call to ctest_submit().

diff --git a/Help/command/ctest_submit.rst b/Help/command/ctest_submit.rst
index 2b83ed9..6fa1191 100644
--- a/Help/command/ctest_submit.rst
+++ b/Help/command/ctest_submit.rst
@@ -9,6 +9,7 @@ Submit results to a dashboard server.
                [RETRY_COUNT count]
                [RETRY_DELAY delay]
                [RETURN_VALUE res]
+               [QUIET]
                )
 
 By default all available parts are submitted if no PARTS or FILES are
@@ -38,6 +39,9 @@ timed-out submission before attempting to re-submit.
 The RETRY_COUNT option specifies how many times to retry a timed-out
 submission.
 
+The QUIET option suppresses all non-error messages that would have
+otherwise been printed by this call to ctest_submit().
+
 Submit to CDash Upload API
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx
index 13c8ca5..81eb0a8 100644
--- a/Source/CTest/cmCTestGenericHandler.cxx
+++ b/Source/CTest/cmCTestGenericHandler.cxx
@@ -22,6 +22,7 @@ cmCTestGenericHandler::cmCTestGenericHandler()
   this->CTest = 0;
   this->SubmitIndex = 0;
   this->AppendXML = false;
+  this->Quiet = false;
 }
 
 //----------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h
index 2788cba..8567dd7 100644
--- a/Source/CTest/cmCTestGenericHandler.h
+++ b/Source/CTest/cmCTestGenericHandler.h
@@ -87,6 +87,8 @@ public:
   int GetSubmitIndex() { return this->SubmitIndex; }
 
   void SetAppendXML(bool b) { this->AppendXML = b; }
+  void SetQuiet(bool b) { this->Quiet = b; }
+  bool GetQuiet() { return this->Quiet; }
 
 protected:
   bool StartResultingXML(cmCTest::Part part,
@@ -94,6 +96,7 @@ protected:
   bool StartLogFile(const char* name, cmGeneratedFileStream& xofs);
 
   bool AppendXML;
+  bool Quiet;
   cmSystemTools::OutputOption HandlerVerbose;
   cmCTest *CTest;
   t_StringToString Options;
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index b886777..3003e8a 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -29,6 +29,7 @@ cmCTestHandlerCommand::cmCTestHandlerCommand()
   this->Arguments[ct_SUBMIT_INDEX] = "SUBMIT_INDEX";
   this->Last = ct_LAST;
   this->AppendXML = false;
+  this->Quiet = false;
 }
 
 bool cmCTestHandlerCommand
@@ -74,7 +75,7 @@ bool cmCTestHandlerCommand
     {
     this->CTest->SetCTestConfiguration("BuildDirectory",
       cmSystemTools::CollapseFullPath(
-        this->Values[ct_BUILD]).c_str());
+        this->Values[ct_BUILD]).c_str(), this->Quiet);
     }
   else
     {
@@ -84,7 +85,7 @@ bool cmCTestHandlerCommand
       {
       this->
         CTest->SetCTestConfiguration("BuildDirectory",
-          cmSystemTools::CollapseFullPath(bdir).c_str());
+          cmSystemTools::CollapseFullPath(bdir).c_str(), this->Quiet);
       }
     else
       {
@@ -98,13 +99,14 @@ bool cmCTestHandlerCommand
       "Set source directory to: " << this->Values[ct_SOURCE] << std::endl);
     this->CTest->SetCTestConfiguration("SourceDirectory",
       cmSystemTools::CollapseFullPath(
-        this->Values[ct_SOURCE]).c_str());
+        this->Values[ct_SOURCE]).c_str(), this->Quiet);
     }
   else
     {
     this->CTest->SetCTestConfiguration("SourceDirectory",
       cmSystemTools::CollapseFullPath(
-        this->Makefile->GetSafeDefinition("CTEST_SOURCE_DIRECTORY")).c_str());
+        this->Makefile->GetSafeDefinition("CTEST_SOURCE_DIRECTORY")).c_str(),
+      this->Quiet);
     }
 
   cmCTestLog(this->CTest, DEBUG, "Initialize handler" << std::endl;);
@@ -160,6 +162,12 @@ bool cmCTestHandlerCommand::CheckArgumentKeyword(std::string const& arg)
     this->AppendXML = true;
     return true;
     }
+  if(arg == "QUIET")
+    {
+    this->ArgumentDoing = ArgumentDoingNone;
+    this->Quiet = true;
+    return true;
+    }
 
   // Check for a keyword in our argument/value table.
   for(unsigned int k=0; k < this->Arguments.size(); ++k)
diff --git a/Source/CTest/cmCTestHandlerCommand.h b/Source/CTest/cmCTestHandlerCommand.h
index 8ef2b80..87b2cd8 100644
--- a/Source/CTest/cmCTestHandlerCommand.h
+++ b/Source/CTest/cmCTestHandlerCommand.h
@@ -62,6 +62,7 @@ protected:
   unsigned int ArgumentIndex;
 
   bool AppendXML;
+  bool Quiet;
 
   std::string ReturnVariable;
   std::vector<const char*> Arguments;
diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx
index cc3514f..5a8090c 100644
--- a/Source/CTest/cmCTestSubmitCommand.cxx
+++ b/Source/CTest/cmCTestSubmitCommand.cxx
@@ -44,29 +44,33 @@ cmCTestGenericHandler* cmCTestSubmitCommand::InitializeHandler()
     // error: CDash requires CTEST_DROP_LOCATION definition
     // in CTestConfig.cmake
     }
-  this->CTest->SetCTestConfiguration("ProjectName", ctestProjectName);
-  this->CTest->SetCTestConfiguration("DropMethod", ctestDropMethod);
-  this->CTest->SetCTestConfiguration("DropSite", ctestDropSite);
-  this->CTest->SetCTestConfiguration("DropLocation", ctestDropLocation);
+  this->CTest->SetCTestConfiguration("ProjectName", ctestProjectName,
+    this->Quiet);
+  this->CTest->SetCTestConfiguration("DropMethod", ctestDropMethod,
+    this->Quiet);
+  this->CTest->SetCTestConfiguration("DropSite", ctestDropSite, this->Quiet);
+  this->CTest->SetCTestConfiguration("DropLocation", ctestDropLocation,
+    this->Quiet);
 
   this->CTest->SetCTestConfiguration("IsCDash",
-    ctestDropSiteCDash ? "TRUE" : "FALSE");
+    ctestDropSiteCDash ? "TRUE" : "FALSE", this->Quiet);
 
   // Only propagate TriggerSite for non-CDash projects:
   //
   if ( !ctestDropSiteCDash )
     {
-    this->CTest->SetCTestConfiguration("TriggerSite",  ctestTriggerSite);
+    this->CTest->SetCTestConfiguration("TriggerSite",  ctestTriggerSite,
+      this->Quiet);
     }
 
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "CurlOptions", "CTEST_CURL_OPTIONS");
+    "CurlOptions", "CTEST_CURL_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "DropSiteUser", "CTEST_DROP_SITE_USER");
+    "DropSiteUser", "CTEST_DROP_SITE_USER", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "DropSitePassword", "CTEST_DROP_SITE_PASSWORD");
+    "DropSitePassword", "CTEST_DROP_SITE_PASSWORD", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "ScpCommand", "CTEST_SCP_COMMAND");
+    "ScpCommand", "CTEST_SCP_COMMAND", this->Quiet);
 
   const char* notesFilesVariable
     = this->Makefile->GetDefinition("CTEST_NOTES_FILES");
@@ -145,6 +149,8 @@ cmCTestGenericHandler* cmCTestSubmitCommand::InitializeHandler()
   static_cast<cmCTestSubmitHandler*>(handler)->SetOption("InternalTest",
     this->InternalTest ? "ON" : "OFF");
 
+  handler->SetQuiet(this->Quiet);
+
   if (this->CDashUpload)
     {
     static_cast<cmCTestSubmitHandler*>(handler)->
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 5b52df7..d585863 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -242,9 +242,9 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
       ftpfile = cmsys::SystemTools::Fopen(local_file, "rb");
       *this->LogFile << "\tUpload file: " << local_file << " to "
           << upload_as << std::endl;
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   Upload file: "
-        << local_file << " to "
-        << upload_as << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        "   Upload file: " << local_file << " to " << upload_as << std::endl,
+        this->Quiet);
 
       ::curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
 
@@ -278,15 +278,15 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
 
       if (!chunk.empty())
         {
-        cmCTestLog(this->CTest, DEBUG, "CURL output: ["
+        cmCTestOptionalLog(this->CTest, DEBUG, "CURL output: ["
           << cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]"
-          << std::endl);
+          << std::endl, this->Quiet);
         }
       if (!chunkDebug.empty())
         {
-        cmCTestLog(this->CTest, DEBUG, "CURL debug output: ["
+        cmCTestOptionalLog(this->CTest, DEBUG, "CURL debug output: ["
           << cmCTestLogWrite(&*chunkDebug.begin(), chunkDebug.size()) << "]"
-          << std::endl);
+          << std::endl, this->Quiet);
         }
 
       fclose(ftpfile);
@@ -318,8 +318,8 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
         }
       // always cleanup
       ::curl_easy_cleanup(curl);
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Uploaded: " + local_file
-        << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+        "   Uploaded: " + local_file << std::endl, this->Quiet);
       }
     }
   ::curl_global_cleanup();
@@ -369,14 +369,14 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
       cmCurlSetCAInfo(curl);
       if(verifyPeerOff)
         {
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                   "  Set CURLOPT_SSL_VERIFYPEER to off\n");
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+                   "  Set CURLOPT_SSL_VERIFYPEER to off\n", this->Quiet);
         curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
         }
       if(verifyHostOff)
         {
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                   "  Set CURLOPT_SSL_VERIFYHOST to off\n");
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+                   "  Set CURLOPT_SSL_VERIFYHOST to off\n", this->Quiet);
         curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
         }
 
@@ -482,9 +482,9 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
       unsigned long filelen = cmSystemTools::FileLength(local_file);
 
       ftpfile = cmsys::SystemTools::Fopen(local_file, "rb");
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   Upload file: "
-        << local_file << " to "
-        << upload_as << " Size: " << filelen << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        "   Upload file: " << local_file << " to "
+        << upload_as << " Size: " << filelen << std::endl, this->Quiet);
 
       // specify target
       ::curl_easy_setopt(curl,CURLOPT_URL, upload_as.c_str());
@@ -529,16 +529,16 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
 
       if (!chunk.empty())
         {
-        cmCTestLog(this->CTest, DEBUG, "CURL output: ["
+        cmCTestOptionalLog(this->CTest, DEBUG, "CURL output: ["
           << cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]"
-          << std::endl);
+          << std::endl, this->Quiet);
         this->ParseResponse(chunk);
         }
       if (!chunkDebug.empty())
         {
-        cmCTestLog(this->CTest, DEBUG, "CURL debug output: ["
+        cmCTestOptionalLog(this->CTest, DEBUG, "CURL debug output: ["
           << cmCTestLogWrite(&*chunkDebug.begin(), chunkDebug.size()) << "]"
-          << std::endl);
+          << std::endl, this->Quiet);
         }
 
       // If curl failed for any reason, or checksum fails, wait and retry
@@ -557,8 +557,9 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
 
         for(int i = 0; i < count; i++)
           {
-          cmCTestLog(this->CTest, HANDLER_OUTPUT,
-            "   Submit failed, waiting " << delay << " seconds...\n");
+          cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+            "   Submit failed, waiting " << delay << " seconds...\n",
+            this->Quiet);
 
           double stop = cmSystemTools::GetTime() + delay;
           while(cmSystemTools::GetTime() < stop)
@@ -566,9 +567,9 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
             cmSystemTools::Delay(100);
             }
 
-          cmCTestLog(this->CTest, HANDLER_OUTPUT,
+          cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
             "   Retry submission: Attempt " << (i + 1) << " of "
-            << count << std::endl);
+            << count << std::endl, this->Quiet);
 
           ::fclose(ftpfile);
           ftpfile = cmsys::SystemTools::Fopen(local_file, "rb");
@@ -582,9 +583,9 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
 
           if (!chunk.empty())
             {
-            cmCTestLog(this->CTest, DEBUG, "CURL output: ["
+            cmCTestOptionalLog(this->CTest, DEBUG, "CURL output: ["
               << cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]"
-              << std::endl);
+              << std::endl, this->Quiet);
             this->ParseResponse(chunk);
             }
 
@@ -624,8 +625,8 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
         }
       // always cleanup
       ::curl_easy_cleanup(curl);
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Uploaded: " + local_file
-        << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+        "   Uploaded: " + local_file << std::endl, this->Quiet);
       }
     }
   ::curl_global_cleanup();
@@ -677,6 +678,7 @@ bool cmCTestSubmitHandler::TriggerUsingHTTP(
 {
   CURL *curl;
   char error_buffer[1024];
+
   /* In windows, this will init the winsock stuff */
   ::curl_global_init(CURL_GLOBAL_ALL);
 
@@ -756,8 +758,8 @@ bool cmCTestSubmitHandler::TriggerUsingHTTP(
         = url + ((url.find("?",0) == std::string::npos) ? "?" : "&")
         + "xmlfile=" + ofile;
       *this->LogFile << "Trigger url: " << turl << std::endl;
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   Trigger url: "
-        << turl << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        "   Trigger url: " << turl << std::endl, this->Quiet);
       curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
       curl_easy_setopt(curl, CURLOPT_URL, turl.c_str());
       if ( curl_easy_perform(curl) )
@@ -786,25 +788,26 @@ bool cmCTestSubmitHandler::TriggerUsingHTTP(
 
       if (!chunk.empty())
         {
-        cmCTestLog(this->CTest, DEBUG, "CURL output: ["
+        cmCTestOptionalLog(this->CTest, DEBUG, "CURL output: ["
           << cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]"
-          << std::endl);
+          << std::endl, this->Quiet);
         }
       if (!chunkDebug.empty())
         {
-        cmCTestLog(this->CTest, DEBUG, "CURL debug output: ["
+        cmCTestOptionalLog(this->CTest, DEBUG, "CURL debug output: ["
           << cmCTestLogWrite(&*chunkDebug.begin(), chunkDebug.size())
-          << "]" << std::endl);
+          << "]" << std::endl, this->Quiet);
         }
 
       // always cleanup
       ::curl_easy_cleanup(curl);
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, std::endl,
+        this->Quiet);
       }
     }
   ::curl_global_cleanup();
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Dart server triggered..."
-    << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Dart server triggered..."
+    << std::endl, this->Quiet);
   return true;
 }
 
@@ -821,6 +824,7 @@ bool cmCTestSubmitHandler::SubmitUsingSCP(
     {
     return 0;
     }
+
   std::vector<const char*> argv;
   argv.push_back(scp_command.c_str()); // Scp command
   argv.push_back(scp_command.c_str()); // Dummy string for file
@@ -845,9 +849,9 @@ bool cmCTestSubmitHandler::SubmitUsingSCP(
     argv[1] = lfname.c_str();
     std::string rfname = url + "/" + remoteprefix + *file;
     argv[2] = rfname.c_str();
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Execute \"" << argv[0]
-      << "\" \"" << argv[1] << "\" \""
-      << argv[2] << "\"" << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Execute \"" << argv[0] << "\" \"" << argv[1] << "\" \""
+      << argv[2] << "\"" << std::endl, this->Quiet);
     *this->LogFile << "Execute \"" << argv[0] << "\" \"" << argv[1] << "\" \""
       << argv[2] << "\"" << std::endl;
 
@@ -858,8 +862,8 @@ bool cmCTestSubmitHandler::SubmitUsingSCP(
 
     while(cmsysProcess_WaitForData(cp, &data, &length, 0))
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-        cmCTestLogWrite(data, length));
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        cmCTestLogWrite(data, length), this->Quiet);
       }
 
     cmsysProcess_WaitForExit(cp, 0);
@@ -871,8 +875,8 @@ bool cmCTestSubmitHandler::SubmitUsingSCP(
       retVal = cmsysProcess_GetExitValue(cp);
       if ( retVal != 0 )
         {
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "\tSCP returned: "
-          << retVal << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+          "\tSCP returned: " << retVal << std::endl, this->Quiet);
         *this->LogFile << "\tSCP returned: " << retVal << std::endl;
         problems ++;
         }
@@ -927,6 +931,7 @@ bool cmCTestSubmitHandler::SubmitUsingCP(
                << "\tdestination: " << destination << std::endl);
     return 0;
     }
+
   cmCTest::SetOfStrings::const_iterator file;
   bool problems = false;
   for ( file = files.begin(); file != files.end(); ++file )
@@ -936,9 +941,9 @@ bool cmCTestSubmitHandler::SubmitUsingCP(
     lfname += "/" + *file;
     std::string rfname = destination + "/" + remoteprefix + *file;
     cmSystemTools::CopyFileAlways(lfname, rfname);
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   Copy file: "
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   Copy file: "
         << lfname << " to "
-        << rfname << std::endl);
+        << rfname << std::endl, this->Quiet);
     }
   std::string tagDoneFile = destination + "/" + remoteprefix + "DONE";
   cmSystemTools::Touch(tagDoneFile, true);
@@ -971,8 +976,9 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
   xmlrpc_env_init(&env);
 
   /* Call the famous server at UserLand. */
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Submitting to: "
-    << realURL.c_str() << " (" << remoteprefix.c_str() << ")" << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Submitting to: "
+    << realURL.c_str() << " (" << remoteprefix.c_str() << ")" << std::endl,
+    this->Quiet);
   cmCTest::SetOfStrings::const_iterator file;
   for ( file = files.begin(); file != files.end(); ++file )
     {
@@ -983,8 +989,8 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       local_file = localprefix + "/" + *file;
       }
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Submit file: "
-      << local_file.c_str() << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Submit file: "
+      << local_file.c_str() << std::endl, this->Quiet);
     struct stat st;
     if ( ::stat(local_file.c_str(), &st) )
       {
@@ -1068,12 +1074,14 @@ void cmCTestSubmitHandler::ConstructCDashURL(std::string& dropMethod,
   if ( this->CTest->GetCTestConfiguration("DropSiteUser").size() > 0 )
     {
     url += this->CTest->GetCTestConfiguration("DropSiteUser");
-    cmCTestLog(this->CTest, HANDLER_OUTPUT,
-               this->CTest->GetCTestConfiguration("DropSiteUser").c_str());
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      this->CTest->GetCTestConfiguration("DropSiteUser").c_str(),
+      this->Quiet);
     if ( this->CTest->GetCTestConfiguration("DropSitePassword").size() > 0 )
       {
       url += ":" + this->CTest->GetCTestConfiguration("DropSitePassword");
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, ":******");
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, ":******",
+        this->Quiet);
       }
     url += "@";
     }
@@ -1147,8 +1155,8 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
       << "datafilesmd5[0]=" << md5sum << "&"
       << "type=" << curl.Escape(typeString);
   std::string fields = str.str();
-  cmCTestLog(this->CTest, DEBUG, "fields: " << fields << "\nurl:"
-             << url << "\nfile: " << file << "\n");
+  cmCTestOptionalLog(this->CTest, DEBUG, "fields: " << fields << "\nurl:"
+             << url << "\nfile: " << file << "\n", this->Quiet);
   std::string response;
   if(!curl.HttpRequest(url, fields, response))
     {
@@ -1156,8 +1164,8 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
                "Error in HttpRequest\n" << response);
     return -1;
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             "Request upload response: [" << response << "]\n");
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "Request upload response: [" << response << "]\n", this->Quiet);
   Json::Value json;
   Json::Reader reader;
   if(!reader.parse(response, json))
@@ -1179,9 +1187,9 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     int datares = json["datafilesmd5"][0].asInt();
     if(datares == 1)
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                 "File already exists on CDash, skip upload "
-                 << file << "\n");
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        "File already exists on CDash, skip upload " << file << "\n",
+        this->Quiet);
       return 0;
       }
     }
@@ -1213,8 +1221,8 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
                << reader.getFormattedErrorMessages() << "\n");
     return -1;
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             "Upload file response: [" << response << "]\n");
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "Upload file response: [" << response << "]\n", this->Quiet );
   return 0;
 }
 
@@ -1311,13 +1319,13 @@ int cmCTestSubmitHandler::ProcessHandler()
 
   if (!this->HTTPProxy.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Use HTTP Proxy: "
-      << this->HTTPProxy << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Use HTTP Proxy: "
+      << this->HTTPProxy << std::endl, this->Quiet);
     }
   if (!this->FTPProxy.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Use FTP Proxy: "
-      << this->FTPProxy << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Use FTP Proxy: "
+      << this->FTPProxy << std::endl, this->Quiet);
     }
   cmGeneratedFileStream ofs;
   this->StartLogFile("Submit", ofs);
@@ -1349,16 +1357,16 @@ int cmCTestSubmitHandler::ProcessHandler()
       = buildDirectory + "/Testing/" + this->CTest->GetCurrentTag();
     std::string::size_type glen = gpath.size() + 1;
     gpath = gpath + "/CoverageLog*";
-    cmCTestLog(this->CTest, DEBUG, "Globbing for: " << gpath
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, DEBUG, "Globbing for: " << gpath
+      << std::endl, this->Quiet);
     if ( cmSystemTools::SimpleGlob(gpath, gfiles, 1) )
       {
       size_t cc;
       for ( cc = 0; cc < gfiles.size(); cc ++ )
         {
         gfiles[cc] = gfiles[cc].substr(glen);
-        cmCTestLog(this->CTest, DEBUG, "Glob file: " << gfiles[cc]
-          << std::endl);
+        cmCTestOptionalLog(this->CTest, DEBUG, "Glob file: " << gfiles[cc]
+          << std::endl, this->Quiet);
         this->CTest->AddSubmitFile(cmCTest::PartCoverage, gfiles[cc].c_str());
         }
       }
@@ -1398,14 +1406,14 @@ int cmCTestSubmitHandler::ProcessHandler()
       cnt ++;
       }
     }
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "Submit files (using "
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "Submit files (using "
     << this->CTest->GetCTestConfiguration("DropMethod") << ")"
-    << std::endl);
+    << std::endl, this->Quiet);
   const char* specificTrack = this->CTest->GetSpecificTrack();
   if ( specificTrack )
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Send to track: "
-      << specificTrack << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Send to track: "
+      << specificTrack << std::endl, this->Quiet);
     }
   this->SetLogFile(&ofs);
 
@@ -1414,9 +1422,9 @@ int cmCTestSubmitHandler::ProcessHandler()
   if ( dropMethod == "" || dropMethod == "ftp" )
     {
     ofs << "Using drop method: FTP" << std::endl;
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Using FTP submit method"
-      << std::endl
-      << "   Drop site: ftp://");
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "   Using FTP submit method" << std::endl << "   Drop site: ftp://",
+      this->Quiet);
     std::string url = "ftp://";
     url += cmCTest::MakeURLSafe(
       this->CTest->GetCTestConfiguration("DropSiteUser")) + ":" +
@@ -1427,18 +1435,20 @@ int cmCTestSubmitHandler::ProcessHandler()
         this->CTest->GetCTestConfiguration("DropLocation"));
     if (!this->CTest->GetCTestConfiguration("DropSiteUser").empty())
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT,
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
         this->CTest->GetCTestConfiguration(
-          "DropSiteUser").c_str());
+          "DropSiteUser").c_str(), this->Quiet);
       if (!this->CTest->GetCTestConfiguration("DropSitePassword").empty())
         {
-        cmCTestLog(this->CTest, HANDLER_OUTPUT, ":******");
+        cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, ":******",
+          this->Quiet);
         }
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "@");
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "@", this->Quiet);
       }
-    cmCTestLog(this->CTest, HANDLER_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
       this->CTest->GetCTestConfiguration("DropSite")
-      << this->CTest->GetCTestConfiguration("DropLocation") << std::endl);
+      << this->CTest->GetCTestConfiguration("DropLocation") << std::endl,
+      this->Quiet);
     if ( !this->SubmitUsingFTP(buildDirectory + "/Testing/"
         + this->CTest->GetCurrentTag(),
         files, prefix, url) )
@@ -1451,11 +1461,12 @@ int cmCTestSubmitHandler::ProcessHandler()
       }
     if(!this->CDash)
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Using HTTP trigger method"
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+                 "   Using HTTP trigger method"
                  << std::endl
                  << "   Trigger site: "
                  << this->CTest->GetCTestConfiguration("TriggerSite")
-                 << std::endl);
+                 << std::endl, this->Quiet);
       if ( !this->
            TriggerUsingHTTP(files, prefix,
                             this->CTest->GetCTestConfiguration("TriggerSite")))
@@ -1465,8 +1476,8 @@ int cmCTestSubmitHandler::ProcessHandler()
         ofs << "   Problems when triggering via HTTP" << std::endl;
         return -1;
         }
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
-                 << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+        "   Submission successful" << std::endl, this->Quiet);
       ofs << "   Submission successful" << std::endl;
       return 0;
       }
@@ -1476,27 +1487,30 @@ int cmCTestSubmitHandler::ProcessHandler()
     std::string url = dropMethod;
     url += "://";
     ofs << "Using drop method: " << dropMethod << std::endl;
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Using HTTP submit method"
-      << std::endl
-      << "   Drop site:" << url);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "   Using HTTP submit method" << std::endl << "   Drop site:" << url,
+      this->Quiet);
      if (!this->CTest->GetCTestConfiguration("DropSiteUser").empty())
       {
       url += this->CTest->GetCTestConfiguration("DropSiteUser");
-      cmCTestLog(this->CTest, HANDLER_OUTPUT,
-        this->CTest->GetCTestConfiguration("DropSiteUser").c_str());
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+        this->CTest->GetCTestConfiguration("DropSiteUser").c_str(),
+        this->Quiet);
       if (!this->CTest->GetCTestConfiguration("DropSitePassword").empty())
         {
         url += ":" + this->CTest->GetCTestConfiguration("DropSitePassword");
-        cmCTestLog(this->CTest, HANDLER_OUTPUT, ":******");
+        cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, ":******",
+          this->Quiet);
         }
       url += "@";
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "@");
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "@", this->Quiet);
       }
     url += this->CTest->GetCTestConfiguration("DropSite") +
       this->CTest->GetCTestConfiguration("DropLocation");
-    cmCTestLog(this->CTest, HANDLER_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
       this->CTest->GetCTestConfiguration("DropSite")
-      << this->CTest->GetCTestConfiguration("DropLocation") << std::endl);
+      << this->CTest->GetCTestConfiguration("DropLocation") << std::endl,
+      this->Quiet);
     if ( !this->SubmitUsingHTTP(buildDirectory + "/Testing/" +
         this->CTest->GetCurrentTag(), files, prefix, url) )
       {
@@ -1507,11 +1521,10 @@ int cmCTestSubmitHandler::ProcessHandler()
       }
     if(!this->CDash)
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Using HTTP trigger method"
-                 << std::endl
-                 << "   Trigger site: "
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+        "   Using HTTP trigger method" << std::endl << "   Trigger site: "
                  << this->CTest->GetCTestConfiguration("TriggerSite")
-                 << std::endl);
+                 << std::endl, this->Quiet);
       if ( !this->
            TriggerUsingHTTP(files, prefix,
                             this->CTest->GetCTestConfiguration("TriggerSite")))
@@ -1530,8 +1543,10 @@ int cmCTestSubmitHandler::ProcessHandler()
       }
     else
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Submission successful" <<
-        (this->HasWarnings ? ", with warnings." : "") << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+        "   Submission successful" <<
+        (this->HasWarnings ? ", with warnings." : "") << std::endl,
+        this->Quiet);
       ofs << "   Submission successful" <<
         (this->HasWarnings ? ", with warnings." : "") << std::endl;
       }
@@ -1542,8 +1557,8 @@ int cmCTestSubmitHandler::ProcessHandler()
     {
 #if defined(CTEST_USE_XMLRPC)
     ofs << "Using drop method: XML-RPC" << std::endl;
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Using XML-RPC submit method"
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "   Using XML-RPC submit method" << std::endl, this->Quiet);
     std::string url = this->CTest->GetCTestConfiguration("DropSite");
     prefix = this->CTest->GetCTestConfiguration("DropLocation");
     if ( !this->SubmitUsingXMLRPC(buildDirectory + "/Testing/" +
@@ -1554,8 +1569,8 @@ int cmCTestSubmitHandler::ProcessHandler()
       ofs << "   Problems when submitting via XML-RPC" << std::endl;
       return -1;
       }
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
+      << std::endl, this->Quiet);
     ofs << "   Submission successful" << std::endl;
     return 0;
 #else
@@ -1593,8 +1608,8 @@ int cmCTestSubmitHandler::ProcessHandler()
       return -1;
       }
     cmSystemTools::ChangeDirectory(oldWorkingDirectory);
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
+      << std::endl, this->Quiet);
     ofs << "   Submission successful" << std::endl;
     return 0;
     }
@@ -1609,8 +1624,8 @@ int cmCTestSubmitHandler::ProcessHandler()
     std::string
       oldWorkingDirectory = cmSystemTools::GetCurrentWorkingDirectory();
     cmSystemTools::ChangeDirectory(buildDirectory);
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   Change directory: "
-               << buildDirectory << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "   Change directory: " << buildDirectory << std::endl, this->Quiet);
 
     if ( !this->SubmitUsingCP(
            "Testing/"+this->CTest->GetCurrentTag(),
@@ -1626,8 +1641,8 @@ int cmCTestSubmitHandler::ProcessHandler()
       return -1;
       }
     cmSystemTools::ChangeDirectory(oldWorkingDirectory);
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
+      << std::endl, this->Quiet);
     ofs << "   Submission successful" << std::endl;
     return 0;
     }
diff --git a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-result.txt b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-result.txt
new file mode 100644
index 0000000..b57e2de
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-result.txt
@@ -0,0 +1 @@
+(-1|255)
diff --git a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
new file mode 100644
index 0000000..34891a1
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
@@ -0,0 +1,4 @@
+ *Error when uploading file: .*/Configure.xml
+ *Error message was: Couldn't resolve host '-no-site-'
+ *Problems when submitting via HTTP
+ *Error in read script: .*/Tests/RunCMake/ctest_submit/CDashSubmitQuiet/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stdout.txt b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stdout.txt
new file mode 100644
index 0000000..cd42c9a
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stdout.txt
@@ -0,0 +1,3 @@
+Configure project
+   Each . represents 1024 bytes of output
+    . Size of output: 0K$
diff --git a/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
index c004e97..a81bc96 100644
--- a/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
@@ -24,6 +24,7 @@ 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(CDashSubmitQuiet QUIET)
 
 function(run_ctest_CDashUploadFTP)
   set(CASE_DROP_METHOD ftp)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=004b6b1198eb26f3ac6add170605a1072f64ee1b
commit 004b6b1198eb26f3ac6add170605a1072f64ee1b
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Mon Feb 16 15:24:55 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 19 11:37:29 2015 -0500

    CTest: Add cmCTestOptionalLog macro
    
    cmCTestOptionalLog takes a boolean argument that indicates
    whether or not the message should be suppressed.  Note that
    error messages will still be printed, even if suppression is
    requested.  This macro will allow us to provide more
    fine-grained control over what messages CTest prints to the
    console.

diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index f08b87c..9975802 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -2741,10 +2741,11 @@ void cmCTest::DetermineNextDayStop()
 }
 
 //----------------------------------------------------------------------
-void cmCTest::SetCTestConfiguration(const char *name, const char* value)
+void cmCTest::SetCTestConfiguration(const char *name, const char* value,
+                                    bool suppress)
 {
-  cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, "SetCTestConfiguration:"
-    << name << ":" << (value ? value : "(null)") << "\n");
+  cmCTestOptionalLog(this, HANDLER_VERBOSE_OUTPUT, "SetCTestConfiguration:"
+    << name << ":" << (value ? value : "(null)") << "\n", suppress);
 
   if ( !name )
     {
@@ -2858,7 +2859,7 @@ void cmCTest::SetConfigType(const char* ct)
 
 //----------------------------------------------------------------------
 bool cmCTest::SetCTestConfigurationFromCMakeVariable(cmMakefile* mf,
-  const char* dconfig, const std::string& cmake_var)
+  const char* dconfig, const std::string& cmake_var, bool suppress)
 {
   const char* ctvar;
   ctvar = mf->GetDefinition(cmake_var);
@@ -2866,10 +2867,10 @@ bool cmCTest::SetCTestConfigurationFromCMakeVariable(cmMakefile* mf,
     {
     return false;
     }
-  cmCTestLog(this, HANDLER_VERBOSE_OUTPUT,
-             "SetCTestConfigurationFromCMakeVariable:"
-             << dconfig << ":" << cmake_var << std::endl);
-  this->SetCTestConfiguration(dconfig, ctvar);
+  cmCTestOptionalLog(this, HANDLER_VERBOSE_OUTPUT,
+    "SetCTestConfigurationFromCMakeVariable:" << dconfig << ":" <<
+    cmake_var << std::endl, suppress);
+  this->SetCTestConfiguration(dconfig, ctvar, suppress);
   return true;
 }
 
@@ -3034,12 +3035,17 @@ void cmCTest::InitStreams()
   this->StreamErr = &std::cerr;
 }
 
-void cmCTest::Log(int logType, const char* file, int line, const char* msg)
+void cmCTest::Log(int logType, const char* file, int line, const char* msg,
+                  bool suppress)
 {
   if ( !msg || !*msg )
     {
     return;
     }
+  if ( suppress && logType != cmCTest::ERROR_MESSAGE )
+    {
+    return;
+    }
   if ( this->OutputLogFile )
     {
     bool display = true;
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index deb8896..88191c4 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -33,6 +33,14 @@ class cmCTestStartCommand;
                 cmCTestLog_msg.str().c_str());\
   } while ( 0 )
 
+#define cmCTestOptionalLog(ctSelf, logType, msg, suppress) \
+  do { \
+  std::ostringstream cmCTestLog_msg; \
+  cmCTestLog_msg << msg; \
+  (ctSelf)->Log(cmCTest::logType, __FILE__, __LINE__,\
+                cmCTestLog_msg.str().c_str(), suppress);\
+  } while ( 0 )
+
 #ifdef cerr
 #  undef cerr
 #endif
@@ -173,7 +181,8 @@ public:
   static int GetTestModelFromString(const char* str);
   static std::string CleanString(const std::string& str);
   std::string GetCTestConfiguration(const std::string& name);
-  void SetCTestConfiguration(const char *name, const char* value);
+  void SetCTestConfiguration(const char *name, const char* value,
+    bool suppress=false);
   void EmptyCTestConfiguration();
 
   /**
@@ -332,7 +341,7 @@ public:
    * Set the CTest variable from CMake variable
    */
   bool SetCTestConfigurationFromCMakeVariable(cmMakefile* mf,
-    const char* dconfig, const std::string& cmake_var);
+    const char* dconfig, const std::string& cmake_var, bool suppress=false);
 
   //! Make string safe to be send as an URL
   static std::string MakeURLSafe(const std::string&);
@@ -376,7 +385,8 @@ public:
   };
 
   //! Add log to the output
-  void Log(int logType, const char* file, int line, const char* msg);
+  void Log(int logType, const char* file, int line, const char* msg,
+           bool suppress=false);
 
   //! Get the version of dart server
   int GetDartVersion() { return this->DartVersion; }

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

Summary of changes:
 Help/command/ctest_build.rst                       |    5 +
 Help/command/ctest_configure.rst                   |    6 +-
 Help/command/ctest_coverage.rst                    |    5 +
 Help/command/ctest_memcheck.rst                    |    4 +
 Help/command/ctest_start.rst                       |    5 +-
 Help/command/ctest_submit.rst                      |    4 +
 Help/command/ctest_test.rst                        |    6 +
 Help/command/ctest_update.rst                      |    7 +-
 Help/command/ctest_upload.rst                      |    5 +-
 Modules/CTestCoverageCollectGCOV.cmake             |   25 +-
 Source/CTest/cmCTestBuildCommand.cxx               |   15 +-
 Source/CTest/cmCTestBuildHandler.cxx               |   76 ++--
 Source/CTest/cmCTestConfigureCommand.cxx           |    5 +-
 Source/CTest/cmCTestConfigureHandler.cxx           |   13 +-
 Source/CTest/cmCTestCoverageCommand.cxx            |    5 +-
 Source/CTest/cmCTestCoverageHandler.cxx            |  372 ++++++++++----------
 Source/CTest/cmCTestCoverageHandler.h              |    3 +-
 Source/CTest/cmCTestGenericHandler.cxx             |    1 +
 Source/CTest/cmCTestGenericHandler.h               |    3 +
 Source/CTest/cmCTestHandlerCommand.cxx             |   16 +-
 Source/CTest/cmCTestHandlerCommand.h               |    1 +
 Source/CTest/cmCTestMemCheckCommand.cxx            |   14 +-
 Source/CTest/cmCTestMemCheckHandler.cxx            |   77 ++--
 Source/CTest/cmCTestMultiProcessHandler.cxx        |   47 ++-
 Source/CTest/cmCTestMultiProcessHandler.h          |    3 +
 Source/CTest/cmCTestRunTest.cxx                    |   14 +-
 Source/CTest/cmCTestStartCommand.cxx               |   23 +-
 Source/CTest/cmCTestStartCommand.h                 |   10 +
 Source/CTest/cmCTestSubmitCommand.cxx              |   26 +-
 Source/CTest/cmCTestSubmitHandler.cxx              |  239 +++++++------
 Source/CTest/cmCTestTestCommand.cxx                |    1 +
 Source/CTest/cmCTestTestHandler.cxx                |   64 ++--
 Source/CTest/cmCTestUpdateCommand.cxx              |   44 +--
 Source/CTest/cmCTestUpdateHandler.cxx              |   39 +-
 Source/CTest/cmCTestUploadCommand.cxx              |    7 +
 Source/CTest/cmCTestUploadHandler.cxx              |    4 +-
 Source/CTest/cmParseBlanketJSCoverage.cxx          |   12 +-
 Source/CTest/cmParseCacheCoverage.cxx              |    4 +-
 Source/CTest/cmParseCoberturaCoverage.cxx          |   15 +-
 Source/CTest/cmParseDelphiCoverage.cxx             |   19 +-
 Source/CTest/cmParseJacocoCoverage.cxx             |    9 +-
 Source/cmCTest.cxx                                 |  100 +++---
 Source/cmCTest.h                                   |   16 +-
 Tests/CTestUpdateCommon.cmake                      |    6 +
 Tests/CTestUpdateGIT.cmake.in                      |   33 ++
 Tests/RunCMake/CMakeLists.txt                      |    8 +
 Tests/RunCMake/ctest_build/BuildQuiet-stdout.txt   |   12 +
 Tests/RunCMake/ctest_build/CMakeLists.txt.in       |    4 +
 Tests/RunCMake/ctest_build/CTestConfig.cmake.in    |    1 +
 Tests/RunCMake/ctest_build/RunCMakeTest.cmake      |   10 +
 Tests/RunCMake/ctest_build/test.cmake.in           |   15 +
 Tests/RunCMake/ctest_configure/CMakeLists.txt.in   |    4 +
 .../RunCMake/ctest_configure/CTestConfig.cmake.in  |    1 +
 .../ctest_configure/ConfigureQuiet-stdout.txt      |    9 +
 Tests/RunCMake/ctest_configure/RunCMakeTest.cmake  |   10 +
 Tests/RunCMake/ctest_configure/test.cmake.in       |   14 +
 Tests/RunCMake/ctest_coverage/CMakeLists.txt.in    |    4 +
 Tests/RunCMake/ctest_coverage/CTestConfig.cmake.in |    1 +
 .../ctest_coverage/CoverageQuiet-stdout.txt        |    1 +
 Tests/RunCMake/ctest_coverage/RunCMakeTest.cmake   |   10 +
 Tests/RunCMake/ctest_coverage/test.cmake.in        |   18 +
 .../RunCMake/ctest_memcheck/DummyQuiet-stdout.txt  |    1 +
 Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake   |    1 +
 Tests/RunCMake/ctest_memcheck/test.cmake.in        |    2 +-
 Tests/RunCMake/ctest_start/CMakeLists.txt.in       |    4 +
 Tests/RunCMake/ctest_start/CTestConfig.cmake.in    |    1 +
 Tests/RunCMake/ctest_start/RunCMakeTest.cmake      |   10 +
 Tests/RunCMake/ctest_start/StartQuiet-stderr.txt   |    1 +
 Tests/RunCMake/ctest_start/StartQuiet-stdout.txt   |    1 +
 Tests/RunCMake/ctest_start/test.cmake.in           |   13 +
 .../CDashSubmitQuiet-result.txt}                   |    0
 .../ctest_submit/CDashSubmitQuiet-stderr.txt       |    4 +
 .../ctest_submit/CDashSubmitQuiet-stdout.txt       |    3 +
 Tests/RunCMake/ctest_submit/RunCMakeTest.cmake     |    1 +
 Tests/RunCMake/ctest_test/CMakeLists.txt.in        |    4 +
 Tests/RunCMake/ctest_test/CTestConfig.cmake.in     |    1 +
 Tests/RunCMake/ctest_test/RunCMakeTest.cmake       |   10 +
 Tests/RunCMake/ctest_test/TestQuiet-stdout.txt     |    2 +
 Tests/RunCMake/ctest_test/test.cmake.in            |   16 +
 Tests/RunCMake/ctest_upload/CMakeLists.txt.in      |    4 +
 Tests/RunCMake/ctest_upload/CTestConfig.cmake.in   |    1 +
 Tests/RunCMake/ctest_upload/RunCMakeTest.cmake     |   10 +
 Tests/RunCMake/ctest_upload/UploadQuiet-stdout.txt |    1 +
 Tests/RunCMake/ctest_upload/test.cmake.in          |   14 +
 84 files changed, 1049 insertions(+), 586 deletions(-)
 create mode 100644 Tests/RunCMake/ctest_build/BuildQuiet-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_build/CMakeLists.txt.in
 create mode 100644 Tests/RunCMake/ctest_build/CTestConfig.cmake.in
 create mode 100644 Tests/RunCMake/ctest_build/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/ctest_build/test.cmake.in
 create mode 100644 Tests/RunCMake/ctest_configure/CMakeLists.txt.in
 create mode 100644 Tests/RunCMake/ctest_configure/CTestConfig.cmake.in
 create mode 100644 Tests/RunCMake/ctest_configure/ConfigureQuiet-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_configure/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/ctest_configure/test.cmake.in
 create mode 100644 Tests/RunCMake/ctest_coverage/CMakeLists.txt.in
 create mode 100644 Tests/RunCMake/ctest_coverage/CTestConfig.cmake.in
 create mode 100644 Tests/RunCMake/ctest_coverage/CoverageQuiet-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_coverage/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/ctest_coverage/test.cmake.in
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyQuiet-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_start/CMakeLists.txt.in
 create mode 100644 Tests/RunCMake/ctest_start/CTestConfig.cmake.in
 create mode 100644 Tests/RunCMake/ctest_start/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_start/StartQuiet-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_start/test.cmake.in
 copy Tests/RunCMake/{ctest_memcheck/DummyAddressSanitizer-result.txt => ctest_submit/CDashSubmitQuiet-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_test/CMakeLists.txt.in
 create mode 100644 Tests/RunCMake/ctest_test/CTestConfig.cmake.in
 create mode 100644 Tests/RunCMake/ctest_test/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/ctest_test/TestQuiet-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_test/test.cmake.in
 create mode 100644 Tests/RunCMake/ctest_upload/CMakeLists.txt.in
 create mode 100644 Tests/RunCMake/ctest_upload/CTestConfig.cmake.in
 create mode 100644 Tests/RunCMake/ctest_upload/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/ctest_upload/UploadQuiet-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_upload/test.cmake.in


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Fri Feb 20 00:01:20 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Fri, 20 Feb 2015 00:01:20 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-201-g14713ee
Message-ID: <20150220050120.D2450AAF22@public.kitware.com>

This is an automated email from 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  14713eebfb3152bb7b3591515da5780b4eec1dd3 (commit)
      from  d5ad641ac3fa161e67759d6feebd9d895ef68bf0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14713eebfb3152bb7b3591515da5780b4eec1dd3
commit 14713eebfb3152bb7b3591515da5780b4eec1dd3
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Fri Feb 20 00:01:16 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Feb 20 00:01:16 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 92f6278..5f5e676 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 2)
-set(CMake_VERSION_PATCH 20150219)
+set(CMake_VERSION_PATCH 20150220)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From zack.galbreath at kitware.com  Fri Feb 20 07:58:15 2015
From: zack.galbreath at kitware.com (Zack Galbreath)
Date: Fri, 20 Feb 2015 07:58:15 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-512-gcf46309
Message-ID: <20150220125815.87FF5AAA7B@public.kitware.com>

This is an automated email from 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  cf4630995c56e8a82110c142e81c2f352575cabe (commit)
       via  73ff7bf44c042a9da9b5f3ec987131febf97d609 (commit)
      from  a9f67370534c230c6e47b0bfaf335841b1c479aa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf4630995c56e8a82110c142e81c2f352575cabe
commit cf4630995c56e8a82110c142e81c2f352575cabe
Merge: a9f6737 73ff7bf
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Fri Feb 20 07:58:13 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 20 07:58:13 2015 -0500

    Merge topic 'ctest-output-options' into next
    
    73ff7bf4 don't check stderr for ctest_*(QUIET) tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73ff7bf44c042a9da9b5f3ec987131febf97d609
commit 73ff7bf44c042a9da9b5f3ec987131febf97d609
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Fri Feb 20 07:56:39 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Fri Feb 20 07:56:39 2015 -0500

    don't check stderr for ctest_*(QUIET) tests
    
    This feature changes what info is printed to stdout, so we can
    ignore any variations that occur on stderr.

diff --git a/Tests/RunCMake/ctest_build/BuildQuiet-stderr.txt b/Tests/RunCMake/ctest_build/BuildQuiet-stderr.txt
new file mode 100644
index 0000000..8d98f9d
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/BuildQuiet-stderr.txt
@@ -0,0 +1 @@
+.*
diff --git a/Tests/RunCMake/ctest_configure/ConfigureQuiet-stderr.txt b/Tests/RunCMake/ctest_configure/ConfigureQuiet-stderr.txt
new file mode 100644
index 0000000..8d98f9d
--- /dev/null
+++ b/Tests/RunCMake/ctest_configure/ConfigureQuiet-stderr.txt
@@ -0,0 +1 @@
+.*
diff --git a/Tests/RunCMake/ctest_coverage/CoverageQuiet-stderr.txt b/Tests/RunCMake/ctest_coverage/CoverageQuiet-stderr.txt
new file mode 100644
index 0000000..8d98f9d
--- /dev/null
+++ b/Tests/RunCMake/ctest_coverage/CoverageQuiet-stderr.txt
@@ -0,0 +1 @@
+.*
diff --git a/Tests/RunCMake/ctest_memcheck/DummyQuiet-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyQuiet-stderr.txt
new file mode 100644
index 0000000..8d98f9d
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyQuiet-stderr.txt
@@ -0,0 +1 @@
+.*
diff --git a/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt b/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
index 10f3293..8d98f9d 100644
--- a/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
+++ b/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
@@ -1 +1 @@
-^$
+.*
diff --git a/Tests/RunCMake/ctest_test/TestQuiet-stderr.txt b/Tests/RunCMake/ctest_test/TestQuiet-stderr.txt
new file mode 100644
index 0000000..8d98f9d
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestQuiet-stderr.txt
@@ -0,0 +1 @@
+.*
diff --git a/Tests/RunCMake/ctest_upload/UploadQuiet-stderr.txt b/Tests/RunCMake/ctest_upload/UploadQuiet-stderr.txt
new file mode 100644
index 0000000..8d98f9d
--- /dev/null
+++ b/Tests/RunCMake/ctest_upload/UploadQuiet-stderr.txt
@@ -0,0 +1 @@
+.*

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

Summary of changes:
 .../BuildQuiet-stderr.txt}                                           |    0
 .../ConfigureQuiet-stderr.txt}                                       |    0
 .../CoverageQuiet-stderr.txt}                                        |    0
 .../DummyQuiet-stderr.txt}                                           |    0
 Tests/RunCMake/ctest_start/StartQuiet-stderr.txt                     |    2 +-
 .../TestQuiet-stderr.txt}                                            |    0
 .../UploadQuiet-stderr.txt}                                          |    0
 7 files changed, 1 insertion(+), 1 deletion(-)
 copy Tests/RunCMake/{file/LOCK-error-timeout-stdout.txt => ctest_build/BuildQuiet-stderr.txt} (100%)
 copy Tests/RunCMake/{file/LOCK-error-timeout-stdout.txt => ctest_configure/ConfigureQuiet-stderr.txt} (100%)
 copy Tests/RunCMake/{file/LOCK-error-timeout-stdout.txt => ctest_coverage/CoverageQuiet-stderr.txt} (100%)
 copy Tests/RunCMake/{file/LOCK-error-timeout-stdout.txt => ctest_memcheck/DummyQuiet-stderr.txt} (100%)
 copy Tests/RunCMake/{file/LOCK-error-timeout-stdout.txt => ctest_test/TestQuiet-stderr.txt} (100%)
 copy Tests/RunCMake/{file/LOCK-error-timeout-stdout.txt => ctest_upload/UploadQuiet-stderr.txt} (100%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 20 08:10:49 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Feb 2015 08:10:49 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-203-gb7351d8
Message-ID: <20150220131049.8208D49DA@public.kitware.com>

This is an automated email from 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  b7351d8e14ea7cc05b0c5d45dae48a21aef298c1 (commit)
       via  1ade687d8dbe2952bc12dabeaaaaf0abec5b98cf (commit)
      from  14713eebfb3152bb7b3591515da5780b4eec1dd3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7351d8e14ea7cc05b0c5d45dae48a21aef298c1
commit b7351d8e14ea7cc05b0c5d45dae48a21aef298c1
Merge: 14713ee 1ade687
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 08:10:48 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 20 08:10:48 2015 -0500

    Merge topic 'cmake-gui-reset-generator-toolset-and-platform'
    
    1ade687d cmake-gui: Reset generator platform and toolset on configure (#15411)


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 20 08:10:51 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Feb 2015 08:10:51 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-205-gc4c570f
Message-ID: <20150220131052.0020149DB@public.kitware.com>

This is an automated email from 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  c4c570f9cc7a7c5f22670793af887dfa5a6dd7de (commit)
       via  ffc06c12397e7cda7307afcfc8a79ebda4a786a6 (commit)
      from  b7351d8e14ea7cc05b0c5d45dae48a21aef298c1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4c570f9cc7a7c5f22670793af887dfa5a6dd7de
commit c4c570f9cc7a7c5f22670793af887dfa5a6dd7de
Merge: b7351d8 ffc06c1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 08:10:50 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 20 08:10:50 2015 -0500

    Merge topic 'find-command-prefix-from-PATH'
    
    ffc06c12 Teach find_(library|file|path) to get prefixes from PATH (#15370)


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

Summary of changes:
 Help/command/FIND_XXX.txt                          |    4 ++++
 Help/command/find_file.rst                         |    5 ++++-
 Help/command/find_library.rst                      |    5 ++++-
 Help/command/find_path.rst                         |    5 ++++-
 Help/release/dev/find-command-prefix-from-PATH.rst |    6 ++++++
 Source/cmFindBase.cxx                              |    1 +
 Source/cmSearchPath.cxx                            |   22 +++++++++++++++++++-
 Source/cmSearchPath.h                              |    2 +-
 Tests/RunCMake/CMakeLists.txt                      |    2 ++
 .../RunCMake/{CMP0055 => find_file}/CMakeLists.txt |    0
 Tests/RunCMake/find_file/PrefixInPATH-stdout.txt   |    4 ++++
 Tests/RunCMake/find_file/PrefixInPATH.cmake        |    8 +++++++
 Tests/RunCMake/find_file/RunCMakeTest.cmake        |    3 +++
 .../RunCMake/find_file/include/PrefixInPATH.h      |    0
 .../RunCMake/find_library/PrefixInPATH-stdout.txt  |    4 ++++
 Tests/RunCMake/find_library/PrefixInPATH.cmake     |   11 ++++++++++
 Tests/RunCMake/find_library/RunCMakeTest.cmake     |    1 +
 .../RunCMake/find_library/lib/libPrefixInPATH.a    |    0
 .../RunCMake/{CMP0055 => find_path}/CMakeLists.txt |    0
 Tests/RunCMake/find_path/PrefixInPATH-stdout.txt   |    4 ++++
 Tests/RunCMake/find_path/PrefixInPATH.cmake        |    8 +++++++
 Tests/RunCMake/find_path/RunCMakeTest.cmake        |    3 +++
 .../RunCMake/find_path/include/PrefixInPATH.h      |    0
 23 files changed, 93 insertions(+), 5 deletions(-)
 create mode 100644 Help/release/dev/find-command-prefix-from-PATH.rst
 copy Tests/RunCMake/{CMP0055 => find_file}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/find_file/PrefixInPATH-stdout.txt
 create mode 100644 Tests/RunCMake/find_file/PrefixInPATH.cmake
 create mode 100644 Tests/RunCMake/find_file/RunCMakeTest.cmake
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/find_file/include/PrefixInPATH.h (100%)
 create mode 100644 Tests/RunCMake/find_library/PrefixInPATH-stdout.txt
 create mode 100644 Tests/RunCMake/find_library/PrefixInPATH.cmake
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/find_library/lib/libPrefixInPATH.a (100%)
 copy Tests/RunCMake/{CMP0055 => find_path}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/find_path/PrefixInPATH-stdout.txt
 create mode 100644 Tests/RunCMake/find_path/PrefixInPATH.cmake
 create mode 100644 Tests/RunCMake/find_path/RunCMakeTest.cmake
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/find_path/include/PrefixInPATH.h (100%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 20 08:11:19 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Feb 2015 08:11:19 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-516-geebca92
Message-ID: <20150220131119.AA1A5512B@public.kitware.com>

This is an automated email from 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  eebca92b95939f95b7e07c55c28f628344430a69 (commit)
       via  c4c570f9cc7a7c5f22670793af887dfa5a6dd7de (commit)
       via  b7351d8e14ea7cc05b0c5d45dae48a21aef298c1 (commit)
       via  14713eebfb3152bb7b3591515da5780b4eec1dd3 (commit)
      from  cf4630995c56e8a82110c142e81c2f352575cabe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eebca92b95939f95b7e07c55c28f628344430a69
commit eebca92b95939f95b7e07c55c28f628344430a69
Merge: cf46309 c4c570f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 08:11:05 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 20 08:11:05 2015 -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 Feb 20 08:32:54 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Feb 2015 08:32:54 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-519-g4164c62
Message-ID: <20150220133254.70517AB06B@public.kitware.com>

This is an automated email from 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  4164c62dba16fc379e7a56e7a86c6ef21680144a (commit)
       via  a41d621d30f73d4a17e4fd2d3ff30f87f1ed4ccc (commit)
       via  a5768442636c7fe909e8afc205fd19ac13b9fbc2 (commit)
      from  eebca92b95939f95b7e07c55c28f628344430a69 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4164c62dba16fc379e7a56e7a86c6ef21680144a
commit 4164c62dba16fc379e7a56e7a86c6ef21680144a
Merge: eebca92 a41d621
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 08:32:53 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 20 08:32:53 2015 -0500

    Merge topic 'private-FindJsonCpp' into next
    
    a41d621d bootstrap: Add --(no-)system-jsoncpp options
    a5768442 FindJsonCpp: Drop new module due to upstream jsoncpp providing package


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a41d621d30f73d4a17e4fd2d3ff30f87f1ed4ccc
commit a41d621d30f73d4a17e4fd2d3ff30f87f1ed4ccc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 08:28:03 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 20 08:28:03 2015 -0500

    bootstrap: Add --(no-)system-jsoncpp options
    
    Provide bootstrap-time control for using a system JsonCpp library.

diff --git a/bootstrap b/bootstrap
index e7d0496..5f12ee0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -398,6 +398,8 @@ Configuration:
   --no-system-curl        use cmake-provided curl library (default)
   --system-expat          use system-installed expat library
   --no-system-expat       use cmake-provided expat library (default)
+  --system-jsoncpp        use system-installed jsoncpp library
+  --no-system-jsoncpp     use cmake-provided jsoncpp library (default)
   --system-zlib           use system-installed zlib library
   --no-system-zlib        use cmake-provided zlib library (default)
   --system-bzip2          use system-installed bzip2 library
@@ -637,10 +639,10 @@ while test $# != 0; do
   --init=*) cmake_init_file=`cmake_arg "$1"` ;;
   --system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=1" ;;
   --no-system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=0" ;;
-  --system-bzip2|--system-curl|--system-expat|--system-libarchive|--system-zlib)
+  --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-zlib)
     lib=`cmake_arg "$1" "--system-"`
     cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;;
-  --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-libarchive|--no-system-zlib)
+  --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-zlib)
     lib=`cmake_arg "$1" "--no-system-"`
     cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=0" ;;
   --qt-gui) cmake_bootstrap_qt_gui="1" ;;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5768442636c7fe909e8afc205fd19ac13b9fbc2
commit a5768442636c7fe909e8afc205fd19ac13b9fbc2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 08:15:43 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 20 08:22:02 2015 -0500

    FindJsonCpp: Drop new module due to upstream jsoncpp providing package
    
    Since jsoncpp 0.7.0 (2014-11-20) the upstream may provide a CMake
    package configuration file such that find_package(jsoncpp) will find a
    jsoncppConfig.cmake file.  In order to avoid conflicting with this
    (especially on case-insensitive filesystems), and since we always prefer
    projects to provide package config files (that they maintain), it is
    better to not provide FindJsonCpp publicly.
    
    Move FindJsonCpp into a private source directory that is not installed
    so that we can still use it for building CMake itself.
    
    Reported-by: Ryan Pavlik <ryan.pavlik at gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e61621d..1250a94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -382,10 +382,8 @@ macro (CMAKE_BUILD_UTILITIES)
   #---------------------------------------------------------------------
   # Build jsoncpp library.
   if(CMAKE_USE_SYSTEM_JSONCPP)
-    if(EXISTS ${CMAKE_ROOT}/Modules/FindJsonCpp.cmake)
-      find_package(JsonCpp)
-    elseif(NOT CMAKE_VERSION VERSION_LESS 3.0)
-      include(${CMake_SOURCE_DIR}/Modules/FindJsonCpp.cmake)
+    if(NOT CMAKE_VERSION VERSION_LESS 3.0)
+      include(${CMake_SOURCE_DIR}/Source/Modules/FindJsonCpp.cmake)
     else()
       message(FATAL_ERROR "CMAKE_USE_SYSTEM_JSONCPP requires CMake >= 3.0")
     endif()
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index db56010..965eede 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -126,7 +126,6 @@ All Modules
    /module/FindJava
    /module/FindJNI
    /module/FindJPEG
-   /module/FindJsonCpp
    /module/FindKDE3
    /module/FindKDE4
    /module/FindLAPACK
diff --git a/Help/module/FindJsonCpp.rst b/Help/module/FindJsonCpp.rst
deleted file mode 100644
index ba87ece..0000000
--- a/Help/module/FindJsonCpp.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. cmake-module:: ../../Modules/FindJsonCpp.cmake
diff --git a/Help/release/3.2.rst b/Help/release/3.2.rst
index ddc3d86..ef26dbe 100644
--- a/Help/release/3.2.rst
+++ b/Help/release/3.2.rst
@@ -124,9 +124,6 @@ Modules
 * A :module:`FindIntl` module was introduced to find the
   Gettext ``libintl`` library.
 
-* A :module:`FindJsonCpp` module was introduced to find the
-  JsonCpp package.
-
 * The :module:`FindLATEX` module learned to support components.
 
 * The :module:`FindMPI` module learned to find MS-MPI on Windows.
diff --git a/Modules/FindJsonCpp.cmake b/Source/Modules/FindJsonCpp.cmake
similarity index 97%
rename from Modules/FindJsonCpp.cmake
rename to Source/Modules/FindJsonCpp.cmake
index cbb4fb3..014d3bd 100644
--- a/Modules/FindJsonCpp.cmake
+++ b/Source/Modules/FindJsonCpp.cmake
@@ -93,7 +93,7 @@ unset(_JsonCpp_H_REGEX)
 unset(_JsonCpp_H)
 
 #-----------------------------------------------------------------------------
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../../Modules/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(JsonCpp
   FOUND_VAR JsonCpp_FOUND
   REQUIRED_VARS JsonCpp_LIBRARY JsonCpp_INCLUDE_DIR
diff --git a/Tests/FindJsonCpp/Test/CMakeLists.txt b/Tests/FindJsonCpp/Test/CMakeLists.txt
index 4e1e271..d1dc647 100644
--- a/Tests/FindJsonCpp/Test/CMakeLists.txt
+++ b/Tests/FindJsonCpp/Test/CMakeLists.txt
@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.1)
 project(TestFindJsonCpp CXX)
 include(CTest)
 
+# CMake does not actually provide FindJsonCpp publicly.
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../Source/Modules)
+
 find_package(JsonCpp REQUIRED)
 
 add_executable(test_jsoncpp_tgt main.cxx)

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

Summary of changes:
 CMakeLists.txt                                |    6 ++----
 Help/manual/cmake-modules.7.rst               |    1 -
 Help/module/FindJsonCpp.rst                   |    1 -
 Help/release/3.2.rst                          |    3 ---
 {Modules => Source/Modules}/FindJsonCpp.cmake |    2 +-
 Tests/FindJsonCpp/Test/CMakeLists.txt         |    3 +++
 bootstrap                                     |    6 ++++--
 7 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 Help/module/FindJsonCpp.rst
 rename {Modules => Source/Modules}/FindJsonCpp.cmake (97%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 20 08:42:30 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Feb 2015 08:42:30 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-521-g67e9bac
Message-ID: <20150220134230.28C9FA8325@public.kitware.com>

This is an automated email from 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  67e9bacb4351e7526808d055348fbc5a85269f32 (commit)
       via  b4005a3ad9af5283f40befe7382a95c27799a90a (commit)
      from  4164c62dba16fc379e7a56e7a86c6ef21680144a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67e9bacb4351e7526808d055348fbc5a85269f32
commit 67e9bacb4351e7526808d055348fbc5a85269f32
Merge: 4164c62 b4005a3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 08:42:29 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 20 08:42:29 2015 -0500

    Merge topic 'FindCurses-remove-unused-check' into next
    
    b4005a3a FindCurses: Drop unused check for cbreak in tinfo library


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4005a3ad9af5283f40befe7382a95c27799a90a
commit b4005a3ad9af5283f40befe7382a95c27799a90a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 08:39:30 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 20 08:41:36 2015 -0500

    FindCurses: Drop unused check for cbreak in tinfo library
    
    This check was first added by commit v3.0.0-rc5~6^2 (FindCurses: Detect
    and satisfy ncurses dependency on tinfo, 2014-01-17), but it is not
    correctly conditioned on existence of the tinfo library and fails if the
    code path is taken but tinfo is not found.  However, since commit
    v3.2.0-rc1~369^2 (FindCurses: Drop search for deprecated HP-UX cur_colr
    library, 2014-11-17) the result of the check is not used, so simply drop
    it.

diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake
index f94bd09..e236c24 100644
--- a/Modules/FindCurses.cmake
+++ b/Modules/FindCurses.cmake
@@ -128,8 +128,6 @@ if(CURSES_USE_NCURSES)
   if(NOT CURSES_NCURSES_HAS_CBREAK)
     find_library(CURSES_EXTRA_LIBRARY tinfo HINTS "${_cursesLibDir}")
     find_library(CURSES_EXTRA_LIBRARY tinfo )
-    CHECK_LIBRARY_EXISTS("${CURSES_EXTRA_LIBRARY}"
-      cbreak "" CURSES_TINFO_HAS_CBREAK)
   endif()
 else()
   get_filename_component(_cursesLibDir "${CURSES_CURSES_LIBRARY}" PATH)

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

Summary of changes:
 Modules/FindCurses.cmake |    2 --
 1 file changed, 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 20 09:46:26 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Feb 2015 09:46:26 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-530-g37e5398
Message-ID: <20150220144626.936CEAA023@public.kitware.com>

This is an automated email from 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  37e53989fc45ec2f99bc987332c013bc910d6fb4 (commit)
       via  0437cdd7f55c6db8df6192810be69a7b6da33206 (commit)
       via  2f903094f2ef23648b188c32e6af6a74d2210b5e (commit)
       via  4587e6413313372e2b79e5dcade31d31fdd99caa (commit)
       via  1c3cb358eb55f4f79ca1c643e06c0f8d0f88131c (commit)
       via  a1060e121ff3ffb6d6b3a0507e4ae95bcb8a198e (commit)
       via  73f154f9c60569bbdd8099dd258196dec16e50a1 (commit)
       via  faebec04a26a9cf9593edd5a18211d589e476d11 (commit)
       via  03a77924ce27480e0590a1fd18c3f0d85f21eeaf (commit)
      from  67e9bacb4351e7526808d055348fbc5a85269f32 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37e53989fc45ec2f99bc987332c013bc910d6fb4
commit 37e53989fc45ec2f99bc987332c013bc910d6fb4
Merge: 67e9bac 0437cdd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 09:46:24 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 20 09:46:24 2015 -0500

    Merge topic 'ctest-output-options' into next
    
    0437cdd7 Tests: Drop unnecessary stderr matching from RunCMake.ctest_memcheck
    2f903094 Tests: Teach RunCMake to tolerate 'Error kstat returned' lines in test output
    4587e641 Tests: Teach RunCMake to tolerate Guard Malloc lines in test output
    1c3cb358 Tests: Teach RunCMake to tolerate BullseyeCoverage lines in test output
    a1060e12 Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases
    73f154f9 Tests/RunCMake/ctest_submit: Match more error message combinations
    faebec04 Tests/RunCMake/ctest_start: Drop unnecessary stderr expectation file
    03a77924 Revert "don't check stderr for ctest_*(QUIET) tests"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0437cdd7f55c6db8df6192810be69a7b6da33206
commit 0437cdd7f55c6db8df6192810be69a7b6da33206
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 09:16:41 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 20 09:42:07 2015 -0500

    Tests: Drop unnecessary stderr matching from RunCMake.ctest_memcheck
    
    The Dummy*-stderr.txt files were needed only to match platform-specific
    memcheck tooling output and verify that stderr is otherwise empty.  Now
    that the RunCMake infrastructure knows how to strip such lines before
    matching, we can simply drop these files and use the default empty
    string match.

diff --git a/Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt
deleted file mode 100644
index 14bc228..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^((^|
-)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
-]*)*$
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt
deleted file mode 100644
index 14bc228..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^((^|
-)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
-]*)*$
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt
deleted file mode 100644
index 14bc228..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^((^|
-)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
-]*)*$
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt
deleted file mode 100644
index 14bc228..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^((^|
-)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
-]*)*$
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt
deleted file mode 100644
index 14bc228..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^((^|
-)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
-]*)*$

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f903094f2ef23648b188c32e6af6a74d2210b5e
commit 2f903094f2ef23648b188c32e6af6a74d2210b5e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 09:12:47 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 20 09:42:07 2015 -0500

    Tests: Teach RunCMake to tolerate 'Error kstat returned' lines in test output
    
    When RunCMake tests run on Solaris, the output may contain unexpected
    lines of the form "Error kstat returned...".  These lines are printed by
    SystemInformationImplementation::RunProcess when called from
    SystemInformationImplementation::ParseValueFromKStat (see issue #12066).
    Until someone investigates why kstat returns values outside the range it
    documents, simply remove such lines from the actual output before
    matching it against the expected output.

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 873eb30..e47417e 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -83,7 +83,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:)[^\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]*\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})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4587e6413313372e2b79e5dcade31d31fdd99caa
commit 4587e6413313372e2b79e5dcade31d31fdd99caa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 09:05:22 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 20 09:42:07 2015 -0500

    Tests: Teach RunCMake to tolerate Guard Malloc lines in test output
    
    When RunCMake tests run under Xcode Guard Malloc, Guard Malloc may add
    lines of the form "<tool>(<pid>) malloc:..." to the output.  Remove such
    lines from the actual output before matching it against the expected
    output.

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index ffa1e2b..873eb30 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -83,7 +83,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)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}")
+    string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\([0-9]+\) malloc:)[^\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})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c3cb358eb55f4f79ca1c643e06c0f8d0f88131c
commit 1c3cb358eb55f4f79ca1c643e06c0f8d0f88131c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 09:02:21 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 20 09:42:07 2015 -0500

    Tests: Teach RunCMake to tolerate BullseyeCoverage lines in test output
    
    When RunCMake tests run under dynamic analysis, Bullseye may add lines
    of the form "BullseyeCoverage..." to the output.  Remove such lines from the
    actual output before matching it against the expected output.

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 6389ef4..ffa1e2b 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -83,7 +83,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]+==[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}")
+    string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage)[^\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})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1060e121ff3ffb6d6b3a0507e4ae95bcb8a198e
commit a1060e121ff3ffb6d6b3a0507e4ae95bcb8a198e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 08:54:45 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 20 09:42:06 2015 -0500

    Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases
    
    Port the regex over from the CTestTestFailedSubmit-http[s] tests.

diff --git a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
index c1a9126..9a32d9e 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
@@ -1,3 +1,3 @@
-Error message was: .*
+Error message was: [Cc]ould *n.t resolve host '?-no-site-'?
    Problems when submitting via HTTP
 Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-http/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
index 11db01a..0f49c04 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
@@ -1,3 +1,3 @@
-Error message was: .*
+Error message was: ([Cc]ould *n.t resolve host '?-no-site-'?|Protocol "https" not supported or disabled in .*|.* was built with SSL disabled.*)
    Problems when submitting via HTTP
 Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-https/test.cmake

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73f154f9c60569bbdd8099dd258196dec16e50a1
commit 73f154f9c60569bbdd8099dd258196dec16e50a1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 08:53:23 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 20 08:53:23 2015 -0500

    Tests/RunCMake/ctest_submit: Match more error message combinations

diff --git a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
index 34891a1..182bd10 100644
--- a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
@@ -1,4 +1,4 @@
  *Error when uploading file: .*/Configure.xml
- *Error message was: Couldn't resolve host '-no-site-'
+ *Error message was: [Cc]ould *n.t resolve host '?-no-site-'?
  *Problems when submitting via HTTP
  *Error in read script: .*/Tests/RunCMake/ctest_submit/CDashSubmitQuiet/test.cmake

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=faebec04a26a9cf9593edd5a18211d589e476d11
commit faebec04a26a9cf9593edd5a18211d589e476d11
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 08:46:25 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 20 08:46:25 2015 -0500

    Tests/RunCMake/ctest_start: Drop unnecessary stderr expectation file
    
    The RunCMake infrastructure defaults to "^$" for stderr.

diff --git a/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt b/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03a77924ce27480e0590a1fd18c3f0d85f21eeaf
commit 03a77924ce27480e0590a1fd18c3f0d85f21eeaf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 08:44:04 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 20 08:44:04 2015 -0500

    Revert "don't check stderr for ctest_*(QUIET) tests"
    
    This reverts commit 73ff7bf44c042a9da9b5f3ec987131febf97d609.
    We really want to check both.  The test failures due to output
    on stderr on some platforms need to be addressed directly.

diff --git a/Tests/RunCMake/ctest_build/BuildQuiet-stderr.txt b/Tests/RunCMake/ctest_build/BuildQuiet-stderr.txt
deleted file mode 100644
index 8d98f9d..0000000
--- a/Tests/RunCMake/ctest_build/BuildQuiet-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-.*
diff --git a/Tests/RunCMake/ctest_configure/ConfigureQuiet-stderr.txt b/Tests/RunCMake/ctest_configure/ConfigureQuiet-stderr.txt
deleted file mode 100644
index 8d98f9d..0000000
--- a/Tests/RunCMake/ctest_configure/ConfigureQuiet-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-.*
diff --git a/Tests/RunCMake/ctest_coverage/CoverageQuiet-stderr.txt b/Tests/RunCMake/ctest_coverage/CoverageQuiet-stderr.txt
deleted file mode 100644
index 8d98f9d..0000000
--- a/Tests/RunCMake/ctest_coverage/CoverageQuiet-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-.*
diff --git a/Tests/RunCMake/ctest_memcheck/DummyQuiet-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyQuiet-stderr.txt
deleted file mode 100644
index 8d98f9d..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyQuiet-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-.*
diff --git a/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt b/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
index 8d98f9d..10f3293 100644
--- a/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
+++ b/Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
@@ -1 +1 @@
-.*
+^$
diff --git a/Tests/RunCMake/ctest_test/TestQuiet-stderr.txt b/Tests/RunCMake/ctest_test/TestQuiet-stderr.txt
deleted file mode 100644
index 8d98f9d..0000000
--- a/Tests/RunCMake/ctest_test/TestQuiet-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-.*
diff --git a/Tests/RunCMake/ctest_upload/UploadQuiet-stderr.txt b/Tests/RunCMake/ctest_upload/UploadQuiet-stderr.txt
deleted file mode 100644
index 8d98f9d..0000000
--- a/Tests/RunCMake/ctest_upload/UploadQuiet-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-.*

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

Summary of changes:
 Tests/RunCMake/RunCMake.cmake                                       |    2 +-
 Tests/RunCMake/ctest_build/BuildQuiet-stderr.txt                    |    1 -
 Tests/RunCMake/ctest_configure/ConfigureQuiet-stderr.txt            |    1 -
 Tests/RunCMake/ctest_coverage/CoverageQuiet-stderr.txt              |    1 -
 Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt                |    3 ---
 Tests/RunCMake/ctest_memcheck/DummyQuiet-stderr.txt                 |    1 -
 Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt              |    3 ---
 .../RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt  |    3 ---
 Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt       |    3 ---
 Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt    |    3 ---
 Tests/RunCMake/ctest_start/StartQuiet-stderr.txt                    |    1 -
 Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt             |    2 +-
 Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt                |    2 +-
 Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt               |    2 +-
 Tests/RunCMake/ctest_test/TestQuiet-stderr.txt                      |    1 -
 Tests/RunCMake/ctest_upload/UploadQuiet-stderr.txt                  |    1 -
 16 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 Tests/RunCMake/ctest_build/BuildQuiet-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_configure/ConfigureQuiet-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_coverage/CoverageQuiet-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyQuiet-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_start/StartQuiet-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_test/TestQuiet-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_upload/UploadQuiet-stderr.txt


hooks/post-receive
-- 
CMake

From clinton at elemtech.com  Fri Feb 20 10:19:19 2015
From: clinton at elemtech.com (Clinton Stimpson)
Date: Fri, 20 Feb 2015 10:19:19 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-532-geb52b44
Message-ID: <20150220151919.F2463AAE66@public.kitware.com>

This is an automated email from 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  eb52b449c2006892e5d13a035ea3c9d31b1a602c (commit)
       via  7b582d15ff4d70e77287eaf5abb4ea240eb26da6 (commit)
      from  37e53989fc45ec2f99bc987332c013bc910d6fb4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb52b449c2006892e5d13a035ea3c9d31b1a602c
commit eb52b449c2006892e5d13a035ea3c9d31b1a602c
Merge: 37e5398 7b582d1
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Feb 20 10:19:19 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 20 10:19:19 2015 -0500

    Merge topic 'cpack-bundle-codesign-output' into next
    
    7b582d15 CPack: Print output from codesign if signing fails


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b582d15ff4d70e77287eaf5abb4ea240eb26da6
commit 7b582d15ff4d70e77287eaf5abb4ea240eb26da6
Author:     Andr? Klitzing <aklitzing at gmail.com>
AuthorDate: Fri Feb 20 10:45:14 2015 +0100
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Fri Feb 20 08:17:53 2015 -0700

    CPack: Print output from codesign if signing fails

diff --git a/Source/CPack/cmCPackBundleGenerator.cxx b/Source/CPack/cmCPackBundleGenerator.cxx
index e751568..6e7a26b 100644
--- a/Source/CPack/cmCPackBundleGenerator.cxx
+++ b/Source/CPack/cmCPackBundleGenerator.cxx
@@ -214,6 +214,7 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
   // codesign the application.
   if(!cpack_apple_cert_app.empty())
     {
+    std::string output;
     std::string bundle_path;
     bundle_path = src_dir + "/";
     bundle_path += this->GetOption("CPACK_BUNDLE_NAME");
@@ -240,11 +241,11 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
       temp_sign_file_cmd << bundle_path;
       temp_sign_file_cmd << it->c_str() << "\"";
 
-      if(!this->RunCommand(temp_sign_file_cmd))
+      if(!this->RunCommand(temp_sign_file_cmd, &output))
         {
         cmCPackLogger(cmCPackLog::LOG_ERROR,
           "Error signing file:"
-          << bundle_path << it->c_str() << std::endl);
+          << bundle_path << it->c_str() << std::endl << output << std::endl);
 
         return 0;
         }
@@ -256,11 +257,11 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
     temp_sign_binary_cmd << " --deep -f -s \"" << cpack_apple_cert_app;
     temp_sign_binary_cmd << "\" \"" << bundle_path << "\"";
 
-    if(!this->RunCommand(temp_sign_binary_cmd))
+    if(!this->RunCommand(temp_sign_binary_cmd, &output))
       {
       cmCPackLogger(cmCPackLog::LOG_ERROR,
         "Error signing the application binary."
-        << std::endl);
+        << std::endl << output << std::endl);
 
       return 0;
       }
@@ -276,11 +277,11 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
       }
     temp_codesign_cmd << " \"" << bundle_path << "\"";
 
-    if(!this->RunCommand(temp_codesign_cmd))
+    if(!this->RunCommand(temp_codesign_cmd, &output))
       {
       cmCPackLogger(cmCPackLog::LOG_ERROR,
         "Error signing the application package."
-        << std::endl);
+        << std::endl << output << std::endl);
 
       return 0;
       }

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

Summary of changes:
 Source/CPack/cmCPackBundleGenerator.cxx |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 20 10:55:30 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Feb 2015 10:55:30 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-207-g2448673
Message-ID: <20150220155530.4EDEEAA9C6@public.kitware.com>

This is an automated email from 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  244867369bcded571a9fe0b06ef2998a5728e368 (commit)
       via  20f64bd2dadbfe740e76d627523adf2161a515f3 (commit)
      from  c4c570f9cc7a7c5f22670793af887dfa5a6dd7de (commit)

Those revisions listed 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 Feb 20 10:55:30 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Feb 2015 10:55:30 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-535-g3646f09
Message-ID: <20150220155530.70CD6AA9C7@public.kitware.com>

This is an automated email from 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  3646f09c7144daafc0d75e96d35031b959b29300 (commit)
       via  244867369bcded571a9fe0b06ef2998a5728e368 (commit)
       via  20f64bd2dadbfe740e76d627523adf2161a515f3 (commit)
      from  eb52b449c2006892e5d13a035ea3c9d31b1a602c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3646f09c7144daafc0d75e96d35031b959b29300
commit 3646f09c7144daafc0d75e96d35031b959b29300
Merge: eb52b44 2448673
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 10:55:02 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 20 10:55:02 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 20 10:55:30 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Feb 2015 10:55:30 -0500 (EST)
Subject: [Cmake-commits] CMake branch, release,
	updated. v3.2.0-rc1-10-g20f64bd
Message-ID: <20150220155530.8841DAA9C8@public.kitware.com>

This is an automated email from 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  20f64bd2dadbfe740e76d627523adf2161a515f3 (commit)
       via  1ade687d8dbe2952bc12dabeaaaaf0abec5b98cf (commit)
      from  05e4fc6b2a664dee4229742577cf4d065ecec713 (commit)

Those revisions listed 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/QtDialog/QCMake.cxx |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 20 11:35:54 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 20 Feb 2015 11:35:54 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-537-ge69434f
Message-ID: <20150220163554.A5BCBAB155@public.kitware.com>

This is an automated email from 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  e69434fa257c42e39b96101c37c39e9178369573 (commit)
       via  e1da4dc2dd55926c9d7140f830a5338512279b3f (commit)
      from  3646f09c7144daafc0d75e96d35031b959b29300 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e69434fa257c42e39b96101c37c39e9178369573
commit e69434fa257c42e39b96101c37c39e9178369573
Merge: 3646f09 e1da4dc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 11:35:54 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 20 11:35:54 2015 -0500

    Merge topic 'CheckStructHasMember-fix-null-deref-warning' into next
    
    e1da4dc2 CheckStructHasMember: fix null deref warning (#15413)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1da4dc2dd55926c9d7140f830a5338512279b3f
commit e1da4dc2dd55926c9d7140f830a5338512279b3f
Author:     Peter Wu <peter at lekensteyn.nl>
AuthorDate: Mon Feb 16 00:22:10 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 20 11:21:43 2015 -0500

    CheckStructHasMember: fix null deref warning (#15413)
    
    Clang Static Analyzer is so smart that it reports a defect when this
    intended null-deref is encountered.  Use sizeof instead which has no
    runtime effects.

diff --git a/Modules/CheckStructHasMember.cmake b/Modules/CheckStructHasMember.cmake
index de31d2c..6c15205 100644
--- a/Modules/CheckStructHasMember.cmake
+++ b/Modules/CheckStructHasMember.cmake
@@ -69,7 +69,7 @@ macro (CHECK_STRUCT_HAS_MEMBER _STRUCT _MEMBER _HEADER _RESULT)
 ${_INCLUDE_FILES}
 int main()
 {
-   (void)((${_STRUCT} *)0)->${_MEMBER};
+   (void)sizeof(((${_STRUCT} *)0)->${_MEMBER});
    return 0;
 }
 ")

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

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


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Fri Feb 20 14:53:24 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Fri, 20 Feb 2015 14:53:24 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-539-g61f41f3
Message-ID: <20150220195325.01C52AAAE2@public.kitware.com>

This is an automated email from 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  61f41f354b513b64040401a201fdeb834b38aa6e (commit)
       via  3764e447b0a3ad2fcb441ea4cd4cb7b7e0ad0091 (commit)
      from  e69434fa257c42e39b96101c37c39e9178369573 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61f41f354b513b64040401a201fdeb834b38aa6e
commit 61f41f354b513b64040401a201fdeb834b38aa6e
Merge: e69434f 3764e44
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 14:53:24 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 20 14:53:24 2015 -0500

    Merge topic 'use-algorithms' into next
    
    3764e447 Fix order of execution problems and whitespace.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3764e447b0a3ad2fcb441ea4cd4cb7b7e0ad0091
commit 3764e447b0a3ad2fcb441ea4cd4cb7b7e0ad0091
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 13:40:56 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 20:52:52 2015 +0100

    Fix order of execution problems and whitespace.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 05cdfeb..eb49041 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -282,10 +282,10 @@ template<typename Range>
 std::string cmWrap(std::string prefix, Range const& r, std::string suffix,
                    std::string sep)
 {
-   if (r.empty())
-     {
-     return std::string();
-     }
+  if (r.empty())
+    {
+    return std::string();
+    }
   return prefix + cmJoin(r, (suffix + sep + prefix).c_str()) + suffix;
 }
 
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 391a965..432cb3a 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1325,7 +1325,7 @@ cmLocalUnixMakefileGenerator3
                       this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
     fout << "\n"
          << "# Per-language clean rules from dependency scanning.\n"
-         << "foreach(lang" << cmJoin(languages, " ") << ")\n"
+         << "foreach(lang " << cmJoin(languages, " ") << ")\n"
          << "  include(" << this->GetTargetDirectory(target)
          << "/cmake_clean_${lang}.cmake OPTIONAL)\n"
          << "endforeach()\n";
diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index b7330ce..cb61ed9 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -491,7 +491,9 @@ void cmRST::UnindentLines(std::vector<std::string>& lines)
   size_t trailingEmpty = std::distance(rit,
                             cmFindNot(cmReverseRange(lines), std::string()));
 
-  lines.erase(cmRotate(lines.begin(),
-              lines.begin() + leadingEmpty,
-              lines.end() - trailingEmpty), lines.end());
+  std::vector<std::string>::iterator contentEnd
+      = cmRotate(lines.begin(),
+                 lines.begin() + leadingEmpty,
+                 lines.end() - trailingEmpty);
+  lines.erase(contentEnd, lines.end());
 }
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 7673554..ebcd810 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1542,8 +1542,9 @@ void cmTarget::DeleteDependencyForVS6( DependencyMap& depMap,
   if( map_itr != depMap.end() )
     {
     DependencyList& depList = map_itr->second;
-    depList.erase(std::remove(depList.begin(), depList.end(), dep),
-                  depList.end());
+    DependencyList::iterator begin =
+        std::remove(depList.begin(), depList.end(), dep);
+    depList.erase(begin, depList.end());
     }
 }
 

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

Summary of changes:
 Source/cmAlgorithms.h                    |    8 ++++----
 Source/cmLocalUnixMakefileGenerator3.cxx |    2 +-
 Source/cmRST.cxx                         |    8 +++++---
 Source/cmTarget.cxx                      |    5 +++--
 4 files changed, 13 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Fri Feb 20 15:24:03 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Fri, 20 Feb 2015 15:24:03 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-541-gfc716a5
Message-ID: <20150220202403.98A24AAF1B@public.kitware.com>

This is an automated email from 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  fc716a5e14862935267dc71d70956a44a6954e1a (commit)
       via  deb1a0f889f464270843f9784ff2d31318b6c5c1 (commit)
      from  61f41f354b513b64040401a201fdeb834b38aa6e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc716a5e14862935267dc71d70956a44a6954e1a
commit fc716a5e14862935267dc71d70956a44a6954e1a
Merge: 61f41f3 deb1a0f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 15:24:02 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 20 15:24:02 2015 -0500

    Merge topic 'use-algorithms' into next
    
    deb1a0f8 Overload cmWrap.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=deb1a0f889f464270843f9784ff2d31318b6c5c1
commit deb1a0f889f464270843f9784ff2d31318b6c5c1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 21:06:44 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 21:16:52 2015 +0100

    Overload cmWrap.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index eb49041..8e642ee 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -289,6 +289,12 @@ std::string cmWrap(std::string prefix, Range const& r, std::string suffix,
   return prefix + cmJoin(r, (suffix + sep + prefix).c_str()) + suffix;
 }
 
+template<typename Range>
+std::string cmWrap(char prefix, Range const& r, char suffix, std::string sep)
+{
+  return cmWrap(std::string(1, prefix), r, std::string(1, suffix), sep);
+}
+
 
 template<typename Range, typename T>
 typename Range::const_iterator cmFindNot(Range const& r, T const& t)
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3baffd3..6147009 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2295,15 +2295,8 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
       std::ostringstream ostr;
       if (!componentsSet->empty())
         {
-        ostr << "Available install components are:";
-        std::set<std::string>::iterator it;
-        for (
-          it = componentsSet->begin();
-          it != componentsSet->end();
-          ++ it )
-          {
-          ostr << " \"" << *it << "\"";
-          }
+        ostr << "Available install components are: ";
+        ostr << cmWrap('"', *componentsSet, '"', " ");
         }
       else
         {
@@ -3043,7 +3036,7 @@ void cmGlobalGenerator::ProcessEvaluationFiles()
     if (!intersection.empty())
       {
       cmSystemTools::Error("Files to be generated by multiple different "
-        "commands: ", cmWrap("\"", intersection, "\"", " ").c_str());
+        "commands: ", cmWrap('"', intersection, '"', " ").c_str());
       return;
       }
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 813e97d..3c92fca 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -213,7 +213,7 @@ cmMakefile::~cmMakefile()
 void cmMakefile::PrintStringVector(const char* s,
                                    const std::vector<std::string>& v) const
 {
-  std::cout << s << ": ( \n" << cmWrap("\"", v, "\"", " ") << ")\n";
+  std::cout << s << ": ( \n" << cmWrap('"', v, '"', " ") << ")\n";
 }
 
 void cmMakefile
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index bc5be33..5264123 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -835,7 +835,7 @@ cmSystemTools::PrintSingleCommand(std::vector<std::string> const& command)
     return std::string();
     }
 
-  return cmWrap("\"", command, "\"", " ");
+  return cmWrap('"', command, '"', " ");
 }
 
 bool cmSystemTools::DoesFileExistWithExtensions(
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 37f9a8f..7d67bd8 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -450,7 +450,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
         return 1;
         }
 
-      std::string command = cmWrap("\"", cmRange(args).advance(3), "\"", " ");
+      std::string command = cmWrap('"', cmRange(args).advance(3), '"', " ");
       int retval = 0;
       int timeout = 0;
       if ( cmSystemTools::RunSingleCommand(command.c_str(), 0, &retval,

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

Summary of changes:
 Source/cmAlgorithms.h        |    6 ++++++
 Source/cmGlobalGenerator.cxx |   13 +++----------
 Source/cmMakefile.cxx        |    2 +-
 Source/cmSystemTools.cxx     |    2 +-
 Source/cmcmd.cxx             |    2 +-
 5 files changed, 12 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Fri Feb 20 15:29:24 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Fri, 20 Feb 2015 15:29:24 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-543-g5195e57
Message-ID: <20150220202924.29F10AAFB9@public.kitware.com>

This is an automated email from 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  5195e57aaa313fe3d9f14143a6f212cdaea81ccd (commit)
       via  0d9da559ba10e1a8b0a035e8846bd283a26a6b88 (commit)
      from  fc716a5e14862935267dc71d70956a44a6954e1a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5195e57aaa313fe3d9f14143a6f212cdaea81ccd
commit 5195e57aaa313fe3d9f14143a6f212cdaea81ccd
Merge: fc716a5 0d9da55
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 15:29:23 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 20 15:29:23 2015 -0500

    Merge topic 'use-algorithms' into next
    
    0d9da559 Remove whitespace.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d9da559ba10e1a8b0a035e8846bd283a26a6b88
commit 0d9da559ba10e1a8b0a035e8846bd283a26a6b88
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 21:28:57 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 21:28:57 2015 +0100

    Remove whitespace.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 8e642ee..b9bd67b 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -295,7 +295,6 @@ std::string cmWrap(char prefix, Range const& r, char suffix, std::string sep)
   return cmWrap(std::string(1, prefix), r, std::string(1, suffix), sep);
 }
 
-
 template<typename Range, typename T>
 typename Range::const_iterator cmFindNot(Range const& r, T const& t)
 {

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

Summary of changes:
 Source/cmAlgorithms.h |    1 -
 1 file changed, 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Fri Feb 20 15:39:43 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Fri, 20 Feb 2015 15:39:43 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-559-g051a565
Message-ID: <20150220203943.F0F77226E@public.kitware.com>

This is an automated email from 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  051a565a7adf3c5a7e0dc02306a0f5368a74e212 (commit)
       via  bb9d71b4fee2cc4abf55e0dcbadf85c6cbe0d07d (commit)
       via  4afe6c26c66556827e6089982c49b8dea3a2efcb (commit)
       via  a3a0a8c222b59f15502f52192bf41c4af2882392 (commit)
       via  8c74a41ff3b6fce1bb7d088d16f5e0a9ae8ab55d (commit)
       via  61fe1919de8c0455a6baff543ccfcb35fce8f37b (commit)
       via  09d6125bfe4034f332956f4bcc5b0a1ba0b82e27 (commit)
       via  8ed6ecac3fb0f832333e2d5d6f3551ab8e335d0f (commit)
       via  dfe49c205654a51f860507ea5d8ad133b2a4f064 (commit)
       via  21b0654ace2ce58d191c2e42a8583b05614cd037 (commit)
       via  416df93aa93d0a633f0e7354d0562934f676768b (commit)
       via  37b88d348a20921c835ce7aa99f6db62271503a7 (commit)
       via  a281809384cc19cc9a7d1726b243020b380b9395 (commit)
       via  76207b0861478318115d65c2e983f4d88c937724 (commit)
       via  60c3bb73e39f7b19a17c989a0f9bf70bbfe73683 (commit)
       via  05fec779d33b872721b9731e872125ebeb89403b (commit)
      from  5195e57aaa313fe3d9f14143a6f212cdaea81ccd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=051a565a7adf3c5a7e0dc02306a0f5368a74e212
commit 051a565a7adf3c5a7e0dc02306a0f5368a74e212
Merge: 5195e57 bb9d71b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 15:39:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 20 15:39:42 2015 -0500

    Merge topic 'use-algorithms' into next
    
    bb9d71b4 Replace loops with algorithms.
    4afe6c26 cmAlgorithms: Add cmReverseRange adaptor.
    a3a0a8c2 cmAlgorithms: Add cmFindNot algorithm.
    8c74a41f cmRST: Replace two erase with a rotate and larger erase.
    61fe1919 cmAlgorithms: Update concept requirement to FowardIterator
    09d6125b cmAlgorithms: Move cmRotate out of 'implementation detail' namespace.
    8ed6ecac cmRST: Move two algorithms beside each other.
    dfe49c20 cmRST: Use std::min where appropriate.
    21b0654a cmGlobalGenerator: Convert set insert algorithm to vector algorithms.
    416df93a Convert some raw loops to cmWrap.
    37b88d34 cmAlgorithms: Add cmWrap.
    a2818093 Use cmJoin where possible.
    76207b08 cmCacheManager: Replace loop with algorithm.
    60c3bb73 cmGlobalGenerator: Replace loop with algorithm.
    05fec779 cmTarget: Port loop to algorithm.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb9d71b4fee2cc4abf55e0dcbadf85c6cbe0d07d
commit bb9d71b4fee2cc4abf55e0dcbadf85c6cbe0d07d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 2 02:13:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 21:36:58 2015 +0100

    Replace loops with algorithms.

diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index c261d57..cb61ed9 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -484,19 +484,12 @@ void cmRST::UnindentLines(std::vector<std::string>& lines)
       }
     }
 
-  // Drop leading blank lines.
-  size_t leadingEmpty = 0;
-  for(size_t i = 0; i < lines.size() && lines[i].empty(); ++i)
-    {
-    ++leadingEmpty;
-    }
+  std::vector<std::string>::const_iterator it = lines.begin();
+  size_t leadingEmpty = std::distance(it, cmFindNot(lines, std::string()));
 
-  // Drop trailing blank lines.
-  size_t trailingEmpty = 0;
-  for(size_t i = lines.size(); i > 0 && lines[i-1].empty(); --i)
-    {
-    ++trailingEmpty;
-    }
+  std::vector<std::string>::const_reverse_iterator rit = lines.rbegin();
+  size_t trailingEmpty = std::distance(rit,
+                            cmFindNot(cmReverseRange(lines), std::string()));
 
   std::vector<std::string>::iterator contentEnd
       = cmRotate(lines.begin(),

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4afe6c26c66556827e6089982c49b8dea3a2efcb
commit 4afe6c26c66556827e6089982c49b8dea3a2efcb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 22:04:25 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 21:36:58 2015 +0100

    cmAlgorithms: Add cmReverseRange adaptor.
    
    Use it to implement list(REVERSE).

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index d88de1e..b9bd67b 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -302,4 +302,12 @@ typename Range::const_iterator cmFindNot(Range const& r, T const& t)
                       std::bind1st(std::not_equal_to<T>(), t));
 }
 
+template<typename Range>
+ContainerAlgorithms::Range<typename Range::const_reverse_iterator>
+cmReverseRange(Range const& range)
+{
+  return ContainerAlgorithms::Range<typename Range::const_reverse_iterator>(
+      range.rbegin(), range.rend());
+}
+
 #endif
diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 0c6adfd..17617aa 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -390,8 +390,7 @@ bool cmListCommand
     return false;
     }
 
-  std::reverse(varArgsExpanded.begin(), varArgsExpanded.end());
-  std::string value = cmJoin(varArgsExpanded, ";");
+  std::string value = cmJoin(cmReverseRange(varArgsExpanded), ";");
 
   this->Makefile->AddDefinition(listName, value.c_str());
   return true;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3a0a8c222b59f15502f52192bf41c4af2882392
commit a3a0a8c222b59f15502f52192bf41c4af2882392
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 23:53:41 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 21:36:58 2015 +0100

    cmAlgorithms: Add cmFindNot algorithm.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 53e2dc8..d88de1e 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -295,4 +295,11 @@ std::string cmWrap(char prefix, Range const& r, char suffix, std::string sep)
   return cmWrap(std::string(1, prefix), r, std::string(1, suffix), sep);
 }
 
+template<typename Range, typename T>
+typename Range::const_iterator cmFindNot(Range const& r, T const& t)
+{
+  return std::find_if(r.begin(), r.end(),
+                      std::bind1st(std::not_equal_to<T>(), t));
+}
+
 #endif

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c74a41ff3b6fce1bb7d088d16f5e0a9ae8ab55d
commit 8c74a41ff3b6fce1bb7d088d16f5e0a9ae8ab55d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 30 00:03:24 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 21:36:58 2015 +0100

    cmRST: Replace two erase with a rotate and larger erase.

diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index 14e8ad9..c261d57 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -497,6 +497,10 @@ void cmRST::UnindentLines(std::vector<std::string>& lines)
     {
     ++trailingEmpty;
     }
-  lines.erase(lines.begin(), lines.begin()+leadingEmpty);
-  lines.erase(lines.end()-trailingEmpty, lines.end());
+
+  std::vector<std::string>::iterator contentEnd
+      = cmRotate(lines.begin(),
+                 lines.begin() + leadingEmpty,
+                 lines.end() - trailingEmpty);
+  lines.erase(contentEnd, lines.end());
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61fe1919de8c0455a6baff543ccfcb35fce8f37b
commit 61fe1919de8c0455a6baff543ccfcb35fce8f37b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 21:59:26 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 21:36:58 2015 +0100

    cmAlgorithms: Update concept requirement to FowardIterator

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 30a062a..53e2dc8 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -81,14 +81,14 @@ private:
   const std::string m_test;
 };
 
-template<typename BiDirIt>
-BiDirIt cmRotate(BiDirIt first, BiDirIt middle, BiDirIt last)
+template<typename FwdIt>
+FwdIt cmRotate(FwdIt first, FwdIt middle, FwdIt last)
 {
-  typename std::iterator_traits<BiDirIt>::difference_type dist =
-      std::distance(first, middle);
+  typename std::iterator_traits<FwdIt>::difference_type dist =
+      std::distance(middle, last);
   std::rotate(first, middle, last);
-  std::advance(last, -dist);
-  return last;
+  std::advance(first, dist);
+  return first;
 }
 
 namespace ContainerAlgorithms {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09d6125bfe4034f332956f4bcc5b0a1ba0b82e27
commit 09d6125bfe4034f332956f4bcc5b0a1ba0b82e27
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 23:39:38 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 21:36:58 2015 +0100

    cmAlgorithms: Move cmRotate out of 'implementation detail' namespace.
    
    This should be generally usable in cmake.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 43e113b..30a062a 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -81,6 +81,16 @@ private:
   const std::string m_test;
 };
 
+template<typename BiDirIt>
+BiDirIt cmRotate(BiDirIt first, BiDirIt middle, BiDirIt last)
+{
+  typename std::iterator_traits<BiDirIt>::difference_type dist =
+      std::distance(first, middle);
+  std::rotate(first, middle, last);
+  std::advance(last, -dist);
+  return last;
+}
+
 namespace ContainerAlgorithms {
 
 template<typename T>
@@ -138,20 +148,10 @@ private:
   const_iterator End;
 };
 
-template<typename BiDirIt>
-BiDirIt Rotate(BiDirIt first, BiDirIt middle, BiDirIt last)
-{
-  typename std::iterator_traits<BiDirIt>::difference_type dist =
-      std::distance(first, middle);
-  std::rotate(first, middle, last);
-  std::advance(last, -dist);
-  return last;
-}
-
 template<typename Iter>
 Iter RemoveN(Iter i1, Iter i2, size_t n)
 {
-  return ContainerAlgorithms::Rotate(i1, i1 + n, i2);
+  return cmRotate(i1, i1 + n, i2);
 }
 
 template<typename Range>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ed6ecac3fb0f832333e2d5d6f3551ab8e335d0f
commit 8ed6ecac3fb0f832333e2d5d6f3551ab8e335d0f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 30 00:01:06 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 21:36:58 2015 +0100

    cmRST: Move two algorithms beside each other.

diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index da72ab7..14e8ad9 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -490,7 +490,6 @@ void cmRST::UnindentLines(std::vector<std::string>& lines)
     {
     ++leadingEmpty;
     }
-  lines.erase(lines.begin(), lines.begin()+leadingEmpty);
 
   // Drop trailing blank lines.
   size_t trailingEmpty = 0;
@@ -498,5 +497,6 @@ void cmRST::UnindentLines(std::vector<std::string>& lines)
     {
     ++trailingEmpty;
     }
+  lines.erase(lines.begin(), lines.begin()+leadingEmpty);
   lines.erase(lines.end()-trailingEmpty, lines.end());
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dfe49c205654a51f860507ea5d8ad133b2a4f064
commit dfe49c205654a51f860507ea5d8ad133b2a4f064
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 23:43:55 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 21:36:58 2015 +0100

    cmRST: Use std::min where appropriate.

diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index d20d999..da72ab7 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -463,10 +463,7 @@ void cmRST::UnindentLines(std::vector<std::string>& lines)
       }
 
     // Truncate indentation to match that on this line.
-    if(line.size() < indentEnd)
-      {
-      indentEnd = line.size();
-      }
+    indentEnd = std::min(indentEnd, line.size());
     for(std::string::size_type j = 0; j != indentEnd; ++j)
       {
       if(line[j] != indentText[j])

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21b0654ace2ce58d191c2e42a8583b05614cd037
commit 21b0654ace2ce58d191c2e42a8583b05614cd037
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 23:29:18 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 21:36:57 2015 +0100

    cmGlobalGenerator: Convert set insert algorithm to vector algorithms.
    
    Adjust test for new error output.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 93692f6..6147009 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -3015,7 +3015,7 @@ void cmGlobalGenerator::AddEvaluationFile(const std::string &inputFile,
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::ProcessEvaluationFiles()
 {
-  std::set<std::string> generatedFiles;
+  std::vector<std::string> generatedFiles;
   for(std::vector<cmGeneratorExpressionEvaluationFile*>::const_iterator
       li = this->EvaluationFiles.begin();
       li != this->EvaluationFiles.end();
@@ -3027,16 +3027,24 @@ void cmGlobalGenerator::ProcessEvaluationFiles()
       return;
       }
     std::vector<std::string> files = (*li)->GetFiles();
-    for(std::vector<std::string>::const_iterator fi = files.begin();
-        fi != files.end(); ++fi)
+    std::sort(files.begin(), files.end());
+
+    std::vector<std::string> intersection;
+    std::set_intersection(files.begin(), files.end(),
+                          generatedFiles.begin(), generatedFiles.end(),
+                          std::back_inserter(intersection));
+    if (!intersection.empty())
       {
-      if (!generatedFiles.insert(*fi).second)
-        {
-        cmSystemTools::Error("File to be generated by multiple different "
-          "commands: ", fi->c_str());
-        return;
-        }
+      cmSystemTools::Error("Files to be generated by multiple different "
+        "commands: ", cmWrap('"', intersection, '"', " ").c_str());
+      return;
       }
+
+        generatedFiles.insert(generatedFiles.end(),
+                              files.begin(), files.end());
+    std::vector<std::string>::iterator newIt =
+        generatedFiles.end() - files.size();
+    std::inplace_merge(generatedFiles.begin(), newIt, generatedFiles.end());
     }
 }
 
diff --git a/Tests/RunCMake/File_Generate/CommandConflict-stderr.txt b/Tests/RunCMake/File_Generate/CommandConflict-stderr.txt
index da97ba4..4fa3f20 100644
--- a/Tests/RunCMake/File_Generate/CommandConflict-stderr.txt
+++ b/Tests/RunCMake/File_Generate/CommandConflict-stderr.txt
@@ -1 +1 @@
-CMake Error: File to be generated by multiple different commands: .*CommandConflict-build/output_.*.txt
+CMake Error: Files to be generated by multiple different commands: ".*CommandConflict-build/output_.*.txt"

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=416df93aa93d0a633f0e7354d0562934f676768b
commit 416df93aa93d0a633f0e7354d0562934f676768b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 22:14:26 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 21:36:57 2015 +0100

    Convert some raw loops to cmWrap.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 8652690..be28b2f 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -705,10 +705,7 @@ void cmComputeLinkDepends::DisplayConstraintGraph()
     {
     EdgeList const& nl = this->EntryConstraintGraph[i];
     e << "item " << i << " is [" << this->EntryList[i].Item << "]\n";
-    for(EdgeList::const_iterator j = nl.begin(); j != nl.end(); ++j)
-      {
-      e << "  item " << *j << " must follow it\n";
-      }
+    e << cmWrap("  item ", nl, " must follow it", "\n") << "\n";
     }
   fprintf(stderr, "%s\n", e.str().c_str());
 }
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index bcd2d81..e9390e4 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -683,11 +683,9 @@ void cmCoreTryCompile::FindOutputFile(const std::string& targetName)
 
   std::ostringstream emsg;
   emsg << "Unable to find the executable at any of:\n";
-  for (unsigned int i = 0; i < searchDirs.size(); ++i)
-    {
-    emsg << "  " << this->BinaryDirectory << searchDirs[i]
-         << tmpOutputFile << "\n";
-    }
+  emsg << cmWrap("  " + this->BinaryDirectory,
+                 searchDirs,
+                 tmpOutputFile, "\n") << "\n";
   this->FindErrorMessage = emsg.str();
   return;
 }
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index fd3aa0b..6fe055a 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -355,11 +355,7 @@ void cmFindBase::PrintFindStuff()
   std::cerr << "SearchPathSuffixes  ";
   std::cerr << cmJoin(this->SearchPathSuffixes, "\n") << "\n";
   std::cerr << "SearchPaths\n";
-  for(std::vector<std::string>::const_iterator i = this->SearchPaths.begin();
-      i != this->SearchPaths.end(); ++i)
-    {
-    std::cerr << "[" << *i << "]\n";
-    }
+  std::cerr << cmWrap("[", this->SearchPaths, "]", "\n") << "\n";
 }
 
 bool cmFindBase::CheckForVariableInCache()
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index fd9b236..26bd4b9 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -329,10 +329,7 @@ bool cmFindPackageCommand
     {
     std::ostringstream e;
     e << "called with components that are both required and optional:\n";
-    for(unsigned int i=0; i<doubledComponents.size(); ++i)
-      {
-      e << "  " << doubledComponents[i] << "\n";
-      }
+    e << cmWrap("  ", doubledComponents, "", "\n") << "\n";
     this->SetError(e.str());
     return false;
     }
@@ -808,13 +805,8 @@ bool cmFindPackageCommand::HandlePackageMode()
           {
           e << "Could not find a package configuration file provided by \""
             << this->Name << "\"" << requestedVersionString
-            << " with any of the following names:\n";
-          for(std::vector<std::string>::const_iterator ci =
-                this->Configs.begin();
-              ci != this->Configs.end(); ++ci)
-            {
-            e << "  " << *ci << "\n";
-            }
+            << " with any of the following names:\n"
+            << cmWrap("  ", this->Configs, "", "\n") << "\n";
           }
 
         e << "Add the installation prefix of \"" << this->Name << "\" to "
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 6fd569e..3c92fca 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -213,13 +213,7 @@ cmMakefile::~cmMakefile()
 void cmMakefile::PrintStringVector(const char* s,
                                    const std::vector<std::string>& v) const
 {
-  std::cout << s << ": ( \n";
-  for(std::vector<std::string>::const_iterator i = v.begin();
-      i != v.end(); ++i)
-    {
-    std::cout << *i << " ";
-    }
-  std::cout << " )\n";
+  std::cout << s << ": ( \n" << cmWrap('"', v, '"', " ") << ")\n";
 }
 
 void cmMakefile

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37b88d348a20921c835ce7aa99f6db62271503a7
commit 37b88d348a20921c835ce7aa99f6db62271503a7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 18 23:50:36 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 21:35:58 2015 +0100

    cmAlgorithms: Add cmWrap.
    
    Port some existing cmJoin to use it.
    
    cmJoin is cumbersome to use in cases where the objective is to
    somehow 'quote' each item and then join it with a separator.  In that
    case, the joiner string is harder to read and reason about.  cmWrap
    aims to solve that.
    
    Provide an overload taking char wrappers to simplify the case
    of surrounding every element in quotes without needing to escape
    the quote character.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 8491838..43e113b 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -278,4 +278,21 @@ typename Range::const_iterator cmRemoveDuplicates(Range& r)
   return cmRemoveIndices(r, indices);
 }
 
+template<typename Range>
+std::string cmWrap(std::string prefix, Range const& r, std::string suffix,
+                   std::string sep)
+{
+  if (r.empty())
+    {
+    return std::string();
+    }
+  return prefix + cmJoin(r, (suffix + sep + prefix).c_str()) + suffix;
+}
+
+template<typename Range>
+std::string cmWrap(char prefix, Range const& r, char suffix, std::string sep)
+{
+  return cmWrap(std::string(1, prefix), r, std::string(1, suffix), sep);
+}
+
 #endif
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index ac4489a..93692f6 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2295,15 +2295,8 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
       std::ostringstream ostr;
       if (!componentsSet->empty())
         {
-        ostr << "Available install components are:";
-        std::set<std::string>::iterator it;
-        for (
-          it = componentsSet->begin();
-          it != componentsSet->end();
-          ++ it )
-          {
-          ostr << " \"" << *it << "\"";
-          }
+        ostr << "Available install components are: ";
+        ostr << cmWrap('"', *componentsSet, '"', " ");
         }
       else
         {
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 68657ad..432cb3a 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -724,12 +724,7 @@ cmLocalUnixMakefileGenerator3
     }
 
   // Write the list of commands.
-  for(std::vector<std::string>::const_iterator i = commands.begin();
-      i != commands.end(); ++i)
-    {
-    replace = *i;
-    os << "\t" << replace << "\n";
-    }
+  os << cmWrap("\t", commands, "", "\n") << "\n";
   if(symbolic && !this->WatcomWMake)
     {
     os << ".PHONY : " << cmMakeSafe(tgt) << "\n";
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index bf496e9..5264123 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -835,7 +835,7 @@ cmSystemTools::PrintSingleCommand(std::vector<std::string> const& command)
     return std::string();
     }
 
-  return "\"" + cmJoin(command, "\" \"") + "\"";
+  return cmWrap('"', command, '"', " ");
 }
 
 bool cmSystemTools::DoesFileExistWithExtensions(
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index eb637ef..7d67bd8 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -450,9 +450,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
         return 1;
         }
 
-      std::string command = "\"";
-      command += cmJoin(cmRange(args).advance(3), "\" \"");
-      command += "\"";
+      std::string command = cmWrap('"', cmRange(args).advance(3), '"', " ");
       int retval = 0;
       int timeout = 0;
       if ( cmSystemTools::RunSingleCommand(command.c_str(), 0, &retval,

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a281809384cc19cc9a7d1726b243020b380b9395
commit a281809384cc19cc9a7d1726b243020b380b9395
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 12 20:53:43 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 21:26:18 2015 +0100

    Use cmJoin where possible.

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 8e20c14..bcd2d81 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -260,14 +260,10 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
         err << "Unknown extension \"" << ext << "\" for file\n"
             << "  " << *si << "\n"
             << "try_compile() works only for enabled languages.  "
-            << "Currently these are:\n ";
+            << "Currently these are:\n  ";
         std::vector<std::string> langs;
         gg->GetEnabledLanguages(langs);
-        for(std::vector<std::string>::iterator l = langs.begin();
-            l != langs.end(); ++l)
-          {
-          err << " " << *l;
-          }
+        err << cmJoin(langs, " ");
         err << "\nSee project() command to enable other languages.";
         this->Makefile->IssueMessage(cmake::FATAL_ERROR, err.str());
         return -1;
@@ -373,12 +369,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
     // handle any compile flags we need to pass on
     if (!compileDefs.empty())
       {
-      fprintf(fout, "add_definitions( ");
-      for (size_t i = 0; i < compileDefs.size(); ++i)
-        {
-        fprintf(fout,"%s ",compileDefs[i].c_str());
-        }
-      fprintf(fout, ")\n");
+      fprintf(fout, "add_definitions(%s)\n", cmJoin(compileDefs, " ").c_str());
       }
 
     /* Use a random file name to avoid rapid creation and deletion
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 6e55533..fd3aa0b 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -350,19 +350,10 @@ void cmFindBase::PrintFindStuff()
   std::cerr << "NoCMakeSystemPath " << this->NoCMakeSystemPath << "\n";
   std::cerr << "EnvironmentPath " << this->EnvironmentPath << "\n";
   std::cerr << "CMakePathName " << this->CMakePathName << "\n";
-  std::cerr << "Names  ";
-  for(unsigned int i =0; i < this->Names.size(); ++i)
-    {
-    std::cerr << this->Names[i] << " ";
-    }
-  std::cerr << "\n";
+  std::cerr << "Names  " << cmJoin(this->Names, " ") << "\n";
   std::cerr << "\n";
   std::cerr << "SearchPathSuffixes  ";
-  for(unsigned int i =0; i < this->SearchPathSuffixes.size(); ++i)
-    {
-    std::cerr << this->SearchPathSuffixes[i] << "\n";
-    }
-  std::cerr << "\n";
+  std::cerr << cmJoin(this->SearchPathSuffixes, "\n") << "\n";
   std::cerr << "SearchPaths\n";
   for(std::vector<std::string>::const_iterator i = this->SearchPaths.begin();
       i != this->SearchPaths.end(); ++i)
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index c275e6b..68657ad 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1330,13 +1330,7 @@ cmLocalUnixMakefileGenerator3
                       this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
     fout << "\n"
          << "# Per-language clean rules from dependency scanning.\n"
-         << "foreach(lang";
-    for(std::set<std::string>::const_iterator l = languages.begin();
-        l != languages.end(); ++l)
-      {
-      fout << " " << *l;
-      }
-    fout << ")\n"
+         << "foreach(lang " << cmJoin(languages, " ") << ")\n"
          << "  include(" << this->GetTargetDirectory(target)
          << "/cmake_clean_${lang}.cmake OPTIONAL)\n"
          << "endforeach()\n";
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 6a7dc6e..eb637ef 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -213,27 +213,14 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
     // Echo string
     else if (args[1] == "echo" )
       {
-      unsigned int cc;
-      const char* space = "";
-      for ( cc = 2; cc < args.size(); cc ++ )
-        {
-        std::cout << space << args[cc];
-        space = " ";
-        }
-      std::cout << std::endl;
+      std::cout << cmJoin(cmRange(args).advance(2), " ") << std::endl;
       return 0;
       }
 
     // Echo string no new line
     else if (args[1] == "echo_append" )
       {
-      unsigned int cc;
-      const char* space = "";
-      for ( cc = 2; cc < args.size(); cc ++ )
-        {
-        std::cout << space << args[cc];
-        space = " ";
-        }
+      std::cout << cmJoin(cmRange(args).advance(2), " ");
       return 0;
       }
 
@@ -1329,12 +1316,7 @@ bool cmcmd::RunCommand(const char* comment,
   if(verbose)
     {
     std::cout << comment << ":\n";
-    for(std::vector<std::string>::iterator i = command.begin();
-        i != command.end(); ++i)
-      {
-      std::cout << *i << " ";
-      }
-    std::cout << "\n";
+    std::cout << cmJoin(command, " ") << "\n";
     }
   std::string output;
   int retCode =0;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76207b0861478318115d65c2e983f4d88c937724
commit 76207b0861478318115d65c2e983f4d88c937724
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 19:50:09 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 21:26:18 2015 +0100

    cmCacheManager: Replace loop with algorithm.

diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 45e92ce..0c77891 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -186,11 +186,7 @@ void cmCacheManager::CleanCMakeFiles(const std::string& path)
   cmsys::Glob globIt;
   globIt.FindFiles(glob);
   std::vector<std::string> files = globIt.GetFiles();
-  for(std::vector<std::string>::iterator i = files.begin();
-      i != files.end(); ++i)
-    {
-    cmSystemTools::RemoveFile(*i);
-    }
+  std::for_each(files.begin(), files.end(), cmSystemTools::RemoveFile);
 }
 
 bool cmCacheManager::LoadCache(const std::string& path,

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60c3bb73e39f7b19a17c989a0f9bf70bbfe73683
commit 60c3bb73e39f7b19a17c989a0f9bf70bbfe73683
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 12 22:29:11 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 21:26:18 2015 +0100

    cmGlobalGenerator: Replace loop with algorithm.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index c976c69..ac4489a 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2571,17 +2571,12 @@ bool cmGlobalGenerator::IsReservedTarget(std::string const& name)
     "test", "RUN_TESTS",
     "package", "PACKAGE",
     "package_source",
-    "ZERO_CHECK",
-    0
+    "ZERO_CHECK"
   };
 
-  for(const char** reservedTarget = reservedTargets;
-    *reservedTarget; ++reservedTarget)
-    {
-    if(name == *reservedTarget) return true;
-    }
-
-  return false;
+  return std::find(cmArrayBegin(reservedTargets),
+                   cmArrayEnd(reservedTargets), name)
+      != cmArrayEnd(reservedTargets);
 }
 
 void cmGlobalGenerator::SetExternalMakefileProjectGenerator(

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05fec779d33b872721b9731e872125ebeb89403b
commit 05fec779d33b872721b9731e872125ebeb89403b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 15 13:40:56 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 20 21:26:17 2015 +0100

    cmTarget: Port loop to algorithm.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 1ad0d48..ebcd810 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1542,12 +1542,9 @@ void cmTarget::DeleteDependencyForVS6( DependencyMap& depMap,
   if( map_itr != depMap.end() )
     {
     DependencyList& depList = map_itr->second;
-    DependencyList::iterator itr;
-    while( (itr = std::find(depList.begin(), depList.end(), dep)) !=
-           depList.end() )
-      {
-      depList.erase( itr );
-      }
+    DependencyList::iterator begin =
+        std::remove(depList.begin(), depList.end(), dep);
+    depList.erase(begin, depList.end());
     }
 }
 

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

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sat Feb 21 00:01:17 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Sat, 21 Feb 2015 00:01:17 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-208-g8804c3e
Message-ID: <20150221050117.99DD7AAA8F@public.kitware.com>

This is an automated email from 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  8804c3e0e419eb692ba487ffb2a7e36b1f8e728d (commit)
      from  244867369bcded571a9fe0b06ef2998a5728e368 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8804c3e0e419eb692ba487ffb2a7e36b1f8e728d
commit 8804c3e0e419eb692ba487ffb2a7e36b1f8e728d
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sat Feb 21 00:01:16 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sat Feb 21 00:01:16 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 5f5e676..5311b36 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 2)
-set(CMake_VERSION_PATCH 20150220)
+set(CMake_VERSION_PATCH 20150221)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Feb 21 04:28:51 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 21 Feb 2015 04:28:51 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-561-g9462da3
Message-ID: <20150221092851.51310AAD36@public.kitware.com>

This is an automated email from 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  9462da361295122182406dbddfb5107694ab759a (commit)
       via  f93438cd839fa209afbf227b5a6a0b58214004b7 (commit)
      from  051a565a7adf3c5a7e0dc02306a0f5368a74e212 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9462da361295122182406dbddfb5107694ab759a
commit 9462da361295122182406dbddfb5107694ab759a
Merge: 051a565 f93438c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 21 04:28:50 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 21 04:28:50 2015 -0500

    Merge topic 'fix-graphiz-typo' into next
    
    f93438cd Fix typo, graphiz -> graphviz.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f93438cd839fa209afbf227b5a6a0b58214004b7
commit f93438cd839fa209afbf227b5a6a0b58214004b7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 21 10:27:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Feb 21 10:27:54 2015 +0100

    Fix typo, graphiz -> graphviz.

diff --git a/Modules/CMakeGraphVizOptions.cmake b/Modules/CMakeGraphVizOptions.cmake
index 64c89b9..ff18267 100644
--- a/Modules/CMakeGraphVizOptions.cmake
+++ b/Modules/CMakeGraphVizOptions.cmake
@@ -10,7 +10,7 @@
 # CMake
 # can generate graphviz files, showing the dependencies between the
 # targets in a project and also external libraries which are linked
-# against.  When CMake is run with the --graphiz=foo option, it will
+# against.  When CMake is run with the --graphviz=foo option, it will
 # produce
 #
 # * a foo.dot file showing all dependencies in the project

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

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


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Feb 21 05:31:15 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 21 Feb 2015 05:31:15 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-567-gf819cf5
Message-ID: <20150221103115.C7AABAAD99@public.kitware.com>

This is an automated email from 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  f819cf535653a2ff9aad630ce4b767421627c42e (commit)
       via  c021f59c1f2f3d892b621a9ba163b069f2a2f0a9 (commit)
       via  2d130896a05ef14f2ef53ed472c6926a85cc5399 (commit)
       via  f19692342ba41ddb2638e118e2864bceca77af59 (commit)
       via  1116698a89e4057300481bac8f38bfd95f4e9ce5 (commit)
       via  8804c3e0e419eb692ba487ffb2a7e36b1f8e728d (commit)
      from  9462da361295122182406dbddfb5107694ab759a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f819cf535653a2ff9aad630ce4b767421627c42e
commit f819cf535653a2ff9aad630ce4b767421627c42e
Merge: 9462da3 c021f59
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 21 05:31:14 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 21 05:31:14 2015 -0500

    Merge topic 'minor-cleanups' into next
    
    c021f59c cmMakefile: Store macro list in a vector not in a map.
    2d130896 cmMakefile: Fix list of macros generation.
    f1969234 cmFunctionCommand: Remove ineffectual code.
    1116698a cmTarget: Don't needlessly clear vectors in the destructor.
    8804c3e0 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c021f59c1f2f3d892b621a9ba163b069f2a2f0a9
commit c021f59c1f2f3d892b621a9ba163b069f2a2f0a9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 21 11:25:47 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Feb 21 11:25:47 2015 +0100

    cmMakefile: Store macro list in a vector not in a map.
    
    The signature was computed (incorrectly) and stored as the map
    value, but never used.  Remove it now.

diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx
index 84c00ba..fd18596 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -39,6 +39,7 @@ bool cmGetCMakePropertyCommand
     }
   else if ( args[1] == "MACROS" )
     {
+    output.clear();
     this->Makefile->GetListOfMacros(output);
     }
   else if ( args[1] == "COMPONENTS" )
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 29e8cb1..12c8576 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -224,15 +224,7 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
     // if this is the endmacro for this macro then execute
     if (!this->Depth)
       {
-      std::string name = this->Args[0];
-      name += "(";
-      if (!this->Args.empty())
-        {
-        name += " ";
-        name += cmJoin(this->Args, " ");
-        }
-      name += " )";
-      mf.AddMacro(this->Args[0].c_str(), name.c_str());
+      mf.AddMacro(this->Args[0].c_str());
       // create a new command and add it to cmake
       cmMacroHelperCommand *f = new cmMacroHelperCommand();
       f->Args = this->Args;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ab0d60a..93b2ce6 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -143,7 +143,7 @@ cmMakefile::cmMakefile(const cmMakefile& mf): Internal(new Internals)
 
   this->LocalGenerator = mf.LocalGenerator;
   this->FunctionBlockers = mf.FunctionBlockers;
-  this->MacrosMap = mf.MacrosMap;
+  this->MacrosList = mf.MacrosList;
   this->SubDirectoryOrder = mf.SubDirectoryOrder;
   this->Properties = mf.Properties;
   this->PreOrder = mf.PreOrder;
@@ -3739,26 +3739,16 @@ cmVariableWatch *cmMakefile::GetVariableWatch() const
 }
 #endif
 
-void cmMakefile::AddMacro(const char* name, const char* signature)
+void cmMakefile::AddMacro(const char* name)
 {
-  if ( !name || !signature )
-    {
-    return;
-    }
-  this->MacrosMap[name] = signature;
+  assert(name);
+  this->MacrosList.push_back(name);
 }
 
 void cmMakefile::GetListOfMacros(std::string& macros) const
 {
-  StringStringMap::const_iterator it;
-  macros = "";
-  const char* sep = "";
-  for ( it = this->MacrosMap.begin(); it != this->MacrosMap.end(); ++it )
-    {
-    macros += sep;
-    macros += it->first;
-    sep = ";";
-    }
+  assert(macros.empty());
+  macros = cmJoin(this->MacrosList, ";");
 }
 
 cmCacheManager *cmMakefile::GetCacheManager() const
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 895a2fc..e98f1d9 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -841,7 +841,7 @@ public:
    * Add a macro to the list of macros. The arguments should be name of the
    * macro and a documentation signature of it
    */
-  void AddMacro(const char* name, const char* signature);
+  void AddMacro(const char* name);
 
   ///! Add a new cmTest to the list of tests for this makefile.
   cmTest* CreateTest(const std::string& testName);
@@ -1065,8 +1065,7 @@ private:
 
   std::stack<int> LoopBlockCounter;
 
-  typedef std::map<std::string, std::string> StringStringMap;
-  StringStringMap MacrosMap;
+  std::vector<std::string> MacrosList;
 
   std::map<std::string, bool> SubDirectoryOrder;
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d130896a05ef14f2ef53ed472c6926a85cc5399
commit 2d130896a05ef14f2ef53ed472c6926a85cc5399
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 21 11:24:24 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Feb 21 11:25:26 2015 +0100

    cmMakefile: Fix list of macros generation.
    
    It was broken by commit 7ee56f03 (Convert loops into the commonly
    used pattern., 2015-01-17).

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ac5fec9..ab0d60a 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3757,7 +3757,7 @@ void cmMakefile::GetListOfMacros(std::string& macros) const
     {
     macros += sep;
     macros += it->first;
-    sep = "";
+    sep = ";";
     }
 }
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f19692342ba41ddb2638e118e2864bceca77af59
commit f19692342ba41ddb2638e118e2864bceca77af59
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 21 11:01:21 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Feb 21 11:02:03 2015 +0100

    cmFunctionCommand: Remove ineffectual code.
    
    The name variable is never used.

diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index a4d9357..9297688 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -175,11 +175,6 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
     // if this is the endfunction for this function then execute
     if (!this->Depth)
       {
-      std::string name = this->Args[0];
-      name += "( ";
-      name += cmJoin(this->Args, " ");
-      name += " )";
-
       // create a new command and add it to cmake
       cmFunctionHelperCommand *f = new cmFunctionHelperCommand();
       f->Args = this->Args;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1116698a89e4057300481bac8f38bfd95f4e9ce5
commit 1116698a89e4057300481bac8f38bfd95f4e9ce5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 21 11:00:14 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Feb 21 11:00:14 2015 +0100

    cmTarget: Don't needlessly clear vectors in the destructor.
    
    This will be done anyway for us.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 1ad0d48..1e47294 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6875,11 +6875,11 @@ cmTargetInternalPointer
 //----------------------------------------------------------------------------
 cmTargetInternalPointer::~cmTargetInternalPointer()
 {
-  deleteAndClear(this->Pointer->IncludeDirectoriesEntries);
-  deleteAndClear(this->Pointer->CompileOptionsEntries);
-  deleteAndClear(this->Pointer->CompileFeaturesEntries);
-  deleteAndClear(this->Pointer->CompileDefinitionsEntries);
-  deleteAndClear(this->Pointer->SourceEntries);
+  cmDeleteAll(this->Pointer->IncludeDirectoriesEntries);
+  cmDeleteAll(this->Pointer->CompileOptionsEntries);
+  cmDeleteAll(this->Pointer->CompileFeaturesEntries);
+  cmDeleteAll(this->Pointer->CompileDefinitionsEntries);
+  cmDeleteAll(this->Pointer->SourceEntries);
   delete this->Pointer;
 }
 

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

Summary of changes:
 Source/CMakeVersion.cmake            |    2 +-
 Source/cmFunctionCommand.cxx         |    5 -----
 Source/cmGetCMakePropertyCommand.cxx |    1 +
 Source/cmMacroCommand.cxx            |   10 +---------
 Source/cmMakefile.cxx                |   22 ++++++----------------
 Source/cmMakefile.h                  |    5 ++---
 Source/cmTarget.cxx                  |   10 +++++-----
 7 files changed, 16 insertions(+), 39 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Sat Feb 21 06:31:43 2015
From: brad.king at kitware.com (Brad King)
Date: Sat, 21 Feb 2015 06:31:43 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-569-g972251f
Message-ID: <20150221113144.72962499C@public.kitware.com>

This is an automated email from 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  972251f54c7c3aa652cff7262783ab2660b52a43 (commit)
       via  6e996316db2b07f49fe806e19cb667b3f4dd4b16 (commit)
      from  f819cf535653a2ff9aad630ce4b767421627c42e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=972251f54c7c3aa652cff7262783ab2660b52a43
commit 972251f54c7c3aa652cff7262783ab2660b52a43
Merge: f819cf5 6e99631
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Feb 21 06:31:39 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 21 06:31:39 2015 -0500

    Merge topic 'ctest-output-options' into next
    
    6e996316 fixup! Tests: Teach RunCMake to tolerate Guard Malloc lines in test output


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e996316db2b07f49fe806e19cb667b3f4dd4b16
commit 6e996316db2b07f49fe806e19cb667b3f4dd4b16
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Feb 21 06:30:57 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Feb 21 06:31:16 2015 -0500

    fixup! Tests: Teach RunCMake to tolerate Guard Malloc lines in test output
    
    Add missing escape for backslashes in regex.

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index e47417e..abac66e 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -83,7 +83,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]*\n)+" "\\1" actual_std${o} "${actual_std${o}}")
+    string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:|Error kstat returned)[^\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})

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Sat Feb 21 06:49:00 2015
From: brad.king at kitware.com (Brad King)
Date: Sat, 21 Feb 2015 06:49:00 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-571-g4f657d8
Message-ID: <20150221114900.A84F4AA8A5@public.kitware.com>

This is an automated email from 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  4f657d84432683d288da022c1f13f70ec93e6591 (commit)
       via  193ffd64b5bbefcb7345e1911b2512029995b3d5 (commit)
      from  972251f54c7c3aa652cff7262783ab2660b52a43 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f657d84432683d288da022c1f13f70ec93e6591
commit 4f657d84432683d288da022c1f13f70ec93e6591
Merge: 972251f 193ffd6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Feb 21 06:48:58 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 21 06:48:58 2015 -0500

    Merge topic 'ctest-output-options' into next
    
    193ffd64 fixup! Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=193ffd64b5bbefcb7345e1911b2512029995b3d5
commit 193ffd64b5bbefcb7345e1911b2512029995b3d5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Feb 21 06:45:58 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Feb 21 06:46:08 2015 -0500

    fixup! Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases
    
    Match message for ftp too.

diff --git a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
index 73df5c1..4cd60ed 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
@@ -1,3 +1,3 @@
-Error message was: .*
+Error message was: [Cc]ould *n.t resolve host '?-no-site-'?
    Problems when submitting via FTP
 Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-ftp/test.cmake

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

Summary of changes:
 Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From domen.vrankar at gmail.com  Sat Feb 21 09:31:26 2015
From: domen.vrankar at gmail.com (Domen Vrankar)
Date: Sat, 21 Feb 2015 09:31:26 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-573-g1b59af5
Message-ID: <20150221143127.1502CAAE10@public.kitware.com>

This is an automated email from 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  1b59af5fd3ac3a6ced99dd70b4e319b837ee8361 (commit)
       via  43fab4ca319cc88f0244470adb2732ed4afef4cf (commit)
      from  4f657d84432683d288da022c1f13f70ec93e6591 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b59af5fd3ac3a6ced99dd70b4e319b837ee8361
commit 1b59af5fd3ac3a6ced99dd70b4e319b837ee8361
Merge: 4f657d8 43fab4c
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sat Feb 21 09:31:25 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 21 09:31:25 2015 -0500

    Merge topic 'rpm_package_architecture' into next
    
    43fab4ca CPack/RPM: rpm package architecture


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43fab4ca319cc88f0244470adb2732ed4afef4cf
commit 43fab4ca319cc88f0244470adb2732ed4afef4cf
Author:     Joshua A Clayton <stillcompiling at gmail.com>
AuthorDate: Sat Feb 21 15:28:03 2015 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sat Feb 21 15:28:03 2015 +0100

    CPack/RPM: rpm package architecture
    
    Correctly set rpm package architecture for
    noarch, native and foreign architectures.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 7516393..6ce18bf 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -51,11 +51,12 @@
 #  * Default   : CPACK_PACKAGE_VERSION
 #
 # .. variable:: CPACK_RPM_PACKAGE_ARCHITECTURE
+#               CPACK_RPM_<component>_PACKAGE_ARCHITECTURE
 #
 #  The RPM package architecture.
 #
-#  * Mandatory : NO
-#  * Default   : -
+#  * Mandatory : YES
+#  * Default   : Native architecture output by "uname -m"
 #
 #  This may be set to "noarch" if you know you are building a noarch package.
 #
@@ -619,12 +620,30 @@ endif()
 # RPM "Version" from RPM "Release"
 string(REPLACE "-" "_" CPACK_RPM_PACKAGE_VERSION ${CPACK_RPM_PACKAGE_VERSION})
 
-# CPACK_RPM_PACKAGE_ARCHITECTURE (optional)
-if(CPACK_RPM_PACKAGE_ARCHITECTURE)
-  set(TMP_RPM_BUILDARCH "Buildarch: ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+# CPACK_RPM_PACKAGE_ARCHITECTURE (mandatory)
+if(NOT CPACK_RPM_PACKAGE_ARCHITECTURE)
+  execute_process(COMMAND uname "-m"
+                  OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+else()
   if(CPACK_RPM_PACKAGE_DEBUG)
     message("CPackRPM:Debug: using user-specified build arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
   endif()
+endif()
+
+set(_CPACK_RPM_PACKAGE_ARCHITECTURE ${CPACK_RPM_PACKAGE_ARCHITECTURE})
+
+#prefer component architecture
+if(CPACK_RPM_PACKAGE_COMPONENT)
+  if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_ARCHITECTURE)
+    set(_CPACK_RPM_PACKAGE_ARCHITECTURE ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_ARCHITECTURE})
+    if(CPACK_RPM_PACKAGE_DEBUG)
+      message("CPackRPM:Debug: using component build arch = ${_CPACK_RPM_PACKAGE_ARCHITECTURE}")
+    endif()
+  endif()
+endif()
+if(${_CPACK_RPM_PACKAGE_ARCHITECTURE} STREQUAL "noarch")
+  set(TMP_RPM_BUILDARCH "Buildarch: ${_CPACK_RPM_PACKAGE_ARCHITECTURE}")
 else()
   set(TMP_RPM_BUILDARCH "")
 endif()
@@ -934,7 +953,7 @@ file(MAKE_DIRECTORY ${CPACK_RPM_ROOTDIR}/SOURCES)
 file(MAKE_DIRECTORY ${CPACK_RPM_ROOTDIR}/SPECS)
 file(MAKE_DIRECTORY ${CPACK_RPM_ROOTDIR}/SRPMS)
 
-#set(CPACK_RPM_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}-${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
+#set(CPACK_RPM_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}-${_CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
 set(CPACK_RPM_FILE_NAME "${CPACK_OUTPUT_FILE_NAME}")
 # it seems rpmbuild can't handle spaces in the path
 # neither escaping (as below) nor putting quotes around the path seem to help
@@ -1282,6 +1301,7 @@ if(RPMBUILD_EXECUTABLE)
     COMMAND "${RPMBUILD_EXECUTABLE}" -bb
             --define "_topdir ${CPACK_RPM_DIRECTORY}"
             --buildroot "${CPACK_RPM_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}"
+            --target "${_CPACK_RPM_PACKAGE_ARCHITECTURE}"
             "${CPACK_RPM_BINARY_SPECFILE}"
     WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}"
     RESULT_VARIABLE CPACK_RPMBUILD_EXEC_RESULT
diff --git a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
index de0ee46..4119b8d 100644
--- a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
+++ b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
@@ -11,6 +11,12 @@ if(CPACK_GENERATOR MATCHES "RPM")
   set(CPACK_RPM_COMPONENT_INSTALL "ON")
   set(CPACK_RPM_applications_PACKAGE_REQUIRES "mylib-libraries")
 
+  # test a "noarch" rpm
+  set(CPACK_RPM_headers_PACKAGE_ARCHITECTURE "noarch")
+
+  # test cross-built rpm
+  set(CPACK_RPM_applications_PACKAGE_ARCHITECTURE "armv7hf")
+
   # test package summary override
   set(CPACK_RPM_PACKAGE_SUMMARY "default summary")
   set(CPACK_RPM_libraries_PACKAGE_SUMMARY "libraries summary")
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index 68d846f..5be9d17 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -161,21 +161,25 @@ if(CPackGen MATCHES "RPM")
         set(check_file_match_expected_summary ".*${CPACK_RPM_libraries_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*${CPACK_RPM_libraries_PACKAGE_DESCRIPTION}.*")
         set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+        set(check_file_match_expected_architecture "Architecture: ${CPACK_RPM_applications_PACKAGE_ARCHITECTURE}")
         set(spec_regex "*libraries*")
       elseif(check_file_headers_match)
         set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*${CPACK_COMPONENT_HEADERS_DESCRIPTION}.*")
         set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
+        set(check_file_match_expected_architecture "Architecture: ${CPACK_RPM_libraries_PACKAGE_ARCHITECTURE}")
         set(spec_regex "*headers*")
       elseif(check_file_applications_match)
         set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*${CPACK_COMPONENT_APPLICATIONS_DESCRIPTION}.*")
         set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
+        set(check_file_match_expected_architecture "Architecture: ${CPACK_RPM_headers_PACKAGE_ARCHITECTURE}")
         set(spec_regex "*applications*")
       elseif(check_file_Unspecified_match)
         set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*DESCRIPTION.*")
         set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
+        set(check_file_match_expected_architecture "Architecture: ${CPACK_RPM_Unspecified_PACKAGE_ARCHITECTURE}")
         set(spec_regex "*Unspecified*")
       else()
         message(FATAL_ERROR "error: unexpected rpm package '${check_file}'")
@@ -204,6 +208,10 @@ if(CPackGen MATCHES "RPM")
 
         message(FATAL_ERROR "error: '${check_file}' rpm package relocation path does not match expected value - regex '${check_file_match_expected_relocation_path}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
       endif()
+      string(REGEX MATCH ${check_file_match_expected_architecture} check_file_match_architecture ${check_file_content})
+      if (NOT check_file_match_architecture)
+          message(FATAL_ERROR "error: '${check_file}' Architecture does not match expected value - '${check_file_match_expected_architecture}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
+      endif()
     endforeach()
   elseif(${CPackComponentWay} STREQUAL "IgnoreGroup")
   endif()

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

Summary of changes:
 Modules/CPackRPM.cmake                             |   32 ++++++++++++++++----
 .../MyLibCPackConfig-IgnoreGroup.cmake.in          |    6 ++++
 .../RunCPackVerifyResult.cmake                     |    8 +++++
 3 files changed, 40 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake

From domen.vrankar at gmail.com  Sat Feb 21 11:50:52 2015
From: domen.vrankar at gmail.com (Domen Vrankar)
Date: Sat, 21 Feb 2015 11:50:52 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-576-g1c8e39c
Message-ID: <20150221165052.14CC0AA160@public.kitware.com>

This is an automated email from 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  1c8e39c5048031f311faac056f6f92c9663958b5 (commit)
       via  f8512ddad6cf2648835e02d00e0327a41e0d160a (commit)
       via  771eca76401502032e2e70fa46d4069f63304745 (commit)
      from  1b59af5fd3ac3a6ced99dd70b4e319b837ee8361 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c8e39c5048031f311faac056f6f92c9663958b5
commit 1c8e39c5048031f311faac056f6f92c9663958b5
Merge: 1b59af5 f8512dd
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sat Feb 21 11:50:51 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 21 11:50:51 2015 -0500

    Merge topic 'rpm_at_in_path' into next
    
    f8512dda fixup! rpm revert at in path escaping patch
    771eca76 rpm revert at in path escaping patch

diff --cc Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index 5be9d17,2597050..f06605a
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@@ -207,12 -204,31 +208,35 @@@ if(CPackGen MATCHES "RPM"
          endif()
  
          message(FATAL_ERROR "error: '${check_file}' rpm package relocation path does not match expected value - regex '${check_file_match_expected_relocation_path}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
 +      endif()
 +      string(REGEX MATCH ${check_file_match_expected_architecture} check_file_match_architecture ${check_file_content})
 +      if (NOT check_file_match_architecture)
 +          message(FATAL_ERROR "error: '${check_file}' Architecture does not match expected value - '${check_file_match_expected_architecture}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
        endif()
      endforeach()
-   elseif(${CPackComponentWay} STREQUAL "IgnoreGroup")
+ 
+     # test package content
+     foreach(check_file ${expected_file})
+       string(REGEX MATCH ".*Unspecified.*" check_file_Unspecified_match ${check_file})
+ 
+       if(check_file_Unspecified_match)
+         execute_process(COMMAND ${RPM_EXECUTABLE} -pql ${check_file}
+             OUTPUT_VARIABLE check_file_content
+             ERROR_QUIET
+             OUTPUT_STRIP_TRAILING_WHITESPACE)
+ 
+         string(REGEX MATCH ".*bin/@in at _@path@@with/@and/@/@in_path@/mylibapp2$" check_at_in_path ${check_file_content})
+ 
+         if(NOT check_at_in_path)
+           file(GLOB_RECURSE spec_file "${CPackComponentsForAll_BINARY_DIR}/*Unspecified*.spec")
+ 
+           if(spec_file)
+             file(READ ${spec_file} spec_file_content)
+           endif()
+ 
+           message(FATAL_ERROR "error: '${check_file}' rpm package path with @ characters is missing or invalid. RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
+         endif()
+       endif()
+     endforeach()
    endif()
  endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f8512ddad6cf2648835e02d00e0327a41e0d160a
commit f8512ddad6cf2648835e02d00e0327a41e0d160a
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sat Feb 21 16:31:31 2015 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sat Feb 21 16:31:31 2015 +0100

    fixup! rpm revert at in path escaping patch
    
    Test for correct handling of @ symbols paths.

diff --git a/Tests/CPackComponentsForAll/CMakeLists.txt b/Tests/CPackComponentsForAll/CMakeLists.txt
index b55594e..51af297 100644
--- a/Tests/CPackComponentsForAll/CMakeLists.txt
+++ b/Tests/CPackComponentsForAll/CMakeLists.txt
@@ -43,7 +43,7 @@ install(TARGETS mylibapp
 # CPACK_MONOLITHIC_INSTALL=1 is set (at cmake time).
 install(TARGETS mylibapp2
   RUNTIME
-  DESTINATION bin)
+  DESTINATION bin/@in at _@path@@with\\@and\\@/\@in_path\@) # test @ char in path
 
 install(FILES mylib.h
   DESTINATION include
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index 68d846f..2597050 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -139,6 +139,7 @@ if(CPackGen MATCHES "RPM")
   set(CPACK_COMPONENT_HEADERS_DESCRIPTION
     "C/C\\+\\+ header files for use with MyLib")
 
+  # test package info
   if(${CPackComponentWay} STREQUAL "IgnoreGroup")
     # set gnu install prefixes to what they are set during rpm creation
     # CMAKE_SIZEOF_VOID_P is not set here but lib is prefix of lib64 so
@@ -205,6 +206,29 @@ if(CPackGen MATCHES "RPM")
         message(FATAL_ERROR "error: '${check_file}' rpm package relocation path does not match expected value - regex '${check_file_match_expected_relocation_path}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
       endif()
     endforeach()
-  elseif(${CPackComponentWay} STREQUAL "IgnoreGroup")
+
+    # test package content
+    foreach(check_file ${expected_file})
+      string(REGEX MATCH ".*Unspecified.*" check_file_Unspecified_match ${check_file})
+
+      if(check_file_Unspecified_match)
+        execute_process(COMMAND ${RPM_EXECUTABLE} -pql ${check_file}
+            OUTPUT_VARIABLE check_file_content
+            ERROR_QUIET
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+        string(REGEX MATCH ".*bin/@in at _@path@@with/@and/@/@in_path@/mylibapp2$" check_at_in_path ${check_file_content})
+
+        if(NOT check_at_in_path)
+          file(GLOB_RECURSE spec_file "${CPackComponentsForAll_BINARY_DIR}/*Unspecified*.spec")
+
+          if(spec_file)
+            file(READ ${spec_file} spec_file_content)
+          endif()
+
+          message(FATAL_ERROR "error: '${check_file}' rpm package path with @ characters is missing or invalid. RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
+        endif()
+      endif()
+    endforeach()
   endif()
 endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=771eca76401502032e2e70fa46d4069f63304745
commit 771eca76401502032e2e70fa46d4069f63304745
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed Jan 7 20:33:27 2015 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sat Feb 21 15:54:47 2015 +0100

    rpm revert at in path escaping patch
    
    Patch for escaping at symbols in paths was added
    to RPM generator and was obsoleted in next cmake
    release. The change that obsoleted it also caused
    it to break paths with @ symbols for which it was
    written to solve.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 7516393..da9cc80 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1156,13 +1156,6 @@ if(CPACK_RPM_PACKAGE_DEBUG)
    message("CPackRPM:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}")
 endif()
 
-# protect @ in pathname in order to avoid their
-# interpretation during the configure_file step
-set(CPACK_RPM_INSTALL_FILES_LIST "${CPACK_RPM_INSTALL_FILES}")
-set(PROTECTED_AT "@")
-string(REPLACE "@" "\@PROTECTED_AT\@" CPACK_RPM_INSTALL_FILES "${CPACK_RPM_INSTALL_FILES_LIST}")
-set(CPACK_RPM_INSTALL_FILES_LIST "")
-
 #
 # USER generated/provided spec file handling.
 #
@@ -1273,9 +1266,6 @@ else()
   configure_file(${CPACK_RPM_BINARY_SPECFILE}.in ${CPACK_RPM_BINARY_SPECFILE} @ONLY)
 endif()
 
-# remove AT protection
-unset(PROTECTED_AT)
-
 if(RPMBUILD_EXECUTABLE)
   # Now call rpmbuild using the SPECFILE
   execute_process(

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

Summary of changes:
 Modules/CPackRPM.cmake                             |   10 --------
 Tests/CPackComponentsForAll/CMakeLists.txt         |    2 +-
 .../RunCPackVerifyResult.cmake                     |   26 +++++++++++++++++++-
 3 files changed, 26 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake

From nilsgladitz at gmail.com  Sat Feb 21 12:09:10 2015
From: nilsgladitz at gmail.com (Nils Gladitz)
Date: Sat, 21 Feb 2015 12:09:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-581-gc9a0af8
Message-ID: <20150221170910.254A6892@public.kitware.com>

This is an automated email from 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  c9a0af8cdd549a27e1b8002c22209659edff2dc9 (commit)
       via  e6731f486e466ddd58550851fb935dbda7939cac (commit)
       via  279605f560312aab4dfeef4cce1c8c67d4083b4e (commit)
       via  53d7dafface62d40ea795456394f7ab1d5ee6712 (commit)
       via  dc0f3fb44fb9384438ece513c12d83a36e385802 (commit)
      from  1c8e39c5048031f311faac056f6f92c9663958b5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9a0af8cdd549a27e1b8002c22209659edff2dc9
commit c9a0af8cdd549a27e1b8002c22209659edff2dc9
Merge: 1c8e39c e6731f4
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Feb 21 12:09:08 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 21 12:09:08 2015 -0500

    Merge topic 'wix-shortcut-properties' into next
    
    e6731f48 CPackWIX: Add new CPACK_STARTUP_SHORTCUTS property.
    279605f5 CPackWIX: Add installed file properties for the creation of shortcuts.
    53d7daff CPackWIX: Refactor start menu and desktop shortcut creation.
    dc0f3fb4 CPackWIX: Explicitly list CPack WIX headers for IDE convenience.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6731f486e466ddd58550851fb935dbda7939cac
commit e6731f486e466ddd58550851fb935dbda7939cac
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Feb 21 18:07:36 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Sat Feb 21 18:07:36 2015 +0100

    CPackWIX: Add new CPACK_STARTUP_SHORTCUTS property.

diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index e3be399..19fdf23 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -324,6 +324,7 @@ Properties on Installed Files
    /prop_inst/CPACK_NEVER_OVERWRITE.rst
    /prop_inst/CPACK_PERMANENT.rst
    /prop_inst/CPACK_START_MENU_SHORTCUTS.rst
+   /prop_inst/CPACK_STARTUP_SHORTCUTS.rst
    /prop_inst/CPACK_WIX_ACL.rst
 
 
diff --git a/Help/prop_inst/CPACK_STARTUP_SHORTCUTS.rst b/Help/prop_inst/CPACK_STARTUP_SHORTCUTS.rst
new file mode 100644
index 0000000..8a16022
--- /dev/null
+++ b/Help/prop_inst/CPACK_STARTUP_SHORTCUTS.rst
@@ -0,0 +1,7 @@
+CPACK_STARTUP_SHORTCUTS
+-----------------------
+
+Species a list of shortcut names that should be created in the Startup folder
+for this file.
+
+The property is currently only supported by the WIX generator.
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index c6daeda..4b8daf8 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -557,6 +557,12 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
     directoryDefinitions.EmitDesktopFolder();
     }
 
+  if(emittedShortcutTypes.find(cmWIXShortcuts::STARTUP) !=
+      emittedShortcutTypes.end())
+    {
+    directoryDefinitions.EmitStartupFolder();
+    }
+
   directoryDefinitions.EndElement("Directory");
   directoryDefinitions.EndElement("Fragment");
 
@@ -714,6 +720,17 @@ bool cmCPackWIXGenerator::CreateShortcuts(
       }
     }
 
+  if(!shortcuts.empty(cmWIXShortcuts::STARTUP))
+    {
+    if(!this->CreateShortcutsOfSpecificType(cmWIXShortcuts::STARTUP,
+      cpackComponentName, featureId, "STARTUP",
+      shortcuts, false,
+      fileDefinitions, featureDefinitions))
+      {
+      return false;
+      }
+    }
+
   return true;
 }
 
@@ -736,6 +753,9 @@ bool cmCPackWIXGenerator::CreateShortcutsOfSpecificType(
     case cmWIXShortcuts::DESKTOP:
       directoryId = "DesktopFolder";
       break;
+    case cmWIXShortcuts::STARTUP:
+      directoryId = "StartupFolder";
+      break;
     default:
       return false;
     }
diff --git a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx
index a93f89b..7bd4315 100644
--- a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx
@@ -41,6 +41,14 @@ void cmWIXDirectoriesSourceWriter::EmitDesktopFolder()
   EndElement("Directory");
 }
 
+void cmWIXDirectoriesSourceWriter::EmitStartupFolder()
+{
+  BeginElement("Directory");
+  AddAttribute("Id", "StartupFolder");
+  AddAttribute("Name", "Startup");
+  EndElement("Directory");
+}
+
 size_t cmWIXDirectoriesSourceWriter::BeginInstallationPrefixDirectory(
   std::string const& programFilesFolderId,
   std::string const& installRootString)
diff --git a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h
index f51fdb4..f8c8166 100644
--- a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h
@@ -32,6 +32,8 @@ public:
 
   void EmitDesktopFolder();
 
+  void EmitStartupFolder();
+
   size_t BeginInstallationPrefixDirectory(
       std::string const& programFilesFolderId,
       std::string const& installRootString);
diff --git a/Source/CPack/WiX/cmWIXShortcut.cxx b/Source/CPack/WiX/cmWIXShortcut.cxx
index aef2b08..d721872 100644
--- a/Source/CPack/WiX/cmWIXShortcut.cxx
+++ b/Source/CPack/WiX/cmWIXShortcut.cxx
@@ -52,6 +52,10 @@ bool cmWIXShortcuts::EmitShortcuts(
       shortcutPrefix = "CM_DS";
       registrySuffix = "_desktop";
       break;
+    case STARTUP:
+      shortcutPrefix = "CM_SS";
+      registrySuffix = "_startup";
+      break;
     default:
       return false;
     }
@@ -96,6 +100,9 @@ void cmWIXShortcuts::CreateFromProperties(
 
   CreateFromProperty("CPACK_DESKTOP_SHORTCUTS",
     DESKTOP, id, directoryId, installedFile);
+
+  CreateFromProperty("CPACK_STARTUP_SHORTCUTS",
+    STARTUP, id, directoryId, installedFile);
 }
 
 void cmWIXShortcuts::CreateFromProperty(
diff --git a/Source/CPack/WiX/cmWIXShortcut.h b/Source/CPack/WiX/cmWIXShortcut.h
index 5e18bdd..5945e43 100644
--- a/Source/CPack/WiX/cmWIXShortcut.h
+++ b/Source/CPack/WiX/cmWIXShortcut.h
@@ -34,7 +34,8 @@ public:
   enum Type
   {
     START_MENU,
-    DESKTOP
+    DESKTOP,
+    STARTUP
   };
 
   typedef std::vector<cmWIXShortcut> shortcut_list_t;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=279605f560312aab4dfeef4cce1c8c67d4083b4e
commit 279605f560312aab4dfeef4cce1c8c67d4083b4e
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Feb 21 17:30:31 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Sat Feb 21 17:30:31 2015 +0100

    CPackWIX: Add installed file properties for the creation of shortcuts.

diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 25f989f..e3be399 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -320,8 +320,10 @@ Properties on Installed Files
 .. toctree::
    :maxdepth: 1
 
+   /prop_inst/CPACK_DESKTOP_SHORTCUTS.rst
    /prop_inst/CPACK_NEVER_OVERWRITE.rst
    /prop_inst/CPACK_PERMANENT.rst
+   /prop_inst/CPACK_START_MENU_SHORTCUTS.rst
    /prop_inst/CPACK_WIX_ACL.rst
 
 
diff --git a/Help/prop_inst/CPACK_DESKTOP_SHORTCUTS.rst b/Help/prop_inst/CPACK_DESKTOP_SHORTCUTS.rst
new file mode 100644
index 0000000..11f2c03
--- /dev/null
+++ b/Help/prop_inst/CPACK_DESKTOP_SHORTCUTS.rst
@@ -0,0 +1,7 @@
+CPACK_DESKTOP_SHORTCUTS
+-----------------------
+
+Species a list of shortcut names that should be created on the Desktop
+for this file.
+
+The property is currently only supported by the WIX generator.
diff --git a/Help/prop_inst/CPACK_START_MENU_SHORTCUTS.rst b/Help/prop_inst/CPACK_START_MENU_SHORTCUTS.rst
new file mode 100644
index 0000000..d30ea39
--- /dev/null
+++ b/Help/prop_inst/CPACK_START_MENU_SHORTCUTS.rst
@@ -0,0 +1,7 @@
+CPACK_START_MENU_SHORTCUTS
+--------------------------
+
+Species a list of shortcut names that should be created in the Start Menu
+for this file.
+
+The property is currently only supported by the WIX generator.
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index f18eaeb..c6daeda 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -856,8 +856,8 @@ void cmCPackWIXGenerator::AddDirectoryAndFileDefinitons(
   cmWIXDirectoriesSourceWriter& directoryDefinitions,
   cmWIXFilesSourceWriter& fileDefinitions,
   cmWIXFeaturesSourceWriter& featureDefinitions,
-  const std::vector<std::string>& packageExecutables,
-  const std::vector<std::string>& desktopExecutables,
+  std::vector<std::string> const& packageExecutables,
+  std::vector<std::string> const& desktopExecutables,
   cmWIXShortcuts& shortcuts)
 {
   cmsys::Directory dir;
@@ -943,6 +943,11 @@ void cmCPackWIXGenerator::AddDirectoryAndFileDefinitons(
       cmInstalledFile const* installedFile =
         this->GetInstalledFile(relativePath);
 
+      if(installedFile)
+        {
+        shortcuts.CreateFromProperties(id, directoryId, *installedFile);
+        }
+
       std::string componentId = fileDefinitions.EmitComponentFile(
         directoryId, id, fullPath, *(this->Patch), installedFile);
 
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h
index d75c69d..d501609 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.h
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.h
@@ -136,7 +136,7 @@ private:
     cmWIXDirectoriesSourceWriter& directoryDefinitions,
     cmWIXFilesSourceWriter& fileDefinitions,
     cmWIXFeaturesSourceWriter& featureDefinitions,
-    std::vector<std::string> const& pkgExecutables,
+    std::vector<std::string> const& packageExecutables,
     std::vector<std::string> const& desktopExecutables,
     cmWIXShortcuts& shortcuts);
 
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
index ca37699..d4698a7 100644
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
@@ -28,16 +28,21 @@ cmWIXFilesSourceWriter::cmWIXFilesSourceWriter(cmCPackLog* logger,
 void cmWIXFilesSourceWriter::EmitShortcut(
   std::string const& id,
   cmWIXShortcut const& shortcut,
-  std::string const& shortcutPrefix)
+  std::string const& shortcutPrefix,
+  size_t shortcutIndex)
 {
-  std::string shortcutId = shortcutPrefix;
+  std::stringstream shortcutId;
+  shortcutId << shortcutPrefix << id;
 
-  shortcutId += id;
+  if(shortcutIndex > 0)
+    {
+    shortcutId << "_"  << shortcutIndex;
+    }
 
   std::string fileId = std::string("CM_F") + id;
 
   BeginElement("Shortcut");
-  AddAttribute("Id", shortcutId);
+  AddAttribute("Id", shortcutId.str());
   AddAttribute("Name", shortcut.label);
   std::string target = "[#" + fileId + "]";
   AddAttribute("Target", target);
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.h b/Source/CPack/WiX/cmWIXFilesSourceWriter.h
index 67808fb..c48bc15 100644
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.h
@@ -31,7 +31,8 @@ public:
   void EmitShortcut(
       std::string const& id,
       cmWIXShortcut const& shortcut,
-      std::string const& shortcutPrefix);
+      std::string const& shortcutPrefix,
+      size_t shortcutIndex);
 
   void EmitRemoveFolder(std::string const& id);
 
diff --git a/Source/CPack/WiX/cmWIXShortcut.cxx b/Source/CPack/WiX/cmWIXShortcut.cxx
index 1c755ec..aef2b08 100644
--- a/Source/CPack/WiX/cmWIXShortcut.cxx
+++ b/Source/CPack/WiX/cmWIXShortcut.cxx
@@ -62,11 +62,12 @@ bool cmWIXShortcuts::EmitShortcuts(
     std::string const& id = j->first;
     shortcut_list_t const& shortcutList = j->second;
 
-    for(shortcut_list_t::const_iterator k = shortcutList.begin();
-      k != shortcutList.end(); ++k)
+    for(size_t shortcutListIndex = 0;
+      shortcutListIndex < shortcutList.size(); ++shortcutListIndex)
       {
-      cmWIXShortcut const& shortcut = *k;
-      fileDefinitions.EmitShortcut(id, shortcut, shortcutPrefix);
+      cmWIXShortcut const& shortcut = shortcutList[shortcutListIndex];
+      fileDefinitions.EmitShortcut(id, shortcut,
+        shortcutPrefix, shortcutListIndex);
       }
     }
 
@@ -84,3 +85,34 @@ void cmWIXShortcuts::AddShortcutTypes(std::set<Type>& types)
     types.insert(i->first);
     }
 }
+
+void cmWIXShortcuts::CreateFromProperties(
+  std::string const& id,
+  std::string const& directoryId,
+  cmInstalledFile const& installedFile)
+{
+  CreateFromProperty("CPACK_START_MENU_SHORTCUTS",
+    START_MENU, id, directoryId, installedFile);
+
+  CreateFromProperty("CPACK_DESKTOP_SHORTCUTS",
+    DESKTOP, id, directoryId, installedFile);
+}
+
+void cmWIXShortcuts::CreateFromProperty(
+  std::string const& propertyName,
+  Type type,
+  std::string const& id,
+  std::string const& directoryId,
+  cmInstalledFile const& installedFile)
+{
+  std::vector<std::string> list;
+  installedFile.GetPropertyAsList(propertyName, list);
+
+  for(size_t i = 0; i < list.size(); ++i)
+    {
+    cmWIXShortcut shortcut;
+    shortcut.label = list[i];
+    shortcut.workingDirectoryId = directoryId;
+    insert(type, id, shortcut);
+    }
+}
diff --git a/Source/CPack/WiX/cmWIXShortcut.h b/Source/CPack/WiX/cmWIXShortcut.h
index a18cbb3..5e18bdd 100644
--- a/Source/CPack/WiX/cmWIXShortcut.h
+++ b/Source/CPack/WiX/cmWIXShortcut.h
@@ -18,6 +18,8 @@
 #include <set>
 #include <vector>
 
+#include <cmInstalledFile.h>
+
 class cmWIXFilesSourceWriter;
 
 struct cmWIXShortcut
@@ -50,9 +52,19 @@ public:
 
   void AddShortcutTypes(std::set<Type>& types);
 
+  void CreateFromProperties(std::string const& id,
+    std::string const& directoryId, cmInstalledFile const& installedFile);
+
 private:
   typedef std::map<Type, shortcut_id_map_t> shortcut_type_map_t;
 
+  void CreateFromProperty(
+    std::string const& propertyName,
+    Type type,
+    std::string const& id,
+    std::string const& directoryId,
+    cmInstalledFile const& installedFile);
+
   shortcut_type_map_t Shortcuts;
   shortcut_id_map_t EmptyIdMap;
 };

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53d7dafface62d40ea795456394f7ab1d5ee6712
commit 53d7dafface62d40ea795456394f7ab1d5ee6712
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Feb 21 12:38:14 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Sat Feb 21 12:38:14 2015 +0100

    CPackWIX: Refactor start menu and desktop shortcut creation.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 0b077d4..5b518b8 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -653,6 +653,7 @@ if(WIN32)
     CPack/WiX/cmWIXPatchParser.h
     CPack/WiX/cmWIXRichTextFormatWriter.cxx
     CPack/WiX/cmWIXRichTextFormatWriter.h
+    CPack/WiX/cmWIXShortcut.cxx
     CPack/WiX/cmWIXShortcut.h
     CPack/WiX/cmWIXSourceWriter.cxx
     CPack/WiX/cmWIXSourceWriter.h
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 11d5437..f18eaeb 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -33,7 +33,6 @@
 #include <rpc.h> // for GUID generation
 
 cmCPackWIXGenerator::cmCPackWIXGenerator():
-  HasDesktopShortcuts(false),
   Patch(0)
 {
 
@@ -490,18 +489,16 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
 
   featureDefinitions.EndElement("Feature");
 
-  bool hasShortcuts = false;
+  std::set<cmWIXShortcuts::Type> emittedShortcutTypes;
 
-  shortcut_map_t globalShortcuts;
+  cmWIXShortcuts globalShortcuts;
   if(Components.empty())
     {
     AddComponentsToFeature(toplevel, "ProductFeature",
       directoryDefinitions, fileDefinitions, featureDefinitions,
       globalShortcuts);
-    if(globalShortcuts.size())
-      {
-      hasShortcuts = true;
-      }
+
+    globalShortcuts.AddShortcutTypes(emittedShortcutTypes);
     }
   else
     {
@@ -516,33 +513,29 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
 
       std::string componentFeatureId = "CM_C_" + component.Name;
 
-      shortcut_map_t featureShortcuts;
+      cmWIXShortcuts featureShortcuts;
       AddComponentsToFeature(componentPath, componentFeatureId,
         directoryDefinitions, fileDefinitions,
         featureDefinitions, featureShortcuts);
-      if(featureShortcuts.size())
-        {
-        hasShortcuts = true;
-        }
 
-      if(featureShortcuts.size())
+      featureShortcuts.AddShortcutTypes(emittedShortcutTypes);
+
+      if(!CreateShortcuts(component.Name, componentFeatureId,
+        featureShortcuts, false, fileDefinitions, featureDefinitions))
         {
-        if(!CreateStartMenuShortcuts(component.Name, componentFeatureId,
-          featureShortcuts, fileDefinitions, featureDefinitions))
-          {
-          return false;
-          }
+        return false;
         }
       }
     }
 
-  if(hasShortcuts)
+  bool emitUninstallShortcut = emittedShortcutTypes.find(
+    cmWIXShortcuts::START_MENU) != emittedShortcutTypes.end();
+
+  if(!CreateShortcuts(std::string(), "ProductFeature",
+      globalShortcuts, emitUninstallShortcut,
+      fileDefinitions, featureDefinitions))
     {
-    if(!CreateStartMenuShortcuts(std::string(), "ProductFeature",
-        globalShortcuts, fileDefinitions, featureDefinitions))
-      {
-      return false;
-      }
+    return false;
     }
 
   featureDefinitions.EndElement("Fragment");
@@ -551,13 +544,15 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
   directoryDefinitions.EndInstallationPrefixDirectory(
     installRootSize);
 
-  if(hasShortcuts)
+  if(emittedShortcutTypes.find(cmWIXShortcuts::START_MENU) !=
+      emittedShortcutTypes.end())
     {
     directoryDefinitions.EmitStartMenuFolder(
       GetOption("CPACK_WIX_PROGRAM_MENU_FOLDER"));
     }
 
-  if(this->HasDesktopShortcuts)
+  if(emittedShortcutTypes.find(cmWIXShortcuts::DESKTOP) !=
+      emittedShortcutTypes.end())
     {
     directoryDefinitions.EmitDesktopFolder();
     }
@@ -649,7 +644,7 @@ bool cmCPackWIXGenerator::AddComponentsToFeature(
   cmWIXDirectoriesSourceWriter& directoryDefinitions,
   cmWIXFilesSourceWriter& fileDefinitions,
   cmWIXFeaturesSourceWriter& featureDefinitions,
-  shortcut_map_t& shortcutMap)
+  cmWIXShortcuts& shortcuts)
 {
   featureDefinitions.BeginElement("FeatureRef");
   featureDefinitions.AddAttribute("Id", featureId);
@@ -682,21 +677,68 @@ bool cmCPackWIXGenerator::AddComponentsToFeature(
     rootPath, "INSTALL_ROOT",
     directoryDefinitions, fileDefinitions, featureDefinitions,
     cpackPackageExecutablesList, cpackPackageDesktopLinksList,
-    shortcutMap);
+    shortcuts);
 
   featureDefinitions.EndElement("FeatureRef");
 
   return true;
 }
 
-bool cmCPackWIXGenerator::CreateStartMenuShortcuts(
+bool cmCPackWIXGenerator::CreateShortcuts(
+  std::string const& cpackComponentName,
+  std::string const& featureId,
+  cmWIXShortcuts const& shortcuts,
+  bool emitUninstallShortcut,
+  cmWIXFilesSourceWriter& fileDefinitions,
+  cmWIXFeaturesSourceWriter& featureDefinitions)
+{
+  if(!shortcuts.empty(cmWIXShortcuts::START_MENU))
+    {
+    if(!this->CreateShortcutsOfSpecificType(cmWIXShortcuts::START_MENU,
+      cpackComponentName, featureId, "",
+      shortcuts, emitUninstallShortcut,
+      fileDefinitions, featureDefinitions))
+      {
+      return false;
+      }
+    }
+
+  if(!shortcuts.empty(cmWIXShortcuts::DESKTOP))
+    {
+    if(!this->CreateShortcutsOfSpecificType(cmWIXShortcuts::DESKTOP,
+      cpackComponentName, featureId, "DESKTOP",
+      shortcuts, false,
+      fileDefinitions, featureDefinitions))
+      {
+      return false;
+      }
+    }
+
+  return true;
+}
+
+bool cmCPackWIXGenerator::CreateShortcutsOfSpecificType(
+  cmWIXShortcuts::Type type,
   std::string const& cpackComponentName,
   std::string const& featureId,
-  shortcut_map_t& shortcutMap,
+  std::string const& idPrefix,
+  cmWIXShortcuts const& shortcuts,
+  bool emitUninstallShortcut,
   cmWIXFilesSourceWriter& fileDefinitions,
   cmWIXFeaturesSourceWriter& featureDefinitions)
 {
-  bool thisHasDesktopShortcuts = false;
+  std::string directoryId;
+  switch(type)
+    {
+    case cmWIXShortcuts::START_MENU:
+      directoryId = "PROGRAM_MENU_FOLDER";
+      break;
+    case cmWIXShortcuts::DESKTOP:
+      directoryId = "DesktopFolder";
+      break;
+    default:
+      return false;
+    }
 
   featureDefinitions.BeginElement("FeatureRef");
   featureDefinitions.AddAttribute("Id", featureId);
@@ -720,80 +762,42 @@ bool cmCPackWIXGenerator::CreateStartMenuShortcuts(
       idSuffix += cpackComponentName;
     }
 
-  std::string componentId = "CM_SHORTCUT" + idSuffix;
+  std::string componentId = "CM_SHORTCUT";
+  if(idPrefix.size())
+    {
+    componentId += "_" + idPrefix;
+    }
+
+  componentId += idSuffix;
 
   fileDefinitions.BeginElement("DirectoryRef");
-  fileDefinitions.AddAttribute("Id", "PROGRAM_MENU_FOLDER");
+  fileDefinitions.AddAttribute("Id", directoryId);
 
   fileDefinitions.BeginElement("Component");
   fileDefinitions.AddAttribute("Id", componentId);
   fileDefinitions.AddAttribute("Guid", "*");
 
-  for(shortcut_map_t::const_iterator
-    i = shortcutMap.begin(); i != shortcutMap.end(); ++i)
-    {
-    std::string const& id = i->first;
-    cmWIXShortcut const& shortcut = i->second;
+  std::string registryKey = std::string("Software\\") +
+    cpackVendor + "\\" + cpackPackageName;
 
-    fileDefinitions.EmitShortcut(id, shortcut, false);
+  shortcuts.EmitShortcuts(type, registryKey,
+    cpackComponentName, fileDefinitions);
 
-    if(shortcut.desktop)
-      {
-      thisHasDesktopShortcuts = true;
-      }
+  if(type == cmWIXShortcuts::START_MENU)
+    {
+    fileDefinitions.EmitRemoveFolder(
+      "CM_REMOVE_PROGRAM_MENU_FOLDER" + idSuffix);
     }
 
-  if(cpackComponentName.empty())
+  if(emitUninstallShortcut)
     {
     fileDefinitions.EmitUninstallShortcut(cpackPackageName);
     }
 
-  fileDefinitions.EmitRemoveFolder(
-    "CM_REMOVE_PROGRAM_MENU_FOLDER" + idSuffix);
-
-  std::string registryKey =
-    std::string("Software\\") + cpackVendor + "\\" + cpackPackageName;
-
-  fileDefinitions.EmitStartMenuShortcutRegistryValue(
-    registryKey, cpackComponentName);
-
   fileDefinitions.EndElement("Component");
   fileDefinitions.EndElement("DirectoryRef");
 
   featureDefinitions.EmitComponentRef(componentId);
-
-  if(thisHasDesktopShortcuts)
-    {
-    this->HasDesktopShortcuts = true;
-    componentId = "CM_DESKTOP_SHORTCUT" + idSuffix;
-
-    fileDefinitions.BeginElement("DirectoryRef");
-    fileDefinitions.AddAttribute("Id", "DesktopFolder");
-    fileDefinitions.BeginElement("Component");
-    fileDefinitions.AddAttribute("Id", componentId);
-    fileDefinitions.AddAttribute("Guid", "*");
-
-    for(shortcut_map_t::const_iterator
-      i = shortcutMap.begin(); i != shortcutMap.end(); ++i)
-      {
-      std::string const& id = i->first;
-      cmWIXShortcut const& shortcut = i->second;
-
-      if (!shortcut.desktop)
-        continue;
-
-      fileDefinitions.EmitShortcut(id, shortcut, true);
-      }
-
-    fileDefinitions.EmitDesktopShortcutRegistryValue(
-      registryKey, cpackComponentName);
-
-    fileDefinitions.EndElement("Component");
-    fileDefinitions.EndElement("DirectoryRef");
-
-    featureDefinitions.EmitComponentRef(componentId);
-    }
-
   featureDefinitions.EndElement("FeatureRef");
 
   return true;
@@ -854,7 +858,7 @@ void cmCPackWIXGenerator::AddDirectoryAndFileDefinitons(
   cmWIXFeaturesSourceWriter& featureDefinitions,
   const std::vector<std::string>& packageExecutables,
   const std::vector<std::string>& desktopExecutables,
-  shortcut_map_t& shortcutMap)
+  cmWIXShortcuts& shortcuts)
 {
   cmsys::Directory dir;
   dir.Load(topdir.c_str());
@@ -929,7 +933,7 @@ void cmCPackWIXGenerator::AddDirectoryAndFileDefinitons(
         featureDefinitions,
         packageExecutables,
         desktopExecutables,
-        shortcutMap);
+        shortcuts);
 
       this->Patch->ApplyFragment(subDirectoryId, directoryDefinitions);
       directoryDefinitions.EndElement("Directory");
@@ -952,9 +956,10 @@ void cmCPackWIXGenerator::AddDirectoryAndFileDefinitons(
         if(cmSystemTools::LowerCase(fileName) ==
             cmSystemTools::LowerCase(executableName) + ".exe")
           {
-          cmWIXShortcut &shortcut = shortcutMap[id];
-          shortcut.textLabel= textLabel;
+          cmWIXShortcut shortcut;
+          shortcut.label= textLabel;
           shortcut.workingDirectoryId = directoryId;
+          shortcuts.insert(cmWIXShortcuts::START_MENU, id, shortcut);
 
           if(desktopExecutables.size() &&
              std::find(desktopExecutables.begin(),
@@ -962,7 +967,7 @@ void cmCPackWIXGenerator::AddDirectoryAndFileDefinitons(
                        executableName)
              != desktopExecutables.end())
             {
-              shortcut.desktop = true;
+              shortcuts.insert(cmWIXShortcuts::DESKTOP, id, shortcut);
             }
           }
         }
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h
index 7035297..d75c69d 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.h
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.h
@@ -65,7 +65,6 @@ protected:
 private:
   typedef std::map<std::string, std::string> id_map_t;
   typedef std::map<std::string, size_t> ambiguity_map_t;
-  typedef std::map<std::string, cmWIXShortcut> shortcut_map_t;
   typedef std::set<std::string> extension_set_t;
 
   bool InitializeWiXConfiguration();
@@ -99,12 +98,23 @@ private:
     cmWIXDirectoriesSourceWriter& directoryDefinitions,
     cmWIXFilesSourceWriter& fileDefinitions,
     cmWIXFeaturesSourceWriter& featureDefinitions,
-    shortcut_map_t& shortcutMap);
+    cmWIXShortcuts& shortcuts);
 
-  bool CreateStartMenuShortcuts(
+  bool CreateShortcuts(
     std::string const& cpackComponentName,
     std::string const& featureId,
-    shortcut_map_t& shortcutMap,
+    cmWIXShortcuts const& shortcuts,
+    bool emitUninstallShortcut,
+    cmWIXFilesSourceWriter& fileDefinitions,
+    cmWIXFeaturesSourceWriter& featureDefinitions);
+
+  bool CreateShortcutsOfSpecificType(
+    cmWIXShortcuts::Type type,
+    std::string const& cpackComponentName,
+    std::string const& featureId,
+    std::string const& idPrefix,
+    cmWIXShortcuts const& shortcuts,
+    bool emitUninstallShortcut,
     cmWIXFilesSourceWriter& fileDefinitions,
     cmWIXFeaturesSourceWriter& featureDefinitions);
 
@@ -126,9 +136,9 @@ private:
     cmWIXDirectoriesSourceWriter& directoryDefinitions,
     cmWIXFilesSourceWriter& fileDefinitions,
     cmWIXFeaturesSourceWriter& featureDefinitions,
-    const std::vector<std::string>& pkgExecutables,
-    const std::vector<std::string>& desktopExecutables,
-    shortcut_map_t& shortcutMap);
+    std::vector<std::string> const& pkgExecutables,
+    std::vector<std::string> const& desktopExecutables,
+    cmWIXShortcuts& shortcuts);
 
   bool RequireOption(std::string const& name, std::string& value) const;
 
@@ -165,8 +175,6 @@ private:
   extension_set_t CandleExtensions;
   extension_set_t LightExtensions;
 
-  bool HasDesktopShortcuts;
-
   std::string CPackTopLevel;
 
   cmWIXPatch* Patch;
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
index 1adb06a..ca37699 100644
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
@@ -1,6 +1,6 @@
 /*============================================================================
   CMake - Cross Platform Makefile Generator
-  Copyright 2014 Kitware, Inc.
+  Copyright 2014-2015 Kitware, Inc.
 
   Distributed under the OSI-approved BSD License (the "License");
   see accompanying file Copyright.txt for details.
@@ -28,18 +28,9 @@ cmWIXFilesSourceWriter::cmWIXFilesSourceWriter(cmCPackLog* logger,
 void cmWIXFilesSourceWriter::EmitShortcut(
   std::string const& id,
   cmWIXShortcut const& shortcut,
-  bool desktop)
+  std::string const& shortcutPrefix)
 {
-  std::string shortcutId;
-
-  if(desktop)
-    {
-    shortcutId = "CM_DS";
-    }
-  else
-    {
-    shortcutId = "CM_S";
-    }
+  std::string shortcutId = shortcutPrefix;
 
   shortcutId += id;
 
@@ -47,7 +38,7 @@ void cmWIXFilesSourceWriter::EmitShortcut(
 
   BeginElement("Shortcut");
   AddAttribute("Id", shortcutId);
-  AddAttribute("Name", shortcut.textLabel);
+  AddAttribute("Name", shortcut.label);
   std::string target = "[#" + fileId + "]";
   AddAttribute("Target", target);
   AddAttribute("WorkingDirectory", shortcut.workingDirectoryId);
@@ -62,20 +53,6 @@ void cmWIXFilesSourceWriter::EmitRemoveFolder(std::string const& id)
   EndElement("RemoveFolder");
 }
 
-void cmWIXFilesSourceWriter::EmitStartMenuShortcutRegistryValue(
-  std::string const& registryKey,
-  std::string const& cpackComponentName)
-{
-  EmitInstallRegistryValue(registryKey, cpackComponentName, std::string());
-}
-
-void cmWIXFilesSourceWriter::EmitDesktopShortcutRegistryValue(
-  std::string const& registryKey,
-  std::string const& cpackComponentName)
-{
-  EmitInstallRegistryValue(registryKey, cpackComponentName, "_desktop");
-}
-
 void cmWIXFilesSourceWriter::EmitInstallRegistryValue(
   std::string const& registryKey,
   std::string const& cpackComponentName,
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.h b/Source/CPack/WiX/cmWIXFilesSourceWriter.h
index b0a4af8..67808fb 100644
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.h
@@ -1,6 +1,6 @@
 /*============================================================================
   CMake - Cross Platform Makefile Generator
-  Copyright 2014 Kitware, Inc.
+  Copyright 2014-2015 Kitware, Inc.
 
   Distributed under the OSI-approved BSD License (the "License");
   see accompanying file Copyright.txt for details.
@@ -31,17 +31,14 @@ public:
   void EmitShortcut(
       std::string const& id,
       cmWIXShortcut const& shortcut,
-      bool desktop);
+      std::string const& shortcutPrefix);
 
   void EmitRemoveFolder(std::string const& id);
 
-  void EmitStartMenuShortcutRegistryValue(
-    std::string const& registryKey,
-    std::string const& cpackComponentName);
-
-  void EmitDesktopShortcutRegistryValue(
+  void EmitInstallRegistryValue(
     std::string const& registryKey,
-    std::string const& cpackComponentName);
+    std::string const& cpackComponentName,
+    std::string const& suffix);
 
   void EmitUninstallShortcut(std::string const& packageName);
 
@@ -56,12 +53,6 @@ public:
     std::string const& filePath,
     cmWIXPatch &patch,
     cmInstalledFile const* installedFile);
-
-private:
-  void EmitInstallRegistryValue(
-    std::string const& registryKey,
-    std::string const& cpackComponentName,
-    std::string const& suffix);
 };
 
 
diff --git a/Source/CPack/WiX/cmWIXShortcut.cxx b/Source/CPack/WiX/cmWIXShortcut.cxx
new file mode 100644
index 0000000..1c755ec
--- /dev/null
+++ b/Source/CPack/WiX/cmWIXShortcut.cxx
@@ -0,0 +1,86 @@
+/*============================================================================
+  CMake - Cross Platform Makefile Generator
+  Copyright 2015 Kitware, Inc.
+
+  Distributed under the OSI-approved BSD License (the "License");
+  see accompanying file Copyright.txt for details.
+
+  This software is distributed WITHOUT ANY WARRANTY; without even the
+  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the License for more information.
+============================================================================*/
+
+#include "cmWIXShortcut.h"
+
+#include "cmWIXFilesSourceWriter.h"
+
+void cmWIXShortcuts::insert(
+  Type type, std::string const& id, cmWIXShortcut const& shortcut)
+{
+  this->Shortcuts[type][id].push_back(shortcut);
+}
+
+bool cmWIXShortcuts::empty(Type type) const
+{
+  return this->Shortcuts.find(type) == this->Shortcuts.end();
+}
+
+bool cmWIXShortcuts::EmitShortcuts(
+  Type type,
+  std::string const& registryKey,
+  std::string const& cpackComponentName,
+  cmWIXFilesSourceWriter& fileDefinitions) const
+{
+  shortcut_type_map_t::const_iterator i = this->Shortcuts.find(type);
+
+  if(i == this->Shortcuts.end())
+    {
+    return false;
+    }
+
+  shortcut_id_map_t const& id_map = i->second;
+
+  std::string shortcutPrefix;
+  std::string registrySuffix;
+
+  switch(type)
+    {
+    case START_MENU:
+      shortcutPrefix = "CM_S";
+      break;
+    case DESKTOP:
+      shortcutPrefix = "CM_DS";
+      registrySuffix = "_desktop";
+      break;
+    default:
+      return false;
+    }
+
+  for(shortcut_id_map_t::const_iterator j = id_map.begin();
+    j != id_map.end(); ++j)
+    {
+    std::string const& id = j->first;
+    shortcut_list_t const& shortcutList = j->second;
+
+    for(shortcut_list_t::const_iterator k = shortcutList.begin();
+      k != shortcutList.end(); ++k)
+      {
+      cmWIXShortcut const& shortcut = *k;
+      fileDefinitions.EmitShortcut(id, shortcut, shortcutPrefix);
+      }
+    }
+
+  fileDefinitions.EmitInstallRegistryValue(
+    registryKey, cpackComponentName, registrySuffix);
+
+  return true;
+}
+
+void cmWIXShortcuts::AddShortcutTypes(std::set<Type>& types)
+{
+  for(shortcut_type_map_t::const_iterator i = this->Shortcuts.begin();
+    i != this->Shortcuts.end(); ++i)
+    {
+    types.insert(i->first);
+    }
+}
diff --git a/Source/CPack/WiX/cmWIXShortcut.h b/Source/CPack/WiX/cmWIXShortcut.h
index 93095e0..a18cbb3 100644
--- a/Source/CPack/WiX/cmWIXShortcut.h
+++ b/Source/CPack/WiX/cmWIXShortcut.h
@@ -1,6 +1,6 @@
 /*============================================================================
   CMake - Cross Platform Makefile Generator
-  Copyright 2014 Kitware, Inc.
+  Copyright 2014-2015 Kitware, Inc.
 
   Distributed under the OSI-approved BSD License (the "License");
   see accompanying file Copyright.txt for details.
@@ -10,20 +10,51 @@
   See the License for more information.
 ============================================================================*/
 
-#ifndef cmWIXFilesShortcut_h
-#define cmWIXFilesShortcut_h
+#ifndef cmWIXShortcut_h
+#define cmWIXShortcut_h
 
 #include <string>
+#include <map>
+#include <set>
+#include <vector>
+
+class cmWIXFilesSourceWriter;
 
 struct cmWIXShortcut
 {
-  cmWIXShortcut()
-    :desktop(false)
-    {}
-
-  std::string textLabel;
+  std::string label;
   std::string workingDirectoryId;
-  bool desktop;
+};
+
+class cmWIXShortcuts
+{
+public:
+  enum Type
+  {
+    START_MENU,
+    DESKTOP
+  };
+
+  typedef std::vector<cmWIXShortcut> shortcut_list_t;
+  typedef std::map<std::string, shortcut_list_t> shortcut_id_map_t;
+
+  void insert(Type type, std::string const& id, cmWIXShortcut const& shortcut);
+
+  bool empty(Type type) const;
+
+  bool EmitShortcuts(
+    Type type,
+    std::string const& registryKey,
+    std::string const& cpackComponentName,
+    cmWIXFilesSourceWriter& fileDefinitions) const;
+
+  void AddShortcutTypes(std::set<Type>& types);
+
+private:
+  typedef std::map<Type, shortcut_id_map_t> shortcut_type_map_t;
+
+  shortcut_type_map_t Shortcuts;
+  shortcut_id_map_t EmptyIdMap;
 };
 
 #endif

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc0f3fb44fb9384438ece513c12d83a36e385802
commit dc0f3fb44fb9384438ece513c12d83a36e385802
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Feb 20 17:51:55 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Feb 20 17:51:55 2015 +0100

    CPackWIX: Explicitly list CPack WIX headers for IDE convenience.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 69bc2a1..0b077d4 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -638,14 +638,24 @@ endif()
 if(WIN32)
   set(CPACK_SRCS ${CPACK_SRCS}
     CPack/WiX/cmCPackWIXGenerator.cxx
+    CPack/WiX/cmCPackWIXGenerator.h
     CPack/WiX/cmWIXAccessControlList.cxx
+    CPack/WiX/cmWIXAccessControlList.h
     CPack/WiX/cmWIXDirectoriesSourceWriter.cxx
+    CPack/WiX/cmWIXDirectoriesSourceWriter.h
     CPack/WiX/cmWIXFeaturesSourceWriter.cxx
+    CPack/WiX/cmWIXFeaturesSourceWriter.h
     CPack/WiX/cmWIXFilesSourceWriter.cxx
+    CPack/WiX/cmWIXFilesSourceWriter.h
     CPack/WiX/cmWIXPatch.cxx
+    CPack/WiX/cmWIXPatch.h
     CPack/WiX/cmWIXPatchParser.cxx
+    CPack/WiX/cmWIXPatchParser.h
     CPack/WiX/cmWIXRichTextFormatWriter.cxx
+    CPack/WiX/cmWIXRichTextFormatWriter.h
+    CPack/WiX/cmWIXShortcut.h
     CPack/WiX/cmWIXSourceWriter.cxx
+    CPack/WiX/cmWIXSourceWriter.h
   )
 endif()
 

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

Summary of changes:
 Help/manual/cmake-properties.7.rst                |    3 +
 Help/prop_inst/CPACK_DESKTOP_SHORTCUTS.rst        |    7 +
 Help/prop_inst/CPACK_STARTUP_SHORTCUTS.rst        |    7 +
 Help/prop_inst/CPACK_START_MENU_SHORTCUTS.rst     |    7 +
 Source/CMakeLists.txt                             |   11 ++
 Source/CPack/WiX/cmCPackWIXGenerator.cxx          |  216 ++++++++++++---------
 Source/CPack/WiX/cmCPackWIXGenerator.h            |   26 ++-
 Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx |    8 +
 Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h   |    2 +
 Source/CPack/WiX/cmWIXFilesSourceWriter.cxx       |   36 +---
 Source/CPack/WiX/cmWIXFilesSourceWriter.h         |   20 +-
 Source/CPack/WiX/cmWIXShortcut.cxx                |  125 ++++++++++++
 Source/CPack/WiX/cmWIXShortcut.h                  |   62 +++++-
 13 files changed, 378 insertions(+), 152 deletions(-)
 create mode 100644 Help/prop_inst/CPACK_DESKTOP_SHORTCUTS.rst
 create mode 100644 Help/prop_inst/CPACK_STARTUP_SHORTCUTS.rst
 create mode 100644 Help/prop_inst/CPACK_START_MENU_SHORTCUTS.rst
 create mode 100644 Source/CPack/WiX/cmWIXShortcut.cxx


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sun Feb 22 00:01:13 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Sun, 22 Feb 2015 00:01:13 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-209-g5cf629c
Message-ID: <20150222050113.11E8BAAEC4@public.kitware.com>

This is an automated email from 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  5cf629c3bc0c7a15d363d6d60e8c3cc04c0618f2 (commit)
      from  8804c3e0e419eb692ba487ffb2a7e36b1f8e728d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5cf629c3bc0c7a15d363d6d60e8c3cc04c0618f2
commit 5cf629c3bc0c7a15d363d6d60e8c3cc04c0618f2
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sun Feb 22 00:01:09 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun Feb 22 00:01:09 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 5311b36..94c9d5d 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 2)
-set(CMake_VERSION_PATCH 20150221)
+set(CMake_VERSION_PATCH 20150222)
 #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  Sun Feb 22 07:08:00 2015
From: brad.king at kitware.com (Brad King)
Date: Sun, 22 Feb 2015 07:08:00 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-584-g235f381
Message-ID: <20150222120804.471ABAAF95@public.kitware.com>

This is an automated email from 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  235f381ba46a49aca8f029b3e9a7c00fb564b19b (commit)
       via  895bf36e8173cd4822050dd351833a772d0e9510 (commit)
       via  23b74116b99c2a514bd3c353ef7a06df0bc20250 (commit)
      from  c9a0af8cdd549a27e1b8002c22209659edff2dc9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=235f381ba46a49aca8f029b3e9a7c00fb564b19b
commit 235f381ba46a49aca8f029b3e9a7c00fb564b19b
Merge: c9a0af8 895bf36
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Feb 22 07:07:57 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 22 07:07:57 2015 -0500

    Merge topic 'ctest-output-options' into next
    
    895bf36e fixup! Tests/RunCMake/ctest_submit: Match more error message combinations
    23b74116 fixup! Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=895bf36e8173cd4822050dd351833a772d0e9510
commit 895bf36e8173cd4822050dd351833a772d0e9510
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Feb 22 07:07:13 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Feb 22 07:07:13 2015 -0500

    fixup! Tests/RunCMake/ctest_submit: Match more error message combinations

diff --git a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
index 182bd10..8496b68 100644
--- a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
@@ -1,4 +1,4 @@
  *Error when uploading file: .*/Configure.xml
- *Error message was: [Cc]ould *n.t resolve host '?-no-site-'?
+ *Error message was: [Cc]ould *n.t resolve host:? '?-no-site-'?
  *Problems when submitting via HTTP
  *Error in read script: .*/Tests/RunCMake/ctest_submit/CDashSubmitQuiet/test.cmake

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23b74116b99c2a514bd3c353ef7a06df0bc20250
commit 23b74116b99c2a514bd3c353ef7a06df0bc20250
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Feb 22 07:03:39 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Feb 22 07:03:39 2015 -0500

    fixup! Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases
    
    Match a ":" in the output.

diff --git a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
index 4cd60ed..c75b209 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
@@ -1,3 +1,3 @@
-Error message was: [Cc]ould *n.t resolve host '?-no-site-'?
+Error message was: [Cc]ould *n.t resolve host:? '?-no-site-'?
    Problems when submitting via FTP
 Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-ftp/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
index 9a32d9e..64a21a1 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
@@ -1,3 +1,3 @@
-Error message was: [Cc]ould *n.t resolve host '?-no-site-'?
+Error message was: [Cc]ould *n.t resolve host:? '?-no-site-'?
    Problems when submitting via HTTP
 Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-http/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
index 0f49c04..59c88d9 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
@@ -1,3 +1,3 @@
-Error message was: ([Cc]ould *n.t resolve host '?-no-site-'?|Protocol "https" not supported or disabled in .*|.* was built with SSL disabled.*)
+Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|Protocol "https" not supported or disabled in .*|.* was built with SSL disabled.*)
    Problems when submitting via HTTP
 Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-https/test.cmake

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

Summary of changes:
 Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt |    2 +-
 Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt     |    2 +-
 Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt    |    2 +-
 Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From nilsgladitz at gmail.com  Sun Feb 22 09:21:32 2015
From: nilsgladitz at gmail.com (Nils Gladitz)
Date: Sun, 22 Feb 2015 09:21:32 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-586-g3407f3c
Message-ID: <20150222142132.AC473AA5DD@public.kitware.com>

This is an automated email from 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  3407f3cdc19ed352d4cd1145eca25b11adad6fdf (commit)
       via  135febf069e7ff5305a3729b81171933ec89dc90 (commit)
      from  235f381ba46a49aca8f029b3e9a7c00fb564b19b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3407f3cdc19ed352d4cd1145eca25b11adad6fdf
commit 3407f3cdc19ed352d4cd1145eca25b11adad6fdf
Merge: 235f381 135febf
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sun Feb 22 09:21:31 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 22 09:21:31 2015 -0500

    Merge topic 'wix-shortcut-properties' into next
    
    135febf0 CPackWIX: Enhance CMake CPack WIX generated installer.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=135febf069e7ff5305a3729b81171933ec89dc90
commit 135febf069e7ff5305a3729b81171933ec89dc90
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sun Feb 22 15:20:33 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Sun Feb 22 15:20:33 2015 +0100

    CPackWIX: Enhance CMake CPack WIX generated installer.

diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in
index 57ed4ca..cc8f5e9 100644
--- a/CMakeCPackOptions.cmake.in
+++ b/CMakeCPackOptions.cmake.in
@@ -87,4 +87,26 @@ if("${CPACK_GENERATOR}" STREQUAL "WIX")
   if(patch MATCHES "^[0-9]+$" AND patch LESS 65535)
     set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}.${patch}")
   endif()
+
+  set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "http://www.cmake.org")
+
+  set(CPACK_WIX_PROPERTY_ARPCONTACT "@CPACK_PACKAGE_CONTACT@")
+
+  set(CPACK_WIX_PROPERTY_ARPCOMMENTS
+    "CMake is a cross-platform, open-source build system."
+  )
+
+  set(CPACK_WIX_PRODUCT_ICON
+    "@CMake_SOURCE_DIR@/Utilities/Release/CMakeLogo.ico"
+  )
+
+  set_property(INSTALL "@CMAKE_DOC_DIR@/html/index.html" PROPERTY
+    CPACK_START_MENU_SHORTCUTS "CMake Documentation"
+  )
+
+  set_property(INSTALL "cmake.org.html" PROPERTY
+    CPACK_START_MENU_SHORTCUTS "CMake Web Site"
+  )
+
+  set(CPACK_WIX_LIGHT_EXTRA_FLAGS "-dcl:high")
 endif()

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

Summary of changes:
 CMakeCPackOptions.cmake.in |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)


hooks/post-receive
-- 
CMake

From eike at sf-mail.de  Sun Feb 22 16:26:43 2015
From: eike at sf-mail.de (Rolf Eike Beer)
Date: Sun, 22 Feb 2015 16:26:43 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-589-g98f77b6
Message-ID: <20150222212643.8D132AA942@public.kitware.com>

This is an automated email from 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  98f77b65bf1848fd3b29c4fe3a4c2b041258aa58 (commit)
       via  51f8de810223139ea0dcb7bafcabe12fc8e075c1 (commit)
       via  5cf629c3bc0c7a15d363d6d60e8c3cc04c0618f2 (commit)
      from  3407f3cdc19ed352d4cd1145eca25b11adad6fdf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98f77b65bf1848fd3b29c4fe3a4c2b041258aa58
commit 98f77b65bf1848fd3b29c4fe3a4c2b041258aa58
Merge: 3407f3c 51f8de8
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Feb 22 16:26:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 22 16:26:42 2015 -0500

    Merge topic 'if-optimize' into next
    
    51f8de81 if(): avoid one needless string compare for all if() statements
    5cf629c3 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51f8de810223139ea0dcb7bafcabe12fc8e075c1
commit 51f8de810223139ea0dcb7bafcabe12fc8e075c1
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Feb 22 13:48:30 2015 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Feb 22 13:48:30 2015 +0100

    if(): avoid one needless string compare for all if() statements
    
    If it's known that it is an "if" it can't be an "elseif".

diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index 3362abb..6dea5c1 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -45,7 +45,7 @@ IsFunctionBlocked(const cmListFileFunction& lff,
     {
     this->ScopeDepth++;
     }
-  if (!cmSystemTools::Strucmp(lff.Name.c_str(),"endif"))
+  else if (!cmSystemTools::Strucmp(lff.Name.c_str(),"endif"))
     {
     this->ScopeDepth--;
     // if this is the endif for this if statement, then start executing

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

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 Source/cmIfCommand.cxx    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From domen.vrankar at gmail.com  Sun Feb 22 18:44:38 2015
From: domen.vrankar at gmail.com (Domen Vrankar)
Date: Sun, 22 Feb 2015 18:44:38 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-591-g743fe7d
Message-ID: <20150222234438.602402C9D0@public.kitware.com>

This is an automated email from 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  743fe7d75f43842bf9ba5ba15d30b2cb4b6d792a (commit)
       via  f21e4ae9652b17457dc058b598274538a7ff2d89 (commit)
      from  98f77b65bf1848fd3b29c4fe3a4c2b041258aa58 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=743fe7d75f43842bf9ba5ba15d30b2cb4b6d792a
commit 743fe7d75f43842bf9ba5ba15d30b2cb4b6d792a
Merge: 98f77b6 f21e4ae
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun Feb 22 18:44:37 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 22 18:44:37 2015 -0500

    Merge topic 'rpm_run_tests_on_other_platforms' into next
    
    f21e4ae9 CPack/RPM: run tests on other platforms


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f21e4ae9652b17457dc058b598274538a7ff2d89
commit f21e4ae9652b17457dc058b598274538a7ff2d89
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Mon Feb 23 00:43:09 2015 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Mon Feb 23 00:43:09 2015 +0100

    CPack/RPM: run tests on other platforms
    
    Current restriction limits use of CPackRPM
    tests to Linux OS only but RPM can also be
    used on for e.g. AIX which is Unix OS.
    Patch removes OS specific restriction.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index cb45e79..4d3aeaf 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -104,7 +104,7 @@ if(BUILD_TESTING)
 
   # Look for rpmbuild to use for tests.
   # The tool does not work with spaces in the path.
-  if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CURRENT_BINARY_DIR MATCHES " ")
+  if(NOT CMAKE_CURRENT_BINARY_DIR MATCHES " ")
     find_program(RPMBUILD_EXECUTABLE NAMES rpmbuild)
   else()
     set(RPMBUILD_EXECUTABLE "RPMBUILD_EXECUTABLE-NOTFOUND")

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

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


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Mon Feb 23 00:01:10 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Mon, 23 Feb 2015 00:01:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-210-g6adff76
Message-ID: <20150223050110.71CA6AA929@public.kitware.com>

This is an automated email from 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  6adff767208c2238efb2649395a76bc2ea78fb08 (commit)
      from  5cf629c3bc0c7a15d363d6d60e8c3cc04c0618f2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6adff767208c2238efb2649395a76bc2ea78fb08
commit 6adff767208c2238efb2649395a76bc2ea78fb08
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Mon Feb 23 00:01:08 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Feb 23 00:01:08 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 94c9d5d..bee5291 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 2)
-set(CMake_VERSION_PATCH 20150222)
+set(CMake_VERSION_PATCH 20150223)
 #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 Feb 23 09:58:22 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 09:58:22 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-594-g7697f2d
Message-ID: <20150223145822.825ABAAE8C@public.kitware.com>

This is an automated email from 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  7697f2d205067cf5eb7b0b387314a621b8d896f4 (commit)
       via  2a69dfe40ee03787e02cdba0fc0a785b13ed8eae (commit)
       via  51bc77c9ebc3a4356f21e65965ce807222fb5eba (commit)
      from  743fe7d75f43842bf9ba5ba15d30b2cb4b6d792a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7697f2d205067cf5eb7b0b387314a621b8d896f4
commit 7697f2d205067cf5eb7b0b387314a621b8d896f4
Merge: 743fe7d 2a69dfe
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 09:58:21 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 09:58:21 2015 -0500

    Merge topic 'ctest-output-options' into next
    
    2a69dfe4 fixup! Tests/RunCMake/ctest_submit: Match more error message combinations
    51bc77c9 fixup! Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a69dfe40ee03787e02cdba0fc0a785b13ed8eae
commit 2a69dfe40ee03787e02cdba0fc0a785b13ed8eae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 09:56:35 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 09:56:35 2015 -0500

    fixup! Tests/RunCMake/ctest_submit: Match more error message combinations

diff --git a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
index 8496b68..ec0a869 100644
--- a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
@@ -1,4 +1,4 @@
  *Error when uploading file: .*/Configure.xml
- *Error message was: [Cc]ould *n.t resolve host:? '?-no-site-'?
+ *Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
  *Problems when submitting via HTTP
  *Error in read script: .*/Tests/RunCMake/ctest_submit/CDashSubmitQuiet/test.cmake

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51bc77c9ebc3a4356f21e65965ce807222fb5eba
commit 51bc77c9ebc3a4356f21e65965ce807222fb5eba
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 09:56:12 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 09:56:12 2015 -0500

    fixup! Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases

diff --git a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
index 64a21a1..9895181 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
@@ -1,3 +1,3 @@
-Error message was: [Cc]ould *n.t resolve host:? '?-no-site-'?
+Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
    Problems when submitting via HTTP
 Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-http/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
index 59c88d9..a9c5d58 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
@@ -1,3 +1,3 @@
-Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|Protocol "https" not supported or disabled in .*|.* was built with SSL disabled.*)
+Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*|Protocol "https" not supported or disabled in .*|.* was built with SSL disabled.*)
    Problems when submitting via HTTP
 Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-https/test.cmake

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

Summary of changes:
 Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt |    2 +-
 Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt    |    2 +-
 Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 10:01:35 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:01:35 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-596-gc2459bf
Message-ID: <20150223150135.F3062AAF48@public.kitware.com>

This is an automated email from 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  c2459bf1167b9e019292b7dfe1b7cb2bf9657a36 (commit)
       via  6f36887fea0c630d40b2238f2e4679e24ca4408b (commit)
      from  7697f2d205067cf5eb7b0b387314a621b8d896f4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2459bf1167b9e019292b7dfe1b7cb2bf9657a36
commit c2459bf1167b9e019292b7dfe1b7cb2bf9657a36
Merge: 7697f2d 6f36887
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:01:34 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:01:34 2015 -0500

    Merge topic 'ctest-output-options' into next
    
    6f36887f fixup! Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f36887fea0c630d40b2238f2e4679e24ca4408b
commit 6f36887fea0c630d40b2238f2e4679e24ca4408b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:01:10 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:01:10 2015 -0500

    fixup! Tests: Match curl error in RunCMake.ctest_submit FailDrop-http* cases

diff --git a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
index c75b209..4345918 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
@@ -1,3 +1,3 @@
-Error message was: [Cc]ould *n.t resolve host:? '?-no-site-'?
+Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
    Problems when submitting via FTP
 Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-ftp/test.cmake

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

Summary of changes:
 Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 10:20:37 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:20:37 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-598-g452eb7e
Message-ID: <20150223152037.B2902AAD2E@public.kitware.com>

This is an automated email from 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  452eb7ef198d9792086517ddb93ddaeff35facce (commit)
       via  8c0474cd2c0b3ad589950bc60d9af22f26111717 (commit)
      from  c2459bf1167b9e019292b7dfe1b7cb2bf9657a36 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=452eb7ef198d9792086517ddb93ddaeff35facce
commit 452eb7ef198d9792086517ddb93ddaeff35facce
Merge: c2459bf 8c0474c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:20:37 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:20:37 2015 -0500

    Merge topic 'rpm_run_tests_on_other_platforms' into next
    
    8c0474cd CPackRPM: run tests on more platforms than just Linux


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c0474cd2c0b3ad589950bc60d9af22f26111717
commit 8c0474cd2c0b3ad589950bc60d9af22f26111717
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Mon Feb 23 00:43:09 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:19:29 2015 -0500

    CPackRPM: run tests on more platforms than just Linux
    
    Lift the restriction that limits use of CPackRPM tests to Linux OS only
    because RPM can also be used on e.g. AIX which is Unix OS.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index cb45e79..4d3aeaf 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -104,7 +104,7 @@ if(BUILD_TESTING)
 
   # Look for rpmbuild to use for tests.
   # The tool does not work with spaces in the path.
-  if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CURRENT_BINARY_DIR MATCHES " ")
+  if(NOT CMAKE_CURRENT_BINARY_DIR MATCHES " ")
     find_program(RPMBUILD_EXECUTABLE NAMES rpmbuild)
   else()
     set(RPMBUILD_EXECUTABLE "RPMBUILD_EXECUTABLE-NOTFOUND")

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 10:26:32 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:26:32 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-213-g1eb1929
Message-ID: <20150223152632.09782AAF7B@public.kitware.com>

This is an automated email from 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  1eb192905d81943073c3cbdd56b665e80e235087 (commit)
       via  a41d621d30f73d4a17e4fd2d3ff30f87f1ed4ccc (commit)
       via  a5768442636c7fe909e8afc205fd19ac13b9fbc2 (commit)
      from  6adff767208c2238efb2649395a76bc2ea78fb08 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1eb192905d81943073c3cbdd56b665e80e235087
commit 1eb192905d81943073c3cbdd56b665e80e235087
Merge: 6adff76 a41d621
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:26:30 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:26:30 2015 -0500

    Merge topic 'private-FindJsonCpp'
    
    a41d621d bootstrap: Add --(no-)system-jsoncpp options
    a5768442 FindJsonCpp: Drop new module due to upstream jsoncpp providing package


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

Summary of changes:
 CMakeLists.txt                                |    6 ++----
 Help/manual/cmake-modules.7.rst               |    1 -
 Help/module/FindJsonCpp.rst                   |    1 -
 Help/release/3.2.rst                          |    3 ---
 {Modules => Source/Modules}/FindJsonCpp.cmake |    2 +-
 Tests/FindJsonCpp/Test/CMakeLists.txt         |    3 +++
 bootstrap                                     |    6 ++++--
 7 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 Help/module/FindJsonCpp.rst
 rename {Modules => Source/Modules}/FindJsonCpp.cmake (97%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 10:26:34 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:26:34 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-215-gae7c5f0
Message-ID: <20150223152634.03C83AAF84@public.kitware.com>

This is an automated email from 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  ae7c5f05c34f2f908573f01d84bd67e34de7b476 (commit)
       via  b4005a3ad9af5283f40befe7382a95c27799a90a (commit)
      from  1eb192905d81943073c3cbdd56b665e80e235087 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae7c5f05c34f2f908573f01d84bd67e34de7b476
commit ae7c5f05c34f2f908573f01d84bd67e34de7b476
Merge: 1eb1929 b4005a3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:26:32 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:26:32 2015 -0500

    Merge topic 'FindCurses-remove-unused-check'
    
    b4005a3a FindCurses: Drop unused check for cbreak in tinfo library


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

Summary of changes:
 Modules/FindCurses.cmake |    2 --
 1 file changed, 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 10:26:35 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:26:35 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-217-ga089c1c
Message-ID: <20150223152635.D3B03AAF86@public.kitware.com>

This is an automated email from 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  a089c1c9038e040b9df5809a02768351f601a613 (commit)
       via  7b582d15ff4d70e77287eaf5abb4ea240eb26da6 (commit)
      from  ae7c5f05c34f2f908573f01d84bd67e34de7b476 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a089c1c9038e040b9df5809a02768351f601a613
commit a089c1c9038e040b9df5809a02768351f601a613
Merge: ae7c5f0 7b582d1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:26:34 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:26:34 2015 -0500

    Merge topic 'cpack-bundle-codesign-output'
    
    7b582d15 CPack: Print output from codesign if signing fails


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

Summary of changes:
 Source/CPack/cmCPackBundleGenerator.cxx |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 10:26:37 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:26:37 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-219-g15c409f
Message-ID: <20150223152637.987CFAAF86@public.kitware.com>

This is an automated email from 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  15c409f4674ad3a94cb03fae145ddcf0b233a4d0 (commit)
       via  e1da4dc2dd55926c9d7140f830a5338512279b3f (commit)
      from  a089c1c9038e040b9df5809a02768351f601a613 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15c409f4674ad3a94cb03fae145ddcf0b233a4d0
commit 15c409f4674ad3a94cb03fae145ddcf0b233a4d0
Merge: a089c1c e1da4dc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:26:36 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:26:36 2015 -0500

    Merge topic 'CheckStructHasMember-fix-null-deref-warning'
    
    e1da4dc2 CheckStructHasMember: fix null deref warning (#15413)


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 10:26:39 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:26:39 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-242-gcc36110
Message-ID: <20150223152639.C7A0AAAF92@public.kitware.com>

This is an automated email from 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  cc3611023d9d5ca9ad1eabe13dfb12577970e283 (commit)
       via  bb9d71b4fee2cc4abf55e0dcbadf85c6cbe0d07d (commit)
       via  4afe6c26c66556827e6089982c49b8dea3a2efcb (commit)
       via  a3a0a8c222b59f15502f52192bf41c4af2882392 (commit)
       via  8c74a41ff3b6fce1bb7d088d16f5e0a9ae8ab55d (commit)
       via  61fe1919de8c0455a6baff543ccfcb35fce8f37b (commit)
       via  09d6125bfe4034f332956f4bcc5b0a1ba0b82e27 (commit)
       via  8ed6ecac3fb0f832333e2d5d6f3551ab8e335d0f (commit)
       via  dfe49c205654a51f860507ea5d8ad133b2a4f064 (commit)
       via  21b0654ace2ce58d191c2e42a8583b05614cd037 (commit)
       via  416df93aa93d0a633f0e7354d0562934f676768b (commit)
       via  37b88d348a20921c835ce7aa99f6db62271503a7 (commit)
       via  a281809384cc19cc9a7d1726b243020b380b9395 (commit)
       via  76207b0861478318115d65c2e983f4d88c937724 (commit)
       via  60c3bb73e39f7b19a17c989a0f9bf70bbfe73683 (commit)
       via  05fec779d33b872721b9731e872125ebeb89403b (commit)
       via  9c225767873ce64a745e865c6f1c3372a8ab45d9 (commit)
       via  ee5bc006ebee898729b81237719106704a2bb38a (commit)
       via  b3a0c6e08f36efc5f3cd4c1a0d9614a789f91e38 (commit)
       via  f20a4257f2889387fcbf540b29b16f10843f2f9e (commit)
       via  ee269f4f16300b0427c1e1baef94b85ccc4ea13f (commit)
       via  470cff497bc26d48ee05de0b260af2546bb7698c (commit)
       via  e6ca1b82744154fa048634abdc353e4118a11979 (commit)
      from  15c409f4674ad3a94cb03fae145ddcf0b233a4d0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc3611023d9d5ca9ad1eabe13dfb12577970e283
commit cc3611023d9d5ca9ad1eabe13dfb12577970e283
Merge: 15c409f bb9d71b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:26:38 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:26:38 2015 -0500

    Merge topic 'use-algorithms'
    
    bb9d71b4 Replace loops with algorithms.
    4afe6c26 cmAlgorithms: Add cmReverseRange adaptor.
    a3a0a8c2 cmAlgorithms: Add cmFindNot algorithm.
    8c74a41f cmRST: Replace two erase with a rotate and larger erase.
    61fe1919 cmAlgorithms: Update concept requirement to FowardIterator
    09d6125b cmAlgorithms: Move cmRotate out of 'implementation detail' namespace.
    8ed6ecac cmRST: Move two algorithms beside each other.
    dfe49c20 cmRST: Use std::min where appropriate.
    21b0654a cmGlobalGenerator: Convert set insert algorithm to vector algorithms.
    416df93a Convert some raw loops to cmWrap.
    37b88d34 cmAlgorithms: Add cmWrap.
    a2818093 Use cmJoin where possible.
    76207b08 cmCacheManager: Replace loop with algorithm.
    60c3bb73 cmGlobalGenerator: Replace loop with algorithm.
    05fec779 cmTarget: Port loop to algorithm.
    9c225767 cmGlobalGenerator: Replace set::insert algorithm with cmRemoveDuplicates.
    ...


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

Summary of changes:
 Source/cmAlgorithms.h                              |   54 ++++++++++++++----
 Source/cmCTest.cxx                                 |    7 +--
 Source/cmCacheManager.cxx                          |    6 +-
 Source/cmComputeLinkDepends.cxx                    |    5 +-
 Source/cmCoreTryCompile.cxx                        |   23 ++------
 Source/cmFindBase.cxx                              |   19 +------
 Source/cmFindPackageCommand.cxx                    |   14 +----
 Source/cmGeneratorTarget.cxx                       |   11 ++--
 Source/cmGlobalGenerator.cxx                       |   59 +++++++++-----------
 Source/cmListCommand.cxx                           |    3 +-
 Source/cmLocalGenerator.cxx                        |    7 +--
 Source/cmLocalUnixMakefileGenerator3.cxx           |   15 +----
 Source/cmMakefile.cxx                              |   46 ++++-----------
 Source/cmRST.cxx                                   |   30 ++++------
 Source/cmSystemTools.cxx                           |    2 +-
 Source/cmTarget.cxx                                |    9 +--
 Source/cmcmd.cxx                                   |   28 ++--------
 .../File_Generate/CommandConflict-stderr.txt       |    2 +-
 18 files changed, 127 insertions(+), 213 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 10:26:41 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:26:41 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-244-g88aeb64
Message-ID: <20150223152641.AEBDAAAF83@public.kitware.com>

This is an automated email from 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  88aeb64ddfb129701b6709f27531da0a885593eb (commit)
       via  f93438cd839fa209afbf227b5a6a0b58214004b7 (commit)
      from  cc3611023d9d5ca9ad1eabe13dfb12577970e283 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88aeb64ddfb129701b6709f27531da0a885593eb
commit 88aeb64ddfb129701b6709f27531da0a885593eb
Merge: cc36110 f93438c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:26:40 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:26:40 2015 -0500

    Merge topic 'fix-graphiz-typo'
    
    f93438cd Fix typo, graphiz -> graphviz.


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 10:26:45 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:26:45 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-249-g6dc9a62
Message-ID: <20150223152645.E501BAAF85@public.kitware.com>

This is an automated email from 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  6dc9a627b635617870945677b4868e212f4184ed (commit)
       via  c021f59c1f2f3d892b621a9ba163b069f2a2f0a9 (commit)
       via  2d130896a05ef14f2ef53ed472c6926a85cc5399 (commit)
       via  f19692342ba41ddb2638e118e2864bceca77af59 (commit)
       via  1116698a89e4057300481bac8f38bfd95f4e9ce5 (commit)
      from  88aeb64ddfb129701b6709f27531da0a885593eb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6dc9a627b635617870945677b4868e212f4184ed
commit 6dc9a627b635617870945677b4868e212f4184ed
Merge: 88aeb64 c021f59
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:26:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:26:42 2015 -0500

    Merge topic 'minor-cleanups'
    
    c021f59c cmMakefile: Store macro list in a vector not in a map.
    2d130896 cmMakefile: Fix list of macros generation.
    f1969234 cmFunctionCommand: Remove ineffectual code.
    1116698a cmTarget: Don't needlessly clear vectors in the destructor.


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

Summary of changes:
 Source/cmFunctionCommand.cxx         |    5 -----
 Source/cmGetCMakePropertyCommand.cxx |    1 +
 Source/cmMacroCommand.cxx            |   10 +---------
 Source/cmMakefile.cxx                |   22 ++++++----------------
 Source/cmMakefile.h                  |    5 ++---
 Source/cmTarget.cxx                  |   10 +++++-----
 6 files changed, 15 insertions(+), 38 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 10:26:47 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:26:47 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-251-g67fa946
Message-ID: <20150223152647.C2429AAF85@public.kitware.com>

This is an automated email from 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  67fa9462adbad2b90b13ba942f2a71c0ea7674c1 (commit)
       via  8c0474cd2c0b3ad589950bc60d9af22f26111717 (commit)
      from  6dc9a627b635617870945677b4868e212f4184ed (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67fa9462adbad2b90b13ba942f2a71c0ea7674c1
commit 67fa9462adbad2b90b13ba942f2a71c0ea7674c1
Merge: 6dc9a62 8c0474c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:26:46 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:26:46 2015 -0500

    Merge topic 'rpm_run_tests_on_other_platforms'
    
    8c0474cd CPackRPM: run tests on more platforms than just Linux


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 10:26:49 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:26:49 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-253-g9627c52
Message-ID: <20150223152649.896DDAAF91@public.kitware.com>

This is an automated email from 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  9627c5238a08acfdeea4a26c0cdea7de68470a72 (commit)
       via  51f8de810223139ea0dcb7bafcabe12fc8e075c1 (commit)
      from  67fa9462adbad2b90b13ba942f2a71c0ea7674c1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9627c5238a08acfdeea4a26c0cdea7de68470a72
commit 9627c5238a08acfdeea4a26c0cdea7de68470a72
Merge: 67fa946 51f8de8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:26:48 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:26:48 2015 -0500

    Merge topic 'if-optimize'
    
    51f8de81 if(): avoid one needless string compare for all if() statements


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 10:27:56 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:27:56 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-609-g99c7be0
Message-ID: <20150223152756.BB4BBAAFAA@public.kitware.com>

This is an automated email from 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  99c7be0411b3117a81d5bf2e990af1bdab14fc1f (commit)
       via  9627c5238a08acfdeea4a26c0cdea7de68470a72 (commit)
       via  67fa9462adbad2b90b13ba942f2a71c0ea7674c1 (commit)
       via  6dc9a627b635617870945677b4868e212f4184ed (commit)
       via  88aeb64ddfb129701b6709f27531da0a885593eb (commit)
       via  cc3611023d9d5ca9ad1eabe13dfb12577970e283 (commit)
       via  15c409f4674ad3a94cb03fae145ddcf0b233a4d0 (commit)
       via  a089c1c9038e040b9df5809a02768351f601a613 (commit)
       via  ae7c5f05c34f2f908573f01d84bd67e34de7b476 (commit)
       via  1eb192905d81943073c3cbdd56b665e80e235087 (commit)
       via  6adff767208c2238efb2649395a76bc2ea78fb08 (commit)
      from  452eb7ef198d9792086517ddb93ddaeff35facce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99c7be0411b3117a81d5bf2e990af1bdab14fc1f
commit 99c7be0411b3117a81d5bf2e990af1bdab14fc1f
Merge: 452eb7e 9627c52
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:27:49 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:27:49 2015 -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 Feb 23 10:30:17 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:30:17 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-256-g9f487b1
Message-ID: <20150223153017.C6050AAFF5@public.kitware.com>

This is an automated email from 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  9f487b1dadc65adb5215c3d97fc64cfd3ba4b26c (commit)
       via  d95d4c2c775e6eb6db1800be869d97b5464628ab (commit)
       via  57d4e1c77684986e26b5ebc6092564fc6cc1c655 (commit)
      from  9627c5238a08acfdeea4a26c0cdea7de68470a72 (commit)

Those revisions listed 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  Mon Feb 23 10:30:17 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:30:17 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-613-g87fa742
Message-ID: <20150223153017.EBFB4AAFF4@public.kitware.com>

This is an automated email from 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  87fa74298625bf860d9d607a7c5446c210f6233b (commit)
       via  9f487b1dadc65adb5215c3d97fc64cfd3ba4b26c (commit)
       via  d95d4c2c775e6eb6db1800be869d97b5464628ab (commit)
       via  57d4e1c77684986e26b5ebc6092564fc6cc1c655 (commit)
      from  99c7be0411b3117a81d5bf2e990af1bdab14fc1f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87fa74298625bf860d9d607a7c5446c210f6233b
commit 87fa74298625bf860d9d607a7c5446c210f6233b
Merge: 99c7be0 9f487b1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:29:56 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:29:56 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 10:30:18 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:30:18 -0500 (EST)
Subject: [Cmake-commits] CMake branch, release,
	updated. v3.2.0-rc1-15-gd95d4c2
Message-ID: <20150223153018.53FD5AAFFE@public.kitware.com>

This is an automated email from 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  d95d4c2c775e6eb6db1800be869d97b5464628ab (commit)
       via  b4005a3ad9af5283f40befe7382a95c27799a90a (commit)
       via  57d4e1c77684986e26b5ebc6092564fc6cc1c655 (commit)
       via  a41d621d30f73d4a17e4fd2d3ff30f87f1ed4ccc (commit)
       via  a5768442636c7fe909e8afc205fd19ac13b9fbc2 (commit)
      from  20f64bd2dadbfe740e76d627523adf2161a515f3 (commit)

Those revisions listed 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:
 CMakeLists.txt                                |    6 ++----
 Help/manual/cmake-modules.7.rst               |    1 -
 Help/module/FindJsonCpp.rst                   |    1 -
 Help/release/3.2.rst                          |    3 ---
 Modules/FindCurses.cmake                      |    2 --
 {Modules => Source/Modules}/FindJsonCpp.cmake |    2 +-
 Tests/FindJsonCpp/Test/CMakeLists.txt         |    3 +++
 bootstrap                                     |    6 ++++--
 8 files changed, 10 insertions(+), 14 deletions(-)
 delete mode 100644 Help/module/FindJsonCpp.rst
 rename {Modules => Source/Modules}/FindJsonCpp.cmake (97%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 10:31:00 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:31:00 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-617-g983811f
Message-ID: <20150223153100.35D56AB00A@public.kitware.com>

This is an automated email from 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  983811fb737927e3d50402b34d15fe03bf2cca42 (commit)
       via  dbe53d48c1e7649ab3f073e5b04608027c6113d8 (commit)
       via  8e3d535ae9582cdcbbec0a269cb98aeb358cda17 (commit)
       via  bee22eec3e34359b0669d63f9aadeeffc5ef5805 (commit)
      from  87fa74298625bf860d9d607a7c5446c210f6233b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=983811fb737927e3d50402b34d15fe03bf2cca42
commit 983811fb737927e3d50402b34d15fe03bf2cca42
Merge: 87fa742 dbe53d4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:30:59 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:30:59 2015 -0500

    Merge topic 'refine-MSVC-ARM-WinCE' into next
    
    dbe53d48 MSVC: Compile with arch-specific flags on ARM platforms (#14552)
    8e3d535a MSVC: Distinguish among ARM architectures more precisely (#14552)
    bee22eec MSVC: Define /DWINCE when building for WinCE platforms (#14552)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dbe53d48c1e7649ab3f073e5b04608027c6113d8
commit dbe53d48c1e7649ab3f073e5b04608027c6113d8
Author:     Gunnar Roth <gunnar.roth at gmx.de>
AuthorDate: Fri Feb 13 10:14:34 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 09:38:39 2015 -0500

    MSVC: Compile with arch-specific flags on ARM platforms (#14552)
    
    Define the exact ARM architecture name as a preprocessor symbol.
    Compile with /QRarch4T or /QRarch5T on ARMV4I or ARMV5I.

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 37b01d5..2d8dac9 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -155,7 +155,18 @@ if(WINCE)
   set(_PLATFORM_DEFINES_CXX " /D${_MSVC_CXX_ARCHITECTURE_FAMILY} /D_${_MSVC_CXX_ARCHITECTURE_FAMILY_UPPER}_")
 
   set(_RTC1 "")
+  set(_FLAGS_C "")
   set(_FLAGS_CXX " /GR /EHsc")
+
+  foreach(lang C CXX)
+    if(_MSVC_${lang}_ARCHITECTURE_FAMILY STREQUAL "ARM")
+      set(_PLATFORM_DEFINES_${lang} "${_PLATFORM_DEFINES_${lang}} /D${MSVC_${lang}_ARCHITECTURE_ID}")
+      if(MSVC_${lang}_ARCHITECTURE_ID MATCHES "^ARMV([45])I$")
+        set(_FLAGS_${lang} "${_FLAGS_${lang}} /QRarch${CMAKE_MATCH_1}T")
+      endif()
+    endif()
+  endforeach()
+
   set(CMAKE_C_STANDARD_LIBRARIES_INIT "coredll.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib")
   set(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT} /NODEFAULTLIB:libc.lib /NODEFAULTLIB:oldnames.lib")
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e3d535ae9582cdcbbec0a269cb98aeb358cda17
commit 8e3d535ae9582cdcbbec0a269cb98aeb358cda17
Author:     Gunnar Roth <gunnar.roth at gmx.de>
AuthorDate: Fri Feb 13 10:11:38 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 09:38:28 2015 -0500

    MSVC: Distinguish among ARM architectures more precisely (#14552)
    
    Detect the exact ARM architecture instead of just "ARM".  Treat "ARM" as
    an architecture family that includes THUMB (ARMV4I and ARMV5I).

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index d22a867..403ac08 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -508,8 +508,6 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
         set(ARCHITECTURE_ID "SH4")
       elseif(peheader STREQUAL "50450000a801")
         set(ARCHITECTURE_ID "SH5")
-      elseif(peheader STREQUAL "50450000c201")
-        set(ARCHITECTURE_ID "THUMB")
       endif()
     endif()
 
diff --git a/Modules/CMakePlatformId.h.in b/Modules/CMakePlatformId.h.in
index bc26c07..da99b9e 100644
--- a/Modules/CMakePlatformId.h.in
+++ b/Modules/CMakePlatformId.h.in
@@ -1,3 +1,6 @@
+#define STRINGIFY_HELPER(X) #X
+#define STRINGIFY(X) STRINGIFY_HELPER(X)
+
 /* Identify known platforms by name.  */
 #if defined(__linux) || defined(__linux__) || defined(linux)
 # define PLATFORM_ID "Linux"
@@ -112,7 +115,13 @@
 #  define ARCHITECTURE_ID "X86"
 
 # elif defined(_M_ARM)
-#  define ARCHITECTURE_ID "ARM"
+#  if _M_ARM == 4
+#   define ARCHITECTURE_ID "ARMV4I"
+#  elif _M_ARM == 5
+#   define ARCHITECTURE_ID "ARMV5I"
+#  else
+#   define ARCHITECTURE_ID "ARMV" STRINGIFY(_M_ARM)
+#  endif
 
 # elif defined(_M_MIPS)
 #  define ARCHITECTURE_ID "MIPS"
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 4098c3f..37b01d5 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -134,7 +134,7 @@ set(CMAKE_BUILD_TYPE_INIT Debug)
 if(WINCE)
   foreach(lang C CXX)
     set(_MSVC_${lang}_ARCHITECTURE_FAMILY "${MSVC_${lang}_ARCHITECTURE_ID}")
-    if(_MSVC_${lang}_ARCHITECTURE_FAMILY STREQUAL "THUMB")
+    if(_MSVC_${lang}_ARCHITECTURE_FAMILY MATCHES "^ARM")
       set(_MSVC_${lang}_ARCHITECTURE_FAMILY "ARM")
     elseif(_MSVC_${lang}_ARCHITECTURE_FAMILY MATCHES "^SH")
       set(_MSVC_${lang}_ARCHITECTURE_FAMILY "SHx")
@@ -168,7 +168,7 @@ elseif(WINDOWS_PHONE OR WINDOWS_STORE)
   set(_FLAGS_CXX " /DUNICODE /D_UNICODE /GR /EHsc")
   if(WINDOWS_PHONE)
     set(CMAKE_C_STANDARD_LIBRARIES_INIT "WindowsPhoneCore.lib RuntimeObject.lib PhoneAppModelHost.lib")
-  elseif(MSVC_C_ARCHITECTURE_ID STREQUAL ARM OR MSVC_CXX_ARCHITECTURE_ID STREQUAL ARM)
+  elseif(_MSVC_C_ARCHITECTURE_FAMILY STREQUAL "ARM" OR _MSVC_CXX_ARCHITECTURE_FAMILY STREQUAL "ARM")
     set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib")
   else()
     set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib")
@@ -176,7 +176,7 @@ elseif(WINDOWS_PHONE OR WINDOWS_STORE)
 else()
   set(_PLATFORM_DEFINES "/DWIN32")
 
-  if(MSVC_C_ARCHITECTURE_ID STREQUAL ARM OR MSVC_CXX_ARCHITECTURE_ID STREQUAL ARM)
+  if(_MSVC_C_ARCHITECTURE_FAMILY STREQUAL "ARM" OR _MSVC_CXX_ARCHITECTURE_FAMILY STREQUAL "ARM")
     set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib")
   elseif(MSVC_VERSION GREATER 1310)
     set(_RTC1 "/RTC1")
@@ -200,9 +200,21 @@ set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
 set (CMAKE_LINK_DEF_FILE_FLAG "/DEF:")
 # set the machine type
 if(MSVC_C_ARCHITECTURE_ID)
-  set(_MACHINE_ARCH_FLAG "/machine:${MSVC_C_ARCHITECTURE_ID}")
+  if(MSVC_C_ARCHITECTURE_ID MATCHES "^ARMV.I")
+    set(_MACHINE_ARCH_FLAG "/machine:THUMB")
+  elseif(_MSVC_C_ARCHITECTURE_FAMILY STREQUAL "ARM")
+    set(_MACHINE_ARCH_FLAG "/machine:ARM")
+  else()
+    set(_MACHINE_ARCH_FLAG "/machine:${MSVC_C_ARCHITECTURE_ID}")
+  endif()
 elseif(MSVC_CXX_ARCHITECTURE_ID)
-  set(_MACHINE_ARCH_FLAG "/machine:${MSVC_CXX_ARCHITECTURE_ID}")
+  if(MSVC_CXX_ARCHITECTURE_ID MATCHES "^ARMV.I")
+    set(_MACHINE_ARCH_FLAG "/machine:THUMB")
+  elseif(_MSVC_CXX_ARCHITECTURE_FAMILY STREQUAL "ARM")
+    set(_MACHINE_ARCH_FLAG "/machine:ARM")
+  else()
+    set(_MACHINE_ARCH_FLAG "/machine:${MSVC_CXX_ARCHITECTURE_ID}")
+  endif()
 elseif(MSVC_Fortran_ARCHITECTURE_ID)
   set(_MACHINE_ARCH_FLAG "/machine:${MSVC_Fortran_ARCHITECTURE_ID}")
 endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bee22eec3e34359b0669d63f9aadeeffc5ef5805
commit bee22eec3e34359b0669d63f9aadeeffc5ef5805
Author:     Gunnar Roth <gunnar.roth at gmx.de>
AuthorDate: Fri Feb 13 10:10:26 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 09:32:28 2015 -0500

    MSVC: Define /DWINCE when building for WinCE platforms (#14552)

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 2440f89..4098c3f 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -150,7 +150,7 @@ if(WINCE)
     message(FATAL_ERROR "Invalid Windows CE version: ${CMAKE_SYSTEM_VERSION}")
   endif()
 
-  set(_PLATFORM_DEFINES "/D_WIN32_WCE=0x${_CE_VERSION} /DUNDER_CE")
+  set(_PLATFORM_DEFINES "/D_WIN32_WCE=0x${_CE_VERSION} /DUNDER_CE /DWINCE")
   set(_PLATFORM_DEFINES_C " /D${_MSVC_C_ARCHITECTURE_FAMILY} /D_${_MSVC_C_ARCHITECTURE_FAMILY_UPPER}_")
   set(_PLATFORM_DEFINES_CXX " /D${_MSVC_CXX_ARCHITECTURE_FAMILY} /D_${_MSVC_CXX_ARCHITECTURE_FAMILY_UPPER}_")
 

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

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |    2 --
 Modules/CMakePlatformId.h.in           |   11 +++++++++-
 Modules/Platform/Windows-MSVC.cmake    |   35 ++++++++++++++++++++++++++------
 3 files changed, 39 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake

From nilsgladitz at gmail.com  Mon Feb 23 10:50:46 2015
From: nilsgladitz at gmail.com (Nils Gladitz)
Date: Mon, 23 Feb 2015 10:50:46 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-619-g82c86e4
Message-ID: <20150223155046.2EB73AA394@public.kitware.com>

This is an automated email from 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  82c86e4a875fb74ed455a2cf34f2b82a18a1417f (commit)
       via  6cc01c140245749bb6a6d5096b4a38f3f16fb776 (commit)
      from  983811fb737927e3d50402b34d15fe03bf2cca42 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82c86e4a875fb74ed455a2cf34f2b82a18a1417f
commit 82c86e4a875fb74ed455a2cf34f2b82a18a1417f
Merge: 983811f 6cc01c1
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Feb 23 10:50:45 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:50:45 2015 -0500

    Merge topic 'wix-shortcut-properties' into next
    
    6cc01c14 CPackWIX: Add release notes for the wix-shortcut-properties topic.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cc01c140245749bb6a6d5096b4a38f3f16fb776
commit 6cc01c140245749bb6a6d5096b4a38f3f16fb776
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Feb 23 16:49:42 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Feb 23 16:49:42 2015 +0100

    CPackWIX: Add release notes for the wix-shortcut-properties topic.

diff --git a/Help/release/dev/wix-shortcut-properties.rst b/Help/release/dev/wix-shortcut-properties.rst
new file mode 100644
index 0000000..bdd6485
--- /dev/null
+++ b/Help/release/dev/wix-shortcut-properties.rst
@@ -0,0 +1,9 @@
+wix-shortcut-properties
+-----------------------
+
+* The CPack WIX generator learned the new
+  :prop_inst:`CPACK_START_MENU_SHORTCUTS`,
+  :prop_inst:`CPACK_DESKTOP_SHORTCUTS` and
+  :prop_inst:`CPACK_STARTUP_SHORTCUTS` installed file properties which can
+  be used to install shorcuts in the Start Menu, on the Desktop and
+  in the Startup Folder respectively.

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

Summary of changes:
 Help/release/dev/wix-shortcut-properties.rst |    9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 Help/release/dev/wix-shortcut-properties.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 10:58:10 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:58:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-621-gc3f41d0
Message-ID: <20150223155810.E2969AAF01@public.kitware.com>

This is an automated email from 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  c3f41d07ce79d23e4bdc79b74fb13463a4241c79 (commit)
       via  60ce8dd510b5ddc4d2465d75b059dda2d4e123cd (commit)
      from  82c86e4a875fb74ed455a2cf34f2b82a18a1417f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3f41d07ce79d23e4bdc79b74fb13463a4241c79
commit c3f41d07ce79d23e4bdc79b74fb13463a4241c79
Merge: 82c86e4 60ce8dd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:58:09 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:58:09 2015 -0500

    Merge topic 'rpm_at_in_path' into next
    
    60ce8dd5 Revert topic 'rpm_at_in_path'

diff --cc Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index f06605a,68d846f..5be9d17
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@@ -209,34 -204,7 +208,11 @@@ if(CPackGen MATCHES "RPM"
  
          message(FATAL_ERROR "error: '${check_file}' rpm package relocation path does not match expected value - regex '${check_file_match_expected_relocation_path}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
        endif()
 +      string(REGEX MATCH ${check_file_match_expected_architecture} check_file_match_architecture ${check_file_content})
 +      if (NOT check_file_match_architecture)
 +          message(FATAL_ERROR "error: '${check_file}' Architecture does not match expected value - '${check_file_match_expected_architecture}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
 +      endif()
      endforeach()
- 
-     # test package content
-     foreach(check_file ${expected_file})
-       string(REGEX MATCH ".*Unspecified.*" check_file_Unspecified_match ${check_file})
- 
-       if(check_file_Unspecified_match)
-         execute_process(COMMAND ${RPM_EXECUTABLE} -pql ${check_file}
-             OUTPUT_VARIABLE check_file_content
-             ERROR_QUIET
-             OUTPUT_STRIP_TRAILING_WHITESPACE)
- 
-         string(REGEX MATCH ".*bin/@in at _@path@@with/@and/@/@in_path@/mylibapp2$" check_at_in_path ${check_file_content})
- 
-         if(NOT check_at_in_path)
-           file(GLOB_RECURSE spec_file "${CPackComponentsForAll_BINARY_DIR}/*Unspecified*.spec")
- 
-           if(spec_file)
-             file(READ ${spec_file} spec_file_content)
-           endif()
- 
-           message(FATAL_ERROR "error: '${check_file}' rpm package path with @ characters is missing or invalid. RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
-         endif()
-       endif()
-     endforeach()
+   elseif(${CPackComponentWay} STREQUAL "IgnoreGroup")
    endif()
  endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60ce8dd510b5ddc4d2465d75b059dda2d4e123cd
commit 60ce8dd510b5ddc4d2465d75b059dda2d4e123cd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:57:56 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:57:56 2015 -0500

    Revert topic 'rpm_at_in_path'
    
    It will be restored after a conflicting topic is added.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index da9cc80..7516393 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1156,6 +1156,13 @@ if(CPACK_RPM_PACKAGE_DEBUG)
    message("CPackRPM:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}")
 endif()
 
+# protect @ in pathname in order to avoid their
+# interpretation during the configure_file step
+set(CPACK_RPM_INSTALL_FILES_LIST "${CPACK_RPM_INSTALL_FILES}")
+set(PROTECTED_AT "@")
+string(REPLACE "@" "\@PROTECTED_AT\@" CPACK_RPM_INSTALL_FILES "${CPACK_RPM_INSTALL_FILES_LIST}")
+set(CPACK_RPM_INSTALL_FILES_LIST "")
+
 #
 # USER generated/provided spec file handling.
 #
@@ -1266,6 +1273,9 @@ else()
   configure_file(${CPACK_RPM_BINARY_SPECFILE}.in ${CPACK_RPM_BINARY_SPECFILE} @ONLY)
 endif()
 
+# remove AT protection
+unset(PROTECTED_AT)
+
 if(RPMBUILD_EXECUTABLE)
   # Now call rpmbuild using the SPECFILE
   execute_process(
diff --git a/Tests/CPackComponentsForAll/CMakeLists.txt b/Tests/CPackComponentsForAll/CMakeLists.txt
index 51af297..b55594e 100644
--- a/Tests/CPackComponentsForAll/CMakeLists.txt
+++ b/Tests/CPackComponentsForAll/CMakeLists.txt
@@ -43,7 +43,7 @@ install(TARGETS mylibapp
 # CPACK_MONOLITHIC_INSTALL=1 is set (at cmake time).
 install(TARGETS mylibapp2
   RUNTIME
-  DESTINATION bin/@in at _@path@@with\\@and\\@/\@in_path\@) # test @ char in path
+  DESTINATION bin)
 
 install(FILES mylib.h
   DESTINATION include
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index 2597050..68d846f 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -139,7 +139,6 @@ if(CPackGen MATCHES "RPM")
   set(CPACK_COMPONENT_HEADERS_DESCRIPTION
     "C/C\\+\\+ header files for use with MyLib")
 
-  # test package info
   if(${CPackComponentWay} STREQUAL "IgnoreGroup")
     # set gnu install prefixes to what they are set during rpm creation
     # CMAKE_SIZEOF_VOID_P is not set here but lib is prefix of lib64 so
@@ -206,29 +205,6 @@ if(CPackGen MATCHES "RPM")
         message(FATAL_ERROR "error: '${check_file}' rpm package relocation path does not match expected value - regex '${check_file_match_expected_relocation_path}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
       endif()
     endforeach()
-
-    # test package content
-    foreach(check_file ${expected_file})
-      string(REGEX MATCH ".*Unspecified.*" check_file_Unspecified_match ${check_file})
-
-      if(check_file_Unspecified_match)
-        execute_process(COMMAND ${RPM_EXECUTABLE} -pql ${check_file}
-            OUTPUT_VARIABLE check_file_content
-            ERROR_QUIET
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-        string(REGEX MATCH ".*bin/@in at _@path@@with/@and/@/@in_path@/mylibapp2$" check_at_in_path ${check_file_content})
-
-        if(NOT check_at_in_path)
-          file(GLOB_RECURSE spec_file "${CPackComponentsForAll_BINARY_DIR}/*Unspecified*.spec")
-
-          if(spec_file)
-            file(READ ${spec_file} spec_file_content)
-          endif()
-
-          message(FATAL_ERROR "error: '${check_file}' rpm package path with @ characters is missing or invalid. RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
-        endif()
-      endif()
-    endforeach()
+  elseif(${CPackComponentWay} STREQUAL "IgnoreGroup")
   endif()
 endif()

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

Summary of changes:
 Modules/CPackRPM.cmake                             |   10 ++++++++
 Tests/CPackComponentsForAll/CMakeLists.txt         |    2 +-
 .../RunCPackVerifyResult.cmake                     |   26 +-------------------
 3 files changed, 12 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 10:58:16 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 10:58:16 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-625-g253d609
Message-ID: <20150223155816.60F27AAF01@public.kitware.com>

This is an automated email from 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  253d6095f73a8d42101e9e2c197b341bec57ab0c (commit)
       via  f174b919d65d8aefbe8dec26e2b31c7525805f8d (commit)
       via  3aa9f89dbb88d957a662effdbc284c95aef1a8a9 (commit)
       via  761562fea6a987bb898f5a349993cf5765dedbea (commit)
      from  c3f41d07ce79d23e4bdc79b74fb13463a4241c79 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=253d6095f73a8d42101e9e2c197b341bec57ab0c
commit 253d6095f73a8d42101e9e2c197b341bec57ab0c
Merge: c3f41d0 f174b91
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 10:58:15 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:58:15 2015 -0500

    Merge topic 'rpm_package_architecture' into next
    
    f174b919 Tests: CpackRPM test component architecture
    3aa9f89d CPackRPM: Support rpm architecture in components
    761562fe CPackRPM: Fix CPACK_RPM_PACKAGE_ARCHITECTURE


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f174b919d65d8aefbe8dec26e2b31c7525805f8d
commit f174b919d65d8aefbe8dec26e2b31c7525805f8d
Author:     Joshua A Clayton <stillcompiling at gmail.com>
AuthorDate: Thu Feb 19 00:01:16 2015 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:48:36 2015 -0500

    Tests: CpackRPM test component architecture
    
    Test creating rpms of type "noarch", native, and "armv7hf"

diff --git a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
index de0ee46..4119b8d 100644
--- a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
+++ b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
@@ -11,6 +11,12 @@ if(CPACK_GENERATOR MATCHES "RPM")
   set(CPACK_RPM_COMPONENT_INSTALL "ON")
   set(CPACK_RPM_applications_PACKAGE_REQUIRES "mylib-libraries")
 
+  # test a "noarch" rpm
+  set(CPACK_RPM_headers_PACKAGE_ARCHITECTURE "noarch")
+
+  # test cross-built rpm
+  set(CPACK_RPM_applications_PACKAGE_ARCHITECTURE "armv7hf")
+
   # test package summary override
   set(CPACK_RPM_PACKAGE_SUMMARY "default summary")
   set(CPACK_RPM_libraries_PACKAGE_SUMMARY "libraries summary")
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index 68d846f..5be9d17 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -161,21 +161,25 @@ if(CPackGen MATCHES "RPM")
         set(check_file_match_expected_summary ".*${CPACK_RPM_libraries_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*${CPACK_RPM_libraries_PACKAGE_DESCRIPTION}.*")
         set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+        set(check_file_match_expected_architecture "Architecture: ${CPACK_RPM_applications_PACKAGE_ARCHITECTURE}")
         set(spec_regex "*libraries*")
       elseif(check_file_headers_match)
         set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*${CPACK_COMPONENT_HEADERS_DESCRIPTION}.*")
         set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
+        set(check_file_match_expected_architecture "Architecture: ${CPACK_RPM_libraries_PACKAGE_ARCHITECTURE}")
         set(spec_regex "*headers*")
       elseif(check_file_applications_match)
         set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*${CPACK_COMPONENT_APPLICATIONS_DESCRIPTION}.*")
         set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
+        set(check_file_match_expected_architecture "Architecture: ${CPACK_RPM_headers_PACKAGE_ARCHITECTURE}")
         set(spec_regex "*applications*")
       elseif(check_file_Unspecified_match)
         set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*DESCRIPTION.*")
         set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
+        set(check_file_match_expected_architecture "Architecture: ${CPACK_RPM_Unspecified_PACKAGE_ARCHITECTURE}")
         set(spec_regex "*Unspecified*")
       else()
         message(FATAL_ERROR "error: unexpected rpm package '${check_file}'")
@@ -204,6 +208,10 @@ if(CPackGen MATCHES "RPM")
 
         message(FATAL_ERROR "error: '${check_file}' rpm package relocation path does not match expected value - regex '${check_file_match_expected_relocation_path}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
       endif()
+      string(REGEX MATCH ${check_file_match_expected_architecture} check_file_match_architecture ${check_file_content})
+      if (NOT check_file_match_architecture)
+          message(FATAL_ERROR "error: '${check_file}' Architecture does not match expected value - '${check_file_match_expected_architecture}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
+      endif()
     endforeach()
   elseif(${CPackComponentWay} STREQUAL "IgnoreGroup")
   endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3aa9f89dbb88d957a662effdbc284c95aef1a8a9
commit 3aa9f89dbb88d957a662effdbc284c95aef1a8a9
Author:     Joshua A Clayton <stillcompiling at gmail.com>
AuthorDate: Thu Feb 19 00:01:15 2015 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:48:27 2015 -0500

    CPackRPM: Support rpm architecture in components
    
    CPACK_RPM_<component>_PACKAGE_ARCHITECTURE variable allows
    the same project to support packages of different architectures
    including noarch, native and foreign architectures.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 932e174..6ce18bf 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -51,6 +51,7 @@
 #  * Default   : CPACK_PACKAGE_VERSION
 #
 # .. variable:: CPACK_RPM_PACKAGE_ARCHITECTURE
+#               CPACK_RPM_<component>_PACKAGE_ARCHITECTURE
 #
 #  The RPM package architecture.
 #
@@ -631,6 +632,16 @@ else()
 endif()
 
 set(_CPACK_RPM_PACKAGE_ARCHITECTURE ${CPACK_RPM_PACKAGE_ARCHITECTURE})
+
+#prefer component architecture
+if(CPACK_RPM_PACKAGE_COMPONENT)
+  if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_ARCHITECTURE)
+    set(_CPACK_RPM_PACKAGE_ARCHITECTURE ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_ARCHITECTURE})
+    if(CPACK_RPM_PACKAGE_DEBUG)
+      message("CPackRPM:Debug: using component build arch = ${_CPACK_RPM_PACKAGE_ARCHITECTURE}")
+    endif()
+  endif()
+endif()
 if(${_CPACK_RPM_PACKAGE_ARCHITECTURE} STREQUAL "noarch")
   set(TMP_RPM_BUILDARCH "Buildarch: ${_CPACK_RPM_PACKAGE_ARCHITECTURE}")
 else()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=761562fea6a987bb898f5a349993cf5765dedbea
commit 761562fea6a987bb898f5a349993cf5765dedbea
Author:     Joshua A Clayton <stillcompiling at gmail.com>
AuthorDate: Thu Feb 19 00:01:14 2015 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:48:10 2015 -0500

    CPackRPM: Fix CPACK_RPM_PACKAGE_ARCHITECTURE
    
    BuildArch must only be added to a spec file for a "noarch" package or
    rpmbuild will fail.  For all others, the --target argument sets the
    package architecture.  In the process of Fixing rpm architecture, we
    make it mandatory, adding a default value of native architecture (the
    same as if no --target argument is present).  Update the documentation
    at the top of the file to make it mandatory.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 7516393..932e174 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -54,8 +54,8 @@
 #
 #  The RPM package architecture.
 #
-#  * Mandatory : NO
-#  * Default   : -
+#  * Mandatory : YES
+#  * Default   : Native architecture output by "uname -m"
 #
 #  This may be set to "noarch" if you know you are building a noarch package.
 #
@@ -619,12 +619,20 @@ endif()
 # RPM "Version" from RPM "Release"
 string(REPLACE "-" "_" CPACK_RPM_PACKAGE_VERSION ${CPACK_RPM_PACKAGE_VERSION})
 
-# CPACK_RPM_PACKAGE_ARCHITECTURE (optional)
-if(CPACK_RPM_PACKAGE_ARCHITECTURE)
-  set(TMP_RPM_BUILDARCH "Buildarch: ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+# CPACK_RPM_PACKAGE_ARCHITECTURE (mandatory)
+if(NOT CPACK_RPM_PACKAGE_ARCHITECTURE)
+  execute_process(COMMAND uname "-m"
+                  OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+else()
   if(CPACK_RPM_PACKAGE_DEBUG)
     message("CPackRPM:Debug: using user-specified build arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
   endif()
+endif()
+
+set(_CPACK_RPM_PACKAGE_ARCHITECTURE ${CPACK_RPM_PACKAGE_ARCHITECTURE})
+if(${_CPACK_RPM_PACKAGE_ARCHITECTURE} STREQUAL "noarch")
+  set(TMP_RPM_BUILDARCH "Buildarch: ${_CPACK_RPM_PACKAGE_ARCHITECTURE}")
 else()
   set(TMP_RPM_BUILDARCH "")
 endif()
@@ -934,7 +942,7 @@ file(MAKE_DIRECTORY ${CPACK_RPM_ROOTDIR}/SOURCES)
 file(MAKE_DIRECTORY ${CPACK_RPM_ROOTDIR}/SPECS)
 file(MAKE_DIRECTORY ${CPACK_RPM_ROOTDIR}/SRPMS)
 
-#set(CPACK_RPM_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}-${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
+#set(CPACK_RPM_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}-${_CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
 set(CPACK_RPM_FILE_NAME "${CPACK_OUTPUT_FILE_NAME}")
 # it seems rpmbuild can't handle spaces in the path
 # neither escaping (as below) nor putting quotes around the path seem to help
@@ -1282,6 +1290,7 @@ if(RPMBUILD_EXECUTABLE)
     COMMAND "${RPMBUILD_EXECUTABLE}" -bb
             --define "_topdir ${CPACK_RPM_DIRECTORY}"
             --buildroot "${CPACK_RPM_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}"
+            --target "${_CPACK_RPM_PACKAGE_ARCHITECTURE}"
             "${CPACK_RPM_BINARY_SPECFILE}"
     WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}"
     RESULT_VARIABLE CPACK_RPMBUILD_EXEC_RESULT

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 11:04:37 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 11:04:37 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-627-g70b9bc5
Message-ID: <20150223160437.6723EAB0CC@public.kitware.com>

This is an automated email from 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  70b9bc55d89ab2e545a3ebd1b92cde1c0a56fb5b (commit)
       via  b6f94e6b14ea1e32014296d3c766500852f74df2 (commit)
      from  253d6095f73a8d42101e9e2c197b341bec57ab0c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70b9bc55d89ab2e545a3ebd1b92cde1c0a56fb5b
commit 70b9bc55d89ab2e545a3ebd1b92cde1c0a56fb5b
Merge: 253d609 b6f94e6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 11:04:36 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 11:04:36 2015 -0500

    Merge topic 'rpm_package_architecture' into next
    
    b6f94e6b Help: Add notes for topic 'rpm_package_architecture'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6f94e6b14ea1e32014296d3c766500852f74df2
commit b6f94e6b14ea1e32014296d3c766500852f74df2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 11:02:22 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 11:02:22 2015 -0500

    Help: Add notes for topic 'rpm_package_architecture'

diff --git a/Help/release/dev/rpm_package_architecture.rst b/Help/release/dev/rpm_package_architecture.rst
new file mode 100644
index 0000000..5bec51d
--- /dev/null
+++ b/Help/release/dev/rpm_package_architecture.rst
@@ -0,0 +1,6 @@
+rpm_package_architecture
+------------------------
+
+* The :module:`CPackRPM` module learned a new
+  :variable:`CPACK_RPM_<component>_PACKAGE_ARCHITECTURE` variable
+  to specify a component-specific package architecture.

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

Summary of changes:
 Help/release/dev/rpm_package_architecture.rst |    6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 Help/release/dev/rpm_package_architecture.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 11:06:06 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 11:06:06 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-261-g7cebc5a
Message-ID: <20150223160606.6D1DBAB0F3@public.kitware.com>

This is an automated email from 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  7cebc5acacc14e0d4c9416735c86c5870671f173 (commit)
       via  b6f94e6b14ea1e32014296d3c766500852f74df2 (commit)
       via  f174b919d65d8aefbe8dec26e2b31c7525805f8d (commit)
       via  3aa9f89dbb88d957a662effdbc284c95aef1a8a9 (commit)
       via  761562fea6a987bb898f5a349993cf5765dedbea (commit)
      from  9f487b1dadc65adb5215c3d97fc64cfd3ba4b26c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7cebc5acacc14e0d4c9416735c86c5870671f173
commit 7cebc5acacc14e0d4c9416735c86c5870671f173
Merge: 9f487b1 b6f94e6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 11:06:05 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 11:06:05 2015 -0500

    Merge topic 'rpm_package_architecture'
    
    b6f94e6b Help: Add notes for topic 'rpm_package_architecture'
    f174b919 Tests: CpackRPM test component architecture
    3aa9f89d CPackRPM: Support rpm architecture in components
    761562fe CPackRPM: Fix CPACK_RPM_PACKAGE_ARCHITECTURE


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

Summary of changes:
 Help/release/dev/rpm_package_architecture.rst      |    6 ++++
 Modules/CPackRPM.cmake                             |   32 ++++++++++++++++----
 .../MyLibCPackConfig-IgnoreGroup.cmake.in          |    6 ++++
 .../RunCPackVerifyResult.cmake                     |    8 +++++
 4 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 Help/release/dev/rpm_package_architecture.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 11:06:08 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 11:06:08 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-268-gcb16c78
Message-ID: <20150223160608.A9552AB0F8@public.kitware.com>

This is an automated email from 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  cb16c7844dce627ab40f404c6ac49db3cde7b0c0 (commit)
       via  6cc01c140245749bb6a6d5096b4a38f3f16fb776 (commit)
       via  135febf069e7ff5305a3729b81171933ec89dc90 (commit)
       via  e6731f486e466ddd58550851fb935dbda7939cac (commit)
       via  279605f560312aab4dfeef4cce1c8c67d4083b4e (commit)
       via  53d7dafface62d40ea795456394f7ab1d5ee6712 (commit)
       via  dc0f3fb44fb9384438ece513c12d83a36e385802 (commit)
      from  7cebc5acacc14e0d4c9416735c86c5870671f173 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb16c7844dce627ab40f404c6ac49db3cde7b0c0
commit cb16c7844dce627ab40f404c6ac49db3cde7b0c0
Merge: 7cebc5a 6cc01c1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 11:06:07 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 11:06:07 2015 -0500

    Merge topic 'wix-shortcut-properties'
    
    6cc01c14 CPackWIX: Add release notes for the wix-shortcut-properties topic.
    135febf0 CPackWIX: Enhance CMake CPack WIX generated installer.
    e6731f48 CPackWIX: Add new CPACK_STARTUP_SHORTCUTS property.
    279605f5 CPackWIX: Add installed file properties for the creation of shortcuts.
    53d7daff CPackWIX: Refactor start menu and desktop shortcut creation.
    dc0f3fb4 CPackWIX: Explicitly list CPack WIX headers for IDE convenience.


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

Summary of changes:
 CMakeCPackOptions.cmake.in                        |   22 +++
 Help/manual/cmake-properties.7.rst                |    3 +
 Help/prop_inst/CPACK_DESKTOP_SHORTCUTS.rst        |    7 +
 Help/prop_inst/CPACK_STARTUP_SHORTCUTS.rst        |    7 +
 Help/prop_inst/CPACK_START_MENU_SHORTCUTS.rst     |    7 +
 Help/release/dev/wix-shortcut-properties.rst      |    9 +
 Source/CMakeLists.txt                             |   11 ++
 Source/CPack/WiX/cmCPackWIXGenerator.cxx          |  216 ++++++++++++---------
 Source/CPack/WiX/cmCPackWIXGenerator.h            |   26 ++-
 Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx |    8 +
 Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h   |    2 +
 Source/CPack/WiX/cmWIXFilesSourceWriter.cxx       |   36 +---
 Source/CPack/WiX/cmWIXFilesSourceWriter.h         |   20 +-
 Source/CPack/WiX/cmWIXShortcut.cxx                |  125 ++++++++++++
 Source/CPack/WiX/cmWIXShortcut.h                  |   62 +++++-
 15 files changed, 409 insertions(+), 152 deletions(-)
 create mode 100644 Help/prop_inst/CPACK_DESKTOP_SHORTCUTS.rst
 create mode 100644 Help/prop_inst/CPACK_STARTUP_SHORTCUTS.rst
 create mode 100644 Help/prop_inst/CPACK_START_MENU_SHORTCUTS.rst
 create mode 100644 Help/release/dev/wix-shortcut-properties.rst
 create mode 100644 Source/CPack/WiX/cmWIXShortcut.cxx


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 11:06:24 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 11:06:24 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-630-g76fde64
Message-ID: <20150223160624.C50E3AB0FF@public.kitware.com>

This is an automated email from 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  76fde644eeff51ae33fd9dc63583e7adf163f1d4 (commit)
       via  cb16c7844dce627ab40f404c6ac49db3cde7b0c0 (commit)
       via  7cebc5acacc14e0d4c9416735c86c5870671f173 (commit)
      from  70b9bc55d89ab2e545a3ebd1b92cde1c0a56fb5b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76fde644eeff51ae33fd9dc63583e7adf163f1d4
commit 76fde644eeff51ae33fd9dc63583e7adf163f1d4
Merge: 70b9bc5 cb16c78
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 11:06:18 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 11:06:18 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 11:11:52 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 11:11:52 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-632-g58c76d9
Message-ID: <20150223161152.82C2E9B161@public.kitware.com>

This is an automated email from 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  58c76d9de12b4ac763b59169c0801513f073e53c (commit)
       via  e8b7d7ab6ef0f02262919f7b9ebae12d985e42bc (commit)
      from  76fde644eeff51ae33fd9dc63583e7adf163f1d4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58c76d9de12b4ac763b59169c0801513f073e53c
commit 58c76d9de12b4ac763b59169c0801513f073e53c
Merge: 76fde64 e8b7d7a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 11:11:51 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 11:11:51 2015 -0500

    Merge topic 'rpm_at_in_path' into next
    
    e8b7d7ab CPackRPM: revert @-in-path escaping patch


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8b7d7ab6ef0f02262919f7b9ebae12d985e42bc
commit e8b7d7ab6ef0f02262919f7b9ebae12d985e42bc
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed Jan 7 20:33:27 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 11:07:59 2015 -0500

    CPackRPM: revert @-in-path escaping patch
    
    The change in commit v2.8.12~218^2 (CPackRPM protect '@' character in
    filename processed in the spec file, 2013-07-05) was later obsoleted
    causing CPackRPM to break paths with @ symbols again.  Revert the
    change to fix the behavior, and add a test case.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 6ce18bf..cb987f8 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1175,13 +1175,6 @@ if(CPACK_RPM_PACKAGE_DEBUG)
    message("CPackRPM:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}")
 endif()
 
-# protect @ in pathname in order to avoid their
-# interpretation during the configure_file step
-set(CPACK_RPM_INSTALL_FILES_LIST "${CPACK_RPM_INSTALL_FILES}")
-set(PROTECTED_AT "@")
-string(REPLACE "@" "\@PROTECTED_AT\@" CPACK_RPM_INSTALL_FILES "${CPACK_RPM_INSTALL_FILES_LIST}")
-set(CPACK_RPM_INSTALL_FILES_LIST "")
-
 #
 # USER generated/provided spec file handling.
 #
@@ -1292,9 +1285,6 @@ else()
   configure_file(${CPACK_RPM_BINARY_SPECFILE}.in ${CPACK_RPM_BINARY_SPECFILE} @ONLY)
 endif()
 
-# remove AT protection
-unset(PROTECTED_AT)
-
 if(RPMBUILD_EXECUTABLE)
   # Now call rpmbuild using the SPECFILE
   execute_process(
diff --git a/Tests/CPackComponentsForAll/CMakeLists.txt b/Tests/CPackComponentsForAll/CMakeLists.txt
index b55594e..51af297 100644
--- a/Tests/CPackComponentsForAll/CMakeLists.txt
+++ b/Tests/CPackComponentsForAll/CMakeLists.txt
@@ -43,7 +43,7 @@ install(TARGETS mylibapp
 # CPACK_MONOLITHIC_INSTALL=1 is set (at cmake time).
 install(TARGETS mylibapp2
   RUNTIME
-  DESTINATION bin)
+  DESTINATION bin/@in at _@path@@with\\@and\\@/\@in_path\@) # test @ char in path
 
 install(FILES mylib.h
   DESTINATION include
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index 5be9d17..f06605a 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -139,6 +139,7 @@ if(CPackGen MATCHES "RPM")
   set(CPACK_COMPONENT_HEADERS_DESCRIPTION
     "C/C\\+\\+ header files for use with MyLib")
 
+  # test package info
   if(${CPackComponentWay} STREQUAL "IgnoreGroup")
     # set gnu install prefixes to what they are set during rpm creation
     # CMAKE_SIZEOF_VOID_P is not set here but lib is prefix of lib64 so
@@ -213,6 +214,29 @@ if(CPackGen MATCHES "RPM")
           message(FATAL_ERROR "error: '${check_file}' Architecture does not match expected value - '${check_file_match_expected_architecture}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
       endif()
     endforeach()
-  elseif(${CPackComponentWay} STREQUAL "IgnoreGroup")
+
+    # test package content
+    foreach(check_file ${expected_file})
+      string(REGEX MATCH ".*Unspecified.*" check_file_Unspecified_match ${check_file})
+
+      if(check_file_Unspecified_match)
+        execute_process(COMMAND ${RPM_EXECUTABLE} -pql ${check_file}
+            OUTPUT_VARIABLE check_file_content
+            ERROR_QUIET
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+        string(REGEX MATCH ".*bin/@in at _@path@@with/@and/@/@in_path@/mylibapp2$" check_at_in_path ${check_file_content})
+
+        if(NOT check_at_in_path)
+          file(GLOB_RECURSE spec_file "${CPackComponentsForAll_BINARY_DIR}/*Unspecified*.spec")
+
+          if(spec_file)
+            file(READ ${spec_file} spec_file_content)
+          endif()
+
+          message(FATAL_ERROR "error: '${check_file}' rpm package path with @ characters is missing or invalid. RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
+        endif()
+      endif()
+    endforeach()
   endif()
 endif()

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

Summary of changes:
 Modules/CPackRPM.cmake                             |   10 --------
 Tests/CPackComponentsForAll/CMakeLists.txt         |    2 +-
 .../RunCPackVerifyResult.cmake                     |   26 +++++++++++++++++++-
 3 files changed, 26 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 11:16:38 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 11:16:38 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-635-g9b38b8d
Message-ID: <20150223161638.3AB7FAA684@public.kitware.com>

This is an automated email from 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  9b38b8d0336e88b00167f03ff152bc900a494e4f (commit)
       via  d13fb919c5dc3cb74433918e019d3a545689940e (commit)
       via  99575c9ac114e6f5d388e1ee7b9a3f788d773c9e (commit)
      from  58c76d9de12b4ac763b59169c0801513f073e53c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b38b8d0336e88b00167f03ff152bc900a494e4f
commit 9b38b8d0336e88b00167f03ff152bc900a494e4f
Merge: 58c76d9 d13fb91
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 11:16:37 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 11:16:37 2015 -0500

    Merge topic 'test-release' into next
    
    d13fb919 Merge branch 'release-prep' into test-release
    99575c9a CMake 3.2.0-rc2


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d13fb919c5dc3cb74433918e019d3a545689940e
commit d13fb919c5dc3cb74433918e019d3a545689940e
Merge: cb16c78 99575c9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 11:16:18 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 11:16:18 2015 -0500

    Merge branch 'release-prep' into test-release


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99575c9ac114e6f5d388e1ee7b9a3f788d773c9e
commit 99575c9ac114e6f5d388e1ee7b9a3f788d773c9e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 11:10:12 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 11:10:12 2015 -0500

    CMake 3.2.0-rc2

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 8ffe8c4..0ab2a58 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -2,4 +2,4 @@
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 2)
 set(CMake_VERSION_PATCH 0)
-set(CMake_VERSION_RC 1)
+set(CMake_VERSION_RC 2)

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 11:39:37 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 11:39:37 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-637-g3f9d984
Message-ID: <20150223163937.8F64B2198@public.kitware.com>

This is an automated email from 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  3f9d98434b29ad77aa6374410b8d3c45ead477e0 (commit)
       via  38ef2b7363533746cfc14dbc55d696de3cc75386 (commit)
      from  9b38b8d0336e88b00167f03ff152bc900a494e4f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f9d98434b29ad77aa6374410b8d3c45ead477e0
commit 3f9d98434b29ad77aa6374410b8d3c45ead477e0
Merge: 9b38b8d 38ef2b7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 11:39:36 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 11:39:36 2015 -0500

    Merge topic 'FeatureSummary-no-duplicates' into next
    
    38ef2b73 FeatureSummary: Print each feature info only once


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38ef2b7363533746cfc14dbc55d696de3cc75386
commit 38ef2b7363533746cfc14dbc55d696de3cc75386
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Feb 22 21:06:27 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 11:39:17 2015 -0500

    FeatureSummary: Print each feature info only once
    
    If a feature is added multiple times via ADD_FEATURE_INFO it should
    appear only once in FEATURE_SUMMARY.
    
    Signed-off-by: Gregor Jasny <gjasny at googlemail.com>

diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index 3eea9db..ce5a4ed 100644
--- a/Modules/FeatureSummary.cmake
+++ b/Modules/FeatureSummary.cmake
@@ -379,6 +379,9 @@ function(_FS_GET_FEATURE_SUMMARY _property _var _includeQuiet)
 
   set(_currentFeatureText "")
   get_property(_EnabledFeatures  GLOBAL PROPERTY ${_property})
+  if(_EnabledFeatures)
+    list(REMOVE_DUPLICATES _EnabledFeatures)
+  endif(_EnabledFeatures)
 
   foreach(_currentFeature ${_EnabledFeatures})
 
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce-stdout.txt b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce-stdout.txt
new file mode 100644
index 0000000..39be105
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce-stdout.txt
@@ -0,0 +1,4 @@
+--( )
+ \* Foo , Foo decscription\.
++
+--
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce.cmake b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce.cmake
new file mode 100644
index 0000000..545fb92
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce.cmake
@@ -0,0 +1,8 @@
+include(FeatureSummary)
+
+set(WITH_FOO 1)
+
+add_feature_info(Foo WITH_FOO "Foo decscription.")
+add_feature_info(Foo WITH_FOO "Foo decscription.")
+
+feature_summary(WHAT ENABLED_FEATURES)
diff --git a/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake b/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake
index 1417338..6a5fc28 100644
--- a/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake
+++ b/Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake
@@ -6,3 +6,4 @@ run_cmake(FeatureSummaryWhatSingleUnknown)
 run_cmake(FeatureSummaryWhatList)
 run_cmake(FeatureSummaryWhatListUnknown)
 run_cmake(FeatureSummaryWhatListAll)
+run_cmake(FeatureSummaryWhatOnce)

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

Summary of changes:
 Modules/FeatureSummary.cmake                                   |    3 +++
 .../RunCMake/FeatureSummary/FeatureSummaryWhatOnce-stdout.txt  |    4 ++++
 Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce.cmake     |    8 ++++++++
 Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake               |    1 +
 4 files changed, 16 insertions(+)
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 11:50:45 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 11:50:45 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-639-gc8fcbc9
Message-ID: <20150223165045.22CB8AA2CC@public.kitware.com>

This is an automated email from 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  c8fcbc95076aa8f0a9a0f216506dcf400c60ec89 (commit)
       via  fe558718b30da989db8b880374012a0e580574e6 (commit)
      from  3f9d98434b29ad77aa6374410b8d3c45ead477e0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8fcbc95076aa8f0a9a0f216506dcf400c60ec89
commit c8fcbc95076aa8f0a9a0f216506dcf400c60ec89
Merge: 3f9d984 fe55871
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 11:50:44 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 11:50:44 2015 -0500

    Merge topic 'GetPrerequisites-file-command-update' into next
    
    fe558718 GetPrerequisites: Update output matching for newer 'file' versions


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe558718b30da989db8b880374012a0e580574e6
commit fe558718b30da989db8b880374012a0e580574e6
Author:     Marcus Meissner <meissner at suse.de>
AuthorDate: Mon Feb 23 10:51:42 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 11:50:29 2015 -0500

    GetPrerequisites: Update output matching for newer 'file' versions
    
    Detect PIE binaries with newer 'file' (5.22).  It no longer prints
    "(uses shared libraries)" but does print "interpreter":
    
     # file 5.19
     $ file /usr/bin/su
     /usr/bin/su: ... shared object, ..., dynamically linked (uses shared libs), ...
    
     # file 5.22
     $ file /usr/bin/su
     /usr/bin/su: ... shared object, ..., dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, ...

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 712a41c..9fb85fe 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -260,6 +260,13 @@ function(is_file_executable file result_var)
         return()
       endif()
 
+      # "file" version 5.22 does not print "(used shared libraries)"
+      # but uses "interpreter"
+      if("${file_ov}" MATCHES "shared object.*interpreter")
+        set(${result_var} 1 PARENT_SCOPE)
+        return()
+      endif()
+
     else()
       message(STATUS "warning: No 'file' command, skipping execute_process...")
     endif()

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 13:12:59 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 13:12:59 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-641-g2746af6
Message-ID: <20150223181259.95A119019B@public.kitware.com>

This is an automated email from 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  2746af6cc62a2b4b3f9761b9b838319411822b78 (commit)
       via  0ee2a004e70e2d49423f5b4b393896258e8ab688 (commit)
      from  c8fcbc95076aa8f0a9a0f216506dcf400c60ec89 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2746af6cc62a2b4b3f9761b9b838319411822b78
commit 2746af6cc62a2b4b3f9761b9b838319411822b78
Merge: c8fcbc9 0ee2a00
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 13:12:58 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 13:12:58 2015 -0500

    Merge topic 'osx-framework-search-platform-SDKs' into next
    
    0ee2a004 OS X: Add platform-specific Frameworks search path


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ee2a004e70e2d49423f5b4b393896258e8ab688
commit 0ee2a004e70e2d49423f5b4b393896258e8ab688
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Feb 22 19:00:11 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 13:10:52 2015 -0500

    OS X: Add platform-specific Frameworks search path
    
    Otherwise find_library is unable to lookup the XCTest framework which
    is not located in the SDK serach path:
    
    In the 10.10 SDK the SDK frameworks are located here:
    
      $DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks
    
    whereas the Platform SDKs are located here:
    
      $DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/Library/Frameworks
    
    Signed-off-by: Gregor Jasny <gjasny at googlemail.com>

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index e5c5f36..b912d98 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -166,6 +166,13 @@ if(_CMAKE_OSX_SYSROOT_PATH)
     ${_CMAKE_OSX_SYSROOT_PATH}/Network/Library/Frameworks
     ${_CMAKE_OSX_SYSROOT_PATH}/System/Library/Frameworks
     )
+  # add platform developer framework path if exists
+  get_filename_component(_CMAKE_OSX_PLATFORM_FRAMEWORK_PATH
+    ${_CMAKE_OSX_SYSROOT_PATH}/../../Library/Frameworks ABSOLUTE)
+  if(IS_DIRECTORY ${_CMAKE_OSX_PLATFORM_FRAMEWORK_PATH})
+    list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH
+      ${_CMAKE_OSX_PLATFORM_FRAMEWORK_PATH})
+  endif()
 endif()
 list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH
   /Library/Frameworks
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index fd01201..6663b88 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -176,7 +176,7 @@ if("${CMAKE_GENERATOR}" MATCHES "Visual Studio [^6]")
 endif()
 
 if(XCODE_VERSION AND NOT "${XCODE_VERSION}" VERSION_LESS 3)
-  add_RunCMake_test(XcodeProject)
+  add_RunCMake_test(XcodeProject -DXCODE_VERSION=${XCODE_VERSION})
 endif()
 
 add_RunCMake_test(File_Generate)
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index 792f40e..03d3cd3 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -3,3 +3,6 @@ include(RunCMake)
 run_cmake(XcodeFileType)
 run_cmake(XcodeAttributeGenex)
 run_cmake(XcodeAttributeGenexError)
+if (NOT XCODE_VERSION VERSION_LESS 6)
+  run_cmake(XcodePlatformFrameworks)
+endif()
diff --git a/Tests/RunCMake/XcodeProject/XcodePlatformFrameworks.cmake b/Tests/RunCMake/XcodeProject/XcodePlatformFrameworks.cmake
new file mode 100644
index 0000000..74dc978
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePlatformFrameworks.cmake
@@ -0,0 +1,6 @@
+enable_language(C)
+
+find_library(XCTEST_LIBRARY XCTest)
+if(NOT XCTEST_LIBRARY)
+  message(FATAL_ERROR "XCTest Framework not found.")
+endif()

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

Summary of changes:
 Modules/Platform/Darwin.cmake                             |    7 +++++++
 Tests/RunCMake/CMakeLists.txt                             |    2 +-
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake            |    3 +++
 Tests/RunCMake/XcodeProject/XcodePlatformFrameworks.cmake |    6 ++++++
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 Tests/RunCMake/XcodeProject/XcodePlatformFrameworks.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 13:13:03 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 13:13:03 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-643-g8585172
Message-ID: <20150223181303.9E5399BBF2@public.kitware.com>

This is an automated email from 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  85851721aab04bb870f8918b50807f138bae7c8e (commit)
       via  78ec4b16400111cab7cc0de3e7544b1b071b2abe (commit)
      from  2746af6cc62a2b4b3f9761b9b838319411822b78 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85851721aab04bb870f8918b50807f138bae7c8e
commit 85851721aab04bb870f8918b50807f138bae7c8e
Merge: 2746af6 78ec4b1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 13:13:02 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 13:13:02 2015 -0500

    Merge topic 'osx-CFBundleExecutable' into next
    
    78ec4b16 OS X: Shorten CFBundleExecutable to file name only


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78ec4b16400111cab7cc0de3e7544b1b071b2abe
commit 78ec4b16400111cab7cc0de3e7544b1b071b2abe
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Feb 22 19:00:10 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 13:07:33 2015 -0500

    OS X: Shorten CFBundleExecutable to file name only
    
    Shorten the CFBundleExecutable in the PList file of Bundles to
    the file name only as it is done for Frameworks, too.
    
    Signed-off-by: Gregor Jasny <gjasny at googlemail.com>

diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 55e20ab..a8eef82 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -181,8 +181,9 @@ void cmOSXBundleGenerator::CreateCFBundle(const std::string& targetName,
   std::string plist = root + "/" +
     this->GT->Target->GetCFBundleDirectory(this->ConfigName, true);
   plist += "/Info.plist";
+  std::string name = cmSystemTools::GetFilenameName(targetName);
   this->LocalGenerator->GenerateAppleInfoPList(this->GT->Target,
-                                               targetName,
+                                               name,
                                                plist.c_str());
   this->Makefile->AddCMakeOutputFile(plist);
 }

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

Summary of changes:
 Source/cmOSXBundleGenerator.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 13:30:53 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 13:30:53 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-645-g1399953
Message-ID: <20150223183053.90EC0AAEC6@public.kitware.com>

This is an automated email from 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  1399953d7ad1b68653a3688c59a283cc107e2506 (commit)
       via  0b54e8366e686340102867035e3dfdedf6f783b9 (commit)
      from  85851721aab04bb870f8918b50807f138bae7c8e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1399953d7ad1b68653a3688c59a283cc107e2506
commit 1399953d7ad1b68653a3688c59a283cc107e2506
Merge: 8585172 0b54e83
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 13:30:52 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 13:30:52 2015 -0500

    Merge topic 'vs-midl-absolute-OutputDirectory' into next
    
    0b54e836 VS: Specify absolute output directory for the Midl tool


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b54e8366e686340102867035e3dfdedf6f783b9
commit 0b54e8366e686340102867035e3dfdedf6f783b9
Author:     Tim Blechmann <tim at klingt.org>
AuthorDate: Thu Feb 19 14:35:02 2015 +0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 13:22:07 2015 -0500

    VS: Specify absolute output directory for the Midl tool
    
    Generate the OutputDirectory element value as an absolute path
    to the same location as the existing relative path.  Somehow
    this addresses an occasional failure in a large/complex build,
    and should not hurt basic use cases.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index a286049..ca8310c 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2522,7 +2522,7 @@ WriteMidlOptions(std::string const& /*config*/,
     }
   this->WriteString("%(AdditionalIncludeDirectories)"
                     "</AdditionalIncludeDirectories>\n", 0);
-  this->WriteString("<OutputDirectory>$(IntDir)</OutputDirectory>\n", 3);
+  this->WriteString("<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>\n", 3);
   this->WriteString("<HeaderFileName>%(Filename).h</HeaderFileName>\n", 3);
   this->WriteString(
     "<TypeLibraryName>%(Filename).tlb</TypeLibraryName>\n", 3);

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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 14:07:20 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 14:07:20 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc1-270-g7e57662
Message-ID: <20150223190720.D598EAB22B@public.kitware.com>

This is an automated email from 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  7e576624bbe77df9879075d48652defdf0cbce62 (commit)
       via  99575c9ac114e6f5d388e1ee7b9a3f788d773c9e (commit)
      from  cb16c7844dce627ab40f404c6ac49db3cde7b0c0 (commit)

Those revisions listed 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  Mon Feb 23 14:07:21 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 14:07:21 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-647-g1998e91
Message-ID: <20150223190721.066E0AB22C@public.kitware.com>

This is an automated email from 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  1998e91525180522bc0503c4c0dadb31dc31f6a8 (commit)
       via  7e576624bbe77df9879075d48652defdf0cbce62 (commit)
      from  1399953d7ad1b68653a3688c59a283cc107e2506 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1998e91525180522bc0503c4c0dadb31dc31f6a8
commit 1998e91525180522bc0503c4c0dadb31dc31f6a8
Merge: 1399953 7e57662
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 14:07:08 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 14:07:08 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Feb 23 14:07:21 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 14:07:21 -0500 (EST)
Subject: [Cmake-commits] CMake branch, release,
	updated. v3.2.0-rc1-16-g99575c9
Message-ID: <20150223190721.1CD8FAB22D@public.kitware.com>

This is an automated email from 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  99575c9ac114e6f5d388e1ee7b9a3f788d773c9e (commit)
      from  d95d4c2c775e6eb6db1800be869d97b5464628ab (commit)

Those revisions listed 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  Mon Feb 23 14:12:23 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 23 Feb 2015 14:12:23 -0500 (EST)
Subject: [Cmake-commits] CMake annotated tag, v3.2.0-rc2, created. v3.2.0-rc2
Message-ID: <20150223191223.4B998A274B@public.kitware.com>

This is an automated email 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.2.0-rc2 has been created
        at  342976a918418cad45e9d63935e2e57d1733076c (tag)
   tagging  99575c9ac114e6f5d388e1ee7b9a3f788d773c9e (commit)
  replaces  v3.2.0-rc1
 tagged by  Brad King
        on  Mon Feb 23 14:10:13 2015 -0500

- Log -----------------------------------------------------------------
CMake 3.2.0-rc2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAABAgAGBQJU63sVAAoJEOyP7zp7+07a1lYP/RD2MY2qgK/h0m7kigGYQxyk
Am+zh9cQD7zsN8Hz/DXPvN2Ozyyv6/FFIlvB+P/RoNBldLuM00GLdfipD0giHnmu
3fftiKlbgo7Y0j5C8l1+57OrK6TTaTEvfJBIqaj2pXj2HX72iipHMUuzryjM+vTz
pIXW4Wi64wmP0bJjjmWIIcz8PhxTJpPD6AYIEWXxGhkeYx980i7q1evEhqrejgtI
cg/t6b4KVMUKltI8I5pUiJByKy6pvaH1BBSPJIWXlz+zxF9XbAROULfNSZBM9mix
Au6C0+HEv5f5BNy4+nwVuk7Fvns9QIPCmeH3SEx+LA1p0RAB3mxicLPu0ld4B9pd
03sss3HpAfqX09YEgkQaHXDzAcfe2CTDRjFukBsFuH4dUdh7SzgMcRvr6Vzc2yFw
6KSTNJWPCWuknB5E669ZtrGxPH46nsfjt31F5g3AWC3jFl56jGBfHx6ljLrK7loc
cEzd/WSlNTUyoQF4YdaO6hRhLk+G5AdMQuDp7uN50zz/wEYeLrdDGKdpAUM+Y6NY
7RIWk4aJlGR6rYHtNJVZYOCPeP318NwkbCG2VPpBqX67judARH0Ee7OOAvpWPtX+
HmJboxShs+YzaVO/0k6hQStaQMod9C62tbrnUpWtPa+FfbaNca3Ezyiiwl9Ldong
H9ePfSyo1Jx16ta4Qsz1
=ZkvU
-----END PGP SIGNATURE-----

Brad King (15):
      Help: Revise configure_file documentation (#15403)
      Merge branch 'doc-configure_file-output-location' into release
      Help: In 3.2 relnotes move OpenGL/X11 to deprecated/removed section
      Merge branch 'doc-3.2-relnotes-fixup' into release
      Merge branch 'FindJNI-awt-arch' into release
      Utilities/Release: Build OS X and Win binaries without OpenSSL
      Merge branch 'binary-release-no-OpenSSL-on-Win-or-OSX' into release
      cmake-gui: Reset generator platform and toolset on configure (#15411)
      Merge branch 'cmake-gui-reset-generator-toolset-and-platform' into release
      FindJsonCpp: Drop new module due to upstream jsoncpp providing package
      bootstrap: Add --(no-)system-jsoncpp options
      Merge branch 'private-FindJsonCpp' into release
      FindCurses: Drop unused check for cbreak in tinfo library
      Merge branch 'FindCurses-remove-unused-check' into release
      CMake 3.2.0-rc2

Tiago St?rmer Daitx (1):
      FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)

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


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Feb 23 14:23:49 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 23 Feb 2015 14:23:49 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-642-g53dd35e
Message-ID: <20150223192349.4AE89AAA08@public.kitware.com>

This is an automated email from 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  53dd35e55a05aeb6b250c3ad9731c708249f5b93 (commit)
       via  6b66f299c3a7a46ec09da88412fab0b65e2f341b (commit)
       via  d44d3d7e4f85088d4b0d860573261c21e079cbcf (commit)
       via  b8ed9dcc9915c77bd294e0a20eaa6fc90733ac54 (commit)
       via  f01eaafbf1f1cc0791267546dd9d72e6da6f671b (commit)
       via  e8b3022ad2357dbac46b7451198a3a7c5aa7acca (commit)
       via  c2296a5929637fdd77b470330e2467a43a80d2f6 (commit)
       via  54af6f86eef18ddae4a73142b0667c832a626f07 (commit)
       via  37669f7c37f0d2e722253ff81c8074a153fe5aa1 (commit)
       via  47a3e22ea5aee971df1e04a6447bb916af81aa2c (commit)
       via  cb75eec0b45eda230996580043e00e38d35a1e5b (commit)
      from  1998e91525180522bc0503c4c0dadb31dc31f6a8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53dd35e55a05aeb6b250c3ad9731c708249f5b93
commit 53dd35e55a05aeb6b250c3ad9731c708249f5b93
Merge: 1998e91 6b66f29
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 23 14:23:48 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 14:23:48 2015 -0500

    Merge topic 'cleanup-cmAlgorithms' into next
    
    6b66f299 cmAlgorithms: Cache the end iterators in algorithms.
    d44d3d7e cmAlgorithms: Remove needless assignment.
    b8ed9dcc cmAlgorithms: Maintain the pivot iterator in cmRemoveIndices.
    f01eaafb cmAlgorithms: Relax iterator requirement for cmRemoveIndices.
    e8b3022a cmAlgorithms: Make cmRemoveDuplicates work with more containers.
    c2296a59 cmAlgorithms: Rename template argument to RemoveN.
    54af6f86 cmAlgorithms: Relax cmRemoveN requirement to FwdIter.
    37669f7c cmAlgorithms: Add a size() to cmRange.
    47a3e22e cmAlgorithms: Rename template type in cmDeleteAll algorithm.
    cb75eec0 cmAlgorithms: Add const to const objects.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b66f299c3a7a46ec09da88412fab0b65e2f341b
commit 6b66f299c3a7a46ec09da88412fab0b65e2f341b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 22:19:14 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 23 20:19:35 2015 +0100

    cmAlgorithms: Cache the end iterators in algorithms.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index c3a2a65..540ad39 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -235,6 +235,7 @@ template<typename Range, typename InputRange>
 typename Range::const_iterator cmRemoveIndices(Range& r, InputRange const& rem)
 {
   typename InputRange::const_iterator remIt = rem.begin();
+  typename InputRange::const_iterator remEnd = rem.end();
 
   typename Range::iterator writer = r.begin();
   std::advance(writer, *remIt);
@@ -242,13 +243,14 @@ typename Range::const_iterator cmRemoveIndices(Range& r, InputRange const& rem)
   typename InputRange::value_type prevRem = *remIt;
   ++remIt;
   size_t count = 1;
-  for ( ; writer != r.end() && remIt != rem.end(); ++count, ++remIt)
+  const typename Range::iterator rangeEnd = r.end();
+  for ( ; writer != rangeEnd && remIt != remEnd; ++count, ++remIt)
     {
     std::advance(pivot, *remIt - prevRem);
     prevRem = *remIt;
     writer = ContainerAlgorithms::RemoveN(writer, pivot, count);
     }
-  return ContainerAlgorithms::RemoveN(writer, r.end(), count);
+  return ContainerAlgorithms::RemoveN(writer, rangeEnd, count);
 }
 
 template<typename Range, typename MatchRange>
@@ -266,8 +268,9 @@ typename Range::const_iterator cmRemoveDuplicates(Range& r)
   unique.reserve(r.size());
   std::vector<size_t> indices;
   size_t count = 0;
+  const typename Range::iterator end = r.end();
   for(typename Range::const_iterator it = r.begin();
-      it != r.end(); ++it, ++count)
+      it != end; ++it, ++count)
     {
     const typename UniqueVector::iterator low =
         std::lower_bound(unique.begin(), unique.end(), *it);
@@ -282,7 +285,7 @@ typename Range::const_iterator cmRemoveDuplicates(Range& r)
     }
   if (indices.empty())
     {
-    return r.end();
+    return end;
     }
   return cmRemoveIndices(r, indices);
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d44d3d7e4f85088d4b0d860573261c21e079cbcf
commit d44d3d7e4f85088d4b0d860573261c21e079cbcf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 22:15:47 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 23 20:19:35 2015 +0100

    cmAlgorithms: Remove needless assignment.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 99213f8..c3a2a65 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -248,8 +248,7 @@ typename Range::const_iterator cmRemoveIndices(Range& r, InputRange const& rem)
     prevRem = *remIt;
     writer = ContainerAlgorithms::RemoveN(writer, pivot, count);
     }
-  writer = ContainerAlgorithms::RemoveN(writer, r.end(), count);
-  return writer;
+  return ContainerAlgorithms::RemoveN(writer, r.end(), count);
 }
 
 template<typename Range, typename MatchRange>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8ed9dcc9915c77bd294e0a20eaa6fc90733ac54
commit b8ed9dcc9915c77bd294e0a20eaa6fc90733ac54
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 22:10:41 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 23 20:19:35 2015 +0100

    cmAlgorithms: Maintain the pivot iterator in cmRemoveIndices.
    
    Avoid the algorithm of 'Schlemiel the painter' in the case of
    iterators which are not RandomAccess.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index cbfbb26..99213f8 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -238,12 +238,14 @@ typename Range::const_iterator cmRemoveIndices(Range& r, InputRange const& rem)
 
   typename Range::iterator writer = r.begin();
   std::advance(writer, *remIt);
+  typename Range::iterator pivot = writer;
+  typename InputRange::value_type prevRem = *remIt;
   ++remIt;
   size_t count = 1;
   for ( ; writer != r.end() && remIt != rem.end(); ++count, ++remIt)
     {
-    typename Range::iterator pivot = r.begin();
-    std::advance(pivot, *remIt);
+    std::advance(pivot, *remIt - prevRem);
+    prevRem = *remIt;
     writer = ContainerAlgorithms::RemoveN(writer, pivot, count);
     }
   writer = ContainerAlgorithms::RemoveN(writer, r.end(), count);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f01eaafbf1f1cc0791267546dd9d72e6da6f671b
commit f01eaafbf1f1cc0791267546dd9d72e6da6f671b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 22:07:28 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 23 20:19:35 2015 +0100

    cmAlgorithms: Relax iterator requirement for cmRemoveIndices.
    
    Require only forward iterators from the range.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index b361e1f..cbfbb26 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -236,12 +236,15 @@ typename Range::const_iterator cmRemoveIndices(Range& r, InputRange const& rem)
 {
   typename InputRange::const_iterator remIt = rem.begin();
 
-  typename Range::iterator writer = r.begin() + *remIt;
+  typename Range::iterator writer = r.begin();
+  std::advance(writer, *remIt);
   ++remIt;
   size_t count = 1;
   for ( ; writer != r.end() && remIt != rem.end(); ++count, ++remIt)
     {
-    writer = ContainerAlgorithms::RemoveN(writer, r.begin() + *remIt, count);
+    typename Range::iterator pivot = r.begin();
+    std::advance(pivot, *remIt);
+    writer = ContainerAlgorithms::RemoveN(writer, pivot, count);
     }
   writer = ContainerAlgorithms::RemoveN(writer, r.end(), count);
   return writer;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8b3022ad2357dbac46b7451198a3a7c5aa7acca
commit e8b3022ad2357dbac46b7451198a3a7c5aa7acca
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 22:00:01 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 23 20:19:35 2015 +0100

    cmAlgorithms: Make cmRemoveDuplicates work with more containers.
    
    Remove the accidental requirement that the input range must be a
    std::vector.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index c803a88..b361e1f 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -257,14 +257,15 @@ typename Range::const_iterator cmRemoveMatching(Range &r, MatchRange const& m)
 template<typename Range>
 typename Range::const_iterator cmRemoveDuplicates(Range& r)
 {
-  std::vector<typename Range::value_type> unique;
+  typedef std::vector<typename Range::value_type> UniqueVector;
+  UniqueVector unique;
   unique.reserve(r.size());
   std::vector<size_t> indices;
   size_t count = 0;
   for(typename Range::const_iterator it = r.begin();
       it != r.end(); ++it, ++count)
     {
-    const typename Range::iterator low =
+    const typename UniqueVector::iterator low =
         std::lower_bound(unique.begin(), unique.end(), *it);
     if (low == unique.end() || *low != *it)
       {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2296a5929637fdd77b470330e2467a43a80d2f6
commit c2296a5929637fdd77b470330e2467a43a80d2f6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 21:56:45 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 23 20:19:35 2015 +0100

    cmAlgorithms: Rename template argument to RemoveN.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 4d511cf..c803a88 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -150,10 +150,10 @@ private:
   const_iterator End;
 };
 
-template<typename Iter>
-Iter RemoveN(Iter i1, Iter i2, size_t n)
+template<typename FwdIt>
+FwdIt RemoveN(FwdIt i1, FwdIt i2, size_t n)
 {
-  Iter m = i1;
+  FwdIt m = i1;
   std::advance(m, n);
   return cmRotate(i1, m, i2);
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54af6f86eef18ddae4a73142b0667c832a626f07
commit 54af6f86eef18ddae4a73142b0667c832a626f07
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 21:55:19 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 23 20:19:35 2015 +0100

    cmAlgorithms: Relax cmRemoveN requirement to FwdIter.
    
    cmRotate already requires only FwdIter.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 86cc913..4d511cf 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -153,7 +153,9 @@ private:
 template<typename Iter>
 Iter RemoveN(Iter i1, Iter i2, size_t n)
 {
-  return cmRotate(i1, i1 + n, i2);
+  Iter m = i1;
+  std::advance(m, n);
+  return cmRotate(i1, m, i2);
 }
 
 template<typename Range>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37669f7c37f0d2e722253ff81c8074a153fe5aa1
commit 37669f7c37f0d2e722253ff81c8074a153fe5aa1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 21:53:19 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 23 20:19:35 2015 +0100

    cmAlgorithms: Add a size() to cmRange.
    
    size() is already used by cmRemoveDuplicates, which is designed to
    accept a cmRange.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 4b03736..86cc913 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -127,11 +127,13 @@ struct Range
 {
   typedef const_iterator_ const_iterator;
   typedef typename std::iterator_traits<const_iterator>::value_type value_type;
+  typedef typename std::iterator_traits<const_iterator>::difference_type difference_type;
   Range(const_iterator begin_, const_iterator end_)
     : Begin(begin_), End(end_) {}
   const_iterator begin() const { return Begin; }
   const_iterator end() const { return End; }
   bool empty() const { return std::distance(Begin, End) == 0; }
+  difference_type size() const { return std::distance(Begin, End); }
   Range& advance(cmIML_INT_intptr_t amount)
   {
     std::advance(Begin, amount);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47a3e22ea5aee971df1e04a6447bb916af81aa2c
commit 47a3e22ea5aee971df1e04a6447bb916af81aa2c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 21:52:36 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 23 20:19:35 2015 +0100

    cmAlgorithms: Rename template type in cmDeleteAll algorithm.
    
    It may be any range, not only a container.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 56e7f17..4b03736 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -105,19 +105,19 @@ struct cmIsPair<std::pair<K, V> >
   enum { value = true };
 };
 
-template<typename Container,
-    bool valueTypeIsPair = cmIsPair<typename Container::value_type>::value>
+template<typename Range,
+    bool valueTypeIsPair = cmIsPair<typename Range::value_type>::value>
 struct DefaultDeleter
 {
-  void operator()(typename Container::value_type value) const {
+  void operator()(typename Range::value_type value) const {
     delete value;
   }
 };
 
-template<typename Container>
-struct DefaultDeleter<Container, /* valueTypeIsPair = */ true>
+template<typename Range>
+struct DefaultDeleter<Range, /* valueTypeIsPair = */ true>
 {
-  void operator()(typename Container::value_type value) const {
+  void operator()(typename Range::value_type value) const {
     delete value.second;
   }
 };
@@ -187,11 +187,11 @@ cmRange(Range const& range)
       range.begin(), range.end());
 }
 
-template<typename Container>
-void cmDeleteAll(Container const& c)
+template<typename Range>
+void cmDeleteAll(Range const& r)
 {
-  std::for_each(c.begin(), c.end(),
-                ContainerAlgorithms::DefaultDeleter<Container>());
+  std::for_each(r.begin(), r.end(),
+                ContainerAlgorithms::DefaultDeleter<Range>());
 }
 
 template<typename Range>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb75eec0b45eda230996580043e00e38d35a1e5b
commit cb75eec0b45eda230996580043e00e38d35a1e5b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 21:52:09 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 23 20:19:35 2015 +0100

    cmAlgorithms: Add const to const objects.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index b9bd67b..56e7f17 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -84,7 +84,7 @@ private:
 template<typename FwdIt>
 FwdIt cmRotate(FwdIt first, FwdIt middle, FwdIt last)
 {
-  typename std::iterator_traits<FwdIt>::difference_type dist =
+  const typename std::iterator_traits<FwdIt>::difference_type dist =
       std::distance(middle, last);
   std::rotate(first, middle, last);
   std::advance(first, dist);
@@ -204,7 +204,7 @@ std::string cmJoin(Range const& r, const char* delimiter)
   std::ostringstream os;
   typedef typename Range::value_type ValueType;
   typedef typename Range::const_iterator InputIt;
-  InputIt first = r.begin();
+  const InputIt first = r.begin();
   InputIt last = r.end();
   --last;
   std::copy(first, last,
@@ -260,7 +260,7 @@ typename Range::const_iterator cmRemoveDuplicates(Range& r)
   for(typename Range::const_iterator it = r.begin();
       it != r.end(); ++it, ++count)
     {
-    typename Range::iterator low =
+    const typename Range::iterator low =
         std::lower_bound(unique.begin(), unique.end(), *it);
     if (low == unique.end() || *low != *it)
       {

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

Summary of changes:
 Source/cmAlgorithms.h |   60 +++++++++++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Feb 23 16:45:20 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 23 Feb 2015 16:45:20 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-644-gb345e92
Message-ID: <20150223214520.1C4BBAA1AB@public.kitware.com>

This is an automated email from 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  b345e9206ebc65030aae13561cbca9c261f263b3 (commit)
       via  f6cb72e00bd813e4878902a414272a4d036b6f22 (commit)
      from  53dd35e55a05aeb6b250c3ad9731c708249f5b93 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b345e9206ebc65030aae13561cbca9c261f263b3
commit b345e9206ebc65030aae13561cbca9c261f263b3
Merge: 53dd35e f6cb72e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 23 16:45:19 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 16:45:19 2015 -0500

    Merge topic 'FPHSA-ExactCase-name' into next
    
    f6cb72e0 FPHSA: Always populate the ExactCase_FOUND variable (#15412).


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6cb72e00bd813e4878902a414272a4d036b6f22
commit f6cb72e00bd813e4878902a414272a4d036b6f22
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 23 22:23:11 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 23 22:43:42 2015 +0100

    FPHSA: Always populate the ExactCase_FOUND variable (#15412).
    
    The UPPERCASE name was inconsistent with config-packages, the
    find_dependency macro, and even FPHSA itself, which expects
    components to be specified with names matching ExactCase.
    
    The FOUND_VAR was only permitted to have two possible values, and
    now both are set for compatibility.  Document it as obsolete, and
    adjust the code for the same.  Users of the variable should just
    remove it.

diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake
index 2de1fb3..c6a1942 100644
--- a/Modules/FindPackageHandleStandardArgs.cmake
+++ b/Modules/FindPackageHandleStandardArgs.cmake
@@ -8,9 +8,9 @@
 #
 # This function is intended to be used in FindXXX.cmake modules files.
 # It handles the REQUIRED, QUIET and version-related arguments to
-# find_package().  It also sets the <packagename>_FOUND variable.  The
-# package is considered found if all variables <var1>...  listed contain
-# valid results, e.g.  valid filepaths.
+# find_package(PackageName).  It also sets the <PackageName>_FOUND
+# variable.  The package is considered found if all variables <var1>...
+# listed contain valid results, e.g.  valid filepaths.
 #
 # There are two modes of this function.  The first argument in both
 # modes is the name of the Find-module where it is called (in original
@@ -24,7 +24,7 @@
 #       (DEFAULT_MSG|"Custom failure message") <var1>...<varN> )
 #
 # If the variables <var1> to <varN> are all valid, then
-# <UPPERCASED_NAME>_FOUND will be set to TRUE.  If DEFAULT_MSG is given
+# <PackageName>_FOUND will be set to TRUE.  If DEFAULT_MSG is given
 # as second argument, then the function will generate itself useful
 # success and error messages.  You can also supply a custom error
 # message for the failure case.  This is not recommended.
@@ -41,16 +41,12 @@
 #       [CONFIG_MODE]
 #       [FAIL_MESSAGE "Custom failure message"] )
 #
-# In this mode, the name of the result-variable can be set either to
-# either <UPPERCASED_NAME>_FOUND or <OriginalCase_Name>_FOUND using the
-# FOUND_VAR option.  Other names for the result-variable are not
-# allowed.  So for a Find-module named FindFooBar.cmake, the two
-# possible names are FooBar_FOUND and FOOBAR_FOUND.  It is recommended
-# to use the original case version.  If the FOUND_VAR option is not
-# used, the default is <UPPERCASED_NAME>_FOUND.
+# The FOUND_VAR option is obsolete.  ``FIND_PACKAGE_HANDLE_STANDARD_ARGS``
+# always populates ``<PackageName>_FOUND``.  For backward compatibility,
+# it also always populates ``<UPPERCASE_NAME>_FOUND``.
 #
 # As in the simple mode, if <var1> through <varN> are all valid,
-# <packagename>_FOUND will be set to TRUE.  After REQUIRED_VARS the
+# <PackageName>_FOUND will be set to TRUE.  After REQUIRED_VARS the
 # variables which are required for this package are listed.  Following
 # VERSION_VAR the name of the variable can be specified which holds the
 # version of the package which has been found.  If this is done, this
@@ -61,7 +57,7 @@
 # version is ok or not.  If the package supports components, use the
 # HANDLE_COMPONENTS option to enable handling them.  In this case,
 # find_package_handle_standard_args() will report which components have
-# been found and which are missing, and the <packagename>_FOUND variable
+# been found and which are missing, and the <PackageName>_FOUND variable
 # will be set to FALSE if any of the required components (i.e.  not the
 # ones listed after OPTIONAL_COMPONENTS) are missing.  Use the option
 # CONFIG_MODE if your FindXXX.cmake module is a wrapper for a
@@ -81,7 +77,7 @@
 #
 #
 # LibXml2 is considered to be found, if both LIBXML2_LIBRARY and
-# LIBXML2_INCLUDE_DIR are valid.  Then also LIBXML2_FOUND is set to
+# LIBXML2_INCLUDE_DIR are valid.  Then also LibXml2_FOUND is set to
 # TRUE.  If it is not found and REQUIRED was used, it fails with
 # FATAL_ERROR, independent whether QUIET was used or not.  If it is
 # found, success will be reported, including the content of <var1>.  On
@@ -92,16 +88,14 @@
 # ::
 #
 #     find_package_handle_standard_args(LibXslt
-#       FOUND_VAR LibXslt_FOUND
 #       REQUIRED_VARS LibXslt_LIBRARIES LibXslt_INCLUDE_DIRS
 #       VERSION_VAR LibXslt_VERSION_STRING)
 #
 # In this case, LibXslt is considered to be found if the variable(s)
 # listed after REQUIRED_VAR are all valid, i.e.  LibXslt_LIBRARIES and
-# LibXslt_INCLUDE_DIRS in this case.  The result will then be stored in
-# LibXslt_FOUND .  Also the version of LibXslt will be checked by using
-# the version contained in LibXslt_VERSION_STRING.  Since no
-# FAIL_MESSAGE is given, the default messages will be printed.
+# LibXslt_INCLUDE_DIRS in this case.  Also the version of LibXslt will be
+# checked by using the version contained in LibXslt_VERSION_STRING.  Since
+# no FAIL_MESSAGE is given, the default messages will be printed.
 #
 # Another example for mode 2:
 #
@@ -111,9 +105,8 @@
 #     find_package_handle_standard_args(Automoc4  CONFIG_MODE)
 #
 # In this case, FindAutmoc4.cmake wraps a call to find_package(Automoc4
-# NO_MODULE) and adds an additional search directory for automoc4.  Here
-# the result will be stored in AUTOMOC4_FOUND.  The following
-# FIND_PACKAGE_HANDLE_STANDARD_ARGS() call produces a proper
+# NO_MODULE) and adds an additional search directory for automoc4.  The
+# following FIND_PACKAGE_HANDLE_STANDARD_ARGS() call produces a proper
 # success/error message.
 
 #=============================================================================
@@ -224,32 +217,23 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
   string(TOUPPER ${_NAME} _NAME_UPPER)
   string(TOLOWER ${_NAME} _NAME_LOWER)
 
-  if(FPHSA_FOUND_VAR)
-    if(FPHSA_FOUND_VAR MATCHES "^${_NAME}_FOUND$"  OR  FPHSA_FOUND_VAR MATCHES "^${_NAME_UPPER}_FOUND$")
-      set(_FOUND_VAR ${FPHSA_FOUND_VAR})
-    else()
-      message(FATAL_ERROR "The argument for FOUND_VAR is \"${FPHSA_FOUND_VAR}\", but only \"${_NAME}_FOUND\" and \"${_NAME_UPPER}_FOUND\" are valid names.")
-    endif()
-  else()
-    set(_FOUND_VAR ${_NAME_UPPER}_FOUND)
-  endif()
-
   # collect all variables which were not found, so they can be printed, so the
   # user knows better what went wrong (#6375)
   set(MISSING_VARS "")
   set(DETAILS "")
   # check if all passed variables are valid
-  unset(${_FOUND_VAR})
+  unset(${_NAME}_FOUND)
+  unset(${_NAME_UPPER}_FOUND)
   foreach(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
     if(NOT ${_CURRENT_VAR})
-      set(${_FOUND_VAR} FALSE)
+      set(${_NAME}_FOUND FALSE)
       set(MISSING_VARS "${MISSING_VARS} ${_CURRENT_VAR}")
     else()
       set(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]")
     endif()
   endforeach()
-  if(NOT "${${_FOUND_VAR}}" STREQUAL "FALSE")
-    set(${_FOUND_VAR} TRUE)
+  if(NOT "${${_NAME}_FOUND}" STREQUAL "FALSE")
+    set(${_NAME}_FOUND TRUE)
   endif()
 
   # component handling
@@ -273,7 +257,7 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
         set(MISSING_COMPONENTS_MSG "${MISSING_COMPONENTS_MSG} ${comp}")
 
         if(${_NAME}_FIND_REQUIRED_${comp})
-          set(${_FOUND_VAR} FALSE)
+          set(${_NAME}_FOUND FALSE)
           set(MISSING_VARS "${MISSING_VARS} ${comp}")
         endif()
 
@@ -356,12 +340,12 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
   if(VERSION_OK)
     set(DETAILS "${DETAILS}[v${VERSION}(${${_NAME}_FIND_VERSION})]")
   else()
-    set(${_FOUND_VAR} FALSE)
+    set(${_NAME}_FOUND FALSE)
   endif()
 
 
   # print the result:
-  if (${_FOUND_VAR})
+  if (${_NAME}_FOUND)
     FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG} ${COMPONENT_MSG}" "${DETAILS}")
   else ()
 
@@ -377,6 +361,6 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
 
   endif ()
 
-  set(${_FOUND_VAR} ${${_FOUND_VAR}} PARENT_SCOPE)
-
+  set(${_NAME}_FOUND ${${_NAME}_FOUND} PARENT_SCOPE)
+  set(${_NAME_UPPER}_FOUND ${${_NAME}_FOUND} PARENT_SCOPE)
 endfunction()
diff --git a/Tests/FindPackageTest/CMakeLists.txt b/Tests/FindPackageTest/CMakeLists.txt
index f311fb9..8fafa3b 100644
--- a/Tests/FindPackageTest/CMakeLists.txt
+++ b/Tests/FindPackageTest/CMakeLists.txt
@@ -45,12 +45,18 @@ endif()
 
 find_package(SomePackage)
 if(NOT SomePackage_FOUND)
-  message(SEND_ERROR "SomePackage with FOUND_VAR SomePackage_FOUND not found !")
+  message(SEND_ERROR "SomePackage not found !")
+endif()
+if(NOT SOMEPACKAGE_FOUND)
+  message(SEND_ERROR "SomePackage compatibility name SOMEPACKAGE_FOUND not set!")
 endif()
 
 find_package(UpperCasePackage)
+if(NOT UpperCasePackage_FOUND)
+  message(SEND_ERROR "UpperCasePackage not found!")
+endif()
 if(NOT UPPERCASEPACKAGE_FOUND)
-  message(SEND_ERROR "UpperCasePackage with FOUND_VAR UPPERCASEPACKAGE_FOUND not found !")
+  message(SEND_ERROR "SomePackage compatibility name SOMEPACKAGE_FOUND not set!")
 endif()
 
 #-----------------------------------------------------------------------------
diff --git a/Tests/FindPackageTest/FindSomePackage.cmake b/Tests/FindPackageTest/FindSomePackage.cmake
index 7283d24..746c087 100644
--- a/Tests/FindPackageTest/FindSomePackage.cmake
+++ b/Tests/FindPackageTest/FindSomePackage.cmake
@@ -2,5 +2,4 @@ set(SOP_FOO TRUE)
 
 include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
 
-find_package_handle_standard_args(SomePackage REQUIRED_VARS SOP_FOO
-                                              FOUND_VAR SomePackage_FOUND )
+find_package_handle_standard_args(SomePackage REQUIRED_VARS SOP_FOO)
diff --git a/Tests/FindPackageTest/FindUpperCasePackage.cmake b/Tests/FindPackageTest/FindUpperCasePackage.cmake
index 425d417..5e349da 100644
--- a/Tests/FindPackageTest/FindUpperCasePackage.cmake
+++ b/Tests/FindPackageTest/FindUpperCasePackage.cmake
@@ -2,5 +2,4 @@ set(UCP_FOO TRUE)
 
 include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
 
-find_package_handle_standard_args(UpperCasePackage REQUIRED_VARS UCP_FOO
-                                                   FOUND_VAR UPPERCASEPACKAGE_FOUND )
+find_package_handle_standard_args(UpperCasePackage REQUIRED_VARS UCP_FOO)
diff --git a/Tests/RunCMake/FPHSA/BadFoundVar-result.txt b/Tests/RunCMake/FPHSA/BadFoundVar-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/FPHSA/BadFoundVar-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/FPHSA/BadFoundVar-stderr.txt b/Tests/RunCMake/FPHSA/BadFoundVar-stderr.txt
deleted file mode 100644
index 4c739d8..0000000
--- a/Tests/RunCMake/FPHSA/BadFoundVar-stderr.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-CMake Error at .*/Modules/FindPackageHandleStandardArgs.cmake:[0-9]+ \(message\):
-  The argument for FOUND_VAR is "badfoundvar_FOUND", but only
-  "BadFoundVar_FOUND" and "BADFOUNDVAR_FOUND" are valid names.
-Call Stack \(most recent call first\):
-  FindBadFoundVar.cmake:5 \(find_package_handle_standard_args\)
-  BadFoundVar.cmake:3 \(find_package\)
-  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/FPHSA/BadFoundVar.cmake b/Tests/RunCMake/FPHSA/BadFoundVar.cmake
deleted file mode 100644
index 07d4322..0000000
--- a/Tests/RunCMake/FPHSA/BadFoundVar.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
-
-find_package(BadFoundVar REQUIRED)
diff --git a/Tests/RunCMake/FPHSA/FindBadFoundVar.cmake b/Tests/RunCMake/FPHSA/FindBadFoundVar.cmake
deleted file mode 100644
index 152df5c..0000000
--- a/Tests/RunCMake/FPHSA/FindBadFoundVar.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-set(BFV_FOO TRUE)
-
-include(FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args(BadFoundVar REQUIRED_VARS BFV_FOO
-                                              FOUND_VAR badfoundvar_FOUND )
diff --git a/Tests/RunCMake/FPHSA/RunCMakeTest.cmake b/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
index e9b2a7a..b63cfa7 100644
--- a/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
+++ b/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
@@ -1,7 +1,5 @@
 include(RunCMake)
 
-run_cmake(BadFoundVar)
-
 # The pseudo module will "find" a package with the given version. Check if the
 # version selection code in FPHSA works correctly.
 set(RunCMake_TEST_OPTIONS "-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_LIST_DIR}" "-DPseudo_VERSION=1.2.3.4.5")

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

Summary of changes:
 Modules/FindPackageHandleStandardArgs.cmake      |   66 ++++++++--------------
 Tests/FindPackageTest/CMakeLists.txt             |   10 +++-
 Tests/FindPackageTest/FindSomePackage.cmake      |    3 +-
 Tests/FindPackageTest/FindUpperCasePackage.cmake |    3 +-
 Tests/RunCMake/FPHSA/BadFoundVar-result.txt      |    1 -
 Tests/RunCMake/FPHSA/BadFoundVar-stderr.txt      |    7 ---
 Tests/RunCMake/FPHSA/BadFoundVar.cmake           |    3 -
 Tests/RunCMake/FPHSA/FindBadFoundVar.cmake       |    6 --
 Tests/RunCMake/FPHSA/RunCMakeTest.cmake          |    2 -
 9 files changed, 35 insertions(+), 66 deletions(-)
 delete mode 100644 Tests/RunCMake/FPHSA/BadFoundVar-result.txt
 delete mode 100644 Tests/RunCMake/FPHSA/BadFoundVar-stderr.txt
 delete mode 100644 Tests/RunCMake/FPHSA/BadFoundVar.cmake
 delete mode 100644 Tests/RunCMake/FPHSA/FindBadFoundVar.cmake


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Tue Feb 24 00:01:19 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Tue, 24 Feb 2015 00:01:19 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-255-gd83b40c
Message-ID: <20150224050119.24DF3AADE8@public.kitware.com>

This is an automated email from 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  d83b40c58dbd8a37147377e159f1c5ae8ca2f8c6 (commit)
      from  7e576624bbe77df9879075d48652defdf0cbce62 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d83b40c58dbd8a37147377e159f1c5ae8ca2f8c6
commit d83b40c58dbd8a37147377e159f1c5ae8ca2f8c6
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Tue Feb 24 00:01:16 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Feb 24 00:01:16 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index bee5291..12242a3 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 2)
-set(CMake_VERSION_PATCH 20150223)
+set(CMake_VERSION_PATCH 20150224)
 #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 Feb 24 08:51:55 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 08:51:55 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-646-gc8dce27
Message-ID: <20150224135155.9F811AAEC3@public.kitware.com>

This is an automated email from 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  c8dce2768943c1fa193e758936a251c9490b5fc7 (commit)
       via  5857ca5e0d6c6f04486153f69184ba5d76b13f0b (commit)
      from  b345e9206ebc65030aae13561cbca9c261f263b3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8dce2768943c1fa193e758936a251c9490b5fc7
commit c8dce2768943c1fa193e758936a251c9490b5fc7
Merge: b345e92 5857ca5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 08:51:54 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 08:51:54 2015 -0500

    Merge topic 'rpm_at_in_path' into next
    
    5857ca5e CPackRPM: Drop explicit handling of '@' symbols that breaks them (#14782)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5857ca5e0d6c6f04486153f69184ba5d76b13f0b
commit 5857ca5e0d6c6f04486153f69184ba5d76b13f0b
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed Jan 7 20:33:27 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 08:44:36 2015 -0500

    CPackRPM: Drop explicit handling of '@' symbols that breaks them (#14782)
    
    The change in commit v2.8.12~218^2 (CPackRPM protect '@' character in
    filename processed in the spec file, 2013-07-05) was not necessary after
    commit v2.8.12~439^2 (Add support for componentized USER spec file,
    2013-04-01).  The latter replaced ${VAR} references in the spec file
    template string with \@VAR\@ references, thus protecting '@' symbols
    automatically.  This caused CPackRPM to break paths with @ symbols.
    Revert the change to fix the behavior, and add a test case.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 6ce18bf..cb987f8 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1175,13 +1175,6 @@ if(CPACK_RPM_PACKAGE_DEBUG)
    message("CPackRPM:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}")
 endif()
 
-# protect @ in pathname in order to avoid their
-# interpretation during the configure_file step
-set(CPACK_RPM_INSTALL_FILES_LIST "${CPACK_RPM_INSTALL_FILES}")
-set(PROTECTED_AT "@")
-string(REPLACE "@" "\@PROTECTED_AT\@" CPACK_RPM_INSTALL_FILES "${CPACK_RPM_INSTALL_FILES_LIST}")
-set(CPACK_RPM_INSTALL_FILES_LIST "")
-
 #
 # USER generated/provided spec file handling.
 #
@@ -1292,9 +1285,6 @@ else()
   configure_file(${CPACK_RPM_BINARY_SPECFILE}.in ${CPACK_RPM_BINARY_SPECFILE} @ONLY)
 endif()
 
-# remove AT protection
-unset(PROTECTED_AT)
-
 if(RPMBUILD_EXECUTABLE)
   # Now call rpmbuild using the SPECFILE
   execute_process(
diff --git a/Tests/CPackComponentsForAll/CMakeLists.txt b/Tests/CPackComponentsForAll/CMakeLists.txt
index b55594e..51af297 100644
--- a/Tests/CPackComponentsForAll/CMakeLists.txt
+++ b/Tests/CPackComponentsForAll/CMakeLists.txt
@@ -43,7 +43,7 @@ install(TARGETS mylibapp
 # CPACK_MONOLITHIC_INSTALL=1 is set (at cmake time).
 install(TARGETS mylibapp2
   RUNTIME
-  DESTINATION bin)
+  DESTINATION bin/@in at _@path@@with\\@and\\@/\@in_path\@) # test @ char in path
 
 install(FILES mylib.h
   DESTINATION include
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index 5be9d17..f06605a 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -139,6 +139,7 @@ if(CPackGen MATCHES "RPM")
   set(CPACK_COMPONENT_HEADERS_DESCRIPTION
     "C/C\\+\\+ header files for use with MyLib")
 
+  # test package info
   if(${CPackComponentWay} STREQUAL "IgnoreGroup")
     # set gnu install prefixes to what they are set during rpm creation
     # CMAKE_SIZEOF_VOID_P is not set here but lib is prefix of lib64 so
@@ -213,6 +214,29 @@ if(CPackGen MATCHES "RPM")
           message(FATAL_ERROR "error: '${check_file}' Architecture does not match expected value - '${check_file_match_expected_architecture}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
       endif()
     endforeach()
-  elseif(${CPackComponentWay} STREQUAL "IgnoreGroup")
+
+    # test package content
+    foreach(check_file ${expected_file})
+      string(REGEX MATCH ".*Unspecified.*" check_file_Unspecified_match ${check_file})
+
+      if(check_file_Unspecified_match)
+        execute_process(COMMAND ${RPM_EXECUTABLE} -pql ${check_file}
+            OUTPUT_VARIABLE check_file_content
+            ERROR_QUIET
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+        string(REGEX MATCH ".*bin/@in at _@path@@with/@and/@/@in_path@/mylibapp2$" check_at_in_path ${check_file_content})
+
+        if(NOT check_at_in_path)
+          file(GLOB_RECURSE spec_file "${CPackComponentsForAll_BINARY_DIR}/*Unspecified*.spec")
+
+          if(spec_file)
+            file(READ ${spec_file} spec_file_content)
+          endif()
+
+          message(FATAL_ERROR "error: '${check_file}' rpm package path with @ characters is missing or invalid. RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
+        endif()
+      endif()
+    endforeach()
   endif()
 endif()

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 08:54:37 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 08:54:37 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-662-g045eaf7
Message-ID: <20150224135437.2F964AAF3E@public.kitware.com>

This is an automated email from 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  045eaf7e810d346b9a2ff0ac36515a0596ddaadd (commit)
       via  ff1ddd2a73dd04e3015c2bc4ffe345f8c6ca02ee (commit)
       via  0b87b2a33902ac000a0073a1def887599c69809d (commit)
       via  fc58bdb9ad90ddd41c5336bc1ab2e35fa0f74d41 (commit)
       via  876a680d4851a39e77b49daa3c670fe2e535c1e6 (commit)
       via  49ba4545c272f5bb00828dfe35e5a63749b4aa43 (commit)
       via  f999dc0bbf70dcf6167d77a1dedabefa12edaef2 (commit)
       via  645ad117e1c8b3b99fda128daad708a87c0a3f2e (commit)
       via  19d1a5599a08f2e8d74c4483cb9ee6d34e38ecba (commit)
       via  1643b905e02473536d60ef4102d3154a6c8816d1 (commit)
       via  12db113944860269b72093424b17ad2f86bccf2f (commit)
       via  e2b9e7f7bc1b4e3a36e8b19fc9925b358b5c99e0 (commit)
       via  7ce9f6e29ee143d2a63d55354c00d5ea50d6d0d1 (commit)
       via  69de0f7ea4163f350dd6683b6d7f47377157ae7d (commit)
       via  57f2aa7c37e3e4d09a43c6790772d11d5b63e9a6 (commit)
       via  b04c8ec3f840a5cb34a97b2fe8417882b49b3820 (commit)
      from  c8dce2768943c1fa193e758936a251c9490b5fc7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=045eaf7e810d346b9a2ff0ac36515a0596ddaadd
commit 045eaf7e810d346b9a2ff0ac36515a0596ddaadd
Merge: c8dce27 ff1ddd2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 08:54:34 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 08:54:34 2015 -0500

    Merge topic 'ctest-output-options' into next
    
    ff1ddd2a ctest_upload: Add QUIET option
    0b87b2a3 ctest_memcheck: Add QUIET option
    fc58bdb9 ctest_coverage: Add QUIET option
    876a680d ctest_test: Add QUIET option
    49ba4545 ctest_build: Add QUIET option
    f999dc0b ctest_configure: Add QUIET option
    645ad117 ctest_update: Add QUIET option
    19d1a559 ctest_start: Add QUIET option
    1643b905 ctest_submit: Add QUIET option
    12db1139 CTest: Add cmCTestOptionalLog macro
    e2b9e7f7 Tests: Drop unnecessary stderr matching from RunCMake.ctest_memcheck
    7ce9f6e2 Tests: Teach RunCMake to tolerate 'Error kstat returned' lines in test output
    69de0f7e Tests: Teach RunCMake to tolerate Guard Malloc lines in test output
    57f2aa7c Tests: Teach RunCMake to tolerate BullseyeCoverage lines in test output
    b04c8ec3 Tests: Match curl error in RunCMake.ctest_submit FailDrop-* cases


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff1ddd2a73dd04e3015c2bc4ffe345f8c6ca02ee
commit ff1ddd2a73dd04e3015c2bc4ffe345f8c6ca02ee
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 18 09:15:29 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:02:00 2015 -0500

    ctest_upload: Add QUIET option

diff --git a/Help/command/ctest_upload.rst b/Help/command/ctest_upload.rst
index 9156af5..fcd9fe4 100644
--- a/Help/command/ctest_upload.rst
+++ b/Help/command/ctest_upload.rst
@@ -5,7 +5,10 @@ Upload files to a dashboard server.
 
 ::
 
-  ctest_upload(FILES ...)
+  ctest_upload(FILES ... [QUIET])
 
 Pass a list of files to be sent along with the build results to the
 dashboard server.
+
+The QUIET option suppresses any CTest-specific non-error output
+that would have been printed to the console otherwise.
diff --git a/Source/CTest/cmCTestUploadCommand.cxx b/Source/CTest/cmCTestUploadCommand.cxx
index 5613751..f5000dd 100644
--- a/Source/CTest/cmCTestUploadCommand.cxx
+++ b/Source/CTest/cmCTestUploadCommand.cxx
@@ -26,6 +26,7 @@ cmCTestGenericHandler* cmCTestUploadCommand::InitializeHandler()
     }
   static_cast<cmCTestUploadHandler*>(handler)->SetFiles(this->Files);
 
+  handler->SetQuiet(this->Quiet);
   return handler;
 }
 
@@ -38,6 +39,12 @@ bool cmCTestUploadCommand::CheckArgumentKeyword(std::string const& arg)
     this->ArgumentDoing = ArgumentDoingFiles;
     return true;
     }
+  if(arg == "QUIET")
+    {
+    this->ArgumentDoing = ArgumentDoingNone;
+    this->Quiet = true;
+    return true;
+    }
   return false;
 }
 
diff --git a/Source/CTest/cmCTestUploadHandler.cxx b/Source/CTest/cmCTestUploadHandler.cxx
index e33c387..579190a 100644
--- a/Source/CTest/cmCTestUploadHandler.cxx
+++ b/Source/CTest/cmCTestUploadHandler.cxx
@@ -64,8 +64,8 @@ int cmCTestUploadHandler::ProcessHandler()
 
   for ( it = this->Files.begin(); it != this->Files.end(); it ++ )
     {
-    cmCTestLog(this->CTest, OUTPUT,
-               "\tUpload file: " << *it << std::endl);
+    cmCTestOptionalLog(this->CTest, OUTPUT,
+      "\tUpload file: " << *it << std::endl, this->Quiet);
     ofs << "<File filename=\"" << cmXMLSafe(*it) << "\">\n"
        << "<Content encoding=\"base64\">\n";
     ofs << this->CTest->Base64EncodeFile(*it);
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 83a88ad..f654dbc 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -137,6 +137,7 @@ endif()
 add_RunCMake_test(ctest_start)
 add_RunCMake_test(ctest_submit)
 add_RunCMake_test(ctest_test)
+add_RunCMake_test(ctest_upload)
 add_RunCMake_test(file)
 add_RunCMake_test(find_library)
 add_RunCMake_test(find_package)
diff --git a/Tests/RunCMake/ctest_upload/CMakeLists.txt.in b/Tests/RunCMake/ctest_upload/CMakeLists.txt.in
new file mode 100644
index 0000000..1fab71b
--- /dev/null
+++ b/Tests/RunCMake/ctest_upload/CMakeLists.txt.in
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1)
+project(CTestUpload at CASE_NAME@ NONE)
+include(CTest)
+add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
diff --git a/Tests/RunCMake/ctest_upload/CTestConfig.cmake.in b/Tests/RunCMake/ctest_upload/CTestConfig.cmake.in
new file mode 100644
index 0000000..52665a8
--- /dev/null
+++ b/Tests/RunCMake/ctest_upload/CTestConfig.cmake.in
@@ -0,0 +1 @@
+set(CTEST_PROJECT_NAME "CTestUpload at CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_upload/RunCMakeTest.cmake b/Tests/RunCMake/ctest_upload/RunCMakeTest.cmake
new file mode 100644
index 0000000..b33d278
--- /dev/null
+++ b/Tests/RunCMake/ctest_upload/RunCMakeTest.cmake
@@ -0,0 +1,10 @@
+include(RunCTest)
+
+set(CASE_CTEST_UPLOAD_ARGS "")
+
+function(run_ctest_upload CASE_NAME)
+  set(CASE_CTEST_UPLOAD_ARGS "${ARGN}")
+  run_ctest(${CASE_NAME})
+endfunction()
+
+run_ctest_upload(UploadQuiet QUIET)
diff --git a/Tests/RunCMake/ctest_upload/UploadQuiet-stdout.txt b/Tests/RunCMake/ctest_upload/UploadQuiet-stdout.txt
new file mode 100644
index 0000000..20e13b8
--- /dev/null
+++ b/Tests/RunCMake/ctest_upload/UploadQuiet-stdout.txt
@@ -0,0 +1 @@
+Use Experimental tag: [0-9-]+$
diff --git a/Tests/RunCMake/ctest_upload/test.cmake.in b/Tests/RunCMake/ctest_upload/test.cmake.in
new file mode 100644
index 0000000..f13bdd1
--- /dev/null
+++ b/Tests/RunCMake/ctest_upload/test.cmake.in
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.1)
+
+set(CTEST_SITE                          "test-site")
+set(CTEST_BUILD_NAME                    "test-build-name")
+set(CTEST_SOURCE_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME@")
+set(CTEST_BINARY_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME at -build")
+set(CTEST_CMAKE_GENERATOR               "@RunCMake_GENERATOR@")
+set(CTEST_CMAKE_GENERATOR_PLATFORM      "@RunCMake_GENERATOR_PLATFORM@")
+set(CTEST_CMAKE_GENERATOR_TOOLSET       "@RunCMake_GENERATOR_TOOLSET@")
+set(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
+
+set(ctest_upload_args "@CASE_CTEST_UPLOAD_ARGS@")
+ctest_start(Experimental)
+ctest_upload(FILES "${CTEST_SOURCE_DIRECTORY}/CMakeLists.txt" ${ctest_upload_args})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b87b2a33902ac000a0073a1def887599c69809d
commit 0b87b2a33902ac000a0073a1def887599c69809d
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 17 17:15:00 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:02:00 2015 -0500

    ctest_memcheck: Add QUIET option

diff --git a/Help/command/ctest_memcheck.rst b/Help/command/ctest_memcheck.rst
index ca47ed0..56a2490 100644
--- a/Help/command/ctest_memcheck.rst
+++ b/Help/command/ctest_memcheck.rst
@@ -26,3 +26,7 @@ the number of tests to be run in parallel.
 The APPEND option marks results for append to those previously
 submitted to a dashboard server since the last ctest_start.  Append
 semantics are defined by the dashboard server in use.
+
+The QUIET option suppresses any CTest-specific non-error messages
+that would have otherwise been printed to the console.  Output from
+the underlying tests are not affected.
diff --git a/Source/CTest/cmCTestMemCheckCommand.cxx b/Source/CTest/cmCTestMemCheckCommand.cxx
index f144066..b379d32 100644
--- a/Source/CTest/cmCTestMemCheckCommand.cxx
+++ b/Source/CTest/cmCTestMemCheckCommand.cxx
@@ -21,16 +21,20 @@ cmCTestGenericHandler* cmCTestMemCheckCommand::InitializeActualHandler()
     = this->CTest->GetInitializedHandler("memcheck");
 
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "MemoryCheckType", "CTEST_MEMORYCHECK_TYPE");
+    "MemoryCheckType", "CTEST_MEMORYCHECK_TYPE", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "MemoryCheckSanitizerOptions", "CTEST_MEMORYCHECK_SANITIZER_OPTIONS");
+    "MemoryCheckSanitizerOptions", "CTEST_MEMORYCHECK_SANITIZER_OPTIONS",
+    this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "MemoryCheckCommand", "CTEST_MEMORYCHECK_COMMAND");
+    "MemoryCheckCommand", "CTEST_MEMORYCHECK_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "MemoryCheckCommandOptions", "CTEST_MEMORYCHECK_COMMAND_OPTIONS");
+    "MemoryCheckCommandOptions", "CTEST_MEMORYCHECK_COMMAND_OPTIONS",
+    this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "MemoryCheckSuppressionFile", "CTEST_MEMORYCHECK_SUPPRESSIONS_FILE");
+    "MemoryCheckSuppressionFile", "CTEST_MEMORYCHECK_SUPPRESSIONS_FILE",
+    this->Quiet);
 
+  handler->SetQuiet(this->Quiet);
   return handler;
 }
 
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index d4ff24f..061f3fd 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -251,8 +251,8 @@ void cmCTestMemCheckHandler::GenerateTestCommand(
     memcheckcommand += " " + memTesterEnvironmentVariable;
     args.push_back(memTesterEnvironmentVariable);
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Memory check command: "
-    << memcheckcommand << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "Memory check command: " << memcheckcommand << std::endl, this->Quiet);
 }
 
 //----------------------------------------------------------------------
@@ -347,7 +347,8 @@ void cmCTestMemCheckHandler::PopulateCustomVectors(cmMakefile *mf)
                              "CTEST_CUSTOM_MEMCHECK_IGNORE",
                              this->CustomTestsIgnore);
   std::string cmake = cmSystemTools::GetCMakeCommand();
-  this->CTest->SetCTestConfiguration("CMakeCommand", cmake.c_str());
+  this->CTest->SetCTestConfiguration("CMakeCommand", cmake.c_str(),
+    this->Quiet);
 }
 
 //----------------------------------------------------------------------
@@ -400,8 +401,8 @@ void cmCTestMemCheckHandler::GenerateDartOutput(std::ostream& os)
       << "</Test>" << std::endl;
     }
   os << "\t</TestList>\n";
-  cmCTestLog(this->CTest, HANDLER_OUTPUT,
-    "-- Processing memory checking output: ");
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+    "-- Processing memory checking output: ", this->Quiet);
   size_t total = this->TestResults.size();
   size_t step = total / 10;
   size_t current = 0;
@@ -451,13 +452,14 @@ void cmCTestMemCheckHandler::GenerateDartOutput(std::ostream& os)
     this->WriteTestResultFooter(os, result);
     if ( current < cc )
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "#" << std::flush);
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "#" << std::flush,
+        this->Quiet);
       current += step;
       }
     }
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl);
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "Memory checking results:"
-    << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, std::endl, this->Quiet);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "Memory checking results:"
+    << std::endl, this->Quiet);
   os << "\t<DefectList>" << std::endl;
   for ( cc = 0; cc < this->GlobalResults.size(); cc ++ )
     {
@@ -468,9 +470,9 @@ void cmCTestMemCheckHandler::GenerateDartOutput(std::ostream& os)
 #endif
       std::cerr.width(35);
 #define cerr no_cerr
-      cmCTestLog(this->CTest, HANDLER_OUTPUT,
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
         this->ResultStringsLong[cc] << " - "
-        << this->GlobalResults[cc] << std::endl);
+        << this->GlobalResults[cc] << std::endl, this->Quiet);
       os << "\t\t<Defect Type=\"" << this->ResultStringsLong[cc]
         << "\"/>" << std::endl;
       }
@@ -594,10 +596,10 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
     }
   if(this->MemoryTester.empty())
     {
-    cmCTestLog(this->CTest, WARNING,
+    cmCTestOptionalLog(this->CTest, WARNING,
                "Memory checker (MemoryCheckCommand) "
                "not set, or cannot find the specified program."
-               << std::endl);
+               << std::endl, this->Quiet);
     return false;
     }
 
@@ -981,17 +983,18 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput(
     "locked by a different thread");
   std::vector<std::string::size_type> nonValGrindOutput;
   double sttime = cmSystemTools::GetTime();
-  cmCTestLog(this->CTest, DEBUG, "Start test: " << lines.size() << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG,
+    "Start test: " << lines.size() << std::endl, this->Quiet);
   std::string::size_type totalOutputSize = 0;
   for ( cc = 0; cc < lines.size(); cc ++ )
     {
-    cmCTestLog(this->CTest, DEBUG, "test line "
-               << lines[cc] << std::endl);
+    cmCTestOptionalLog(this->CTest, DEBUG, "test line "
+               << lines[cc] << std::endl, this->Quiet);
 
     if ( valgrindLine.find(lines[cc]) )
       {
-      cmCTestLog(this->CTest, DEBUG, "valgrind  line "
-                 << lines[cc] << std::endl);
+      cmCTestOptionalLog(this->CTest, DEBUG, "valgrind  line "
+                 << lines[cc] << std::endl, this->Quiet);
       int failure = cmCTestMemCheckHandler::NO_MEMORY_FAULT;
       if ( vgFIM.find(lines[cc]) )
         {
@@ -1075,10 +1078,10 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput(
         nonValGrindOutput.begin(); i != nonValGrindOutput.end(); ++i)
     {
     totalOutputSize += lines[*i].size();
-    cmCTestLog(this->CTest, DEBUG, "before xml safe "
-               << lines[*i] << std::endl);
-    cmCTestLog(this->CTest, DEBUG, "after  xml safe "
-               <<  cmXMLSafe(lines[*i]) << std::endl);
+    cmCTestOptionalLog(this->CTest, DEBUG, "before xml safe "
+               << lines[*i] << std::endl, this->Quiet);
+    cmCTestOptionalLog(this->CTest, DEBUG, "after  xml safe "
+               <<  cmXMLSafe(lines[*i]) << std::endl, this->Quiet);
     ostr << cmXMLSafe(lines[*i]) << std::endl;
     if(!unlimitedOutput && totalOutputSize >
        static_cast<size_t>(this->CustomMaximumFailedTestOutputSize))
@@ -1091,8 +1094,8 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput(
       break;  // stop the copy of output if we are full
       }
     }
-  cmCTestLog(this->CTest, DEBUG, "End test (elapsed: "
-             << (cmSystemTools::GetTime() - sttime) << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG, "End test (elapsed: "
+             << (cmSystemTools::GetTime() - sttime) << std::endl, this->Quiet);
   log = ostr.str();
   if ( defects )
     {
@@ -1112,7 +1115,8 @@ bool cmCTestMemCheckHandler::ProcessMemCheckBoundsCheckerOutput(
   double sttime = cmSystemTools::GetTime();
   std::vector<std::string> lines;
   cmSystemTools::Split(str.c_str(), lines);
-  cmCTestLog(this->CTest, DEBUG, "Start test: " << lines.size() << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG,
+    "Start test: " << lines.size() << std::endl, this->Quiet);
   std::vector<std::string>::size_type cc;
   for ( cc = 0; cc < lines.size(); cc ++ )
     {
@@ -1148,8 +1152,8 @@ bool cmCTestMemCheckHandler::ProcessMemCheckBoundsCheckerOutput(
     results[parser.Errors[cc]]++;
     defects++;
     }
-  cmCTestLog(this->CTest, DEBUG, "End test (elapsed: "
-    << (cmSystemTools::GetTime() - sttime) << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG, "End test (elapsed: "
+    << (cmSystemTools::GetTime() - sttime) << std::endl, this->Quiet);
   if(defects)
     {
     // only put the output of Bounds Checker if there were
@@ -1165,9 +1169,9 @@ void
 cmCTestMemCheckHandler::PostProcessTest(cmCTestTestResult& res,
                                         int test)
 {
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
              "PostProcessTest memcheck results for : "
-             << res.Name << std::endl);
+             << res.Name << std::endl, this->Quiet);
   if(this->MemoryTesterStyle
      == cmCTestMemCheckHandler::BOUNDS_CHECKER)
     {
@@ -1192,9 +1196,9 @@ void
 cmCTestMemCheckHandler::PostProcessBoundsCheckerTest(cmCTestTestResult& res,
                                                      int test)
 {
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
              "PostProcessBoundsCheckerTest for : "
-             << res.Name << std::endl);
+             << res.Name << std::endl, this->Quiet);
   std::vector<std::string> files;
   this->TestOutputFileNames(test, files);
   if (files.empty())
@@ -1226,11 +1230,11 @@ cmCTestMemCheckHandler::PostProcessBoundsCheckerTest(cmCTestTestResult& res,
   }
   cmSystemTools::Delay(1000);
   cmSystemTools::RemoveFile(this->BoundsCheckerDPBDFile);
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Remove: "
-    << this->BoundsCheckerDPBDFile << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Remove: "
+    << this->BoundsCheckerDPBDFile << std::endl, this->Quiet);
   cmSystemTools::RemoveFile(this->BoundsCheckerXMLFile);
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Remove: "
-    << this->BoundsCheckerXMLFile << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Remove: "
+    << this->BoundsCheckerXMLFile << std::endl, this->Quiet);
 }
 
 void
@@ -1260,7 +1264,8 @@ cmCTestMemCheckHandler::AppendMemTesterOutput(cmCTestTestResult& res,
   if(this->LogWithPID)
     {
     cmSystemTools::RemoveFile(ofile);
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Remove: "<< ofile <<"\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Remove: "<< ofile <<"\n", this->Quiet);
     }
 }
 
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 314c8ad..03131fd 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -386,10 +386,11 @@ void cmCTestRunTest::MemCheckPostProcess()
     {
     return;
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, this->Index
-             << ": process test output now: "
-             << this->TestProperties->Name << " "
-             << this->TestResult.Name << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, this->Index
+    << ": process test output now: "
+    << this->TestProperties->Name << " "
+    << this->TestResult.Name << std::endl,
+    this->TestHandler->GetQuiet());
   cmCTestMemCheckHandler * handler = static_cast<cmCTestMemCheckHandler*>
     (this->TestHandler);
   handler->PostProcessTest(this->TestResult, this->Index);
@@ -661,8 +662,9 @@ bool cmCTestRunTest::ForkProcess(double testTimeOut, bool explicitTimeout,
     {
     timeout = 0;
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, this->Index << ": "
-             << "Test timeout computed to be: " << timeout << "\n");
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, this->Index << ": "
+    << "Test timeout computed to be: " << timeout << "\n",
+    this->TestHandler->GetQuiet());
 
   this->TestProcess->SetTimeout(timeout);
 
diff --git a/Tests/RunCMake/ctest_memcheck/DummyQuiet-stdout.txt b/Tests/RunCMake/ctest_memcheck/DummyQuiet-stdout.txt
new file mode 100644
index 0000000..58f55a5
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyQuiet-stdout.txt
@@ -0,0 +1 @@
+0 tests failed out of 1$
diff --git a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
index b1793fa..6c96a26 100644
--- a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
@@ -130,3 +130,4 @@ run_mc_test(DummyValgrindNoLogFile "${PSEUDO_VALGRIND_NOLOG}")
 run_mc_test(DummyBCNoLogFile "${PSEUDO_BC_NOLOG}")
 run_mc_test(NotExist "\${CTEST_BINARY_DIRECTORY}/no-memcheck-exe")
 run_mc_test(Unknown "\${CMAKE_COMMAND}")
+run_mc_test(DummyQuiet "${PSEUDO_VALGRIND}" -DMEMCHECK_ARGS=QUIET)
diff --git a/Tests/RunCMake/ctest_memcheck/test.cmake.in b/Tests/RunCMake/ctest_memcheck/test.cmake.in
index f9c1ba9..8431fa6 100644
--- a/Tests/RunCMake/ctest_memcheck/test.cmake.in
+++ b/Tests/RunCMake/ctest_memcheck/test.cmake.in
@@ -21,4 +21,4 @@ set(CTEST_MEMORYCHECK_TYPE "${MEMCHECK_TYPE}")
 CTEST_START(Experimental)
 CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
 CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
-CTEST_MEMCHECK(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+CTEST_MEMCHECK(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res ${MEMCHECK_ARGS})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc58bdb9ad90ddd41c5336bc1ab2e35fa0f74d41
commit fc58bdb9ad90ddd41c5336bc1ab2e35fa0f74d41
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 17 15:57:26 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:02:00 2015 -0500

    ctest_coverage: Add QUIET option

diff --git a/Help/command/ctest_coverage.rst b/Help/command/ctest_coverage.rst
index 4c90f9c..bac5c1c 100644
--- a/Help/command/ctest_coverage.rst
+++ b/Help/command/ctest_coverage.rst
@@ -18,3 +18,8 @@ files labeled with at least one of the labels specified.
 The APPEND option marks results for append to those previously
 submitted to a dashboard server since the last ctest_start.  Append
 semantics are defined by the dashboard server in use.
+
+The QUIET option suppresses any CTest-specific non-error output
+that would have been printed to the console otherwise.  The summary
+indicating how many lines of code were covered is unaffected by this
+option.
diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index a607c52..4519627 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -45,6 +45,10 @@
 #     Specify options to be passed to gcov.  The ``gcov`` command
 #     is run as ``gcov <options>... -o <gcov-dir> <file>.gcda``.
 #     If not specified, the default option is just ``-b``.
+#
+#   ``QUIET``
+#     Suppress non-error messages that otherwise would have been
+#     printed out by this function.
 
 #=============================================================================
 # Copyright 2014-2015 Kitware, Inc.
@@ -60,7 +64,7 @@
 #  License text for the above reference.)
 include(CMakeParseArguments)
 function(ctest_coverage_collect_gcov)
-  set(options "")
+  set(options QUIET)
   set(oneValueArgs TARBALL SOURCE BUILD GCOV_COMMAND)
   set(multiValueArgs GCOV_OPTIONS)
   cmake_parse_arguments(GCOV  "${options}" "${oneValueArgs}"
@@ -106,8 +110,10 @@ function(ctest_coverage_collect_gcov)
   # return early if no coverage files were found
   list(LENGTH gcda_files len)
   if(len EQUAL 0)
-    message("ctest_coverage_collect_gcov: No .gcda files found, "
-      "ignoring coverage request.")
+    if (NOT GCOV_QUIET)
+      message("ctest_coverage_collect_gcov: No .gcda files found, "
+        "ignoring coverage request.")
+    endif()
     return()
   endif()
   # setup the dir for the coverage files
@@ -130,7 +136,9 @@ function(ctest_coverage_collect_gcov)
       WORKING_DIRECTORY ${coverage_dir})
   endforeach()
   if(NOT "${res}" EQUAL 0)
-    message(STATUS "Error running gcov: ${res} ${out}")
+    if (NOT GCOV_QUIET)
+      message(STATUS "Error running gcov: ${res} ${out}")
+    endif()
   endif()
   # create json file with project information
   file(WRITE ${coverage_dir}/data.json
@@ -151,8 +159,15 @@ function(ctest_coverage_collect_gcov)
 ${coverage_dir}/data.json
 ${label_files}
 ")
+
+  if (GCOV_QUIET)
+    set(tar_opts "cfj")
+  else()
+    set(tar_opts "cvfj")
+  endif()
+
   execute_process(COMMAND
-    ${CMAKE_COMMAND} -E tar cvfj ${GCOV_TARBALL}
+    ${CMAKE_COMMAND} -E tar ${tar_opts} ${GCOV_TARBALL}
     "--mtime=1970-01-01 0:0:0 UTC"
     --files-from=${coverage_dir}/coverage_file_list.txt
     WORKING_DIRECTORY ${binary_dir})
diff --git a/Source/CTest/cmCTestCoverageCommand.cxx b/Source/CTest/cmCTestCoverageCommand.cxx
index 41f016b..f1f935b 100644
--- a/Source/CTest/cmCTestCoverageCommand.cxx
+++ b/Source/CTest/cmCTestCoverageCommand.cxx
@@ -24,9 +24,9 @@ cmCTestCoverageCommand::cmCTestCoverageCommand()
 cmCTestGenericHandler* cmCTestCoverageCommand::InitializeHandler()
 {
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "CoverageCommand", "CTEST_COVERAGE_COMMAND");
+    "CoverageCommand", "CTEST_COVERAGE_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "CoverageExtraFlags", "CTEST_COVERAGE_EXTRA_FLAGS");
+    "CoverageExtraFlags", "CTEST_COVERAGE_EXTRA_FLAGS", this->Quiet);
   cmCTestCoverageHandler* handler = static_cast<cmCTestCoverageHandler*>(
     this->CTest->GetInitializedHandler("coverage"));
   if ( !handler )
@@ -41,6 +41,7 @@ cmCTestGenericHandler* cmCTestCoverageCommand::InitializeHandler()
     handler->SetLabelFilter(this->Labels);
     }
 
+  handler->SetQuiet(this->Quiet);
   return handler;
 }
 
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 1226d22..790e488 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -176,8 +176,8 @@ bool cmCTestCoverageHandler::StartCoverageLogFile(
 {
   char covLogFilename[1024];
   sprintf(covLogFilename, "CoverageLog-%d", logFileCount);
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Open file: "
-    << covLogFilename << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Open file: "
+    << covLogFilename << std::endl, this->Quiet);
   if(!this->StartResultingXML(cmCTest::PartCoverage,
                               covLogFilename, covLogFile))
     {
@@ -209,8 +209,8 @@ void cmCTestCoverageHandler::EndCoverageLogFile(cmGeneratedFileStream& ostr,
   this->CTest->EndXML(ostr);
   char covLogFilename[1024];
   sprintf(covLogFilename, "CoverageLog-%d.xml", logFileCount);
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Close file: "
-    << covLogFilename << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Close file: "
+    << covLogFilename << std::endl, this->Quiet);
   ostr.Close();
 }
 
@@ -230,8 +230,8 @@ bool cmCTestCoverageHandler::ShouldIDoCoverage(const char* file,
     {
     if ( sit->find(file) )
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "  File " << file
-        << " is excluded in CTestCustom.ctest" << std::endl;);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "  File " << file
+        << " is excluded in CTestCustom.ctest" << std::endl;, this->Quiet);
       return false;
       }
     }
@@ -272,8 +272,8 @@ bool cmCTestCoverageHandler::ShouldIDoCoverage(const char* file,
       fFile.c_str(), checkDir.c_str());
   if (!ndc.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Found: " << ndc
-      << " so skip coverage of " << file << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Found: " << ndc
+      << " so skip coverage of " << file << std::endl, this->Quiet);
     return false;
     }
 
@@ -311,8 +311,8 @@ bool cmCTestCoverageHandler::ShouldIDoCoverage(const char* file,
     fFile.c_str(), checkDir.c_str());
   if (!ndc.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Found: " << ndc
-      << " so skip coverage of: " << file << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Found: " << ndc
+      << " so skip coverage of: " << file << std::endl, this->Quiet);
     return false;
     }
   // Ok, nothing in source tree, nothing in binary tree
@@ -356,13 +356,15 @@ int cmCTestCoverageHandler::ProcessHandler()
   cmSystemTools::ConvertToUnixSlashes(sourceDir);
   cmSystemTools::ConvertToUnixSlashes(binaryDir);
 
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "Performing coverage" << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+    "Performing coverage" << std::endl, this->Quiet);
 
   cmCTestCoverageHandlerContainer cont;
   cont.Error = error;
   cont.SourceDir = sourceDir;
   cont.BinaryDir = binaryDir;
   cont.OFS = &ofs;
+  cont.Quiet = this->Quiet;
 
   // setup the regex exclude stuff
   this->CustomCoverageExcludeRegex.clear();
@@ -442,9 +444,9 @@ int cmCTestCoverageHandler::ProcessHandler()
 
   if ( file_count == 0 )
     {
-    cmCTestLog(this->CTest, WARNING,
+    cmCTestOptionalLog(this->CTest, WARNING,
       " Cannot find any coverage files. Ignoring Coverage request."
-      << std::endl);
+      << std::endl, this->Quiet);
     return error;
     }
   cmGeneratedFileStream covSumFile;
@@ -476,10 +478,11 @@ int cmCTestCoverageHandler::ProcessHandler()
   long total_untested = 0;
   //std::string fullSourceDir = sourceDir + "/";
   //std::string fullBinaryDir = binaryDir + "/";
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl);
-  cmCTestLog(this->CTest, HANDLER_OUTPUT,
-    "   Accumulating results (each . represents one file):" << std::endl);
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "    ");
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, std::endl, this->Quiet);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+    "   Accumulating results (each . represents one file):" << std::endl,
+    this->Quiet);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "    ", this->Quiet);
 
   std::vector<std::string> errorsWhileAccumulating;
 
@@ -488,14 +491,16 @@ int cmCTestCoverageHandler::ProcessHandler()
     fileIterator != cont.TotalCoverage.end();
     ++fileIterator )
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "." << std::flush);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "." << std::flush,
+      this->Quiet);
     file_count ++;
     if ( file_count % 50 == 0 )
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, " processed: " << file_count
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, " processed: "
+        << file_count
         << " out of "
-        << cont.TotalCoverage.size() << std::endl);
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "    ");
+        << cont.TotalCoverage.size() << std::endl, this->Quiet);
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "    ", this->Quiet);
       }
 
     const std::string fullFileName = fileIterator->first;
@@ -504,15 +509,15 @@ int cmCTestCoverageHandler::ProcessHandler()
         sourceDir.c_str(), binaryDir.c_str());
     if ( !shouldIDoCoverage )
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
         ".NoDartCoverage found, so skip coverage check for: "
         << fullFileName
-        << std::endl);
+        << std::endl, this->Quiet);
       continue;
       }
 
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-      "Process file: " << fullFileName << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Process file: " << fullFileName << std::endl, this->Quiet);
 
     if ( !cmSystemTools::FileExists(fullFileName.c_str()) )
       {
@@ -556,8 +561,9 @@ int cmCTestCoverageHandler::ProcessHandler()
 
     cmCTestCoverageHandlerContainer::SingleFileCoverageVector::size_type cc;
     std::string line;
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-      "Actually performing coverage for: " << fullFileName << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Actually performing coverage for: " << fullFileName << std::endl,
+      this->Quiet);
     for ( cc= 0; cc < fcov.size(); cc ++ )
       {
       if ( !cmSystemTools::GetLineFromStream(ifs, line) &&
@@ -641,8 +647,8 @@ int cmCTestCoverageHandler::ProcessHandler()
       }
     int untested = 0;
     std::string line;
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-      "Actually performing coverage for: " << *i << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Actually performing coverage for: " << *i << std::endl, this->Quiet);
     while (cmSystemTools::GetLineFromStream(ifs, line))
       {
       covLogFile << "\t\t<Line Number=\"" << untested << "\" Count=\"0\">"
@@ -736,8 +742,8 @@ int cmCTestCoverageHandler::ProcessHandler()
 //----------------------------------------------------------------------
 void cmCTestCoverageHandler::PopulateCustomVectors(cmMakefile *mf)
 {
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-    " Add coverage exclude regular expressions." << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    " Add coverage exclude regular expressions." << std::endl, this->Quiet);
   this->CTest->PopulateCustomVector(mf, "CTEST_CUSTOM_COVERAGE_EXCLUDE",
                                 this->CustomCoverageExclude);
   this->CTest->PopulateCustomVector(mf, "CTEST_EXTRA_COVERAGE_GLOB",
@@ -747,14 +753,14 @@ void cmCTestCoverageHandler::PopulateCustomVectors(cmMakefile *mf)
     it != this->CustomCoverageExclude.end();
     ++ it )
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " Add coverage exclude: "
-      << *it << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      " Add coverage exclude: " << *it << std::endl, this->Quiet);
     }
   for ( it = this->ExtraCoverageGlobs.begin();
     it != this->ExtraCoverageGlobs.end(); ++it)
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " Add coverage glob: "
-      << *it << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      " Add coverage glob: " << *it << std::endl, this->Quiet);
     }
 }
 
@@ -812,16 +818,16 @@ int cmCTestCoverageHandler::HandleCoberturaCoverage(
 
   if(cmSystemTools::FileExists(coverageXMLFile.c_str()))
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
                "Parsing Cobertura XML file: " << coverageXMLFile
-               << std::endl);
+               << std::endl, this->Quiet);
     cov.ReadCoverageXML(coverageXMLFile.c_str());
     }
   else
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
                "Cannot find Cobertura XML file: " << coverageXMLFile
-               << std::endl);
+               << std::endl, this->Quiet);
     }
   return static_cast<int>(cont->TotalCoverage.size());
 }
@@ -836,33 +842,33 @@ int cmCTestCoverageHandler::HandleMumpsCoverage(
     "/gtm_coverage.mcov";
   if(cmSystemTools::FileExists(coverageFile.c_str()))
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
                "Parsing Cache Coverage: " << coverageFile
-               << std::endl);
+               << std::endl, this->Quiet);
     cov.ReadCoverageFile(coverageFile.c_str());
     return static_cast<int>(cont->TotalCoverage.size());
     }
   else
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-               " Cannot find foobar GTM coverage file: " << coverageFile
-               << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+               " Cannot find GTM coverage file: " << coverageFile
+               << std::endl, this->Quiet);
     }
   cmParseCacheCoverage ccov(*cont, this->CTest);
   coverageFile = this->CTest->GetBinaryDir() +
     "/cache_coverage.cmcov";
   if(cmSystemTools::FileExists(coverageFile.c_str()))
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
                "Parsing Cache Coverage: " << coverageFile
-               << std::endl);
+               << std::endl, this->Quiet);
     ccov.ReadCoverageFile(coverageFile.c_str());
     }
   else
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
                " Cannot find Cache coverage file: " << coverageFile
-               << std::endl);
+               << std::endl, this->Quiet);
     }
   return static_cast<int>(cont->TotalCoverage.size());
 }
@@ -912,15 +918,15 @@ int cmCTestCoverageHandler::HandleJacocoCoverage(
   files=g.GetFiles();
   if (!files.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-      "Found Jacoco Files, Performing Coverage" << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Found Jacoco Files, Performing Coverage" << std::endl, this->Quiet);
     cov.LoadCoverageData(files);
     }
   else
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       " Cannot find Jacoco coverage files: " << coverageFile
-      << std::endl);
+      << std::endl, this->Quiet);
     }
   return static_cast<int>(cont->TotalCoverage.size());
 }
@@ -945,15 +951,16 @@ int cmCTestCoverageHandler::HandleDelphiCoverage(
   files=g.GetFiles();
   if (!files.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-      "Found Delphi HTML Files, Performing Coverage" << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Found Delphi HTML Files, Performing Coverage" << std::endl,
+      this->Quiet);
     cov.LoadCoverageData(files);
     }
   else
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       " Cannot find Delphi coverage files: " << coverageFile
-      << std::endl);
+      << std::endl, this->Quiet);
     }
   return static_cast<int>(cont->TotalCoverage.size());
 }
@@ -975,15 +982,16 @@ int cmCTestCoverageHandler::HandleBlanketJSCoverage(
   files=g.GetFiles();
   if (!files.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-      "Found BlanketJS output JSON, Performing Coverage" << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Found BlanketJS output JSON, Performing Coverage" << std::endl,
+      this->Quiet);
     cov.LoadCoverageData(files);
     }
   else
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
        " Cannot find BlanketJS coverage files: " << coverageFile
-       << std::endl);
+       << std::endl, this->Quiet);
     }
   return static_cast<int>(cont->TotalCoverage.size());
   }
@@ -1039,9 +1047,9 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
 
   if (files.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       " Cannot find any GCov coverage files."
-      << std::endl);
+      << std::endl, this->Quiet);
     // No coverage files is a valid thing, so the exit code is 0
     return 0;
     }
@@ -1057,9 +1065,10 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
   std::set<std::string> missingFiles;
 
   std::string actualSourceFile = "";
-  cmCTestLog(this->CTest, HANDLER_OUTPUT,
-    "   Processing coverage (each . represents one file):" << std::endl);
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "    ");
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+    "   Processing coverage (each . represents one file):" << std::endl,
+    this->Quiet);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "    ", this->Quiet);
   int file_count = 0;
 
   // make sure output from gcov is in English!
@@ -1072,7 +1081,8 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
   //
   for ( it = files.begin(); it != files.end(); ++ it )
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "." << std::flush);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "." << std::flush,
+      this->Quiet);
 
     // Call gcov to get coverage data for this *.gcda file:
     //
@@ -1082,8 +1092,8 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
       "-o \"" + fileDir + "\" " +
       "\"" + *it + "\"";
 
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, command.c_str()
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, command.c_str()
+      << std::endl, this->Quiet);
 
     std::string output = "";
     std::string errors = "";
@@ -1111,12 +1121,12 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << cont->Error << std::endl);
       }
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "--------------------------------------------------------------"
       << std::endl
       << output << std::endl
       << "--------------------------------------------------------------"
-      << std::endl);
+      << std::endl, this->Quiet);
 
     std::vector<std::string> lines;
     std::vector<std::string>::iterator line;
@@ -1128,8 +1138,8 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
       std::string sourceFile;
       std::string gcovFile;
 
-      cmCTestLog(this->CTest, DEBUG, "Line: [" << *line << "]"
-        << std::endl);
+      cmCTestOptionalLog(this->CTest, DEBUG, "Line: [" << *line << "]"
+        << std::endl, this->Quiet);
 
       if (line->empty())
         {
@@ -1229,8 +1239,8 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           break;
           }
 
-        cmCTestLog(this->CTest, WARNING, "Warning: " << st2re4.match(1)
-          << " had unexpected EOF" << std::endl);
+        cmCTestOptionalLog(this->CTest, WARNING, "Warning: " << st2re4.match(1)
+          << " had unexpected EOF" << std::endl, this->Quiet);
         }
       else if ( st2re5.find(line->c_str() ) )
         {
@@ -1246,8 +1256,8 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           break;
           }
 
-        cmCTestLog(this->CTest, WARNING, "Warning: Cannot open file: "
-          << st2re5.match(1) << std::endl);
+        cmCTestOptionalLog(this->CTest, WARNING, "Warning: Cannot open file: "
+          << st2re5.match(1) << std::endl, this->Quiet);
         }
       else if ( st2re6.find(line->c_str() ) )
         {
@@ -1263,8 +1273,9 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           break;
           }
 
-        cmCTestLog(this->CTest, WARNING, "Warning: File: " << st2re6.match(1)
-          << " is newer than " << st2re6.match(2) << std::endl);
+        cmCTestOptionalLog(this->CTest, WARNING, "Warning: File: "
+          << st2re6.match(1)
+          << " is newer than " << st2re6.match(2) << std::endl, this->Quiet);
         }
       else
         {
@@ -1291,8 +1302,8 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
         cmCTestCoverageHandlerContainer::SingleFileCoverageVector& vec
           = cont->TotalCoverage[actualSourceFile];
 
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   in gcovFile: "
-          << gcovFile << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+          "   in gcovFile: " << gcovFile << std::endl, this->Quiet);
 
         cmsys::ifstream ifile(gcovFile.c_str());
         if ( ! ifile )
@@ -1366,8 +1377,8 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
         //
         if ( IsFileInDir(sourceFile, cont->SourceDir) )
           {
-          cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   produced s: "
-            << sourceFile << std::endl);
+          cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+            "   produced s: " << sourceFile << std::endl, this->Quiet);
           *cont->OFS << "  produced in source dir: " << sourceFile
             << std::endl;
           actualSourceFile
@@ -1375,8 +1386,8 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           }
         else if ( IsFileInDir(sourceFile, cont->BinaryDir) )
           {
-          cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   produced b: "
-            << sourceFile << std::endl);
+          cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+            "   produced b: " << sourceFile << std::endl, this->Quiet);
           *cont->OFS << "  produced in binary dir: " << sourceFile
             << std::endl;
           actualSourceFile
@@ -1387,19 +1398,19 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           {
           if ( missingFiles.find(sourceFile) == missingFiles.end() )
             {
-            cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-              "Something went wrong" << std::endl);
-            cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+            cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+              "Something went wrong" << std::endl, this->Quiet);
+            cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
               "Cannot find file: ["
-              << sourceFile << "]" << std::endl);
-            cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+              << sourceFile << "]" << std::endl, this->Quiet);
+            cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
               " in source dir: ["
               << cont->SourceDir << "]"
-              << std::endl);
-            cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+              << std::endl, this->Quiet);
+            cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
               " or binary dir: ["
               << cont->BinaryDir.size() << "]"
-              << std::endl);
+              << std::endl, this->Quiet);
             *cont->OFS << "  Something went wrong. Cannot find file: "
               << sourceFile
               << " in source dir: " << cont->SourceDir
@@ -1415,9 +1426,10 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
 
     if ( file_count % 50 == 0 )
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, " processed: " << file_count
-        << " out of " << files.size() << std::endl);
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "    ");
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, " processed: "
+        << file_count
+        << " out of " << files.size() << std::endl, this->Quiet);
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "    ", this->Quiet);
       }
     }
 
@@ -1435,22 +1447,22 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
     = this->CTest->GetCTestConfiguration("CoverageExtraFlags");
   if ( lcovCommand != "codecov" )
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
                " Not a valid Intel Coverage command."
-               << std::endl);
+               << std::endl, this->Quiet);
     return 0;
     }
   // There is only percentage completed output from LCOV
   std::string st2lcovOutputRex3 = "[0-9]+%";
   cmsys::RegularExpression st2re3(st2lcovOutputRex3.c_str());
 
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
     " This is coverage command: " << lcovCommand
-    << std::endl);
+    << std::endl, this->Quiet);
 
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
     " These are coverage command flags: " << lcovExtraFlags
-    << std::endl);
+    << std::endl, this->Quiet);
 
   std::vector<std::string> files;
   this->FindLCovFiles(files);
@@ -1458,9 +1470,9 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
 
   if (files.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       " Cannot find any LCov coverage files."
-      << std::endl);
+      << std::endl, this->Quiet);
     // No coverage files is a valid thing, so the exit code is 0
     return 0;
     }
@@ -1471,9 +1483,10 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
   std::set<std::string> missingFiles;
 
   std::string actualSourceFile = "";
-  cmCTestLog(this->CTest, HANDLER_OUTPUT,
-    "   Processing coverage (each . represents one file):" << std::endl);
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "    ");
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+    "   Processing coverage (each . represents one file):" << std::endl,
+    this->Quiet);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "    ", this->Quiet);
   int file_count = 0;
 
   // make sure output from lcov is in English!
@@ -1484,16 +1497,17 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
   // directory. It collects all *.dyn files to generate .dpi file.
   for ( it = files.begin(); it != files.end(); ++ it )
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "." << std::flush);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "." << std::flush,
+      this->Quiet);
     std::string fileDir = cmSystemTools::GetFilenamePath(*it);
     cmSystemTools::ChangeDirectory(fileDir);
     std::string command = "\"" + lcovCommand + "\" " +
       lcovExtraFlags + " ";
 
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Current coverage dir: "
-               << fileDir << std::endl);
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, command.c_str()
-               << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Current coverage dir: " << fileDir << std::endl, this->Quiet);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, command.c_str()
+      << std::endl, this->Quiet);
 
     std::string output = "";
     std::string errors = "";
@@ -1521,12 +1535,12 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << cont->Error << std::endl);
       }
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "--------------------------------------------------------------"
       << std::endl
       << output << std::endl
       << "--------------------------------------------------------------"
-      << std::endl);
+      << std::endl, this->Quiet);
 
     std::vector<std::string> lines;
     std::vector<std::string>::iterator line;
@@ -1554,8 +1568,8 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
       std::string daGlob;
       daGlob = dir;
       daGlob += "/*.LCOV";
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                 "   looking for LCOV files in: " << daGlob << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        "   looking for LCOV files in: " << daGlob << std::endl, this->Quiet);
       gl.FindFiles(daGlob);
       // Keep a list of all LCOV files
       lcovFiles.insert(lcovFiles.end(), gl.GetFiles().begin(),
@@ -1590,13 +1604,13 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
         for(std::vector<std::string>::iterator t = lcovFiles.begin();
             t != lcovFiles.end(); ++t)
           {
-          cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Found LCOV File: "
-                     << *t << std::endl);
+          cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+            "Found LCOV File: " << *t << std::endl, this->Quiet);
           }
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "SourceFile: "
-                   << sourceFile << std::endl);
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "lCovFile: "
-                   << lcovFile << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "SourceFile: "
+          << sourceFile << std::endl, this->Quiet);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "lCovFile: "
+        << lcovFile << std::endl, this->Quiet);
 
         // If we have some LCOV files to process
         if ( !lcovFile.empty() && !actualSourceFile.empty() )
@@ -1604,8 +1618,8 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
           cmCTestCoverageHandlerContainer::SingleFileCoverageVector& vec
             = cont->TotalCoverage[actualSourceFile];
 
-          cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   in lcovFile: "
-                     << lcovFile << std::endl);
+          cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+            "   in lcovFile: " << lcovFile << std::endl, this->Quiet);
 
           cmsys::ifstream ifile(lcovFile.c_str());
           if ( ! ifile )
@@ -1620,8 +1634,8 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
 
             // Skip the first line
             cmSystemTools::GetLineFromStream(ifile, nl);
-            cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                       "File is ready, start reading." << std::endl);
+            cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+              "File is ready, start reading." << std::endl, this->Quiet);
             while ( cmSystemTools::GetLineFromStream(ifile, nl) )
               {
               cnt ++;
@@ -1679,9 +1693,10 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
 
     if ( file_count % 50 == 0 )
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, " processed: " << file_count
-                 << " out of " << files.size() << std::endl);
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "    ");
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+        " processed: " << file_count << " out of " << files.size()
+        << std::endl, this->Quiet);
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "    ", this->Quiet);
       }
     }
 
@@ -1707,8 +1722,8 @@ void cmCTestCoverageHandler::FindGCovFiles(std::vector<std::string>& files)
 
     // Coverage files appear next to their object files in the target
     // support directory.
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-               "   globbing for coverage in: " << lmi->first << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "   globbing for coverage in: " << lmi->first << std::endl, this->Quiet);
     std::string daGlob = lmi->first;
     daGlob += "/*.da";
     gl.FindFiles(daGlob);
@@ -1740,12 +1755,12 @@ void cmCTestCoverageHandler::FindLCovFiles(std::vector<std::string>& files)
   std::string daGlob;
   daGlob = prevBinaryDir;
   daGlob += "/*.dpi";
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             "   looking for dpi files in: " << daGlob << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "   looking for dpi files in: " << daGlob << std::endl, this->Quiet);
   gl.FindFiles(daGlob);
   files.insert(files.end(), gl.GetFiles().begin(), gl.GetFiles().end());
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             "Now searching in: " << daGlob << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "Now searching in: " << daGlob << std::endl, this->Quiet);
 }
 
 //----------------------------------------------------------------------
@@ -1761,9 +1776,9 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
 
   if (files.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       " Cannot find any Python Trace.py coverage files."
-      << std::endl);
+      << std::endl, this->Quiet);
     // No coverage files is a valid thing, so the exit code is 0
     return 0;
     }
@@ -1791,13 +1806,13 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
 
     std::string actualSourceFile
       = cmSystemTools::CollapseFullPath(fileName);
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "   Check coverage for file: " << actualSourceFile
-      << std::endl);
+      << std::endl, this->Quiet);
     cmCTestCoverageHandlerContainer::SingleFileCoverageVector* vec
       = &cont->TotalCoverage[actualSourceFile];
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-      "   in file: " << *fileIt << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "   in file: " << *fileIt << std::endl, this->Quiet);
     cmsys::ifstream ifile(fileIt->c_str());
     if ( ! ifile )
       {
@@ -1850,9 +1865,9 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
           // So, this will be set to 0.
           cov = 0;
           }
-        cmCTestLog(this->CTest, DEBUG, "Prefix: " << prefix
+        cmCTestOptionalLog(this->CTest, DEBUG, "Prefix: " << prefix
           << " cov: " << cov
-          << std::endl);
+          << std::endl, this->Quiet);
         // Read the line number starting at the 10th character of the gcov
         // output line
         long lineIdx = cnt;
@@ -1945,18 +1960,16 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
   // for each file run covbr on that file to get the coverage
   // information for that file
   std::string outputFile;
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                 "run covbr: "
-                 << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "run covbr: " << std::endl, this->Quiet);
 
   if(!this->RunBullseyeCommand(cont, "covbr", 0, outputFile))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error running covbr for." << "\n");
     return -1;
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             "covbr output in  " << outputFile
-             << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "covbr output in  " << outputFile << std::endl, this->Quiet);
   // open the output file
   cmsys::ifstream fin(outputFile.c_str());
   if(!fin)
@@ -2002,10 +2015,8 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
       // only allow 100 files in each log file
       if ( count != 0 && count % 100 == 0 )
         {
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                   "start a new log file: "
-                   << count
-                   << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+          "start a new log file: " << count << std::endl, this->Quiet);
         this->EndCoverageLogFile(covLogFile, logFileCount);
         logFileCount ++;
         if ( !this->StartCoverageLogFile(covLogFile, logFileCount) )
@@ -2021,10 +2032,9 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
         {
         // we have a new file so count it in the output
         count++;
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                   "Produce coverage for file: "
-                   << file << " " << count
-                   << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+          "Produce coverage for file: " << file << " " << count
+          << std::endl, this->Quiet);
         // start the file output
         covLogFile << "\t<File Name=\""
                    << cmXMLSafe(i->first)
@@ -2083,13 +2093,13 @@ int cmCTestCoverageHandler::RunBullseyeCommand(
     }
   if(arg)
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-               "Run : " << program << " " << arg << "\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Run : " << program << " " << arg << "\n", this->Quiet);
     }
   else
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-               "Run : " << program << "\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Run : " << program << "\n", this->Quiet);
     }
   // create a process object and start it
   cmCTestRunProcess runCoverageSrc;
@@ -2215,17 +2225,17 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
                                   cont->BinaryDir.c_str());
       if ( !shouldIDoCoverage )
         {
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                   ".NoDartCoverage found, so skip coverage check for: "
-                   << file
-                   << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+          ".NoDartCoverage found, so skip coverage check for: "
+          << file
+          << std::endl, this->Quiet);
         continue;
         }
 
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                 "Doing coverage for: "
-                 << file
-                 << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        "Doing coverage for: "
+        << file
+        << std::endl, this->Quiet);
 
       coveredFiles.push_back(sourceFile);
       coveredFilesFullPath.push_back(file);
@@ -2328,23 +2338,23 @@ int cmCTestCoverageHandler::HandleBullseyeCoverage(
   const char* covfile = cmSystemTools::GetEnv("COVFILE");
   if(!covfile || strlen(covfile) == 0)
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-               " COVFILE environment variable not found, not running "
-               " bullseye\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      " COVFILE environment variable not found, not running "
+      " bullseye\n", this->Quiet);
     return 0;
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             " run covsrc with COVFILE=["
-             << covfile
-             << "]" << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    " run covsrc with COVFILE=["
+    << covfile
+    << "]" << std::endl, this->Quiet);
   if(!this->RunBullseyeSourceSummary(cont))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Error running bullseye summary.\n");
     return 0;
     }
-  cmCTestLog(this->CTest, DEBUG, "HandleBullseyeCoverage return 1 "
-             << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG, "HandleBullseyeCoverage return 1 "
+  << std::endl, this->Quiet);
   return 1;
 }
 
@@ -2438,8 +2448,8 @@ void cmCTestCoverageHandler::LoadLabels()
   std::string fileList = this->CTest->GetBinaryDir();
   fileList += cmake::GetCMakeFilesDirectory();
   fileList += "/TargetDirectories.txt";
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             " target directory list [" << fileList << "]\n");
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    " target directory list [" << fileList << "]\n", this->Quiet);
   cmsys::ifstream finList(fileList.c_str());
   std::string line;
   while(cmSystemTools::GetLineFromStream(finList, line))
@@ -2460,8 +2470,8 @@ void cmCTestCoverageHandler::LoadLabels(const char* dir)
     return;
     }
 
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             " loading labels from [" << fname << "]\n");
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    " loading labels from [" << fname << "]\n", this->Quiet);
   bool inTarget = true;
   std::string source;
   std::string line;
diff --git a/Source/CTest/cmCTestCoverageHandler.h b/Source/CTest/cmCTestCoverageHandler.h
index 4aec795..3258ddb 100644
--- a/Source/CTest/cmCTestCoverageHandler.h
+++ b/Source/CTest/cmCTestCoverageHandler.h
@@ -30,9 +30,10 @@ public:
   typedef std::map<std::string, SingleFileCoverageVector> TotalCoverageMap;
   TotalCoverageMap TotalCoverage;
   std::ostream* OFS;
+  bool Quiet;
 };
 /** \class cmCTestCoverageHandler
- * \brief A class that handles coverage computaiton for ctest
+ * \brief A class that handles coverage computation for ctest
  *
  */
 class cmCTestCoverageHandler : public cmCTestGenericHandler
diff --git a/Source/CTest/cmParseBlanketJSCoverage.cxx b/Source/CTest/cmParseBlanketJSCoverage.cxx
index 85d066b..1edd01f 100644
--- a/Source/CTest/cmParseBlanketJSCoverage.cxx
+++ b/Source/CTest/cmParseBlanketJSCoverage.cxx
@@ -138,12 +138,12 @@ bool cmParseBlanketJSCoverage::LoadCoverageData(std::vector<std::string> files)
   {
   size_t i=0;
   std::string path;
-      cmCTestLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
-       "Found " << files.size() <<" Files" << std::endl);
+      cmCTestOptionalLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
+       "Found " << files.size() <<" Files" << std::endl, this->Coverage.Quiet);
   for(i=0;i<files.size();i++)
     {
-    cmCTestLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
-       "Reading JSON File " << files[i]  << std::endl);
+    cmCTestOptionalLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
+       "Reading JSON File " << files[i]  << std::endl, this->Coverage.Quiet);
 
     if(!this->ReadJSONFile(files[i]))
       {
@@ -157,8 +157,8 @@ bool cmParseBlanketJSCoverage::ReadJSONFile(std::string file)
   {
   cmParseBlanketJSCoverage::JSONParser parser
      (this->Coverage);
-  cmCTestLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
-       "Parsing " << file << std::endl);
+  cmCTestOptionalLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
+       "Parsing " << file << std::endl, this->Coverage.Quiet);
   parser.ParseFile(file);
   return true;
   }
diff --git a/Source/CTest/cmParseCacheCoverage.cxx b/Source/CTest/cmParseCacheCoverage.cxx
index 3642308..92bf88e 100644
--- a/Source/CTest/cmParseCacheCoverage.cxx
+++ b/Source/CTest/cmParseCacheCoverage.cxx
@@ -71,9 +71,9 @@ void cmParseCacheCoverage::RemoveUnCoveredFiles()
       }
     if(nothing)
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
                  "No coverage found in: " << ci->first
-                 << std::endl);
+                 << std::endl, this->Coverage.Quiet);
       this->Coverage.TotalCoverage.erase(ci++);
       }
     else
diff --git a/Source/CTest/cmParseCoberturaCoverage.cxx b/Source/CTest/cmParseCoberturaCoverage.cxx
index e19b199..3ed5cb0 100644
--- a/Source/CTest/cmParseCoberturaCoverage.cxx
+++ b/Source/CTest/cmParseCoberturaCoverage.cxx
@@ -50,8 +50,8 @@ protected:
      if (this->InSources && this->InSource)
        {
        this->FilePaths.push_back(tmp);
-       cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Adding Source: "
-                   << tmp << std::endl);
+       cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+         "Adding Source: " << tmp << std::endl, this->Coverage.Quiet);
        }
   }
 
@@ -74,8 +74,9 @@ protected:
       {
         if(strcmp(atts[tagCount], "filename") == 0)
         {
-          cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Reading file: "
-                     << atts[tagCount+1]<< std::endl);
+          cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+            "Reading file: " << atts[tagCount+1]<< std::endl,
+            this->Coverage.Quiet);
           std::string filename = atts[tagCount+1];
           this->CurFileName = "";
 
@@ -113,9 +114,9 @@ protected:
             fin.open(this->CurFileName.c_str());
             if (!fin)
             {
-              cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                         "Skipping system file " << filename <<
-                         std::endl);
+              cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+                "Skipping system file " << filename << std::endl,
+                this->Coverage.Quiet);
 
               this->SkipThisClass = true;
               break;
diff --git a/Source/CTest/cmParseDelphiCoverage.cxx b/Source/CTest/cmParseDelphiCoverage.cxx
index 4dfdfac..e453fe1 100644
--- a/Source/CTest/cmParseDelphiCoverage.cxx
+++ b/Source/CTest/cmParseDelphiCoverage.cxx
@@ -122,8 +122,9 @@ public:
       lastoffset = line.find('(',pos);
       if(lastoffset==line.npos)
         {
-        cmCTestLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
-           endnamepos << "File not found  " << lastoffset  << std::endl);
+        cmCTestOptionalLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
+           endnamepos << "File not found  " << lastoffset  << std::endl,
+           this->Coverage.Quiet);
         return false;
         }
       endnamepos = line.find(')',lastoffset);
@@ -131,8 +132,9 @@ public:
          (endnamepos-1)-lastoffset);
       if(filename.find(".pas") != filename.npos)
         {
-        cmCTestLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
-           "Coverage found for file:  " << filename  << std::endl);
+        cmCTestOptionalLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
+           "Coverage found for file:  " << filename  << std::endl,
+           this->Coverage.Quiet);
         break;
         }
       pos = lastoffset+1;
@@ -153,8 +155,9 @@ public:
       *  If that doesn't find any matching files
       *  return a failure.
       */
-      cmCTestLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
-         "Unable to find file matching" << glob << std::endl);
+      cmCTestOptionalLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
+         "Unable to find file matching" << glob << std::endl,
+         this->Coverage.Quiet);
       return false;
       }
     FileLinesType&  coverageVector =
@@ -229,8 +232,8 @@ bool cmParseDelphiCoverage::LoadCoverageData(
     {
     path = files[i];
 
-    cmCTestLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
-       "Reading HTML File " << path  << std::endl);
+    cmCTestOptionalLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
+       "Reading HTML File " << path  << std::endl, this->Coverage.Quiet);
     if(cmSystemTools::GetFilenameLastExtension(path) == ".html")
       {
       if(!this->ReadDelphiHTML(path.c_str()))
diff --git a/Source/CTest/cmParseJacocoCoverage.cxx b/Source/CTest/cmParseJacocoCoverage.cxx
index 780debc..ec4cfad 100644
--- a/Source/CTest/cmParseJacocoCoverage.cxx
+++ b/Source/CTest/cmParseJacocoCoverage.cxx
@@ -49,8 +49,9 @@ class cmParseJacocoCoverage::XMLParser: public cmXMLParser
       else if(name == "sourcefile")
         {
         this->FileName = atts[1];
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Reading file: "
-                     << this->FileName << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+          "Reading file: " << this->FileName << std::endl,
+          this->Coverage.Quiet);
           for(size_t i=0;i < FilePaths.size();i++)
             {
             std::string finalpath = FilePaths[i] + "/" + this->FileName;
@@ -148,8 +149,8 @@ bool cmParseJacocoCoverage::LoadCoverageData(
     {
     path = files[i];
 
-    cmCTestLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
-      "Reading XML File " << path  << std::endl);
+    cmCTestOptionalLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
+      "Reading XML File " << path  << std::endl, this->Coverage.Quiet);
     if(cmSystemTools::GetFilenameLastExtension(path) == ".xml")
       {
       if(!this->ReadJacocoXML(path.c_str()))
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 4861202..83a88ad 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -131,6 +131,9 @@ add_RunCMake_test(cmake_minimum_required)
 add_RunCMake_test(continue)
 add_RunCMake_test(ctest_build)
 add_RunCMake_test(ctest_configure)
+if(COVERAGE_COMMAND)
+  add_RunCMake_test(ctest_coverage -DCOVERAGE_COMMAND=${COVERAGE_COMMAND})
+endif()
 add_RunCMake_test(ctest_start)
 add_RunCMake_test(ctest_submit)
 add_RunCMake_test(ctest_test)
diff --git a/Tests/RunCMake/ctest_coverage/CMakeLists.txt.in b/Tests/RunCMake/ctest_coverage/CMakeLists.txt.in
new file mode 100644
index 0000000..1babd72
--- /dev/null
+++ b/Tests/RunCMake/ctest_coverage/CMakeLists.txt.in
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1)
+project(CTestCoverage at CASE_NAME@ NONE)
+include(CTest)
+add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
diff --git a/Tests/RunCMake/ctest_coverage/CTestConfig.cmake.in b/Tests/RunCMake/ctest_coverage/CTestConfig.cmake.in
new file mode 100644
index 0000000..1f679d5
--- /dev/null
+++ b/Tests/RunCMake/ctest_coverage/CTestConfig.cmake.in
@@ -0,0 +1 @@
+set(CTEST_PROJECT_NAME "CTestCoverage at CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_coverage/CoverageQuiet-stdout.txt b/Tests/RunCMake/ctest_coverage/CoverageQuiet-stdout.txt
new file mode 100644
index 0000000..3b09eac
--- /dev/null
+++ b/Tests/RunCMake/ctest_coverage/CoverageQuiet-stdout.txt
@@ -0,0 +1 @@
+sec$
diff --git a/Tests/RunCMake/ctest_coverage/RunCMakeTest.cmake b/Tests/RunCMake/ctest_coverage/RunCMakeTest.cmake
new file mode 100644
index 0000000..dd443fc
--- /dev/null
+++ b/Tests/RunCMake/ctest_coverage/RunCMakeTest.cmake
@@ -0,0 +1,10 @@
+include(RunCTest)
+
+set(CASE_CTEST_COVERAGE_ARGS "")
+
+function(run_ctest_coverage CASE_NAME)
+  set(CASE_CTEST_COVERAGE_ARGS "${ARGN}")
+  run_ctest(${CASE_NAME})
+endfunction()
+
+run_ctest_coverage(CoverageQuiet QUIET)
diff --git a/Tests/RunCMake/ctest_coverage/test.cmake.in b/Tests/RunCMake/ctest_coverage/test.cmake.in
new file mode 100644
index 0000000..1788e66
--- /dev/null
+++ b/Tests/RunCMake/ctest_coverage/test.cmake.in
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.1)
+
+set(CTEST_SITE                          "test-site")
+set(CTEST_BUILD_NAME                    "test-build-name")
+set(CTEST_SOURCE_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME@")
+set(CTEST_BINARY_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME at -build")
+set(CTEST_CMAKE_GENERATOR               "@RunCMake_GENERATOR@")
+set(CTEST_CMAKE_GENERATOR_PLATFORM      "@RunCMake_GENERATOR_PLATFORM@")
+set(CTEST_CMAKE_GENERATOR_TOOLSET       "@RunCMake_GENERATOR_TOOLSET@")
+set(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
+set(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
+
+set(ctest_coverage_args "@CASE_CTEST_COVERAGE_ARGS@")
+ctest_start(Experimental)
+ctest_configure()
+ctest_build()
+ctest_test()
+ctest_coverage(${ctest_coverage_args})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=876a680d4851a39e77b49daa3c670fe2e535c1e6
commit 876a680d4851a39e77b49daa3c670fe2e535c1e6
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 17 14:23:56 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:01:59 2015 -0500

    ctest_test: Add QUIET option

diff --git a/Help/command/ctest_test.rst b/Help/command/ctest_test.rst
index 5f28083..ee76e91 100644
--- a/Help/command/ctest_test.rst
+++ b/Help/command/ctest_test.rst
@@ -31,3 +31,9 @@ tests should all stop running.
 The APPEND option marks results for append to those previously
 submitted to a dashboard server since the last ctest_start.  Append
 semantics are defined by the dashboard server in use.
+
+The QUIET option suppresses any CTest-specific non-error messages
+that would have otherwise been printed to the console.  Output from
+the underlying test command is not affected.  Summary info detailing
+the percentage of passing tests is also unaffected by the QUIET
+option.
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index f223127..eb33d8e 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -113,7 +113,8 @@ void cmCTestMultiProcessHandler::RunTests()
 //---------------------------------------------------------
 void cmCTestMultiProcessHandler::StartTestProcess(int test)
 {
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "test " << test << "\n");
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "test " << test << "\n", this->Quiet);
   this->TestRunningMap[test] = true; // mark the test as running
   // now remove the test itself
   this->EraseTest(test);
@@ -639,39 +640,44 @@ void cmCTestMultiProcessHandler::PrintTestList()
 
     if(!p.Labels.empty()) //print the labels
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Labels:");
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Labels:",
+        this->Quiet);
       }
     for(std::vector<std::string>::iterator label = p.Labels.begin();
         label != p.Labels.end(); ++label)
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " " << *label);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " " << *label,
+        this->Quiet);
       }
     if(!p.Labels.empty()) //print the labels
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, std::endl,
+        this->Quiet);
       }
 
     if (this->TestHandler->MemCheck)
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "  Memory Check");
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "  Memory Check",
+        this->Quiet);
       }
      else
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "  Test");
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "  Test", this->Quiet);
       }
     std::ostringstream indexStr;
     indexStr << " #" << p.Index << ":";
-    cmCTestLog(this->CTest, HANDLER_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
       std::setw(3 + getNumWidth(this->TestHandler->GetMaxIndex()))
-      << indexStr.str());
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, " ");
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, p.Name.c_str() << std::endl);
+      << indexStr.str(), this->Quiet);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, " ", this->Quiet);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      p.Name.c_str() << std::endl, this->Quiet);
     //pop working dir
     cmSystemTools::ChangeDirectory(current_dir);
     }
 
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl << "Total Tests: "
-    << this->Total << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, std::endl << "Total Tests: "
+    << this->Total << std::endl, this->Quiet);
 }
 
 void cmCTestMultiProcessHandler::PrintLabels()
@@ -686,16 +692,19 @@ void cmCTestMultiProcessHandler::PrintLabels()
 
   if(!allLabels.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "All Labels:" << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "All Labels:" << std::endl, this->Quiet);
     }
   else
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "No Labels Exist" << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "No Labels Exist" << std::endl, this->Quiet);
     }
   for(std::set<std::string>::iterator label = allLabels.begin();
       label != allLabels.end(); ++label)
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "  " << *label << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "  " << *label << std::endl, this->Quiet);
     }
 }
 
@@ -758,8 +767,8 @@ int cmCTestMultiProcessHandler::FindMaxIndex()
 //Returns true if no cycles exist in the dependency graph
 bool cmCTestMultiProcessHandler::CheckCycles()
 {
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             "Checking test dependency graph..." << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+             "Checking test dependency graph..." << std::endl, this->Quiet);
   for(TestMap::iterator it = this->Tests.begin();
       it != this->Tests.end(); ++it)
     {
@@ -794,7 +803,7 @@ bool cmCTestMultiProcessHandler::CheckCycles()
         }
       }
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             "Checking test dependency graph end" << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+             "Checking test dependency graph end" << std::endl, this->Quiet);
   return true;
 }
diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h
index 605de31..6440fbc 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.h
+++ b/Source/CTest/cmCTestMultiProcessHandler.h
@@ -57,6 +57,8 @@ public:
 
   cmCTestTestHandler * GetTestHandler()
   { return this->TestHandler; }
+
+  void SetQuiet(bool b) { this->Quiet = b; }
 protected:
   // Start the next test or tests as many as are allowed by
   // ParallelLevel
@@ -118,6 +120,7 @@ protected:
   cmCTestTestHandler * TestHandler;
   cmCTest* CTest;
   bool HasCycles;
+  bool Quiet;
 };
 
 #endif
diff --git a/Source/CTest/cmCTestTestCommand.cxx b/Source/CTest/cmCTestTestCommand.cxx
index d209094..8b357ac 100644
--- a/Source/CTest/cmCTestTestCommand.cxx
+++ b/Source/CTest/cmCTestTestCommand.cxx
@@ -103,6 +103,7 @@ cmCTestGenericHandler* cmCTestTestCommand::InitializeHandler()
     {
     this->CTest->SetStopTime(this->Values[ctt_STOP_TIME]);
     }
+  handler->SetQuiet(this->Quiet);
   return handler;
 }
 
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 925e3c9..0e84fbf 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -527,10 +527,10 @@ int cmCTestTestHandler::ProcessHandler()
 
   this->TestResults.clear();
 
-  cmCTestLog(this->CTest, HANDLER_OUTPUT,
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
              (this->MemCheck ? "Memory check" : "Test")
              << " project " << cmSystemTools::GetCurrentWorkingDirectory()
-             << std::endl);
+             << std::endl, this->Quiet);
   if ( ! this->PreProcessHandler() )
     {
     return -1;
@@ -567,13 +567,13 @@ int cmCTestTestHandler::ProcessHandler()
     if (this->HandlerVerbose && !passed.empty() &&
       (this->UseIncludeRegExpFlag || this->UseExcludeRegExpFlag))
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, std::endl
-        << "The following tests passed:" << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, std::endl
+        << "The following tests passed:" << std::endl, this->Quiet);
       for(std::vector<std::string>::iterator j = passed.begin();
           j != passed.end(); ++j)
         {
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "\t" << *j
-          << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "\t" << *j
+          << std::endl, this->Quiet);
         }
       }
 
@@ -593,8 +593,8 @@ int cmCTestTestHandler::ProcessHandler()
       }
     char realBuf[1024];
     sprintf(realBuf, "%6.2f sec", (double)(clock_finish - clock_start));
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "\nTotal Test time (real) = "
-               << realBuf << "\n" );
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "\nTotal Test time (real) = " << realBuf << "\n", this->Quiet );
 
     if (!failed.empty())
       {
@@ -614,11 +614,11 @@ int cmCTestTestHandler::ProcessHandler()
         if ( ftit->Status != cmCTestTestHandler::COMPLETED )
           {
           ofs << ftit->TestCount << ":" << ftit->Name << std::endl;
-          cmCTestLog(this->CTest, HANDLER_OUTPUT, "\t" << std::setw(3)
+          cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "\t" << std::setw(3)
                      << ftit->TestCount << " - "
                      << ftit->Name << " ("
                      << this->GetTestStatus(ftit->Status) << ")"
-                     << std::endl);
+                     << std::endl, this->Quiet);
           }
         }
       }
@@ -700,7 +700,8 @@ void cmCTestTestHandler::PrintLabelSummary()
   // now print times
   if(!labels.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "\nLabel Time Summary:");
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "\nLabel Time Summary:",
+      this->Quiet);
     }
   for(std::set<std::string>::const_iterator i = labels.begin();
       i != labels.end(); ++i)
@@ -709,8 +710,8 @@ void cmCTestTestHandler::PrintLabelSummary()
     label.resize(maxlen +3, ' ');
     char buf[1024];
     sprintf(buf, "%6.2f sec", labelTimes[*i]);
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "\n"
-               << label << " = " << buf );
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "\n"
+               << label << " = " << buf, this->Quiet );
     if ( this->LogFile )
       {
       *this->LogFile << "\n" << *i << " = "
@@ -723,7 +724,7 @@ void cmCTestTestHandler::PrintLabelSummary()
       {
       *this->LogFile << "\n";
       }
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "\n", this->Quiet);
     }
 
 }
@@ -1063,6 +1064,7 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<std::string> &passed,
   parallel->SetCTest(this->CTest);
   parallel->SetParallelLevel(this->CTest->GetParallelLevel());
   parallel->SetTestHandler(this);
+  parallel->SetQuiet(this->Quiet);
 
   *this->LogFile << "Start testing: "
     << this->CTest->CurrentTime() << std::endl
@@ -1334,8 +1336,8 @@ int cmCTestTestHandler::ExecuteCommands(std::vector<std::string>& vec)
   for ( it = vec.begin(); it != vec.end(); ++it )
     {
     int retVal = 0;
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << *it
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " <<
+      *it << std::endl, this->Quiet);
     if ( !cmSystemTools::RunSingleCommand(it->c_str(), 0, &retVal, 0,
                                           cmSystemTools::OUTPUT_MERGE
         /*this->Verbose*/) || retVal != 0 )
@@ -1541,8 +1543,7 @@ std::string cmCTestTestHandler
     for(std::vector<std::string>::iterator i = failed.begin();
         i != failed.end(); ++i)
       {
-      cmCTestLog(ctest, HANDLER_OUTPUT,
-                 i->c_str() << "\n");
+      cmCTestLog(ctest, HANDLER_OUTPUT, i->c_str() << "\n");
       }
     }
 
@@ -1571,8 +1572,8 @@ void cmCTestTestHandler::GetListOfTests()
     {
     this->ExcludeTestsRegularExpression.compile(this->ExcludeRegExp.c_str());
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-    "Constructing a list of tests" << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "Constructing a list of tests" << std::endl, this->Quiet);
   cmake cm;
   cmGlobalGenerator gg;
   gg.SetCMakeInstance(&cm);
@@ -1628,8 +1629,8 @@ void cmCTestTestHandler::GetListOfTests()
     {
     return;
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-    "Done constructing a list of tests" << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "Done constructing a list of tests" << std::endl, this->Quiet);
 }
 
 //----------------------------------------------------------------------
@@ -2016,8 +2017,8 @@ std::string cmCTestTestHandler::GenerateRegressionImages(
           << "><Value>File " << filename
           << " not found</Value></NamedMeasurement>"
           << std::endl;
-        cmCTestLog(this->CTest, HANDLER_OUTPUT, "File \"" << filename
-          << "\" not found." << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "File \"" << filename
+          << "\" not found." << std::endl, this->Quiet);
         }
       cxml.erase(measurementfile.start(),
         measurementfile.end() - measurementfile.start());
@@ -2265,7 +2266,8 @@ bool cmCTestTestHandler::SetTestsProperties(
 bool cmCTestTestHandler::AddTest(const std::vector<std::string>& args)
 {
   const std::string& testname = args[0];
-  cmCTestLog(this->CTest, DEBUG, "Add test: " << args[0] << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG, "Add test: " << args[0] << std::endl,
+    this->Quiet);
 
   if (this->UseExcludeRegExpFlag &&
     this->UseExcludeRegExpFirst &&
@@ -2288,8 +2290,8 @@ bool cmCTestTestHandler::AddTest(const std::vector<std::string>& args)
       }
     if ( found )
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Ignore memcheck: "
-        << *it << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        "Ignore memcheck: " << *it << std::endl, this->Quiet);
       return true;
       }
     }
@@ -2308,8 +2310,8 @@ bool cmCTestTestHandler::AddTest(const std::vector<std::string>& args)
       }
     if ( found )
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Ignore test: "
-        << *it << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Ignore test: "
+        << *it << std::endl, this->Quiet);
       return true;
       }
     }
@@ -2318,8 +2320,8 @@ bool cmCTestTestHandler::AddTest(const std::vector<std::string>& args)
   test.Name = testname;
   test.Args = args;
   test.Directory = cmSystemTools::GetCurrentWorkingDirectory();
-  cmCTestLog(this->CTest, DEBUG, "Set test directory: "
-    << test.Directory << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG, "Set test directory: "
+    << test.Directory << std::endl, this->Quiet);
 
   test.IsInBasedOnREOptions = true;
   test.WillFail = false;
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 9bce7a3..4861202 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -133,6 +133,7 @@ add_RunCMake_test(ctest_build)
 add_RunCMake_test(ctest_configure)
 add_RunCMake_test(ctest_start)
 add_RunCMake_test(ctest_submit)
+add_RunCMake_test(ctest_test)
 add_RunCMake_test(file)
 add_RunCMake_test(find_library)
 add_RunCMake_test(find_package)
diff --git a/Tests/RunCMake/ctest_test/CMakeLists.txt.in b/Tests/RunCMake/ctest_test/CMakeLists.txt.in
new file mode 100644
index 0000000..cedf379
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/CMakeLists.txt.in
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1)
+project(CTestTest at CASE_NAME@ NONE)
+include(CTest)
+add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
diff --git a/Tests/RunCMake/ctest_test/CTestConfig.cmake.in b/Tests/RunCMake/ctest_test/CTestConfig.cmake.in
new file mode 100644
index 0000000..9004419
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/CTestConfig.cmake.in
@@ -0,0 +1 @@
+set(CTEST_PROJECT_NAME "CTestTest at CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
new file mode 100644
index 0000000..d906290
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
@@ -0,0 +1,10 @@
+include(RunCTest)
+
+set(CASE_CTEST_TEST_ARGS "")
+
+function(run_ctest_test CASE_NAME)
+  set(CASE_CTEST_TEST_ARGS "${ARGN}")
+  run_ctest(${CASE_NAME})
+endfunction()
+
+run_ctest_test(TestQuiet QUIET)
diff --git a/Tests/RunCMake/ctest_test/TestQuiet-stdout.txt b/Tests/RunCMake/ctest_test/TestQuiet-stdout.txt
new file mode 100644
index 0000000..14613c5
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestQuiet-stdout.txt
@@ -0,0 +1,2 @@
+   0 Compiler warnings
+    Start 1: RunCMakeVersion
diff --git a/Tests/RunCMake/ctest_test/test.cmake.in b/Tests/RunCMake/ctest_test/test.cmake.in
new file mode 100644
index 0000000..1350abe
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/test.cmake.in
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.1)
+
+set(CTEST_SITE                          "test-site")
+set(CTEST_BUILD_NAME                    "test-build-name")
+set(CTEST_SOURCE_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME@")
+set(CTEST_BINARY_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME at -build")
+set(CTEST_CMAKE_GENERATOR               "@RunCMake_GENERATOR@")
+set(CTEST_CMAKE_GENERATOR_PLATFORM      "@RunCMake_GENERATOR_PLATFORM@")
+set(CTEST_CMAKE_GENERATOR_TOOLSET       "@RunCMake_GENERATOR_TOOLSET@")
+set(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
+
+set(ctest_test_args "@CASE_CTEST_TEST_ARGS@")
+ctest_start(Experimental)
+ctest_configure()
+ctest_build()
+ctest_test(${ctest_test_args})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49ba4545c272f5bb00828dfe35e5a63749b4aa43
commit 49ba4545c272f5bb00828dfe35e5a63749b4aa43
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 17 13:41:40 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:01:59 2015 -0500

    ctest_build: Add QUIET option

diff --git a/Help/command/ctest_build.rst b/Help/command/ctest_build.rst
index 4a95cdd..e7a54d1 100644
--- a/Help/command/ctest_build.rst
+++ b/Help/command/ctest_build.rst
@@ -23,6 +23,11 @@ The APPEND option marks results for append to those previously
 submitted to a dashboard server since the last ctest_start.  Append
 semantics are defined by the dashboard server in use.
 
+The QUIET option suppresses any CTest-specific non-error output
+that would have been printed to the console otherwise.  The summary
+of warnings / errors, as well as the output from the native build tool
+is unaffected by this option.
+
 If set, the contents of the variable CTEST_BUILD_FLAGS are passed as
 additional arguments to the underlying build command. This can e.g. be
 used to trigger a parallel build using the -j option of make. See
diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx
index c4df741..2b36b0a 100644
--- a/Source/CTest/cmCTestBuildCommand.cxx
+++ b/Source/CTest/cmCTestBuildCommand.cxx
@@ -58,7 +58,8 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler()
     = this->Makefile->GetDefinition("CTEST_BUILD_COMMAND");
   if ( ctestBuildCommand && *ctestBuildCommand )
     {
-    this->CTest->SetCTestConfiguration("MakeCommand", ctestBuildCommand);
+    this->CTest->SetCTestConfiguration("MakeCommand", ctestBuildCommand,
+      this->Quiet);
     }
   else
     {
@@ -141,10 +142,10 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler()
         GenerateCMakeBuildCommand(cmakeBuildTarget ? cmakeBuildTarget : "",
           cmakeBuildConfiguration,
           cmakeBuildAdditionalFlags ? cmakeBuildAdditionalFlags : "", true);
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                 "SetMakeCommand:"
-                 << buildCommand << "\n");
-      this->CTest->SetCTestConfiguration("MakeCommand", buildCommand.c_str());
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        "SetMakeCommand:" << buildCommand << "\n", this->Quiet);
+      this->CTest->SetCTestConfiguration("MakeCommand", buildCommand.c_str(),
+        this->Quiet);
       }
     else
       {
@@ -168,9 +169,11 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler()
   if(const char* useLaunchers =
      this->Makefile->GetDefinition("CTEST_USE_LAUNCHERS"))
     {
-    this->CTest->SetCTestConfiguration("UseLaunchers", useLaunchers);
+    this->CTest->SetCTestConfiguration("UseLaunchers", useLaunchers,
+      this->Quiet);
     }
 
+  handler->SetQuiet(this->Quiet);
   return handler;
 }
 
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index f941408..fe27e2b 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -286,9 +286,9 @@ std::string cmCTestBuildHandler::GetMakeCommand()
 {
   std::string makeCommand
     = this->CTest->GetCTestConfiguration("MakeCommand");
-  cmCTestLog(this->CTest,
-             HANDLER_VERBOSE_OUTPUT, "MakeCommand:" << makeCommand <<
-             "\n");
+  cmCTestOptionalLog(this->CTest,
+    HANDLER_VERBOSE_OUTPUT, "MakeCommand:" << makeCommand << "\n",
+    this->Quiet);
 
   std::string configType = this->CTest->GetConfigType();
   if (configType == "")
@@ -312,7 +312,8 @@ std::string cmCTestBuildHandler::GetMakeCommand()
 //functions and commented...
 int cmCTestBuildHandler::ProcessHandler()
 {
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "Build project" << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "Build project" << std::endl,
+    this->Quiet);
 
   // do we have time for this
   if (this->CTest->GetRemainingTimeAllowed() < 120)
@@ -401,12 +402,12 @@ int cmCTestBuildHandler::ProcessHandler()
 
 #define cmCTestBuildHandlerPopulateRegexVector(strings, regexes) \
   regexes.clear(); \
-    cmCTestLog(this->CTest, DEBUG, this << "Add " #regexes \
-    << std::endl); \
+    cmCTestOptionalLog(this->CTest, DEBUG, this << "Add " #regexes \
+    << std::endl, this->Quiet); \
   for ( it = strings.begin(); it != strings.end(); ++it ) \
     { \
-    cmCTestLog(this->CTest, DEBUG, "Add " #strings ": " \
-    << *it << std::endl); \
+    cmCTestOptionalLog(this->CTest, DEBUG, "Add " #strings ": " \
+    << *it << std::endl, this->Quiet); \
     regexes.push_back(it->c_str()); \
     }
   cmCTestBuildHandlerPopulateRegexVector(
@@ -472,8 +473,8 @@ int cmCTestBuildHandler::ProcessHandler()
     }
   else
     {
-    cmCTestLog(this->CTest, DEBUG, "Build with command: " << makeCommand
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, DEBUG, "Build with command: " <<
+      makeCommand << std::endl, this->Quiet);
     }
 
   // Remember end build time and calculate elapsed time
@@ -906,13 +907,16 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
     }
   argv.push_back(0);
 
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command:");
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command:",
+    this->Quiet);
   std::vector<const char*>::iterator ait;
   for ( ait = argv.begin(); ait != argv.end() && *ait; ++ ait )
     {
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " \"" << *ait << "\"");
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " \"" << *ait <<
+      "\"", this->Quiet);
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, std::endl,
+    this->Quiet);
 
   // Optionally use make rule launchers to record errors and warnings.
   LaunchHelper launchHelper(this);
@@ -932,12 +936,12 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
 
   char* data;
   int length;
-  cmCTestLog(this->CTest, HANDLER_OUTPUT,
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
     "   Each symbol represents " << tick_len << " bytes of output."
     << std::endl
     << (this->UseCTestLaunch? "" :
         "   '!' represents an error and '*' a warning.\n")
-    << "    " << std::flush);
+    << "    " << std::flush, this->Quiet);
 
   // Initialize building structures
   this->BuildProcessingQueue.clear();
@@ -980,8 +984,9 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
   this->ProcessBuffer(0, 0, tick, tick_len, ofs, &this->BuildProcessingQueue);
   this->ProcessBuffer(0, 0, tick, tick_len, ofs,
     &this->BuildProcessingErrorQueue);
-  cmCTestLog(this->CTest, OUTPUT, " Size of output: "
-    << ((this->BuildOutputLogSize + 512) / 1024) << "K" << std::endl);
+  cmCTestOptionalLog(this->CTest, OUTPUT, " Size of output: "
+    << ((this->BuildOutputLogSize + 512) / 1024) << "K" << std::endl,
+    this->Quiet);
 
   // Properly handle output of the build command
   cmsysProcess_WaitForExit(cp, 0);
@@ -992,8 +997,8 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
     if (retVal)
       {
       *retVal = cmsysProcess_GetExitValue(cp);
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-      "Command exited with the value: " << *retVal << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Command exited with the value: " << *retVal << std::endl, this->Quiet);
       // if a non zero return value
       if (*retVal)
         {
@@ -1017,13 +1022,14 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command,
     if (retVal)
       {
       *retVal = cmsysProcess_GetExitException(cp);
-      cmCTestLog(this->CTest, WARNING, "There was an exception: " << *retVal
-                 << std::endl);
+      cmCTestOptionalLog(this->CTest, WARNING, "There was an exception: " <<
+        *retVal << std::endl, this->Quiet);
       }
     }
   else if(result == cmsysProcess_State_Expired)
     {
-    cmCTestLog(this->CTest, WARNING, "There was a timeout" << std::endl);
+    cmCTestOptionalLog(this->CTest, WARNING, "There was a timeout" <<
+      std::endl, this->Quiet);
     }
   else if(result == cmsysProcess_State_Error)
     {
@@ -1185,13 +1191,14 @@ void cmCTestBuildHandler::ProcessBuffer(const char* data, int length,
   while ( this->BuildOutputLogSize > (tick * tick_len) )
     {
     tick ++;
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, this->LastTickChar);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, this->LastTickChar,
+      this->Quiet);
     tickDisplayed = true;
     if ( tick % tick_line_len == 0 && tick > 0 )
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "  Size: "
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "  Size: "
         << ((this->BuildOutputLogSize + 512) / 1024) << "K" << std::endl
-        << "    ");
+        << "    ", this->Quiet);
       }
     }
   if ( tickDisplayed )
@@ -1216,7 +1223,8 @@ int cmCTestBuildHandler::ProcessSingleLine(const char* data)
     return b_REGULAR_LINE;
     }
 
-  cmCTestLog(this->CTest, DEBUG, "Line: [" << data << "]" << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG, "Line: [" << data << "]" <<
+    std::endl, this->Quiet);
 
   std::vector<cmsys::RegularExpression>::iterator it;
 
@@ -1236,9 +1244,9 @@ int cmCTestBuildHandler::ProcessSingleLine(const char* data)
       if ( it->find(data) )
         {
         errorLine = 1;
-        cmCTestLog(this->CTest, DEBUG, "  Error Line: " << data
+        cmCTestOptionalLog(this->CTest, DEBUG, "  Error Line: " << data
           << " (matches: " << this->CustomErrorMatches[wrxCnt] << ")"
-          << std::endl);
+          << std::endl, this->Quiet);
         break;
         }
       wrxCnt ++;
@@ -1252,9 +1260,9 @@ int cmCTestBuildHandler::ProcessSingleLine(const char* data)
       if ( it->find(data) )
         {
         errorLine = 0;
-        cmCTestLog(this->CTest, DEBUG, "  Not an error Line: " << data
+        cmCTestOptionalLog(this->CTest, DEBUG, "  Not an error Line: " << data
           << " (matches: " << this->CustomErrorExceptions[wrxCnt] << ")"
-          << std::endl);
+          << std::endl, this->Quiet);
         break;
         }
       wrxCnt ++;
@@ -1271,10 +1279,10 @@ int cmCTestBuildHandler::ProcessSingleLine(const char* data)
       if ( it->find(data) )
         {
         warningLine = 1;
-        cmCTestLog(this->CTest, DEBUG,
+        cmCTestOptionalLog(this->CTest, DEBUG,
           "  Warning Line: " << data
           << " (matches: " << this->CustomWarningMatches[wrxCnt] << ")"
-          << std::endl);
+          << std::endl, this->Quiet);
         break;
         }
       wrxCnt ++;
@@ -1289,9 +1297,9 @@ int cmCTestBuildHandler::ProcessSingleLine(const char* data)
       if ( it->find(data) )
         {
         warningLine = 0;
-        cmCTestLog(this->CTest, DEBUG, "  Not a warning Line: " << data
+        cmCTestOptionalLog(this->CTest, DEBUG, "  Not a warning Line: " << data
           << " (matches: " << this->CustomWarningExceptions[wrxCnt] << ")"
-          << std::endl);
+          << std::endl, this->Quiet);
         break;
         }
       wrxCnt ++;
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d39dbcf..9bce7a3 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -129,6 +129,7 @@ add_RunCMake_test(build_command)
 add_RunCMake_test(export)
 add_RunCMake_test(cmake_minimum_required)
 add_RunCMake_test(continue)
+add_RunCMake_test(ctest_build)
 add_RunCMake_test(ctest_configure)
 add_RunCMake_test(ctest_start)
 add_RunCMake_test(ctest_submit)
diff --git a/Tests/RunCMake/ctest_build/BuildQuiet-stdout.txt b/Tests/RunCMake/ctest_build/BuildQuiet-stdout.txt
new file mode 100644
index 0000000..2e59d99
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/BuildQuiet-stdout.txt
@@ -0,0 +1,12 @@
+Run dashboard with model Experimental
+   Source directory: .*/Tests/RunCMake/ctest_build/BuildQuiet
+   Build directory: .*/Tests/RunCMake/ctest_build/BuildQuiet-build
+   Reading ctest configuration file: .*/Tests/RunCMake/ctest_build/BuildQuiet/CTestConfig.cmake
+   Site: test-site
+   Build name: test-build-name
+   Use Experimental tag: [0-9-]+
+Configure project
+   Each . represents 1024 bytes of output
+    . Size of output: 0K
+   0 Compiler errors
+   0 Compiler warnings
diff --git a/Tests/RunCMake/ctest_build/CMakeLists.txt.in b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
new file mode 100644
index 0000000..9ba08e9
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1)
+project(CTestBuild at CASE_NAME@ NONE)
+include(CTest)
+add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
diff --git a/Tests/RunCMake/ctest_build/CTestConfig.cmake.in b/Tests/RunCMake/ctest_build/CTestConfig.cmake.in
new file mode 100644
index 0000000..097f82c
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/CTestConfig.cmake.in
@@ -0,0 +1 @@
+set(CTEST_PROJECT_NAME "CTestBuild at CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
new file mode 100644
index 0000000..5826fe4
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
@@ -0,0 +1,10 @@
+include(RunCTest)
+
+set(CASE_CTEST_BUILD_ARGS "")
+
+function(run_ctest_build CASE_NAME)
+  set(CASE_CTEST_BUILD_ARGS "${ARGN}")
+  run_ctest(${CASE_NAME})
+endfunction()
+
+run_ctest_build(BuildQuiet QUIET)
diff --git a/Tests/RunCMake/ctest_build/test.cmake.in b/Tests/RunCMake/ctest_build/test.cmake.in
new file mode 100644
index 0000000..38c8ea1
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/test.cmake.in
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.1)
+
+set(CTEST_SITE                          "test-site")
+set(CTEST_BUILD_NAME                    "test-build-name")
+set(CTEST_SOURCE_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME@")
+set(CTEST_BINARY_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME at -build")
+set(CTEST_CMAKE_GENERATOR               "@RunCMake_GENERATOR@")
+set(CTEST_CMAKE_GENERATOR_PLATFORM      "@RunCMake_GENERATOR_PLATFORM@")
+set(CTEST_CMAKE_GENERATOR_TOOLSET       "@RunCMake_GENERATOR_TOOLSET@")
+set(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
+
+set(ctest_build_args "@CASE_CTEST_BUILD_ARGS@")
+ctest_start(Experimental)
+ctest_configure()
+ctest_build(${ctest_build_args})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f999dc0bbf70dcf6167d77a1dedabefa12edaef2
commit f999dc0bbf70dcf6167d77a1dedabefa12edaef2
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 17 12:38:52 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:01:59 2015 -0500

    ctest_configure: Add QUIET option

diff --git a/Help/command/ctest_configure.rst b/Help/command/ctest_configure.rst
index 2c4e305..61d9320 100644
--- a/Help/command/ctest_configure.rst
+++ b/Help/command/ctest_configure.rst
@@ -6,7 +6,7 @@ Configure the project build tree.
 ::
 
   ctest_configure([BUILD build_dir] [SOURCE source_dir] [APPEND]
-                  [OPTIONS options] [RETURN_VALUE res])
+                  [OPTIONS options] [RETURN_VALUE res] [QUIET])
 
 Configures the given build directory and stores results in
 Configure.xml.  If no BUILD is given, the CTEST_BINARY_DIRECTORY
@@ -19,3 +19,7 @@ build tool.
 The APPEND option marks results for append to those previously
 submitted to a dashboard server since the last ctest_start.  Append
 semantics are defined by the dashboard server in use.
+
+The QUIET option suppresses any CTest-specific non-error messages
+that would have otherwise been printed to the console.  Output from
+the underlying configure command is not affected.
diff --git a/Source/CTest/cmCTestConfigureCommand.cxx b/Source/CTest/cmCTestConfigureCommand.cxx
index 0f13263..ba4dab2 100644
--- a/Source/CTest/cmCTestConfigureCommand.cxx
+++ b/Source/CTest/cmCTestConfigureCommand.cxx
@@ -45,7 +45,7 @@ cmCTestGenericHandler* cmCTestConfigureCommand::InitializeHandler()
   if ( ctestConfigureCommand && *ctestConfigureCommand )
     {
     this->CTest->SetCTestConfiguration("ConfigureCommand",
-      ctestConfigureCommand);
+      ctestConfigureCommand, this->Quiet);
     }
   else
     {
@@ -141,7 +141,7 @@ cmCTestGenericHandler* cmCTestConfigureCommand::InitializeHandler()
       cmakeConfigureCommand += "\"";
 
       this->CTest->SetCTestConfiguration("ConfigureCommand",
-        cmakeConfigureCommand.c_str());
+        cmakeConfigureCommand.c_str(), this->Quiet);
       }
     else
       {
@@ -160,5 +160,6 @@ cmCTestGenericHandler* cmCTestConfigureCommand::InitializeHandler()
       "internal CTest error. Cannot instantiate configure handler");
     return 0;
     }
+  handler->SetQuiet(this->Quiet);
   return handler;
 }
diff --git a/Source/CTest/cmCTestConfigureHandler.cxx b/Source/CTest/cmCTestConfigureHandler.cxx
index 506433f..3b444f2 100644
--- a/Source/CTest/cmCTestConfigureHandler.cxx
+++ b/Source/CTest/cmCTestConfigureHandler.cxx
@@ -35,7 +35,8 @@ void cmCTestConfigureHandler::Initialize()
 //functions and commented...
 int cmCTestConfigureHandler::ProcessHandler()
 {
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "Configure project" << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+    "Configure project" << std::endl, this->Quiet);
   std::string cCommand
     = this->CTest->GetCTestConfiguration("ConfigureCommand");
   if (cCommand.empty())
@@ -75,8 +76,8 @@ int cmCTestConfigureHandler::ProcessHandler()
 
     cmGeneratedFileStream ofs;
     this->StartLogFile("Configure", ofs);
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Configure with command: "
-      << cCommand << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Configure with command: " << cCommand << std::endl, this->Quiet);
     res = this->CTest->RunMakeCommand(cCommand.c_str(), output,
       &retVal, buildDirectory.c_str(),
       0, ofs);
@@ -101,7 +102,7 @@ int cmCTestConfigureHandler::ProcessHandler()
         }
       os << "<ConfigureCommand>" << cCommand << "</ConfigureCommand>"
         << std::endl;
-      cmCTestLog(this->CTest, DEBUG, "End" << std::endl);
+      cmCTestOptionalLog(this->CTest, DEBUG, "End" << std::endl, this->Quiet);
       os << "<Log>" << cmXMLSafe(output) << "</Log>" << std::endl;
       std::string end_time = this->CTest->CurrentTime();
       os << "\t<ConfigureStatus>" << retVal << "</ConfigureStatus>\n"
@@ -119,8 +120,8 @@ int cmCTestConfigureHandler::ProcessHandler()
     }
   else
     {
-    cmCTestLog(this->CTest, DEBUG, "Configure with command: " << cCommand
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, DEBUG,
+      "Configure with command: " << cCommand << std::endl, this->Quiet);
     }
   if (! res || retVal )
     {
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index a9b8bf3..d39dbcf 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -129,6 +129,7 @@ add_RunCMake_test(build_command)
 add_RunCMake_test(export)
 add_RunCMake_test(cmake_minimum_required)
 add_RunCMake_test(continue)
+add_RunCMake_test(ctest_configure)
 add_RunCMake_test(ctest_start)
 add_RunCMake_test(ctest_submit)
 add_RunCMake_test(file)
diff --git a/Tests/RunCMake/ctest_configure/CMakeLists.txt.in b/Tests/RunCMake/ctest_configure/CMakeLists.txt.in
new file mode 100644
index 0000000..2fb21d4
--- /dev/null
+++ b/Tests/RunCMake/ctest_configure/CMakeLists.txt.in
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1)
+project(CTestConfigure at CASE_NAME@ NONE)
+include(CTest)
+add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
diff --git a/Tests/RunCMake/ctest_configure/CTestConfig.cmake.in b/Tests/RunCMake/ctest_configure/CTestConfig.cmake.in
new file mode 100644
index 0000000..7e30ab9
--- /dev/null
+++ b/Tests/RunCMake/ctest_configure/CTestConfig.cmake.in
@@ -0,0 +1 @@
+set(CTEST_PROJECT_NAME "CTestConfigure at CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_configure/ConfigureQuiet-stdout.txt b/Tests/RunCMake/ctest_configure/ConfigureQuiet-stdout.txt
new file mode 100644
index 0000000..015644d
--- /dev/null
+++ b/Tests/RunCMake/ctest_configure/ConfigureQuiet-stdout.txt
@@ -0,0 +1,9 @@
+Run dashboard with model Experimental
+   Source directory: .*/Tests/RunCMake/ctest_configure/ConfigureQuiet
+   Build directory: .*/Tests/RunCMake/ctest_configure/ConfigureQuiet-build
+   Reading ctest configuration file: .*/Tests/RunCMake/ctest_configure/ConfigureQuiet/CTestConfig.cmake
+   Site: test-site
+   Build name: test-build-name
+   Use Experimental tag: [0-9-]+
+   Each . represents 1024 bytes of output
+    . Size of output: 0K
diff --git a/Tests/RunCMake/ctest_configure/RunCMakeTest.cmake b/Tests/RunCMake/ctest_configure/RunCMakeTest.cmake
new file mode 100644
index 0000000..fc1b02c
--- /dev/null
+++ b/Tests/RunCMake/ctest_configure/RunCMakeTest.cmake
@@ -0,0 +1,10 @@
+include(RunCTest)
+
+set(CASE_CTEST_CONFIGURE_ARGS "")
+
+function(run_ctest_configure CASE_NAME)
+  set(CASE_CTEST_CONFIGURE_ARGS "${ARGN}")
+  run_ctest(${CASE_NAME})
+endfunction()
+
+run_ctest_configure(ConfigureQuiet QUIET)
diff --git a/Tests/RunCMake/ctest_configure/test.cmake.in b/Tests/RunCMake/ctest_configure/test.cmake.in
new file mode 100644
index 0000000..72d199a
--- /dev/null
+++ b/Tests/RunCMake/ctest_configure/test.cmake.in
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.1)
+
+set(CTEST_SITE                          "test-site")
+set(CTEST_BUILD_NAME                    "test-build-name")
+set(CTEST_SOURCE_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME@")
+set(CTEST_BINARY_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME at -build")
+set(CTEST_CMAKE_GENERATOR               "@RunCMake_GENERATOR@")
+set(CTEST_CMAKE_GENERATOR_PLATFORM      "@RunCMake_GENERATOR_PLATFORM@")
+set(CTEST_CMAKE_GENERATOR_TOOLSET       "@RunCMake_GENERATOR_TOOLSET@")
+set(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
+
+set(ctest_configure_args "@CASE_CTEST_CONFIGURE_ARGS@")
+ctest_start(Experimental)
+ctest_configure(${ctest_configure_args})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=645ad117e1c8b3b99fda128daad708a87c0a3f2e
commit 645ad117e1c8b3b99fda128daad708a87c0a3f2e
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 17 11:45:46 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:01:59 2015 -0500

    ctest_update: Add QUIET option

diff --git a/Help/command/ctest_update.rst b/Help/command/ctest_update.rst
index d34e192..01e357b 100644
--- a/Help/command/ctest_update.rst
+++ b/Help/command/ctest_update.rst
@@ -5,9 +5,14 @@ Update the work tree from version control.
 
 ::
 
-  ctest_update([SOURCE source] [RETURN_VALUE res])
+  ctest_update([SOURCE source] [RETURN_VALUE res] [QUIET])
 
 Updates the given source directory and stores results in Update.xml.
 If no SOURCE is given, the CTEST_SOURCE_DIRECTORY variable is used.
 The RETURN_VALUE option specifies a variable in which to store the
 result, which is the number of files updated or -1 on error.
+
+If QUIET is specified then CTest will suppress most non-error
+messages that it would have otherwise printed to the console.
+CTest will still report the new revision of the repository
+and any conflicting files that were found.
diff --git a/Source/CTest/cmCTestUpdateCommand.cxx b/Source/CTest/cmCTestUpdateCommand.cxx
index f87466d..dfda9f1 100644
--- a/Source/CTest/cmCTestUpdateCommand.cxx
+++ b/Source/CTest/cmCTestUpdateCommand.cxx
@@ -20,55 +20,56 @@ cmCTestGenericHandler* cmCTestUpdateCommand::InitializeHandler()
     {
     this->CTest->SetCTestConfiguration("SourceDirectory",
       cmSystemTools::CollapseFullPath(
-        this->Values[ct_SOURCE]).c_str());
+        this->Values[ct_SOURCE]).c_str(), this->Quiet);
     }
   else
     {
     this->CTest->SetCTestConfiguration("SourceDirectory",
       cmSystemTools::CollapseFullPath(
-        this->Makefile->GetDefinition("CTEST_SOURCE_DIRECTORY")).c_str());
+        this->Makefile->GetDefinition("CTEST_SOURCE_DIRECTORY")).c_str(),
+      this->Quiet);
     }
   std::string source_dir
     = this->CTest->GetCTestConfiguration("SourceDirectory");
 
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "UpdateCommand", "CTEST_UPDATE_COMMAND");
+    "UpdateCommand", "CTEST_UPDATE_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "UpdateOptions", "CTEST_UPDATE_OPTIONS");
+    "UpdateOptions", "CTEST_UPDATE_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "CVSCommand", "CTEST_CVS_COMMAND");
+    "CVSCommand", "CTEST_CVS_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "CVSUpdateOptions", "CTEST_CVS_UPDATE_OPTIONS");
+    "CVSUpdateOptions", "CTEST_CVS_UPDATE_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "SVNCommand", "CTEST_SVN_COMMAND");
+    "SVNCommand", "CTEST_SVN_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "SVNUpdateOptions", "CTEST_SVN_UPDATE_OPTIONS");
+    "SVNUpdateOptions", "CTEST_SVN_UPDATE_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "SVNOptions", "CTEST_SVN_OPTIONS");
+    "SVNOptions", "CTEST_SVN_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "BZRCommand", "CTEST_BZR_COMMAND");
+    "BZRCommand", "CTEST_BZR_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "BZRUpdateOptions", "CTEST_BZR_UPDATE_OPTIONS");
+    "BZRUpdateOptions", "CTEST_BZR_UPDATE_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "GITCommand", "CTEST_GIT_COMMAND");
+    "GITCommand", "CTEST_GIT_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "GITUpdateOptions", "CTEST_GIT_UPDATE_OPTIONS");
+    "GITUpdateOptions", "CTEST_GIT_UPDATE_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "GITUpdateCustom", "CTEST_GIT_UPDATE_CUSTOM");
+    "GITUpdateCustom", "CTEST_GIT_UPDATE_CUSTOM", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "UpdateVersionOnly", "CTEST_UPDATE_VERSION_ONLY");
+    "UpdateVersionOnly", "CTEST_UPDATE_VERSION_ONLY", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "HGCommand", "CTEST_HG_COMMAND");
+    "HGCommand", "CTEST_HG_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "HGUpdateOptions", "CTEST_HG_UPDATE_OPTIONS");
+    "HGUpdateOptions", "CTEST_HG_UPDATE_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "P4Command", "CTEST_P4_COMMAND");
+    "P4Command", "CTEST_P4_COMMAND", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "P4UpdateOptions", "CTEST_P4_UPDATE_OPTIONS");
+    "P4UpdateOptions", "CTEST_P4_UPDATE_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "P4Client", "CTEST_P4_CLIENT");
+    "P4Client", "CTEST_P4_CLIENT", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "P4Options", "CTEST_P4_OPTIONS");
+    "P4Options", "CTEST_P4_OPTIONS", this->Quiet);
 
   cmCTestGenericHandler* handler
     = this->CTest->GetInitializedHandler("update");
@@ -84,6 +85,7 @@ cmCTestGenericHandler* cmCTestUpdateCommand::InitializeHandler()
     return 0;
     }
   handler->SetOption("SourceDirectory", source_dir.c_str());
+  handler->SetQuiet(this->Quiet);
   return handler;
 }
 
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx
index 4c37c8b..b18786a 100644
--- a/Source/CTest/cmCTestUpdateHandler.cxx
+++ b/Source/CTest/cmCTestUpdateHandler.cxx
@@ -122,11 +122,13 @@ void cmCTestUpdateHandler::Initialize()
 //----------------------------------------------------------------------
 int cmCTestUpdateHandler::DetermineType(const char* cmd, const char* type)
 {
-  cmCTestLog(this->CTest, DEBUG, "Determine update type from command: " << cmd
-    << " and type: " << type << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG,
+    "Determine update type from command: " << cmd << " and type: " << type <<
+    std::endl, this->Quiet);
   if ( type && *type )
     {
-    cmCTestLog(this->CTest, DEBUG, "Type specified: " << type << std::endl);
+    cmCTestOptionalLog(this->CTest, DEBUG, "Type specified: " << type <<
+      std::endl, this->Quiet);
     std::string stype = cmSystemTools::LowerCase(type);
     if ( stype.find("cvs") != std::string::npos )
       {
@@ -155,8 +157,8 @@ int cmCTestUpdateHandler::DetermineType(const char* cmd, const char* type)
     }
   else
     {
-    cmCTestLog(this->CTest, DEBUG, "Type not specified, check command: "
-      << cmd << std::endl);
+    cmCTestOptionalLog(this->CTest, DEBUG,
+      "Type not specified, check command: " << cmd << std::endl, this->Quiet);
     std::string stype = cmSystemTools::LowerCase(cmd);
     if ( stype.find("cvs") != std::string::npos )
       {
@@ -211,18 +213,19 @@ int cmCTestUpdateHandler::ProcessHandler()
     this->StartLogFile("Update", ofs);
     }
 
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Updating the repository: "
-    << sourceDirectory << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+    "   Updating the repository: " << sourceDirectory << std::endl,
+    this->Quiet);
 
   if(!this->SelectVCS())
     {
     return -1;
     }
 
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Use "
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Use "
     << cmCTestUpdateHandlerUpdateToString(this->UpdateType)
     << " repository type"
-    << std::endl;);
+    << std::endl;, this->Quiet);
 
   // Create an object to interact with the VCS tool.
   cmsys::auto_ptr<cmCTestVC> vc;
@@ -283,23 +286,23 @@ int cmCTestUpdateHandler::ProcessHandler()
   int numUpdated = vc->GetPathCount(cmCTestVC::PathUpdated);
   if(numUpdated)
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT,
-               "   Found " << numUpdated << " updated files\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "   Found " << numUpdated << " updated files\n", this->Quiet);
     }
   if(int numModified = vc->GetPathCount(cmCTestVC::PathModified))
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT,
-               "   Found " << numModified << " locally modified files\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "   Found " << numModified << " locally modified files\n", this->Quiet);
     localModifications += numModified;
     }
   if(int numConflicting = vc->GetPathCount(cmCTestVC::PathConflicting))
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT,
-               "   Found " << numConflicting << " conflicting files\n");
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+    "   Found " << numConflicting << " conflicting files\n", this->Quiet);
     localModifications += numConflicting;
     }
 
-  cmCTestLog(this->CTest, DEBUG, "End" << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG, "End" << std::endl, this->Quiet);
   std::string end_time = this->CTest->CurrentTime();
   os << "\t<EndDateTime>" << end_time << "</EndDateTime>\n"
      << "\t<EndTime>" << static_cast<unsigned int>(cmSystemTools::GetTime())
@@ -331,8 +334,8 @@ int cmCTestUpdateHandler::ProcessHandler()
 int cmCTestUpdateHandler::DetectVCS(const char* dir)
 {
   std::string sourceDirectory = dir;
-  cmCTestLog(this->CTest, DEBUG, "Check directory: "
-    << sourceDirectory << std::endl);
+  cmCTestOptionalLog(this->CTest, DEBUG, "Check directory: "
+    << sourceDirectory << std::endl, this->Quiet);
   sourceDirectory += "/.svn";
   if ( cmSystemTools::FileExists(sourceDirectory.c_str()) )
     {
diff --git a/Tests/CTestUpdateCommon.cmake b/Tests/CTestUpdateCommon.cmake
index 97153f0..77b3398 100644
--- a/Tests/CTestUpdateCommon.cmake
+++ b/Tests/CTestUpdateCommon.cmake
@@ -13,6 +13,9 @@ function(run_child)
     message(FATAL_ERROR "Child failed (${FAILED}), output is\n  ${OUTPUT}\n"
       "Command = [${ARGN}]\n")
   endif()
+
+  # Pass output back up to the parent scope for possible further inspection.
+  set(OUTPUT "${OUTPUT}" PARENT_SCOPE)
 endfunction()
 
 #-----------------------------------------------------------------------------
@@ -269,6 +272,9 @@ function(run_dashboard_script bin_dir)
       Updated{subdir/bar.txt}
       )
   endif()
+
+  # Pass console output up to the parent, in case they'd like to inspect it.
+  set(OUTPUT "${OUTPUT}" PARENT_SCOPE)
 endfunction()
 
 #-----------------------------------------------------------------------------
diff --git a/Tests/CTestUpdateGIT.cmake.in b/Tests/CTestUpdateGIT.cmake.in
index 41b732b..5987a30 100644
--- a/Tests/CTestUpdateGIT.cmake.in
+++ b/Tests/CTestUpdateGIT.cmake.in
@@ -334,3 +334,36 @@ set(CTEST_UPDATE_VERSION_ONLY TRUE)
 # Run the dashboard script with CTest.
 set(NO_UPDATE 1)
 run_dashboard_script(dash-binary-no-update)
+
+rewind_source(dash-source)
+
+#-----------------------------------------------------------------------------
+# Test ctest_update(QUIET)
+set(NO_UPDATE 0)
+message("Running CTest Dashboard Script (update quietly)...")
+
+create_dashboard_script(dash-binary-quiet
+  "# git command configuration
+set(CTEST_GIT_COMMAND \"${GIT}\")
+set(CTEST_GIT_UPDATE_OPTIONS)
+set(CTEST_GIT_UPDATE_CUSTOM \${CTEST_GIT_COMMAND} pull origin master)
+")
+
+# We need to modify the created dashboard script to include our "QUIET"
+# option.
+set(filename "${TOP}/dash-binary-quiet.cmake")
+file(READ "${filename}" contents)
+string(REPLACE
+  [=[ctest_update(SOURCE ${CTEST_SOURCE_DIRECTORY})]=]
+  [=[ctest_update(SOURCE ${CTEST_SOURCE_DIRECTORY} QUIET)]=]
+  contents
+  "${contents}")
+file(WRITE "${filename}" "${contents}")
+
+# Run the dashboard script with CTest.
+run_dashboard_script(dash-binary-quiet)
+
+# Make sure the output seems quiet.
+if("${OUTPUT}" MATCHES "Updating the repository")
+  message(FATAL_ERROR "Found 'Updating the repository' in quiet output")
+endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19d1a5599a08f2e8d74c4483cb9ee6d34e38ecba
commit 19d1a5599a08f2e8d74c4483cb9ee6d34e38ecba
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 17 09:58:25 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:01:59 2015 -0500

    ctest_start: Add QUIET option
    
    This suppresses all non-error messages that would have otherwise
    been printed by this function.

diff --git a/Help/command/ctest_start.rst b/Help/command/ctest_start.rst
index d7472db..b5c7b34 100644
--- a/Help/command/ctest_start.rst
+++ b/Help/command/ctest_start.rst
@@ -5,7 +5,7 @@ Starts the testing for a given model
 
 ::
 
-  ctest_start(Model [TRACK <track>] [APPEND] [source [binary]])
+  ctest_start(Model [TRACK <track>] [APPEND] [source [binary]] [QUIET])
 
 Starts the testing for a given model.  The command should be called
 after the binary directory is initialized.  If the 'source' and
@@ -14,7 +14,8 @@ after the binary directory is initialized.  If the 'source' and
 If the track is
 specified, the submissions will go to the specified track.  If APPEND
 is used, the existing TAG is used rather than creating a new one based
-on the current time stamp.
+on the current time stamp.  If QUIET is used, CTest will suppress any
+non-error messages that it otherwise would have printed to the console.
 
 If the :variable:`CTEST_CHECKOUT_COMMAND` variable
 (or the :variable:`CTEST_CVS_CHECKOUT` variable)
diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx
index 8ea6cef..e19e4f4 100644
--- a/Source/CTest/cmCTestStartCommand.cxx
+++ b/Source/CTest/cmCTestStartCommand.cxx
@@ -20,6 +20,7 @@
 cmCTestStartCommand::cmCTestStartCommand()
 {
   this->CreateNewTag = true;
+  this->Quiet = false;
 }
 
 bool cmCTestStartCommand
@@ -57,6 +58,14 @@ bool cmCTestStartCommand
       this->CreateNewTag = false;
       }
     }
+  if (cnt < args.size())
+    {
+    if (args[cnt] == "QUIET")
+      {
+      cnt ++;
+      this->Quiet = true;
+      }
+    }
 
   if ( cnt < args.size() )
     {
@@ -95,18 +104,20 @@ bool cmCTestStartCommand
 
   std::string sourceDir = cmSystemTools::CollapseFullPath(src_dir);
   std::string binaryDir = cmSystemTools::CollapseFullPath(bld_dir);
-  this->CTest->SetCTestConfiguration("SourceDirectory", sourceDir.c_str());
-  this->CTest->SetCTestConfiguration("BuildDirectory", binaryDir.c_str());
+  this->CTest->SetCTestConfiguration("SourceDirectory", sourceDir.c_str(),
+    this->Quiet);
+  this->CTest->SetCTestConfiguration("BuildDirectory", binaryDir.c_str(),
+    this->Quiet);
 
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "Run dashboard with model "
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "Run dashboard with model "
     << smodel << std::endl
     << "   Source directory: " << src_dir << std::endl
-    << "   Build directory: " << bld_dir << std::endl);
+    << "   Build directory: " << bld_dir << std::endl, this->Quiet);
   const char* track = this->CTest->GetSpecificTrack();
   if ( track )
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT,
-      "   Track: " << track << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "   Track: " << track << std::endl, this->Quiet);
     }
 
   // Log startup actions.
diff --git a/Source/CTest/cmCTestStartCommand.h b/Source/CTest/cmCTestStartCommand.h
index 3b8843f..eed1962 100644
--- a/Source/CTest/cmCTestStartCommand.h
+++ b/Source/CTest/cmCTestStartCommand.h
@@ -34,6 +34,7 @@ public:
     ni->CTest = this->CTest;
     ni->CTestScriptHandler = this->CTestScriptHandler;
     ni->CreateNewTag = this->CreateNewTag;
+    ni->Quiet = this->Quiet;
     return ni;
     }
 
@@ -53,6 +54,14 @@ public:
     }
 
   /**
+   * Should this invocation of ctest_start output non-error messages?
+   */
+  bool ShouldBeQuiet()
+    {
+    return this->Quiet;
+    }
+
+  /**
    * The name of the command as specified in CMakeList.txt.
    */
   virtual std::string GetName() const { return "ctest_start";}
@@ -62,6 +71,7 @@ public:
 private:
   bool InitialCheckout(std::ostream& ofs, std::string const& sourceDir);
   bool CreateNewTag;
+  bool Quiet;
 };
 
 
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 9975802..d7fe22d 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -463,7 +463,13 @@ cmCTest::Part cmCTest::GetPartFromName(const char* name)
 //----------------------------------------------------------------------
 int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command)
 {
-  cmCTestLog(this, DEBUG, "Here: " << __LINE__ << std::endl);
+  bool quiet = false;
+  if (command && command->ShouldBeQuiet())
+    {
+    quiet = true;
+    }
+
+  cmCTestOptionalLog(this, DEBUG, "Here: " << __LINE__ << std::endl, quiet);
   if(!this->InteractiveDebugMode)
     {
     this->BlockTestErrorDiagnostics();
@@ -478,24 +484,23 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command)
 
   this->UpdateCTestConfiguration();
 
-  cmCTestLog(this, DEBUG, "Here: " << __LINE__ << std::endl);
+  cmCTestOptionalLog(this, DEBUG, "Here: " << __LINE__ << std::endl, quiet);
   if ( this->ProduceXML )
     {
-    cmCTestLog(this, DEBUG, "Here: " << __LINE__ << std::endl);
-    cmCTestLog(this, OUTPUT,
-               "   Site: " << this->GetCTestConfiguration("Site") << std::endl
-               << "   Build name: "
-               << cmCTest::SafeBuildIdField(
-                 this->GetCTestConfiguration("BuildName"))
-               << std::endl);
-    cmCTestLog(this, DEBUG, "Produce XML is on" << std::endl);
+    cmCTestOptionalLog(this, DEBUG, "Here: " << __LINE__ << std::endl, quiet);
+    cmCTestOptionalLog(this, OUTPUT,
+      "   Site: " << this->GetCTestConfiguration("Site") << std::endl <<
+      "   Build name: " << cmCTest::SafeBuildIdField(
+      this->GetCTestConfiguration("BuildName")) << std::endl, quiet);
+    cmCTestOptionalLog(this, DEBUG, "Produce XML is on" << std::endl, quiet);
     if ( this->TestModel == cmCTest::NIGHTLY &&
          this->GetCTestConfiguration("NightlyStartTime").empty() )
       {
-      cmCTestLog(this, WARNING,
-                 "WARNING: No nightly start time found please set in"
-                 " CTestConfig.cmake or DartConfig.cmake" << std::endl);
-      cmCTestLog(this, DEBUG, "Here: " << __LINE__ << std::endl);
+      cmCTestOptionalLog(this, WARNING,
+        "WARNING: No nightly start time found please set in CTestConfig.cmake"
+        " or DartConfig.cmake" << std::endl, quiet);
+      cmCTestOptionalLog(this, DEBUG, "Here: " << __LINE__ << std::endl,
+        quiet);
       return 0;
       }
     }
@@ -507,8 +512,8 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command)
   cmMakefile *mf = lg->GetMakefile();
   if ( !this->ReadCustomConfigurationFileTree(this->BinaryDir.c_str(), mf) )
     {
-    cmCTestLog(this, DEBUG, "Cannot find custom configuration file tree"
-      << std::endl);
+    cmCTestOptionalLog(this, DEBUG,
+      "Cannot find custom configuration file tree" << std::endl, quiet);
     return 0;
     }
 
@@ -583,9 +588,10 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command)
         }
       if (tag.empty() || (0 != command) || this->Parts[PartStart])
         {
-        cmCTestLog(this, DEBUG, "TestModel: " << this->GetTestModelString()
-          << std::endl);
-        cmCTestLog(this, DEBUG, "TestModel: " << this->TestModel << std::endl);
+        cmCTestOptionalLog(this, DEBUG, "TestModel: " <<
+          this->GetTestModelString() << std::endl, quiet);
+        cmCTestOptionalLog(this, DEBUG, "TestModel: " <<
+          this->TestModel << std::endl, quiet);
         if ( this->TestModel == cmCTest::NIGHTLY )
           {
           lctime = this->GetNightlyTime(
@@ -609,8 +615,8 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command)
         ofs.close();
         if ( 0 == command )
           {
-          cmCTestLog(this, OUTPUT, "Create new tag: " << tag << " - "
-            << this->GetTestModelString() << std::endl);
+          cmCTestOptionalLog(this, OUTPUT, "Create new tag: " << tag << " - "
+            << this->GetTestModelString() << std::endl, quiet);
           }
         }
       }
@@ -630,8 +636,8 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command)
         return 0;
         }
 
-      cmCTestLog(this, OUTPUT, "  Use existing tag: " << tag << " - "
-        << this->GetTestModelString() << std::endl);
+      cmCTestOptionalLog(this, OUTPUT, "  Use existing tag: " << tag << " - "
+        << this->GetTestModelString() << std::endl, quiet);
       }
 
     this->CurrentTag = tag;
@@ -675,8 +681,8 @@ bool cmCTest::InitializeFromCommand(cmCTestStartCommand* command)
 
   if ( !fname.empty() )
     {
-    cmCTestLog(this, OUTPUT, "   Reading ctest configuration file: "
-      << fname << std::endl);
+    cmCTestOptionalLog(this, OUTPUT, "   Reading ctest configuration file: "
+      << fname << std::endl, command->ShouldBeQuiet());
     bool readit = mf->ReadListFile(mf->GetCurrentListFile(),
       fname.c_str() );
     if(!readit)
@@ -689,19 +695,20 @@ bool cmCTest::InitializeFromCommand(cmCTestStartCommand* command)
     }
   else
     {
-    cmCTestLog(this, WARNING,
+    cmCTestOptionalLog(this, WARNING,
       "Cannot locate CTest configuration: in BuildDirectory: "
-      << bld_dir_fname << std::endl);
-    cmCTestLog(this, WARNING,
+      << bld_dir_fname << std::endl, command->ShouldBeQuiet());
+    cmCTestOptionalLog(this, WARNING,
       "Cannot locate CTest configuration: in SourceDirectory: "
-      << src_dir_fname << std::endl);
+      << src_dir_fname << std::endl, command->ShouldBeQuiet());
     }
 
   this->SetCTestConfigurationFromCMakeVariable(mf, "NightlyStartTime",
-    "CTEST_NIGHTLY_START_TIME");
-  this->SetCTestConfigurationFromCMakeVariable(mf, "Site", "CTEST_SITE");
+    "CTEST_NIGHTLY_START_TIME", command->ShouldBeQuiet());
+  this->SetCTestConfigurationFromCMakeVariable(mf, "Site", "CTEST_SITE",
+    command->ShouldBeQuiet());
   this->SetCTestConfigurationFromCMakeVariable(mf, "BuildName",
-    "CTEST_BUILD_NAME");
+    "CTEST_BUILD_NAME", command->ShouldBeQuiet());
   const char* dartVersion = mf->GetDefinition("CTEST_DART_SERVER_VERSION");
   if ( dartVersion )
     {
@@ -720,8 +727,9 @@ bool cmCTest::InitializeFromCommand(cmCTestStartCommand* command)
     {
     return false;
     }
-  cmCTestLog(this, OUTPUT, "   Use " << this->GetTestModelString()
-    << " tag: " << this->GetCurrentTag() << std::endl);
+  cmCTestOptionalLog(this, OUTPUT, "   Use " << this->GetTestModelString()
+    << " tag: " << this->GetCurrentTag() << std::endl,
+    command->ShouldBeQuiet());
   return true;
 }
 
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 59c6918..a9b8bf3 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -129,6 +129,7 @@ add_RunCMake_test(build_command)
 add_RunCMake_test(export)
 add_RunCMake_test(cmake_minimum_required)
 add_RunCMake_test(continue)
+add_RunCMake_test(ctest_start)
 add_RunCMake_test(ctest_submit)
 add_RunCMake_test(file)
 add_RunCMake_test(find_library)
diff --git a/Tests/RunCMake/ctest_start/CMakeLists.txt.in b/Tests/RunCMake/ctest_start/CMakeLists.txt.in
new file mode 100644
index 0000000..913239c
--- /dev/null
+++ b/Tests/RunCMake/ctest_start/CMakeLists.txt.in
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1)
+project(CTestStart at CASE_NAME@ NONE)
+include(CTest)
+add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
diff --git a/Tests/RunCMake/ctest_start/CTestConfig.cmake.in b/Tests/RunCMake/ctest_start/CTestConfig.cmake.in
new file mode 100644
index 0000000..e75d14f
--- /dev/null
+++ b/Tests/RunCMake/ctest_start/CTestConfig.cmake.in
@@ -0,0 +1 @@
+set(CTEST_PROJECT_NAME "CTestStart at CASE_NAME@")
diff --git a/Tests/RunCMake/ctest_start/RunCMakeTest.cmake b/Tests/RunCMake/ctest_start/RunCMakeTest.cmake
new file mode 100644
index 0000000..f765a0f
--- /dev/null
+++ b/Tests/RunCMake/ctest_start/RunCMakeTest.cmake
@@ -0,0 +1,10 @@
+include(RunCTest)
+
+set(CASE_CTEST_START_ARGS "")
+
+function(run_ctest_start CASE_NAME)
+  set(CASE_CTEST_START_ARGS "${ARGN}")
+  run_ctest(${CASE_NAME})
+endfunction()
+
+run_ctest_start(StartQuiet Experimental QUIET)
diff --git a/Tests/RunCMake/ctest_start/StartQuiet-stdout.txt b/Tests/RunCMake/ctest_start/StartQuiet-stdout.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/ctest_start/StartQuiet-stdout.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/ctest_start/test.cmake.in b/Tests/RunCMake/ctest_start/test.cmake.in
new file mode 100644
index 0000000..21e3fad
--- /dev/null
+++ b/Tests/RunCMake/ctest_start/test.cmake.in
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.1)
+
+set(CTEST_SITE                          "test-site")
+set(CTEST_BUILD_NAME                    "test-build-name")
+set(CTEST_SOURCE_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME@")
+set(CTEST_BINARY_DIRECTORY              "@RunCMake_BINARY_DIR@/@CASE_NAME at -build")
+set(CTEST_CMAKE_GENERATOR               "@RunCMake_GENERATOR@")
+set(CTEST_CMAKE_GENERATOR_PLATFORM      "@RunCMake_GENERATOR_PLATFORM@")
+set(CTEST_CMAKE_GENERATOR_TOOLSET       "@RunCMake_GENERATOR_TOOLSET@")
+set(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
+
+set(ctest_start_args "@CASE_CTEST_START_ARGS@")
+ctest_start(${ctest_start_args})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1643b905e02473536d60ef4102d3154a6c8816d1
commit 1643b905e02473536d60ef4102d3154a6c8816d1
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Mon Feb 16 16:02:14 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:01:58 2015 -0500

    ctest_submit: Add QUIET option
    
    Specifying this option prevents CTest from printing any non-error
    messages to the console for this call to ctest_submit().

diff --git a/Help/command/ctest_submit.rst b/Help/command/ctest_submit.rst
index 2b83ed9..6fa1191 100644
--- a/Help/command/ctest_submit.rst
+++ b/Help/command/ctest_submit.rst
@@ -9,6 +9,7 @@ Submit results to a dashboard server.
                [RETRY_COUNT count]
                [RETRY_DELAY delay]
                [RETURN_VALUE res]
+               [QUIET]
                )
 
 By default all available parts are submitted if no PARTS or FILES are
@@ -38,6 +39,9 @@ timed-out submission before attempting to re-submit.
 The RETRY_COUNT option specifies how many times to retry a timed-out
 submission.
 
+The QUIET option suppresses all non-error messages that would have
+otherwise been printed by this call to ctest_submit().
+
 Submit to CDash Upload API
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx
index 13c8ca5..81eb0a8 100644
--- a/Source/CTest/cmCTestGenericHandler.cxx
+++ b/Source/CTest/cmCTestGenericHandler.cxx
@@ -22,6 +22,7 @@ cmCTestGenericHandler::cmCTestGenericHandler()
   this->CTest = 0;
   this->SubmitIndex = 0;
   this->AppendXML = false;
+  this->Quiet = false;
 }
 
 //----------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h
index 2788cba..8567dd7 100644
--- a/Source/CTest/cmCTestGenericHandler.h
+++ b/Source/CTest/cmCTestGenericHandler.h
@@ -87,6 +87,8 @@ public:
   int GetSubmitIndex() { return this->SubmitIndex; }
 
   void SetAppendXML(bool b) { this->AppendXML = b; }
+  void SetQuiet(bool b) { this->Quiet = b; }
+  bool GetQuiet() { return this->Quiet; }
 
 protected:
   bool StartResultingXML(cmCTest::Part part,
@@ -94,6 +96,7 @@ protected:
   bool StartLogFile(const char* name, cmGeneratedFileStream& xofs);
 
   bool AppendXML;
+  bool Quiet;
   cmSystemTools::OutputOption HandlerVerbose;
   cmCTest *CTest;
   t_StringToString Options;
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index b886777..3003e8a 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -29,6 +29,7 @@ cmCTestHandlerCommand::cmCTestHandlerCommand()
   this->Arguments[ct_SUBMIT_INDEX] = "SUBMIT_INDEX";
   this->Last = ct_LAST;
   this->AppendXML = false;
+  this->Quiet = false;
 }
 
 bool cmCTestHandlerCommand
@@ -74,7 +75,7 @@ bool cmCTestHandlerCommand
     {
     this->CTest->SetCTestConfiguration("BuildDirectory",
       cmSystemTools::CollapseFullPath(
-        this->Values[ct_BUILD]).c_str());
+        this->Values[ct_BUILD]).c_str(), this->Quiet);
     }
   else
     {
@@ -84,7 +85,7 @@ bool cmCTestHandlerCommand
       {
       this->
         CTest->SetCTestConfiguration("BuildDirectory",
-          cmSystemTools::CollapseFullPath(bdir).c_str());
+          cmSystemTools::CollapseFullPath(bdir).c_str(), this->Quiet);
       }
     else
       {
@@ -98,13 +99,14 @@ bool cmCTestHandlerCommand
       "Set source directory to: " << this->Values[ct_SOURCE] << std::endl);
     this->CTest->SetCTestConfiguration("SourceDirectory",
       cmSystemTools::CollapseFullPath(
-        this->Values[ct_SOURCE]).c_str());
+        this->Values[ct_SOURCE]).c_str(), this->Quiet);
     }
   else
     {
     this->CTest->SetCTestConfiguration("SourceDirectory",
       cmSystemTools::CollapseFullPath(
-        this->Makefile->GetSafeDefinition("CTEST_SOURCE_DIRECTORY")).c_str());
+        this->Makefile->GetSafeDefinition("CTEST_SOURCE_DIRECTORY")).c_str(),
+      this->Quiet);
     }
 
   cmCTestLog(this->CTest, DEBUG, "Initialize handler" << std::endl;);
@@ -160,6 +162,12 @@ bool cmCTestHandlerCommand::CheckArgumentKeyword(std::string const& arg)
     this->AppendXML = true;
     return true;
     }
+  if(arg == "QUIET")
+    {
+    this->ArgumentDoing = ArgumentDoingNone;
+    this->Quiet = true;
+    return true;
+    }
 
   // Check for a keyword in our argument/value table.
   for(unsigned int k=0; k < this->Arguments.size(); ++k)
diff --git a/Source/CTest/cmCTestHandlerCommand.h b/Source/CTest/cmCTestHandlerCommand.h
index 8ef2b80..87b2cd8 100644
--- a/Source/CTest/cmCTestHandlerCommand.h
+++ b/Source/CTest/cmCTestHandlerCommand.h
@@ -62,6 +62,7 @@ protected:
   unsigned int ArgumentIndex;
 
   bool AppendXML;
+  bool Quiet;
 
   std::string ReturnVariable;
   std::vector<const char*> Arguments;
diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx
index cc3514f..5a8090c 100644
--- a/Source/CTest/cmCTestSubmitCommand.cxx
+++ b/Source/CTest/cmCTestSubmitCommand.cxx
@@ -44,29 +44,33 @@ cmCTestGenericHandler* cmCTestSubmitCommand::InitializeHandler()
     // error: CDash requires CTEST_DROP_LOCATION definition
     // in CTestConfig.cmake
     }
-  this->CTest->SetCTestConfiguration("ProjectName", ctestProjectName);
-  this->CTest->SetCTestConfiguration("DropMethod", ctestDropMethod);
-  this->CTest->SetCTestConfiguration("DropSite", ctestDropSite);
-  this->CTest->SetCTestConfiguration("DropLocation", ctestDropLocation);
+  this->CTest->SetCTestConfiguration("ProjectName", ctestProjectName,
+    this->Quiet);
+  this->CTest->SetCTestConfiguration("DropMethod", ctestDropMethod,
+    this->Quiet);
+  this->CTest->SetCTestConfiguration("DropSite", ctestDropSite, this->Quiet);
+  this->CTest->SetCTestConfiguration("DropLocation", ctestDropLocation,
+    this->Quiet);
 
   this->CTest->SetCTestConfiguration("IsCDash",
-    ctestDropSiteCDash ? "TRUE" : "FALSE");
+    ctestDropSiteCDash ? "TRUE" : "FALSE", this->Quiet);
 
   // Only propagate TriggerSite for non-CDash projects:
   //
   if ( !ctestDropSiteCDash )
     {
-    this->CTest->SetCTestConfiguration("TriggerSite",  ctestTriggerSite);
+    this->CTest->SetCTestConfiguration("TriggerSite",  ctestTriggerSite,
+      this->Quiet);
     }
 
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "CurlOptions", "CTEST_CURL_OPTIONS");
+    "CurlOptions", "CTEST_CURL_OPTIONS", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "DropSiteUser", "CTEST_DROP_SITE_USER");
+    "DropSiteUser", "CTEST_DROP_SITE_USER", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "DropSitePassword", "CTEST_DROP_SITE_PASSWORD");
+    "DropSitePassword", "CTEST_DROP_SITE_PASSWORD", this->Quiet);
   this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
-    "ScpCommand", "CTEST_SCP_COMMAND");
+    "ScpCommand", "CTEST_SCP_COMMAND", this->Quiet);
 
   const char* notesFilesVariable
     = this->Makefile->GetDefinition("CTEST_NOTES_FILES");
@@ -145,6 +149,8 @@ cmCTestGenericHandler* cmCTestSubmitCommand::InitializeHandler()
   static_cast<cmCTestSubmitHandler*>(handler)->SetOption("InternalTest",
     this->InternalTest ? "ON" : "OFF");
 
+  handler->SetQuiet(this->Quiet);
+
   if (this->CDashUpload)
     {
     static_cast<cmCTestSubmitHandler*>(handler)->
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 5b52df7..d585863 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -242,9 +242,9 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
       ftpfile = cmsys::SystemTools::Fopen(local_file, "rb");
       *this->LogFile << "\tUpload file: " << local_file << " to "
           << upload_as << std::endl;
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   Upload file: "
-        << local_file << " to "
-        << upload_as << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        "   Upload file: " << local_file << " to " << upload_as << std::endl,
+        this->Quiet);
 
       ::curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
 
@@ -278,15 +278,15 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
 
       if (!chunk.empty())
         {
-        cmCTestLog(this->CTest, DEBUG, "CURL output: ["
+        cmCTestOptionalLog(this->CTest, DEBUG, "CURL output: ["
           << cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]"
-          << std::endl);
+          << std::endl, this->Quiet);
         }
       if (!chunkDebug.empty())
         {
-        cmCTestLog(this->CTest, DEBUG, "CURL debug output: ["
+        cmCTestOptionalLog(this->CTest, DEBUG, "CURL debug output: ["
           << cmCTestLogWrite(&*chunkDebug.begin(), chunkDebug.size()) << "]"
-          << std::endl);
+          << std::endl, this->Quiet);
         }
 
       fclose(ftpfile);
@@ -318,8 +318,8 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
         }
       // always cleanup
       ::curl_easy_cleanup(curl);
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Uploaded: " + local_file
-        << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+        "   Uploaded: " + local_file << std::endl, this->Quiet);
       }
     }
   ::curl_global_cleanup();
@@ -369,14 +369,14 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
       cmCurlSetCAInfo(curl);
       if(verifyPeerOff)
         {
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                   "  Set CURLOPT_SSL_VERIFYPEER to off\n");
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+                   "  Set CURLOPT_SSL_VERIFYPEER to off\n", this->Quiet);
         curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
         }
       if(verifyHostOff)
         {
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                   "  Set CURLOPT_SSL_VERIFYHOST to off\n");
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+                   "  Set CURLOPT_SSL_VERIFYHOST to off\n", this->Quiet);
         curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
         }
 
@@ -482,9 +482,9 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
       unsigned long filelen = cmSystemTools::FileLength(local_file);
 
       ftpfile = cmsys::SystemTools::Fopen(local_file, "rb");
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   Upload file: "
-        << local_file << " to "
-        << upload_as << " Size: " << filelen << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        "   Upload file: " << local_file << " to "
+        << upload_as << " Size: " << filelen << std::endl, this->Quiet);
 
       // specify target
       ::curl_easy_setopt(curl,CURLOPT_URL, upload_as.c_str());
@@ -529,16 +529,16 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
 
       if (!chunk.empty())
         {
-        cmCTestLog(this->CTest, DEBUG, "CURL output: ["
+        cmCTestOptionalLog(this->CTest, DEBUG, "CURL output: ["
           << cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]"
-          << std::endl);
+          << std::endl, this->Quiet);
         this->ParseResponse(chunk);
         }
       if (!chunkDebug.empty())
         {
-        cmCTestLog(this->CTest, DEBUG, "CURL debug output: ["
+        cmCTestOptionalLog(this->CTest, DEBUG, "CURL debug output: ["
           << cmCTestLogWrite(&*chunkDebug.begin(), chunkDebug.size()) << "]"
-          << std::endl);
+          << std::endl, this->Quiet);
         }
 
       // If curl failed for any reason, or checksum fails, wait and retry
@@ -557,8 +557,9 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
 
         for(int i = 0; i < count; i++)
           {
-          cmCTestLog(this->CTest, HANDLER_OUTPUT,
-            "   Submit failed, waiting " << delay << " seconds...\n");
+          cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+            "   Submit failed, waiting " << delay << " seconds...\n",
+            this->Quiet);
 
           double stop = cmSystemTools::GetTime() + delay;
           while(cmSystemTools::GetTime() < stop)
@@ -566,9 +567,9 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
             cmSystemTools::Delay(100);
             }
 
-          cmCTestLog(this->CTest, HANDLER_OUTPUT,
+          cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
             "   Retry submission: Attempt " << (i + 1) << " of "
-            << count << std::endl);
+            << count << std::endl, this->Quiet);
 
           ::fclose(ftpfile);
           ftpfile = cmsys::SystemTools::Fopen(local_file, "rb");
@@ -582,9 +583,9 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
 
           if (!chunk.empty())
             {
-            cmCTestLog(this->CTest, DEBUG, "CURL output: ["
+            cmCTestOptionalLog(this->CTest, DEBUG, "CURL output: ["
               << cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]"
-              << std::endl);
+              << std::endl, this->Quiet);
             this->ParseResponse(chunk);
             }
 
@@ -624,8 +625,8 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
         }
       // always cleanup
       ::curl_easy_cleanup(curl);
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Uploaded: " + local_file
-        << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+        "   Uploaded: " + local_file << std::endl, this->Quiet);
       }
     }
   ::curl_global_cleanup();
@@ -677,6 +678,7 @@ bool cmCTestSubmitHandler::TriggerUsingHTTP(
 {
   CURL *curl;
   char error_buffer[1024];
+
   /* In windows, this will init the winsock stuff */
   ::curl_global_init(CURL_GLOBAL_ALL);
 
@@ -756,8 +758,8 @@ bool cmCTestSubmitHandler::TriggerUsingHTTP(
         = url + ((url.find("?",0) == std::string::npos) ? "?" : "&")
         + "xmlfile=" + ofile;
       *this->LogFile << "Trigger url: " << turl << std::endl;
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   Trigger url: "
-        << turl << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        "   Trigger url: " << turl << std::endl, this->Quiet);
       curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
       curl_easy_setopt(curl, CURLOPT_URL, turl.c_str());
       if ( curl_easy_perform(curl) )
@@ -786,25 +788,26 @@ bool cmCTestSubmitHandler::TriggerUsingHTTP(
 
       if (!chunk.empty())
         {
-        cmCTestLog(this->CTest, DEBUG, "CURL output: ["
+        cmCTestOptionalLog(this->CTest, DEBUG, "CURL output: ["
           << cmCTestLogWrite(&*chunk.begin(), chunk.size()) << "]"
-          << std::endl);
+          << std::endl, this->Quiet);
         }
       if (!chunkDebug.empty())
         {
-        cmCTestLog(this->CTest, DEBUG, "CURL debug output: ["
+        cmCTestOptionalLog(this->CTest, DEBUG, "CURL debug output: ["
           << cmCTestLogWrite(&*chunkDebug.begin(), chunkDebug.size())
-          << "]" << std::endl);
+          << "]" << std::endl, this->Quiet);
         }
 
       // always cleanup
       ::curl_easy_cleanup(curl);
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, std::endl,
+        this->Quiet);
       }
     }
   ::curl_global_cleanup();
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Dart server triggered..."
-    << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Dart server triggered..."
+    << std::endl, this->Quiet);
   return true;
 }
 
@@ -821,6 +824,7 @@ bool cmCTestSubmitHandler::SubmitUsingSCP(
     {
     return 0;
     }
+
   std::vector<const char*> argv;
   argv.push_back(scp_command.c_str()); // Scp command
   argv.push_back(scp_command.c_str()); // Dummy string for file
@@ -845,9 +849,9 @@ bool cmCTestSubmitHandler::SubmitUsingSCP(
     argv[1] = lfname.c_str();
     std::string rfname = url + "/" + remoteprefix + *file;
     argv[2] = rfname.c_str();
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Execute \"" << argv[0]
-      << "\" \"" << argv[1] << "\" \""
-      << argv[2] << "\"" << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "Execute \"" << argv[0] << "\" \"" << argv[1] << "\" \""
+      << argv[2] << "\"" << std::endl, this->Quiet);
     *this->LogFile << "Execute \"" << argv[0] << "\" \"" << argv[1] << "\" \""
       << argv[2] << "\"" << std::endl;
 
@@ -858,8 +862,8 @@ bool cmCTestSubmitHandler::SubmitUsingSCP(
 
     while(cmsysProcess_WaitForData(cp, &data, &length, 0))
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-        cmCTestLogWrite(data, length));
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        cmCTestLogWrite(data, length), this->Quiet);
       }
 
     cmsysProcess_WaitForExit(cp, 0);
@@ -871,8 +875,8 @@ bool cmCTestSubmitHandler::SubmitUsingSCP(
       retVal = cmsysProcess_GetExitValue(cp);
       if ( retVal != 0 )
         {
-        cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "\tSCP returned: "
-          << retVal << std::endl);
+        cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+          "\tSCP returned: " << retVal << std::endl, this->Quiet);
         *this->LogFile << "\tSCP returned: " << retVal << std::endl;
         problems ++;
         }
@@ -927,6 +931,7 @@ bool cmCTestSubmitHandler::SubmitUsingCP(
                << "\tdestination: " << destination << std::endl);
     return 0;
     }
+
   cmCTest::SetOfStrings::const_iterator file;
   bool problems = false;
   for ( file = files.begin(); file != files.end(); ++file )
@@ -936,9 +941,9 @@ bool cmCTestSubmitHandler::SubmitUsingCP(
     lfname += "/" + *file;
     std::string rfname = destination + "/" + remoteprefix + *file;
     cmSystemTools::CopyFileAlways(lfname, rfname);
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   Copy file: "
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   Copy file: "
         << lfname << " to "
-        << rfname << std::endl);
+        << rfname << std::endl, this->Quiet);
     }
   std::string tagDoneFile = destination + "/" + remoteprefix + "DONE";
   cmSystemTools::Touch(tagDoneFile, true);
@@ -971,8 +976,9 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
   xmlrpc_env_init(&env);
 
   /* Call the famous server at UserLand. */
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Submitting to: "
-    << realURL.c_str() << " (" << remoteprefix.c_str() << ")" << std::endl);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Submitting to: "
+    << realURL.c_str() << " (" << remoteprefix.c_str() << ")" << std::endl,
+    this->Quiet);
   cmCTest::SetOfStrings::const_iterator file;
   for ( file = files.begin(); file != files.end(); ++file )
     {
@@ -983,8 +989,8 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       local_file = localprefix + "/" + *file;
       }
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Submit file: "
-      << local_file.c_str() << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Submit file: "
+      << local_file.c_str() << std::endl, this->Quiet);
     struct stat st;
     if ( ::stat(local_file.c_str(), &st) )
       {
@@ -1068,12 +1074,14 @@ void cmCTestSubmitHandler::ConstructCDashURL(std::string& dropMethod,
   if ( this->CTest->GetCTestConfiguration("DropSiteUser").size() > 0 )
     {
     url += this->CTest->GetCTestConfiguration("DropSiteUser");
-    cmCTestLog(this->CTest, HANDLER_OUTPUT,
-               this->CTest->GetCTestConfiguration("DropSiteUser").c_str());
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      this->CTest->GetCTestConfiguration("DropSiteUser").c_str(),
+      this->Quiet);
     if ( this->CTest->GetCTestConfiguration("DropSitePassword").size() > 0 )
       {
       url += ":" + this->CTest->GetCTestConfiguration("DropSitePassword");
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, ":******");
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, ":******",
+        this->Quiet);
       }
     url += "@";
     }
@@ -1147,8 +1155,8 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
       << "datafilesmd5[0]=" << md5sum << "&"
       << "type=" << curl.Escape(typeString);
   std::string fields = str.str();
-  cmCTestLog(this->CTest, DEBUG, "fields: " << fields << "\nurl:"
-             << url << "\nfile: " << file << "\n");
+  cmCTestOptionalLog(this->CTest, DEBUG, "fields: " << fields << "\nurl:"
+             << url << "\nfile: " << file << "\n", this->Quiet);
   std::string response;
   if(!curl.HttpRequest(url, fields, response))
     {
@@ -1156,8 +1164,8 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
                "Error in HttpRequest\n" << response);
     return -1;
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             "Request upload response: [" << response << "]\n");
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "Request upload response: [" << response << "]\n", this->Quiet);
   Json::Value json;
   Json::Reader reader;
   if(!reader.parse(response, json))
@@ -1179,9 +1187,9 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     int datares = json["datafilesmd5"][0].asInt();
     if(datares == 1)
       {
-      cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-                 "File already exists on CDash, skip upload "
-                 << file << "\n");
+      cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+        "File already exists on CDash, skip upload " << file << "\n",
+        this->Quiet);
       return 0;
       }
     }
@@ -1213,8 +1221,8 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
                << reader.getFormattedErrorMessages() << "\n");
     return -1;
     }
-  cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-             "Upload file response: [" << response << "]\n");
+  cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+    "Upload file response: [" << response << "]\n", this->Quiet );
   return 0;
 }
 
@@ -1311,13 +1319,13 @@ int cmCTestSubmitHandler::ProcessHandler()
 
   if (!this->HTTPProxy.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Use HTTP Proxy: "
-      << this->HTTPProxy << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Use HTTP Proxy: "
+      << this->HTTPProxy << std::endl, this->Quiet);
     }
   if (!this->FTPProxy.empty())
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Use FTP Proxy: "
-      << this->FTPProxy << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Use FTP Proxy: "
+      << this->FTPProxy << std::endl, this->Quiet);
     }
   cmGeneratedFileStream ofs;
   this->StartLogFile("Submit", ofs);
@@ -1349,16 +1357,16 @@ int cmCTestSubmitHandler::ProcessHandler()
       = buildDirectory + "/Testing/" + this->CTest->GetCurrentTag();
     std::string::size_type glen = gpath.size() + 1;
     gpath = gpath + "/CoverageLog*";
-    cmCTestLog(this->CTest, DEBUG, "Globbing for: " << gpath
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, DEBUG, "Globbing for: " << gpath
+      << std::endl, this->Quiet);
     if ( cmSystemTools::SimpleGlob(gpath, gfiles, 1) )
       {
       size_t cc;
       for ( cc = 0; cc < gfiles.size(); cc ++ )
         {
         gfiles[cc] = gfiles[cc].substr(glen);
-        cmCTestLog(this->CTest, DEBUG, "Glob file: " << gfiles[cc]
-          << std::endl);
+        cmCTestOptionalLog(this->CTest, DEBUG, "Glob file: " << gfiles[cc]
+          << std::endl, this->Quiet);
         this->CTest->AddSubmitFile(cmCTest::PartCoverage, gfiles[cc].c_str());
         }
       }
@@ -1398,14 +1406,14 @@ int cmCTestSubmitHandler::ProcessHandler()
       cnt ++;
       }
     }
-  cmCTestLog(this->CTest, HANDLER_OUTPUT, "Submit files (using "
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "Submit files (using "
     << this->CTest->GetCTestConfiguration("DropMethod") << ")"
-    << std::endl);
+    << std::endl, this->Quiet);
   const char* specificTrack = this->CTest->GetSpecificTrack();
   if ( specificTrack )
     {
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Send to track: "
-      << specificTrack << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Send to track: "
+      << specificTrack << std::endl, this->Quiet);
     }
   this->SetLogFile(&ofs);
 
@@ -1414,9 +1422,9 @@ int cmCTestSubmitHandler::ProcessHandler()
   if ( dropMethod == "" || dropMethod == "ftp" )
     {
     ofs << "Using drop method: FTP" << std::endl;
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Using FTP submit method"
-      << std::endl
-      << "   Drop site: ftp://");
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "   Using FTP submit method" << std::endl << "   Drop site: ftp://",
+      this->Quiet);
     std::string url = "ftp://";
     url += cmCTest::MakeURLSafe(
       this->CTest->GetCTestConfiguration("DropSiteUser")) + ":" +
@@ -1427,18 +1435,20 @@ int cmCTestSubmitHandler::ProcessHandler()
         this->CTest->GetCTestConfiguration("DropLocation"));
     if (!this->CTest->GetCTestConfiguration("DropSiteUser").empty())
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT,
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
         this->CTest->GetCTestConfiguration(
-          "DropSiteUser").c_str());
+          "DropSiteUser").c_str(), this->Quiet);
       if (!this->CTest->GetCTestConfiguration("DropSitePassword").empty())
         {
-        cmCTestLog(this->CTest, HANDLER_OUTPUT, ":******");
+        cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, ":******",
+          this->Quiet);
         }
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "@");
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "@", this->Quiet);
       }
-    cmCTestLog(this->CTest, HANDLER_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
       this->CTest->GetCTestConfiguration("DropSite")
-      << this->CTest->GetCTestConfiguration("DropLocation") << std::endl);
+      << this->CTest->GetCTestConfiguration("DropLocation") << std::endl,
+      this->Quiet);
     if ( !this->SubmitUsingFTP(buildDirectory + "/Testing/"
         + this->CTest->GetCurrentTag(),
         files, prefix, url) )
@@ -1451,11 +1461,12 @@ int cmCTestSubmitHandler::ProcessHandler()
       }
     if(!this->CDash)
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Using HTTP trigger method"
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+                 "   Using HTTP trigger method"
                  << std::endl
                  << "   Trigger site: "
                  << this->CTest->GetCTestConfiguration("TriggerSite")
-                 << std::endl);
+                 << std::endl, this->Quiet);
       if ( !this->
            TriggerUsingHTTP(files, prefix,
                             this->CTest->GetCTestConfiguration("TriggerSite")))
@@ -1465,8 +1476,8 @@ int cmCTestSubmitHandler::ProcessHandler()
         ofs << "   Problems when triggering via HTTP" << std::endl;
         return -1;
         }
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
-                 << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+        "   Submission successful" << std::endl, this->Quiet);
       ofs << "   Submission successful" << std::endl;
       return 0;
       }
@@ -1476,27 +1487,30 @@ int cmCTestSubmitHandler::ProcessHandler()
     std::string url = dropMethod;
     url += "://";
     ofs << "Using drop method: " << dropMethod << std::endl;
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Using HTTP submit method"
-      << std::endl
-      << "   Drop site:" << url);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "   Using HTTP submit method" << std::endl << "   Drop site:" << url,
+      this->Quiet);
      if (!this->CTest->GetCTestConfiguration("DropSiteUser").empty())
       {
       url += this->CTest->GetCTestConfiguration("DropSiteUser");
-      cmCTestLog(this->CTest, HANDLER_OUTPUT,
-        this->CTest->GetCTestConfiguration("DropSiteUser").c_str());
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+        this->CTest->GetCTestConfiguration("DropSiteUser").c_str(),
+        this->Quiet);
       if (!this->CTest->GetCTestConfiguration("DropSitePassword").empty())
         {
         url += ":" + this->CTest->GetCTestConfiguration("DropSitePassword");
-        cmCTestLog(this->CTest, HANDLER_OUTPUT, ":******");
+        cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, ":******",
+          this->Quiet);
         }
       url += "@";
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "@");
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "@", this->Quiet);
       }
     url += this->CTest->GetCTestConfiguration("DropSite") +
       this->CTest->GetCTestConfiguration("DropLocation");
-    cmCTestLog(this->CTest, HANDLER_OUTPUT,
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
       this->CTest->GetCTestConfiguration("DropSite")
-      << this->CTest->GetCTestConfiguration("DropLocation") << std::endl);
+      << this->CTest->GetCTestConfiguration("DropLocation") << std::endl,
+      this->Quiet);
     if ( !this->SubmitUsingHTTP(buildDirectory + "/Testing/" +
         this->CTest->GetCurrentTag(), files, prefix, url) )
       {
@@ -1507,11 +1521,10 @@ int cmCTestSubmitHandler::ProcessHandler()
       }
     if(!this->CDash)
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Using HTTP trigger method"
-                 << std::endl
-                 << "   Trigger site: "
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+        "   Using HTTP trigger method" << std::endl << "   Trigger site: "
                  << this->CTest->GetCTestConfiguration("TriggerSite")
-                 << std::endl);
+                 << std::endl, this->Quiet);
       if ( !this->
            TriggerUsingHTTP(files, prefix,
                             this->CTest->GetCTestConfiguration("TriggerSite")))
@@ -1530,8 +1543,10 @@ int cmCTestSubmitHandler::ProcessHandler()
       }
     else
       {
-      cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Submission successful" <<
-        (this->HasWarnings ? ", with warnings." : "") << std::endl);
+      cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+        "   Submission successful" <<
+        (this->HasWarnings ? ", with warnings." : "") << std::endl,
+        this->Quiet);
       ofs << "   Submission successful" <<
         (this->HasWarnings ? ", with warnings." : "") << std::endl;
       }
@@ -1542,8 +1557,8 @@ int cmCTestSubmitHandler::ProcessHandler()
     {
 #if defined(CTEST_USE_XMLRPC)
     ofs << "Using drop method: XML-RPC" << std::endl;
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Using XML-RPC submit method"
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+      "   Using XML-RPC submit method" << std::endl, this->Quiet);
     std::string url = this->CTest->GetCTestConfiguration("DropSite");
     prefix = this->CTest->GetCTestConfiguration("DropLocation");
     if ( !this->SubmitUsingXMLRPC(buildDirectory + "/Testing/" +
@@ -1554,8 +1569,8 @@ int cmCTestSubmitHandler::ProcessHandler()
       ofs << "   Problems when submitting via XML-RPC" << std::endl;
       return -1;
       }
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
+      << std::endl, this->Quiet);
     ofs << "   Submission successful" << std::endl;
     return 0;
 #else
@@ -1593,8 +1608,8 @@ int cmCTestSubmitHandler::ProcessHandler()
       return -1;
       }
     cmSystemTools::ChangeDirectory(oldWorkingDirectory);
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
+      << std::endl, this->Quiet);
     ofs << "   Submission successful" << std::endl;
     return 0;
     }
@@ -1609,8 +1624,8 @@ int cmCTestSubmitHandler::ProcessHandler()
     std::string
       oldWorkingDirectory = cmSystemTools::GetCurrentWorkingDirectory();
     cmSystemTools::ChangeDirectory(buildDirectory);
-    cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "   Change directory: "
-               << buildDirectory << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+      "   Change directory: " << buildDirectory << std::endl, this->Quiet);
 
     if ( !this->SubmitUsingCP(
            "Testing/"+this->CTest->GetCurrentTag(),
@@ -1626,8 +1641,8 @@ int cmCTestSubmitHandler::ProcessHandler()
       return -1;
       }
     cmSystemTools::ChangeDirectory(oldWorkingDirectory);
-    cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
-      << std::endl);
+    cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
+      << std::endl, this->Quiet);
     ofs << "   Submission successful" << std::endl;
     return 0;
     }
diff --git a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-result.txt b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-result.txt
new file mode 100644
index 0000000..b57e2de
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-result.txt
@@ -0,0 +1 @@
+(-1|255)
diff --git a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
new file mode 100644
index 0000000..ec0a869
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
@@ -0,0 +1,4 @@
+ *Error when uploading file: .*/Configure.xml
+ *Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
+ *Problems when submitting via HTTP
+ *Error in read script: .*/Tests/RunCMake/ctest_submit/CDashSubmitQuiet/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stdout.txt b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stdout.txt
new file mode 100644
index 0000000..cd42c9a
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stdout.txt
@@ -0,0 +1,3 @@
+Configure project
+   Each . represents 1024 bytes of output
+    . Size of output: 0K$
diff --git a/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
index c004e97..a81bc96 100644
--- a/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
@@ -24,6 +24,7 @@ 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(CDashSubmitQuiet QUIET)
 
 function(run_ctest_CDashUploadFTP)
   set(CASE_DROP_METHOD ftp)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12db113944860269b72093424b17ad2f86bccf2f
commit 12db113944860269b72093424b17ad2f86bccf2f
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Mon Feb 16 15:24:55 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:01:58 2015 -0500

    CTest: Add cmCTestOptionalLog macro
    
    cmCTestOptionalLog takes a boolean argument that indicates
    whether or not the message should be suppressed.  Note that
    error messages will still be printed, even if suppression is
    requested.  This macro will allow us to provide more
    fine-grained control over what messages CTest prints to the
    console.

diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index f08b87c..9975802 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -2741,10 +2741,11 @@ void cmCTest::DetermineNextDayStop()
 }
 
 //----------------------------------------------------------------------
-void cmCTest::SetCTestConfiguration(const char *name, const char* value)
+void cmCTest::SetCTestConfiguration(const char *name, const char* value,
+                                    bool suppress)
 {
-  cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, "SetCTestConfiguration:"
-    << name << ":" << (value ? value : "(null)") << "\n");
+  cmCTestOptionalLog(this, HANDLER_VERBOSE_OUTPUT, "SetCTestConfiguration:"
+    << name << ":" << (value ? value : "(null)") << "\n", suppress);
 
   if ( !name )
     {
@@ -2858,7 +2859,7 @@ void cmCTest::SetConfigType(const char* ct)
 
 //----------------------------------------------------------------------
 bool cmCTest::SetCTestConfigurationFromCMakeVariable(cmMakefile* mf,
-  const char* dconfig, const std::string& cmake_var)
+  const char* dconfig, const std::string& cmake_var, bool suppress)
 {
   const char* ctvar;
   ctvar = mf->GetDefinition(cmake_var);
@@ -2866,10 +2867,10 @@ bool cmCTest::SetCTestConfigurationFromCMakeVariable(cmMakefile* mf,
     {
     return false;
     }
-  cmCTestLog(this, HANDLER_VERBOSE_OUTPUT,
-             "SetCTestConfigurationFromCMakeVariable:"
-             << dconfig << ":" << cmake_var << std::endl);
-  this->SetCTestConfiguration(dconfig, ctvar);
+  cmCTestOptionalLog(this, HANDLER_VERBOSE_OUTPUT,
+    "SetCTestConfigurationFromCMakeVariable:" << dconfig << ":" <<
+    cmake_var << std::endl, suppress);
+  this->SetCTestConfiguration(dconfig, ctvar, suppress);
   return true;
 }
 
@@ -3034,12 +3035,17 @@ void cmCTest::InitStreams()
   this->StreamErr = &std::cerr;
 }
 
-void cmCTest::Log(int logType, const char* file, int line, const char* msg)
+void cmCTest::Log(int logType, const char* file, int line, const char* msg,
+                  bool suppress)
 {
   if ( !msg || !*msg )
     {
     return;
     }
+  if ( suppress && logType != cmCTest::ERROR_MESSAGE )
+    {
+    return;
+    }
   if ( this->OutputLogFile )
     {
     bool display = true;
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index deb8896..88191c4 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -33,6 +33,14 @@ class cmCTestStartCommand;
                 cmCTestLog_msg.str().c_str());\
   } while ( 0 )
 
+#define cmCTestOptionalLog(ctSelf, logType, msg, suppress) \
+  do { \
+  std::ostringstream cmCTestLog_msg; \
+  cmCTestLog_msg << msg; \
+  (ctSelf)->Log(cmCTest::logType, __FILE__, __LINE__,\
+                cmCTestLog_msg.str().c_str(), suppress);\
+  } while ( 0 )
+
 #ifdef cerr
 #  undef cerr
 #endif
@@ -173,7 +181,8 @@ public:
   static int GetTestModelFromString(const char* str);
   static std::string CleanString(const std::string& str);
   std::string GetCTestConfiguration(const std::string& name);
-  void SetCTestConfiguration(const char *name, const char* value);
+  void SetCTestConfiguration(const char *name, const char* value,
+    bool suppress=false);
   void EmptyCTestConfiguration();
 
   /**
@@ -332,7 +341,7 @@ public:
    * Set the CTest variable from CMake variable
    */
   bool SetCTestConfigurationFromCMakeVariable(cmMakefile* mf,
-    const char* dconfig, const std::string& cmake_var);
+    const char* dconfig, const std::string& cmake_var, bool suppress=false);
 
   //! Make string safe to be send as an URL
   static std::string MakeURLSafe(const std::string&);
@@ -376,7 +385,8 @@ public:
   };
 
   //! Add log to the output
-  void Log(int logType, const char* file, int line, const char* msg);
+  void Log(int logType, const char* file, int line, const char* msg,
+           bool suppress=false);
 
   //! Get the version of dart server
   int GetDartVersion() { return this->DartVersion; }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2b9e7f7bc1b4e3a36e8b19fc9925b358b5c99e0
commit e2b9e7f7bc1b4e3a36e8b19fc9925b358b5c99e0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 09:16:41 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:01:58 2015 -0500

    Tests: Drop unnecessary stderr matching from RunCMake.ctest_memcheck
    
    The Dummy*-stderr.txt files were needed only to match platform-specific
    memcheck tooling output and verify that stderr is otherwise empty.  Now
    that the RunCMake infrastructure knows how to strip such lines before
    matching, we can simply drop these files and use the default empty
    string match.

diff --git a/Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt
deleted file mode 100644
index 14bc228..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyPurify-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^((^|
-)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
-]*)*$
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt
deleted file mode 100644
index 14bc228..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrind-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^((^|
-)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
-]*)*$
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt
deleted file mode 100644
index 14bc228..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindIgnoreMemcheck-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^((^|
-)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
-]*)*$
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt
deleted file mode 100644
index 14bc228..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindPrePost-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^((^|
-)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
-]*)*$
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt
deleted file mode 100644
index 14bc228..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindTwoTargets-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^((^|
-)(BullseyeCoverage|==|ctest\([0-9]+\) malloc:)[^
-]*)*$

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ce9f6e29ee143d2a63d55354c00d5ea50d6d0d1
commit 7ce9f6e29ee143d2a63d55354c00d5ea50d6d0d1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 09:12:47 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:01:58 2015 -0500

    Tests: Teach RunCMake to tolerate 'Error kstat returned' lines in test output
    
    When RunCMake tests run on Solaris, the output may contain unexpected
    lines of the form "Error kstat returned...".  These lines are printed by
    SystemInformationImplementation::RunProcess when called from
    SystemInformationImplementation::ParseValueFromKStat (see issue #12066).
    Until someone investigates why kstat returns values outside the range it
    documents, simply remove such lines from the actual output before
    matching it against the expected output.

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 3ad1bab..abac66e 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -83,7 +83,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:)[^\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]*\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})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69de0f7ea4163f350dd6683b6d7f47377157ae7d
commit 69de0f7ea4163f350dd6683b6d7f47377157ae7d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 09:05:22 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:01:57 2015 -0500

    Tests: Teach RunCMake to tolerate Guard Malloc lines in test output
    
    When RunCMake tests run under Xcode Guard Malloc, Guard Malloc may add
    lines of the form "<tool>(<pid>) malloc:..." to the output.  Remove such
    lines from the actual output before matching it against the expected
    output.

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index ffa1e2b..3ad1bab 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -83,7 +83,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)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}")
+    string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:)[^\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})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57f2aa7c37e3e4d09a43c6790772d11d5b63e9a6
commit 57f2aa7c37e3e4d09a43c6790772d11d5b63e9a6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 09:02:21 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:01:57 2015 -0500

    Tests: Teach RunCMake to tolerate BullseyeCoverage lines in test output
    
    When RunCMake tests run under dynamic analysis, Bullseye may add lines
    of the form "BullseyeCoverage..." to the output.  Remove such lines from the
    actual output before matching it against the expected output.

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 6389ef4..ffa1e2b 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -83,7 +83,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]+==[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}")
+    string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage)[^\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})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b04c8ec3f840a5cb34a97b2fe8417882b49b3820
commit b04c8ec3f840a5cb34a97b2fe8417882b49b3820
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 08:54:45 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 23 10:01:57 2015 -0500

    Tests: Match curl error in RunCMake.ctest_submit FailDrop-* cases
    
    Port the regexes over from the CTestTestFailedSubmit tests for ftp,
    http, and https.  No such match is needed for the other protocols.

diff --git a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
index 73df5c1..4345918 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
@@ -1,3 +1,3 @@
-Error message was: .*
+Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
    Problems when submitting via FTP
 Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-ftp/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
index c1a9126..9895181 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
@@ -1,3 +1,3 @@
-Error message was: .*
+Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
    Problems when submitting via HTTP
 Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-http/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
index 11db01a..a9c5d58 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
@@ -1,3 +1,3 @@
-Error message was: .*
+Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*|Protocol "https" not supported or disabled in .*|.* was built with SSL disabled.*)
    Problems when submitting via HTTP
 Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-https/test.cmake

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:05:18 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:05:18 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-664-g78ac317
Message-ID: <20150224140518.CCDFDAB0DC@public.kitware.com>

This is an automated email from 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  78ac31774a09ecc1b257694896fc0e37105d3772 (commit)
       via  04dc73712e197e6515d9044090cddccf8c86aa89 (commit)
      from  045eaf7e810d346b9a2ff0ac36515a0596ddaadd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78ac31774a09ecc1b257694896fc0e37105d3772
commit 78ac31774a09ecc1b257694896fc0e37105d3772
Merge: 045eaf7 04dc737
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:05:17 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 09:05:17 2015 -0500

    Merge topic 'doc-user-interaction' into next
    
    04dc7371 Revert topic 'doc-user-interaction'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=04dc73712e197e6515d9044090cddccf8c86aa89
commit 04dc73712e197e6515d9044090cddccf8c86aa89
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:04:57 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:04:57 2015 -0500

    Revert topic 'doc-user-interaction'
    
    It will be restored after revisions.

diff --git a/Help/index.rst b/Help/index.rst
index cfcf164..2d3f156 100644
--- a/Help/index.rst
+++ b/Help/index.rst
@@ -38,7 +38,6 @@ Reference Manuals
    /manual/cmake-properties.7
    /manual/cmake-qt.7
    /manual/cmake-toolchains.7
-   /manual/cmake-user-interaction.7
    /manual/cmake-variables.7
 
 .. only:: html or text
diff --git a/Help/manual/cmake-user-interaction.7.rst b/Help/manual/cmake-user-interaction.7.rst
deleted file mode 100644
index e50f4b3..0000000
--- a/Help/manual/cmake-user-interaction.7.rst
+++ /dev/null
@@ -1,655 +0,0 @@
-.. cmake-manual-description: CMake User Interaction Reference
-
-cmake-user-interaction(7)
-*************************
-
-.. only:: html
-
-   .. contents::
-
-Introduction
-============
-
-Where a software package supplies a CMake-based buildsystem with their
-software, the consumer of the software is required to run a CMake user
-interaction tool in order to build it.
-
-Well-behaved CMake-based buildsystems do not create any output in the source
-directory, so typically, the user performs an out-of-source build and
-performs the build there.  First, CMake must be instructed to generate a
-suitable buildsystem, then the user invokes a build tool to process that
-generated buildsystem.  The generated buildsystem is specific to the machine
-used to generate it and is not redistributable.  Each consumer of a provided
-software package is required to use CMake to generate a buildsystem specific
-to their system.
-
-Generated buildsystems should generally be treated as read-only. The CMake
-files as a primary artifact should completely specify the buildsystem and
-there should be no reason to populate properties manually in an IDE for
-example.
-
-The features and user interfaces described in this manual are available for
-all CMake-based build systems by virtue of providing CMake files.
-
-The CMake tooling may report errors to the user when processing provided
-CMake files, such as reporting that the compiler is not supported, or the
-compiler does not support a required compile option, or a dependency can
-not be found.  These errors must be resolved by the user by choosing a
-different compiler, installing dependencies, or instructing CMake where to
-find them, etc.
-
-Quick Start
------------
-
-The typical, portable way to build and install any CMake-based software on
-any supported platform is:
-
-.. code-block:: console
-
-  $ cd some_software-1.4.2
-  $ mkdir build
-  $ cd build
-  $ cmake .. -DCMAKE_INSTALL_PREFIX=/opt/the/prefix
-  $ cmake --build .
-  $ cmake --build . --target install
-
-Generating a Buildsystem
-========================
-
-There are several user interface tools which may be used to generate a
-buildsystem from CMake files.  The :manual:`ccmake(1)` and
-:manual:`cmake-gui(1)` tools guide the user through setting the various
-necessary options.  The :manual:`cmake(1)` tool can be invoked to specify
-options on the command line.  This manual describes options which may be
-set using any of the user interface tools, though the mode of setting an
-option is different for each tool.
-
-For simplicity, this manual only describes how to set options with
-the :manual:`cmake(1)` command line tool, and assumes the software package
-is free from bugs preventing typical CMake use.
-
-A simple but typical use of :manual:`cmake(1)` with a fresh copy of software
-source code is to create a build directory and invoke cmake there:
-
-.. code-block:: console
-
-  $ cd some_software-1.4.2
-  $ mkdir build
-  $ cd build
-  $ cmake ..
-
-It is recommended to build in a separate directory to the source because
-that keeps the source directory pristine, allows for building a single source
-with multiple toolchains, and allows easy clearing of build artifacts by
-simply deleting the build directory.
-
-The CMake tooling may report warnings which are intended for the provider
-of the software, not intended for the consumer of the software.  Such
-warnings end with "This warning is for project developers".  Users may
-disable such warnings by passing the ``-Wno-dev`` flag to :manual:`cmake(1)`.
-
-Note that spaces in the path to the source directory or build directory can
-cause problems if the provided software is not written to carefully quote
-each path it uses.  Such issues are usually easy to fix in the provided
-CMake files.
-
-Choosing a Generator
---------------------
-
-CMake chooses a generator by default based on the platform.  Usually, the
-default generator is sufficient to allow the user to proceed to build the
-software.
-
-The user may override the default generator with the ``-G`` option:
-
-.. code-block:: console
-
-  $ cmake .. -G Ninja
-
-The output of ``cmake --help`` includes a list of
-:manual:`generators <cmake-generators(7)>` available for the user to
-choose from.
-
-On Unix-like systems (including Mac OS X), the :generator:`Unix Makefiles`
-generator is used by default.  A variant of that generator can also be used
-on Windows in various environments, such as the :generator:`NMake Makefiles`
-and :generator:`MinGW Makefiles` generator.  These generators generate
-a ``Makefile`` variant which can be executed with ``make``, ``gmake``,
-``nmake`` or similar tools.  See the individual generator documentation for
-more information on targetted environments and tools.
-
-The :generator:`Ninja` generator is available on all major platforms.
-``ninja`` is a build tool similar in use-cases to ``make``, but with a
-focus on performance and efficiency.
-
-On Windows, :manual:`cmake(1)` can be used to generate solutions for the
-Visual Studio IDE from version 6 to the most recent version.
-:manual:`cmake(1)` must be invoked in a command line environment suitable
-for executing the compiler which is to be generated for by running the
-``vcvarsall.bat`` script, or launching the appropriate command line
-environment.
-
-Visual Studio versions may be specified by the product name of the IDE, which
-includes a four-digit year.  Aliases are provided for other means by which
-Visual Studio versions are sometimes referred to, such as two digits which
-correspond to the product version of the VisualC++ compiler, or a
-combination of the two:
-
-.. code-block:: console
-
-  $ cmake .. -G "Visual Studio 2013"
-  $ cmake .. -G "Visual Studio 12"
-  $ cmake .. -G "Visual Studio 12 2013"
-
-If building for a 64 bit environment, ``Win64`` must be appended to the
-generator name to generate correct files for the IDE:
-
-.. code-block:: console
-
-  $ cmake .. -G "Visual Studio 2013 Win64"
-  $ cmake .. -G "Visual Studio 12 Win64"
-  $ cmake .. -G "Visual Studio 12 2013 Win64"
-
-On Apple, the :generator:`Xcode` generator may be used to generate project
-files for the Xcode IDE.  The particular version of Xcode used is determined
-by the ``xcode-select`` platform tool and the ``DEVELOPER_DIR`` environment
-variable.
-
-Note that for all Xcode and Visual Studio generators, the toolchain related
-environment variables must be consistent between generating the buildsystem
-and executing it.  Executing the build in a different toolchain environment
-than it was generated in results in undefined behavior.
-
-CMake also ships some generators which generate a ``Makefile`` or ``Ninja``
-based buildsystem, but also generate an IDE project which executes it.  This
-allows use of Eclipse with the :generator:`Eclipse CDT4` generator for
-example, which allows semantic navigation through the software source files.
-
-Some IDEs such as KDevelop4, QtCreator and CLion have native support for
-CMake-based buildsystems.  Those IDEs provide user interface for selecting
-an underlying generator to use, typcially a choice between a ``Makefile``
-or a ``Ninja`` based generator.
-
-After the first run, :manual:`cmake(1)` may be executed with a path to the
-build directory instead of the source directory.  This is most useful if
-the build directory is not a subdirectory of the source directory as above,
-but in a different location.  Invoking :manual:`cmake(1)` directly after the
-first generation is needed only when setting additional options for the
-buildsystem generation:
-
-.. code-block:: console
-
-  $ cmake . -DBUILD_EXAMPLES=TRUE
-
-Note that it is not possible to change the generator with ``-G`` after the
-first invocation of CMake.  To change the generator, the build directory
-must be deleted and the build must be started from scratch.
-
-The CMake Cache
----------------
-
-When CMake is executed, it needs to find the locations of compilers, tools
-and dependencies.  It also needs to be able to consistently re-generate
-a buildsystem to use the same compile/link flags and paths to
-dependencies.  Such parameters are also required to be configurable by the
-user because they are paths and options specific to the users system.
-
-When it is first executed, CMake generates a cache file in the build
-directory containing key-value pairs for such artifacts.  The cache file
-can be viewed or edited by the user by running the :manual:`cmake-gui(1)`
-or :manual:`ccmake(1)` tool.  The tools provide an interactive interface for
-re-configuring the provided software and re-generating the buildsystem, as
-is needed after editing cached values.  Each cache entry may have an
-associated short help text which is displayed in the user interface tools.
-
-The cache entries may also have a type to signify how it should be
-presented in the user interface.  For example, a cache entry of
-type ``BOOL`` can be edited by a checkbox in a user interface, a
-``STRING`` can be edited in a text field, and a ``FILEPATH`` while similar
-to a ``STRING`` should also provide a way to locate filesystem paths using
-a file dialog.  An entry of type ``STRING`` may provide a restricted list of
-allowed values which are then provided in a drop-down menu in
-the :manual:`cmake-gui(1)` user interface (see the :prop_cache:`STRINGS`
-cache property).
-
-On the command line, the ``-D`` option to the :manual:`cmake(1)` tool is
-used to specify cache entries, and the ``-U`` option is used to clear
-them.  Cache entries may be populated on first run, or any time after
-the first run.
-
-The CMake files shipped with a software package may also define options
-using the :command:`option` command.  The command creates a cache entry
-which can has a type, help text and a default value.  Such cache entries
-are typically specific to the provided software and affect the configuration
-of the build, such as whether tests and examples are built, whether to build
-with exceptions enabled, which major version of Qt to prefer etc.
-
-There is no convention provided by CMake for how such variables are named
-between different provided buildsystems, except that variables with the
-prefix ``CMAKE_`` usually refer to options provided by CMake itself and
-should not be used in provider-specific options, which should use their
-own prefix instead.  The :manual:`cmake-gui(1)` tool can display options
-in groups defined by their prefix, so it makes sense for providers to
-ensure that they use a self-consistent prefix.
-
-The :manual:`cmake(1)` tool allows specifying a file to use to populate
-the initial cache using the ``-C`` option.  This can be useful to simplify
-commands and scripts which repeatedly require the same cache entries.
-
-Choosing a Toolchain
---------------------
-
-After determining the generator to use, CMake then attempts to determine the
-toolchain to use for the build.
-
-CMake generates buildsystem files for multiple languages, so it tries to
-find compilers for each language enabled by the :command:`project`
-command in the provided software.  As the ``C`` and ``CXX`` languages are
-enabled by default, most CMake-based buildsystems will look for compilers
-for those languages.
-
-CMake searches for well-known compilers in the ``PATH`` and in other
-typical locations.  Several compilers are searched for by default for
-a particular language, such as ``g++``, ``cl.exe``, ``clang++`` for the
-``CXX`` language.  When CMake is run,
-the :variable:`CMAKE_<LANG>_COMPILER` cache entry is populated with the
-compiler in use for each language.
-
-The default compiler may be overriden by specifing that cache value in one
-of the gui tools or on the command line.  This is typically specified when
-first run, along with the generator if overriding that too.  Either a full
-path to a compiler may be specified, or a basename may be specified, in
-which case CMake will search for it in the ``PATH``:
-
-.. code-block:: console
-
-  $ cmake .. -G "Ninja" \
-    -DCMAKE_C_COMPILER=/custom/built/clang \
-    -DCMAKE_CXX_COMPILER=/custom/built/clang++
-
-The initial value of the :variable:`CMAKE_<LANG>_COMPILER` for a particular
-language may also be specified by populating the environment variable
-corresponding to the language:
-
-.. code-block:: console
-
-  $ CXX=g++-4.8 cmake .. -G "Ninja"
-
-If the :variable:`CMAKE_<LANG>_COMPILER` variable for a particular language
-changed after the first invocation, CMake will re-run the compiler tests for
-the new toolchain.  Note that changing the environment variable and
-re-running CMake has no effect, so setting the
-:variable:`CMAKE_<LANG>_COMPILER` should be preferred.
-
-In the case of cross compiling provided software, it is usually required to
-specify the locations of compilers, the sysroot, custom compile flags and
-settings to affect behavior specific to cross-compiling.  Users can maintain
-a :variable:`toolchain file <CMAKE_TOOLCHAIN_FILE>` with specific paths to
-particular cross-compiling environments.  Such files are usually not
-distributable because they only contain content specific to a machine such as
-user paths in the filesystem.  For more see :ref:`Cross Compiling Toolchain`.
-
-For most generators, the compiler for each language is a primary
-customization point.  For Visual Studio however, the user does not generally
-specify the compilers to use, but may specify a particular toolset.  This
-can be used to specify a
-:ref:`cross compiling toolchain <Cross Compiling Toolchain>` or to specify
-the Windows port of the Clang toolchain for use with Visual Studio:
-
-.. code-block:: console
-
-  $ # Build with the clang-cl toolset
-  $ cmake.exe .. -G "Visual Studio 2013" -T LLVM-vs2013
-  $ # Build targetting Windows XP
-  $ cmake.exe .. -G "Visual Studio 2013" -T v120_xp
-
-The :variable:`CMAKE_GENERATOR_TOOLSET` may also be specified in
-a :variable:`toolchain file <CMAKE_TOOLCHAIN_FILE>` instead of as a
-CMake execution setting.
-
-If using Xcode build tools, the ``Makefile`` and ``Ninja`` generators
-determine the compilers to use when CMake is run.  Changing the
-``DEVELOPER_DIR`` environment variable, or using ``xcode-select``
-to select a different version of Xcode will not affect the toolchain
-used to build with those generators as the paths to the tools will be
-cached.  If using the :generator:`Xcode` generator, executing the build
-in a different toolchain environment than it was generated in results
-in undefined behavior.
-
-.. _`Choosing a Build Configuration`:
-
-Choosing a Build Configuration
-------------------------------
-
-Often software packages are intended to be built in at least two
-configurations: Debug and Release.  These configurations are defined by
-a small number of build flags, such as for generating debugging symbols,
-defining the ``NDEBUG`` macro or activating a particular optimization level.
-Some software also provides extra configurations defined in their CMake
-files such as a configuration for compiling in a mode for generating
-coverage statistics.
-
-The available configurations known to the provided buildsystem are listed
-in the :variable:`CMAKE_CONFIGURATION_TYPES` variable.
-
-The IDE generators, Visual Studio and Xcode, are multi-configuration
-generators.  The user does not specify the build configuration when
-invoking CMake to generate the project files.  The user instead generates
-project files capable of building all configurations listed in the
-:variable:`CMAKE_CONFIGURATION_TYPES` variable, and the then chooses
-a particular configuration to build afterward.  The IDEs themselves
-provide user interface for choosing the build configuration, and
-the :manual:`cmake(1)` tool
-:ref:`provides a mode <Specifying the Build Configuration>` to build a
-particular configuration on the command line.
-
-All other generators are for one particular configuration, determined by
-the :variable:`CMAKE_BUILD_TYPE` variable.  The user can set that variable
-in a gui tool or on the command line to choose a particular configuration
-to generate for:
-
-.. code-block:: console
-
-  $ cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Debug
-
-The build flags used for a particular configuration and compile language are
-specified by the ``CMAKE_<LANG>_FLAGS_<CONFIG>`` variables such
-as :variable:`CMAKE_CXX_FLAGS_DEBUG <CMAKE_<LANG>_FLAGS_DEBUG>`.
-
-Configuration names are always handled in a case-insensitive way by
-CMake.  That is, ``release``, ``RELEASE`` and ``Release`` are all acceptable
-ways of specifying the configuration.
-
-Customizing the Build
----------------------
-
-CMake files in a software package may provide high-level cache options for
-some build customization, such as with or without multi-threading support,
-enabling compiler warnings etc.  Where high-level interfaces are not
-provided, users may specify additional flags when invoking
-:manual:`cmake(1)`.
-
-The :variable:`CMAKE_<LANG>_FLAGS` variables such as ``CMAKE_CXX_FLAGS`` can
-be populated with a strings containing flags which will be passed to the
-compiler for the appropriate language:
-
-.. code-block:: console
-
-  $ cmake .. -DCMAKE_CXX_FLAGS="-Wall -Werror"
-
-For linker flag customization, variables specific to the type of target
-being linked are used:
-
-.. code-block:: console
-
-  $ cmake .. -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined"
-
-The initial values of the compiler and linker flags are populated with the
-content of the environment variables ``CFLAGS``, ``CXXFLAGS`` and
-``LDFLAGS``.  These environment variables are considered only on the first
-invocation of :manual:`cmake(1)` and are ignored if on subsequent
-invocations, so setting the appropriate variables should be preferred.
-
-Because build configurations are defined by variables with a naming
-convention, it is often possible to define the build configuration even if
-the CMake files do not explicitly provide it:
-
-.. code-block:: console
-
-  $ cmake .. -DCMAKE_BUILD_TYPE=Coverage \
-    -DCMAKE_CXX_FLAGS_COVERAGE="-fprofile-arcs -ftest-coverage" \
-    -DCMAKE_C_FLAGS_COVERAGE="-fprofile-arcs -ftest-coverage" \
-    -DCMAKE_EXE_LINKER_FLAGS_COVERAGE="-fprofile-arcs -ftest-coverage"
-
-Note that both the generic build property variables, such
-as ``CMAKE_CXX_FLAGS``, and the config-specific build property variables,
-such as ``CMAKE_CXX_FLAGS_RELEASE``, are used when invoking the compiler.
-The config-specifc variants are additions, not replacements.
-
-Finding Dependencies
---------------------
-
-CMake files provided with a software package contain instructions for
-finding each build dependency.  Some build dependencies are optional
-in that the build may succeed with a different feature set if the
-dependency is missing, and some dependencies are required.  CMake
-searches well-known locations for each dependency, and the provided
-software may supply additional hints or locations to CMake to find each
-dependency.
-
-If a required dependency is not found by :manual:`cmake(1)`, the cache is
-populated with an entry which contains a ``NOTFOUND`` value.  This value
-can be replaced by specifying it on the command line, or in
-the :manual:`ccmake(1)` or :manual:`cmake-gui(1)` tool.
-
-The cache entries which need to be populated depend on several factors
-relating to the dependency.  CMake-aware upstreams may
-provide :ref:`Config File Packages` which supply all required information
-about the package.  All packaged artifacts such as libraries and header
-files have their location specified in
-the :ref:`Config File Package <Config File Packages>`, so there is nothing
-more CMake is required to find.
-
-CMake searches certain well-known locations for :ref:`Config File Packages`,
-and end users can extend the locations searched by populating the
-:variable:`CMAKE_PREFIX_PATH` variable, or the environment variable
-of the same name.  For each particular package, CMake provides a cache
-entry matching the name ``<PACKAGE_NAME>_DIR``, which can be populated on
-the command line or using the :manual:`ccmake(1)` or :manual:`cmake-gui(1)`
-tool.  The :variable:`CMAKE_PREFIX_PATH` and ``<PACKAGE_NAME>_DIR`` are
-dis-similar in that the former is a prefix within which the ``Config.cmake``
-file is searched in several locations, whereas the ``<PACKAGE_NAME>_DIR``
-is a specific individual directory where the ``Config.cmake`` is expected
-to be found directly.
-
-Where dependencies are not CMake-aware, each of their artifacts may need
-to be found by specifying their path.  In some cases, this will involve
-specifying locations of multiple configurations, such as debug and
-release versions.  Some modules are written to find some artifacts
-relative to others, so for example specifying the location of ``qmake``
-is enough to define the location of the accompanying Qt4 libraries.  Some
-find scripts in use by a CMake buildsystem are
-:manual:`supplied by CMake <cmake-modules(7)>`, while others are
-maintained by the software being built.  Consult the documentation of the
-particular module for specific information.
-
-Invoking the Buildsystem
-========================
-
-After generating the buildsystem, the software can be built by invoking
-the particular build tool.  In the case of the IDE generators, this can
-involve loading the generated project file into the IDE to invoke the
-build.
-
-For all generators, it is possible to run the underlying build tool after
-invoking CMake.  For example, ``make`` may be executed after generating
-with the :generator:`Unix Makefiles` generator to invoke the build, or
-``ninja`` after generating with the :generator:`Ninja` generator etc.
-The IDE buildsystems usually provide command line tooling for building
-a project which can also be invoked.
-
-CMake is aware of the specific build tool needed to invoke a build so in
-general, to build a buildsystem or project from the command line after
-generating, the following command may be invoked in the build directory:
-
-.. code-block:: console
-
-  $ cmake --build .
-
-The ``--build`` flag enables a particular mode of operation for
-the :manual:`cmake(1)` tool.  It invokes the :variable:`CMAKE_MAKE_PROGRAM`
-command associated with the :manual:`generator <cmake-generators(7)>`, or
-the build tool configured by the user.
-
-The ``--build`` mode also accepts the parameter ``--target`` to specify a
-particular target to build, for example a particular library, executable or
-custom target, or a particular special target like ``install``.
-
-.. code-block:: console
-
-  $ cmake --build . --target myexe
-
-The ``--build`` mode can also pass particular command line options to the
-underlying build tool by listing them after ``--``.  This can be useful to
-specify options to the build tool, such as parallel jobs, where CMake does
-not provide a high-level user interface.
-
-Selecting a Target
-------------------
-
-Each executable and library described in the CMake files is a build
-target, and the provided package may describe custom targets, either for
-internal use, or for user consumption, for example to create documentation.
-
-CMake provides some built-in targets for all buildsystems providing CMake
-files.
-
-``all``
-  The default target used by ``Makefile`` and ``Ninja`` generators.  Builds
-  all targets in the buildsystem, except those which are excluded by
-  their :prop_tgt:`EXCLUDE_FROM_ALL` target property
-  or :prop_dir:`EXCLUDE_FROM_ALL` directory property.  The name ``ALL_BUILD``
-  is used for this purpose for the Xcode and Visual Studio generators.
-``help``
-  Lists the targets available for build.  This target is available when
-  using the :generator:`Unix Makefiles` or :generator:`Ninja` generator, and
-  the exact output is tool-specific.
-``clean``
-  Delete built object files and other output files.  The ``Makefile`` based
-  generators create a ``clean`` target per directory, so that an individual
-  directory can be cleaned.  The ``Ninja`` tool provides its own granular
-  ``-t clean`` system.
-``test``
-  Runs tests.  This target is only automatically available if the CMake
-  files provide CTest-based tests.
-``install``
-  Installs the software.  This target is only automatically available if
-  the software defines install rules with the :command:`install`
-  command.  See also `Software Installation`_.
-``package``
-  Creates a binary package.  This target is only automatically available
-  if the CMake files provide CPack-based packages.
-``package_source``
-  Creates a source package.  This target is only automatically available
-  if the CMake files provide CPack-based packages.
-
-For ``Makefile`` based systems, ``/fast`` variants of binary build targets
-are provided. The ``/fast`` variants are used to build the specified target
-without regard for its dependencies.  The dependencies are not checked and
-are not rebuilt if out of date.  The :generator:`Ninja` generator is
-sufficiently fast at dependency checking that such targets are not provided.
-
-``Makefile`` based systems also provide build-targets to preprocess,
-assemble and compile individual files in a particular directory.
-
-.. code-block:: console
-
-  $ make foo.cpp.i
-  $ make foo.cpp.s
-  $ make foo.cpp.o
-
-The file extension is built into the name of the target because another file
-with the same name but a different extension may exist.  However,
-build-targets without the file extension are also provided.
-
-.. code-block:: console
-
-  $ make foo.i
-  $ make foo.s
-  $ make foo.o
-
-In buildsystems which contain ``foo.c`` and ``foo.cpp``, building
-the ``foo.i`` target will preprocess both files.
-
-.. _`Specifying the Build Configuration`:
-
-Specifying a Build Configuration
---------------------------------
-
-The mode also accepts a ``--config`` parameter in the case of multi-config
-IDE projects to specify which particular configuration to build.
-
-.. code-block:: console
-
-  $ cmake --build . --target myexe --config Release
-
-The ``--config`` option has no effect if the generator generates a
-buildsystem specific to a configuration which is
-:ref:`chosen when invoking cmake <Choosing a Build Configuration>` with
-the :variable:`CMAKE_BUILD_TYPE` variable.
-
-Specifying a Build Program
---------------------------
-
-The program invoked by the ``--build`` mode is determined by the
-:variable:`CMAKE_MAKE_PROGRAM` variable.  For some generators, the
-particular program does not need to be configured.
-
-===================== =========================== ===========================
-      Generator           Default make program           Alternatives
-===================== =========================== ===========================
- XCode                 ``xcodebuild``
- Unix Makefiles        ``make``
- NMake Makefiles       ``nmake``                   ``jom``
- NMake Makefiles JOM   ``jom``                     ``nmake``
- MinGW Makefiles       ``mingw32-make``
- MSYS Makefiles        ``make``
- Ninja                 ``ninja``
- Visual Studio         ``msbuild``                ``devenv``
- Watcom WMake          ``wmake``
-===================== =========================== ===========================
-
-The ``jom`` tool is capable of reading makefiles of the ``NMake`` flavor
-and building in parallel, while the ``nmake`` tool always builds
-serially.  After generating with the :generator:`NMake Makefiles` generator
-a user can run ``jom`` instead of ``nmake``.  The ``--build`` mode would
-also use ``jom`` if the :variable:`CMAKE_MAKE_PROGRAM` was set to ``jom``
-while using the :generator:`NMake Makefiles` generator, and as a
-convenience, the :generator:`NMake Makefiles JOM` generator is provided
-to find ``jom`` in the normal way and use it as
-the :variable:`CMAKE_MAKE_PROGRAM`. For completeness, ``nmake`` is an
-alternative tool which can process the output of
-the :generator:`NMake Makefiles JOM` generator, but doing so would be a
-pessimisation.
-
-The Visual Studio generators use either ``msbuild`` or ``devenv`` by
-default, depending on the version and the enabled toolsets.
-
-Software Installation
-=====================
-
-The :variable:`CMAKE_INSTALL_PREFIX` variable can be set in the CMake cache
-to specify where to install the provided software.  If the provided
-software has install rules, specified using the :command:`install` command,
-they will install artifacts into that prefix.  On Windows, the default
-installation location corresponds to the ``ProgramFiles`` system directory
-which may be architecture specific.  On Unix hosts, ``/usr/local`` is the
-default installation location.
-
-The :variable:`CMAKE_INSTALL_PREFIX` variable always refers to the
-installation prefix on the target filesystem.  The CMake RPath-related
-features ensure that this is the string written into the installed binary,
-and the buildsystem might write it into the compiled binary in some cases.
-
-In cross-compiling or packaging scenarios where the sysroot is read-only
-or where the sysroot should otherwise remain pristine,
-the :variable:`CMAKE_STAGING_PREFIX` variable can be set to a location to
-actually install the files.
-
-The commands:
-
-.. code-block:: console
-
-  $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local \
-    -DCMAKE_SYSROOT=$HOME/root \
-    -DCMAKE_STAGING_PREFIX=/tmp/package
-  $ cmake --build .
-  $ cmake --build . --target install
-
-result in files being installed to paths such
-as ``/tmp/package/lib/libfoo.so`` on the host machine, with RPath
-information on the installed binaries prefixed at ``/usr/local``.  The
-``/usr/local`` location on the host machine is not affected.
-
-Some provided software may specify ``uninstall`` rules, but CMake does not
-generate such rules by default itself.

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

Summary of changes:
 Help/index.rst                           |    1 -
 Help/manual/cmake-user-interaction.7.rst |  655 ------------------------------
 2 files changed, 656 deletions(-)
 delete mode 100644 Help/manual/cmake-user-interaction.7.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:08:35 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:08:35 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-668-g38439c3
Message-ID: <20150224140835.5858DAB189@public.kitware.com>

This is an automated email from 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  38439c33a4250ef49129ec9d1978ff3fd0024cfb (commit)
       via  9d8847504ce1b5a02fce3393a4006e889f4abda0 (commit)
       via  00a04096bd16b596d441f837069724908e697c83 (commit)
       via  08d1e65a9ab89c6d23f6ace8d652dee278710586 (commit)
      from  78ac31774a09ecc1b257694896fc0e37105d3772 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38439c33a4250ef49129ec9d1978ff3fd0024cfb
commit 38439c33a4250ef49129ec9d1978ff3fd0024cfb
Merge: 78ac317 9d88475
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:08:34 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 09:08:34 2015 -0500

    Merge topic 'FindMatlab-rewrite' into next
    
    9d884750 Revert topic 'FindMatlab-rewrite'
    00a04096 Merge branch 'FindMatlab-remove-trailing-lines' into FindMatlab-rewrite
    08d1e65a FindMatlab: Remove trailing blank lines


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d8847504ce1b5a02fce3393a4006e889f4abda0
commit 9d8847504ce1b5a02fce3393a4006e889f4abda0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:05:53 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:08:12 2015 -0500

    Revert topic 'FindMatlab-rewrite'
    
    It will be restored after further revisions are received.

diff --git a/Help/release/dev/FindMatlab-rewrite.rst b/Help/release/dev/FindMatlab-rewrite.rst
deleted file mode 100644
index 07727b8..0000000
--- a/Help/release/dev/FindMatlab-rewrite.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-FindMatlab-rewrite
-------------------
-
-* The :module:`FindMatlab` module was completely rewritten.  It learned
-  about versions and components and to find Matlab in a more precise and
-  multiplatform way.  The module now offers APIs to create mex extensions,
-  documentation, and unit tests.
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 9686a76..73b3a5b 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -2,199 +2,20 @@
 # FindMatlab
 # ----------
 #
-# Finds Matlab installations and provides Matlab tools and libraries to cmake.
+# this module looks for Matlab
 #
-# This package first intention is to find the libraries associated with Matlab
-# in order to be able to build Matlab extensions (mex files). It can also be
-# used:
+# Defines:
 #
-# * run specific commands in Matlab
-# * declare Matlab unit test
-# * retrieve various information from Matlab (mex extensions, versions and
-#   release queries, ...)
+# ::
 #
-# The module supports the following components:
-#
-# * ``MX_LIBRARY`` and ``ENG_LIBRARY`` respectively the MX and ENG libraries of
-#   Matlab
-# * ``MAIN_PROGRAM`` the Matlab binary program.
-#
-# .. note::
-#
-#   The version given to the :command:`find_package` directive is the Matlab
-#   **version**, which should not be confused with the Matlab *release* name
-#   (eg. `R2014`).
-#   The :command:`matlab_get_version_from_release_name` and
-#   :command:`matlab_get_release_name_from_version` allow a mapping
-#   from the release name to the version.
-#
-# The variable :variable:`MATLAB_USER_ROOT` may be specified in order to give
-# the path of the desired Matlab version. Otherwise, the behaviour is platform
-# specific:
-#
-# * Windows: The installed versions of Matlab are retrieved from the
-#   Windows registry
-# * OS X: The installed versions of Matlab are given by the MATLAB
-#   paths in ``/Application``
-# * Unix: The desired Matlab should be accessible from the PATH.
-#
-# Additional information is provided when :variable:`MATLAB_FIND_DEBUG` is set.
-# When a Matlab binary is found automatically and the ``MATLAB_VERSION``
-# is not given, the version is queried from Matlab directly.
-# On Windows, it can make a window running Matlab appear.
-#
-# The mapping of the release names and the version of Matlab is performed by
-# defining pairs (name, version).  The variable
-# :variable:`MATLAB_ADDITIONAL_VERSIONS` may be provided before the call to
-# the :command:`find_package` in order to handle additional versions.
-#
-# A Matlab scripts can be added to the set of tests using the
-# :command:`matlab_add_unit_test`. By default, the Matlab unit test framework
-# will be used (>= 2013a) to run this script, but regular ``.m`` files
-# returning an exit code can be used as well (0 indicating a success).
-#
-# Module Input Variables
-# ----------------------
-#
-# Users or projects may set the following variables to configure the module
-# behaviour:
-#
-# :variable:`MATLAB_USER_ROOT`
-#   the root of the Matlab installation.
-# :variable:`MATLAB_FIND_DEBUG`
-#   outputs debug information
-# :variable:`MATLAB_ADDITIONAL_VERSIONS`
-#   additional versions of Matlab for the automatic retrieval of the installed
-#   versions.
-#
-# Variables defined by the module
-# -------------------------------
-#
-# Result variables
-# ^^^^^^^^^^^^^^^^
-#
-# ``Matlab_FOUND``
-#   ``TRUE`` if the Matlab installation is found, ``FALSE``
-#   otherwise. All variable below are defined if Matlab is found.
-# ``Matlab_ROOT_DIR``
-#   the root of the Matlab installation determined by the FindMatlab module.
-# ``Matlab_MAIN_PROGRAM``
-#   the Matlab binary program. Available only if the component ``MAIN_PROGRAM``
-#   is given in the :command:`find_package` directive.
-# ``Matlab_INCLUDE_DIRS``
-#  the path of the Matlab libraries headers
-# ``Matlab_MEX_LIBRARY``
-#   library for mex
-# ``Matlab_MX_LIBRARY``
-#   mx library of Matlab (arrays). Available only if the component
-#   ``MX_LIBRARY`` has been requested.
-# ``Matlab_ENG_LIBRARY``
-#   Matlab engine library. Available only if the component ``ENG_LIBRARY``
-#   is requested.
-# ``Matlab_LIBRARIES``
-#   the whole set of libraries of Matlab
-# ``Matlab_MEX_COMPILER``
-#   the mex compiler of Matlab. Currently not used.
-#   Available only if the component ``MEX_COMPILER`` is asked
-#
-# Cached variables
-# ^^^^^^^^^^^^^^^^
-#
-# ``Matlab_MEX_EXTENSION``
-#   the extension of the mex files for the current platform (given by Matlab).
-#
-# Provided macros
-# ---------------
-#
-# :command:`matlab_get_version_from_release_name`
-#   returns the version from the release name
-# :command:`matlab_get_release_name_from_version`
-#   returns the release name from the Matlab version
-#
-# Provided functions
-# ------------------
-#
-# :command:`matlab_add_mex`
-#   adds a target compiling a MEX file.
-# :command:`matlab_add_unit_test`
-#   adds a Matlab unit test file as a test to the project.
-# :command:`matlab_extract_all_installed_versions_from_registry`
-#   parses the registry for all Matlab versions. Available on Windows only.
-#   The part of the registry parsed is dependent on the host processor
-# :command:`matlab_get_all_valid_matlab_roots_from_registry`
-#   returns all the possible Matlab paths, according to a previously
-#   given list. Only the existing/accessible paths are kept. This is mainly
-#   useful for the searching all possible Matlab installation.
-# :command:`matlab_get_mex_suffix`
-#   returns the suffix to be used for the mex files
-#   (platform/architecture dependant)
-# :command:`matlab_get_version_from_matlab_run`
-#   returns the version of Matlab, given the full directory of the Matlab program.
-#
-#
-# Known issues
-# ------------
-#
-# **Symbol clash in a MEX target**
-#   By default, every symbols inside a MEX
-#   file defined with the command :command:`matlab_add_mex` have hidden
-#   visibility, except for the entry point. This is the default behaviour of
-#   the MEX compiler, which lowers the risk of symbol collision between the
-#   libraries shipped with Matlab, and the libraries to which the MEX file is
-#   linking to. This is also the default on Windows platforms.
-#
-#   However, this is not sufficient in certain case, where for instance your
-#   MEX file is linking against libraries that are already loaded by Matlab,
-#   even if those libraries have different SONAMES.
-#   A possible solution is to hide the symbols of the libraries to which the
-#   MEX target is linking to. This can be achieved in GNU GCC compilers with
-#   the linker option ``-Wl,--exclude-libs,ALL``.
-#
-# **Tests using GPU resources**
-#   in case your MEX file is using the GPU and
-#   in order to be able to run unit tests on this MEX file, the GPU resources
-#   should be properly released by Matlab. A possible solution is to make
-#   Matlab aware of the use of the GPU resources in the session, which can be
-#   performed by a command such as ``D = gpuDevice()`` at the beginning of
-#   the test script (or via a fixture).
-#
-#
-# Reference
-# --------------
-#
-# .. variable:: MATLAB_USER_ROOT
-#
-#    The root folder of the Matlab installation. This is set before the call to
-#    :command:`find_package`. If not set, then an automatic search of Matlab
-#    will be performed. If set, it should point to a valid version of Matlab.
-#
-# .. variable:: MATLAB_FIND_DEBUG
-#
-#    If set, the lookup of Matlab and the intermediate configuration steps are
-#    outputted to the console.
-#
-# .. variable:: MATLAB_ADDITIONAL_VERSIONS
-#
-#   If set, specifies additional versions of Matlab that may be looked for.
-#   This variable will be used if :variable:`MATLAB_USER_ROOT` is not set.
-#   The variable should be a list of strings, organised by pairs of release
-#   name and versions, such as follows::
-#
-#     set(MATLAB_ADDITIONAL_VERSIONS
-#         "release_name1=corresponding_version1"
-#         "release_name2=corresponding_version2"
-#         ...
-#         )
-#
-#   Example::
-#
-#     set(MATLAB_ADDITIONAL_VERSIONS
-#         "R2013b=8.2"
-#         "R2013a=8.1"
-#         "R2012b=8.0")
+#   MATLAB_INCLUDE_DIR: include path for mex.h, engine.h
+#   MATLAB_LIBRARIES:   required libraries: libmex, etc
+#   MATLAB_MEX_LIBRARY: path to libmex.lib
+#   MATLAB_MX_LIBRARY:  path to libmx.lib
+#   MATLAB_ENG_LIBRARY: path to libeng.lib
 
 #=============================================================================
-# Copyright 2014-2015 Raffi Enficiaud, Max Planck Society
+# Copyright 2005-2009 Kitware, Inc.
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -206,1184 +27,101 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-set(_FindMatlab_SELF_DIR "${CMAKE_CURRENT_LIST_DIR}")
-
-include(FindPackageHandleStandardArgs)
-include(CheckCXXCompilerFlag)
-
-
-# The currently supported versions. Other version can be added by the user by
-# providing MATLAB_ADDITIONAL_VERSIONS
-if(NOT MATLAB_ADDITIONAL_VERSIONS)
-  set(MATLAB_ADDITIONAL_VERSIONS)
-endif()
-
-set(MATLAB_VERSIONS_MAPPING
-  "R2014a=8.3"
-  "R2013b=8.2"
-  "R2013a=8.1"
-  "R2012b=8.0"
-  "R2012a=7.14"
-
-  "R2011b=7.13"
-  "R2011a=7.12"
-  "R2010b=7.11"
-
-  ${MATLAB_ADDITIONAL_VERSIONS}
-  )
-
-
-# temporary folder for all Matlab runs
-set(_matlab_temporary_folder ${CMAKE_BINARY_DIR}/Matlab)
-
-if(NOT EXISTS "${_matlab_temporary_folder}")
-  file(MAKE_DIRECTORY "${_matlab_temporary_folder}")
-endif()
-
-#.rst:
-# .. command:: matlab_get_version_from_release_name
-#
-#   Returns the version of Matlab (17.58) from a release name (R2017k)
-macro (matlab_get_version_from_release_name release_name version_name)
-
-  string(REGEX MATCHALL "${release_name}=([0-9]+\\.?[0-9]*)" _matched ${MATLAB_VERSIONS_MAPPING})
-
-  set(${version_name} "")
-  if(NOT _matched STREQUAL "")
-    set(${version_name} ${CMAKE_MATCH_1})
-  else()
-    message(WARNING "The release name ${release_name} is not registered")
-  endif()
-
-endmacro()
-
-
-
-
-
-#.rst:
-# .. command:: matlab_get_release_name_from_version
-#
-#   Returns the release name (R2017k) from the version of Matlab (17.58)
-macro (matlab_get_release_name_from_version version release_name)
-
-  set(${release_name} "")
-  foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
-    string(REGEX MATCHALL "(.+)=${version}" _matched ${_var})
-    if(NOT _matched STREQUAL "")
-      set(${release_name} ${CMAKE_MATCH_1})
-      break()
-    endif()
-  endforeach(_var)
-
-  unset(_var)
-  unset(_matched)
-  if(${release_name} STREQUAL "")
-    message(WARNING "The version ${version} is not registered")
-  endif()
-
-endmacro()
-
-
-
-
-
-# extracts all the supported release names (R2017k...) of Matlab
-# internal use
-macro(matlab_get_supported_releases list_releases)
-  set(${list_releases})
-  foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
-    string(REGEX MATCHALL "(.+)=([0-9]+\\.?[0-9]*)" _matched ${_var})
-    if(NOT _matched STREQUAL "")
-      list(APPEND ${list_releases} ${CMAKE_MATCH_1})
-    endif()
-    unset(_matched)
-    unset(CMAKE_MATCH_1)
-  endforeach(_var)
-  unset(_var)
-endmacro()
-
-
-
-# extracts all the supported versions of Matlab
-# internal use
-macro(matlab_get_supported_versions list_versions)
-  set(${list_versions})
-  foreach(_var IN LISTS MATLAB_VERSIONS_MAPPING)
-    string(REGEX MATCHALL "(.+)=([0-9]+\\.?[0-9]*)" _matched ${_var})
-    if(NOT _matched STREQUAL "")
-      list(APPEND ${list_versions} ${CMAKE_MATCH_2})
-    endif()
-    unset(_matched)
-    unset(CMAKE_MATCH_1)
-  endforeach(_var)
-  unset(_var)
-endmacro()
-
-
-#.rst:
-# .. command:: matlab_extract_all_installed_versions_from_registry
-#
-#   This function parses the registry and founds the Matlab versions that are
-#   installed. The found versions are returned in `matlab_versions`.
-#   Set `win64` to `TRUE` if the 64 bit version of Matlab should be looked for
-#   The returned list contains all versions under
-#   ``HKLM\\SOFTWARE\\Mathworks\\MATLAB`` or an empty list in case an error
-#   occurred (or nothing found).
-#
-#   .. note::
-#
-#     Only the versions are provided. No check is made over the existence of the
-#     installation referenced in the registry,
-#
-function(matlab_extract_all_installed_versions_from_registry win64 matlab_versions)
-
-  if(NOT CMAKE_HOST_WIN32)
-    message(FATAL_ERROR "This macro can only be called by a windows host (call to reg.exe")
-  endif()
-
-
-  if(${win64} AND ${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "64")
-    set(APPEND_REG "/reg:64")
+set(MATLAB_FOUND 0)
+if(WIN32)
+  if(${CMAKE_GENERATOR} MATCHES "Visual Studio 6")
+    set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/msvc60")
   else()
-    set(APPEND_REG "/reg:32")
-  endif()
-
-  # /reg:64 should be added on 64 bits capable OSs in order to enable the
-  # redirection of 64 bits applications
-  execute_process(
-    COMMAND reg query HKEY_LOCAL_MACHINE\\SOFTWARE\\Mathworks\\MATLAB /f * /k ${APPEND_REG}
-    RESULT_VARIABLE resultMatlab
-    OUTPUT_VARIABLE varMatlab
-    ERROR_VARIABLE errMatlab
-    )
-  #message("Matlabs = ${varMatlab} | ${resultMatlab}")
-
-
-  set(matlabs_from_registry)
-  if(${resultMatlab} EQUAL 0)
-
-    string(
-      REGEX MATCHALL "MATLAB\\\\([0-9]+(\\.[0-9]+)?)"
-      matlab_versions_regex ${varMatlab})
-
-    foreach(match IN LISTS matlab_versions_regex)
-      string(
-        REGEX MATCH "MATLAB\\\\(([0-9]+)(\\.([0-9]+))?)"
-        current_match ${match})
-
-      set(_matlab_current_version ${CMAKE_MATCH_1})
-      set(current_matlab_version_major ${CMAKE_MATCH_2})
-      set(current_matlab_version_minor ${CMAKE_MATCH_4})
-      if(NOT current_matlab_version_minor)
-        set(current_matlab_version_minor "0")
+    if(${CMAKE_GENERATOR} MATCHES "Visual Studio 7")
+      # Assume people are generally using 7.1,
+      # if using 7.0 need to link to: ../extern/lib/win32/microsoft/msvc70
+      set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/msvc71")
+    else()
+      if(${CMAKE_GENERATOR} MATCHES "Borland")
+        # Same here, there are also: bcc50 and bcc51 directories
+        set(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/bcc54")
+      else()
+        if(MATLAB_FIND_REQUIRED)
+          message(FATAL_ERROR "Generator not compatible: ${CMAKE_GENERATOR}")
+        endif()
       endif()
-
-      list(APPEND matlabs_from_registry ${_matlab_current_version})
-      unset(_matlab_current_version)
-    endforeach(match)
-
-  endif()
-
-  set(${matlab_versions} ${matlabs_from_registry} PARENT_SCOPE)
-
-endfunction()
-
-
-
-# (internal)
-macro(extract_matlab_versions_from_registry_brute_force matlab_versions)
-  # get the supported versions
-  set(matlab_supported_versions)
-  matlab_get_supported_versions(matlab_supported_versions)
-
-
-  # this is a manual population of the versions we want to look for
-  # this can be done as is, but preferably with the call to
-  # matlab_get_supported_versions and variable
-
-  # populating the versions we want to look for
-  # set(matlab_supported_versions)
-
-  # # Matlab 7
-  # set(matlab_major 7)
-  # foreach(current_matlab_minor RANGE 4 20)
-    # list(APPEND matlab_supported_versions "${matlab_major}.${current_matlab_minor}")
-  # endforeach(current_matlab_minor)
-
-  # # Matlab 8
-  # set(matlab_major 8)
-  # foreach(current_matlab_minor RANGE 0 5)
-    # list(APPEND matlab_supported_versions "${matlab_major}.${current_matlab_minor}")
-  # endforeach(current_matlab_minor)
-
-  # # taking into account the possible additional versions provided by the user
-  # if(DEFINED MATLAB_ADDITIONAL_VERSIONS)
-    # list(APPEND matlab_supported_versions MATLAB_ADDITIONAL_VERSIONS)
-  # endif()
-
-
-  # we order from more recent to older
-  list(REMOVE_DUPLICATES matlab_supported_versions)
-  list(SORT matlab_supported_versions)
-  list(REVERSE matlab_supported_versions)
-
-
-  set(${matlab_versions} ${matlab_supported_versions})
-
-
-endmacro()
-
-
-
-
-#.rst:
-# .. command:: matlab_get_all_valid_matlab_roots_from_registry
-#
-#   Populates the Matlab root with valid versions of Matlab.
-#   The returned matlab_roots is organized in pairs
-#   ``(version_number,matlab_root_path)``.
-#
-#   ::
-#
-#     matlab_get_all_valid_matlab_roots_from_registry(
-#         matlab_versions
-#         matlab_roots)
-#
-#   ``matlab_versions``
-#     the versions of each of the Matlab installations
-#   ``matlab_roots``
-#     the location of each of the Matlab installations
-function(matlab_get_all_valid_matlab_roots_from_registry matlab_versions matlab_roots)
-
-  # The matlab_versions comes either from
-  # extract_matlab_versions_from_registry_brute_force or
-  # matlab_extract_all_installed_versions_from_registry.
-
-
-  set(_matlab_roots_list )
-  foreach(_matlab_current_version ${matlab_versions})
-    get_filename_component(
-      current_MATLAB_ROOT
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\${_matlab_current_version};MATLABROOT]"
-      ABSOLUTE)
-
-    if(EXISTS ${current_MATLAB_ROOT})
-      list(APPEND _matlab_roots_list ${_matlab_current_version} ${current_MATLAB_ROOT})
-    endif()
-
-  endforeach(_matlab_current_version)
-  unset(_matlab_current_version)
-  set(${matlab_roots} ${_matlab_roots_list} PARENT_SCOPE)
-  unset(_matlab_roots_list)
-endfunction()
-
-#.rst:
-# .. command:: matlab_get_mex_suffix
-#
-#   Returns the extension of the mex files (the suffixes).
-#   This function should not be called before the appropriate Matlab root has
-#   been found.
-#
-#   ::
-#
-#     matlab_get_mex_suffix(
-#         matlab_root
-#         mex_suffix)
-#
-#   ``matlab_root``
-#     the root of the Matlab installation
-#   ``mex_suffix``
-#     the variable name in which the suffix will be returned.
-function(matlab_get_mex_suffix matlab_root mex_suffix)
-
-  # todo setup the extension properly. Currently I do not know if this is
-  # sufficient for all win32 distributions.
-  # there is also CMAKE_EXECUTABLE_SUFFIX that could be tweaked
-  set(mexext_suffix "")
-  if(WIN32)
-    list(APPEND mexext_suffix ".bat")
-  endif()
-
-  # we first try without suffix, since cmake does not understand a list with
-  # one empty string element
-  find_program(
-    MATLAB_MEXEXTENSIONS_PROG
-    NAMES mexext
-    PATHS ${matlab_root}/bin
-    DOC "Matlab MEX extension provider"
-    NO_DEFAULT_PATH
-  )
-
-  foreach(current_mexext_suffix IN LISTS mexext_suffix)
-    if(NOT DEFINED MATLAB_MEXEXTENSIONS_PROG OR NOT MATLAB_MEXEXTENSIONS_PROG)
-      # this call should populate the cache automatically
-      find_program(
-        MATLAB_MEXEXTENSIONS_PROG
-        "mexext${current_mexext_suffix}"
-        PATHS ${matlab_root}/bin
-        DOC "Matlab MEX extension provider"
-        NO_DEFAULT_PATH
-      )
-    endif()
-  endforeach(current_mexext_suffix)
-
-
-  # the program has been found?
-  if((NOT MATLAB_MEXEXTENSIONS_PROG) OR (NOT EXISTS ${MATLAB_MEXEXTENSIONS_PROG}))
-    if(MATLAB_FIND_DEBUG)
-      message(WARNING "[MATLAB] Cannot found mexext program. Matlab root is ${matlab_root}")
-    endif()
-    return()
-  endif()
-
-  set(_matlab_mex_extension)
-
-
-  execute_process(
-    COMMAND ${MATLAB_MEXEXTENSIONS_PROG}
-    OUTPUT_VARIABLE _matlab_mex_extension
-    ERROR_VARIABLE _matlab_mex_extension_error)
-  string(STRIP ${_matlab_mex_extension} _matlab_mex_extension)
-
-  set(${mex_suffix} ${_matlab_mex_extension} PARENT_SCOPE)
-endfunction()
-
-
-
-
-#.rst:
-# .. command:: matlab_get_version_from_matlab_run
-#
-#   This function runs Matlab program specified on arguments and extracts its
-#   version.
-#
-#   ::
-#
-#     matlab_get_version_from_matlab_run(
-#         matlab_binary_path
-#         matlab_list_versions)
-#
-#   ``matlab_binary_path``
-#     the location of the `matlab` binary executable
-#   ``matlab_list_versions``
-#     the version extracted from Matlab
-function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_versions)
-
-  set(${matlab_list_versions} "" PARENT_SCOPE)
-
-
-  if(MATLAB_FIND_DEBUG)
-    message(STATUS "[MATLAB] Determining the version of Matlab from ${matlab_binary_program}")
-  endif()
-
-  if(EXISTS "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp")
-    if(MATLAB_FIND_DEBUG)
-      message(STATUS "[MATLAB] Removing previous ${_matlab_temporary_folder}/matlabVersionLog.cmaketmp file")
     endif()
-    file(REMOVE "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp")
-  endif()
-
-
-  # the log file is needed since on windows the command executes in a new
-  # window and it is not possible to get back the answer of Matlab
-  # the -wait command is needed on windows, otherwise the call returns
-  # immediately after the program launches itself.
-  if(WIN32)
-    set(_matlab_additional_commands "-wait")
   endif()
-
-  # timeout set to 30 seconds, in case it does not start
-  # note as said before OUTPUT_VARIABLE cannot be used in a platform
-  # independent manner however, not setting it would flush the output of Matlab
-  # in the current console (unix variant)
-  execute_process(
-    COMMAND "${matlab_binary_program}" -nosplash -nojvm ${_matlab_additional_commands} -logfile "matlabVersionLog.cmaketmp" -nodesktop -nodisplay -r "version, exit"
-    OUTPUT_VARIABLE _matlab_version_from_cmd_dummy
-    RESULT_VARIABLE _matlab_result_version_call
-    ERROR_VARIABLE _matlab_result_version_call_error
-    TIMEOUT 30
-    WORKING_DIRECTORY "${_matlab_temporary_folder}"
+  find_library(MATLAB_MEX_LIBRARY
+    libmex
+    ${MATLAB_ROOT}
     )
-
-
-  if(${_matlab_result_version_call})
-    if(MATLAB_FIND_DEBUG)
-      message(WARNING "[MATLAB] Unable to determine the version of Matlab. Matlab call returned with error ${_matlab_result_version_call}.")
-    endif()
-    return()
-  elseif(NOT EXISTS "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp")
-    if(MATLAB_FIND_DEBUG)
-      message(WARNING "[MATLAB] Unable to determine the version of Matlab. The log file does not exist.")
-    endif()
-    return()
-  endif()
-
-  # if successful, read back the log
-  file(READ "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp" _matlab_version_from_cmd)
-  file(REMOVE "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp")
-
-  set(index -1)
-  string(FIND ${_matlab_version_from_cmd} "ans" index)
-  if(index EQUAL -1)
-
-    if(MATLAB_FIND_DEBUG)
-      message(WARNING "[MATLAB] Cannot find the version of Matlab returned by the run.")
-    endif()
-
-  else()
-    set(matlab_list_of_all_versions_tmp)
-
-    string(SUBSTRING ${_matlab_version_from_cmd} ${index} -1 substring_ans)
-    string(
-      REGEX MATCHALL "ans[\r\n\t ]*=[\r\n\t ]*([0-9]+(\\.[0-9]+)?)"
-      matlab_versions_regex
-      ${substring_ans})
-    foreach(match IN LISTS matlab_versions_regex)
-      string(
-        REGEX MATCH "ans[\r\n\t ]*=[\r\n\t ]*(([0-9]+)(\\.([0-9]+))?)"
-        current_match ${match})
-
-      list(APPEND matlab_list_of_all_versions_tmp ${CMAKE_MATCH_1})
-    endforeach()
-    list(REMOVE_DUPLICATES matlab_list_of_all_versions_tmp)
-    set(${matlab_list_versions} ${matlab_list_of_all_versions_tmp} PARENT_SCOPE)
-
-  endif()
-
-endfunction()
-
-
-#.rst:
-# .. command:: matlab_add_unit_test
-#
-#   Adds a Matlab unit test to the test set of cmake/ctest.
-#   This command requires the component ``MAIN_PROGRAM``.
-#   The unit test uses the Matlab unittest framework (default, available
-#   starting Matlab 2013b+) except if the option ``NO_UNITTEST_FRAMEWORK``
-#   is given.
-#
-#   The function expects one Matlab test script file to be given.
-#   In the case ``NO_UNITTEST_FRAMEWORK`` is given, the unittest script file
-#   should contain the script to be run, plus an exit command with the exit
-#   value. This exit value will be passed to the ctest framework (0 success,
-#   non 0 failure). Additional arguments accepted by :command:`add_test` can be
-#   passed through ``TEST_ARGS`` (eg. ``CONFIGURATION <config> ...``).
-#
-#   ::
-#
-#     matlab_add_unit_test(
-#         NAME <name>
-#         UNITTEST_FILE matlab_file_containing_unittest.m
-#         [UNITTEST_PRECOMMAND matlab_command_to_run]
-#         [TIMEOUT timeout]
-#         [ADDITIONAL_PATH path1 [path2 ...]]
-#         [MATLAB_ADDITIONAL_STARTUP_OPTIONS option1 [option2 ...]]
-#         [TEST_ARGS arg1 [arg2 ...]]
-#         [NO_UNITTEST_FRAMEWORK]
-#         )
-#
-#   The function arguments are:
-#
-#   ``NAME``
-#     name of the unittest in ctest.
-#   ``UNITTEST_FILE``
-#     the matlab unittest file. Its path will be automatically
-#     added to the Matlab path.
-#   ``UNITTEST_PRECOMMAND``
-#     Matlab script command to be ran before the file
-#     containing the test (eg. GPU device initialisation based on CMake
-#     variables).
-#   ``TIMEOUT``
-#     the test timeout in seconds. Defaults to 180 seconds as the
-#     Matlab unit test may hang.
-#   ``ADDITIONAL_PATH``
-#     a list of paths to add to the Matlab path prior to
-#     running the unit test.
-#   ``MATLAB_ADDITIONAL_STARTUP_OPTIONS``
-#     a list of additional option in order
-#     to run Matlab from the command line.
-#   ``TEST_ARGS``
-#     Additional options provided to the add_test command. These
-#     options are added to the default options (eg. "CONFIGURATIONS Release")
-#   ``NO_UNITTEST_FRAMEWORK``
-#     when set, indicates that the test should not
-#     use the unittest framework of Matlab (available for versions >= R2013a).
-#
-function(matlab_add_unit_test)
-
-  if(NOT Matlab_MAIN_PROGRAM)
-    message(FATAL_ERROR "[MATLAB] This functionality needs the MAIN_PROGRAM component (not default)")
-  endif()
-
-  set(options NO_UNITTEST_FRAMEWORK)
-  set(oneValueArgs NAME UNITTEST_PRECOMMAND UNITTEST_FILE TIMEOUT)
-  set(multiValueArgs ADDITIONAL_PATH MATLAB_ADDITIONAL_STARTUP_OPTIONS TEST_ARGS)
-
-  set(prefix _matlab_unittest_prefix)
-  cmake_parse_arguments(${prefix} "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-
-  if(NOT ${prefix}_NAME)
-    message(FATAL_ERROR "[MATLAB] The Matlab test name cannot be empty")
-  endif()
-
-  add_test(NAME ${${prefix}_NAME}
-           COMMAND ${CMAKE_COMMAND}
-            -Dtest_name=${${prefix}_NAME}
-            -Dadditional_paths=${${prefix}_ADDITIONAL_PATH}
-            -Dtest_timeout=${${prefix}_TIMEOUT}
-            -Doutput_directory=${_matlab_temporary_folder}
-            -DMatlab_PROGRAM=${Matlab_MAIN_PROGRAM}
-            -Dno_unittest_framework=${${prefix}_NO_UNITTEST_FRAMEWORK}
-            -DMatlab_ADDITIONNAL_STARTUP_OPTIONS=${${prefix}_MATLAB_ADDITIONAL_STARTUP_OPTIONS}
-            -Dunittest_file_to_run=${${prefix}_UNITTEST_FILE}
-            -Dcmd_to_run_before_test=${${prefix}_UNITTEST_PRECOMMAND}
-            -P ${_FindMatlab_SELF_DIR}/MatlabTestsRedirect.cmake
-           ${${prefix}_TEST_ARGS}
-           ${${prefix}_UNPARSED_ARGUMENTS}
-           )
-endfunction()
-
-
-#.rst:
-# .. command:: matlab_add_mex
-#
-#   Adds a Matlab MEX target.
-#   This commands compiles the given sources with the current tool-chain in
-#   order to produce a MEX file. The final name of the produced output may be
-#   specified, as well as additional link libraries, and a documentation entry
-#   for the MEX file. Remaining arguments of the call are passed to the
-#   :command:`add_library` command.
-#
-#   ::
-#
-#      matlab_add_mex(
-#          NAME <name>
-#          SRC src1 [src2 ...]
-#          [OUTPUT_NAME output_name]
-#          [DOCUMENTATION file.txt]
-#          [LINK_TO target1 target2 ...]
-#          [...]
-#      )
-#
-#   ``NAME``
-#     name of the target.
-#   ``SRC``
-#     list of tje source files.
-#   ``LINK_TO``
-#     a list of additional link dependencies.  The target links to ``libmex``
-#     by default. If ``Matlab_MX_LIBRARY`` is defined, it also
-#     links to ``libmx``.
-#   ``OUTPUT_NAME``
-#     if given, overrides the default name. The default name is
-#     the name of the target without any prefix and
-#     with ``Matlab_MEX_EXTENSION`` suffix.
-#   ``DOCUMENTATION``
-#     if given, the file ``file.txt`` will be considered as
-#     being the documentation file for the MEX file. This file is copied into
-#     the same folder without any processing, with the same name as the final
-#     mex file, and with extension `.m`. In that case, typing ``help <name>``
-#     in Matlab prints the documentation contained in this file.
-#
-#   The documentation file is not processed and should be in the following
-#   format:
-#
-#   ::
-#
-#     % This is the documentation
-#     function ret = mex_target_output_name(input1)
-#
-function(matlab_add_mex )
-
-  if(NOT WIN32)
-    # we do not need all this on Windows
-    # pthread options
-    check_cxx_compiler_flag(-pthread                    HAS_MINUS_PTHREAD)
-    # we should use try_compile instead, the link flags are discarded from
-    # this compiler_flag function.
-    #check_cxx_compiler_flag(-Wl,--exclude-libs,ALL HAS_SYMBOL_HIDING_CAPABILITY)
-
-  endif()
-
-  set(oneValueArgs NAME DOCUMENTATION OUTPUT_NAME)
-  set(multiValueArgs LINK_TO SRC)
-
-  set(prefix _matlab_addmex_prefix)
-  cmake_parse_arguments(${prefix} "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-
-  if(NOT ${prefix}_NAME)
-    message(FATAL_ERROR "[MATLAB] The MEX target name cannot be empty")
-  endif()
-
-  if(NOT ${prefix}_OUTPUT_NAME)
-    set(${prefix}_OUTPUT_NAME ${${prefix}_NAME})
-  endif()
-
-  add_library(${${prefix}_NAME}
-    SHARED
-      ${${prefix}_SRC}
-      ${${prefix}_DOCUMENTATION}
-      ${${prefix}_UNPARSED_ARGUMENTS})
-  target_include_directories(${${prefix}_NAME} PRIVATE ${Matlab_INCLUDE_DIRS})
-
-  if(DEFINED Matlab_MX_LIBRARY)
-    target_link_libraries(${${prefix}_NAME} ${Matlab_MX_LIBRARY})
-  endif()
-
-  target_link_libraries(${${prefix}_NAME} ${Matlab_MEX_LIBRARY} ${${prefix}_LINK_TO})
-  set_target_properties(${${prefix}_NAME}
-      PROPERTIES
-        PREFIX ""
-        OUTPUT_NAME ${${prefix}_OUTPUT_NAME}
-        SUFFIX ".${Matlab_MEX_EXTENSION}")
-
-
-  # documentation
-  if(NOT ${${prefix}_DOCUMENTATION} STREQUAL "")
-    get_target_property(output_name ${${prefix}_NAME} OUTPUT_NAME)
-    add_custom_command(
-      TARGET ${${prefix}_NAME}
-      PRE_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${${prefix}_DOCUMENTATION} $<TARGET_FILE_DIR:${${prefix}_NAME}>/${output_name}.m
-      COMMENT "Copy ${${prefix}_NAME} documentation file into the output folder"
+  find_library(MATLAB_MX_LIBRARY
+    libmx
+    ${MATLAB_ROOT}
     )
-  endif() # documentation
-
-  # entry point in the mex file + taking care of visibility and symbol clashes.
-  if(WIN32)
-    set_target_properties(${${prefix}_NAME}
-      PROPERTIES
-        DEFINE_SYMBOL "DLL_EXPORT_SYM=__declspec(dllexport)")
-  else()
-
-    if(HAS_MINUS_PTHREAD AND NOT APPLE)
-      # Apparently, compiling with -pthread generated the proper link flags
-      # and some defines at compilation
-      target_compile_options(${${prefix}_NAME} PRIVATE "-pthread")
-    endif()
-
-
-    # if we do not do that, the symbols linked from eg. boost remain weak and
-    # then clash with the ones defined in the matlab process. So by default
-    # the symbols are hidden.
-    # This also means that for shared libraries (like MEX), the entry point
-    # should be explicitly declared with default visibility, otherwise Matlab
-    # cannot find the entry point.
-    # Note that this is particularly meaningful if the MEX wrapper itself
-    # contains symbols that are clashing with Matlab (that are compiled in the
-    # MEX file). In order to propagate the visibility options to the libraries
-    # to which the MEX file is linked against, the -Wl,--exclude-libs,ALL
-    # option should also be specified.
-
-    set_target_properties(${${prefix}_NAME}
-      PROPERTIES
-        CXX_VISIBILITY_PRESET "hidden"
-        C_VISIBILITY_PRESET "hidden"
-        VISIBILITY_INLINES_HIDDEN "hidden"
+  find_library(MATLAB_ENG_LIBRARY
+    libeng
+    ${MATLAB_ROOT}
     )
 
-    #  get_target_property(
-    #    _previous_link_flags
-    #    ${${prefix}_NAME}
-    #    LINK_FLAGS)
-    #  if(NOT _previous_link_flags)
-    #    set(_previous_link_flags)
-    #  endif()
-
-    #  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    #    set_target_properties(${${prefix}_NAME}
-    #      PROPERTIES
-    #        LINK_FLAGS "${_previous_link_flags} -Wl,--exclude-libs,ALL"
-    #        # -Wl,--version-script=${_FindMatlab_SELF_DIR}/MatlabLinuxVisibility.map"
-    #    )
-    #  elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    #    # in this case, all other symbols become hidden.
-    #    set_target_properties(${${prefix}_NAME}
-    #      PROPERTIES
-    #        LINK_FLAGS "${_previous_link_flags} -Wl,-exported_symbol,_mexFunction"
-    #        #-Wl,-exported_symbols_list,${_FindMatlab_SELF_DIR}/MatlabOSXVisilibity.map"
-    #    )
-    #  endif()
-
-
-
-    set_target_properties(${${prefix}_NAME}
-      PROPERTIES
-        DEFINE_SYMBOL "DLL_EXPORT_SYM=__attribute__ ((visibility (\"default\")))"
+  find_path(MATLAB_INCLUDE_DIR
+    "mex.h"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/include"
     )
-
-
-  endif()
-
-endfunction()
-
-
-
-
-
-
-
-
-# this variable will get all Matlab installations found in the current system.
-set(_matlab_possible_roots)
-
-
-# listing the Matlab versions installed on the WIN machine if MATLAB_USER_ROOT
-# is not set
-if(WIN32)
-
-  # for windows
-
-
-  if(NOT MATLAB_USER_ROOT)
-    # if MATLAB_USER_ROOT not specified, we look for Matlab installation in
-    # the registry
-    # if unsuccessful, we look for all known revision and filter the existing
-    # ones.
-
-    # testing if we are able to extract the needed information from the registry
-    set(matlab_versions_from_registry)
-    matlab_extract_all_installed_versions_from_registry(CMAKE_CL_64 matlab_versions_from_registry)
-
-    # the returned list is empty, doing the search on all known versions
-    if(NOT matlab_versions_from_registry)
-
-      if(MATLAB_FIND_DEBUG)
-        message(STATUS "[MATLAB] Search for Matlab from the registry unsuccessful, testing all supported versions")
-      endif()
-
-      extract_matlab_versions_from_registry_brute_force(matlab_versions_from_registry)
-    endif()
-
-    # filtering the results with the registry keys
-    matlab_get_all_valid_matlab_roots_from_registry("${matlab_versions_from_registry}" _matlab_possible_roots)
-
-
-
-  elseif(NOT EXISTS ${MATLAB_USER_ROOT})
-
-    # if MATLAB_USER_ROOT specified but erroneous
-    if(MATLAB_FIND_DEBUG)
-      message(WARNING "[MATLAB] the specified path for MATLAB_USER_ROOT does not exist (${MATLAB_USER_ROOT})")
-    endif()
-  else()
-    list(APPEND _matlab_possible_roots "NOTFOUND" ${MATLAB_USER_ROOT}) # empty version
-  endif()
-
-
-else()
-  # for linux/osx
-
-  if(NOT MATLAB_USER_ROOT)
-
-    # if MATLAB_USER_ROOT not specified, we look for Matlab from the command
-    # line PATH
-    # maybe using CMAKE_PROGRAM_PATH to add some more hints
-
-    set(_matlab_main_tmp "")
-    if(Matlab_MAIN_PROGRAM)
-      set(_matlab_main_tmp ${Matlab_MAIN_PROGRAM})
-    endif()
-
-    if(NOT _matlab_main_tmp)
-
-      find_program(
-        _matlab_main_tmp
-        NAMES matlab)
-
-      if(NOT _matlab_main_tmp)
-        execute_process(
-          COMMAND "which" matlab
-          OUTPUT_VARIABLE _matlab_main_tmp
-          ERROR_VARIABLE _matlab_main_tmp_err)
-        # the output should be cleaned up
-        string(STRIP "${_matlab_main_tmp}" _matlab_main_tmp)
-      endif()
-
-      if(EXISTS ${_matlab_main_tmp})
-        if(MATLAB_FIND_DEBUG)
-          message(STATUS "[MATLAB] matlab found from PATH: ${_matlab_main_tmp}")
-        endif()
-      else()
-        # found candidate is not good, we remove it
-        unset(_matlab_main_tmp)
-        unset(_matlab_main_tmp CACHE)
-      endif()
-
-    endif() # if(NOT _matlab_main_tmp)
-
-    if(_matlab_main_tmp AND EXISTS ${_matlab_main_tmp})
-      # resolve symlinks
-      get_filename_component(_matlab_current_location "${_matlab_main_tmp}" REALPATH)
-      set(_directory_alias DIRECTORY)
-
-      # get the directory (the command below has to be run twice)
-      get_filename_component(_matlab_current_location "${_matlab_current_location}" ${_directory_alias})
-      get_filename_component(_matlab_current_location "${_matlab_current_location}" ${_directory_alias}) # Matlab should be in bin
-      list(APPEND _matlab_possible_roots "NOTFOUND" ${_matlab_current_location}) # empty version
-    endif()
-
-
-    # on mac, we look for the /Application paths
-    # this corresponds to the behaviour on Windows. On Linux, we do not have
-    # any other guess.
-    if((NOT _matlab_possible_roots) AND APPLE)
-
-      matlab_get_supported_releases(_matlab_releases)
-      if(MATLAB_FIND_DEBUG)
-        message(STATUS "[MATLAB] Matlab supported versions ${_matlab_releases}. If more version should be supported "
-                     "the variable MATLAB_ADDITIONAL_VERSIONS can be set according to the documentation")
-      endif()
-
-      foreach(_matlab_current_release IN LISTS _matlab_releases)
-        set(_matlab_full_string "/Applications/MATLAB_${_matlab_current_release}.app")
-        if(EXISTS ${_matlab_full_string})
-          set(_matlab_current_version)
-          matlab_get_version_from_release_name("${_matlab_current_release}" _matlab_current_version)
-          if(MATLAB_FIND_DEBUG)
-            message(STATUS "[MATLAB] Found version ${_matlab_current_release} (${_matlab_current_version}) in ${_matlab_full_string}")
-          endif()
-          list(APPEND _matlab_possible_roots ${_matlab_current_version})
-          list(APPEND _matlab_possible_roots ${_matlab_full_string})
-          unset(_matlab_current_version)
-        endif()
-
-        unset(_matlab_full_string)
-      endforeach(_matlab_current_release)
-      unset(_matlab_current_release)
-      unset(_matlab_releases)
-    endif()
-
-    # we need to clear _matlab_main_tmp here
-    unset(_matlab_main_tmp CACHE)
-    unset(_matlab_main_tmp)
-
-  elseif(NOT EXISTS ${MATLAB_USER_ROOT})
-    # if MATLAB_USER_ROOT specified but erroneous
-    if(MATLAB_FIND_DEBUG)
-      message(WARNING "[MATLAB] the specified path for MATLAB_USER_ROOT does not exist (${MATLAB_USER_ROOT})")
-    endif()
-  else()
-    list(APPEND _matlab_possible_roots "NOTFOUND" ${MATLAB_USER_ROOT}) # empty version
-  endif()
-endif()
-
-
-if(MATLAB_FIND_DEBUG)
-  message(STATUS "[MATLAB] Matlab root folders are ${_matlab_possible_roots}")
-endif()
-
-
-
-if(DEFINED Matlab_ROOT_DIR)
-  unset(Matlab_ROOT_DIR)
-endif()
-
-# take the first possible Matlab root
-if(_matlab_possible_roots)
-  list(GET _matlab_possible_roots 0 Matlab_VERSION_STRING)
-  list(GET _matlab_possible_roots 1 Matlab_ROOT_DIR)
-  list(LENGTH _matlab_possible_roots numbers_of_matlab_roots)
-
-  # adding a warning in case of ambiguity
-  if(numbers_of_matlab_roots GREATER 2 AND MATLAB_FIND_DEBUG)
-    message(WARNING "[MATLAB] Found several distributions of Matlab. Setting the current version to ${Matlab_VERSION_STRING} (located ${Matlab_ROOT_DIR})."
-                    " If this is not the desired behaviour, provide the -DMATLAB_USER_ROOT on the command line")
-  endif()
-endif()
-
-
-if((NOT (DEFINED Matlab_VERSION_STRING)) OR (NOT Matlab_VERSION_STRING))
-  set(Matlab_VERSION_STRING "NOTFOUND")
-endif()
-
-
-
-# if the version is not trivial, we query matlab for that
-# we keep track of the location of matlab that induced this version
-set(Matlab_VERSION_STRING_AUTO_DETECT "" CACHE INTERNAL "internal matlab location for the discovered version")
-
-set(_matlab_version_should_be_recomputed FALSE)
-if(${Matlab_VERSION_STRING} STREQUAL "NOTFOUND")
-  set(_matlab_version_should_be_recomputed TRUE)
-elseif((NOT Matlab_MAIN_PROGRAM) OR (NOT EXISTS ${Matlab_MAIN_PROGRAM}))
-  set(_matlab_version_should_be_recomputed TRUE)
 else()
-  # just in case the variable is modified to a symlink
-  get_filename_component(_matlab_main_tmp "${Matlab_MAIN_PROGRAM}" REALPATH)
-  if(NOT (_matlab_main_tmp STREQUAL Matlab_VERSION_STRING_AUTO_DETECT))
-    set(_matlab_version_should_be_recomputed TRUE)
-  endif()
-endif()
-
-if(_matlab_version_should_be_recomputed)
-  if(MATLAB_FIND_DEBUG)
-    message(STATUS "[MATLAB] querying for version from Matlab root = ${Matlab_ROOT_DIR}")
-  endif()
-
-  if(Matlab_MAIN_PROGRAM)
-    set(_matlab_main_tmp ${Matlab_MAIN_PROGRAM})
+  if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    # Regular x86
+    set(MATLAB_ROOT
+      /usr/local/matlab-7sp1/bin/glnx86/
+      /opt/matlab-7sp1/bin/glnx86/
+      $ENV{HOME}/matlab-7sp1/bin/glnx86/
+      $ENV{HOME}/redhat-matlab/bin/glnx86/
+      )
   else()
-    find_program(
-      _matlab_main_tmp
-      matlab
-      PATHS ${Matlab_ROOT_DIR} ${Matlab_ROOT_DIR}/bin
-      DOC "Matlab main program"
-      NO_DEFAULT_PATH
-    )
-  endif()
-
-  if(_matlab_main_tmp)
-    set(matlab_list_of_all_versions)
-    matlab_get_version_from_matlab_run("${_matlab_main_tmp}" matlab_list_of_all_versions)
-
-    list(GET matlab_list_of_all_versions 0 MATLAB_VERSION_tmp)
-
-    # set the version into the cache
-    set(Matlab_VERSION_STRING ${MATLAB_VERSION_tmp} CACHE INTERNAL "Matlab version (automatically determined)" FORCE)
-    list(LENGTH list_of_all_versions list_of_all_versions_length)
-    if((${list_of_all_versions_length} GREATER 1) AND MATLAB_FIND_DEBUG)
-      message(WARNING "[MATLAB] Found several versions, taking the first one (versions found ${list_of_all_versions})")
-    endif()
-
-    # update the location of Matlab that produced this value
-    # we store the real path for comparison
-    get_filename_component(_matlab_main_tmp1 "${_matlab_main_tmp}" REALPATH)
-    set(Matlab_VERSION_STRING_AUTO_DETECT ${_matlab_main_tmp1} CACHE INTERNAL "internal matlab location for the discovered version" FORCE)
-
-    # these are internal variables
-    unset(_matlab_main_tmp)
-    unset(_matlab_main_tmp CACHE)
-    unset(_matlab_main_tmp1)
-  endif()
-endif()
-
-
-if(MATLAB_FIND_DEBUG)
-  message(STATUS "[MATLAB] Current version is ${Matlab_VERSION_STRING} located ${Matlab_ROOT_DIR}")
-endif()
-
-
-
-if(Matlab_ROOT_DIR)
-  file(TO_CMAKE_PATH ${Matlab_ROOT_DIR} Matlab_ROOT_DIR)
-endif()
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-  set(_matlab_64Build FALSE)
-else()
-  set(_matlab_64Build TRUE)
-endif()
-
-if(APPLE)
-  set(_matlab_bin_prefix "mac") # i should be for intel
-  set(_matlab_bin_suffix_32bits "i")
-  set(_matlab_bin_suffix_64bits "i64")
-elseif(UNIX)
-  set(_matlab_bin_prefix "gln")
-  set(_matlab_bin_suffix_32bits "x86")
-  set(_matlab_bin_suffix_64bits "xa64")
-else()
-  set(_matlab_bin_prefix "win")
-  set(_matlab_bin_suffix_32bits "32")
-  set(_matlab_bin_suffix_64bits "64")
-endif()
-
-
-
-set(MATLAB_INCLUDE_DIR_TO_LOOK ${Matlab_ROOT_DIR}/extern/include)
-if(_matlab_64Build)
-  set(_matlab_current_suffix ${_matlab_bin_suffix_64bits})
-else()
-  set(_matlab_current_suffix ${_matlab_bin_suffix_32bits})
-endif()
-
-set(Matlab_BINARIES_DIR
-    ${Matlab_ROOT_DIR}/bin/${_matlab_bin_prefix}${_matlab_current_suffix})
-set(Matlab_EXTERN_LIBRARY_DIR
-    ${Matlab_ROOT_DIR}/extern/lib/${_matlab_bin_prefix}${_matlab_current_suffix})
-
-if(WIN32)
-  set(_matlab_lib_dir_for_search ${Matlab_EXTERN_LIBRARY_DIR}/microsoft)
-  set(_matlab_lib_prefix_for_search "lib")
-else()
-  set(_matlab_lib_dir_for_search ${Matlab_BINARIES_DIR})
-  set(_matlab_lib_prefix_for_search "lib")
-endif()
-
-unset(_matlab_64Build)
-
-
-if(NOT DEFINED Matlab_MEX_EXTENSION)
-  set(_matlab_mex_extension "")
-  matlab_get_mex_suffix("${Matlab_ROOT_DIR}" _matlab_mex_extension)
-
-  # This variable goes to the cache.
-  set(Matlab_MEX_EXTENSION ${_matlab_mex_extension} CACHE STRING "Extensions for the mex targets (automatically given by Matlab)")
-  unset(_matlab_mex_extension)
-endif()
-
-
-if(MATLAB_FIND_DEBUG)
-  message(STATUS "[MATLAB] [DEBUG]_matlab_lib_prefix_for_search = ${_matlab_lib_prefix_for_search} | _matlab_lib_dir_for_search = ${_matlab_lib_dir_for_search}")
-endif()
-
-
-
-# internal
-# This small stub around find_library is to prevent any pollution of CMAKE_FIND_LIBRARY_PREFIXES in the global scope.
-# This is the function to be used below instead of the find_library directives.
-function(_Matlab_find_library _matlab_library_prefix)
-  set(CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES} ${_matlab_library_prefix})
-  find_library(${ARGN})
-endfunction()
-
-
-set(_matlab_required_variables)
-
-
-# the MEX library/header are required
-find_path(
-  Matlab_INCLUDE_DIRS
-  mex.h
-  PATHS ${MATLAB_INCLUDE_DIR_TO_LOOK}
-  NO_DEFAULT_PATH
-  )
-list(APPEND _matlab_required_variables Matlab_INCLUDE_DIRS)
-
-_Matlab_find_library(
-  ${_matlab_lib_prefix_for_search}
-  Matlab_MEX_LIBRARY
-  mex
-  PATHS ${_matlab_lib_dir_for_search}
-  NO_DEFAULT_PATH
-)
-
-
-list(APPEND _matlab_required_variables Matlab_MEX_LIBRARY)
-
-# the MEX extension is required
-list(APPEND _matlab_required_variables Matlab_MEX_EXTENSION)
-
-# the matlab root is required
-list(APPEND _matlab_required_variables Matlab_ROOT_DIR)
-
-
-# component Mex Compiler
-list(FIND Matlab_FIND_COMPONENTS MEX_COMPILER _matlab_find_mex_compiler)
-if(_matlab_find_mex_compiler GREATER -1)
-  find_program(
-    Matlab_MEX_COMPILER
-    "mex"
-    PATHS ${Matlab_BINARIES_DIR}
-    DOC "Matlab MEX compiler"
-    NO_DEFAULT_PATH
-  )
-
-  if(Matlab_MEX_COMPILER)
-    set(Matlab_MEX_COMPILER_FOUND TRUE)
+    # AMD64:
+    set(MATLAB_ROOT
+      /usr/local/matlab-7sp1/bin/glnxa64/
+      /opt/matlab-7sp1/bin/glnxa64/
+      $ENV{HOME}/matlab7_64/bin/glnxa64/
+      $ENV{HOME}/matlab-7sp1/bin/glnxa64/
+      $ENV{HOME}/redhat-matlab/bin/glnxa64/
+      )
   endif()
-endif()
-unset(_matlab_find_mex_compiler)
-
-# component Matlab program
-list(FIND Matlab_FIND_COMPONENTS MAIN_PROGRAM _matlab_find_matlab_program)
-if(_matlab_find_matlab_program GREATER -1)
-  # todo cleanup with code above
-  if(NOT DEFINED Matlab_MAIN_PROGRAM)
-    find_program(
-      Matlab_MAIN_PROGRAM
-      matlab
-      PATHS ${Matlab_ROOT_DIR} ${Matlab_ROOT_DIR}/bin
-      DOC "Matlab main program"
-      NO_DEFAULT_PATH
+  find_library(MATLAB_MEX_LIBRARY
+    mex
+    ${MATLAB_ROOT}
     )
-  endif()
-  if(Matlab_MAIN_PROGRAM)
-    set(Matlab_MAIN_PROGRAM_FOUND TRUE)
-  endif()
-
-endif()
-unset(_matlab_find_matlab_program)
-
-# Component MX library
-list(FIND Matlab_FIND_COMPONENTS MX_LIBRARY _matlab_find_mx)
-if(_matlab_find_mx GREATER -1)
-  _Matlab_find_library(
-    ${_matlab_lib_prefix_for_search}
-    Matlab_MX_LIBRARY
+  find_library(MATLAB_MX_LIBRARY
     mx
-    PATHS ${_matlab_lib_dir_for_search}
-    NO_DEFAULT_PATH
-  )
-
-  if(Matlab_MX_LIBRARY)
-    set(Matlab_MX_LIBRARY_FOUND TRUE)
-  endif()
-endif()
-unset(_matlab_find_mx)
-
-
-# Component ENG library
-list(FIND Matlab_FIND_COMPONENTS ENG_LIBRARY _matlab_find_eng)
-if(_matlab_find_eng GREATER -1)
-  _Matlab_find_library(
-    ${_matlab_lib_prefix_for_search}
-    Matlab_ENG_LIBRARY
+    ${MATLAB_ROOT}
+    )
+  find_library(MATLAB_ENG_LIBRARY
     eng
-    PATHS ${_matlab_lib_dir_for_search}
-    NO_DEFAULT_PATH
-  )
-  if(Matlab_ENG_LIBRARY)
-    set(Matlab_ENG_LIBRARY_FOUND TRUE)
-  endif()
-endif()
-unset(_matlab_find_eng)
-
-
-
-
-
-unset(_matlab_lib_dir_for_search)
-
-
-set(Matlab_LIBRARIES ${Matlab_MEX_LIBRARY} ${Matlab_MX_LIBRARY} ${Matlab_ENG_LIBRARY})
+    ${MATLAB_ROOT}
+    )
+  find_path(MATLAB_INCLUDE_DIR
+    "mex.h"
+    "/usr/local/matlab-7sp1/extern/include/"
+    "/opt/matlab-7sp1/extern/include/"
+    "$ENV{HOME}/matlab-7sp1/extern/include/"
+    "$ENV{HOME}/redhat-matlab/extern/include/"
+    )
 
-if(CMAKE_VERSION VERSION_LESS "2.8.11")
-  find_package_handle_standard_args(
-    Matlab
-    REQUIRED_VARS ${_matlab_required_variables}
-    VERSION_VAR Matlab_VERSION_STRING)
-else()
-  find_package_handle_standard_args(
-    Matlab
-    FOUND_VAR Matlab_FOUND
-    REQUIRED_VARS ${_matlab_required_variables} #MATLAB_REQUIRED_PROGRAMS MATLAB_REQUIRED_LIBRARIES MATLAB_REQUIRED_INCLUDE_DIRS
-    VERSION_VAR Matlab_VERSION_STRING
-    HANDLE_COMPONENTS)
 endif()
 
-unset(_matlab_required_variables)
-unset(_matlab_bin_prefix)
-unset(_matlab_bin_suffix_32bits)
-unset(_matlab_bin_suffix_64bits)
-unset(_matlab_current_suffix)
-unset(_matlab_lib_dir_for_search)
-unset(_matlab_lib_prefix_for_search)
+# This is common to UNIX and Win32:
+set(MATLAB_LIBRARIES
+  ${MATLAB_MEX_LIBRARY}
+  ${MATLAB_MX_LIBRARY}
+  ${MATLAB_ENG_LIBRARY}
+)
 
-if(Matlab_INCLUDE_DIRS AND Matlab_LIBRARIES)
-  mark_as_advanced(
-    Matlab_LIBRARIES
-    Matlab_MEX_LIBRARY
-    Matlab_MX_LIBRARY
-    Matlab_ENG_LIBRARY
-    Matlab_INCLUDE_DIRS
-    Matlab_FOUND
-    MATLAB_USER_ROOT
-    Matlab_ROOT_DIR
-    Matlab_VERSION_STRING
-    Matlab_MAIN_PROGRAM
-    Matlab_MEX_EXTENSION
-    Matlab_BINARIES_DIR
-  )
+if(MATLAB_INCLUDE_DIR AND MATLAB_LIBRARIES)
+  set(MATLAB_FOUND 1)
 endif()
+
+mark_as_advanced(
+  MATLAB_LIBRARIES
+  MATLAB_MEX_LIBRARY
+  MATLAB_MX_LIBRARY
+  MATLAB_ENG_LIBRARY
+  MATLAB_INCLUDE_DIR
+  MATLAB_FOUND
+  MATLAB_ROOT
+)
diff --git a/Modules/MatlabTestsRedirect.cmake b/Modules/MatlabTestsRedirect.cmake
deleted file mode 100644
index 804101c..0000000
--- a/Modules/MatlabTestsRedirect.cmake
+++ /dev/null
@@ -1,84 +0,0 @@
-# This is an undocumented internal helper for the FindMatlab
-# module ``matlab_add_unit_test`` command.
-
-#=============================================================================
-# Copyright 2014-2015 Raffi Enficiaud, Max Planck Society
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-
-# Usage: cmake
-#   -Dtest_timeout=180
-#   -Dworking_directory="."
-#   -Doutput_directory=
-#   -Dadditional_paths=""
-#   -Dno_unittest_framework=""
-#   -DMatlab_PROGRAM=matlab_exe_location
-#   -DMatlab_ADDITIONNAL_STARTUP_OPTIONS=""
-#   -Dtest_name=name_of_the_test
-#   -Dcmd_to_run_before_test=""
-#   -Dunittest_file_to_run
-#   -P FindMatlab_TestsRedirect.cmake
-
-set(Matlab_UNIT_TESTS_CMD -nosplash -nojvm -nodesktop -nodisplay ${Matlab_ADDITIONNAL_STARTUP_OPTIONS})
-if(WIN32)
-  set(Matlab_UNIT_TESTS_CMD ${Matlab_UNIT_TESTS_CMD} -wait)
-endif()
-
-if(NOT test_timeout)
-  set(test_timeout 180)
-endif()
-
-if(NOT cmd_to_run_before_test)
-  set(cmd_to_run_before_test)
-endif()
-
-get_filename_component(unittest_file_directory   "${unittest_file_to_run}" DIRECTORY)
-get_filename_component(unittest_file_to_run_name "${unittest_file_to_run}" NAME_WE)
-
-set(concat_string '${unittest_file_directory}')
-foreach(s IN LISTS additional_paths)
-  if(NOT "${s}" STREQUAL "")
-    set(concat_string "${concat_string}, '${s}'")
-  endif()
-endforeach()
-
-set(unittest_to_run "runtests('${unittest_file_to_run_name}'), exit(max([ans(1,:).Failed]))")
-if(no_unittest_framework)
-  set(unittest_to_run "try, ${unittest_file_to_run_name}, catch err, disp('An exception has been thrown during the execution'), disp(err), disp(err.stack), exit(1), end, exit(0)")
-endif()
-
-set(Matlab_SCRIPT_TO_RUN
-    "addpath(${concat_string}), path, ${cmd_to_run_before_test}, ${unittest_to_run}"
-   )
-
-set(Matlab_LOG_FILE "${output_directory}/${test_name}.log")
-
-execute_process(
-  COMMAND "${Matlab_PROGRAM}" ${Matlab_UNIT_TESTS_CMD} -logfile "${test_name}.log" -r "${Matlab_SCRIPT_TO_RUN}"
-  RESULT_VARIABLE res
-  TIMEOUT ${test_timeout}
-  OUTPUT_QUIET # we do not want the output twice
-  WORKING_DIRECTORY "${output_directory}"
-  )
-
-if(NOT EXISTS ${Matlab_LOG_FILE})
-  message( FATAL_ERROR "[MATLAB] ERROR: cannot find the log file ${Matlab_LOG_FILE}")
-endif()
-
-# print the output in any case.
-file(READ ${Matlab_LOG_FILE} matlab_log_content)
-message("Matlab test ${name_of_the_test} output:\n${matlab_log_content}") # if we put FATAL_ERROR here, the file is indented.
-
-
-if(NOT (res EQUAL 0))
-  message( FATAL_ERROR "[MATLAB] TEST FAILED" )
-endif()
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index a8e4822..cb45e79 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1256,12 +1256,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     add_subdirectory(FindJsonCpp)
   endif()
 
-  # Matlab module
-  if(CMake_TEST_FindMatlab)
-    ADD_TEST_MACRO(FindMatlab.basic_checks      ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>)
-    ADD_TEST_MACRO(FindMatlab.versions_checks   ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>)
-  endif()
-
   find_package(GTK2 QUIET)
   if(GTK2_FOUND)
     add_subdirectory(FindGTK2)
diff --git a/Tests/FindMatlab/basic_checks/CMakeLists.txt b/Tests/FindMatlab/basic_checks/CMakeLists.txt
deleted file mode 100644
index acf71ea..0000000
--- a/Tests/FindMatlab/basic_checks/CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-
-cmake_minimum_required (VERSION 2.8.12)
-enable_testing()
-project(basic_checks)
-
-set(MATLAB_FIND_DEBUG TRUE)
-
-# the success of the following command is dependent on the current configuration:
-# - on 32bits builds (cmake is building with 32 bits), it looks for 32 bits Matlab
-# - on 64bits builds (cmake is building with 64 bits), it looks for 64 bits Matlab
-find_package(Matlab REQUIRED COMPONENTS MX_LIBRARY MAIN_PROGRAM)
-
-
-
-matlab_add_mex(
-    # target name
-    NAME cmake_matlab_test_wrapper1
-    # output name
-    OUTPUT_NAME cmake_matlab_mex1
-    SRC ${CMAKE_CURRENT_SOURCE_DIR}/../matlab_wrapper1.cpp
-    DOCUMENTATION ${CMAKE_CURRENT_SOURCE_DIR}/../help_text1.m.txt
-  )
-
-
-matlab_add_unit_test(
-    NAME ${PROJECT_NAME}_matlabtest-1
-    TIMEOUT 30
-    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests1.m
-    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
-    )
-
-matlab_add_unit_test(
-    NAME ${PROJECT_NAME}_matlabtest-2
-    TIMEOUT 15
-    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests_timeout.m
-    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
-    )
-set_tests_properties(${PROJECT_NAME}_matlabtest-2 PROPERTIES WILL_FAIL TRUE)
-
-
-# testing the test without the unittest framework of Matlab
-matlab_add_unit_test(
-    NAME ${PROJECT_NAME}_matlabtest-3
-    TIMEOUT 30
-    NO_UNITTEST_FRAMEWORK
-    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests2.m
-    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
-    )
-
-matlab_add_unit_test(
-    NAME ${PROJECT_NAME}_matlabtest-4
-    TIMEOUT 30
-    NO_UNITTEST_FRAMEWORK
-    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_matlab_unit_tests3.m
-    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
-    )
-set_tests_properties(${PROJECT_NAME}_matlabtest-4 PROPERTIES WILL_FAIL TRUE)
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests1.m b/Tests/FindMatlab/cmake_matlab_unit_tests1.m
deleted file mode 100644
index 2371c3a..0000000
--- a/Tests/FindMatlab/cmake_matlab_unit_tests1.m
+++ /dev/null
@@ -1,33 +0,0 @@
-
-classdef cmake_matlab_unit_tests1 < matlab.unittest.TestCase
-  % some simple unit test for CMake Matlab wrapper
-  properties
-  end
-
-  methods (Test)
-    function testDummyCall(testCase)
-      % very simple call test
-      cmake_matlab_mex1(rand(3,3));
-    end
-
-    function testDummyCall2(testCase)
-      % very simple call test 2
-      ret = cmake_matlab_mex1(rand(3,3));
-      testCase.verifyEqual(size(ret), size(rand(3,3)));
-
-      testCase.verifyEqual(size(cmake_matlab_mex1(rand(4,3))), [4,3] );
-    end
-
-    function testFailTest(testCase)
-      testCase.verifyError(@() cmake_matlab_mex1(10), 'cmake_matlab:configuration');
-      testCase.verifyError(@() cmake_matlab_mex1([10]), 'cmake_matlab:configuration');
-    end
-
-    function testHelpContent(testCase)
-      % testing the help feature
-      testCase.verifySubstring(evalc('help cmake_matlab_mex1'), 'Dummy matlab extension in cmake');
-    end
-
-
-  end
-end
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests2.m b/Tests/FindMatlab/cmake_matlab_unit_tests2.m
deleted file mode 100644
index 7a8a342..0000000
--- a/Tests/FindMatlab/cmake_matlab_unit_tests2.m
+++ /dev/null
@@ -1,6 +0,0 @@
-
-ret = cmake_matlab_mex1(rand(3,3));
-
-if(size(ret) ~= size(rand(3,3)))
-  error('Dimension mismatch!');
-end
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests3.m b/Tests/FindMatlab/cmake_matlab_unit_tests3.m
deleted file mode 100644
index 2639325..0000000
--- a/Tests/FindMatlab/cmake_matlab_unit_tests3.m
+++ /dev/null
@@ -1,5 +0,0 @@
-
-cmake_matlab_mex1(10);
-
-% should not reach this point
-exit(0);
diff --git a/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m b/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
deleted file mode 100644
index 66be1bb..0000000
--- a/Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
+++ /dev/null
@@ -1,15 +0,0 @@
-
-classdef cmake_matlab_unit_tests_timeout < matlab.unittest.TestCase
-  % timeout tests
-
-  properties
-  end
-
-  methods (Test)
-    function testCallHangsShouldBeTimedOut(testCase)
-      cmake_matlab_mex1(rand(3,3));
-      disp('Will now wait.');
-      input('Testing the cmake Matlab package timeout - do not press anything');
-    end
-  end
-end
diff --git a/Tests/FindMatlab/help_text1.m.txt b/Tests/FindMatlab/help_text1.m.txt
deleted file mode 100644
index a924355..0000000
--- a/Tests/FindMatlab/help_text1.m.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-% Dummy matlab extension in cmake
-function ret = cmake_matlab_mex1(X)
diff --git a/Tests/FindMatlab/matlab_wrapper1.cpp b/Tests/FindMatlab/matlab_wrapper1.cpp
deleted file mode 100644
index 4149bb9..0000000
--- a/Tests/FindMatlab/matlab_wrapper1.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// simple workaround to some compiler specific problems
-// see http://stackoverflow.com/questions/22367516/mex-compile-error-unknown-type-name-char16-t/23281916#23281916
-#include <algorithm>
-
-#include "mex.h"
-
-// this test should return a matrix of 10 x 10 and should check some of the arguments
-
-void mexFunction(const int nlhs, mxArray *plhs[], const int nrhs, const mxArray *prhs[])
-{
-  if(nrhs != 1)
-  {
-    mexErrMsgTxt("Incorrect arguments");
-  }
-
-  size_t dim1 = mxGetM(prhs[0]);
-  size_t dim2 = mxGetN(prhs[0]);
-
-  if(dim1 == 1 || dim2 == 1)
-  {
-    mexErrMsgIdAndTxt("cmake_matlab:configuration", "Incorrect arguments");
-  }
-
-  plhs[0] = mxCreateNumericMatrix(dim1, dim2, mxGetClassID(prhs[0]), mxREAL);
-}
diff --git a/Tests/FindMatlab/versions_checks/CMakeLists.txt b/Tests/FindMatlab/versions_checks/CMakeLists.txt
deleted file mode 100644
index 5d20685..0000000
--- a/Tests/FindMatlab/versions_checks/CMakeLists.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-
-cmake_minimum_required (VERSION 2.8.12)
-enable_testing()
-project(versions_checks)
-
-set(MATLAB_FIND_DEBUG TRUE)
-set(MATLAB_ADDITIONAL_VERSIONS
-    "dummy=14.9")
-
-# the success of the following command is dependent on the current configuration
-# in this case, we are only interested in the version macros
-find_package(Matlab)
-
-
-
-if(NOT COMMAND matlab_get_version_from_release_name)
-  message(FATAL_ERROR "The macro matlab_get_version_from_release_name should be defined")
-endif()
-
-if(NOT COMMAND matlab_get_release_name_from_version)
-  message(FATAL_ERROR "The macro matlab_get_release_name_from_version should be defined")
-endif()
-
-
-# matlab_get_release_name_from_version
-matlab_get_release_name_from_version("7.13" release_name)
-if(NOT release_name STREQUAL "R2011b")
-  message(FATAL_ERROR "version 7.13 does not give release R2011b : '${release_name}' != R2011b")
-endif()
-
-matlab_get_release_name_from_version("14.9" release_name)
-if(NOT release_name STREQUAL "dummy")
-  message(FATAL_ERROR "version 14.9 does not give release dummy : '${release_name}' != dummy")
-endif()
-
-matlab_get_release_name_from_version("14.10" release_name)
-if(NOT release_name STREQUAL "")
-  message(FATAL_ERROR "version 14.10 does not give empty release: '${release_name}' != ''")
-endif()
-
-
-# matlab_get_version_from_release_name
-matlab_get_version_from_release_name("R2011a" version)
-if(NOT version STREQUAL "7.12")
-  message(FATAL_ERROR "Release R2011a does not give version 7.12 : '${version}' != 7.12")
-endif()
-
-matlab_get_version_from_release_name("dummy" version)
-#message(FATAL_ERROR "versionversion = ${version}")
-if(NOT version STREQUAL "14.9")
-  message(FATAL_ERROR "Release dummy does not give version 14.9 : '${version}' != 14.9")
-endif()
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 7715f1c..f0426e5 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -198,8 +198,3 @@ add_RunCMake_test(IfacePaths_SOURCES TEST_DIR IfacePaths)
 if(RPMBUILD_EXECUTABLE)
   add_RunCMake_test(CPackRPM)
 endif()
-
-# Matlab module related tests
-if(CMake_TEST_FindMatlab)
-  add_RunCMake_test(FindMatlab)
-endif()
diff --git a/Tests/RunCMake/FindMatlab/CMakeLists.txt b/Tests/RunCMake/FindMatlab/CMakeLists.txt
deleted file mode 100644
index 1b9a957..0000000
--- a/Tests/RunCMake/FindMatlab/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-cmake_minimum_required(VERSION 2.8.12)
-include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt b/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/FindMatlab/MatlabTest1-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt b/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
deleted file mode 100644
index 95a787f..0000000
--- a/Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*FindMatlab.cmake:[0-9]+ \(message\):
-  \[MATLAB\] This functionality needs the MAIN_PROGRAM component \(not default\)
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest1.cmake b/Tests/RunCMake/FindMatlab/MatlabTest1.cmake
deleted file mode 100644
index 1cbc1c2..0000000
--- a/Tests/RunCMake/FindMatlab/MatlabTest1.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-
-cmake_minimum_required (VERSION 2.8.12)
-enable_testing()
-project(test_should_fail)
-
-find_package(Matlab REQUIRED COMPONENTS MX_LIBRARY)
-
-matlab_add_mex(
-    # target name
-    NAME cmake_matlab_test_wrapper1
-    # output name
-    OUTPUT_NAME cmake_matlab_mex1
-    SRC ${CMAKE_CURRENT_SOURCE_DIR}/matlab_wrapper1.cpp
-  )
-
-# this command should raise a FATAL_ERROR, component MAIN_PROGRAM is missing
-matlab_add_unit_test(
-    NAME ${PROJECT_NAME}_matlabtest-1
-    TIMEOUT 1
-    UNITTEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake_matlab_unit_tests2.m
-    ADDITIONAL_PATH $<TARGET_FILE_DIR:cmake_matlab_test_wrapper1>
-    )
diff --git a/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake b/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
deleted file mode 100644
index 33dbb77..0000000
--- a/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-
-include(RunCMake)
-run_cmake(MatlabTest1)
diff --git a/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m b/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
deleted file mode 100644
index 7a8a342..0000000
--- a/Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
+++ /dev/null
@@ -1,6 +0,0 @@
-
-ret = cmake_matlab_mex1(rand(3,3));
-
-if(size(ret) ~= size(rand(3,3)))
-  error('Dimension mismatch!');
-end
diff --git a/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp b/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp
deleted file mode 100644
index 4149bb9..0000000
--- a/Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// simple workaround to some compiler specific problems
-// see http://stackoverflow.com/questions/22367516/mex-compile-error-unknown-type-name-char16-t/23281916#23281916
-#include <algorithm>
-
-#include "mex.h"
-
-// this test should return a matrix of 10 x 10 and should check some of the arguments
-
-void mexFunction(const int nlhs, mxArray *plhs[], const int nrhs, const mxArray *prhs[])
-{
-  if(nrhs != 1)
-  {
-    mexErrMsgTxt("Incorrect arguments");
-  }
-
-  size_t dim1 = mxGetM(prhs[0]);
-  size_t dim2 = mxGetN(prhs[0]);
-
-  if(dim1 == 1 || dim2 == 1)
-  {
-    mexErrMsgIdAndTxt("cmake_matlab:configuration", "Incorrect arguments");
-  }
-
-  plhs[0] = mxCreateNumericMatrix(dim1, dim2, mxGetClassID(prhs[0]), mxREAL);
-}

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00a04096bd16b596d441f837069724908e697c83
commit 00a04096bd16b596d441f837069724908e697c83
Merge: 1416d21 08d1e65
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:07:29 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:07:29 2015 -0500

    Merge branch 'FindMatlab-remove-trailing-lines' into FindMatlab-rewrite


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08d1e65a9ab89c6d23f6ace8d652dee278710586
commit 08d1e65a9ab89c6d23f6ace8d652dee278710586
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:06:39 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:06:39 2015 -0500

    FindMatlab: Remove trailing blank lines

diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 474556e..73b3a5b 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -125,4 +125,3 @@ mark_as_advanced(
   MATLAB_FOUND
   MATLAB_ROOT
 )
-

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

Summary of changes:
 Help/release/dev/FindMatlab-rewrite.rst            |    7 -
 Modules/FindMatlab.cmake                           | 1436 ++------------------
 Modules/MatlabTestsRedirect.cmake                  |   84 --
 Tests/CMakeLists.txt                               |    6 -
 Tests/FindMatlab/basic_checks/CMakeLists.txt       |   57 -
 Tests/FindMatlab/cmake_matlab_unit_tests1.m        |   33 -
 Tests/FindMatlab/cmake_matlab_unit_tests2.m        |    6 -
 Tests/FindMatlab/cmake_matlab_unit_tests3.m        |    5 -
 Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m |   15 -
 Tests/FindMatlab/help_text1.m.txt                  |    2 -
 Tests/FindMatlab/matlab_wrapper1.cpp               |   26 -
 Tests/FindMatlab/versions_checks/CMakeLists.txt    |   52 -
 Tests/RunCMake/CMakeLists.txt                      |    5 -
 Tests/RunCMake/FindMatlab/CMakeLists.txt           |    3 -
 Tests/RunCMake/FindMatlab/MatlabTest1-result.txt   |    1 -
 Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt   |    2 -
 Tests/RunCMake/FindMatlab/MatlabTest1.cmake        |   22 -
 Tests/RunCMake/FindMatlab/RunCMakeTest.cmake       |    3 -
 .../RunCMake/FindMatlab/cmake_matlab_unit_tests2.m |    6 -
 Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp      |   26 -
 20 files changed, 87 insertions(+), 1710 deletions(-)
 delete mode 100644 Help/release/dev/FindMatlab-rewrite.rst
 delete mode 100644 Modules/MatlabTestsRedirect.cmake
 delete mode 100644 Tests/FindMatlab/basic_checks/CMakeLists.txt
 delete mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests1.m
 delete mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests2.m
 delete mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests3.m
 delete mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
 delete mode 100644 Tests/FindMatlab/help_text1.m.txt
 delete mode 100644 Tests/FindMatlab/matlab_wrapper1.cpp
 delete mode 100644 Tests/FindMatlab/versions_checks/CMakeLists.txt
 delete mode 100644 Tests/RunCMake/FindMatlab/CMakeLists.txt
 delete mode 100644 Tests/RunCMake/FindMatlab/MatlabTest1-result.txt
 delete mode 100644 Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
 delete mode 100644 Tests/RunCMake/FindMatlab/MatlabTest1.cmake
 delete mode 100644 Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
 delete mode 100644 Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
 delete mode 100644 Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:12:33 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:12:33 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-265-g8366b1b
Message-ID: <20150224141233.03DE598386@public.kitware.com>

This is an automated email from 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  8366b1bd4fff38d2e928edee1f93acdee12365d4 (commit)
       via  e2b9e7f7bc1b4e3a36e8b19fc9925b358b5c99e0 (commit)
       via  7ce9f6e29ee143d2a63d55354c00d5ea50d6d0d1 (commit)
       via  69de0f7ea4163f350dd6683b6d7f47377157ae7d (commit)
       via  57f2aa7c37e3e4d09a43c6790772d11d5b63e9a6 (commit)
       via  b04c8ec3f840a5cb34a97b2fe8417882b49b3820 (commit)
       via  1d82105e29fc6f0bb71a474f876a7553b397cc26 (commit)
       via  d7662141a771f105e64b56543d99ee43e7d00849 (commit)
       via  9b50388b0989fab1d77fbb3d48e648c86427d808 (commit)
       via  76e7c22b3c37f382d6232ee95fe77e39e7aa269d (commit)
      from  d83b40c58dbd8a37147377e159f1c5ae8ca2f8c6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8366b1bd4fff38d2e928edee1f93acdee12365d4
commit 8366b1bd4fff38d2e928edee1f93acdee12365d4
Merge: d83b40c e2b9e7f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:12:31 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 09:12:31 2015 -0500

    Merge topic 'test-RunCMake-refactor-ctest'
    
    e2b9e7f7 Tests: Drop unnecessary stderr matching from RunCMake.ctest_memcheck
    7ce9f6e2 Tests: Teach RunCMake to tolerate 'Error kstat returned' lines in test output
    69de0f7e Tests: Teach RunCMake to tolerate Guard Malloc lines in test output
    57f2aa7c Tests: Teach RunCMake to tolerate BullseyeCoverage lines in test output
    b04c8ec3 Tests: Match curl error in RunCMake.ctest_submit FailDrop-* cases
    1d82105e Tests: Rename RunCMake.{CTestMemcheck => ctest_memcheck}
    d7662141 Tests: Rename RunCMake.{CTestSubmit => ctest_submit}
    9b50388b Tests: Split RunCTest helper out of RunCMake.CTest(Submit|Memcheck)
    76e7c22b Tests: Rename RunCMake.CTestMemcheck internals to match CTestSubmit

diff --cc Tests/RunCMake/CMakeLists.txt
index fd01201,59c6918..e085b41
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -130,11 -129,10 +129,12 @@@ add_RunCMake_test(build_command
  add_RunCMake_test(export)
  add_RunCMake_test(cmake_minimum_required)
  add_RunCMake_test(continue)
+ add_RunCMake_test(ctest_submit)
  add_RunCMake_test(file)
 +add_RunCMake_test(find_file)
  add_RunCMake_test(find_library)
  add_RunCMake_test(find_package)
 +add_RunCMake_test(find_path)
  add_RunCMake_test(get_filename_component)
  add_RunCMake_test(get_property)
  add_RunCMake_test(if)

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt                        |    4 ++--
 .../CTestMemcheck/DummyAddressSanitizer-stderr.txt   |    2 --
 .../CTestMemcheck/DummyBCNoLogFile-stderr.txt        |    3 ---
 .../CTestMemcheck/DummyLeakSanitizer-stderr.txt      |    2 --
 .../CTestMemcheck/DummyMemorySanitizer-stderr.txt    |    2 --
 Tests/RunCMake/CTestMemcheck/DummyPurify-stderr.txt  |    3 ---
 .../CTestMemcheck/DummyPurifyNoLogFile-stderr.txt    |    2 --
 .../CTestMemcheck/DummyThreadSanitizer-stderr.txt    |    2 --
 .../DummyUndefinedBehaviorSanitizer-stderr.txt       |    2 --
 .../RunCMake/CTestMemcheck/DummyValgrind-stderr.txt  |    3 ---
 .../DummyValgrindCustomOptions-stderr.txt            |    2 --
 .../CTestMemcheck/DummyValgrindFailPre-stdout.txt    |    1 -
 .../DummyValgrindIgnoreMemcheck-stderr.txt           |    3 ---
 .../DummyValgrindInvalidSupFile-stderr.txt           |    2 --
 .../DummyValgrindInvalidSupFile-stdout.txt           |    1 -
 .../CTestMemcheck/DummyValgrindNoLogFile-stderr.txt  |    2 --
 .../CTestMemcheck/DummyValgrindPrePost-stderr.txt    |    3 ---
 .../CTestMemcheck/DummyValgrindTwoTargets-stderr.txt |    3 ---
 Tests/RunCMake/CTestMemcheck/NotExist-stdout.txt     |    1 -
 Tests/RunCMake/CTestMemcheck/Unknown-stderr.txt      |    2 --
 Tests/RunCMake/CTestMemcheck/Unknown-stdout.txt      |    1 -
 Tests/RunCMake/CTestSubmit/BadArg-stderr.txt         |    2 --
 Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt       |    2 --
 Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt       |    2 --
 .../RunCMake/CTestSubmit/CDashUploadFILES-stderr.txt |    2 --
 .../RunCMake/CTestSubmit/CDashUploadPARTS-stderr.txt |    2 --
 .../CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt    |    2 --
 .../CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt    |    2 --
 Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt    |    4 ----
 Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt   |    3 ---
 Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt  |    3 ---
 Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt |    3 ---
 Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt   |    2 --
 .../RunCMake/CTestSubmit/PARTSCDashUpload-stderr.txt |    2 --
 .../CTestSubmit/PARTSCDashUploadType-stderr.txt      |    2 --
 .../CTestSubmit/RepeatRETURN_VALUE-stderr.txt        |    2 --
 Tests/RunCMake/README.rst                            |   10 ++++++++++
 Tests/RunCMake/RunCMake.cmake                        |    2 +-
 Tests/RunCMake/RunCTest.cmake                        |   17 +++++++++++++++++
 .../CMakeLists.txt.in                                |    2 +-
 .../CTestConfig.cmake.in                             |    2 +-
 .../DummyAddressSanitizer-result.txt                 |    0
 .../ctest_memcheck/DummyAddressSanitizer-stderr.txt  |    2 ++
 .../DummyAddressSanitizer-stdout.txt                 |    0
 .../DummyBC-result.txt                               |    0
 .../DummyBC-stderr.txt                               |    0
 .../DummyBC-stdout.txt                               |    0
 .../DummyBCNoLogFile-result.txt                      |    0
 .../ctest_memcheck/DummyBCNoLogFile-stderr.txt       |    3 +++
 .../DummyBCNoLogFile-stdout.txt                      |    0
 .../DummyLeakSanitizer-result.txt                    |    0
 .../ctest_memcheck/DummyLeakSanitizer-stderr.txt     |    2 ++
 .../DummyLeakSanitizer-stdout.txt                    |    0
 .../DummyMemorySanitizer-result.txt                  |    0
 .../ctest_memcheck/DummyMemorySanitizer-stderr.txt   |    2 ++
 .../DummyMemorySanitizer-stdout.txt                  |    0
 .../DummyPurify-result.txt                           |    0
 .../DummyPurify-stdout.txt                           |    0
 .../DummyPurifyNoLogFile-result.txt                  |    0
 .../ctest_memcheck/DummyPurifyNoLogFile-stderr.txt   |    2 ++
 .../DummyPurifyNoLogFile-stdout.txt                  |    0
 .../DummyThreadSanitizer-result.txt                  |    0
 .../ctest_memcheck/DummyThreadSanitizer-stderr.txt   |    2 ++
 .../DummyThreadSanitizer-stdout.txt                  |    0
 .../DummyUndefinedBehaviorSanitizer-result.txt       |    0
 .../DummyUndefinedBehaviorSanitizer-stderr.txt       |    2 ++
 .../DummyUndefinedBehaviorSanitizer-stdout.txt       |    0
 .../DummyValgrind-result.txt                         |    0
 .../DummyValgrind-stdout.txt                         |    0
 .../DummyValgrindCustomOptions-result.txt            |    0
 .../DummyValgrindCustomOptions-stderr.txt            |    2 ++
 .../DummyValgrindCustomOptions-stdout.txt            |    0
 .../DummyValgrindFailPost-result.txt                 |    0
 .../DummyValgrindFailPost-stderr.txt                 |    2 +-
 .../DummyValgrindFailPost-stdout.txt                 |    0
 .../DummyValgrindFailPre-result.txt                  |    0
 .../DummyValgrindFailPre-stderr.txt                  |    2 +-
 .../ctest_memcheck/DummyValgrindFailPre-stdout.txt   |    1 +
 .../DummyValgrindIgnoreMemcheck-result.txt           |    0
 .../DummyValgrindIgnoreMemcheck-stdout.txt           |    0
 .../DummyValgrindInvalidSupFile-result.txt           |    0
 .../DummyValgrindInvalidSupFile-stderr.txt           |    2 ++
 .../DummyValgrindInvalidSupFile-stdout.txt           |    1 +
 .../DummyValgrindNoLogFile-result.txt                |    0
 .../ctest_memcheck/DummyValgrindNoLogFile-stderr.txt |    2 ++
 .../DummyValgrindNoLogFile-stdout.txt                |    0
 .../DummyValgrindPrePost-result.txt                  |    0
 .../DummyValgrindPrePost-stdout.txt                  |    0
 .../DummyValgrindTwoTargets-result.txt               |    0
 .../DummyValgrindTwoTargets-stdout.txt               |    0
 .../NotExist-result.txt                              |    0
 .../NotExist-stderr.txt                              |    0
 Tests/RunCMake/ctest_memcheck/NotExist-stdout.txt    |    1 +
 .../RunCMakeTest.cmake                               |   18 +++---------------
 .../Unknown-result.txt                               |    0
 Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt     |    2 ++
 Tests/RunCMake/ctest_memcheck/Unknown-stdout.txt     |    1 +
 .../{CTestMemcheck => ctest_memcheck}/test.cmake.in  |    6 +++---
 .../testAddressSanitizer.cmake                       |    0
 .../testLeakSanitizer.cmake                          |    0
 .../testMemorySanitizer.cmake                        |    0
 .../testThreadSanitizer.cmake                        |    0
 .../testUndefinedBehaviorSanitizer.cmake             |    0
 .../{CTestSubmit => ctest_submit}/BadArg-result.txt  |    0
 Tests/RunCMake/ctest_submit/BadArg-stderr.txt        |    2 ++
 .../BadFILES-result.txt                              |    0
 Tests/RunCMake/ctest_submit/BadFILES-stderr.txt      |    2 ++
 .../BadPARTS-result.txt                              |    0
 Tests/RunCMake/ctest_submit/BadPARTS-stderr.txt      |    2 ++
 .../CDashUploadFILES-result.txt                      |    0
 .../ctest_submit/CDashUploadFILES-stderr.txt         |    2 ++
 .../CDashUploadFTP-result.txt                        |    0
 .../CDashUploadFTP-stderr.txt                        |    0
 .../CDashUploadNone-result.txt                       |    0
 .../CDashUploadNone-stderr.txt                       |    0
 .../CDashUploadPARTS-result.txt                      |    0
 .../ctest_submit/CDashUploadPARTS-stderr.txt         |    2 ++
 .../CDashUploadRETRY_COUNT-result.txt                |    0
 .../ctest_submit/CDashUploadRETRY_COUNT-stderr.txt   |    2 ++
 .../CDashUploadRETRY_DELAY-result.txt                |    0
 .../ctest_submit/CDashUploadRETRY_DELAY-stderr.txt   |    2 ++
 .../{CTestSubmit => ctest_submit}/CMakeLists.txt.in  |    0
 .../CTestConfig.cmake.in                             |    0
 .../FailDrop-cp-result.txt                           |    0
 Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt   |    4 ++++
 .../FailDrop-cp-stdout.txt                           |    0
 .../FailDrop-ftp-result.txt                          |    0
 Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt  |    3 +++
 .../FailDrop-ftp-stdout.txt                          |    0
 .../FailDrop-http-result.txt                         |    0
 Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt |    3 +++
 .../FailDrop-http-stdout.txt                         |    0
 .../FailDrop-https-result.txt                        |    0
 .../RunCMake/ctest_submit/FailDrop-https-stderr.txt  |    3 +++
 .../FailDrop-https-stdout.txt                        |    0
 .../FailDrop-scp-result.txt                          |    0
 Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt  |    2 ++
 .../FailDrop-scp-stdout.txt                          |    0
 .../FailDrop-xmlrpc-result.txt                       |    0
 .../FailDrop-xmlrpc-stderr.txt                       |    2 +-
 .../FailDrop-xmlrpc-stdout.txt                       |    0
 .../PARTSCDashUpload-result.txt                      |    0
 .../ctest_submit/PARTSCDashUpload-stderr.txt         |    2 ++
 .../PARTSCDashUploadType-result.txt                  |    0
 .../ctest_submit/PARTSCDashUploadType-stderr.txt     |    2 ++
 .../RepeatRETURN_VALUE-result.txt                    |    0
 .../ctest_submit/RepeatRETURN_VALUE-stderr.txt       |    2 ++
 .../{CTestSubmit => ctest_submit}/RunCMakeTest.cmake |   18 +-----------------
 .../{CTestSubmit => ctest_submit}/test.cmake.in      |    0
 149 files changed, 104 insertions(+), 120 deletions(-)
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyAddressSanitizer-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyBCNoLogFile-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyLeakSanitizer-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyMemorySanitizer-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyPurify-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyPurifyNoLogFile-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyThreadSanitizer-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrind-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindCustomOptions-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindFailPre-stdout.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindIgnoreMemcheck-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindInvalidSupFile-stdout.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindNoLogFile-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindPrePost-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/DummyValgrindTwoTargets-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/NotExist-stdout.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/Unknown-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestMemcheck/Unknown-stdout.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/BadArg-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadFILES-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadPARTS-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/PARTSCDashUpload-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-stderr.txt
 create mode 100644 Tests/RunCMake/RunCTest.cmake
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/CMakeLists.txt.in (75%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/CTestConfig.cmake.in (81%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyAddressSanitizer-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyAddressSanitizer-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyBC-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyBC-stderr.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyBC-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyBCNoLogFile-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyBCNoLogFile-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyLeakSanitizer-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyLeakSanitizer-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyMemorySanitizer-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyMemorySanitizer-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyPurify-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyPurify-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyPurifyNoLogFile-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyPurifyNoLogFile-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyThreadSanitizer-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyThreadSanitizer-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyUndefinedBehaviorSanitizer-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyUndefinedBehaviorSanitizer-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrind-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrind-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindCustomOptions-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindCustomOptions-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindFailPost-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindFailPost-stderr.txt (50%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindFailPost-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindFailPre-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindFailPre-stderr.txt (50%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stdout.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindIgnoreMemcheck-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindIgnoreMemcheck-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindInvalidSupFile-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stdout.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindNoLogFile-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindNoLogFile-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindPrePost-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindPrePost-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindTwoTargets-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/DummyValgrindTwoTargets-stdout.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/NotExist-result.txt (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/NotExist-stderr.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/NotExist-stdout.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/RunCMakeTest.cmake (88%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/Unknown-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_memcheck/Unknown-stdout.txt
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/test.cmake.in (94%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/testAddressSanitizer.cmake (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/testLeakSanitizer.cmake (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/testMemorySanitizer.cmake (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/testThreadSanitizer.cmake (100%)
 rename Tests/RunCMake/{CTestMemcheck => ctest_memcheck}/testUndefinedBehaviorSanitizer.cmake (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/BadArg-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/BadArg-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/BadFILES-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/BadFILES-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/BadPARTS-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/BadPARTS-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadFILES-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadFILES-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadFTP-result.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadFTP-stderr.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadNone-result.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadNone-stderr.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadPARTS-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadPARTS-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadRETRY_COUNT-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadRETRY_DELAY-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CMakeLists.txt.in (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CTestConfig.cmake.in (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-cp-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-cp-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-ftp-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-ftp-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-http-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-http-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-https-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-https-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-scp-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-scp-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-xmlrpc-result.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-xmlrpc-stderr.txt (54%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-xmlrpc-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/PARTSCDashUpload-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/PARTSCDashUpload-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/PARTSCDashUploadType-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/PARTSCDashUploadType-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/RepeatRETURN_VALUE-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/RunCMakeTest.cmake (70%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/test.cmake.in (100%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:12:35 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:12:35 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-276-g206ce77
Message-ID: <20150224141235.888E79C69B@public.kitware.com>

This is an automated email from 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  206ce77781d7f19a9877caab137d69cc5ce4bb05 (commit)
       via  ff1ddd2a73dd04e3015c2bc4ffe345f8c6ca02ee (commit)
       via  0b87b2a33902ac000a0073a1def887599c69809d (commit)
       via  fc58bdb9ad90ddd41c5336bc1ab2e35fa0f74d41 (commit)
       via  876a680d4851a39e77b49daa3c670fe2e535c1e6 (commit)
       via  49ba4545c272f5bb00828dfe35e5a63749b4aa43 (commit)
       via  f999dc0bbf70dcf6167d77a1dedabefa12edaef2 (commit)
       via  645ad117e1c8b3b99fda128daad708a87c0a3f2e (commit)
       via  19d1a5599a08f2e8d74c4483cb9ee6d34e38ecba (commit)
       via  1643b905e02473536d60ef4102d3154a6c8816d1 (commit)
       via  12db113944860269b72093424b17ad2f86bccf2f (commit)
      from  8366b1bd4fff38d2e928edee1f93acdee12365d4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=206ce77781d7f19a9877caab137d69cc5ce4bb05
commit 206ce77781d7f19a9877caab137d69cc5ce4bb05
Merge: 8366b1b ff1ddd2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:12:33 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 09:12:33 2015 -0500

    Merge topic 'ctest-output-options'
    
    ff1ddd2a ctest_upload: Add QUIET option
    0b87b2a3 ctest_memcheck: Add QUIET option
    fc58bdb9 ctest_coverage: Add QUIET option
    876a680d ctest_test: Add QUIET option
    49ba4545 ctest_build: Add QUIET option
    f999dc0b ctest_configure: Add QUIET option
    645ad117 ctest_update: Add QUIET option
    19d1a559 ctest_start: Add QUIET option
    1643b905 ctest_submit: Add QUIET option
    12db1139 CTest: Add cmCTestOptionalLog macro

diff --cc Tests/RunCMake/CMakeLists.txt
index e085b41,f654dbc..bd5b036
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -129,12 -129,18 +129,20 @@@ add_RunCMake_test(build_command
  add_RunCMake_test(export)
  add_RunCMake_test(cmake_minimum_required)
  add_RunCMake_test(continue)
+ add_RunCMake_test(ctest_build)
+ add_RunCMake_test(ctest_configure)
+ if(COVERAGE_COMMAND)
+   add_RunCMake_test(ctest_coverage -DCOVERAGE_COMMAND=${COVERAGE_COMMAND})
+ endif()
+ add_RunCMake_test(ctest_start)
  add_RunCMake_test(ctest_submit)
+ add_RunCMake_test(ctest_test)
+ add_RunCMake_test(ctest_upload)
  add_RunCMake_test(file)
 +add_RunCMake_test(find_file)
  add_RunCMake_test(find_library)
  add_RunCMake_test(find_package)
 +add_RunCMake_test(find_path)
  add_RunCMake_test(get_filename_component)
  add_RunCMake_test(get_property)
  add_RunCMake_test(if)

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

Summary of changes:
 Help/command/ctest_build.rst                       |    5 +
 Help/command/ctest_configure.rst                   |    6 +-
 Help/command/ctest_coverage.rst                    |    5 +
 Help/command/ctest_memcheck.rst                    |    4 +
 Help/command/ctest_start.rst                       |    5 +-
 Help/command/ctest_submit.rst                      |    4 +
 Help/command/ctest_test.rst                        |    6 +
 Help/command/ctest_update.rst                      |    7 +-
 Help/command/ctest_upload.rst                      |    5 +-
 Modules/CTestCoverageCollectGCOV.cmake             |   25 +-
 Source/CTest/cmCTestBuildCommand.cxx               |   15 +-
 Source/CTest/cmCTestBuildHandler.cxx               |   76 ++--
 Source/CTest/cmCTestConfigureCommand.cxx           |    5 +-
 Source/CTest/cmCTestConfigureHandler.cxx           |   13 +-
 Source/CTest/cmCTestCoverageCommand.cxx            |    5 +-
 Source/CTest/cmCTestCoverageHandler.cxx            |  372 ++++++++++----------
 Source/CTest/cmCTestCoverageHandler.h              |    3 +-
 Source/CTest/cmCTestGenericHandler.cxx             |    1 +
 Source/CTest/cmCTestGenericHandler.h               |    3 +
 Source/CTest/cmCTestHandlerCommand.cxx             |   16 +-
 Source/CTest/cmCTestHandlerCommand.h               |    1 +
 Source/CTest/cmCTestMemCheckCommand.cxx            |   14 +-
 Source/CTest/cmCTestMemCheckHandler.cxx            |   77 ++--
 Source/CTest/cmCTestMultiProcessHandler.cxx        |   47 ++-
 Source/CTest/cmCTestMultiProcessHandler.h          |    3 +
 Source/CTest/cmCTestRunTest.cxx                    |   14 +-
 Source/CTest/cmCTestStartCommand.cxx               |   23 +-
 Source/CTest/cmCTestStartCommand.h                 |   10 +
 Source/CTest/cmCTestSubmitCommand.cxx              |   26 +-
 Source/CTest/cmCTestSubmitHandler.cxx              |  239 +++++++------
 Source/CTest/cmCTestTestCommand.cxx                |    1 +
 Source/CTest/cmCTestTestHandler.cxx                |   64 ++--
 Source/CTest/cmCTestUpdateCommand.cxx              |   44 +--
 Source/CTest/cmCTestUpdateHandler.cxx              |   39 +-
 Source/CTest/cmCTestUploadCommand.cxx              |    7 +
 Source/CTest/cmCTestUploadHandler.cxx              |    4 +-
 Source/CTest/cmParseBlanketJSCoverage.cxx          |   12 +-
 Source/CTest/cmParseCacheCoverage.cxx              |    4 +-
 Source/CTest/cmParseCoberturaCoverage.cxx          |   15 +-
 Source/CTest/cmParseDelphiCoverage.cxx             |   19 +-
 Source/CTest/cmParseJacocoCoverage.cxx             |    9 +-
 Source/cmCTest.cxx                                 |  100 +++---
 Source/cmCTest.h                                   |   16 +-
 Tests/CTestUpdateCommon.cmake                      |    6 +
 Tests/CTestUpdateGIT.cmake.in                      |   33 ++
 Tests/RunCMake/CMakeLists.txt                      |    8 +
 Tests/RunCMake/ctest_build/BuildQuiet-stdout.txt   |   12 +
 Tests/RunCMake/ctest_build/CMakeLists.txt.in       |    4 +
 Tests/RunCMake/ctest_build/CTestConfig.cmake.in    |    1 +
 Tests/RunCMake/ctest_build/RunCMakeTest.cmake      |   10 +
 Tests/RunCMake/ctest_build/test.cmake.in           |   15 +
 Tests/RunCMake/ctest_configure/CMakeLists.txt.in   |    4 +
 .../RunCMake/ctest_configure/CTestConfig.cmake.in  |    1 +
 .../ctest_configure/ConfigureQuiet-stdout.txt      |    9 +
 Tests/RunCMake/ctest_configure/RunCMakeTest.cmake  |   10 +
 Tests/RunCMake/ctest_configure/test.cmake.in       |   14 +
 Tests/RunCMake/ctest_coverage/CMakeLists.txt.in    |    4 +
 Tests/RunCMake/ctest_coverage/CTestConfig.cmake.in |    1 +
 .../ctest_coverage/CoverageQuiet-stdout.txt        |    1 +
 Tests/RunCMake/ctest_coverage/RunCMakeTest.cmake   |   10 +
 Tests/RunCMake/ctest_coverage/test.cmake.in        |   18 +
 .../RunCMake/ctest_memcheck/DummyQuiet-stdout.txt  |    1 +
 Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake   |    1 +
 Tests/RunCMake/ctest_memcheck/test.cmake.in        |    2 +-
 Tests/RunCMake/ctest_start/CMakeLists.txt.in       |    4 +
 Tests/RunCMake/ctest_start/CTestConfig.cmake.in    |    1 +
 Tests/RunCMake/ctest_start/RunCMakeTest.cmake      |   10 +
 Tests/RunCMake/ctest_start/StartQuiet-stdout.txt   |    1 +
 Tests/RunCMake/ctest_start/test.cmake.in           |   13 +
 .../CDashSubmitQuiet-result.txt}                   |    0
 .../ctest_submit/CDashSubmitQuiet-stderr.txt       |    4 +
 .../ctest_submit/CDashSubmitQuiet-stdout.txt       |    3 +
 Tests/RunCMake/ctest_submit/RunCMakeTest.cmake     |    1 +
 Tests/RunCMake/ctest_test/CMakeLists.txt.in        |    4 +
 Tests/RunCMake/ctest_test/CTestConfig.cmake.in     |    1 +
 Tests/RunCMake/ctest_test/RunCMakeTest.cmake       |   10 +
 Tests/RunCMake/ctest_test/TestQuiet-stdout.txt     |    2 +
 Tests/RunCMake/ctest_test/test.cmake.in            |   16 +
 Tests/RunCMake/ctest_upload/CMakeLists.txt.in      |    4 +
 Tests/RunCMake/ctest_upload/CTestConfig.cmake.in   |    1 +
 Tests/RunCMake/ctest_upload/RunCMakeTest.cmake     |   10 +
 Tests/RunCMake/ctest_upload/UploadQuiet-stdout.txt |    1 +
 Tests/RunCMake/ctest_upload/test.cmake.in          |   14 +
 83 files changed, 1048 insertions(+), 586 deletions(-)
 create mode 100644 Tests/RunCMake/ctest_build/BuildQuiet-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_build/CMakeLists.txt.in
 create mode 100644 Tests/RunCMake/ctest_build/CTestConfig.cmake.in
 create mode 100644 Tests/RunCMake/ctest_build/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/ctest_build/test.cmake.in
 create mode 100644 Tests/RunCMake/ctest_configure/CMakeLists.txt.in
 create mode 100644 Tests/RunCMake/ctest_configure/CTestConfig.cmake.in
 create mode 100644 Tests/RunCMake/ctest_configure/ConfigureQuiet-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_configure/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/ctest_configure/test.cmake.in
 create mode 100644 Tests/RunCMake/ctest_coverage/CMakeLists.txt.in
 create mode 100644 Tests/RunCMake/ctest_coverage/CTestConfig.cmake.in
 create mode 100644 Tests/RunCMake/ctest_coverage/CoverageQuiet-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_coverage/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/ctest_coverage/test.cmake.in
 create mode 100644 Tests/RunCMake/ctest_memcheck/DummyQuiet-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_start/CMakeLists.txt.in
 create mode 100644 Tests/RunCMake/ctest_start/CTestConfig.cmake.in
 create mode 100644 Tests/RunCMake/ctest_start/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/ctest_start/StartQuiet-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_start/test.cmake.in
 copy Tests/RunCMake/{ctest_memcheck/DummyAddressSanitizer-result.txt => ctest_submit/CDashSubmitQuiet-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_test/CMakeLists.txt.in
 create mode 100644 Tests/RunCMake/ctest_test/CTestConfig.cmake.in
 create mode 100644 Tests/RunCMake/ctest_test/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/ctest_test/TestQuiet-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_test/test.cmake.in
 create mode 100644 Tests/RunCMake/ctest_upload/CMakeLists.txt.in
 create mode 100644 Tests/RunCMake/ctest_upload/CTestConfig.cmake.in
 create mode 100644 Tests/RunCMake/ctest_upload/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/ctest_upload/UploadQuiet-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_upload/test.cmake.in


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:12:38 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:12:38 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-278-g9123471
Message-ID: <20150224141238.59A3AA2AA8@public.kitware.com>

This is an automated email from 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  91234717f710c3922a03e8449bf12475b7d6f26b (commit)
       via  fe558718b30da989db8b880374012a0e580574e6 (commit)
      from  206ce77781d7f19a9877caab137d69cc5ce4bb05 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=91234717f710c3922a03e8449bf12475b7d6f26b
commit 91234717f710c3922a03e8449bf12475b7d6f26b
Merge: 206ce77 fe55871
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:12:37 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 09:12:37 2015 -0500

    Merge topic 'GetPrerequisites-file-command-update'
    
    fe558718 GetPrerequisites: Update output matching for newer 'file' versions


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:12:40 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:12:40 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-280-g133ab7a
Message-ID: <20150224141240.4ED56A48F9@public.kitware.com>

This is an automated email from 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  133ab7a4476f97c5c524bd1e7dcb65efe7d6f810 (commit)
       via  5857ca5e0d6c6f04486153f69184ba5d76b13f0b (commit)
      from  91234717f710c3922a03e8449bf12475b7d6f26b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=133ab7a4476f97c5c524bd1e7dcb65efe7d6f810
commit 133ab7a4476f97c5c524bd1e7dcb65efe7d6f810
Merge: 9123471 5857ca5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:12:39 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 09:12:39 2015 -0500

    Merge topic 'rpm_at_in_path'
    
    5857ca5e CPackRPM: Drop explicit handling of '@' symbols that breaks them (#14782)


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

Summary of changes:
 Modules/CPackRPM.cmake                             |   10 --------
 Tests/CPackComponentsForAll/CMakeLists.txt         |    2 +-
 .../RunCPackVerifyResult.cmake                     |   26 +++++++++++++++++++-
 3 files changed, 26 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:12:42 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:12:42 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-282-g3bda071
Message-ID: <20150224141242.4D2E0A4ED1@public.kitware.com>

This is an automated email from 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  3bda0717b31aa63e906cbc6129674a9e046f1066 (commit)
       via  0b54e8366e686340102867035e3dfdedf6f783b9 (commit)
      from  133ab7a4476f97c5c524bd1e7dcb65efe7d6f810 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3bda0717b31aa63e906cbc6129674a9e046f1066
commit 3bda0717b31aa63e906cbc6129674a9e046f1066
Merge: 133ab7a 0b54e83
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:12:41 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 09:12:41 2015 -0500

    Merge topic 'vs-midl-absolute-OutputDirectory'
    
    0b54e836 VS: Specify absolute output directory for the Midl tool


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

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


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:12:44 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:12:44 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-284-g13f9f84
Message-ID: <20150224141244.88A2D98386@public.kitware.com>

This is an automated email from 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  13f9f848defa75f7d728050b4d99d44b194642b2 (commit)
       via  38ef2b7363533746cfc14dbc55d696de3cc75386 (commit)
      from  3bda0717b31aa63e906cbc6129674a9e046f1066 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13f9f848defa75f7d728050b4d99d44b194642b2
commit 13f9f848defa75f7d728050b4d99d44b194642b2
Merge: 3bda071 38ef2b7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:12:43 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 09:12:43 2015 -0500

    Merge topic 'FeatureSummary-no-duplicates'
    
    38ef2b73 FeatureSummary: Print each feature info only once


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

Summary of changes:
 Modules/FeatureSummary.cmake                                   |    3 +++
 .../RunCMake/FeatureSummary/FeatureSummaryWhatOnce-stdout.txt  |    4 ++++
 Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce.cmake     |    8 ++++++++
 Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake               |    1 +
 4 files changed, 16 insertions(+)
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce-stdout.txt
 create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryWhatOnce.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:12:46 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:12:46 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-286-g41a16f0
Message-ID: <20150224141246.9955AA4ED1@public.kitware.com>

This is an automated email from 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  41a16f07c3b57e05927ba7706a4e3cebd7768ddf (commit)
       via  0ee2a004e70e2d49423f5b4b393896258e8ab688 (commit)
      from  13f9f848defa75f7d728050b4d99d44b194642b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41a16f07c3b57e05927ba7706a4e3cebd7768ddf
commit 41a16f07c3b57e05927ba7706a4e3cebd7768ddf
Merge: 13f9f84 0ee2a00
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:12:45 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 09:12:45 2015 -0500

    Merge topic 'osx-framework-search-platform-SDKs'
    
    0ee2a004 OS X: Add platform-specific Frameworks search path


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

Summary of changes:
 Modules/Platform/Darwin.cmake                             |    7 +++++++
 Tests/RunCMake/CMakeLists.txt                             |    2 +-
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake            |    3 +++
 Tests/RunCMake/XcodeProject/XcodePlatformFrameworks.cmake |    6 ++++++
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 Tests/RunCMake/XcodeProject/XcodePlatformFrameworks.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:12:48 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:12:48 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-288-gf67b806
Message-ID: <20150224141248.DD67D9C5C5@public.kitware.com>

This is an automated email from 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  f67b8065f603392ca794cc6f5c07bbbe6b077526 (commit)
       via  78ec4b16400111cab7cc0de3e7544b1b071b2abe (commit)
      from  41a16f07c3b57e05927ba7706a4e3cebd7768ddf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f67b8065f603392ca794cc6f5c07bbbe6b077526
commit f67b8065f603392ca794cc6f5c07bbbe6b077526
Merge: 41a16f0 78ec4b1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:12:47 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 09:12:47 2015 -0500

    Merge topic 'osx-CFBundleExecutable'
    
    78ec4b16 OS X: Shorten CFBundleExecutable to file name only


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

Summary of changes:
 Source/cmOSXBundleGenerator.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:13:04 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:13:04 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-678-g0e0a995
Message-ID: <20150224141304.B2CBA9BBF2@public.kitware.com>

This is an automated email from 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  0e0a995d4909910e08d2c95dfd95c336b81ab89c (commit)
       via  f67b8065f603392ca794cc6f5c07bbbe6b077526 (commit)
       via  41a16f07c3b57e05927ba7706a4e3cebd7768ddf (commit)
       via  13f9f848defa75f7d728050b4d99d44b194642b2 (commit)
       via  3bda0717b31aa63e906cbc6129674a9e046f1066 (commit)
       via  133ab7a4476f97c5c524bd1e7dcb65efe7d6f810 (commit)
       via  91234717f710c3922a03e8449bf12475b7d6f26b (commit)
       via  206ce77781d7f19a9877caab137d69cc5ce4bb05 (commit)
       via  8366b1bd4fff38d2e928edee1f93acdee12365d4 (commit)
       via  d83b40c58dbd8a37147377e159f1c5ae8ca2f8c6 (commit)
      from  38439c33a4250ef49129ec9d1978ff3fd0024cfb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e0a995d4909910e08d2c95dfd95c336b81ab89c
commit 0e0a995d4909910e08d2c95dfd95c336b81ab89c
Merge: 38439c3 f67b806
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:12:55 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:12:55 2015 -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 Feb 24 09:13:37 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:13:37 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-290-gd518aa7
Message-ID: <20150224141337.CB6F5A5BEC@public.kitware.com>

This is an automated email from 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  d518aa79a4a7ab5659a7cd67ee9c9ba374b26001 (commit)
       via  08d1e65a9ab89c6d23f6ace8d652dee278710586 (commit)
      from  f67b8065f603392ca794cc6f5c07bbbe6b077526 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d518aa79a4a7ab5659a7cd67ee9c9ba374b26001
commit d518aa79a4a7ab5659a7cd67ee9c9ba374b26001
Merge: f67b806 08d1e65
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:13:36 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 09:13:36 2015 -0500

    Merge topic 'FindMatlab-remove-trailing-lines'
    
    08d1e65a FindMatlab: Remove trailing blank lines


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

Summary of changes:
 Modules/FindMatlab.cmake |    1 -
 1 file changed, 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:13:51 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:13:51 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-680-g99e58d5
Message-ID: <20150224141351.6D72AA7696@public.kitware.com>

This is an automated email from 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  99e58d5e35fef0bd797e0674e3be7ef26eb6da6b (commit)
       via  d518aa79a4a7ab5659a7cd67ee9c9ba374b26001 (commit)
      from  0e0a995d4909910e08d2c95dfd95c336b81ab89c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99e58d5e35fef0bd797e0674e3be7ef26eb6da6b
commit 99e58d5e35fef0bd797e0674e3be7ef26eb6da6b
Merge: 0e0a995 d518aa7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:13:45 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:13:45 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:16:20 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:16:20 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-682-g62e71ca
Message-ID: <20150224141620.6389FA92BE@public.kitware.com>

This is an automated email from 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  62e71cadfed6f49104496c1dff176935f7fad6bd (commit)
       via  740892f979bdd5809fb18f3f529ad908bbebe5d4 (commit)
      from  99e58d5e35fef0bd797e0674e3be7ef26eb6da6b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62e71cadfed6f49104496c1dff176935f7fad6bd
commit 62e71cadfed6f49104496c1dff176935f7fad6bd
Merge: 99e58d5 740892f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:16:19 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 09:16:19 2015 -0500

    Merge topic 'cleanup-cmAlgorithms' into next
    
    740892f9 fixup! cmAlgorithms: Add a size() to cmRange.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=740892f979bdd5809fb18f3f529ad908bbebe5d4
commit 740892f979bdd5809fb18f3f529ad908bbebe5d4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:15:40 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:15:40 2015 -0500

    fixup! cmAlgorithms: Add a size() to cmRange.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 540ad39..b9d7e78 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -127,7 +127,8 @@ struct Range
 {
   typedef const_iterator_ const_iterator;
   typedef typename std::iterator_traits<const_iterator>::value_type value_type;
-  typedef typename std::iterator_traits<const_iterator>::difference_type difference_type;
+  typedef typename std::iterator_traits<const_iterator>::difference_type
+    difference_type;
   Range(const_iterator begin_, const_iterator end_)
     : Begin(begin_), End(end_) {}
   const_iterator begin() const { return Begin; }

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

Summary of changes:
 Source/cmAlgorithms.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:16:49 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:16:49 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-691-gd170c90
Message-ID: <20150224141649.194DEA9C42@public.kitware.com>

This is an automated email from 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  d170c90d0ad3b749355f15ad7f91f290d7329156 (commit)
       via  47c2da6aa8c8f77e8d01b68cd5de596da2b2c3d7 (commit)
       via  a5b10ae68a4a84face73767f96189673015946be (commit)
       via  7fd8557f4c3d761c8ec0e7c29c9fa74a3ff45295 (commit)
       via  1f7967913662429adcc509528086d6525acff317 (commit)
       via  ba959934a6a832e7d0a9f4bfc433e09aad1476f3 (commit)
       via  cae45df77235bf7314421f2520177f21179beb84 (commit)
       via  b917f4c003cb192f461345b66a9af1a3436b86b1 (commit)
       via  bbc1a9788d94ed9a6f710689611c63dcc52c8b09 (commit)
       via  47a3e22ea5aee971df1e04a6447bb916af81aa2c (commit)
       via  cb75eec0b45eda230996580043e00e38d35a1e5b (commit)
      from  62e71cadfed6f49104496c1dff176935f7fad6bd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d170c90d0ad3b749355f15ad7f91f290d7329156
commit d170c90d0ad3b749355f15ad7f91f290d7329156
Merge: 62e71ca 47c2da6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:16:48 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 09:16:48 2015 -0500

    Merge topic 'cleanup-cmAlgorithms' into next
    
    47c2da6a cmAlgorithms: Cache the end iterators in algorithms.
    a5b10ae6 cmAlgorithms: Remove needless assignment.
    7fd8557f cmAlgorithms: Maintain the pivot iterator in cmRemoveIndices.
    1f796791 cmAlgorithms: Relax iterator requirement for cmRemoveIndices.
    ba959934 cmAlgorithms: Make cmRemoveDuplicates work with more containers.
    cae45df7 cmAlgorithms: Rename template argument to RemoveN.
    b917f4c0 cmAlgorithms: Relax cmRemoveN requirement to FwdIter.
    bbc1a978 cmAlgorithms: Add a size() to cmRange.
    47a3e22e cmAlgorithms: Rename template type in cmDeleteAll algorithm.
    cb75eec0 cmAlgorithms: Add const to const objects.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47c2da6aa8c8f77e8d01b68cd5de596da2b2c3d7
commit 47c2da6aa8c8f77e8d01b68cd5de596da2b2c3d7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 22:19:14 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:16:02 2015 -0500

    cmAlgorithms: Cache the end iterators in algorithms.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 43023db..b9d7e78 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -236,6 +236,7 @@ template<typename Range, typename InputRange>
 typename Range::const_iterator cmRemoveIndices(Range& r, InputRange const& rem)
 {
   typename InputRange::const_iterator remIt = rem.begin();
+  typename InputRange::const_iterator remEnd = rem.end();
 
   typename Range::iterator writer = r.begin();
   std::advance(writer, *remIt);
@@ -243,13 +244,14 @@ typename Range::const_iterator cmRemoveIndices(Range& r, InputRange const& rem)
   typename InputRange::value_type prevRem = *remIt;
   ++remIt;
   size_t count = 1;
-  for ( ; writer != r.end() && remIt != rem.end(); ++count, ++remIt)
+  const typename Range::iterator rangeEnd = r.end();
+  for ( ; writer != rangeEnd && remIt != remEnd; ++count, ++remIt)
     {
     std::advance(pivot, *remIt - prevRem);
     prevRem = *remIt;
     writer = ContainerAlgorithms::RemoveN(writer, pivot, count);
     }
-  return ContainerAlgorithms::RemoveN(writer, r.end(), count);
+  return ContainerAlgorithms::RemoveN(writer, rangeEnd, count);
 }
 
 template<typename Range, typename MatchRange>
@@ -267,8 +269,9 @@ typename Range::const_iterator cmRemoveDuplicates(Range& r)
   unique.reserve(r.size());
   std::vector<size_t> indices;
   size_t count = 0;
+  const typename Range::iterator end = r.end();
   for(typename Range::const_iterator it = r.begin();
-      it != r.end(); ++it, ++count)
+      it != end; ++it, ++count)
     {
     const typename UniqueVector::iterator low =
         std::lower_bound(unique.begin(), unique.end(), *it);
@@ -283,7 +286,7 @@ typename Range::const_iterator cmRemoveDuplicates(Range& r)
     }
   if (indices.empty())
     {
-    return r.end();
+    return end;
     }
   return cmRemoveIndices(r, indices);
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5b10ae68a4a84face73767f96189673015946be
commit a5b10ae68a4a84face73767f96189673015946be
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 22:15:47 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:16:02 2015 -0500

    cmAlgorithms: Remove needless assignment.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index f00e1c0..43023db 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -249,8 +249,7 @@ typename Range::const_iterator cmRemoveIndices(Range& r, InputRange const& rem)
     prevRem = *remIt;
     writer = ContainerAlgorithms::RemoveN(writer, pivot, count);
     }
-  writer = ContainerAlgorithms::RemoveN(writer, r.end(), count);
-  return writer;
+  return ContainerAlgorithms::RemoveN(writer, r.end(), count);
 }
 
 template<typename Range, typename MatchRange>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7fd8557f4c3d761c8ec0e7c29c9fa74a3ff45295
commit 7fd8557f4c3d761c8ec0e7c29c9fa74a3ff45295
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 22:10:41 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:16:02 2015 -0500

    cmAlgorithms: Maintain the pivot iterator in cmRemoveIndices.
    
    Avoid the algorithm of 'Schlemiel the painter' in the case of
    iterators which are not RandomAccess.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 3dd5f95..f00e1c0 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -239,12 +239,14 @@ typename Range::const_iterator cmRemoveIndices(Range& r, InputRange const& rem)
 
   typename Range::iterator writer = r.begin();
   std::advance(writer, *remIt);
+  typename Range::iterator pivot = writer;
+  typename InputRange::value_type prevRem = *remIt;
   ++remIt;
   size_t count = 1;
   for ( ; writer != r.end() && remIt != rem.end(); ++count, ++remIt)
     {
-    typename Range::iterator pivot = r.begin();
-    std::advance(pivot, *remIt);
+    std::advance(pivot, *remIt - prevRem);
+    prevRem = *remIt;
     writer = ContainerAlgorithms::RemoveN(writer, pivot, count);
     }
   writer = ContainerAlgorithms::RemoveN(writer, r.end(), count);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f7967913662429adcc509528086d6525acff317
commit 1f7967913662429adcc509528086d6525acff317
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 22:07:28 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:16:02 2015 -0500

    cmAlgorithms: Relax iterator requirement for cmRemoveIndices.
    
    Require only forward iterators from the range.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 161a2cb..3dd5f95 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -237,12 +237,15 @@ typename Range::const_iterator cmRemoveIndices(Range& r, InputRange const& rem)
 {
   typename InputRange::const_iterator remIt = rem.begin();
 
-  typename Range::iterator writer = r.begin() + *remIt;
+  typename Range::iterator writer = r.begin();
+  std::advance(writer, *remIt);
   ++remIt;
   size_t count = 1;
   for ( ; writer != r.end() && remIt != rem.end(); ++count, ++remIt)
     {
-    writer = ContainerAlgorithms::RemoveN(writer, r.begin() + *remIt, count);
+    typename Range::iterator pivot = r.begin();
+    std::advance(pivot, *remIt);
+    writer = ContainerAlgorithms::RemoveN(writer, pivot, count);
     }
   writer = ContainerAlgorithms::RemoveN(writer, r.end(), count);
   return writer;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba959934a6a832e7d0a9f4bfc433e09aad1476f3
commit ba959934a6a832e7d0a9f4bfc433e09aad1476f3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 22:00:01 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:16:02 2015 -0500

    cmAlgorithms: Make cmRemoveDuplicates work with more containers.
    
    Remove the accidental requirement that the input range must be a
    std::vector.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index ca4c1fd..161a2cb 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -258,14 +258,15 @@ typename Range::const_iterator cmRemoveMatching(Range &r, MatchRange const& m)
 template<typename Range>
 typename Range::const_iterator cmRemoveDuplicates(Range& r)
 {
-  std::vector<typename Range::value_type> unique;
+  typedef std::vector<typename Range::value_type> UniqueVector;
+  UniqueVector unique;
   unique.reserve(r.size());
   std::vector<size_t> indices;
   size_t count = 0;
   for(typename Range::const_iterator it = r.begin();
       it != r.end(); ++it, ++count)
     {
-    const typename Range::iterator low =
+    const typename UniqueVector::iterator low =
         std::lower_bound(unique.begin(), unique.end(), *it);
     if (low == unique.end() || *low != *it)
       {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cae45df77235bf7314421f2520177f21179beb84
commit cae45df77235bf7314421f2520177f21179beb84
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 21:56:45 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:16:01 2015 -0500

    cmAlgorithms: Rename template argument to RemoveN.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 8790732..ca4c1fd 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -151,10 +151,10 @@ private:
   const_iterator End;
 };
 
-template<typename Iter>
-Iter RemoveN(Iter i1, Iter i2, size_t n)
+template<typename FwdIt>
+FwdIt RemoveN(FwdIt i1, FwdIt i2, size_t n)
 {
-  Iter m = i1;
+  FwdIt m = i1;
   std::advance(m, n);
   return cmRotate(i1, m, i2);
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b917f4c003cb192f461345b66a9af1a3436b86b1
commit b917f4c003cb192f461345b66a9af1a3436b86b1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 21:55:19 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:16:01 2015 -0500

    cmAlgorithms: Relax cmRemoveN requirement to FwdIter.
    
    cmRotate already requires only FwdIter.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index f90f105..8790732 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -154,7 +154,9 @@ private:
 template<typename Iter>
 Iter RemoveN(Iter i1, Iter i2, size_t n)
 {
-  return cmRotate(i1, i1 + n, i2);
+  Iter m = i1;
+  std::advance(m, n);
+  return cmRotate(i1, m, i2);
 }
 
 template<typename Range>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bbc1a9788d94ed9a6f710689611c63dcc52c8b09
commit bbc1a9788d94ed9a6f710689611c63dcc52c8b09
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 21:53:19 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:16:01 2015 -0500

    cmAlgorithms: Add a size() to cmRange.
    
    size() is already used by cmRemoveDuplicates, which is designed to
    accept a cmRange.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 4b03736..f90f105 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -127,11 +127,14 @@ struct Range
 {
   typedef const_iterator_ const_iterator;
   typedef typename std::iterator_traits<const_iterator>::value_type value_type;
+  typedef typename std::iterator_traits<const_iterator>::difference_type
+    difference_type;
   Range(const_iterator begin_, const_iterator end_)
     : Begin(begin_), End(end_) {}
   const_iterator begin() const { return Begin; }
   const_iterator end() const { return End; }
   bool empty() const { return std::distance(Begin, End) == 0; }
+  difference_type size() const { return std::distance(Begin, End); }
   Range& advance(cmIML_INT_intptr_t amount)
   {
     std::advance(Begin, amount);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47a3e22ea5aee971df1e04a6447bb916af81aa2c
commit 47a3e22ea5aee971df1e04a6447bb916af81aa2c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 21:52:36 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 23 20:19:35 2015 +0100

    cmAlgorithms: Rename template type in cmDeleteAll algorithm.
    
    It may be any range, not only a container.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index 56e7f17..4b03736 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -105,19 +105,19 @@ struct cmIsPair<std::pair<K, V> >
   enum { value = true };
 };
 
-template<typename Container,
-    bool valueTypeIsPair = cmIsPair<typename Container::value_type>::value>
+template<typename Range,
+    bool valueTypeIsPair = cmIsPair<typename Range::value_type>::value>
 struct DefaultDeleter
 {
-  void operator()(typename Container::value_type value) const {
+  void operator()(typename Range::value_type value) const {
     delete value;
   }
 };
 
-template<typename Container>
-struct DefaultDeleter<Container, /* valueTypeIsPair = */ true>
+template<typename Range>
+struct DefaultDeleter<Range, /* valueTypeIsPair = */ true>
 {
-  void operator()(typename Container::value_type value) const {
+  void operator()(typename Range::value_type value) const {
     delete value.second;
   }
 };
@@ -187,11 +187,11 @@ cmRange(Range const& range)
       range.begin(), range.end());
 }
 
-template<typename Container>
-void cmDeleteAll(Container const& c)
+template<typename Range>
+void cmDeleteAll(Range const& r)
 {
-  std::for_each(c.begin(), c.end(),
-                ContainerAlgorithms::DefaultDeleter<Container>());
+  std::for_each(r.begin(), r.end(),
+                ContainerAlgorithms::DefaultDeleter<Range>());
 }
 
 template<typename Range>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb75eec0b45eda230996580043e00e38d35a1e5b
commit cb75eec0b45eda230996580043e00e38d35a1e5b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 20 21:52:09 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 23 20:19:35 2015 +0100

    cmAlgorithms: Add const to const objects.

diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h
index b9bd67b..56e7f17 100644
--- a/Source/cmAlgorithms.h
+++ b/Source/cmAlgorithms.h
@@ -84,7 +84,7 @@ private:
 template<typename FwdIt>
 FwdIt cmRotate(FwdIt first, FwdIt middle, FwdIt last)
 {
-  typename std::iterator_traits<FwdIt>::difference_type dist =
+  const typename std::iterator_traits<FwdIt>::difference_type dist =
       std::distance(middle, last);
   std::rotate(first, middle, last);
   std::advance(first, dist);
@@ -204,7 +204,7 @@ std::string cmJoin(Range const& r, const char* delimiter)
   std::ostringstream os;
   typedef typename Range::value_type ValueType;
   typedef typename Range::const_iterator InputIt;
-  InputIt first = r.begin();
+  const InputIt first = r.begin();
   InputIt last = r.end();
   --last;
   std::copy(first, last,
@@ -260,7 +260,7 @@ typename Range::const_iterator cmRemoveDuplicates(Range& r)
   for(typename Range::const_iterator it = r.begin();
       it != r.end(); ++it, ++count)
     {
-    typename Range::iterator low =
+    const typename Range::iterator low =
         std::lower_bound(unique.begin(), unique.end(), *it);
     if (low == unique.end() || *low != *it)
       {

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:16:54 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:16:54 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-301-gac80f0f
Message-ID: <20150224141654.4DFC5A9C32@public.kitware.com>

This is an automated email from 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  ac80f0f95fc7cfbad17c2a5656a87e346b9f298a (commit)
       via  47c2da6aa8c8f77e8d01b68cd5de596da2b2c3d7 (commit)
       via  a5b10ae68a4a84face73767f96189673015946be (commit)
       via  7fd8557f4c3d761c8ec0e7c29c9fa74a3ff45295 (commit)
       via  1f7967913662429adcc509528086d6525acff317 (commit)
       via  ba959934a6a832e7d0a9f4bfc433e09aad1476f3 (commit)
       via  cae45df77235bf7314421f2520177f21179beb84 (commit)
       via  b917f4c003cb192f461345b66a9af1a3436b86b1 (commit)
       via  bbc1a9788d94ed9a6f710689611c63dcc52c8b09 (commit)
       via  47a3e22ea5aee971df1e04a6447bb916af81aa2c (commit)
       via  cb75eec0b45eda230996580043e00e38d35a1e5b (commit)
      from  d518aa79a4a7ab5659a7cd67ee9c9ba374b26001 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac80f0f95fc7cfbad17c2a5656a87e346b9f298a
commit ac80f0f95fc7cfbad17c2a5656a87e346b9f298a
Merge: d518aa7 47c2da6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:16:53 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 09:16:53 2015 -0500

    Merge topic 'cleanup-cmAlgorithms'
    
    47c2da6a cmAlgorithms: Cache the end iterators in algorithms.
    a5b10ae6 cmAlgorithms: Remove needless assignment.
    7fd8557f cmAlgorithms: Maintain the pivot iterator in cmRemoveIndices.
    1f796791 cmAlgorithms: Relax iterator requirement for cmRemoveIndices.
    ba959934 cmAlgorithms: Make cmRemoveDuplicates work with more containers.
    cae45df7 cmAlgorithms: Rename template argument to RemoveN.
    b917f4c0 cmAlgorithms: Relax cmRemoveN requirement to FwdIter.
    bbc1a978 cmAlgorithms: Add a size() to cmRange.
    47a3e22e cmAlgorithms: Rename template type in cmDeleteAll algorithm.
    cb75eec0 cmAlgorithms: Add const to const objects.


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

Summary of changes:
 Source/cmAlgorithms.h |   61 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:17:13 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:17:13 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-693-g7fd618b
Message-ID: <20150224141713.DB558A9DC4@public.kitware.com>

This is an automated email from 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  7fd618ba818b0f9c30777971852482c4c8d8ee8a (commit)
       via  ac80f0f95fc7cfbad17c2a5656a87e346b9f298a (commit)
      from  d170c90d0ad3b749355f15ad7f91f290d7329156 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7fd618ba818b0f9c30777971852482c4c8d8ee8a
commit 7fd618ba818b0f9c30777971852482c4c8d8ee8a
Merge: d170c90 ac80f0f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:17:01 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:17:01 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:32:43 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:32:43 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-695-g2a55898
Message-ID: <20150224143243.78DC0AB068@public.kitware.com>

This is an automated email from 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  2a558989f553964140f612fc6d7d0cc3dcae1a19 (commit)
       via  73da92702c6e26e859dabf55f2c9d74252021b1b (commit)
      from  7fd618ba818b0f9c30777971852482c4c8d8ee8a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a558989f553964140f612fc6d7d0cc3dcae1a19
commit 2a558989f553964140f612fc6d7d0cc3dcae1a19
Merge: 7fd618b 73da927
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:32:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 09:32:42 2015 -0500

    Merge topic 'refine-MSVC-ARM-WinCE' into next
    
    73da9270 MSVC: Compute architecture family for all target platforms


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73da92702c6e26e859dabf55f2c9d74252021b1b
commit 73da92702c6e26e859dabf55f2c9d74252021b1b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:27:49 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:27:49 2015 -0500

    MSVC: Compute architecture family for all target platforms

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 2d8dac9..267de3c 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -131,14 +131,18 @@ endif()
 # default to Debug builds
 set(CMAKE_BUILD_TYPE_INIT Debug)
 
+# Compute an architecture family from the architecture id.
+foreach(lang C CXX)
+  set(_MSVC_${lang}_ARCHITECTURE_FAMILY "${MSVC_${lang}_ARCHITECTURE_ID}")
+  if(_MSVC_${lang}_ARCHITECTURE_FAMILY MATCHES "^ARM")
+    set(_MSVC_${lang}_ARCHITECTURE_FAMILY "ARM")
+  elseif(_MSVC_${lang}_ARCHITECTURE_FAMILY MATCHES "^SH")
+    set(_MSVC_${lang}_ARCHITECTURE_FAMILY "SHx")
+  endif()
+endforeach()
+
 if(WINCE)
   foreach(lang C CXX)
-    set(_MSVC_${lang}_ARCHITECTURE_FAMILY "${MSVC_${lang}_ARCHITECTURE_ID}")
-    if(_MSVC_${lang}_ARCHITECTURE_FAMILY MATCHES "^ARM")
-      set(_MSVC_${lang}_ARCHITECTURE_FAMILY "ARM")
-    elseif(_MSVC_${lang}_ARCHITECTURE_FAMILY MATCHES "^SH")
-      set(_MSVC_${lang}_ARCHITECTURE_FAMILY "SHx")
-    endif()
     string(TOUPPER "${_MSVC_${lang}_ARCHITECTURE_FAMILY}" _MSVC_${lang}_ARCHITECTURE_FAMILY_UPPER)
   endforeach()
 

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

Summary of changes:
 Modules/Platform/Windows-MSVC.cmake |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:33:21 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:33:21 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-699-g8c9e5f5
Message-ID: <20150224143321.35D11AB07E@public.kitware.com>

This is an automated email from 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  8c9e5f5e73a474ab208694007e0bee63cb801304 (commit)
       via  3d612c735285d9a63d4981a2ca7bff44cd741e4b (commit)
       via  886dcaa7c5f91269b91da857d6eb2db3610d385e (commit)
       via  ea98667682f29e8f900c01c5c36eebebf80ea8c7 (commit)
      from  2a558989f553964140f612fc6d7d0cc3dcae1a19 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c9e5f5e73a474ab208694007e0bee63cb801304
commit 8c9e5f5e73a474ab208694007e0bee63cb801304
Merge: 2a55898 3d612c7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:33:20 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 09:33:20 2015 -0500

    Merge topic 'refine-MSVC-ARM-WinCE' into next
    
    3d612c73 MSVC: Compile with arch-specific flags on ARM platforms (#14552)
    886dcaa7 MSVC: Distinguish among ARM architectures more precisely (#14552)
    ea986676 MSVC: Define /DWINCE when building for WinCE platforms (#14552)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d612c735285d9a63d4981a2ca7bff44cd741e4b
commit 3d612c735285d9a63d4981a2ca7bff44cd741e4b
Author:     Gunnar Roth <gunnar.roth at gmx.de>
AuthorDate: Fri Feb 13 10:14:34 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:33:08 2015 -0500

    MSVC: Compile with arch-specific flags on ARM platforms (#14552)
    
    Define the exact ARM architecture name as a preprocessor symbol.
    Compile with /QRarch4T or /QRarch5T on ARMV4I or ARMV5I.

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 6df377b..267de3c 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -159,7 +159,18 @@ if(WINCE)
   set(_PLATFORM_DEFINES_CXX " /D${_MSVC_CXX_ARCHITECTURE_FAMILY} /D_${_MSVC_CXX_ARCHITECTURE_FAMILY_UPPER}_")
 
   set(_RTC1 "")
+  set(_FLAGS_C "")
   set(_FLAGS_CXX " /GR /EHsc")
+
+  foreach(lang C CXX)
+    if(_MSVC_${lang}_ARCHITECTURE_FAMILY STREQUAL "ARM")
+      set(_PLATFORM_DEFINES_${lang} "${_PLATFORM_DEFINES_${lang}} /D${MSVC_${lang}_ARCHITECTURE_ID}")
+      if(MSVC_${lang}_ARCHITECTURE_ID MATCHES "^ARMV([45])I$")
+        set(_FLAGS_${lang} "${_FLAGS_${lang}} /QRarch${CMAKE_MATCH_1}T")
+      endif()
+    endif()
+  endforeach()
+
   set(CMAKE_C_STANDARD_LIBRARIES_INIT "coredll.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib")
   set(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT} /NODEFAULTLIB:libc.lib /NODEFAULTLIB:oldnames.lib")
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=886dcaa7c5f91269b91da857d6eb2db3610d385e
commit 886dcaa7c5f91269b91da857d6eb2db3610d385e
Author:     Gunnar Roth <gunnar.roth at gmx.de>
AuthorDate: Fri Feb 13 10:11:38 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:33:08 2015 -0500

    MSVC: Distinguish among ARM architectures more precisely (#14552)
    
    Detect the exact ARM architecture instead of just "ARM".  Treat "ARM" as
    an architecture family that includes THUMB (ARMV4I and ARMV5I).

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index d22a867..403ac08 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -508,8 +508,6 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
         set(ARCHITECTURE_ID "SH4")
       elseif(peheader STREQUAL "50450000a801")
         set(ARCHITECTURE_ID "SH5")
-      elseif(peheader STREQUAL "50450000c201")
-        set(ARCHITECTURE_ID "THUMB")
       endif()
     endif()
 
diff --git a/Modules/CMakePlatformId.h.in b/Modules/CMakePlatformId.h.in
index bc26c07..da99b9e 100644
--- a/Modules/CMakePlatformId.h.in
+++ b/Modules/CMakePlatformId.h.in
@@ -1,3 +1,6 @@
+#define STRINGIFY_HELPER(X) #X
+#define STRINGIFY(X) STRINGIFY_HELPER(X)
+
 /* Identify known platforms by name.  */
 #if defined(__linux) || defined(__linux__) || defined(linux)
 # define PLATFORM_ID "Linux"
@@ -112,7 +115,13 @@
 #  define ARCHITECTURE_ID "X86"
 
 # elif defined(_M_ARM)
-#  define ARCHITECTURE_ID "ARM"
+#  if _M_ARM == 4
+#   define ARCHITECTURE_ID "ARMV4I"
+#  elif _M_ARM == 5
+#   define ARCHITECTURE_ID "ARMV5I"
+#  else
+#   define ARCHITECTURE_ID "ARMV" STRINGIFY(_M_ARM)
+#  endif
 
 # elif defined(_M_MIPS)
 #  define ARCHITECTURE_ID "MIPS"
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 4098c3f..6df377b 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -131,14 +131,18 @@ endif()
 # default to Debug builds
 set(CMAKE_BUILD_TYPE_INIT Debug)
 
+# Compute an architecture family from the architecture id.
+foreach(lang C CXX)
+  set(_MSVC_${lang}_ARCHITECTURE_FAMILY "${MSVC_${lang}_ARCHITECTURE_ID}")
+  if(_MSVC_${lang}_ARCHITECTURE_FAMILY MATCHES "^ARM")
+    set(_MSVC_${lang}_ARCHITECTURE_FAMILY "ARM")
+  elseif(_MSVC_${lang}_ARCHITECTURE_FAMILY MATCHES "^SH")
+    set(_MSVC_${lang}_ARCHITECTURE_FAMILY "SHx")
+  endif()
+endforeach()
+
 if(WINCE)
   foreach(lang C CXX)
-    set(_MSVC_${lang}_ARCHITECTURE_FAMILY "${MSVC_${lang}_ARCHITECTURE_ID}")
-    if(_MSVC_${lang}_ARCHITECTURE_FAMILY STREQUAL "THUMB")
-      set(_MSVC_${lang}_ARCHITECTURE_FAMILY "ARM")
-    elseif(_MSVC_${lang}_ARCHITECTURE_FAMILY MATCHES "^SH")
-      set(_MSVC_${lang}_ARCHITECTURE_FAMILY "SHx")
-    endif()
     string(TOUPPER "${_MSVC_${lang}_ARCHITECTURE_FAMILY}" _MSVC_${lang}_ARCHITECTURE_FAMILY_UPPER)
   endforeach()
 
@@ -168,7 +172,7 @@ elseif(WINDOWS_PHONE OR WINDOWS_STORE)
   set(_FLAGS_CXX " /DUNICODE /D_UNICODE /GR /EHsc")
   if(WINDOWS_PHONE)
     set(CMAKE_C_STANDARD_LIBRARIES_INIT "WindowsPhoneCore.lib RuntimeObject.lib PhoneAppModelHost.lib")
-  elseif(MSVC_C_ARCHITECTURE_ID STREQUAL ARM OR MSVC_CXX_ARCHITECTURE_ID STREQUAL ARM)
+  elseif(_MSVC_C_ARCHITECTURE_FAMILY STREQUAL "ARM" OR _MSVC_CXX_ARCHITECTURE_FAMILY STREQUAL "ARM")
     set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib")
   else()
     set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib")
@@ -176,7 +180,7 @@ elseif(WINDOWS_PHONE OR WINDOWS_STORE)
 else()
   set(_PLATFORM_DEFINES "/DWIN32")
 
-  if(MSVC_C_ARCHITECTURE_ID STREQUAL ARM OR MSVC_CXX_ARCHITECTURE_ID STREQUAL ARM)
+  if(_MSVC_C_ARCHITECTURE_FAMILY STREQUAL "ARM" OR _MSVC_CXX_ARCHITECTURE_FAMILY STREQUAL "ARM")
     set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib")
   elseif(MSVC_VERSION GREATER 1310)
     set(_RTC1 "/RTC1")
@@ -200,9 +204,21 @@ set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
 set (CMAKE_LINK_DEF_FILE_FLAG "/DEF:")
 # set the machine type
 if(MSVC_C_ARCHITECTURE_ID)
-  set(_MACHINE_ARCH_FLAG "/machine:${MSVC_C_ARCHITECTURE_ID}")
+  if(MSVC_C_ARCHITECTURE_ID MATCHES "^ARMV.I")
+    set(_MACHINE_ARCH_FLAG "/machine:THUMB")
+  elseif(_MSVC_C_ARCHITECTURE_FAMILY STREQUAL "ARM")
+    set(_MACHINE_ARCH_FLAG "/machine:ARM")
+  else()
+    set(_MACHINE_ARCH_FLAG "/machine:${MSVC_C_ARCHITECTURE_ID}")
+  endif()
 elseif(MSVC_CXX_ARCHITECTURE_ID)
-  set(_MACHINE_ARCH_FLAG "/machine:${MSVC_CXX_ARCHITECTURE_ID}")
+  if(MSVC_CXX_ARCHITECTURE_ID MATCHES "^ARMV.I")
+    set(_MACHINE_ARCH_FLAG "/machine:THUMB")
+  elseif(_MSVC_CXX_ARCHITECTURE_FAMILY STREQUAL "ARM")
+    set(_MACHINE_ARCH_FLAG "/machine:ARM")
+  else()
+    set(_MACHINE_ARCH_FLAG "/machine:${MSVC_CXX_ARCHITECTURE_ID}")
+  endif()
 elseif(MSVC_Fortran_ARCHITECTURE_ID)
   set(_MACHINE_ARCH_FLAG "/machine:${MSVC_Fortran_ARCHITECTURE_ID}")
 endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea98667682f29e8f900c01c5c36eebebf80ea8c7
commit ea98667682f29e8f900c01c5c36eebebf80ea8c7
Author:     Gunnar Roth <gunnar.roth at gmx.de>
AuthorDate: Fri Feb 13 10:10:26 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:33:06 2015 -0500

    MSVC: Define /DWINCE when building for WinCE platforms (#14552)

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 2440f89..4098c3f 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -150,7 +150,7 @@ if(WINCE)
     message(FATAL_ERROR "Invalid Windows CE version: ${CMAKE_SYSTEM_VERSION}")
   endif()
 
-  set(_PLATFORM_DEFINES "/D_WIN32_WCE=0x${_CE_VERSION} /DUNDER_CE")
+  set(_PLATFORM_DEFINES "/D_WIN32_WCE=0x${_CE_VERSION} /DUNDER_CE /DWINCE")
   set(_PLATFORM_DEFINES_C " /D${_MSVC_C_ARCHITECTURE_FAMILY} /D_${_MSVC_C_ARCHITECTURE_FAMILY_UPPER}_")
   set(_PLATFORM_DEFINES_CXX " /D${_MSVC_CXX_ARCHITECTURE_FAMILY} /D_${_MSVC_CXX_ARCHITECTURE_FAMILY_UPPER}_")
 

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 09:45:58 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 09:45:58 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-701-g1a0b06d
Message-ID: <20150224144558.54600AA2EB@public.kitware.com>

This is an automated email from 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  1a0b06dd6dc08b5253ea12e9f1b55dee1ac803be (commit)
       via  5d5067ae57c9d02656a54076cdf121c7084a4de3 (commit)
      from  8c9e5f5e73a474ab208694007e0bee63cb801304 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a0b06dd6dc08b5253ea12e9f1b55dee1ac803be
commit 1a0b06dd6dc08b5253ea12e9f1b55dee1ac803be
Merge: 8c9e5f5 5d5067a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 09:45:57 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 09:45:57 2015 -0500

    Merge topic 'CheckCompilerFlag-use-FLAGS' into next
    
    5d5067ae Check*CompilerFlag: Refactor method used to pass flags


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d5067ae57c9d02656a54076cdf121c7084a4de3
commit 5d5067ae57c9d02656a54076cdf121c7084a4de3
Author:     Mark Abraham <mark.j.abraham at gmail.com>
AuthorDate: Tue Feb 24 14:20:16 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 09:45:19 2015 -0500

    Check*CompilerFlag: Refactor method used to pass flags
    
    Refactor the Check*CompilerFlag modules to pass the flags to
    Check*SourceCompiles using CMAKE_REQUIRED_FLAGS instead of
    CMAKE_REQUIRED_DEFINITIONS.  Both end up being used, but the variable
    for "FLAGS" is more precise.

diff --git a/Modules/CheckCCompilerFlag.cmake b/Modules/CheckCCompilerFlag.cmake
index 53f3454..750e4fb 100644
--- a/Modules/CheckCCompilerFlag.cmake
+++ b/Modules/CheckCCompilerFlag.cmake
@@ -13,7 +13,7 @@
 #            Will be created as an internal cache variable.
 #
 # This internally calls the check_c_source_compiles macro and sets
-# CMAKE_REQUIRED_DEFINITIONS to <flag>.  See help for
+# CMAKE_REQUIRED_FLAGS to <flag>.  See help for
 # CheckCSourceCompiles for a listing of variables that can otherwise
 # modify the build.  The result only tells that the compiler does not
 # give an error message when it encounters the flag.  If the flag has
@@ -38,8 +38,8 @@ include(CheckCSourceCompiles)
 include(CMakeCheckCompilerFlagCommonPatterns)
 
 macro (CHECK_C_COMPILER_FLAG _FLAG _RESULT)
-   set(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
-   set(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
+   set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
+   set(CMAKE_REQUIRED_FLAGS "${_FLAG}")
 
    # Normalize locale during test compilation.
    set(_CheckCCompilerFlag_LOCALE_VARS LC_ALL LC_MESSAGES LANG)
@@ -60,5 +60,5 @@ macro (CHECK_C_COMPILER_FLAG _FLAG _RESULT)
    unset(_CheckCCompilerFlag_LOCALE_VARS)
    unset(_CheckCCompilerFlag_COMMON_PATTERNS)
 
-   set (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
+   set (CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
 endmacro ()
diff --git a/Modules/CheckCXXCompilerFlag.cmake b/Modules/CheckCXXCompilerFlag.cmake
index fab3a05..71b3fd2 100644
--- a/Modules/CheckCXXCompilerFlag.cmake
+++ b/Modules/CheckCXXCompilerFlag.cmake
@@ -12,7 +12,7 @@
 #   <var>  - variable to store the result
 #
 # This internally calls the check_cxx_source_compiles macro and sets
-# CMAKE_REQUIRED_DEFINITIONS to <flag>.  See help for
+# CMAKE_REQUIRED_FLAGS to <flag>.  See help for
 # CheckCXXSourceCompiles for a listing of variables that can otherwise
 # modify the build.  The result only tells that the compiler does not
 # give an error message when it encounters the flag.  If the flag has
@@ -37,8 +37,8 @@ include(CheckCXXSourceCompiles)
 include(CMakeCheckCompilerFlagCommonPatterns)
 
 macro (CHECK_CXX_COMPILER_FLAG _FLAG _RESULT)
-   set(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
-   set(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
+   set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
+   set(CMAKE_REQUIRED_FLAGS "${_FLAG}")
 
    # Normalize locale during test compilation.
    set(_CheckCXXCompilerFlag_LOCALE_VARS LC_ALL LC_MESSAGES LANG)
@@ -59,6 +59,6 @@ macro (CHECK_CXX_COMPILER_FLAG _FLAG _RESULT)
    unset(_CheckCXXCompilerFlag_LOCALE_VARS)
    unset(_CheckCXXCompilerFlag_COMMON_PATTERNS)
 
-   set (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
+   set (CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
 endmacro ()
 
diff --git a/Modules/CheckFortranCompilerFlag.cmake b/Modules/CheckFortranCompilerFlag.cmake
index 53fd8d6..c476661 100644
--- a/Modules/CheckFortranCompilerFlag.cmake
+++ b/Modules/CheckFortranCompilerFlag.cmake
@@ -13,7 +13,7 @@
 #            Will be created as an internal cache variable.
 #
 # This internally calls the check_fortran_source_compiles macro and
-# sets CMAKE_REQUIRED_DEFINITIONS to <flag>.  See help for
+# sets CMAKE_REQUIRED_FLAGS to <flag>.  See help for
 # CheckFortranSourceCompiles for a listing of variables that can
 # otherwise modify the build.  The result only tells that the compiler
 # does not give an error message when it encounters the flag.  If the
@@ -40,8 +40,8 @@ include(CheckFortranSourceCompiles)
 include(CMakeCheckCompilerFlagCommonPatterns)
 
 macro (CHECK_Fortran_COMPILER_FLAG _FLAG _RESULT)
-  set(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
-  set(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
+  set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
+  set(CMAKE_REQUIRED_FLAGS "${_FLAG}")
 
   # Normalize locale during test compilation.
   set(_CheckFortranCompilerFlag_LOCALE_VARS LC_ALL LC_MESSAGES LANG)
@@ -62,5 +62,5 @@ macro (CHECK_Fortran_COMPILER_FLAG _FLAG _RESULT)
   unset(_CheckFortranCompilerFlag_LOCALE_VARS)
   unset(_CheckFortranCompilerFlag_COMMON_PATTERNS)
 
-  set (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
+  set (CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
 endmacro ()

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

Summary of changes:
 Modules/CheckCCompilerFlag.cmake       |    8 ++++----
 Modules/CheckCXXCompilerFlag.cmake     |    8 ++++----
 Modules/CheckFortranCompilerFlag.cmake |    8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 10:33:11 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 10:33:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-703-g1c381be
Message-ID: <20150224153311.5D158AB068@public.kitware.com>

This is an automated email from 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  1c381be5e1c8d01288ab198520141da5f7d74a8f (commit)
       via  b10310e6e69588dc389dea7220f3bf3db8bc0d42 (commit)
      from  1a0b06dd6dc08b5253ea12e9f1b55dee1ac803be (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c381be5e1c8d01288ab198520141da5f7d74a8f
commit 1c381be5e1c8d01288ab198520141da5f7d74a8f
Merge: 1a0b06d b10310e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 10:33:10 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 10:33:10 2015 -0500

    Merge topic 'test-drop-CTestTestFailedSubmit' into next
    
    b10310e6 Tests: Drop CTestTestFailedSubmit-* tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b10310e6e69588dc389dea7220f3bf3db8bc0d42
commit b10310e6e69588dc389dea7220f3bf3db8bc0d42
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 10:02:23 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 10:03:27 2015 -0500

    Tests: Drop CTestTestFailedSubmit-* tests
    
    Everything they cover is now covered by RunCMake.ctest_submit test cases
    (except ctest_coverage LABELS which were not actually checked anyway).
    Drop these redundant tests.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 4d3aeaf..08765de 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2743,48 +2743,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFdSetSize/testOutput.log"
     )
 
-  function(add_failed_submit_test name source build in out log regex)
-    configure_file("${in}" "${out}" @ONLY)
-    add_test(${name} ${CMAKE_CTEST_COMMAND} -S "${out}" -V --output-log "${log}")
-    set_tests_properties(${name} PROPERTIES PASS_REGULAR_EXPRESSION "${regex}")
-  endfunction()
-
-  set(regex "(Problems when submitting via S*CP")
-  set(regex "${regex}|Error message was: ")
-  set(regex "${regex}([Cc]ould *n.t resolve host")
-  set(regex "${regex}|[Cc]ould *n.t connect to host")
-  set(regex "${regex}|Failed *t*o* connect to")
-  set(regex "${regex}|Connection timed out after [0-9]+ milliseconds")
-  set(regex "${regex}|Empty reply from server")
-  set(regex "${regex}|The requested URL returned error")
-  set(regex "${regex}|libcurl was built with SSL disabled. https: not supported)")
-  set(regex "${regex}|Submission method .xmlrpc. not compiled into CTest")
-  set(regex "${regex}|Submission problem")
-  set(regex "${regex}|Submission successful)")
-
-  set(ctest_coverage_labels_args "")
-
-  foreach(drop_method cp ftp http https scp xmlrpc)
-    # Cycle through these values each time through the loop:
-    if(ctest_coverage_labels_args STREQUAL "")
-      set(ctest_coverage_labels_args "LABELS Everything")
-    elseif(ctest_coverage_labels_args STREQUAL "LABELS Everything")
-      set(ctest_coverage_labels_args "LABELS 0ArgTest")
-    else()
-      set(ctest_coverage_labels_args "")
-    endif()
-
-    add_failed_submit_test(CTestTestFailedSubmit-${drop_method}
-      "${CMake_SOURCE_DIR}/Tests/CTestTest/SmallAndFast"
-      "${CMake_BINARY_DIR}/Tests/CTestTestFailedSubmits/${drop_method}"
-      "${CMake_SOURCE_DIR}/Tests/CTestTestFailedSubmits/test.cmake.in"
-      "${CMake_BINARY_DIR}/Tests/CTestTestFailedSubmits/test-${drop_method}.cmake"
-      "${CMake_BINARY_DIR}/Tests/CTestTestFailedSubmits/test-${drop_method}.log"
-      "${regex}"
-      )
-  endforeach()
-
-
   if (CMAKE_TESTS_CDASH_SERVER)
     set(regex "^([^:]+)://([^/]+)(.*)$")
 
diff --git a/Tests/CTestTestFailedSubmits/test.cmake.in b/Tests/CTestTestFailedSubmits/test.cmake.in
deleted file mode 100644
index 5ff836f..0000000
--- a/Tests/CTestTestFailedSubmits/test.cmake.in
+++ /dev/null
@@ -1,49 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-# CTestConfig.cmake settings:
-set(CTEST_PROJECT_NAME "SmallAndFast")
-
-# Intentionally leave out other upload-related CTestConfig.cmake settings
-# so that the ctest_submit call below fails with an error message...
-#
-set(CTEST_DROP_METHOD "@drop_method@")
-
-# Settings:
-set(CTEST_USE_LAUNCHERS 1)
-
-# Emit these compiler warnings:
-set(ENV{CXXFLAGS} "$ENV{CXXFLAGS} -Wall")
-
-set(CTEST_SITE                          "@SITE@")
-set(CTEST_BUILD_NAME                    "CTestTestLaunchers- at drop_method@")
-
-set(CTEST_SOURCE_DIRECTORY              "@source@")
-set(CTEST_BINARY_DIRECTORY              "@build@")
-set(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
-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_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
-set(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
-
-CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
-
-CTEST_START(Experimental)
-
-# explicitly do not use CTEST_UPDATE - avoid network activity
-
-CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}"
-  OPTIONS "-DCTEST_USE_LAUNCHERS:BOOL=${CTEST_USE_LAUNCHERS};-DSAF_INTENTIONAL_COMPILE_ERROR:BOOL=ON;-DSAF_INTENTIONAL_COMPILE_WARNING:BOOL=ON"
-  RETURN_VALUE res)
-CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
-CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
-CTEST_COVERAGE(BUILD "${CTEST_BINARY_DIRECTORY}" @ctest_coverage_labels_args@ RETURN_VALUE res)
-
-# ok to call ctest_submit - still avoids network activity because there is
-# not a valid drop location given above...
-CTEST_SUBMIT(RETURN_VALUE res)
-
-# Add coverage for the new APPEND arg to ctest_start:
-#
-CTEST_START(Experimental APPEND)

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

Summary of changes:
 Tests/CMakeLists.txt                       |   42 ------------------------
 Tests/CTestTestFailedSubmits/test.cmake.in |   49 ----------------------------
 2 files changed, 91 deletions(-)
 delete mode 100644 Tests/CTestTestFailedSubmits/test.cmake.in


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 10:37:07 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 10:37:07 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-705-gd608b74
Message-ID: <20150224153707.EB043AB109@public.kitware.com>

This is an automated email from 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  d608b74b92d989fb8ece93d7fdd729fe7ebc9cbe (commit)
       via  4ee9005d7304f922c95db19ffab2a9da4145b93b (commit)
      from  1c381be5e1c8d01288ab198520141da5f7d74a8f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d608b74b92d989fb8ece93d7fdd729fe7ebc9cbe
commit d608b74b92d989fb8ece93d7fdd729fe7ebc9cbe
Merge: 1c381be 4ee9005
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 10:37:07 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 10:37:07 2015 -0500

    Merge topic 'vs-midl-absolute-OutputDirectory' into next
    
    4ee9005d cmVisualStudio10TargetGenerator: Wrap long line


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ee9005d7304f922c95db19ffab2a9da4145b93b
commit 4ee9005d7304f922c95db19ffab2a9da4145b93b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 10:34:15 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 10:34:15 2015 -0500

    cmVisualStudio10TargetGenerator: Wrap long line

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index ca8310c..04d1487 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2522,7 +2522,8 @@ WriteMidlOptions(std::string const& /*config*/,
     }
   this->WriteString("%(AdditionalIncludeDirectories)"
                     "</AdditionalIncludeDirectories>\n", 0);
-  this->WriteString("<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>\n", 3);
+  this->WriteString("<OutputDirectory>$(ProjectDir)/$(IntDir)"
+                    "</OutputDirectory>\n", 3);
   this->WriteString("<HeaderFileName>%(Filename).h</HeaderFileName>\n", 3);
   this->WriteString(
     "<TypeLibraryName>%(Filename).tlb</TypeLibraryName>\n", 3);

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 13:32:01 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 13:32:01 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-707-g172ea18
Message-ID: <20150224183201.6F598AB049@public.kitware.com>

This is an automated email from 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  172ea187ef9486df4e1fe41cb6c6774e86a8bd46 (commit)
       via  987d4a1240a7578804435f13f9021de47e93dada (commit)
      from  d608b74b92d989fb8ece93d7fdd729fe7ebc9cbe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=172ea187ef9486df4e1fe41cb6c6774e86a8bd46
commit 172ea187ef9486df4e1fe41cb6c6774e86a8bd46
Merge: d608b74 987d4a1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 13:32:00 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 13:32:00 2015 -0500

    Merge topic 'sln-no-bom' into next
    
    987d4a12 VS: Do not generate a BOM in .sln files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=987d4a1240a7578804435f13f9021de47e93dada
commit 987d4a1240a7578804435f13f9021de47e93dada
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 13:29:42 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 13:30:50 2015 -0500

    VS: Do not generate a BOM in .sln files
    
    Revert commit v3.2.0-rc1~165^2 (Encoding:  Write Visual Studio solution
    file with BOM, 2014-12-26).  The BOM breaks the VS IDE version selector
    when loading the .sln from Windows Explorer.

diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 64f9cee..a67a649 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -93,11 +93,6 @@ void cmGlobalVisualStudio71Generator
                cmLocalGenerator* root,
                std::vector<cmLocalGenerator*>& generators)
 {
-#ifdef CMAKE_ENCODING_UTF8
-  // Add UTF-8 BOM for .sln file to indicate encoding
-  const unsigned char utf8_bom[3] = {0xEF,0xBB,0xBF};
-  fout.write(reinterpret_cast<const char*>(utf8_bom), 3);
-#endif
   // Write out the header for a SLN file
   this->WriteSLNHeader(fout);
 
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 0eb7d2c..401e475 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -558,11 +558,6 @@ void cmGlobalVisualStudio7Generator
                cmLocalGenerator* root,
                std::vector<cmLocalGenerator*>& generators)
 {
-#ifdef CMAKE_ENCODING_UTF8
-  // Add UTF-8 BOM for .sln file to indicate encoding
-  const unsigned char utf8_bom[3] = {0xEF,0xBB,0xBF};
-  fout.write(reinterpret_cast<const char*>(utf8_bom), 3);
-#endif
   // Write out the header for a SLN file
   this->WriteSLNHeader(fout);
 

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

Summary of changes:
 Source/cmGlobalVisualStudio71Generator.cxx |    5 -----
 Source/cmGlobalVisualStudio7Generator.cxx  |    5 -----
 2 files changed, 10 deletions(-)


hooks/post-receive
-- 
CMake

From zack.galbreath at kitware.com  Tue Feb 24 16:01:55 2015
From: zack.galbreath at kitware.com (Zack Galbreath)
Date: Tue, 24 Feb 2015 16:01:55 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-710-g1f09ba7
Message-ID: <20150224210155.6E0E3AAFA9@public.kitware.com>

This is an automated email from 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  1f09ba7030818eb51d5abd9f32e0ae3c873c43e2 (commit)
       via  817262dff24bc37af224254152900858f8f62494 (commit)
       via  9759197a80a2e3b295e3c1ef6f420a8d135521b0 (commit)
      from  172ea187ef9486df4e1fe41cb6c6774e86a8bd46 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f09ba7030818eb51d5abd9f32e0ae3c873c43e2
commit 1f09ba7030818eb51d5abd9f32e0ae3c873c43e2
Merge: 172ea18 817262d
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 24 16:01:53 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 16:01:53 2015 -0500

    Merge topic 'error_in_read_script' into next
    
    817262df new test case for ctest_build
    9759197a Change how CTest errors are reported


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=817262dff24bc37af224254152900858f8f62494
commit 817262dff24bc37af224254152900858f8f62494
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 24 14:09:40 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Tue Feb 24 14:09:40 2015 -0500

    new test case for ctest_build
    
    This demonstrates that "Error in read script" is not printed when
    compilation errors are encountered during a call to ctest_build().

diff --git a/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt b/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt
new file mode 100644
index 0000000..d8e63fa
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt
@@ -0,0 +1 @@
+Error\(s\) when building project$
diff --git a/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt b/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
new file mode 100644
index 0000000..63215c0
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
@@ -0,0 +1,16 @@
+Run dashboard with model Experimental
+   Source directory: .*/Tests/RunCMake/ctest_build/BuildCompileError
+   Build directory: .*/Tests/RunCMake/ctest_build/BuildCompileError-build
+   Reading ctest configuration file: .*/Tests/RunCMake/ctest_build/BuildCompileError/CTestConfig.cmake
+   Site: test-site
+   Build name: test-build-name
+   Use Experimental tag: [0-9-]+
+Configure project
+   Each . represents 1024 bytes of output
+    . Size of output: [0-9]+K
+Build project
+   Each symbol represents 1024 bytes of output.
+   '!' represents an error and '\*' a warning.
+    . Size of output: [0-9]+K
+   [1-9] Compiler errors
+   0 Compiler warnings
diff --git a/Tests/RunCMake/ctest_build/CMakeLists.txt.in b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
index 9ba08e9..55ccc19 100644
--- a/Tests/RunCMake/ctest_build/CMakeLists.txt.in
+++ b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
@@ -1,4 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
-project(CTestBuild at CASE_NAME@ NONE)
+project(CTestBuild at CASE_NAME@)
 include(CTest)
 add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
+add_executable(compile_error EXCLUDE_FROM_ALL
+  @RunCMake_SOURCE_DIR@/../../CTestTestFailure/badCode.cxx)
diff --git a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
index 5826fe4..2fc80d3 100644
--- a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
@@ -8,3 +8,4 @@ function(run_ctest_build CASE_NAME)
 endfunction()
 
 run_ctest_build(BuildQuiet QUIET)
+run_ctest_build(BuildCompileError TARGET compile_error)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9759197a80a2e3b295e3c1ef6f420a8d135521b0
commit 9759197a80a2e3b295e3c1ef6f420a8d135521b0
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Mon Feb 23 15:04:01 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Tue Feb 24 13:22:26 2015 -0500

    Change how CTest errors are reported
    
    "Error in read script" should only be displayed for issues
    that the site maintainer is expected to fix.  This message
    should not be displayed for more mundane problems like
    compilation errors & test failures.
    
    We distinguish between these two types of errors with the
    use of the following new function:
    cmCTestGenericHandler::SetScriptErrorOccurred(bool).

diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 790e488..ea95401 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -183,6 +183,7 @@ bool cmCTestCoverageHandler::StartCoverageLogFile(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open log file: "
       << covLogFilename << std::endl);
+    this->SetScriptErrorOccurred(true);
     return false;
     }
   std::string local_start_time = this->CTest->CurrentTime();
@@ -348,6 +349,7 @@ int cmCTestCoverageHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot create LastCoverage.log file" << std::endl);
+    this->SetScriptErrorOccurred(true);
     }
 
   ofs << "Performing coverage: " << elapsed_time_start << std::endl;
@@ -456,6 +458,7 @@ int cmCTestCoverageHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open coverage summary file." << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -523,6 +526,7 @@ int cmCTestCoverageHandler::ProcessHandler()
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find file: "
         << fullFileName << std::endl);
+      this->SetScriptErrorOccurred(true);
       continue;
       }
 
@@ -684,6 +688,7 @@ int cmCTestCoverageHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "  " << *erIt << std::endl);
       }
+    this->SetScriptErrorOccurred(true);
     }
 
   long total_lines = total_tested + total_untested;
@@ -1005,6 +1010,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Could not find gcov." << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::string gcovExtraFlags
@@ -1112,6 +1118,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << errors << std::endl);
       cont->Error ++;
+      this->SetScriptErrorOccurred(true);
       continue;
       }
     if ( retVal != 0 )
@@ -1120,6 +1127,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
         << retVal << " while processing: " << *it << std::endl);
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << cont->Error << std::endl);
+      this->SetScriptErrorOccurred(true);
       }
     cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "--------------------------------------------------------------"
@@ -1156,6 +1164,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e1"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1173,6 +1182,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e2"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1189,6 +1199,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e3"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1206,6 +1217,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e4"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
         }
@@ -1220,6 +1232,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e5"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1236,6 +1249,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e6"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1253,6 +1267,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e7"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1270,6 +1285,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e8"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1287,6 +1303,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE,
             "Unknown gcov output line: [" << *line << "]"
             << std::endl);
+          this->SetScriptErrorOccurred(true);
           cont->Error ++;
           //abort();
           }
@@ -1310,6 +1327,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           {
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
             << gcovFile << std::endl);
+          this->SetScriptErrorOccurred(true);
           }
         else
           {
@@ -1526,6 +1544,7 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << errors << std::endl);
       cont->Error ++;
+      this->SetScriptErrorOccurred(true);
       continue;
       }
     if ( retVal != 0 )
@@ -1534,6 +1553,7 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
         << retVal << " while processing: " << *it << std::endl);
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << cont->Error << std::endl);
+      this->SetScriptErrorOccurred(true);
       }
     cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "--------------------------------------------------------------"
@@ -1584,6 +1604,7 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
           {
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
                      << lcovFile << std::endl);
+          this->SetScriptErrorOccurred(true);
           }
         std::string srcname;
 
@@ -1593,6 +1614,7 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE,
                      "Error while parsing lcov file '" << lcovFile << "':"
                      << " No source file name found!" << std::endl);
+          this->SetScriptErrorOccurred(true);
           return 0;
           }
         srcname = srcname.substr(18);
@@ -1626,6 +1648,7 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
             {
             cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
                        << lcovFile << std::endl);
+            this->SetScriptErrorOccurred(true);
             }
           else
             {
@@ -1801,6 +1824,7 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Cannot find source Python file corresponding to: "
         << *fileIt << std::endl);
+      this->SetScriptErrorOccurred(true);
       continue;
       }
 
@@ -1818,6 +1842,7 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
         << *fileIt << std::endl);
+      this->SetScriptErrorOccurred(true);
       }
     else
       {
@@ -1854,6 +1879,7 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
               cmCTestLog(this->CTest, ERROR_MESSAGE,
                 "Currently the limit is maximum coverage of 999999"
                 << std::endl);
+              this->SetScriptErrorOccurred(true);
               }
             }
           }
@@ -1948,6 +1974,7 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Files and full path files not the same size?:\n");
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   // create the output stream for the CoverageLog-N.xml file
@@ -1955,6 +1982,7 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
   int logFileCount = 0;
   if ( !this->StartCoverageLogFile(covLogFile, logFileCount) )
     {
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   // for each file run covbr on that file to get the coverage
@@ -1966,6 +1994,7 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
   if(!this->RunBullseyeCommand(cont, "covbr", 0, outputFile))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error running covbr for." << "\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -1977,6 +2006,7 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Cannot open coverage file: " <<
                outputFile << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::map<std::string, std::string> fileMap;
@@ -2089,6 +2119,7 @@ int cmCTestCoverageHandler::RunBullseyeCommand(
   if(program.empty())
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find :" << cmd << "\n");
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   if(arg)
@@ -2120,6 +2151,7 @@ int cmCTestCoverageHandler::RunBullseyeCommand(
                << program << " " << arg << "\n"
                << "kwsys process state : "
                << runCoverageSrc.GetProcessState());
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   // since we set the output file names wait for it to end
@@ -2137,6 +2169,7 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
   if(!this->RunBullseyeCommand(cont, "covsrc", "-c", outputFile))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error running covsrc:\n");
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
 
@@ -2147,6 +2180,7 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open coverage summary file." << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   this->CTest->StartXML(covSumFile, this->AppendXML);
@@ -2187,6 +2221,7 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Cannot open coverage summary file: " <<
                outputFile << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::set<std::string> coveredFileNames;
@@ -2351,6 +2386,7 @@ int cmCTestCoverageHandler::HandleBullseyeCoverage(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Error running bullseye summary.\n");
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   cmCTestOptionalLog(this->CTest, DEBUG, "HandleBullseyeCoverage return 1 "
@@ -2389,6 +2425,7 @@ bool cmCTestCoverageHandler::ParseBullsEyeCovsrcLine(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error parsing string : "
                << inputLine << "\n");
+    this->SetScriptErrorOccurred(true);
     return false;
     }
   // the source file has "" around it so extract out the file name
@@ -2424,6 +2461,7 @@ bool cmCTestCoverageHandler::ParseBullsEyeCovsrcLine(
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error parsing input : "
                << inputLine << " last pos not npos =  " << pos <<
                "\n");
+    this->SetScriptErrorOccurred(true);
     }
   return true;
 }
diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx
index 81eb0a8..c16ec2b 100644
--- a/Source/CTest/cmCTestGenericHandler.cxx
+++ b/Source/CTest/cmCTestGenericHandler.cxx
@@ -23,6 +23,7 @@ cmCTestGenericHandler::cmCTestGenericHandler()
   this->SubmitIndex = 0;
   this->AppendXML = false;
   this->Quiet = false;
+  this->ScriptErrorOccurred = false;
 }
 
 //----------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h
index 8567dd7..d83ad7b 100644
--- a/Source/CTest/cmCTestGenericHandler.h
+++ b/Source/CTest/cmCTestGenericHandler.h
@@ -90,6 +90,12 @@ public:
   void SetQuiet(bool b) { this->Quiet = b; }
   bool GetQuiet() { return this->Quiet; }
 
+  /**
+   * Get/Set whether or not a script-level error occurred.
+   */
+  bool GetScriptErrorOccurred() { return this->ScriptErrorOccurred; }
+  void SetScriptErrorOccurred(bool b) { this->ScriptErrorOccurred = b; }
+
 protected:
   bool StartResultingXML(cmCTest::Part part,
                          const char* name, cmGeneratedFileStream& xofs);
@@ -97,6 +103,7 @@ protected:
 
   bool AppendXML;
   bool Quiet;
+  bool ScriptErrorOccurred;
   cmSystemTools::OutputOption HandlerVerbose;
   cmCTest *CTest;
   t_StringToString Options;
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index 3003e8a..571e539 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -141,6 +141,12 @@ bool cmCTestHandlerCommand
   cmSystemTools::ChangeDirectory(
     this->CTest->GetCTestConfiguration("BuildDirectory"));
   int res = handler->ProcessHandler();
+  cmSystemTools::ChangeDirectory(current_dir);
+
+  if (handler->GetScriptErrorOccurred())
+    {
+    return false;
+    }
   if ( this->Values[ct_RETURN_VALUE] && *this->Values[ct_RETURN_VALUE])
     {
     std::ostringstream str;
@@ -148,7 +154,6 @@ bool cmCTestHandlerCommand
     this->Makefile->AddDefinition(
       this->Values[ct_RETURN_VALUE], str.str().c_str());
     }
-  cmSystemTools::ChangeDirectory(current_dir);
   return true;
 }
 
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 061f3fd..f603297 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -51,6 +51,7 @@ static void xmlReportError(int line, const char* msg, void* data)
   cmCTestLog(ctest, ERROR_MESSAGE,
              "Error parsing XML in stream at line "
              << line << ": " << msg << std::endl);
+  ctest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
 }
 
 // parse the xml file containing the results of last BoundsChecker run
@@ -111,6 +112,7 @@ public:
         this->Errors.push_back(cmCTestMemCheckHandler::ABW); // do not know
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "No Category found in Bounds checker XML\n" );
+        this->CTest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
         return;
         }
       while(ptr->ErrorCategory && cat)
@@ -128,6 +130,7 @@ public:
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "Found unknown Bounds Checker error "
                    << ptr->ErrorCategory << std::endl);
+        this->CTest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
         }
     }
   cmCTest* CTest;
@@ -175,6 +178,7 @@ int cmCTestMemCheckHandler::PreProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Problem executing pre-memcheck command(s)." << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   return 1;
@@ -187,6 +191,7 @@ int cmCTestMemCheckHandler::PostProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Problem executing post-memcheck command(s)." << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   return 1;
@@ -646,6 +651,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
             "Cannot find memory checker suppression file: "
             << this->CTest->GetCTestConfiguration(
               "MemoryCheckSuppressionFile") << std::endl);
+          this->SetScriptErrorOccurred(true);
           return false;
           }
         std::string suppressions = "--suppressions="
@@ -671,6 +677,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
                      "Cannot find memory checker suppression file: "
                      << this->CTest->GetCTestConfiguration(
                        "MemoryCheckSuppressionFile").c_str() << std::endl);
+          this->SetScriptErrorOccurred(true);
           return false;
           }
         std::string filterFiles = "/FilterFiles="
@@ -742,6 +749,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Do not understand memory checker: " << this->MemoryTester
         << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
     }
 
@@ -908,6 +916,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckPurifyOutput(
           << pfW.match(1) << std::endl);
         ostr << "*** Unknown Purify memory fault: " << pfW.match(1)
           << std::endl;
+        this->SetScriptErrorOccurred(true);
         }
       }
     if ( failure != this->ResultStrings.size() )
@@ -1143,6 +1152,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckBoundsCheckerOutput(
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "Error in ParseChunk: " << theLine
                    << std::endl);
+        this->SetScriptErrorOccurred(true);
         }
       }
     }
@@ -1217,6 +1227,7 @@ cmCTestMemCheckHandler::PostProcessBoundsCheckerTest(cmCTestTestResult& res,
     {
     std::string log = "Cannot read memory tester output file: " + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
+    this->SetScriptErrorOccurred(true);
     return;
     }
   res.Output += BOUNDS_CHECKER_MARKER;
@@ -1252,6 +1263,7 @@ cmCTestMemCheckHandler::AppendMemTesterOutput(cmCTestTestResult& res,
     {
     std::string log = "Cannot read memory tester output file: " + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
+    this->SetScriptErrorOccurred(true);
     return;
     }
   std::string line;
@@ -1290,6 +1302,7 @@ void cmCTestMemCheckHandler::TestOutputFileNames(int test,
       std::string log = "Cannot find memory tester output file: "
         + ofile;
       cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       ofile = "";
       }
     else
@@ -1303,6 +1316,7 @@ void cmCTestMemCheckHandler::TestOutputFileNames(int test,
     std::string log = "Cannot find memory tester output file: "
       + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
+    this->SetScriptErrorOccurred(true);
     ofile = "";
     }
   files.push_back(ofile);
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index d585863..ddb5f4c 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -235,6 +235,7 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
           << local_file << std::endl);
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
+        this->SetScriptErrorOccurred(true);
         return false;
         }
       unsigned long filelen = cmSystemTools::FileLength(local_file);
@@ -314,6 +315,7 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
         *this->LogFile << std::endl;
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
+        this->SetScriptErrorOccurred(true);
         return false;
         }
       // always cleanup
@@ -477,6 +479,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
           << local_file << std::endl);
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
+        this->SetScriptErrorOccurred(true);
         return false;
         }
       unsigned long filelen = cmSystemTools::FileLength(local_file);
@@ -621,6 +624,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
           }
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
+        this->SetScriptErrorOccurred(true);
         return false;
         }
       // always cleanup
@@ -783,6 +787,7 @@ bool cmCTestSubmitHandler::TriggerUsingHTTP(
           }
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
+        this->SetScriptErrorOccurred(true);
         return false;
         }
 
@@ -908,6 +913,7 @@ bool cmCTestSubmitHandler::SubmitUsingSCP(
   cmsysProcess_Delete(cp);
   if ( problems )
     {
+    this->SetScriptErrorOccurred(true);
     return false;
     }
   return true;
@@ -929,6 +935,7 @@ bool cmCTestSubmitHandler::SubmitUsingCP(
                << "\tNumber of files: " << files.size() << "\n"
                << "\tremoteprefix: " << remoteprefix << "\n"
                << "\tdestination: " << destination << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
 
@@ -996,6 +1003,7 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot find file: "
         << local_file.c_str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
       }
 
@@ -1006,6 +1014,7 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  File too big: "
         << local_file.c_str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
       }
     size_t fileSize = static_cast<size_t>(st.st_size);
@@ -1014,6 +1023,7 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot open file: "
         << local_file.c_str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
       }
 
@@ -1024,6 +1034,7 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       fclose(fp);
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot read file: "
         << local_file.c_str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
       }
     fclose(fp);
@@ -1041,6 +1052,7 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
         << env.fault_string << " (" << env.fault_code << ")" << std::endl);
       xmlrpc_env_clean(&env);
       xmlrpc_client_cleanup();
+      this->SetScriptErrorOccurred(true);
       return false;
       }
 
@@ -1097,12 +1109,14 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Upload file not specified\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if (!cmSystemTools::FileExists(file))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Upload file not found: '" << file << "'\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestCurl curl(this->CTest);
@@ -1120,6 +1134,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Only http and https are supported for CDASH_UPLOAD\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   char md5sum[33];
@@ -1162,6 +1177,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Error in HttpRequest\n" << response);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -1173,6 +1189,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error parsing json string [" << response << "]\n"
                << reader.getFormattedErrorMessages() << "\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(json["status"].asInt() != 0)
@@ -1180,6 +1197,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Bad status returned from CDash: "
                << json["status"].asInt());
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(json["datafilesmd5"].isArray())
@@ -1198,6 +1216,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "bad datafilesmd5 value in response "
                << response << "\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -1212,6 +1231,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error uploading to CDash. "
                << file << " " << url << " " << fstr.str());
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(!reader.parse(response, json))
@@ -1219,6 +1239,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error parsing json string [" << response << "]\n"
                << reader.getFormattedErrorMessages() << "\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -1249,6 +1270,7 @@ int cmCTestSubmitHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot find BuildDirectory  key in the DartConfiguration.tcl"
       << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -1457,6 +1479,7 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via FTP"
         << std::endl);
       ofs << "   Problems when submitting via FTP" << std::endl;
+      this->SetScriptErrorOccurred(true);
       return -1;
       }
     if(!this->CDash)
@@ -1474,6 +1497,7 @@ int cmCTestSubmitHandler::ProcessHandler()
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "   Problems when triggering via HTTP" << std::endl);
         ofs << "   Problems when triggering via HTTP" << std::endl;
+        this->SetScriptErrorOccurred(true);
         return -1;
         }
       cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
@@ -1517,6 +1541,7 @@ int cmCTestSubmitHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "   Problems when submitting via HTTP" << std::endl);
       ofs << "   Problems when submitting via HTTP" << std::endl;
+      this->SetScriptErrorOccurred(true);
       return -1;
       }
     if(!this->CDash)
@@ -1532,6 +1557,7 @@ int cmCTestSubmitHandler::ProcessHandler()
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "   Problems when triggering via HTTP" << std::endl);
         ofs << "   Problems when triggering via HTTP" << std::endl;
+        this->SetScriptErrorOccurred(true);
         return -1;
         }
       }
@@ -1567,6 +1593,7 @@ int cmCTestSubmitHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "   Problems when submitting via XML-RPC" << std::endl);
       ofs << "   Problems when submitting via XML-RPC" << std::endl;
+      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
@@ -1577,6 +1604,7 @@ int cmCTestSubmitHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "   Submission method \"xmlrpc\" not compiled into CTest!"
                << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
 #endif
     }
@@ -1605,6 +1633,7 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via SCP"
         << std::endl);
       ofs << "   Problems when submitting via SCP" << std::endl;
+      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmSystemTools::ChangeDirectory(oldWorkingDirectory);
@@ -1638,6 +1667,7 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via CP"
         << std::endl);
       ofs << "   Problems when submitting via cp" << std::endl;
+      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmSystemTools::ChangeDirectory(oldWorkingDirectory);
@@ -1649,6 +1679,7 @@ int cmCTestSubmitHandler::ProcessHandler()
 
   cmCTestLog(this->CTest, ERROR_MESSAGE, "   Unknown submission method: \""
     << dropMethod << "\"" << std::endl);
+  this->SetScriptErrorOccurred(true);
   return -1;
 }
 
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx
index b18786a..57e9216 100644
--- a/Source/CTest/cmCTestUpdateHandler.cxx
+++ b/Source/CTest/cmCTestUpdateHandler.cxx
@@ -204,6 +204,7 @@ int cmCTestUpdateHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot find SourceDirectory  key in the DartConfiguration.tcl"
       << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -253,6 +254,7 @@ int cmCTestUpdateHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open log file"
       << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   std::string start_time = this->CTest->CurrentTime();
@@ -318,12 +320,14 @@ int cmCTestUpdateHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "   There are modified or conflicting files in the repository"
       << std::endl);
+    this->SetScriptErrorOccurred(true);
     }
   if(!updated)
     {
     os << "Update command failed:\n" << vc->GetUpdateCommandLine();
     cmCTestLog(this->CTest, ERROR_MESSAGE, "   Update command failed: "
                << vc->GetUpdateCommandLine() << "\n");
+    this->SetScriptErrorOccurred(true);
     }
   os << "</UpdateReturnStatus>" << std::endl;
   os << "</Update>" << std::endl;
@@ -424,6 +428,7 @@ bool cmCTestUpdateHandler::SelectVCS()
         }
       e << " configuration key.";
       cmCTestLog(this->CTest, ERROR_MESSAGE, e.str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
       }
     }
diff --git a/Source/CTest/cmCTestUploadHandler.cxx b/Source/CTest/cmCTestUploadHandler.cxx
index 579190a..965f88e 100644
--- a/Source/CTest/cmCTestUploadHandler.cxx
+++ b/Source/CTest/cmCTestUploadHandler.cxx
@@ -42,6 +42,7 @@ int cmCTestUploadHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open Upload.xml file" << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   std::string buildname = cmCTest::SafeBuildIdField(
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index e6d3960..aec943e 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -3122,7 +3122,6 @@ void cmCTest::Log(int logType, const char* file, int line, const char* msg,
       cmCTestLogOutputFileLine(err);
       err << msg;
       err.flush();
-      cmSystemTools::SetErrorOccured();
       break;
     default:
       cmCTestLogOutputFileLine(out);
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ccfe2b1..f989aff 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -382,8 +382,21 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
         {
         if(!status.GetNestedError())
           {
-          // The command invocation requested that we report an error.
-          this->IssueMessage(cmake::FATAL_ERROR, pcmd->GetError());
+          if (cmSystemTools::GetFilenameName(
+              this->GetSafeDefinition("CMAKE_CURRENT_LIST_FILE")) ==
+              this->GetSafeDefinition("CTEST_SCRIPT_NAME") &&
+              std::string(pcmd->GetError()).find("unknown error") !=
+              std::string::npos)
+            {
+            // Don't report "unknown error" from a CTest script.
+            // Instead simply note that an error occurred.
+            cmSystemTools::SetFatalErrorOccured();
+            }
+          else
+            {
+            // The command invocation requested that we report an error.
+            this->IssueMessage(cmake::FATAL_ERROR, pcmd->GetError());
+            }
           }
         result = false;
         if ( this->GetCMakeInstance()->GetWorkingMode() != cmake::NORMAL_MODE)

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

Summary of changes:
 Source/CTest/cmCTestCoverageHandler.cxx            |   38 ++++++++++++++++++++
 Source/CTest/cmCTestGenericHandler.cxx             |    1 +
 Source/CTest/cmCTestGenericHandler.h               |    7 ++++
 Source/CTest/cmCTestHandlerCommand.cxx             |    7 +++-
 Source/CTest/cmCTestMemCheckHandler.cxx            |   14 ++++++++
 Source/CTest/cmCTestSubmitHandler.cxx              |   31 ++++++++++++++++
 Source/CTest/cmCTestUpdateHandler.cxx              |    5 +++
 Source/CTest/cmCTestUploadHandler.cxx              |    1 +
 Source/cmCTest.cxx                                 |    1 -
 Source/cmMakefile.cxx                              |   17 +++++++--
 .../ctest_build/BuildCompileError-stderr.txt       |    1 +
 .../ctest_build/BuildCompileError-stdout.txt       |   16 +++++++++
 Tests/RunCMake/ctest_build/CMakeLists.txt.in       |    4 ++-
 Tests/RunCMake/ctest_build/RunCMakeTest.cmake      |    1 +
 14 files changed, 139 insertions(+), 5 deletions(-)
 create mode 100644 Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt


hooks/post-receive
-- 
CMake

From zack.galbreath at kitware.com  Tue Feb 24 16:19:44 2015
From: zack.galbreath at kitware.com (Zack Galbreath)
Date: Tue, 24 Feb 2015 16:19:44 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-715-gd81a19c
Message-ID: <20150224211944.251CEAA931@public.kitware.com>

This is an automated email from 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  d81a19c7edb2dffa9f4bdbdeadacc8cce16522b2 (commit)
       via  1e9d94195d8d2c5ef36f68314d3a7786235cc98a (commit)
       via  fde2c82eaaee2fe29f564b0ed5d95283aed5abf5 (commit)
       via  f8b1fc024135d61e8e5b01a914422db3c6a92333 (commit)
       via  ae98b7c754601dc524cede3f564cf17d5d076de0 (commit)
      from  1f09ba7030818eb51d5abd9f32e0ae3c873c43e2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d81a19c7edb2dffa9f4bdbdeadacc8cce16522b2
commit d81a19c7edb2dffa9f4bdbdeadacc8cce16522b2
Merge: 1f09ba7 1e9d941
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 24 16:19:43 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 16:19:43 2015 -0500

    Merge topic 'revert_error_in_read_script' into next
    
    1e9d9419 Revert "Change how CTest errors are reported"
    fde2c82e Revert "new test case for ctest_build"
    f8b1fc02 new test case for ctest_build
    ae98b7c7 Change how CTest errors are reported


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e9d94195d8d2c5ef36f68314d3a7786235cc98a
commit 1e9d94195d8d2c5ef36f68314d3a7786235cc98a
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 24 16:19:10 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Tue Feb 24 16:19:10 2015 -0500

    Revert "Change how CTest errors are reported"
    
    This reverts commit 9759197a80a2e3b295e3c1ef6f420a8d135521b0.

diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index ea95401..790e488 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -183,7 +183,6 @@ bool cmCTestCoverageHandler::StartCoverageLogFile(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open log file: "
       << covLogFilename << std::endl);
-    this->SetScriptErrorOccurred(true);
     return false;
     }
   std::string local_start_time = this->CTest->CurrentTime();
@@ -349,7 +348,6 @@ int cmCTestCoverageHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot create LastCoverage.log file" << std::endl);
-    this->SetScriptErrorOccurred(true);
     }
 
   ofs << "Performing coverage: " << elapsed_time_start << std::endl;
@@ -458,7 +456,6 @@ int cmCTestCoverageHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open coverage summary file." << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -526,7 +523,6 @@ int cmCTestCoverageHandler::ProcessHandler()
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find file: "
         << fullFileName << std::endl);
-      this->SetScriptErrorOccurred(true);
       continue;
       }
 
@@ -688,7 +684,6 @@ int cmCTestCoverageHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "  " << *erIt << std::endl);
       }
-    this->SetScriptErrorOccurred(true);
     }
 
   long total_lines = total_tested + total_untested;
@@ -1010,7 +1005,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Could not find gcov." << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::string gcovExtraFlags
@@ -1118,7 +1112,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << errors << std::endl);
       cont->Error ++;
-      this->SetScriptErrorOccurred(true);
       continue;
       }
     if ( retVal != 0 )
@@ -1127,7 +1120,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
         << retVal << " while processing: " << *it << std::endl);
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << cont->Error << std::endl);
-      this->SetScriptErrorOccurred(true);
       }
     cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "--------------------------------------------------------------"
@@ -1164,7 +1156,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e1"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1182,7 +1173,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e2"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1199,7 +1189,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e3"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1217,7 +1206,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e4"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
         }
@@ -1232,7 +1220,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e5"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1249,7 +1236,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e6"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1267,7 +1253,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e7"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1285,7 +1270,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e8"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1303,7 +1287,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE,
             "Unknown gcov output line: [" << *line << "]"
             << std::endl);
-          this->SetScriptErrorOccurred(true);
           cont->Error ++;
           //abort();
           }
@@ -1327,7 +1310,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           {
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
             << gcovFile << std::endl);
-          this->SetScriptErrorOccurred(true);
           }
         else
           {
@@ -1544,7 +1526,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << errors << std::endl);
       cont->Error ++;
-      this->SetScriptErrorOccurred(true);
       continue;
       }
     if ( retVal != 0 )
@@ -1553,7 +1534,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
         << retVal << " while processing: " << *it << std::endl);
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << cont->Error << std::endl);
-      this->SetScriptErrorOccurred(true);
       }
     cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "--------------------------------------------------------------"
@@ -1604,7 +1584,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
           {
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
                      << lcovFile << std::endl);
-          this->SetScriptErrorOccurred(true);
           }
         std::string srcname;
 
@@ -1614,7 +1593,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE,
                      "Error while parsing lcov file '" << lcovFile << "':"
                      << " No source file name found!" << std::endl);
-          this->SetScriptErrorOccurred(true);
           return 0;
           }
         srcname = srcname.substr(18);
@@ -1648,7 +1626,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
             {
             cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
                        << lcovFile << std::endl);
-            this->SetScriptErrorOccurred(true);
             }
           else
             {
@@ -1824,7 +1801,6 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Cannot find source Python file corresponding to: "
         << *fileIt << std::endl);
-      this->SetScriptErrorOccurred(true);
       continue;
       }
 
@@ -1842,7 +1818,6 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
         << *fileIt << std::endl);
-      this->SetScriptErrorOccurred(true);
       }
     else
       {
@@ -1879,7 +1854,6 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
               cmCTestLog(this->CTest, ERROR_MESSAGE,
                 "Currently the limit is maximum coverage of 999999"
                 << std::endl);
-              this->SetScriptErrorOccurred(true);
               }
             }
           }
@@ -1974,7 +1948,6 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Files and full path files not the same size?:\n");
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   // create the output stream for the CoverageLog-N.xml file
@@ -1982,7 +1955,6 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
   int logFileCount = 0;
   if ( !this->StartCoverageLogFile(covLogFile, logFileCount) )
     {
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   // for each file run covbr on that file to get the coverage
@@ -1994,7 +1966,6 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
   if(!this->RunBullseyeCommand(cont, "covbr", 0, outputFile))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error running covbr for." << "\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -2006,7 +1977,6 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Cannot open coverage file: " <<
                outputFile << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::map<std::string, std::string> fileMap;
@@ -2119,7 +2089,6 @@ int cmCTestCoverageHandler::RunBullseyeCommand(
   if(program.empty())
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find :" << cmd << "\n");
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   if(arg)
@@ -2151,7 +2120,6 @@ int cmCTestCoverageHandler::RunBullseyeCommand(
                << program << " " << arg << "\n"
                << "kwsys process state : "
                << runCoverageSrc.GetProcessState());
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   // since we set the output file names wait for it to end
@@ -2169,7 +2137,6 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
   if(!this->RunBullseyeCommand(cont, "covsrc", "-c", outputFile))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error running covsrc:\n");
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
 
@@ -2180,7 +2147,6 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open coverage summary file." << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   this->CTest->StartXML(covSumFile, this->AppendXML);
@@ -2221,7 +2187,6 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Cannot open coverage summary file: " <<
                outputFile << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::set<std::string> coveredFileNames;
@@ -2386,7 +2351,6 @@ int cmCTestCoverageHandler::HandleBullseyeCoverage(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Error running bullseye summary.\n");
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   cmCTestOptionalLog(this->CTest, DEBUG, "HandleBullseyeCoverage return 1 "
@@ -2425,7 +2389,6 @@ bool cmCTestCoverageHandler::ParseBullsEyeCovsrcLine(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error parsing string : "
                << inputLine << "\n");
-    this->SetScriptErrorOccurred(true);
     return false;
     }
   // the source file has "" around it so extract out the file name
@@ -2461,7 +2424,6 @@ bool cmCTestCoverageHandler::ParseBullsEyeCovsrcLine(
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error parsing input : "
                << inputLine << " last pos not npos =  " << pos <<
                "\n");
-    this->SetScriptErrorOccurred(true);
     }
   return true;
 }
diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx
index c16ec2b..81eb0a8 100644
--- a/Source/CTest/cmCTestGenericHandler.cxx
+++ b/Source/CTest/cmCTestGenericHandler.cxx
@@ -23,7 +23,6 @@ cmCTestGenericHandler::cmCTestGenericHandler()
   this->SubmitIndex = 0;
   this->AppendXML = false;
   this->Quiet = false;
-  this->ScriptErrorOccurred = false;
 }
 
 //----------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h
index d83ad7b..8567dd7 100644
--- a/Source/CTest/cmCTestGenericHandler.h
+++ b/Source/CTest/cmCTestGenericHandler.h
@@ -90,12 +90,6 @@ public:
   void SetQuiet(bool b) { this->Quiet = b; }
   bool GetQuiet() { return this->Quiet; }
 
-  /**
-   * Get/Set whether or not a script-level error occurred.
-   */
-  bool GetScriptErrorOccurred() { return this->ScriptErrorOccurred; }
-  void SetScriptErrorOccurred(bool b) { this->ScriptErrorOccurred = b; }
-
 protected:
   bool StartResultingXML(cmCTest::Part part,
                          const char* name, cmGeneratedFileStream& xofs);
@@ -103,7 +97,6 @@ protected:
 
   bool AppendXML;
   bool Quiet;
-  bool ScriptErrorOccurred;
   cmSystemTools::OutputOption HandlerVerbose;
   cmCTest *CTest;
   t_StringToString Options;
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index 571e539..3003e8a 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -141,12 +141,6 @@ bool cmCTestHandlerCommand
   cmSystemTools::ChangeDirectory(
     this->CTest->GetCTestConfiguration("BuildDirectory"));
   int res = handler->ProcessHandler();
-  cmSystemTools::ChangeDirectory(current_dir);
-
-  if (handler->GetScriptErrorOccurred())
-    {
-    return false;
-    }
   if ( this->Values[ct_RETURN_VALUE] && *this->Values[ct_RETURN_VALUE])
     {
     std::ostringstream str;
@@ -154,6 +148,7 @@ bool cmCTestHandlerCommand
     this->Makefile->AddDefinition(
       this->Values[ct_RETURN_VALUE], str.str().c_str());
     }
+  cmSystemTools::ChangeDirectory(current_dir);
   return true;
 }
 
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index f603297..061f3fd 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -51,7 +51,6 @@ static void xmlReportError(int line, const char* msg, void* data)
   cmCTestLog(ctest, ERROR_MESSAGE,
              "Error parsing XML in stream at line "
              << line << ": " << msg << std::endl);
-  ctest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
 }
 
 // parse the xml file containing the results of last BoundsChecker run
@@ -112,7 +111,6 @@ public:
         this->Errors.push_back(cmCTestMemCheckHandler::ABW); // do not know
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "No Category found in Bounds checker XML\n" );
-        this->CTest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
         return;
         }
       while(ptr->ErrorCategory && cat)
@@ -130,7 +128,6 @@ public:
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "Found unknown Bounds Checker error "
                    << ptr->ErrorCategory << std::endl);
-        this->CTest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
         }
     }
   cmCTest* CTest;
@@ -178,7 +175,6 @@ int cmCTestMemCheckHandler::PreProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Problem executing pre-memcheck command(s)." << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   return 1;
@@ -191,7 +187,6 @@ int cmCTestMemCheckHandler::PostProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Problem executing post-memcheck command(s)." << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   return 1;
@@ -651,7 +646,6 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
             "Cannot find memory checker suppression file: "
             << this->CTest->GetCTestConfiguration(
               "MemoryCheckSuppressionFile") << std::endl);
-          this->SetScriptErrorOccurred(true);
           return false;
           }
         std::string suppressions = "--suppressions="
@@ -677,7 +671,6 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
                      "Cannot find memory checker suppression file: "
                      << this->CTest->GetCTestConfiguration(
                        "MemoryCheckSuppressionFile").c_str() << std::endl);
-          this->SetScriptErrorOccurred(true);
           return false;
           }
         std::string filterFiles = "/FilterFiles="
@@ -749,7 +742,6 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Do not understand memory checker: " << this->MemoryTester
         << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
     }
 
@@ -916,7 +908,6 @@ bool cmCTestMemCheckHandler::ProcessMemCheckPurifyOutput(
           << pfW.match(1) << std::endl);
         ostr << "*** Unknown Purify memory fault: " << pfW.match(1)
           << std::endl;
-        this->SetScriptErrorOccurred(true);
         }
       }
     if ( failure != this->ResultStrings.size() )
@@ -1152,7 +1143,6 @@ bool cmCTestMemCheckHandler::ProcessMemCheckBoundsCheckerOutput(
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "Error in ParseChunk: " << theLine
                    << std::endl);
-        this->SetScriptErrorOccurred(true);
         }
       }
     }
@@ -1227,7 +1217,6 @@ cmCTestMemCheckHandler::PostProcessBoundsCheckerTest(cmCTestTestResult& res,
     {
     std::string log = "Cannot read memory tester output file: " + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
-    this->SetScriptErrorOccurred(true);
     return;
     }
   res.Output += BOUNDS_CHECKER_MARKER;
@@ -1263,7 +1252,6 @@ cmCTestMemCheckHandler::AppendMemTesterOutput(cmCTestTestResult& res,
     {
     std::string log = "Cannot read memory tester output file: " + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
-    this->SetScriptErrorOccurred(true);
     return;
     }
   std::string line;
@@ -1302,7 +1290,6 @@ void cmCTestMemCheckHandler::TestOutputFileNames(int test,
       std::string log = "Cannot find memory tester output file: "
         + ofile;
       cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       ofile = "";
       }
     else
@@ -1316,7 +1303,6 @@ void cmCTestMemCheckHandler::TestOutputFileNames(int test,
     std::string log = "Cannot find memory tester output file: "
       + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
-    this->SetScriptErrorOccurred(true);
     ofile = "";
     }
   files.push_back(ofile);
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index ddb5f4c..d585863 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -235,7 +235,6 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
           << local_file << std::endl);
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
-        this->SetScriptErrorOccurred(true);
         return false;
         }
       unsigned long filelen = cmSystemTools::FileLength(local_file);
@@ -315,7 +314,6 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
         *this->LogFile << std::endl;
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
-        this->SetScriptErrorOccurred(true);
         return false;
         }
       // always cleanup
@@ -479,7 +477,6 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
           << local_file << std::endl);
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
-        this->SetScriptErrorOccurred(true);
         return false;
         }
       unsigned long filelen = cmSystemTools::FileLength(local_file);
@@ -624,7 +621,6 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
           }
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
-        this->SetScriptErrorOccurred(true);
         return false;
         }
       // always cleanup
@@ -787,7 +783,6 @@ bool cmCTestSubmitHandler::TriggerUsingHTTP(
           }
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
-        this->SetScriptErrorOccurred(true);
         return false;
         }
 
@@ -913,7 +908,6 @@ bool cmCTestSubmitHandler::SubmitUsingSCP(
   cmsysProcess_Delete(cp);
   if ( problems )
     {
-    this->SetScriptErrorOccurred(true);
     return false;
     }
   return true;
@@ -935,7 +929,6 @@ bool cmCTestSubmitHandler::SubmitUsingCP(
                << "\tNumber of files: " << files.size() << "\n"
                << "\tremoteprefix: " << remoteprefix << "\n"
                << "\tdestination: " << destination << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
 
@@ -1003,7 +996,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot find file: "
         << local_file.c_str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
       }
 
@@ -1014,7 +1006,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  File too big: "
         << local_file.c_str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
       }
     size_t fileSize = static_cast<size_t>(st.st_size);
@@ -1023,7 +1014,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot open file: "
         << local_file.c_str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
       }
 
@@ -1034,7 +1024,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       fclose(fp);
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot read file: "
         << local_file.c_str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
       }
     fclose(fp);
@@ -1052,7 +1041,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
         << env.fault_string << " (" << env.fault_code << ")" << std::endl);
       xmlrpc_env_clean(&env);
       xmlrpc_client_cleanup();
-      this->SetScriptErrorOccurred(true);
       return false;
       }
 
@@ -1109,14 +1097,12 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Upload file not specified\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if (!cmSystemTools::FileExists(file))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Upload file not found: '" << file << "'\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestCurl curl(this->CTest);
@@ -1134,7 +1120,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Only http and https are supported for CDASH_UPLOAD\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   char md5sum[33];
@@ -1177,7 +1162,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Error in HttpRequest\n" << response);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -1189,7 +1173,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error parsing json string [" << response << "]\n"
                << reader.getFormattedErrorMessages() << "\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(json["status"].asInt() != 0)
@@ -1197,7 +1180,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Bad status returned from CDash: "
                << json["status"].asInt());
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(json["datafilesmd5"].isArray())
@@ -1216,7 +1198,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "bad datafilesmd5 value in response "
                << response << "\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -1231,7 +1212,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error uploading to CDash. "
                << file << " " << url << " " << fstr.str());
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(!reader.parse(response, json))
@@ -1239,7 +1219,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error parsing json string [" << response << "]\n"
                << reader.getFormattedErrorMessages() << "\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -1270,7 +1249,6 @@ int cmCTestSubmitHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot find BuildDirectory  key in the DartConfiguration.tcl"
       << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -1479,7 +1457,6 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via FTP"
         << std::endl);
       ofs << "   Problems when submitting via FTP" << std::endl;
-      this->SetScriptErrorOccurred(true);
       return -1;
       }
     if(!this->CDash)
@@ -1497,7 +1474,6 @@ int cmCTestSubmitHandler::ProcessHandler()
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "   Problems when triggering via HTTP" << std::endl);
         ofs << "   Problems when triggering via HTTP" << std::endl;
-        this->SetScriptErrorOccurred(true);
         return -1;
         }
       cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
@@ -1541,7 +1517,6 @@ int cmCTestSubmitHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "   Problems when submitting via HTTP" << std::endl);
       ofs << "   Problems when submitting via HTTP" << std::endl;
-      this->SetScriptErrorOccurred(true);
       return -1;
       }
     if(!this->CDash)
@@ -1557,7 +1532,6 @@ int cmCTestSubmitHandler::ProcessHandler()
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "   Problems when triggering via HTTP" << std::endl);
         ofs << "   Problems when triggering via HTTP" << std::endl;
-        this->SetScriptErrorOccurred(true);
         return -1;
         }
       }
@@ -1593,7 +1567,6 @@ int cmCTestSubmitHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "   Problems when submitting via XML-RPC" << std::endl);
       ofs << "   Problems when submitting via XML-RPC" << std::endl;
-      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
@@ -1604,7 +1577,6 @@ int cmCTestSubmitHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "   Submission method \"xmlrpc\" not compiled into CTest!"
                << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
 #endif
     }
@@ -1633,7 +1605,6 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via SCP"
         << std::endl);
       ofs << "   Problems when submitting via SCP" << std::endl;
-      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmSystemTools::ChangeDirectory(oldWorkingDirectory);
@@ -1667,7 +1638,6 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via CP"
         << std::endl);
       ofs << "   Problems when submitting via cp" << std::endl;
-      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmSystemTools::ChangeDirectory(oldWorkingDirectory);
@@ -1679,7 +1649,6 @@ int cmCTestSubmitHandler::ProcessHandler()
 
   cmCTestLog(this->CTest, ERROR_MESSAGE, "   Unknown submission method: \""
     << dropMethod << "\"" << std::endl);
-  this->SetScriptErrorOccurred(true);
   return -1;
 }
 
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx
index 57e9216..b18786a 100644
--- a/Source/CTest/cmCTestUpdateHandler.cxx
+++ b/Source/CTest/cmCTestUpdateHandler.cxx
@@ -204,7 +204,6 @@ int cmCTestUpdateHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot find SourceDirectory  key in the DartConfiguration.tcl"
       << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -254,7 +253,6 @@ int cmCTestUpdateHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open log file"
       << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   std::string start_time = this->CTest->CurrentTime();
@@ -320,14 +318,12 @@ int cmCTestUpdateHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "   There are modified or conflicting files in the repository"
       << std::endl);
-    this->SetScriptErrorOccurred(true);
     }
   if(!updated)
     {
     os << "Update command failed:\n" << vc->GetUpdateCommandLine();
     cmCTestLog(this->CTest, ERROR_MESSAGE, "   Update command failed: "
                << vc->GetUpdateCommandLine() << "\n");
-    this->SetScriptErrorOccurred(true);
     }
   os << "</UpdateReturnStatus>" << std::endl;
   os << "</Update>" << std::endl;
@@ -428,7 +424,6 @@ bool cmCTestUpdateHandler::SelectVCS()
         }
       e << " configuration key.";
       cmCTestLog(this->CTest, ERROR_MESSAGE, e.str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
       }
     }
diff --git a/Source/CTest/cmCTestUploadHandler.cxx b/Source/CTest/cmCTestUploadHandler.cxx
index 965f88e..579190a 100644
--- a/Source/CTest/cmCTestUploadHandler.cxx
+++ b/Source/CTest/cmCTestUploadHandler.cxx
@@ -42,7 +42,6 @@ int cmCTestUploadHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open Upload.xml file" << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   std::string buildname = cmCTest::SafeBuildIdField(
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index aec943e..e6d3960 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -3122,6 +3122,7 @@ void cmCTest::Log(int logType, const char* file, int line, const char* msg,
       cmCTestLogOutputFileLine(err);
       err << msg;
       err.flush();
+      cmSystemTools::SetErrorOccured();
       break;
     default:
       cmCTestLogOutputFileLine(out);
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f989aff..ccfe2b1 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -382,21 +382,8 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
         {
         if(!status.GetNestedError())
           {
-          if (cmSystemTools::GetFilenameName(
-              this->GetSafeDefinition("CMAKE_CURRENT_LIST_FILE")) ==
-              this->GetSafeDefinition("CTEST_SCRIPT_NAME") &&
-              std::string(pcmd->GetError()).find("unknown error") !=
-              std::string::npos)
-            {
-            // Don't report "unknown error" from a CTest script.
-            // Instead simply note that an error occurred.
-            cmSystemTools::SetFatalErrorOccured();
-            }
-          else
-            {
-            // The command invocation requested that we report an error.
-            this->IssueMessage(cmake::FATAL_ERROR, pcmd->GetError());
-            }
+          // The command invocation requested that we report an error.
+          this->IssueMessage(cmake::FATAL_ERROR, pcmd->GetError());
           }
         result = false;
         if ( this->GetCMakeInstance()->GetWorkingMode() != cmake::NORMAL_MODE)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fde2c82eaaee2fe29f564b0ed5d95283aed5abf5
commit fde2c82eaaee2fe29f564b0ed5d95283aed5abf5
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 24 16:18:59 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Tue Feb 24 16:18:59 2015 -0500

    Revert "new test case for ctest_build"
    
    This reverts commit 817262dff24bc37af224254152900858f8f62494.

diff --git a/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt b/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt
deleted file mode 100644
index d8e63fa..0000000
--- a/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-Error\(s\) when building project$
diff --git a/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt b/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
deleted file mode 100644
index 63215c0..0000000
--- a/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Run dashboard with model Experimental
-   Source directory: .*/Tests/RunCMake/ctest_build/BuildCompileError
-   Build directory: .*/Tests/RunCMake/ctest_build/BuildCompileError-build
-   Reading ctest configuration file: .*/Tests/RunCMake/ctest_build/BuildCompileError/CTestConfig.cmake
-   Site: test-site
-   Build name: test-build-name
-   Use Experimental tag: [0-9-]+
-Configure project
-   Each . represents 1024 bytes of output
-    . Size of output: [0-9]+K
-Build project
-   Each symbol represents 1024 bytes of output.
-   '!' represents an error and '\*' a warning.
-    . Size of output: [0-9]+K
-   [1-9] Compiler errors
-   0 Compiler warnings
diff --git a/Tests/RunCMake/ctest_build/CMakeLists.txt.in b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
index 55ccc19..9ba08e9 100644
--- a/Tests/RunCMake/ctest_build/CMakeLists.txt.in
+++ b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
@@ -1,6 +1,4 @@
 cmake_minimum_required(VERSION 3.1)
-project(CTestBuild at CASE_NAME@)
+project(CTestBuild at CASE_NAME@ NONE)
 include(CTest)
 add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
-add_executable(compile_error EXCLUDE_FROM_ALL
-  @RunCMake_SOURCE_DIR@/../../CTestTestFailure/badCode.cxx)
diff --git a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
index 2fc80d3..5826fe4 100644
--- a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
@@ -8,4 +8,3 @@ function(run_ctest_build CASE_NAME)
 endfunction()
 
 run_ctest_build(BuildQuiet QUIET)
-run_ctest_build(BuildCompileError TARGET compile_error)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f8b1fc024135d61e8e5b01a914422db3c6a92333
commit f8b1fc024135d61e8e5b01a914422db3c6a92333
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 24 14:09:40 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Tue Feb 24 16:18:45 2015 -0500

    new test case for ctest_build
    
    This demonstrates that "Error in read script" is not printed when
    compilation errors are encountered during a call to ctest_build().

diff --git a/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt b/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt
new file mode 100644
index 0000000..d8e63fa
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt
@@ -0,0 +1 @@
+Error\(s\) when building project$
diff --git a/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt b/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
new file mode 100644
index 0000000..63215c0
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
@@ -0,0 +1,16 @@
+Run dashboard with model Experimental
+   Source directory: .*/Tests/RunCMake/ctest_build/BuildCompileError
+   Build directory: .*/Tests/RunCMake/ctest_build/BuildCompileError-build
+   Reading ctest configuration file: .*/Tests/RunCMake/ctest_build/BuildCompileError/CTestConfig.cmake
+   Site: test-site
+   Build name: test-build-name
+   Use Experimental tag: [0-9-]+
+Configure project
+   Each . represents 1024 bytes of output
+    . Size of output: [0-9]+K
+Build project
+   Each symbol represents 1024 bytes of output.
+   '!' represents an error and '\*' a warning.
+    . Size of output: [0-9]+K
+   [1-9] Compiler errors
+   0 Compiler warnings
diff --git a/Tests/RunCMake/ctest_build/CMakeLists.txt.in b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
index 9ba08e9..55ccc19 100644
--- a/Tests/RunCMake/ctest_build/CMakeLists.txt.in
+++ b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
@@ -1,4 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
-project(CTestBuild at CASE_NAME@ NONE)
+project(CTestBuild at CASE_NAME@)
 include(CTest)
 add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
+add_executable(compile_error EXCLUDE_FROM_ALL
+  @RunCMake_SOURCE_DIR@/../../CTestTestFailure/badCode.cxx)
diff --git a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
index 5826fe4..2fc80d3 100644
--- a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
@@ -8,3 +8,4 @@ function(run_ctest_build CASE_NAME)
 endfunction()
 
 run_ctest_build(BuildQuiet QUIET)
+run_ctest_build(BuildCompileError TARGET compile_error)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae98b7c754601dc524cede3f564cf17d5d076de0
commit ae98b7c754601dc524cede3f564cf17d5d076de0
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Mon Feb 23 15:04:01 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Tue Feb 24 16:18:40 2015 -0500

    Change how CTest errors are reported
    
    "Error in read script" should only be displayed for issues
    that the site maintainer is expected to fix.  This message
    should not be displayed for more mundane problems like
    compilation errors & test failures.
    
    We distinguish between these two types of errors with the
    use of the following new function:
    cmCTestGenericHandler::SetScriptErrorOccurred(bool).

diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 790e488..ea95401 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -183,6 +183,7 @@ bool cmCTestCoverageHandler::StartCoverageLogFile(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open log file: "
       << covLogFilename << std::endl);
+    this->SetScriptErrorOccurred(true);
     return false;
     }
   std::string local_start_time = this->CTest->CurrentTime();
@@ -348,6 +349,7 @@ int cmCTestCoverageHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot create LastCoverage.log file" << std::endl);
+    this->SetScriptErrorOccurred(true);
     }
 
   ofs << "Performing coverage: " << elapsed_time_start << std::endl;
@@ -456,6 +458,7 @@ int cmCTestCoverageHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open coverage summary file." << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -523,6 +526,7 @@ int cmCTestCoverageHandler::ProcessHandler()
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find file: "
         << fullFileName << std::endl);
+      this->SetScriptErrorOccurred(true);
       continue;
       }
 
@@ -684,6 +688,7 @@ int cmCTestCoverageHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "  " << *erIt << std::endl);
       }
+    this->SetScriptErrorOccurred(true);
     }
 
   long total_lines = total_tested + total_untested;
@@ -1005,6 +1010,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Could not find gcov." << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::string gcovExtraFlags
@@ -1112,6 +1118,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << errors << std::endl);
       cont->Error ++;
+      this->SetScriptErrorOccurred(true);
       continue;
       }
     if ( retVal != 0 )
@@ -1120,6 +1127,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
         << retVal << " while processing: " << *it << std::endl);
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << cont->Error << std::endl);
+      this->SetScriptErrorOccurred(true);
       }
     cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "--------------------------------------------------------------"
@@ -1156,6 +1164,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e1"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1173,6 +1182,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e2"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1189,6 +1199,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e3"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1206,6 +1217,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e4"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
         }
@@ -1220,6 +1232,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e5"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1236,6 +1249,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e6"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1253,6 +1267,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e7"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1270,6 +1285,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e8"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1287,6 +1303,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE,
             "Unknown gcov output line: [" << *line << "]"
             << std::endl);
+          this->SetScriptErrorOccurred(true);
           cont->Error ++;
           //abort();
           }
@@ -1310,6 +1327,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           {
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
             << gcovFile << std::endl);
+          this->SetScriptErrorOccurred(true);
           }
         else
           {
@@ -1526,6 +1544,7 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << errors << std::endl);
       cont->Error ++;
+      this->SetScriptErrorOccurred(true);
       continue;
       }
     if ( retVal != 0 )
@@ -1534,6 +1553,7 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
         << retVal << " while processing: " << *it << std::endl);
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << cont->Error << std::endl);
+      this->SetScriptErrorOccurred(true);
       }
     cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "--------------------------------------------------------------"
@@ -1584,6 +1604,7 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
           {
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
                      << lcovFile << std::endl);
+          this->SetScriptErrorOccurred(true);
           }
         std::string srcname;
 
@@ -1593,6 +1614,7 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE,
                      "Error while parsing lcov file '" << lcovFile << "':"
                      << " No source file name found!" << std::endl);
+          this->SetScriptErrorOccurred(true);
           return 0;
           }
         srcname = srcname.substr(18);
@@ -1626,6 +1648,7 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
             {
             cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
                        << lcovFile << std::endl);
+            this->SetScriptErrorOccurred(true);
             }
           else
             {
@@ -1801,6 +1824,7 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Cannot find source Python file corresponding to: "
         << *fileIt << std::endl);
+      this->SetScriptErrorOccurred(true);
       continue;
       }
 
@@ -1818,6 +1842,7 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
         << *fileIt << std::endl);
+      this->SetScriptErrorOccurred(true);
       }
     else
       {
@@ -1854,6 +1879,7 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
               cmCTestLog(this->CTest, ERROR_MESSAGE,
                 "Currently the limit is maximum coverage of 999999"
                 << std::endl);
+              this->SetScriptErrorOccurred(true);
               }
             }
           }
@@ -1948,6 +1974,7 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Files and full path files not the same size?:\n");
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   // create the output stream for the CoverageLog-N.xml file
@@ -1955,6 +1982,7 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
   int logFileCount = 0;
   if ( !this->StartCoverageLogFile(covLogFile, logFileCount) )
     {
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   // for each file run covbr on that file to get the coverage
@@ -1966,6 +1994,7 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
   if(!this->RunBullseyeCommand(cont, "covbr", 0, outputFile))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error running covbr for." << "\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -1977,6 +2006,7 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Cannot open coverage file: " <<
                outputFile << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::map<std::string, std::string> fileMap;
@@ -2089,6 +2119,7 @@ int cmCTestCoverageHandler::RunBullseyeCommand(
   if(program.empty())
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find :" << cmd << "\n");
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   if(arg)
@@ -2120,6 +2151,7 @@ int cmCTestCoverageHandler::RunBullseyeCommand(
                << program << " " << arg << "\n"
                << "kwsys process state : "
                << runCoverageSrc.GetProcessState());
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   // since we set the output file names wait for it to end
@@ -2137,6 +2169,7 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
   if(!this->RunBullseyeCommand(cont, "covsrc", "-c", outputFile))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error running covsrc:\n");
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
 
@@ -2147,6 +2180,7 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open coverage summary file." << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   this->CTest->StartXML(covSumFile, this->AppendXML);
@@ -2187,6 +2221,7 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Cannot open coverage summary file: " <<
                outputFile << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::set<std::string> coveredFileNames;
@@ -2351,6 +2386,7 @@ int cmCTestCoverageHandler::HandleBullseyeCoverage(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Error running bullseye summary.\n");
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   cmCTestOptionalLog(this->CTest, DEBUG, "HandleBullseyeCoverage return 1 "
@@ -2389,6 +2425,7 @@ bool cmCTestCoverageHandler::ParseBullsEyeCovsrcLine(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error parsing string : "
                << inputLine << "\n");
+    this->SetScriptErrorOccurred(true);
     return false;
     }
   // the source file has "" around it so extract out the file name
@@ -2424,6 +2461,7 @@ bool cmCTestCoverageHandler::ParseBullsEyeCovsrcLine(
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error parsing input : "
                << inputLine << " last pos not npos =  " << pos <<
                "\n");
+    this->SetScriptErrorOccurred(true);
     }
   return true;
 }
diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx
index 81eb0a8..c16ec2b 100644
--- a/Source/CTest/cmCTestGenericHandler.cxx
+++ b/Source/CTest/cmCTestGenericHandler.cxx
@@ -23,6 +23,7 @@ cmCTestGenericHandler::cmCTestGenericHandler()
   this->SubmitIndex = 0;
   this->AppendXML = false;
   this->Quiet = false;
+  this->ScriptErrorOccurred = false;
 }
 
 //----------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h
index 8567dd7..d83ad7b 100644
--- a/Source/CTest/cmCTestGenericHandler.h
+++ b/Source/CTest/cmCTestGenericHandler.h
@@ -90,6 +90,12 @@ public:
   void SetQuiet(bool b) { this->Quiet = b; }
   bool GetQuiet() { return this->Quiet; }
 
+  /**
+   * Get/Set whether or not a script-level error occurred.
+   */
+  bool GetScriptErrorOccurred() { return this->ScriptErrorOccurred; }
+  void SetScriptErrorOccurred(bool b) { this->ScriptErrorOccurred = b; }
+
 protected:
   bool StartResultingXML(cmCTest::Part part,
                          const char* name, cmGeneratedFileStream& xofs);
@@ -97,6 +103,7 @@ protected:
 
   bool AppendXML;
   bool Quiet;
+  bool ScriptErrorOccurred;
   cmSystemTools::OutputOption HandlerVerbose;
   cmCTest *CTest;
   t_StringToString Options;
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index 3003e8a..571e539 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -141,6 +141,12 @@ bool cmCTestHandlerCommand
   cmSystemTools::ChangeDirectory(
     this->CTest->GetCTestConfiguration("BuildDirectory"));
   int res = handler->ProcessHandler();
+  cmSystemTools::ChangeDirectory(current_dir);
+
+  if (handler->GetScriptErrorOccurred())
+    {
+    return false;
+    }
   if ( this->Values[ct_RETURN_VALUE] && *this->Values[ct_RETURN_VALUE])
     {
     std::ostringstream str;
@@ -148,7 +154,6 @@ bool cmCTestHandlerCommand
     this->Makefile->AddDefinition(
       this->Values[ct_RETURN_VALUE], str.str().c_str());
     }
-  cmSystemTools::ChangeDirectory(current_dir);
   return true;
 }
 
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 061f3fd..f603297 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -51,6 +51,7 @@ static void xmlReportError(int line, const char* msg, void* data)
   cmCTestLog(ctest, ERROR_MESSAGE,
              "Error parsing XML in stream at line "
              << line << ": " << msg << std::endl);
+  ctest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
 }
 
 // parse the xml file containing the results of last BoundsChecker run
@@ -111,6 +112,7 @@ public:
         this->Errors.push_back(cmCTestMemCheckHandler::ABW); // do not know
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "No Category found in Bounds checker XML\n" );
+        this->CTest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
         return;
         }
       while(ptr->ErrorCategory && cat)
@@ -128,6 +130,7 @@ public:
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "Found unknown Bounds Checker error "
                    << ptr->ErrorCategory << std::endl);
+        this->CTest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
         }
     }
   cmCTest* CTest;
@@ -175,6 +178,7 @@ int cmCTestMemCheckHandler::PreProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Problem executing pre-memcheck command(s)." << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   return 1;
@@ -187,6 +191,7 @@ int cmCTestMemCheckHandler::PostProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Problem executing post-memcheck command(s)." << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   return 1;
@@ -646,6 +651,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
             "Cannot find memory checker suppression file: "
             << this->CTest->GetCTestConfiguration(
               "MemoryCheckSuppressionFile") << std::endl);
+          this->SetScriptErrorOccurred(true);
           return false;
           }
         std::string suppressions = "--suppressions="
@@ -671,6 +677,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
                      "Cannot find memory checker suppression file: "
                      << this->CTest->GetCTestConfiguration(
                        "MemoryCheckSuppressionFile").c_str() << std::endl);
+          this->SetScriptErrorOccurred(true);
           return false;
           }
         std::string filterFiles = "/FilterFiles="
@@ -742,6 +749,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Do not understand memory checker: " << this->MemoryTester
         << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
     }
 
@@ -908,6 +916,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckPurifyOutput(
           << pfW.match(1) << std::endl);
         ostr << "*** Unknown Purify memory fault: " << pfW.match(1)
           << std::endl;
+        this->SetScriptErrorOccurred(true);
         }
       }
     if ( failure != this->ResultStrings.size() )
@@ -1143,6 +1152,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckBoundsCheckerOutput(
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "Error in ParseChunk: " << theLine
                    << std::endl);
+        this->SetScriptErrorOccurred(true);
         }
       }
     }
@@ -1217,6 +1227,7 @@ cmCTestMemCheckHandler::PostProcessBoundsCheckerTest(cmCTestTestResult& res,
     {
     std::string log = "Cannot read memory tester output file: " + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
+    this->SetScriptErrorOccurred(true);
     return;
     }
   res.Output += BOUNDS_CHECKER_MARKER;
@@ -1252,6 +1263,7 @@ cmCTestMemCheckHandler::AppendMemTesterOutput(cmCTestTestResult& res,
     {
     std::string log = "Cannot read memory tester output file: " + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
+    this->SetScriptErrorOccurred(true);
     return;
     }
   std::string line;
@@ -1290,6 +1302,7 @@ void cmCTestMemCheckHandler::TestOutputFileNames(int test,
       std::string log = "Cannot find memory tester output file: "
         + ofile;
       cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       ofile = "";
       }
     else
@@ -1303,6 +1316,7 @@ void cmCTestMemCheckHandler::TestOutputFileNames(int test,
     std::string log = "Cannot find memory tester output file: "
       + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
+    this->SetScriptErrorOccurred(true);
     ofile = "";
     }
   files.push_back(ofile);
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index d585863..ddb5f4c 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -235,6 +235,7 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
           << local_file << std::endl);
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
+        this->SetScriptErrorOccurred(true);
         return false;
         }
       unsigned long filelen = cmSystemTools::FileLength(local_file);
@@ -314,6 +315,7 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
         *this->LogFile << std::endl;
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
+        this->SetScriptErrorOccurred(true);
         return false;
         }
       // always cleanup
@@ -477,6 +479,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
           << local_file << std::endl);
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
+        this->SetScriptErrorOccurred(true);
         return false;
         }
       unsigned long filelen = cmSystemTools::FileLength(local_file);
@@ -621,6 +624,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
           }
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
+        this->SetScriptErrorOccurred(true);
         return false;
         }
       // always cleanup
@@ -783,6 +787,7 @@ bool cmCTestSubmitHandler::TriggerUsingHTTP(
           }
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
+        this->SetScriptErrorOccurred(true);
         return false;
         }
 
@@ -908,6 +913,7 @@ bool cmCTestSubmitHandler::SubmitUsingSCP(
   cmsysProcess_Delete(cp);
   if ( problems )
     {
+    this->SetScriptErrorOccurred(true);
     return false;
     }
   return true;
@@ -929,6 +935,7 @@ bool cmCTestSubmitHandler::SubmitUsingCP(
                << "\tNumber of files: " << files.size() << "\n"
                << "\tremoteprefix: " << remoteprefix << "\n"
                << "\tdestination: " << destination << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
 
@@ -996,6 +1003,7 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot find file: "
         << local_file.c_str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
       }
 
@@ -1006,6 +1014,7 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  File too big: "
         << local_file.c_str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
       }
     size_t fileSize = static_cast<size_t>(st.st_size);
@@ -1014,6 +1023,7 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot open file: "
         << local_file.c_str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
       }
 
@@ -1024,6 +1034,7 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       fclose(fp);
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot read file: "
         << local_file.c_str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
       }
     fclose(fp);
@@ -1041,6 +1052,7 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
         << env.fault_string << " (" << env.fault_code << ")" << std::endl);
       xmlrpc_env_clean(&env);
       xmlrpc_client_cleanup();
+      this->SetScriptErrorOccurred(true);
       return false;
       }
 
@@ -1097,12 +1109,14 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Upload file not specified\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if (!cmSystemTools::FileExists(file))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Upload file not found: '" << file << "'\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestCurl curl(this->CTest);
@@ -1120,6 +1134,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Only http and https are supported for CDASH_UPLOAD\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   char md5sum[33];
@@ -1162,6 +1177,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Error in HttpRequest\n" << response);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -1173,6 +1189,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error parsing json string [" << response << "]\n"
                << reader.getFormattedErrorMessages() << "\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(json["status"].asInt() != 0)
@@ -1180,6 +1197,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Bad status returned from CDash: "
                << json["status"].asInt());
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(json["datafilesmd5"].isArray())
@@ -1198,6 +1216,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "bad datafilesmd5 value in response "
                << response << "\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -1212,6 +1231,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error uploading to CDash. "
                << file << " " << url << " " << fstr.str());
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(!reader.parse(response, json))
@@ -1219,6 +1239,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error parsing json string [" << response << "]\n"
                << reader.getFormattedErrorMessages() << "\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -1249,6 +1270,7 @@ int cmCTestSubmitHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot find BuildDirectory  key in the DartConfiguration.tcl"
       << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -1457,6 +1479,7 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via FTP"
         << std::endl);
       ofs << "   Problems when submitting via FTP" << std::endl;
+      this->SetScriptErrorOccurred(true);
       return -1;
       }
     if(!this->CDash)
@@ -1474,6 +1497,7 @@ int cmCTestSubmitHandler::ProcessHandler()
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "   Problems when triggering via HTTP" << std::endl);
         ofs << "   Problems when triggering via HTTP" << std::endl;
+        this->SetScriptErrorOccurred(true);
         return -1;
         }
       cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
@@ -1517,6 +1541,7 @@ int cmCTestSubmitHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "   Problems when submitting via HTTP" << std::endl);
       ofs << "   Problems when submitting via HTTP" << std::endl;
+      this->SetScriptErrorOccurred(true);
       return -1;
       }
     if(!this->CDash)
@@ -1532,6 +1557,7 @@ int cmCTestSubmitHandler::ProcessHandler()
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "   Problems when triggering via HTTP" << std::endl);
         ofs << "   Problems when triggering via HTTP" << std::endl;
+        this->SetScriptErrorOccurred(true);
         return -1;
         }
       }
@@ -1567,6 +1593,7 @@ int cmCTestSubmitHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "   Problems when submitting via XML-RPC" << std::endl);
       ofs << "   Problems when submitting via XML-RPC" << std::endl;
+      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
@@ -1577,6 +1604,7 @@ int cmCTestSubmitHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "   Submission method \"xmlrpc\" not compiled into CTest!"
                << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
 #endif
     }
@@ -1605,6 +1633,7 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via SCP"
         << std::endl);
       ofs << "   Problems when submitting via SCP" << std::endl;
+      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmSystemTools::ChangeDirectory(oldWorkingDirectory);
@@ -1638,6 +1667,7 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via CP"
         << std::endl);
       ofs << "   Problems when submitting via cp" << std::endl;
+      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmSystemTools::ChangeDirectory(oldWorkingDirectory);
@@ -1649,6 +1679,7 @@ int cmCTestSubmitHandler::ProcessHandler()
 
   cmCTestLog(this->CTest, ERROR_MESSAGE, "   Unknown submission method: \""
     << dropMethod << "\"" << std::endl);
+  this->SetScriptErrorOccurred(true);
   return -1;
 }
 
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx
index b18786a..57e9216 100644
--- a/Source/CTest/cmCTestUpdateHandler.cxx
+++ b/Source/CTest/cmCTestUpdateHandler.cxx
@@ -204,6 +204,7 @@ int cmCTestUpdateHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot find SourceDirectory  key in the DartConfiguration.tcl"
       << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -253,6 +254,7 @@ int cmCTestUpdateHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open log file"
       << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   std::string start_time = this->CTest->CurrentTime();
@@ -318,12 +320,14 @@ int cmCTestUpdateHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "   There are modified or conflicting files in the repository"
       << std::endl);
+    this->SetScriptErrorOccurred(true);
     }
   if(!updated)
     {
     os << "Update command failed:\n" << vc->GetUpdateCommandLine();
     cmCTestLog(this->CTest, ERROR_MESSAGE, "   Update command failed: "
                << vc->GetUpdateCommandLine() << "\n");
+    this->SetScriptErrorOccurred(true);
     }
   os << "</UpdateReturnStatus>" << std::endl;
   os << "</Update>" << std::endl;
@@ -424,6 +428,7 @@ bool cmCTestUpdateHandler::SelectVCS()
         }
       e << " configuration key.";
       cmCTestLog(this->CTest, ERROR_MESSAGE, e.str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
       }
     }
diff --git a/Source/CTest/cmCTestUploadHandler.cxx b/Source/CTest/cmCTestUploadHandler.cxx
index 579190a..965f88e 100644
--- a/Source/CTest/cmCTestUploadHandler.cxx
+++ b/Source/CTest/cmCTestUploadHandler.cxx
@@ -42,6 +42,7 @@ int cmCTestUploadHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open Upload.xml file" << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   std::string buildname = cmCTest::SafeBuildIdField(
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index e6d3960..aec943e 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -3122,7 +3122,6 @@ void cmCTest::Log(int logType, const char* file, int line, const char* msg,
       cmCTestLogOutputFileLine(err);
       err << msg;
       err.flush();
-      cmSystemTools::SetErrorOccured();
       break;
     default:
       cmCTestLogOutputFileLine(out);
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ccfe2b1..f989aff 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -382,8 +382,21 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
         {
         if(!status.GetNestedError())
           {
-          // The command invocation requested that we report an error.
-          this->IssueMessage(cmake::FATAL_ERROR, pcmd->GetError());
+          if (cmSystemTools::GetFilenameName(
+              this->GetSafeDefinition("CMAKE_CURRENT_LIST_FILE")) ==
+              this->GetSafeDefinition("CTEST_SCRIPT_NAME") &&
+              std::string(pcmd->GetError()).find("unknown error") !=
+              std::string::npos)
+            {
+            // Don't report "unknown error" from a CTest script.
+            // Instead simply note that an error occurred.
+            cmSystemTools::SetFatalErrorOccured();
+            }
+          else
+            {
+            // The command invocation requested that we report an error.
+            this->IssueMessage(cmake::FATAL_ERROR, pcmd->GetError());
+            }
           }
         result = false;
         if ( this->GetCMakeInstance()->GetWorkingMode() != cmake::NORMAL_MODE)

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Feb 24 16:45:18 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 24 Feb 2015 16:45:18 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-717-g0d9f208
Message-ID: <20150224214518.B09B39C5C5@public.kitware.com>

This is an automated email from 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  0d9f208ce393702510ba29b3193f760a5cf71b63 (commit)
       via  f4bf45211ee4fa6e869a6953b4b7b87e7731ce4c (commit)
      from  d81a19c7edb2dffa9f4bdbdeadacc8cce16522b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d9f208ce393702510ba29b3193f760a5cf71b63
commit 0d9f208ce393702510ba29b3193f760a5cf71b63
Merge: d81a19c f4bf452
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 16:45:17 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 16:45:17 2015 -0500

    Merge topic 'revert_error_in_read_script' into next
    
    f4bf4521 Revert topic 'error_in_read_script'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4bf45211ee4fa6e869a6953b4b7b87e7731ce4c
commit f4bf45211ee4fa6e869a6953b4b7b87e7731ce4c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 16:44:59 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 16:44:59 2015 -0500

    Revert topic 'error_in_read_script'

diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index ea95401..790e488 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -183,7 +183,6 @@ bool cmCTestCoverageHandler::StartCoverageLogFile(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open log file: "
       << covLogFilename << std::endl);
-    this->SetScriptErrorOccurred(true);
     return false;
     }
   std::string local_start_time = this->CTest->CurrentTime();
@@ -349,7 +348,6 @@ int cmCTestCoverageHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot create LastCoverage.log file" << std::endl);
-    this->SetScriptErrorOccurred(true);
     }
 
   ofs << "Performing coverage: " << elapsed_time_start << std::endl;
@@ -458,7 +456,6 @@ int cmCTestCoverageHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open coverage summary file." << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -526,7 +523,6 @@ int cmCTestCoverageHandler::ProcessHandler()
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find file: "
         << fullFileName << std::endl);
-      this->SetScriptErrorOccurred(true);
       continue;
       }
 
@@ -688,7 +684,6 @@ int cmCTestCoverageHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "  " << *erIt << std::endl);
       }
-    this->SetScriptErrorOccurred(true);
     }
 
   long total_lines = total_tested + total_untested;
@@ -1010,7 +1005,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Could not find gcov." << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::string gcovExtraFlags
@@ -1118,7 +1112,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << errors << std::endl);
       cont->Error ++;
-      this->SetScriptErrorOccurred(true);
       continue;
       }
     if ( retVal != 0 )
@@ -1127,7 +1120,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
         << retVal << " while processing: " << *it << std::endl);
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << cont->Error << std::endl);
-      this->SetScriptErrorOccurred(true);
       }
     cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "--------------------------------------------------------------"
@@ -1164,7 +1156,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e1"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1182,7 +1173,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e2"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1199,7 +1189,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e3"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1217,7 +1206,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e4"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
         }
@@ -1232,7 +1220,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e5"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1249,7 +1236,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e6"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1267,7 +1253,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e7"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1285,7 +1270,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e8"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1303,7 +1287,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE,
             "Unknown gcov output line: [" << *line << "]"
             << std::endl);
-          this->SetScriptErrorOccurred(true);
           cont->Error ++;
           //abort();
           }
@@ -1327,7 +1310,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           {
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
             << gcovFile << std::endl);
-          this->SetScriptErrorOccurred(true);
           }
         else
           {
@@ -1544,7 +1526,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << errors << std::endl);
       cont->Error ++;
-      this->SetScriptErrorOccurred(true);
       continue;
       }
     if ( retVal != 0 )
@@ -1553,7 +1534,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
         << retVal << " while processing: " << *it << std::endl);
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << cont->Error << std::endl);
-      this->SetScriptErrorOccurred(true);
       }
     cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "--------------------------------------------------------------"
@@ -1604,7 +1584,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
           {
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
                      << lcovFile << std::endl);
-          this->SetScriptErrorOccurred(true);
           }
         std::string srcname;
 
@@ -1614,7 +1593,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE,
                      "Error while parsing lcov file '" << lcovFile << "':"
                      << " No source file name found!" << std::endl);
-          this->SetScriptErrorOccurred(true);
           return 0;
           }
         srcname = srcname.substr(18);
@@ -1648,7 +1626,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
             {
             cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
                        << lcovFile << std::endl);
-            this->SetScriptErrorOccurred(true);
             }
           else
             {
@@ -1824,7 +1801,6 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Cannot find source Python file corresponding to: "
         << *fileIt << std::endl);
-      this->SetScriptErrorOccurred(true);
       continue;
       }
 
@@ -1842,7 +1818,6 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
         << *fileIt << std::endl);
-      this->SetScriptErrorOccurred(true);
       }
     else
       {
@@ -1879,7 +1854,6 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
               cmCTestLog(this->CTest, ERROR_MESSAGE,
                 "Currently the limit is maximum coverage of 999999"
                 << std::endl);
-              this->SetScriptErrorOccurred(true);
               }
             }
           }
@@ -1974,7 +1948,6 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Files and full path files not the same size?:\n");
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   // create the output stream for the CoverageLog-N.xml file
@@ -1982,7 +1955,6 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
   int logFileCount = 0;
   if ( !this->StartCoverageLogFile(covLogFile, logFileCount) )
     {
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   // for each file run covbr on that file to get the coverage
@@ -1994,7 +1966,6 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
   if(!this->RunBullseyeCommand(cont, "covbr", 0, outputFile))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error running covbr for." << "\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -2006,7 +1977,6 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Cannot open coverage file: " <<
                outputFile << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::map<std::string, std::string> fileMap;
@@ -2119,7 +2089,6 @@ int cmCTestCoverageHandler::RunBullseyeCommand(
   if(program.empty())
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find :" << cmd << "\n");
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   if(arg)
@@ -2151,7 +2120,6 @@ int cmCTestCoverageHandler::RunBullseyeCommand(
                << program << " " << arg << "\n"
                << "kwsys process state : "
                << runCoverageSrc.GetProcessState());
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   // since we set the output file names wait for it to end
@@ -2169,7 +2137,6 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
   if(!this->RunBullseyeCommand(cont, "covsrc", "-c", outputFile))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error running covsrc:\n");
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
 
@@ -2180,7 +2147,6 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open coverage summary file." << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   this->CTest->StartXML(covSumFile, this->AppendXML);
@@ -2221,7 +2187,6 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Cannot open coverage summary file: " <<
                outputFile << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::set<std::string> coveredFileNames;
@@ -2386,7 +2351,6 @@ int cmCTestCoverageHandler::HandleBullseyeCoverage(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Error running bullseye summary.\n");
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   cmCTestOptionalLog(this->CTest, DEBUG, "HandleBullseyeCoverage return 1 "
@@ -2425,7 +2389,6 @@ bool cmCTestCoverageHandler::ParseBullsEyeCovsrcLine(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error parsing string : "
                << inputLine << "\n");
-    this->SetScriptErrorOccurred(true);
     return false;
     }
   // the source file has "" around it so extract out the file name
@@ -2461,7 +2424,6 @@ bool cmCTestCoverageHandler::ParseBullsEyeCovsrcLine(
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error parsing input : "
                << inputLine << " last pos not npos =  " << pos <<
                "\n");
-    this->SetScriptErrorOccurred(true);
     }
   return true;
 }
diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx
index c16ec2b..81eb0a8 100644
--- a/Source/CTest/cmCTestGenericHandler.cxx
+++ b/Source/CTest/cmCTestGenericHandler.cxx
@@ -23,7 +23,6 @@ cmCTestGenericHandler::cmCTestGenericHandler()
   this->SubmitIndex = 0;
   this->AppendXML = false;
   this->Quiet = false;
-  this->ScriptErrorOccurred = false;
 }
 
 //----------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h
index d83ad7b..8567dd7 100644
--- a/Source/CTest/cmCTestGenericHandler.h
+++ b/Source/CTest/cmCTestGenericHandler.h
@@ -90,12 +90,6 @@ public:
   void SetQuiet(bool b) { this->Quiet = b; }
   bool GetQuiet() { return this->Quiet; }
 
-  /**
-   * Get/Set whether or not a script-level error occurred.
-   */
-  bool GetScriptErrorOccurred() { return this->ScriptErrorOccurred; }
-  void SetScriptErrorOccurred(bool b) { this->ScriptErrorOccurred = b; }
-
 protected:
   bool StartResultingXML(cmCTest::Part part,
                          const char* name, cmGeneratedFileStream& xofs);
@@ -103,7 +97,6 @@ protected:
 
   bool AppendXML;
   bool Quiet;
-  bool ScriptErrorOccurred;
   cmSystemTools::OutputOption HandlerVerbose;
   cmCTest *CTest;
   t_StringToString Options;
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index 571e539..3003e8a 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -141,12 +141,6 @@ bool cmCTestHandlerCommand
   cmSystemTools::ChangeDirectory(
     this->CTest->GetCTestConfiguration("BuildDirectory"));
   int res = handler->ProcessHandler();
-  cmSystemTools::ChangeDirectory(current_dir);
-
-  if (handler->GetScriptErrorOccurred())
-    {
-    return false;
-    }
   if ( this->Values[ct_RETURN_VALUE] && *this->Values[ct_RETURN_VALUE])
     {
     std::ostringstream str;
@@ -154,6 +148,7 @@ bool cmCTestHandlerCommand
     this->Makefile->AddDefinition(
       this->Values[ct_RETURN_VALUE], str.str().c_str());
     }
+  cmSystemTools::ChangeDirectory(current_dir);
   return true;
 }
 
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index f603297..061f3fd 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -51,7 +51,6 @@ static void xmlReportError(int line, const char* msg, void* data)
   cmCTestLog(ctest, ERROR_MESSAGE,
              "Error parsing XML in stream at line "
              << line << ": " << msg << std::endl);
-  ctest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
 }
 
 // parse the xml file containing the results of last BoundsChecker run
@@ -112,7 +111,6 @@ public:
         this->Errors.push_back(cmCTestMemCheckHandler::ABW); // do not know
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "No Category found in Bounds checker XML\n" );
-        this->CTest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
         return;
         }
       while(ptr->ErrorCategory && cat)
@@ -130,7 +128,6 @@ public:
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "Found unknown Bounds Checker error "
                    << ptr->ErrorCategory << std::endl);
-        this->CTest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
         }
     }
   cmCTest* CTest;
@@ -178,7 +175,6 @@ int cmCTestMemCheckHandler::PreProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Problem executing pre-memcheck command(s)." << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   return 1;
@@ -191,7 +187,6 @@ int cmCTestMemCheckHandler::PostProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Problem executing post-memcheck command(s)." << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   return 1;
@@ -651,7 +646,6 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
             "Cannot find memory checker suppression file: "
             << this->CTest->GetCTestConfiguration(
               "MemoryCheckSuppressionFile") << std::endl);
-          this->SetScriptErrorOccurred(true);
           return false;
           }
         std::string suppressions = "--suppressions="
@@ -677,7 +671,6 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
                      "Cannot find memory checker suppression file: "
                      << this->CTest->GetCTestConfiguration(
                        "MemoryCheckSuppressionFile").c_str() << std::endl);
-          this->SetScriptErrorOccurred(true);
           return false;
           }
         std::string filterFiles = "/FilterFiles="
@@ -749,7 +742,6 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Do not understand memory checker: " << this->MemoryTester
         << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
     }
 
@@ -916,7 +908,6 @@ bool cmCTestMemCheckHandler::ProcessMemCheckPurifyOutput(
           << pfW.match(1) << std::endl);
         ostr << "*** Unknown Purify memory fault: " << pfW.match(1)
           << std::endl;
-        this->SetScriptErrorOccurred(true);
         }
       }
     if ( failure != this->ResultStrings.size() )
@@ -1152,7 +1143,6 @@ bool cmCTestMemCheckHandler::ProcessMemCheckBoundsCheckerOutput(
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "Error in ParseChunk: " << theLine
                    << std::endl);
-        this->SetScriptErrorOccurred(true);
         }
       }
     }
@@ -1227,7 +1217,6 @@ cmCTestMemCheckHandler::PostProcessBoundsCheckerTest(cmCTestTestResult& res,
     {
     std::string log = "Cannot read memory tester output file: " + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
-    this->SetScriptErrorOccurred(true);
     return;
     }
   res.Output += BOUNDS_CHECKER_MARKER;
@@ -1263,7 +1252,6 @@ cmCTestMemCheckHandler::AppendMemTesterOutput(cmCTestTestResult& res,
     {
     std::string log = "Cannot read memory tester output file: " + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
-    this->SetScriptErrorOccurred(true);
     return;
     }
   std::string line;
@@ -1302,7 +1290,6 @@ void cmCTestMemCheckHandler::TestOutputFileNames(int test,
       std::string log = "Cannot find memory tester output file: "
         + ofile;
       cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       ofile = "";
       }
     else
@@ -1316,7 +1303,6 @@ void cmCTestMemCheckHandler::TestOutputFileNames(int test,
     std::string log = "Cannot find memory tester output file: "
       + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
-    this->SetScriptErrorOccurred(true);
     ofile = "";
     }
   files.push_back(ofile);
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index ddb5f4c..d585863 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -235,7 +235,6 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
           << local_file << std::endl);
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
-        this->SetScriptErrorOccurred(true);
         return false;
         }
       unsigned long filelen = cmSystemTools::FileLength(local_file);
@@ -315,7 +314,6 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
         *this->LogFile << std::endl;
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
-        this->SetScriptErrorOccurred(true);
         return false;
         }
       // always cleanup
@@ -479,7 +477,6 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
           << local_file << std::endl);
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
-        this->SetScriptErrorOccurred(true);
         return false;
         }
       unsigned long filelen = cmSystemTools::FileLength(local_file);
@@ -624,7 +621,6 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
           }
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
-        this->SetScriptErrorOccurred(true);
         return false;
         }
       // always cleanup
@@ -787,7 +783,6 @@ bool cmCTestSubmitHandler::TriggerUsingHTTP(
           }
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
-        this->SetScriptErrorOccurred(true);
         return false;
         }
 
@@ -913,7 +908,6 @@ bool cmCTestSubmitHandler::SubmitUsingSCP(
   cmsysProcess_Delete(cp);
   if ( problems )
     {
-    this->SetScriptErrorOccurred(true);
     return false;
     }
   return true;
@@ -935,7 +929,6 @@ bool cmCTestSubmitHandler::SubmitUsingCP(
                << "\tNumber of files: " << files.size() << "\n"
                << "\tremoteprefix: " << remoteprefix << "\n"
                << "\tdestination: " << destination << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
 
@@ -1003,7 +996,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot find file: "
         << local_file.c_str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
       }
 
@@ -1014,7 +1006,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  File too big: "
         << local_file.c_str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
       }
     size_t fileSize = static_cast<size_t>(st.st_size);
@@ -1023,7 +1014,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot open file: "
         << local_file.c_str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
       }
 
@@ -1034,7 +1024,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       fclose(fp);
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot read file: "
         << local_file.c_str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
       }
     fclose(fp);
@@ -1052,7 +1041,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
         << env.fault_string << " (" << env.fault_code << ")" << std::endl);
       xmlrpc_env_clean(&env);
       xmlrpc_client_cleanup();
-      this->SetScriptErrorOccurred(true);
       return false;
       }
 
@@ -1109,14 +1097,12 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Upload file not specified\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if (!cmSystemTools::FileExists(file))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Upload file not found: '" << file << "'\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestCurl curl(this->CTest);
@@ -1134,7 +1120,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Only http and https are supported for CDASH_UPLOAD\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   char md5sum[33];
@@ -1177,7 +1162,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Error in HttpRequest\n" << response);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -1189,7 +1173,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error parsing json string [" << response << "]\n"
                << reader.getFormattedErrorMessages() << "\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(json["status"].asInt() != 0)
@@ -1197,7 +1180,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Bad status returned from CDash: "
                << json["status"].asInt());
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(json["datafilesmd5"].isArray())
@@ -1216,7 +1198,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "bad datafilesmd5 value in response "
                << response << "\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -1231,7 +1212,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error uploading to CDash. "
                << file << " " << url << " " << fstr.str());
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(!reader.parse(response, json))
@@ -1239,7 +1219,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error parsing json string [" << response << "]\n"
                << reader.getFormattedErrorMessages() << "\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -1270,7 +1249,6 @@ int cmCTestSubmitHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot find BuildDirectory  key in the DartConfiguration.tcl"
       << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -1479,7 +1457,6 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via FTP"
         << std::endl);
       ofs << "   Problems when submitting via FTP" << std::endl;
-      this->SetScriptErrorOccurred(true);
       return -1;
       }
     if(!this->CDash)
@@ -1497,7 +1474,6 @@ int cmCTestSubmitHandler::ProcessHandler()
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "   Problems when triggering via HTTP" << std::endl);
         ofs << "   Problems when triggering via HTTP" << std::endl;
-        this->SetScriptErrorOccurred(true);
         return -1;
         }
       cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
@@ -1541,7 +1517,6 @@ int cmCTestSubmitHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "   Problems when submitting via HTTP" << std::endl);
       ofs << "   Problems when submitting via HTTP" << std::endl;
-      this->SetScriptErrorOccurred(true);
       return -1;
       }
     if(!this->CDash)
@@ -1557,7 +1532,6 @@ int cmCTestSubmitHandler::ProcessHandler()
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "   Problems when triggering via HTTP" << std::endl);
         ofs << "   Problems when triggering via HTTP" << std::endl;
-        this->SetScriptErrorOccurred(true);
         return -1;
         }
       }
@@ -1593,7 +1567,6 @@ int cmCTestSubmitHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "   Problems when submitting via XML-RPC" << std::endl);
       ofs << "   Problems when submitting via XML-RPC" << std::endl;
-      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
@@ -1604,7 +1577,6 @@ int cmCTestSubmitHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "   Submission method \"xmlrpc\" not compiled into CTest!"
                << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
 #endif
     }
@@ -1633,7 +1605,6 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via SCP"
         << std::endl);
       ofs << "   Problems when submitting via SCP" << std::endl;
-      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmSystemTools::ChangeDirectory(oldWorkingDirectory);
@@ -1667,7 +1638,6 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via CP"
         << std::endl);
       ofs << "   Problems when submitting via cp" << std::endl;
-      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmSystemTools::ChangeDirectory(oldWorkingDirectory);
@@ -1679,7 +1649,6 @@ int cmCTestSubmitHandler::ProcessHandler()
 
   cmCTestLog(this->CTest, ERROR_MESSAGE, "   Unknown submission method: \""
     << dropMethod << "\"" << std::endl);
-  this->SetScriptErrorOccurred(true);
   return -1;
 }
 
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx
index 57e9216..b18786a 100644
--- a/Source/CTest/cmCTestUpdateHandler.cxx
+++ b/Source/CTest/cmCTestUpdateHandler.cxx
@@ -204,7 +204,6 @@ int cmCTestUpdateHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot find SourceDirectory  key in the DartConfiguration.tcl"
       << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -254,7 +253,6 @@ int cmCTestUpdateHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open log file"
       << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   std::string start_time = this->CTest->CurrentTime();
@@ -320,14 +318,12 @@ int cmCTestUpdateHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "   There are modified or conflicting files in the repository"
       << std::endl);
-    this->SetScriptErrorOccurred(true);
     }
   if(!updated)
     {
     os << "Update command failed:\n" << vc->GetUpdateCommandLine();
     cmCTestLog(this->CTest, ERROR_MESSAGE, "   Update command failed: "
                << vc->GetUpdateCommandLine() << "\n");
-    this->SetScriptErrorOccurred(true);
     }
   os << "</UpdateReturnStatus>" << std::endl;
   os << "</Update>" << std::endl;
@@ -428,7 +424,6 @@ bool cmCTestUpdateHandler::SelectVCS()
         }
       e << " configuration key.";
       cmCTestLog(this->CTest, ERROR_MESSAGE, e.str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
       }
     }
diff --git a/Source/CTest/cmCTestUploadHandler.cxx b/Source/CTest/cmCTestUploadHandler.cxx
index 965f88e..579190a 100644
--- a/Source/CTest/cmCTestUploadHandler.cxx
+++ b/Source/CTest/cmCTestUploadHandler.cxx
@@ -42,7 +42,6 @@ int cmCTestUploadHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open Upload.xml file" << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   std::string buildname = cmCTest::SafeBuildIdField(
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index aec943e..e6d3960 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -3122,6 +3122,7 @@ void cmCTest::Log(int logType, const char* file, int line, const char* msg,
       cmCTestLogOutputFileLine(err);
       err << msg;
       err.flush();
+      cmSystemTools::SetErrorOccured();
       break;
     default:
       cmCTestLogOutputFileLine(out);
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f989aff..ccfe2b1 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -382,21 +382,8 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
         {
         if(!status.GetNestedError())
           {
-          if (cmSystemTools::GetFilenameName(
-              this->GetSafeDefinition("CMAKE_CURRENT_LIST_FILE")) ==
-              this->GetSafeDefinition("CTEST_SCRIPT_NAME") &&
-              std::string(pcmd->GetError()).find("unknown error") !=
-              std::string::npos)
-            {
-            // Don't report "unknown error" from a CTest script.
-            // Instead simply note that an error occurred.
-            cmSystemTools::SetFatalErrorOccured();
-            }
-          else
-            {
-            // The command invocation requested that we report an error.
-            this->IssueMessage(cmake::FATAL_ERROR, pcmd->GetError());
-            }
+          // The command invocation requested that we report an error.
+          this->IssueMessage(cmake::FATAL_ERROR, pcmd->GetError());
           }
         result = false;
         if ( this->GetCMakeInstance()->GetWorkingMode() != cmake::NORMAL_MODE)
diff --git a/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt b/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt
deleted file mode 100644
index d8e63fa..0000000
--- a/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-Error\(s\) when building project$
diff --git a/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt b/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
deleted file mode 100644
index 63215c0..0000000
--- a/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Run dashboard with model Experimental
-   Source directory: .*/Tests/RunCMake/ctest_build/BuildCompileError
-   Build directory: .*/Tests/RunCMake/ctest_build/BuildCompileError-build
-   Reading ctest configuration file: .*/Tests/RunCMake/ctest_build/BuildCompileError/CTestConfig.cmake
-   Site: test-site
-   Build name: test-build-name
-   Use Experimental tag: [0-9-]+
-Configure project
-   Each . represents 1024 bytes of output
-    . Size of output: [0-9]+K
-Build project
-   Each symbol represents 1024 bytes of output.
-   '!' represents an error and '\*' a warning.
-    . Size of output: [0-9]+K
-   [1-9] Compiler errors
-   0 Compiler warnings
diff --git a/Tests/RunCMake/ctest_build/CMakeLists.txt.in b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
index 55ccc19..9ba08e9 100644
--- a/Tests/RunCMake/ctest_build/CMakeLists.txt.in
+++ b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
@@ -1,6 +1,4 @@
 cmake_minimum_required(VERSION 3.1)
-project(CTestBuild at CASE_NAME@)
+project(CTestBuild at CASE_NAME@ NONE)
 include(CTest)
 add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
-add_executable(compile_error EXCLUDE_FROM_ALL
-  @RunCMake_SOURCE_DIR@/../../CTestTestFailure/badCode.cxx)
diff --git a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
index 2fc80d3..5826fe4 100644
--- a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
@@ -8,4 +8,3 @@ function(run_ctest_build CASE_NAME)
 endfunction()
 
 run_ctest_build(BuildQuiet QUIET)
-run_ctest_build(BuildCompileError TARGET compile_error)

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

Summary of changes:
 Source/CTest/cmCTestCoverageHandler.cxx            |   38 --------------------
 Source/CTest/cmCTestGenericHandler.cxx             |    1 -
 Source/CTest/cmCTestGenericHandler.h               |    7 ----
 Source/CTest/cmCTestHandlerCommand.cxx             |    7 +---
 Source/CTest/cmCTestMemCheckHandler.cxx            |   14 --------
 Source/CTest/cmCTestSubmitHandler.cxx              |   31 ----------------
 Source/CTest/cmCTestUpdateHandler.cxx              |    5 ---
 Source/CTest/cmCTestUploadHandler.cxx              |    1 -
 Source/cmCTest.cxx                                 |    1 +
 Source/cmMakefile.cxx                              |   17 ++-------
 .../ctest_build/BuildCompileError-stderr.txt       |    1 -
 .../ctest_build/BuildCompileError-stdout.txt       |   16 ---------
 Tests/RunCMake/ctest_build/CMakeLists.txt.in       |    4 +--
 Tests/RunCMake/ctest_build/RunCMakeTest.cmake      |    1 -
 14 files changed, 5 insertions(+), 139 deletions(-)
 delete mode 100644 Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Wed Feb 25 00:01:11 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Wed, 25 Feb 2015 00:01:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-302-g1826aad
Message-ID: <20150225050111.75A56AAF3E@public.kitware.com>

This is an automated email from 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  1826aadcf3ee7f0d3a35927d32226513d265accc (commit)
      from  ac80f0f95fc7cfbad17c2a5656a87e346b9f298a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1826aadcf3ee7f0d3a35927d32226513d265accc
commit 1826aadcf3ee7f0d3a35927d32226513d265accc
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Wed Feb 25 00:01:09 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Feb 25 00:01:09 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 12242a3..a929232 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 2)
-set(CMake_VERSION_PATCH 20150224)
+set(CMake_VERSION_PATCH 20150225)
 #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 Feb 25 08:57:17 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Feb 2015 08:57:17 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-719-geba94c2
Message-ID: <20150225135717.A97C4AAB66@public.kitware.com>

This is an automated email from 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  eba94c24021fd411aa8196015bd91ad1f66ba61b (commit)
       via  f7f4ca55bde68b174b7542fe417426a7cbf76fe3 (commit)
      from  0d9f208ce393702510ba29b3193f760a5cf71b63 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eba94c24021fd411aa8196015bd91ad1f66ba61b
commit eba94c24021fd411aa8196015bd91ad1f66ba61b
Merge: 0d9f208 f7f4ca5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 25 08:57:16 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 25 08:57:16 2015 -0500

    Merge topic 'ExternalData-url-algo-map' into next
    
    f7f4ca55 ExternalData: Add support for custom algorithm-to-URL mapping


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7f4ca55bde68b174b7542fe417426a7cbf76fe3
commit f7f4ca55bde68b174b7542fe417426a7cbf76fe3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 25 08:11:39 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 25 08:28:05 2015 -0500

    ExternalData: Add support for custom algorithm-to-URL mapping
    
    Allow URL templates to contain a %(algo:<key>) placeholder that is
    replaced by mapping the canonical hash algorithm name through a map
    defined by the <key>.
    
    Extend the Module.ExternalData test to cover the behavior.
    Extend the RunCMake.ExternalData test to cover error cases.

diff --git a/Help/release/dev/ExternalData-url-algo-map.rst b/Help/release/dev/ExternalData-url-algo-map.rst
new file mode 100644
index 0000000..baf661f
--- /dev/null
+++ b/Help/release/dev/ExternalData-url-algo-map.rst
@@ -0,0 +1,8 @@
+ExternalData-url-algo-map
+-------------------------
+
+* The :module:`ExternalData` module learned a new URL template
+  placeholder ``%(algo:<key>)`` to allow custom mapping from
+  algorithm name to URL component through configuration of new
+  :variable:`ExternalData_URL_ALGO_<algo>_<key>` variables.
+  This allows more flexibility in remote URLs.
diff --git a/Modules/ExternalData.cmake b/Modules/ExternalData.cmake
index 741db81..b3206be 100644
--- a/Modules/ExternalData.cmake
+++ b/Modules/ExternalData.cmake
@@ -155,13 +155,23 @@ calling any of the functions provided by this module.
   inactivity timeout, in seconds, with a default of ``60`` seconds.
   Set to ``0`` to disable enforcement.
 
+.. variable:: ExternalData_URL_ALGO_<algo>_<key>
+
+  Specify a custom URL component to be substituted for URL template
+  placeholders of the form ``%(algo:<key>)``, where ``<key>`` is a
+  valid C identifier, when fetching an object referenced via hash
+  algorithm ``<algo>``.  If not defined, the default URL component
+  is just ``<algo>`` for any ``<key>``.
+
 .. variable:: ExternalData_URL_TEMPLATES
 
   The ``ExternalData_URL_TEMPLATES`` may be set to provide a list of
   of URL templates using the placeholders ``%(algo)`` and ``%(hash)``
   in each template.  Data fetch rules try each URL template in order
   by substituting the hash algorithm name for ``%(algo)`` and the hash
-  value for ``%(hash)``.
+  value for ``%(hash)``.  Alternatively one may use ``%(algo:<key>)``
+  with ``ExternalData_URL_ALGO_<algo>_<key>`` variables to gain more
+  flexibility in remote URLs.
 
 Referencing Files
 ^^^^^^^^^^^^^^^^^
@@ -349,6 +359,25 @@ function(ExternalData_add_target target)
           "The key must be a valid C identifier.")
       endif()
     endif()
+
+    # Store custom algorithm name to URL component maps.
+    if("${url_template}" MATCHES "%\\(algo:([^)]*)\\)")
+      set(key "${CMAKE_MATCH_1}")
+      if(key MATCHES "^[A-Za-z_][A-Za-z0-9_]*$")
+        string(REPLACE "|" ";" _algos "${_ExternalData_REGEX_ALGO}")
+        foreach(algo ${_algos})
+          if(DEFINED ExternalData_URL_ALGO_${algo}_${key})
+            string(CONCAT _ExternalData_CONFIG_CODE "${_ExternalData_CONFIG_CODE}\n"
+              "set(ExternalData_URL_ALGO_${algo}_${key} \"${ExternalData_URL_ALGO_${algo}_${key}}\")")
+          endif()
+        endforeach()
+      else()
+        message(FATAL_ERROR
+          "Bad %(algo:${key}) in URL template:\n"
+          " ${url_template}\n"
+          "The transform name must be a valid C identifier.")
+      endif()
+    endif()
   endforeach()
 
   # Store configuration for use by build-time script.
@@ -904,6 +933,16 @@ function(_ExternalData_download_object name hash algo var_obj)
   foreach(url_template IN LISTS ExternalData_URL_TEMPLATES)
     string(REPLACE "%(hash)" "${hash}" url_tmp "${url_template}")
     string(REPLACE "%(algo)" "${algo}" url "${url_tmp}")
+    if(url MATCHES "^(.*)%\\(algo:([A-Za-z_][A-Za-z0-9_]*)\\)(.*)$")
+      set(lhs "${CMAKE_MATCH_1}")
+      set(key "${CMAKE_MATCH_2}")
+      set(rhs "${CMAKE_MATCH_3}")
+      if(DEFINED ExternalData_URL_ALGO_${algo}_${key})
+        set(url "${lhs}${ExternalData_URL_ALGO_${algo}_${key}}${rhs}")
+      else()
+        set(url "${lhs}${algo}${rhs}")
+      endif()
+    endif()
     message(STATUS "Fetching \"${url}\"")
     if(url MATCHES "^ExternalDataCustomScript://([A-Za-z_][A-Za-z0-9_]*)/(.*)$")
       _ExternalData_custom_fetch("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}" "${tmp}" err errMsg)
diff --git a/Tests/Module/ExternalData/Alt/MyAlgoMap1-md5/dded55e43cd6529ee35d24113dfc87a3 b/Tests/Module/ExternalData/Alt/MyAlgoMap1-md5/dded55e43cd6529ee35d24113dfc87a3
new file mode 100644
index 0000000..fa0cb1a
--- /dev/null
+++ b/Tests/Module/ExternalData/Alt/MyAlgoMap1-md5/dded55e43cd6529ee35d24113dfc87a3
@@ -0,0 +1 @@
+DataAlgoMap
\ No newline at end of file
diff --git a/Tests/Module/ExternalData/Alt/SHA1/85158f0c1996837976e858c42a9a7634bfe91b93 b/Tests/Module/ExternalData/Alt/SHA1/85158f0c1996837976e858c42a9a7634bfe91b93
new file mode 100644
index 0000000..fa0cb1a
--- /dev/null
+++ b/Tests/Module/ExternalData/Alt/SHA1/85158f0c1996837976e858c42a9a7634bfe91b93
@@ -0,0 +1 @@
+DataAlgoMap
\ No newline at end of file
diff --git a/Tests/Module/ExternalData/CMakeLists.txt b/Tests/Module/ExternalData/CMakeLists.txt
index f99f6af..6c5e59c 100644
--- a/Tests/Module/ExternalData/CMakeLists.txt
+++ b/Tests/Module/ExternalData/CMakeLists.txt
@@ -10,8 +10,10 @@ if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^/")
 endif()
 set(ExternalData_URL_TEMPLATES
   "file://${slash}${CMAKE_CURRENT_SOURCE_DIR}/%(algo)/%(hash)"
+  "file://${slash}${CMAKE_CURRENT_SOURCE_DIR}/Alt/%(algo:MyAlgoMap1)/%(hash)"
   "ExternalDataCustomScript://MyScript1/%(algo)/%(hash)"
   )
+set(ExternalData_URL_ALGO_MD5_MyAlgoMap1 MyAlgoMap1-md5)
 set(ExternalData_CUSTOM_SCRIPT_MyScript1 "${CMAKE_CURRENT_SOURCE_DIR}/MyScript1.cmake")
 set(ExternalData_BINARY_ROOT "${CMAKE_CURRENT_BINARY_DIR}/ExternalData")
 file(REMOVE_RECURSE ${ExternalData_BINARY_ROOT}) # clean test
@@ -26,6 +28,8 @@ ExternalData_Add_Test(Data1
     -D Data=DATA{Data.dat}
     ${Data1CheckSpaces}
     -D DataScript=DATA{DataScript.dat}
+    -D DataAlgoMapA=DATA{DataAlgoMapA.dat}
+    -D DataAlgoMapB=DATA{DataAlgoMapB.dat}
     -D DataMissing=DATA{DataMissing.dat}
     -D DataMissingWithAssociated=DATA{DataMissing.dat,Data.dat}
     -D SeriesA=DATA{SeriesA.dat,:}
diff --git a/Tests/Module/ExternalData/Data1Check.cmake b/Tests/Module/ExternalData/Data1Check.cmake
index a7aa4ae..9845a3b 100644
--- a/Tests/Module/ExternalData/Data1Check.cmake
+++ b/Tests/Module/ExternalData/Data1Check.cmake
@@ -12,6 +12,14 @@ file(STRINGS "${DataScript}" lines LIMIT_INPUT 1024)
 if(NOT "x${lines}" STREQUAL "xDataScript")
   message(SEND_ERROR "Input file:\n  ${DataScript}\ndoes not have expected content, but [[${lines}]]")
 endif()
+file(STRINGS "${DataAlgoMapA}" lines LIMIT_INPUT 1024)
+if(NOT "x${lines}" STREQUAL "xDataAlgoMap")
+  message(SEND_ERROR "Input file:\n  ${DataAlgoMapA}\ndoes not have expected content, but [[${lines}]]")
+endif()
+file(STRINGS "${DataAlgoMapB}" lines LIMIT_INPUT 1024)
+if(NOT "x${lines}" STREQUAL "xDataAlgoMap")
+  message(SEND_ERROR "Input file:\n  ${DataAlgoMapB}\ndoes not have expected content, but [[${lines}]]")
+endif()
 if(DataMissing)
   if(EXISTS "${DataMissing}")
     message(SEND_ERROR
diff --git a/Tests/Module/ExternalData/DataAlgoMapA.dat.md5 b/Tests/Module/ExternalData/DataAlgoMapA.dat.md5
new file mode 100644
index 0000000..7281481
--- /dev/null
+++ b/Tests/Module/ExternalData/DataAlgoMapA.dat.md5
@@ -0,0 +1 @@
+dded55e43cd6529ee35d24113dfc87a3
diff --git a/Tests/Module/ExternalData/DataAlgoMapB.dat.sha1 b/Tests/Module/ExternalData/DataAlgoMapB.dat.sha1
new file mode 100644
index 0000000..4fd7c06
--- /dev/null
+++ b/Tests/Module/ExternalData/DataAlgoMapB.dat.sha1
@@ -0,0 +1 @@
+85158f0c1996837976e858c42a9a7634bfe91b93
diff --git a/Tests/RunCMake/ExternalData/BadAlgoMap1-result.txt b/Tests/RunCMake/ExternalData/BadAlgoMap1-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/ExternalData/BadAlgoMap1-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/ExternalData/BadAlgoMap1-stderr.txt b/Tests/RunCMake/ExternalData/BadAlgoMap1-stderr.txt
new file mode 100644
index 0000000..c3708a9
--- /dev/null
+++ b/Tests/RunCMake/ExternalData/BadAlgoMap1-stderr.txt
@@ -0,0 +1,9 @@
+CMake Error at .*/Modules/ExternalData.cmake:[0-9]+ \(message\):
+  Bad %\(algo:\) in URL template:
+
+   file:///path/to/%\(algo:\)/%\(hash\)
+
+  The transform name must be a valid C identifier.
+Call Stack \(most recent call first\):
+  BadAlgoMap1.cmake:[0-9]+ \(ExternalData_Add_Target\)
+  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/ExternalData/BadAlgoMap1.cmake b/Tests/RunCMake/ExternalData/BadAlgoMap1.cmake
new file mode 100644
index 0000000..542ec1d
--- /dev/null
+++ b/Tests/RunCMake/ExternalData/BadAlgoMap1.cmake
@@ -0,0 +1,5 @@
+include(ExternalData)
+set(ExternalData_URL_TEMPLATES
+  "file:///path/to/%(algo:)/%(hash)"
+  )
+ExternalData_Add_Target(Data)
diff --git a/Tests/RunCMake/ExternalData/BadAlgoMap2-result.txt b/Tests/RunCMake/ExternalData/BadAlgoMap2-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/ExternalData/BadAlgoMap2-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/ExternalData/BadAlgoMap2-stderr.txt b/Tests/RunCMake/ExternalData/BadAlgoMap2-stderr.txt
new file mode 100644
index 0000000..1f10644
--- /dev/null
+++ b/Tests/RunCMake/ExternalData/BadAlgoMap2-stderr.txt
@@ -0,0 +1,9 @@
+CMake Error at .*/Modules/ExternalData.cmake:[0-9]+ \(message\):
+  Bad %\(algo:0BadMap\(\) in URL template:
+
+   file:///path/to/%\(algo:0BadMap\(\)/%\(hash\)
+
+  The transform name must be a valid C identifier.
+Call Stack \(most recent call first\):
+  BadAlgoMap2.cmake:[0-9]+ \(ExternalData_Add_Target\)
+  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/ExternalData/BadAlgoMap2.cmake b/Tests/RunCMake/ExternalData/BadAlgoMap2.cmake
new file mode 100644
index 0000000..0537a7b
--- /dev/null
+++ b/Tests/RunCMake/ExternalData/BadAlgoMap2.cmake
@@ -0,0 +1,5 @@
+include(ExternalData)
+set(ExternalData_URL_TEMPLATES
+  "file:///path/to/%(algo:0BadMap()/%(hash)"
+  )
+ExternalData_Add_Target(Data)
diff --git a/Tests/RunCMake/ExternalData/RunCMakeTest.cmake b/Tests/RunCMake/ExternalData/RunCMakeTest.cmake
index 7afd289..241fa1f 100644
--- a/Tests/RunCMake/ExternalData/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ExternalData/RunCMakeTest.cmake
@@ -1,5 +1,7 @@
 include(RunCMake)
 
+run_cmake(BadAlgoMap1)
+run_cmake(BadAlgoMap2)
 run_cmake(BadCustom1)
 run_cmake(BadCustom2)
 run_cmake(BadCustom3)

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

Summary of changes:
 Help/release/dev/ExternalData-url-algo-map.rst     |    8 ++++
 Modules/ExternalData.cmake                         |   41 +++++++++++++++++++-
 .../dded55e43cd6529ee35d24113dfc87a3               |    1 +
 .../SHA1/85158f0c1996837976e858c42a9a7634bfe91b93  |    1 +
 Tests/Module/ExternalData/CMakeLists.txt           |    4 ++
 Tests/Module/ExternalData/Data1Check.cmake         |    8 ++++
 Tests/Module/ExternalData/DataAlgoMapA.dat.md5     |    1 +
 Tests/Module/ExternalData/DataAlgoMapB.dat.sha1    |    1 +
 .../BadAlgoMap1-result.txt}                        |    0
 Tests/RunCMake/ExternalData/BadAlgoMap1-stderr.txt |    9 +++++
 .../{BadCustom2.cmake => BadAlgoMap1.cmake}        |    2 +-
 .../BadAlgoMap2-result.txt}                        |    0
 Tests/RunCMake/ExternalData/BadAlgoMap2-stderr.txt |    9 +++++
 .../{BadCustom2.cmake => BadAlgoMap2.cmake}        |    2 +-
 Tests/RunCMake/ExternalData/RunCMakeTest.cmake     |    2 +
 15 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 Help/release/dev/ExternalData-url-algo-map.rst
 create mode 100644 Tests/Module/ExternalData/Alt/MyAlgoMap1-md5/dded55e43cd6529ee35d24113dfc87a3
 create mode 100644 Tests/Module/ExternalData/Alt/SHA1/85158f0c1996837976e858c42a9a7634bfe91b93
 create mode 100644 Tests/Module/ExternalData/DataAlgoMapA.dat.md5
 create mode 100644 Tests/Module/ExternalData/DataAlgoMapB.dat.sha1
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => ExternalData/BadAlgoMap1-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ExternalData/BadAlgoMap1-stderr.txt
 copy Tests/RunCMake/ExternalData/{BadCustom2.cmake => BadAlgoMap1.cmake} (64%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => ExternalData/BadAlgoMap2-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ExternalData/BadAlgoMap2-stderr.txt
 copy Tests/RunCMake/ExternalData/{BadCustom2.cmake => BadAlgoMap2.cmake} (64%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 25 09:03:02 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Feb 2015 09:03:02 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-304-gb38f535
Message-ID: <20150225140302.8D264AB020@public.kitware.com>

This is an automated email from 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  b38f535eaa648005d700e214ac77c774b4a7509e (commit)
       via  987d4a1240a7578804435f13f9021de47e93dada (commit)
      from  1826aadcf3ee7f0d3a35927d32226513d265accc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b38f535eaa648005d700e214ac77c774b4a7509e
commit b38f535eaa648005d700e214ac77c774b4a7509e
Merge: 1826aad 987d4a1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 25 09:03:01 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 25 09:03:01 2015 -0500

    Merge topic 'sln-no-bom'
    
    987d4a12 VS: Do not generate a BOM in .sln files


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

Summary of changes:
 Source/cmGlobalVisualStudio71Generator.cxx |    5 -----
 Source/cmGlobalVisualStudio7Generator.cxx  |    5 -----
 2 files changed, 10 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 25 09:03:04 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Feb 2015 09:03:04 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-308-g71a610f
Message-ID: <20150225140304.9D547AB021@public.kitware.com>

This is an automated email from 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  71a610ff2997bd0d92c332572c0dd35405a77682 (commit)
       via  3d612c735285d9a63d4981a2ca7bff44cd741e4b (commit)
       via  886dcaa7c5f91269b91da857d6eb2db3610d385e (commit)
       via  ea98667682f29e8f900c01c5c36eebebf80ea8c7 (commit)
      from  b38f535eaa648005d700e214ac77c774b4a7509e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=71a610ff2997bd0d92c332572c0dd35405a77682
commit 71a610ff2997bd0d92c332572c0dd35405a77682
Merge: b38f535 3d612c7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 25 09:03:03 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 25 09:03:03 2015 -0500

    Merge topic 'refine-MSVC-ARM-WinCE'
    
    3d612c73 MSVC: Compile with arch-specific flags on ARM platforms (#14552)
    886dcaa7 MSVC: Distinguish among ARM architectures more precisely (#14552)
    ea986676 MSVC: Define /DWINCE when building for WinCE platforms (#14552)


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

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |    2 --
 Modules/CMakePlatformId.h.in           |   11 ++++++-
 Modules/Platform/Windows-MSVC.cmake    |   49 +++++++++++++++++++++++++-------
 3 files changed, 48 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 25 09:03:06 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Feb 2015 09:03:06 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-310-gdbad497
Message-ID: <20150225140306.8EE7BAB055@public.kitware.com>

This is an automated email from 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  dbad49705ec07a80248e333e4ca7f6cc17fa3766 (commit)
       via  4ee9005d7304f922c95db19ffab2a9da4145b93b (commit)
      from  71a610ff2997bd0d92c332572c0dd35405a77682 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dbad49705ec07a80248e333e4ca7f6cc17fa3766
commit dbad49705ec07a80248e333e4ca7f6cc17fa3766
Merge: 71a610f 4ee9005
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 25 09:03:05 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 25 09:03:05 2015 -0500

    Merge topic 'vs-midl-absolute-OutputDirectory'
    
    4ee9005d cmVisualStudio10TargetGenerator: Wrap long line


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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 25 09:03:08 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Feb 2015 09:03:08 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-312-gfa6da5f
Message-ID: <20150225140308.69861AB066@public.kitware.com>

This is an automated email from 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  fa6da5fcd8aa5bdfa4a635a9890af9c7c09456a8 (commit)
       via  5d5067ae57c9d02656a54076cdf121c7084a4de3 (commit)
      from  dbad49705ec07a80248e333e4ca7f6cc17fa3766 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa6da5fcd8aa5bdfa4a635a9890af9c7c09456a8
commit fa6da5fcd8aa5bdfa4a635a9890af9c7c09456a8
Merge: dbad497 5d5067a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 25 09:03:07 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 25 09:03:07 2015 -0500

    Merge topic 'CheckCompilerFlag-use-FLAGS'
    
    5d5067ae Check*CompilerFlag: Refactor method used to pass flags


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

Summary of changes:
 Modules/CheckCCompilerFlag.cmake       |    8 ++++----
 Modules/CheckCXXCompilerFlag.cmake     |    8 ++++----
 Modules/CheckFortranCompilerFlag.cmake |    8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 25 09:03:10 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Feb 2015 09:03:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-314-gef542c8
Message-ID: <20150225140310.C4224AB069@public.kitware.com>

This is an automated email from 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  ef542c86a53d0973e2de10cdaf140c9608e02402 (commit)
       via  b10310e6e69588dc389dea7220f3bf3db8bc0d42 (commit)
      from  fa6da5fcd8aa5bdfa4a635a9890af9c7c09456a8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef542c86a53d0973e2de10cdaf140c9608e02402
commit ef542c86a53d0973e2de10cdaf140c9608e02402
Merge: fa6da5f b10310e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 25 09:03:09 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 25 09:03:09 2015 -0500

    Merge topic 'test-drop-CTestTestFailedSubmit'
    
    b10310e6 Tests: Drop CTestTestFailedSubmit-* tests


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

Summary of changes:
 Tests/CMakeLists.txt                       |   42 ------------------------
 Tests/CTestTestFailedSubmits/test.cmake.in |   49 ----------------------------
 2 files changed, 91 deletions(-)
 delete mode 100644 Tests/CTestTestFailedSubmits/test.cmake.in


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 25 09:04:16 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Feb 2015 09:04:16 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-726-g3f6c93b
Message-ID: <20150225140416.2CA81AB079@public.kitware.com>

This is an automated email from 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  3f6c93b98691da7426cd9b75bea1d6ba132091a8 (commit)
       via  ef542c86a53d0973e2de10cdaf140c9608e02402 (commit)
       via  fa6da5fcd8aa5bdfa4a635a9890af9c7c09456a8 (commit)
       via  dbad49705ec07a80248e333e4ca7f6cc17fa3766 (commit)
       via  71a610ff2997bd0d92c332572c0dd35405a77682 (commit)
       via  b38f535eaa648005d700e214ac77c774b4a7509e (commit)
       via  1826aadcf3ee7f0d3a35927d32226513d265accc (commit)
      from  eba94c24021fd411aa8196015bd91ad1f66ba61b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f6c93b98691da7426cd9b75bea1d6ba132091a8
commit 3f6c93b98691da7426cd9b75bea1d6ba132091a8
Merge: eba94c2 ef542c8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 25 09:04:03 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 25 09:04:03 2015 -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 Feb 25 09:05:15 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Feb 2015 09:05:15 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-316-g5b0b36c
Message-ID: <20150225140515.9BFFBAB088@public.kitware.com>

This is an automated email from 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  5b0b36c3f8daa78b504e66615b1d3da937790c85 (commit)
       via  cd935b03bfee380f6d2a3999dbc9bf6f929485bc (commit)
      from  ef542c86a53d0973e2de10cdaf140c9608e02402 (commit)

Those revisions listed 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 Feb 25 09:05:15 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Feb 2015 09:05:15 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-729-g7686e8d
Message-ID: <20150225140515.B8213AB089@public.kitware.com>

This is an automated email from 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  7686e8d86bfa049dbf72adb308d9257ebec958a1 (commit)
       via  5b0b36c3f8daa78b504e66615b1d3da937790c85 (commit)
       via  cd935b03bfee380f6d2a3999dbc9bf6f929485bc (commit)
      from  3f6c93b98691da7426cd9b75bea1d6ba132091a8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7686e8d86bfa049dbf72adb308d9257ebec958a1
commit 7686e8d86bfa049dbf72adb308d9257ebec958a1
Merge: 3f6c93b 5b0b36c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 25 09:05:01 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 25 09:05:01 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 25 09:05:15 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Feb 2015 09:05:15 -0500 (EST)
Subject: [Cmake-commits] CMake branch, release,
	updated. v3.2.0-rc2-2-gcd935b0
Message-ID: <20150225140515.C793DAB08E@public.kitware.com>

This is an automated email from 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  cd935b03bfee380f6d2a3999dbc9bf6f929485bc (commit)
       via  987d4a1240a7578804435f13f9021de47e93dada (commit)
      from  99575c9ac114e6f5d388e1ee7b9a3f788d773c9e (commit)

Those revisions listed 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/cmGlobalVisualStudio71Generator.cxx |    5 -----
 Source/cmGlobalVisualStudio7Generator.cxx  |    5 -----
 2 files changed, 10 deletions(-)


hooks/post-receive
-- 
CMake

From zack.galbreath at kitware.com  Wed Feb 25 09:32:52 2015
From: zack.galbreath at kitware.com (Zack Galbreath)
Date: Wed, 25 Feb 2015 09:32:52 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-732-gf36c284
Message-ID: <20150225143252.1CFDEAB0FF@public.kitware.com>

This is an automated email from 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  f36c2841a7a62fb1d6df9c12065f79f4a54be996 (commit)
       via  fd2458973141a0820584c36dba3afeb9de032599 (commit)
       via  fe6566df25259a6cd03e756aa148d98c73c6a947 (commit)
      from  7686e8d86bfa049dbf72adb308d9257ebec958a1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f36c2841a7a62fb1d6df9c12065f79f4a54be996
commit f36c2841a7a62fb1d6df9c12065f79f4a54be996
Merge: 7686e8d fd24589
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 09:32:50 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 25 09:32:50 2015 -0500

    Merge topic 'error_in_read_script' into next
    
    fd245897 new RunCMake test cases
    fe6566df Change how CTest errors are reported


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd2458973141a0820584c36dba3afeb9de032599
commit fd2458973141a0820584c36dba3afeb9de032599
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Feb 24 14:09:40 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Tue Feb 24 15:39:07 2015 -0500

    new RunCMake test cases
    
    These new test cases demonstrate that "Error in read script"
    is not printed when compilation errors or test failures are
    encountered by ctest_build or ctest_test, respectively.

diff --git a/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt b/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt
new file mode 100644
index 0000000..d8e63fa
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt
@@ -0,0 +1 @@
+Error\(s\) when building project$
diff --git a/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt b/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
new file mode 100644
index 0000000..63215c0
--- /dev/null
+++ b/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
@@ -0,0 +1,16 @@
+Run dashboard with model Experimental
+   Source directory: .*/Tests/RunCMake/ctest_build/BuildCompileError
+   Build directory: .*/Tests/RunCMake/ctest_build/BuildCompileError-build
+   Reading ctest configuration file: .*/Tests/RunCMake/ctest_build/BuildCompileError/CTestConfig.cmake
+   Site: test-site
+   Build name: test-build-name
+   Use Experimental tag: [0-9-]+
+Configure project
+   Each . represents 1024 bytes of output
+    . Size of output: [0-9]+K
+Build project
+   Each symbol represents 1024 bytes of output.
+   '!' represents an error and '\*' a warning.
+    . Size of output: [0-9]+K
+   [1-9] Compiler errors
+   0 Compiler warnings
diff --git a/Tests/RunCMake/ctest_build/CMakeLists.txt.in b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
index 9ba08e9..55ccc19 100644
--- a/Tests/RunCMake/ctest_build/CMakeLists.txt.in
+++ b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
@@ -1,4 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
-project(CTestBuild at CASE_NAME@ NONE)
+project(CTestBuild at CASE_NAME@)
 include(CTest)
 add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
+add_executable(compile_error EXCLUDE_FROM_ALL
+  @RunCMake_SOURCE_DIR@/../../CTestTestFailure/badCode.cxx)
diff --git a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
index 5826fe4..2fc80d3 100644
--- a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
@@ -8,3 +8,4 @@ function(run_ctest_build CASE_NAME)
 endfunction()
 
 run_ctest_build(BuildQuiet QUIET)
+run_ctest_build(BuildCompileError TARGET compile_error)
diff --git a/Tests/RunCMake/ctest_test/CMakeLists.txt.in b/Tests/RunCMake/ctest_test/CMakeLists.txt.in
index cedf379..2a095dd 100644
--- a/Tests/RunCMake/ctest_test/CMakeLists.txt.in
+++ b/Tests/RunCMake/ctest_test/CMakeLists.txt.in
@@ -2,3 +2,6 @@ cmake_minimum_required(VERSION 3.1)
 project(CTestTest at CASE_NAME@ NONE)
 include(CTest)
 add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
+
+add_test(NAME CMakeVersionFail COMMAND "${CMAKE_COMMAND}" --version)
+set_tests_properties(CMakeVersionFail PROPERTIES WILL_FAIL TRUE)
diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
index d906290..24edbd2 100644
--- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
@@ -7,4 +7,5 @@ function(run_ctest_test CASE_NAME)
   run_ctest(${CASE_NAME})
 endfunction()
 
-run_ctest_test(TestQuiet QUIET)
+run_ctest_test(TestQuiet QUIET EXCLUDE Fail)
+run_ctest_test(TestFail INCLUDE Fail)
diff --git a/Tests/RunCMake/ctest_test/TestFail-stdout.txt b/Tests/RunCMake/ctest_test/TestFail-stdout.txt
new file mode 100644
index 0000000..a8d0df6
--- /dev/null
+++ b/Tests/RunCMake/ctest_test/TestFail-stdout.txt
@@ -0,0 +1,10 @@
+Test project .*/Tests/RunCMake/ctest_test/TestFail-build
+    Start 2: CMakeVersionFail
+1/1 Test #2: CMakeVersionFail .................\*\*\*Failed    [0-9.]+ sec
+
+0% tests passed, 1 tests failed out of 1
+
+Total Test time \(real\) =   [0-9.]+ sec
+
+The following tests FAILED:
+.*2 - CMakeVersionFail \(Failed\)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe6566df25259a6cd03e756aa148d98c73c6a947
commit fe6566df25259a6cd03e756aa148d98c73c6a947
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Mon Feb 23 15:04:01 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Tue Feb 24 14:56:13 2015 -0500

    Change how CTest errors are reported
    
    "Error in read script" should only be displayed for issues
    that the site maintainer is expected to fix.  This message
    should not be displayed for more mundane problems like
    compilation errors & test failures.
    
    We distinguish between these two types of errors with the
    use of the following new function:
    cmCTestGenericHandler::SetScriptErrorOccurred(bool).

diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 790e488..ea95401 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -183,6 +183,7 @@ bool cmCTestCoverageHandler::StartCoverageLogFile(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open log file: "
       << covLogFilename << std::endl);
+    this->SetScriptErrorOccurred(true);
     return false;
     }
   std::string local_start_time = this->CTest->CurrentTime();
@@ -348,6 +349,7 @@ int cmCTestCoverageHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot create LastCoverage.log file" << std::endl);
+    this->SetScriptErrorOccurred(true);
     }
 
   ofs << "Performing coverage: " << elapsed_time_start << std::endl;
@@ -456,6 +458,7 @@ int cmCTestCoverageHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open coverage summary file." << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -523,6 +526,7 @@ int cmCTestCoverageHandler::ProcessHandler()
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find file: "
         << fullFileName << std::endl);
+      this->SetScriptErrorOccurred(true);
       continue;
       }
 
@@ -684,6 +688,7 @@ int cmCTestCoverageHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "  " << *erIt << std::endl);
       }
+    this->SetScriptErrorOccurred(true);
     }
 
   long total_lines = total_tested + total_untested;
@@ -1005,6 +1010,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Could not find gcov." << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::string gcovExtraFlags
@@ -1112,6 +1118,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << errors << std::endl);
       cont->Error ++;
+      this->SetScriptErrorOccurred(true);
       continue;
       }
     if ( retVal != 0 )
@@ -1120,6 +1127,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
         << retVal << " while processing: " << *it << std::endl);
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << cont->Error << std::endl);
+      this->SetScriptErrorOccurred(true);
       }
     cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "--------------------------------------------------------------"
@@ -1156,6 +1164,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e1"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1173,6 +1182,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e2"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1189,6 +1199,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e3"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1206,6 +1217,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e4"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
         }
@@ -1220,6 +1232,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e5"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1236,6 +1249,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e6"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1253,6 +1267,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e7"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1270,6 +1285,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e8"
             << std::endl);
           cont->Error ++;
+          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1287,6 +1303,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE,
             "Unknown gcov output line: [" << *line << "]"
             << std::endl);
+          this->SetScriptErrorOccurred(true);
           cont->Error ++;
           //abort();
           }
@@ -1310,6 +1327,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           {
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
             << gcovFile << std::endl);
+          this->SetScriptErrorOccurred(true);
           }
         else
           {
@@ -1526,6 +1544,7 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << errors << std::endl);
       cont->Error ++;
+      this->SetScriptErrorOccurred(true);
       continue;
       }
     if ( retVal != 0 )
@@ -1534,6 +1553,7 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
         << retVal << " while processing: " << *it << std::endl);
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << cont->Error << std::endl);
+      this->SetScriptErrorOccurred(true);
       }
     cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "--------------------------------------------------------------"
@@ -1584,6 +1604,7 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
           {
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
                      << lcovFile << std::endl);
+          this->SetScriptErrorOccurred(true);
           }
         std::string srcname;
 
@@ -1593,6 +1614,7 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE,
                      "Error while parsing lcov file '" << lcovFile << "':"
                      << " No source file name found!" << std::endl);
+          this->SetScriptErrorOccurred(true);
           return 0;
           }
         srcname = srcname.substr(18);
@@ -1626,6 +1648,7 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
             {
             cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
                        << lcovFile << std::endl);
+            this->SetScriptErrorOccurred(true);
             }
           else
             {
@@ -1801,6 +1824,7 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Cannot find source Python file corresponding to: "
         << *fileIt << std::endl);
+      this->SetScriptErrorOccurred(true);
       continue;
       }
 
@@ -1818,6 +1842,7 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
         << *fileIt << std::endl);
+      this->SetScriptErrorOccurred(true);
       }
     else
       {
@@ -1854,6 +1879,7 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
               cmCTestLog(this->CTest, ERROR_MESSAGE,
                 "Currently the limit is maximum coverage of 999999"
                 << std::endl);
+              this->SetScriptErrorOccurred(true);
               }
             }
           }
@@ -1948,6 +1974,7 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Files and full path files not the same size?:\n");
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   // create the output stream for the CoverageLog-N.xml file
@@ -1955,6 +1982,7 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
   int logFileCount = 0;
   if ( !this->StartCoverageLogFile(covLogFile, logFileCount) )
     {
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   // for each file run covbr on that file to get the coverage
@@ -1966,6 +1994,7 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
   if(!this->RunBullseyeCommand(cont, "covbr", 0, outputFile))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error running covbr for." << "\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -1977,6 +2006,7 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Cannot open coverage file: " <<
                outputFile << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::map<std::string, std::string> fileMap;
@@ -2089,6 +2119,7 @@ int cmCTestCoverageHandler::RunBullseyeCommand(
   if(program.empty())
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find :" << cmd << "\n");
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   if(arg)
@@ -2120,6 +2151,7 @@ int cmCTestCoverageHandler::RunBullseyeCommand(
                << program << " " << arg << "\n"
                << "kwsys process state : "
                << runCoverageSrc.GetProcessState());
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   // since we set the output file names wait for it to end
@@ -2137,6 +2169,7 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
   if(!this->RunBullseyeCommand(cont, "covsrc", "-c", outputFile))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error running covsrc:\n");
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
 
@@ -2147,6 +2180,7 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open coverage summary file." << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   this->CTest->StartXML(covSumFile, this->AppendXML);
@@ -2187,6 +2221,7 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Cannot open coverage summary file: " <<
                outputFile << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::set<std::string> coveredFileNames;
@@ -2351,6 +2386,7 @@ int cmCTestCoverageHandler::HandleBullseyeCoverage(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Error running bullseye summary.\n");
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   cmCTestOptionalLog(this->CTest, DEBUG, "HandleBullseyeCoverage return 1 "
@@ -2389,6 +2425,7 @@ bool cmCTestCoverageHandler::ParseBullsEyeCovsrcLine(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error parsing string : "
                << inputLine << "\n");
+    this->SetScriptErrorOccurred(true);
     return false;
     }
   // the source file has "" around it so extract out the file name
@@ -2424,6 +2461,7 @@ bool cmCTestCoverageHandler::ParseBullsEyeCovsrcLine(
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error parsing input : "
                << inputLine << " last pos not npos =  " << pos <<
                "\n");
+    this->SetScriptErrorOccurred(true);
     }
   return true;
 }
diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx
index 81eb0a8..c16ec2b 100644
--- a/Source/CTest/cmCTestGenericHandler.cxx
+++ b/Source/CTest/cmCTestGenericHandler.cxx
@@ -23,6 +23,7 @@ cmCTestGenericHandler::cmCTestGenericHandler()
   this->SubmitIndex = 0;
   this->AppendXML = false;
   this->Quiet = false;
+  this->ScriptErrorOccurred = false;
 }
 
 //----------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h
index 8567dd7..d83ad7b 100644
--- a/Source/CTest/cmCTestGenericHandler.h
+++ b/Source/CTest/cmCTestGenericHandler.h
@@ -90,6 +90,12 @@ public:
   void SetQuiet(bool b) { this->Quiet = b; }
   bool GetQuiet() { return this->Quiet; }
 
+  /**
+   * Get/Set whether or not a script-level error occurred.
+   */
+  bool GetScriptErrorOccurred() { return this->ScriptErrorOccurred; }
+  void SetScriptErrorOccurred(bool b) { this->ScriptErrorOccurred = b; }
+
 protected:
   bool StartResultingXML(cmCTest::Part part,
                          const char* name, cmGeneratedFileStream& xofs);
@@ -97,6 +103,7 @@ protected:
 
   bool AppendXML;
   bool Quiet;
+  bool ScriptErrorOccurred;
   cmSystemTools::OutputOption HandlerVerbose;
   cmCTest *CTest;
   t_StringToString Options;
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index 3003e8a..6c4fa63 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -141,14 +141,19 @@ bool cmCTestHandlerCommand
   cmSystemTools::ChangeDirectory(
     this->CTest->GetCTestConfiguration("BuildDirectory"));
   int res = handler->ProcessHandler();
-  if ( this->Values[ct_RETURN_VALUE] && *this->Values[ct_RETURN_VALUE])
+  cmSystemTools::ChangeDirectory(current_dir);
+
+  if (handler->GetScriptErrorOccurred())
+    {
+    cmSystemTools::SetErrorOccured();
+    }
+  else if ( this->Values[ct_RETURN_VALUE] && *this->Values[ct_RETURN_VALUE])
     {
     std::ostringstream str;
     str << res;
     this->Makefile->AddDefinition(
       this->Values[ct_RETURN_VALUE], str.str().c_str());
     }
-  cmSystemTools::ChangeDirectory(current_dir);
   return true;
 }
 
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 061f3fd..f603297 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -51,6 +51,7 @@ static void xmlReportError(int line, const char* msg, void* data)
   cmCTestLog(ctest, ERROR_MESSAGE,
              "Error parsing XML in stream at line "
              << line << ": " << msg << std::endl);
+  ctest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
 }
 
 // parse the xml file containing the results of last BoundsChecker run
@@ -111,6 +112,7 @@ public:
         this->Errors.push_back(cmCTestMemCheckHandler::ABW); // do not know
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "No Category found in Bounds checker XML\n" );
+        this->CTest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
         return;
         }
       while(ptr->ErrorCategory && cat)
@@ -128,6 +130,7 @@ public:
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "Found unknown Bounds Checker error "
                    << ptr->ErrorCategory << std::endl);
+        this->CTest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
         }
     }
   cmCTest* CTest;
@@ -175,6 +178,7 @@ int cmCTestMemCheckHandler::PreProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Problem executing pre-memcheck command(s)." << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   return 1;
@@ -187,6 +191,7 @@ int cmCTestMemCheckHandler::PostProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Problem executing post-memcheck command(s)." << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
   return 1;
@@ -646,6 +651,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
             "Cannot find memory checker suppression file: "
             << this->CTest->GetCTestConfiguration(
               "MemoryCheckSuppressionFile") << std::endl);
+          this->SetScriptErrorOccurred(true);
           return false;
           }
         std::string suppressions = "--suppressions="
@@ -671,6 +677,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
                      "Cannot find memory checker suppression file: "
                      << this->CTest->GetCTestConfiguration(
                        "MemoryCheckSuppressionFile").c_str() << std::endl);
+          this->SetScriptErrorOccurred(true);
           return false;
           }
         std::string filterFiles = "/FilterFiles="
@@ -742,6 +749,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Do not understand memory checker: " << this->MemoryTester
         << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
     }
 
@@ -908,6 +916,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckPurifyOutput(
           << pfW.match(1) << std::endl);
         ostr << "*** Unknown Purify memory fault: " << pfW.match(1)
           << std::endl;
+        this->SetScriptErrorOccurred(true);
         }
       }
     if ( failure != this->ResultStrings.size() )
@@ -1143,6 +1152,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckBoundsCheckerOutput(
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "Error in ParseChunk: " << theLine
                    << std::endl);
+        this->SetScriptErrorOccurred(true);
         }
       }
     }
@@ -1217,6 +1227,7 @@ cmCTestMemCheckHandler::PostProcessBoundsCheckerTest(cmCTestTestResult& res,
     {
     std::string log = "Cannot read memory tester output file: " + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
+    this->SetScriptErrorOccurred(true);
     return;
     }
   res.Output += BOUNDS_CHECKER_MARKER;
@@ -1252,6 +1263,7 @@ cmCTestMemCheckHandler::AppendMemTesterOutput(cmCTestTestResult& res,
     {
     std::string log = "Cannot read memory tester output file: " + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
+    this->SetScriptErrorOccurred(true);
     return;
     }
   std::string line;
@@ -1290,6 +1302,7 @@ void cmCTestMemCheckHandler::TestOutputFileNames(int test,
       std::string log = "Cannot find memory tester output file: "
         + ofile;
       cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       ofile = "";
       }
     else
@@ -1303,6 +1316,7 @@ void cmCTestMemCheckHandler::TestOutputFileNames(int test,
     std::string log = "Cannot find memory tester output file: "
       + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
+    this->SetScriptErrorOccurred(true);
     ofile = "";
     }
   files.push_back(ofile);
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index d585863..ddb5f4c 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -235,6 +235,7 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
           << local_file << std::endl);
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
+        this->SetScriptErrorOccurred(true);
         return false;
         }
       unsigned long filelen = cmSystemTools::FileLength(local_file);
@@ -314,6 +315,7 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
         *this->LogFile << std::endl;
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
+        this->SetScriptErrorOccurred(true);
         return false;
         }
       // always cleanup
@@ -477,6 +479,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
           << local_file << std::endl);
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
+        this->SetScriptErrorOccurred(true);
         return false;
         }
       unsigned long filelen = cmSystemTools::FileLength(local_file);
@@ -621,6 +624,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
           }
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
+        this->SetScriptErrorOccurred(true);
         return false;
         }
       // always cleanup
@@ -783,6 +787,7 @@ bool cmCTestSubmitHandler::TriggerUsingHTTP(
           }
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
+        this->SetScriptErrorOccurred(true);
         return false;
         }
 
@@ -908,6 +913,7 @@ bool cmCTestSubmitHandler::SubmitUsingSCP(
   cmsysProcess_Delete(cp);
   if ( problems )
     {
+    this->SetScriptErrorOccurred(true);
     return false;
     }
   return true;
@@ -929,6 +935,7 @@ bool cmCTestSubmitHandler::SubmitUsingCP(
                << "\tNumber of files: " << files.size() << "\n"
                << "\tremoteprefix: " << remoteprefix << "\n"
                << "\tdestination: " << destination << std::endl);
+    this->SetScriptErrorOccurred(true);
     return 0;
     }
 
@@ -996,6 +1003,7 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot find file: "
         << local_file.c_str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
       }
 
@@ -1006,6 +1014,7 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  File too big: "
         << local_file.c_str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
       }
     size_t fileSize = static_cast<size_t>(st.st_size);
@@ -1014,6 +1023,7 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot open file: "
         << local_file.c_str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
       }
 
@@ -1024,6 +1034,7 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       fclose(fp);
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot read file: "
         << local_file.c_str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
       }
     fclose(fp);
@@ -1041,6 +1052,7 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
         << env.fault_string << " (" << env.fault_code << ")" << std::endl);
       xmlrpc_env_clean(&env);
       xmlrpc_client_cleanup();
+      this->SetScriptErrorOccurred(true);
       return false;
       }
 
@@ -1097,12 +1109,14 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Upload file not specified\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if (!cmSystemTools::FileExists(file))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Upload file not found: '" << file << "'\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestCurl curl(this->CTest);
@@ -1120,6 +1134,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Only http and https are supported for CDASH_UPLOAD\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   char md5sum[33];
@@ -1162,6 +1177,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Error in HttpRequest\n" << response);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -1173,6 +1189,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error parsing json string [" << response << "]\n"
                << reader.getFormattedErrorMessages() << "\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(json["status"].asInt() != 0)
@@ -1180,6 +1197,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Bad status returned from CDash: "
                << json["status"].asInt());
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(json["datafilesmd5"].isArray())
@@ -1198,6 +1216,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "bad datafilesmd5 value in response "
                << response << "\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -1212,6 +1231,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error uploading to CDash. "
                << file << " " << url << " " << fstr.str());
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(!reader.parse(response, json))
@@ -1219,6 +1239,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error parsing json string [" << response << "]\n"
                << reader.getFormattedErrorMessages() << "\n");
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -1249,6 +1270,7 @@ int cmCTestSubmitHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot find BuildDirectory  key in the DartConfiguration.tcl"
       << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -1457,6 +1479,7 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via FTP"
         << std::endl);
       ofs << "   Problems when submitting via FTP" << std::endl;
+      this->SetScriptErrorOccurred(true);
       return -1;
       }
     if(!this->CDash)
@@ -1474,6 +1497,7 @@ int cmCTestSubmitHandler::ProcessHandler()
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "   Problems when triggering via HTTP" << std::endl);
         ofs << "   Problems when triggering via HTTP" << std::endl;
+        this->SetScriptErrorOccurred(true);
         return -1;
         }
       cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
@@ -1517,6 +1541,7 @@ int cmCTestSubmitHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "   Problems when submitting via HTTP" << std::endl);
       ofs << "   Problems when submitting via HTTP" << std::endl;
+      this->SetScriptErrorOccurred(true);
       return -1;
       }
     if(!this->CDash)
@@ -1532,6 +1557,7 @@ int cmCTestSubmitHandler::ProcessHandler()
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "   Problems when triggering via HTTP" << std::endl);
         ofs << "   Problems when triggering via HTTP" << std::endl;
+        this->SetScriptErrorOccurred(true);
         return -1;
         }
       }
@@ -1567,6 +1593,7 @@ int cmCTestSubmitHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "   Problems when submitting via XML-RPC" << std::endl);
       ofs << "   Problems when submitting via XML-RPC" << std::endl;
+      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
@@ -1577,6 +1604,7 @@ int cmCTestSubmitHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "   Submission method \"xmlrpc\" not compiled into CTest!"
                << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
 #endif
     }
@@ -1605,6 +1633,7 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via SCP"
         << std::endl);
       ofs << "   Problems when submitting via SCP" << std::endl;
+      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmSystemTools::ChangeDirectory(oldWorkingDirectory);
@@ -1638,6 +1667,7 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via CP"
         << std::endl);
       ofs << "   Problems when submitting via cp" << std::endl;
+      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmSystemTools::ChangeDirectory(oldWorkingDirectory);
@@ -1649,6 +1679,7 @@ int cmCTestSubmitHandler::ProcessHandler()
 
   cmCTestLog(this->CTest, ERROR_MESSAGE, "   Unknown submission method: \""
     << dropMethod << "\"" << std::endl);
+  this->SetScriptErrorOccurred(true);
   return -1;
 }
 
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx
index b18786a..57e9216 100644
--- a/Source/CTest/cmCTestUpdateHandler.cxx
+++ b/Source/CTest/cmCTestUpdateHandler.cxx
@@ -204,6 +204,7 @@ int cmCTestUpdateHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot find SourceDirectory  key in the DartConfiguration.tcl"
       << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -253,6 +254,7 @@ int cmCTestUpdateHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open log file"
       << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   std::string start_time = this->CTest->CurrentTime();
@@ -318,12 +320,14 @@ int cmCTestUpdateHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "   There are modified or conflicting files in the repository"
       << std::endl);
+    this->SetScriptErrorOccurred(true);
     }
   if(!updated)
     {
     os << "Update command failed:\n" << vc->GetUpdateCommandLine();
     cmCTestLog(this->CTest, ERROR_MESSAGE, "   Update command failed: "
                << vc->GetUpdateCommandLine() << "\n");
+    this->SetScriptErrorOccurred(true);
     }
   os << "</UpdateReturnStatus>" << std::endl;
   os << "</Update>" << std::endl;
@@ -424,6 +428,7 @@ bool cmCTestUpdateHandler::SelectVCS()
         }
       e << " configuration key.";
       cmCTestLog(this->CTest, ERROR_MESSAGE, e.str() << std::endl);
+      this->SetScriptErrorOccurred(true);
       return false;
       }
     }
diff --git a/Source/CTest/cmCTestUploadHandler.cxx b/Source/CTest/cmCTestUploadHandler.cxx
index 579190a..965f88e 100644
--- a/Source/CTest/cmCTestUploadHandler.cxx
+++ b/Source/CTest/cmCTestUploadHandler.cxx
@@ -42,6 +42,7 @@ int cmCTestUploadHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open Upload.xml file" << std::endl);
+    this->SetScriptErrorOccurred(true);
     return -1;
     }
   std::string buildname = cmCTest::SafeBuildIdField(
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index e6d3960..aec943e 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -3122,7 +3122,6 @@ void cmCTest::Log(int logType, const char* file, int line, const char* msg,
       cmCTestLogOutputFileLine(err);
       err << msg;
       err.flush();
-      cmSystemTools::SetErrorOccured();
       break;
     default:
       cmCTestLogOutputFileLine(out);

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

Summary of changes:
 Source/CTest/cmCTestCoverageHandler.cxx            |   38 ++++++++++++++++++++
 Source/CTest/cmCTestGenericHandler.cxx             |    1 +
 Source/CTest/cmCTestGenericHandler.h               |    7 ++++
 Source/CTest/cmCTestHandlerCommand.cxx             |    9 +++--
 Source/CTest/cmCTestMemCheckHandler.cxx            |   14 ++++++++
 Source/CTest/cmCTestSubmitHandler.cxx              |   31 ++++++++++++++++
 Source/CTest/cmCTestUpdateHandler.cxx              |    5 +++
 Source/CTest/cmCTestUploadHandler.cxx              |    1 +
 Source/cmCTest.cxx                                 |    1 -
 .../ctest_build/BuildCompileError-stderr.txt       |    1 +
 .../ctest_build/BuildCompileError-stdout.txt       |   16 +++++++++
 Tests/RunCMake/ctest_build/CMakeLists.txt.in       |    4 ++-
 Tests/RunCMake/ctest_build/RunCMakeTest.cmake      |    1 +
 Tests/RunCMake/ctest_test/CMakeLists.txt.in        |    3 ++
 Tests/RunCMake/ctest_test/RunCMakeTest.cmake       |    3 +-
 Tests/RunCMake/ctest_test/TestFail-stdout.txt      |   10 ++++++
 16 files changed, 140 insertions(+), 5 deletions(-)
 create mode 100644 Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_test/TestFail-stdout.txt


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 25 11:40:15 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Feb 2015 11:40:15 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-736-g3fd4bd8
Message-ID: <20150225164016.01298227D@public.kitware.com>

This is an automated email from 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  3fd4bd8cf59b0e3612f4d946201f63485f245649 (commit)
       via  772eae446409fb853585e196009c87d3037fbc22 (commit)
       via  4300de3e2759810ddfd253352eb42cd7f3514c85 (commit)
       via  1de4a0fb09fded1401ecb1aeaecb1159ae46a3c6 (commit)
      from  f36c2841a7a62fb1d6df9c12065f79f4a54be996 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fd4bd8cf59b0e3612f4d946201f63485f245649
commit 3fd4bd8cf59b0e3612f4d946201f63485f245649
Merge: f36c284 772eae4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 25 11:40:15 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 25 11:40:15 2015 -0500

    Merge topic 'windows-rc-enable-later' into next
    
    772eae44 RC: Add platform-specific preprocessor definitions (#15404)
    4300de3e RC: Enable language after C, CXX, or Fortran is enabled (#15404)
    1de4a0fb RC: Drop unused CMAKE_COMPILE_RESOURCE variable setting


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=772eae446409fb853585e196009c87d3037fbc22
commit 772eae446409fb853585e196009c87d3037fbc22
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 25 11:26:48 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 25 11:29:45 2015 -0500

    RC: Add platform-specific preprocessor definitions (#15404)
    
    In Platform/Windows-MSVC the C and CXX flags are initialized to
    contain preprocessor definitions describing the platform.  On
    WinCE platforms this may not be just -DWIN32.  This information
    may be important to RC sources too, so add such preprocessor
    definitions to the default RC flags.
    
    Suggested-by: Gunnar Roth <gunnar.roth at gmx.de>

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 7ac299a..9298da2 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -271,5 +271,9 @@ macro(__windows_compiler_msvc lang)
   set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG")
   set(CMAKE_${lang}_LINKER_SUPPORTS_PDB ON)
 
+  if(NOT CMAKE_RC_FLAGS_INIT)
+    set(CMAKE_RC_FLAGS_INIT "${_PLATFORM_DEFINES} ${_PLATFORM_DEFINES_${lang}}")
+  endif()
+
   enable_language(RC)
 endmacro()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4300de3e2759810ddfd253352eb42cd7f3514c85
commit 4300de3e2759810ddfd253352eb42cd7f3514c85
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 25 11:15:51 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 25 11:16:51 2015 -0500

    RC: Enable language after C, CXX, or Fortran is enabled (#15404)
    
    The RC language is special in that it is automatically enabled
    on Windows-based platforms when another primary language is
    enabled.  Move enablement of RC from early in the enablement
    of the other language to late.  This will allow it to use
    information detected as part of enabling C, CXX, or Fortran.

diff --git a/Modules/Platform/CYGWIN-GNU.cmake b/Modules/Platform/CYGWIN-GNU.cmake
index fe25ab2..3144ac4 100644
--- a/Modules/Platform/CYGWIN-GNU.cmake
+++ b/Modules/Platform/CYGWIN-GNU.cmake
@@ -25,7 +25,6 @@ set(CMAKE_CREATE_WIN32_EXE  "-mwindows")
 set(CMAKE_GNULD_IMAGE_VERSION
   "-Wl,--major-image-version,<TARGET_VERSION_MAJOR>,--minor-image-version,<TARGET_VERSION_MINOR>")
 set(CMAKE_GENERATOR_RC windres)
-enable_language(RC)
 macro(__cygwin_compiler_gnu lang)
   # Binary link rules.
   set(CMAKE_${lang}_CREATE_SHARED_MODULE
@@ -53,4 +52,6 @@ macro(__cygwin_compiler_gnu lang)
   # TODO: Is -Wl,--enable-auto-import now always default?
   set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS} -Wl,--enable-auto-import")
   set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS}")
+
+  enable_language(RC)
 endmacro()
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index a7653cf..c827c32 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -61,8 +61,6 @@ if(NOT CMAKE_GENERATOR_RC AND CMAKE_GENERATOR MATCHES "Unix Makefiles")
   set(CMAKE_GENERATOR_RC windres)
 endif()
 
-enable_language(RC)
-
 macro(__windows_compiler_gnu lang)
 
   if(MSYS OR MINGW)
@@ -139,6 +137,8 @@ macro(__windows_compiler_gnu lang)
         )
     endforeach()
   endif()
+
+  enable_language(RC)
 endmacro()
 
 macro(__windows_compiler_gnu_abi lang)
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index b101b63..7ac299a 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -53,9 +53,6 @@ if(NOT CMAKE_NO_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Visual Studio")
   set (CMAKE_NO_BUILD_TYPE 1)
 endif()
 
-# make sure to enable languages after setting configuration types
-enable_language(RC)
-
 if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
   set(MSVC_IDE 1)
 else()
@@ -273,4 +270,6 @@ macro(__windows_compiler_msvc lang)
   set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG")
   set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG")
   set(CMAKE_${lang}_LINKER_SUPPORTS_PDB ON)
+
+  enable_language(RC)
 endmacro()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1de4a0fb09fded1401ecb1aeaecb1159ae46a3c6
commit 1de4a0fb09fded1401ecb1aeaecb1159ae46a3c6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 25 11:12:06 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 25 11:16:19 2015 -0500

    RC: Drop unused CMAKE_COMPILE_RESOURCE variable setting
    
    This variable has long been replaced by CMAKE_RC_COMPILE_OBJECT.
    Stop setting it in platform modules.

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 2440f89..b101b63 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -55,7 +55,6 @@ endif()
 
 # make sure to enable languages after setting configuration types
 enable_language(RC)
-set(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
 
 if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
   set(MSVC_IDE 1)
diff --git a/Modules/Platform/Windows-df.cmake b/Modules/Platform/Windows-df.cmake
index 59d88a3..0beba73 100644
--- a/Modules/Platform/Windows-df.cmake
+++ b/Modules/Platform/Windows-df.cmake
@@ -24,8 +24,6 @@ set(CMAKE_Fortran_CREATE_STATIC_LIBRARY  "lib ${CMAKE_CL_NOLOGO} <LINK_FLAGS> /o
 set(CMAKE_Fortran_COMPILE_OBJECT
     "<CMAKE_Fortran_COMPILER>  ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} /object:<OBJECT> <FLAGS> /compile_only <SOURCE>${CMAKE_END_TEMP_FILE}")
 
-set(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
-
 set(CMAKE_Fortran_LINK_EXECUTABLE
     "<CMAKE_Fortran_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> /exe:<TARGET> <OBJECTS> /link <CMAKE_Fortran_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
 

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

Summary of changes:
 Modules/Platform/CYGWIN-GNU.cmake   |    3 ++-
 Modules/Platform/Windows-GNU.cmake  |    4 ++--
 Modules/Platform/Windows-MSVC.cmake |   10 ++++++----
 Modules/Platform/Windows-df.cmake   |    2 --
 4 files changed, 10 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake

From zack.galbreath at kitware.com  Wed Feb 25 15:03:32 2015
From: zack.galbreath at kitware.com (Zack Galbreath)
Date: Wed, 25 Feb 2015 15:03:32 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-741-g9715186
Message-ID: <20150225200332.3E06FAB0FF@public.kitware.com>

This is an automated email from 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  9715186541d1b94762a36a85ad769339c13c9c60 (commit)
       via  ade4ad327a1a7e061a879c8f327af4308ae636fc (commit)
       via  fa4cce658a0768e3ca7b8e2de086dc045aa0fda2 (commit)
       via  f5de2d8e8a097319e6d1e9db23b19e9edb3e6c5a (commit)
       via  614e2d3488b1306051f562e98c103a3a137773b0 (commit)
      from  3fd4bd8cf59b0e3612f4d946201f63485f245649 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9715186541d1b94762a36a85ad769339c13c9c60
commit 9715186541d1b94762a36a85ad769339c13c9c60
Merge: 3fd4bd8 ade4ad3
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 15:03:31 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 25 15:03:31 2015 -0500

    Merge topic 'error_in_read_script' into next
    
    ade4ad32 tolerate spaces in path for RunCMake.ctest_build
    fa4cce65 Adopt CMAKELISTS_EXTRA_CODE approach
    f5de2d8e remove redundant calls to SetScriptErrorOccurred
    614e2d34 remove some calls to SetScriptErrorOccurred


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ade4ad327a1a7e061a879c8f327af4308ae636fc
commit ade4ad327a1a7e061a879c8f327af4308ae636fc
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 14:44:33 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Wed Feb 25 14:44:33 2015 -0500

    tolerate spaces in path for RunCMake.ctest_build

diff --git a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
index c4dc301..e2b23c4 100644
--- a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
@@ -12,6 +12,6 @@ run_ctest_build(BuildQuiet QUIET)
 set(CMAKELISTS_EXTRA_CODE "
 enable_language(CXX)
 add_executable(compile_error
- ${RunCMake_SOURCE_DIR}/../../CTestTestFailure/badCode.cxx)")
+ \"${RunCMake_SOURCE_DIR}/../../CTestTestFailure/badCode.cxx\")")
 run_ctest_build(BuildCompileError TARGET compile_error)
 set(CMAKELISTS_EXTRA_CODE "")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa4cce658a0768e3ca7b8e2de086dc045aa0fda2
commit fa4cce658a0768e3ca7b8e2de086dc045aa0fda2
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 11:27:14 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Wed Feb 25 11:27:14 2015 -0500

    Adopt CMAKELISTS_EXTRA_CODE approach
    
    This is a more encapsulated way to perform our new
    "Error in read script" test cases.

diff --git a/Tests/RunCMake/ctest_build/CMakeLists.txt.in b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
index 55ccc19..97c4ec2 100644
--- a/Tests/RunCMake/ctest_build/CMakeLists.txt.in
+++ b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
@@ -1,6 +1,5 @@
 cmake_minimum_required(VERSION 3.1)
-project(CTestBuild at CASE_NAME@)
+project(CTestBuild at CASE_NAME@ NONE)
 include(CTest)
 add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
-add_executable(compile_error EXCLUDE_FROM_ALL
-  @RunCMake_SOURCE_DIR@/../../CTestTestFailure/badCode.cxx)
+ at CMAKELISTS_EXTRA_CODE@
diff --git a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
index 2fc80d3..c4dc301 100644
--- a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
@@ -8,4 +8,10 @@ function(run_ctest_build CASE_NAME)
 endfunction()
 
 run_ctest_build(BuildQuiet QUIET)
+
+set(CMAKELISTS_EXTRA_CODE "
+enable_language(CXX)
+add_executable(compile_error
+ ${RunCMake_SOURCE_DIR}/../../CTestTestFailure/badCode.cxx)")
 run_ctest_build(BuildCompileError TARGET compile_error)
+set(CMAKELISTS_EXTRA_CODE "")
diff --git a/Tests/RunCMake/ctest_test/CMakeLists.txt.in b/Tests/RunCMake/ctest_test/CMakeLists.txt.in
index 2a095dd..6b3f485 100644
--- a/Tests/RunCMake/ctest_test/CMakeLists.txt.in
+++ b/Tests/RunCMake/ctest_test/CMakeLists.txt.in
@@ -2,6 +2,4 @@ cmake_minimum_required(VERSION 3.1)
 project(CTestTest at CASE_NAME@ NONE)
 include(CTest)
 add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
-
-add_test(NAME CMakeVersionFail COMMAND "${CMAKE_COMMAND}" --version)
-set_tests_properties(CMakeVersionFail PROPERTIES WILL_FAIL TRUE)
+ at CMAKELISTS_EXTRA_CODE@
diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
index 24edbd2..bb0d5cf 100644
--- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
@@ -7,5 +7,11 @@ function(run_ctest_test CASE_NAME)
   run_ctest(${CASE_NAME})
 endfunction()
 
-run_ctest_test(TestQuiet QUIET EXCLUDE Fail)
+run_ctest_test(TestQuiet QUIET)
+
+set(CMAKELISTS_EXTRA_CODE "
+add_test(NAME CMakeVersionFail COMMAND \"${CMAKE_COMMAND}\" --version)
+set_tests_properties(CMakeVersionFail PROPERTIES WILL_FAIL TRUE)
+")
 run_ctest_test(TestFail INCLUDE Fail)
+set(CMAKELISTS_EXTRA_CODE "")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5de2d8e8a097319e6d1e9db23b19e9edb3e6c5a
commit f5de2d8e8a097319e6d1e9db23b19e9edb3e6c5a
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 11:07:57 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Wed Feb 25 11:14:52 2015 -0500

    remove redundant calls to SetScriptErrorOccurred

diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index ddb5f4c..36ef199 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -235,7 +235,6 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
           << local_file << std::endl);
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
-        this->SetScriptErrorOccurred(true);
         return false;
         }
       unsigned long filelen = cmSystemTools::FileLength(local_file);
@@ -315,7 +314,6 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
         *this->LogFile << std::endl;
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
-        this->SetScriptErrorOccurred(true);
         return false;
         }
       // always cleanup
@@ -479,7 +477,6 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
           << local_file << std::endl);
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
-        this->SetScriptErrorOccurred(true);
         return false;
         }
       unsigned long filelen = cmSystemTools::FileLength(local_file);
@@ -624,7 +621,6 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
           }
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
-        this->SetScriptErrorOccurred(true);
         return false;
         }
       // always cleanup
@@ -787,7 +783,6 @@ bool cmCTestSubmitHandler::TriggerUsingHTTP(
           }
         ::curl_easy_cleanup(curl);
         ::curl_global_cleanup();
-        this->SetScriptErrorOccurred(true);
         return false;
         }
 
@@ -913,7 +908,6 @@ bool cmCTestSubmitHandler::SubmitUsingSCP(
   cmsysProcess_Delete(cp);
   if ( problems )
     {
-    this->SetScriptErrorOccurred(true);
     return false;
     }
   return true;
@@ -935,8 +929,7 @@ bool cmCTestSubmitHandler::SubmitUsingCP(
                << "\tNumber of files: " << files.size() << "\n"
                << "\tremoteprefix: " << remoteprefix << "\n"
                << "\tdestination: " << destination << std::endl);
-    this->SetScriptErrorOccurred(true);
-    return 0;
+    return false;
     }
 
   cmCTest::SetOfStrings::const_iterator file;
@@ -1003,7 +996,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot find file: "
         << local_file.c_str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
       }
 
@@ -1014,7 +1006,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  File too big: "
         << local_file.c_str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
       }
     size_t fileSize = static_cast<size_t>(st.st_size);
@@ -1023,7 +1014,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot open file: "
         << local_file.c_str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
       }
 
@@ -1034,7 +1024,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
       fclose(fp);
       cmCTestLog(this->CTest, ERROR_MESSAGE, "  Cannot read file: "
         << local_file.c_str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
       }
     fclose(fp);
@@ -1052,7 +1041,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
         << env.fault_string << " (" << env.fault_code << ")" << std::endl);
       xmlrpc_env_clean(&env);
       xmlrpc_client_cleanup();
-      this->SetScriptErrorOccurred(true);
       return false;
       }
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=614e2d3488b1306051f562e98c103a3a137773b0
commit 614e2d3488b1306051f562e98c103a3a137773b0
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 10:58:19 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Wed Feb 25 11:14:28 2015 -0500

    remove some calls to SetScriptErrorOccurred
    
    This should only be called for errors that the site maintainer
    could reasonably be expected to fix.

diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index ea95401..bb31bc7 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -458,7 +458,6 @@ int cmCTestCoverageHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open coverage summary file." << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -526,7 +525,6 @@ int cmCTestCoverageHandler::ProcessHandler()
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find file: "
         << fullFileName << std::endl);
-      this->SetScriptErrorOccurred(true);
       continue;
       }
 
@@ -688,7 +686,6 @@ int cmCTestCoverageHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "  " << *erIt << std::endl);
       }
-    this->SetScriptErrorOccurred(true);
     }
 
   long total_lines = total_tested + total_untested;
@@ -1118,7 +1115,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << errors << std::endl);
       cont->Error ++;
-      this->SetScriptErrorOccurred(true);
       continue;
       }
     if ( retVal != 0 )
@@ -1127,7 +1123,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
         << retVal << " while processing: " << *it << std::endl);
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << cont->Error << std::endl);
-      this->SetScriptErrorOccurred(true);
       }
     cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "--------------------------------------------------------------"
@@ -1164,7 +1159,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e1"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1182,7 +1176,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e2"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1199,7 +1192,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e3"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1217,7 +1209,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e4"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
         }
@@ -1232,7 +1223,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e5"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1249,7 +1239,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e6"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1267,7 +1256,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e7"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1285,7 +1273,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e8"
             << std::endl);
           cont->Error ++;
-          this->SetScriptErrorOccurred(true);
           break;
           }
 
@@ -1303,7 +1290,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE,
             "Unknown gcov output line: [" << *line << "]"
             << std::endl);
-          this->SetScriptErrorOccurred(true);
           cont->Error ++;
           //abort();
           }
@@ -1327,7 +1313,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
           {
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
             << gcovFile << std::endl);
-          this->SetScriptErrorOccurred(true);
           }
         else
           {
@@ -1544,7 +1529,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << errors << std::endl);
       cont->Error ++;
-      this->SetScriptErrorOccurred(true);
       continue;
       }
     if ( retVal != 0 )
@@ -1553,7 +1537,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
         << retVal << " while processing: " << *it << std::endl);
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Command produced error: " << cont->Error << std::endl);
-      this->SetScriptErrorOccurred(true);
       }
     cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "--------------------------------------------------------------"
@@ -1604,7 +1587,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
           {
           cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
                      << lcovFile << std::endl);
-          this->SetScriptErrorOccurred(true);
           }
         std::string srcname;
 
@@ -1614,7 +1596,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
           cmCTestLog(this->CTest, ERROR_MESSAGE,
                      "Error while parsing lcov file '" << lcovFile << "':"
                      << " No source file name found!" << std::endl);
-          this->SetScriptErrorOccurred(true);
           return 0;
           }
         srcname = srcname.substr(18);
@@ -1648,7 +1629,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
             {
             cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
                        << lcovFile << std::endl);
-            this->SetScriptErrorOccurred(true);
             }
           else
             {
@@ -1824,7 +1804,6 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Cannot find source Python file corresponding to: "
         << *fileIt << std::endl);
-      this->SetScriptErrorOccurred(true);
       continue;
       }
 
@@ -1842,7 +1821,6 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
         << *fileIt << std::endl);
-      this->SetScriptErrorOccurred(true);
       }
     else
       {
@@ -1879,7 +1857,6 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
               cmCTestLog(this->CTest, ERROR_MESSAGE,
                 "Currently the limit is maximum coverage of 999999"
                 << std::endl);
-              this->SetScriptErrorOccurred(true);
               }
             }
           }
@@ -1974,7 +1951,6 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Files and full path files not the same size?:\n");
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   // create the output stream for the CoverageLog-N.xml file
@@ -1982,7 +1958,6 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
   int logFileCount = 0;
   if ( !this->StartCoverageLogFile(covLogFile, logFileCount) )
     {
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   // for each file run covbr on that file to get the coverage
@@ -1994,7 +1969,6 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
   if(!this->RunBullseyeCommand(cont, "covbr", 0, outputFile))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error running covbr for." << "\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -2006,7 +1980,6 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Cannot open coverage file: " <<
                outputFile << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::map<std::string, std::string> fileMap;
@@ -2119,7 +2092,6 @@ int cmCTestCoverageHandler::RunBullseyeCommand(
   if(program.empty())
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find :" << cmd << "\n");
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   if(arg)
@@ -2151,7 +2123,6 @@ int cmCTestCoverageHandler::RunBullseyeCommand(
                << program << " " << arg << "\n"
                << "kwsys process state : "
                << runCoverageSrc.GetProcessState());
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   // since we set the output file names wait for it to end
@@ -2169,7 +2140,6 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
   if(!this->RunBullseyeCommand(cont, "covsrc", "-c", outputFile))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "error running covsrc:\n");
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
 
@@ -2180,7 +2150,6 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open coverage summary file." << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   this->CTest->StartXML(covSumFile, this->AppendXML);
@@ -2221,7 +2190,6 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Cannot open coverage summary file: " <<
                outputFile << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::set<std::string> coveredFileNames;
@@ -2386,7 +2354,6 @@ int cmCTestCoverageHandler::HandleBullseyeCoverage(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Error running bullseye summary.\n");
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   cmCTestOptionalLog(this->CTest, DEBUG, "HandleBullseyeCoverage return 1 "
@@ -2425,7 +2392,6 @@ bool cmCTestCoverageHandler::ParseBullsEyeCovsrcLine(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error parsing string : "
                << inputLine << "\n");
-    this->SetScriptErrorOccurred(true);
     return false;
     }
   // the source file has "" around it so extract out the file name
@@ -2461,7 +2427,6 @@ bool cmCTestCoverageHandler::ParseBullsEyeCovsrcLine(
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error parsing input : "
                << inputLine << " last pos not npos =  " << pos <<
                "\n");
-    this->SetScriptErrorOccurred(true);
     }
   return true;
 }
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index f603297..c7b2210 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -51,7 +51,6 @@ static void xmlReportError(int line, const char* msg, void* data)
   cmCTestLog(ctest, ERROR_MESSAGE,
              "Error parsing XML in stream at line "
              << line << ": " << msg << std::endl);
-  ctest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
 }
 
 // parse the xml file containing the results of last BoundsChecker run
@@ -112,7 +111,6 @@ public:
         this->Errors.push_back(cmCTestMemCheckHandler::ABW); // do not know
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "No Category found in Bounds checker XML\n" );
-        this->CTest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
         return;
         }
       while(ptr->ErrorCategory && cat)
@@ -130,7 +128,6 @@ public:
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "Found unknown Bounds Checker error "
                    << ptr->ErrorCategory << std::endl);
-        this->CTest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
         }
     }
   cmCTest* CTest;
@@ -916,7 +913,6 @@ bool cmCTestMemCheckHandler::ProcessMemCheckPurifyOutput(
           << pfW.match(1) << std::endl);
         ostr << "*** Unknown Purify memory fault: " << pfW.match(1)
           << std::endl;
-        this->SetScriptErrorOccurred(true);
         }
       }
     if ( failure != this->ResultStrings.size() )
@@ -1152,7 +1148,6 @@ bool cmCTestMemCheckHandler::ProcessMemCheckBoundsCheckerOutput(
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "Error in ParseChunk: " << theLine
                    << std::endl);
-        this->SetScriptErrorOccurred(true);
         }
       }
     }
@@ -1227,7 +1222,6 @@ cmCTestMemCheckHandler::PostProcessBoundsCheckerTest(cmCTestTestResult& res,
     {
     std::string log = "Cannot read memory tester output file: " + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
-    this->SetScriptErrorOccurred(true);
     return;
     }
   res.Output += BOUNDS_CHECKER_MARKER;
@@ -1263,7 +1257,6 @@ cmCTestMemCheckHandler::AppendMemTesterOutput(cmCTestTestResult& res,
     {
     std::string log = "Cannot read memory tester output file: " + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
-    this->SetScriptErrorOccurred(true);
     return;
     }
   std::string line;
diff --git a/Tests/RunCMake/ctest_memcheck/DummyBC-result.txt b/Tests/RunCMake/ctest_memcheck/DummyBC-result.txt
deleted file mode 100644
index b57e2de..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyBC-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-(-1|255)

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

Summary of changes:
 Source/CTest/cmCTestCoverageHandler.cxx          |   35 ----------------------
 Source/CTest/cmCTestMemCheckHandler.cxx          |    7 -----
 Source/CTest/cmCTestSubmitHandler.cxx            |   14 +--------
 Tests/RunCMake/ctest_build/CMakeLists.txt.in     |    5 ++--
 Tests/RunCMake/ctest_build/RunCMakeTest.cmake    |    6 ++++
 Tests/RunCMake/ctest_memcheck/DummyBC-result.txt |    1 -
 Tests/RunCMake/ctest_test/CMakeLists.txt.in      |    4 +--
 Tests/RunCMake/ctest_test/RunCMakeTest.cmake     |    8 ++++-
 8 files changed, 17 insertions(+), 63 deletions(-)
 delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyBC-result.txt


hooks/post-receive
-- 
CMake

From zack.galbreath at kitware.com  Wed Feb 25 16:19:46 2015
From: zack.galbreath at kitware.com (Zack Galbreath)
Date: Wed, 25 Feb 2015 16:19:46 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-743-g731f112
Message-ID: <20150225211946.D0AAEA9C42@public.kitware.com>

This is an automated email from 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  731f11216cb3f40fd7ab5facfc037759e4e62838 (commit)
       via  ef4032f7262eb1486b6f83402c14be90dcddf7d9 (commit)
      from  9715186541d1b94762a36a85ad769339c13c9c60 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=731f11216cb3f40fd7ab5facfc037759e4e62838
commit 731f11216cb3f40fd7ab5facfc037759e4e62838
Merge: 9715186 ef4032f
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 16:19:46 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 25 16:19:46 2015 -0500

    Merge topic 'error_in_read_script' into next
    
    ef4032f7 more permissive output for BuildCompileError


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef4032f7262eb1486b6f83402c14be90dcddf7d9
commit ef4032f7262eb1486b6f83402c14be90dcddf7d9
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 16:17:23 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Wed Feb 25 16:17:23 2015 -0500

    more permissive output for BuildCompileError
    
    This accounts for differences in how native compilers report
    errors and warnings.

diff --git a/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt b/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
index 63215c0..3ecb292 100644
--- a/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
+++ b/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
@@ -12,5 +12,5 @@ Build project
    Each symbol represents 1024 bytes of output.
    '!' represents an error and '\*' a warning.
     . Size of output: [0-9]+K
-   [1-9] Compiler errors
-   0 Compiler warnings
+   [1-9][0-9]* Compiler errors
+   [0-9]+ Compiler warnings

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

Summary of changes:
 Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From zack.galbreath at kitware.com  Wed Feb 25 16:22:26 2015
From: zack.galbreath at kitware.com (Zack Galbreath)
Date: Wed, 25 Feb 2015 16:22:26 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-745-g966b73f
Message-ID: <20150225212226.E52ABAA148@public.kitware.com>

This is an automated email from 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  966b73f5903810892388aecd379d844e1d830169 (commit)
       via  4f0ba0ac922325f46c7fa513d117f0aef076e625 (commit)
      from  731f11216cb3f40fd7ab5facfc037759e4e62838 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=966b73f5903810892388aecd379d844e1d830169
commit 966b73f5903810892388aecd379d844e1d830169
Merge: 731f112 4f0ba0a
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 16:22:26 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 25 16:22:26 2015 -0500

    Merge topic 'error_in_read_script' into next
    
    4f0ba0ac more attempts to get ctest_build passing


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f0ba0ac922325f46c7fa513d117f0aef076e625
commit 4f0ba0ac922325f46c7fa513d117f0aef076e625
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 16:22:08 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Wed Feb 25 16:22:08 2015 -0500

    more attempts to get ctest_build passing
    
    Similar to last commit, account for difference in numbers of
    errors & warnings detected by different compilers.

diff --git a/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt b/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
index 3ecb292..1d7c09c 100644
--- a/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
+++ b/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
@@ -11,6 +11,6 @@ Configure project
 Build project
    Each symbol represents 1024 bytes of output.
    '!' represents an error and '\*' a warning.
-    . Size of output: [0-9]+K
+    [.*!]+ Size of output: [0-9]+K
    [1-9][0-9]* Compiler errors
    [0-9]+ Compiler warnings

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

Summary of changes:
 Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Feb 25 16:33:58 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 25 Feb 2015 16:33:58 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-747-g9c73f92
Message-ID: <20150225213358.11198AAC23@public.kitware.com>

This is an automated email from 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  9c73f92cde601f229547ed4795a4d4d351b43a02 (commit)
       via  6a3f01dcaa5420dad4871a2715dd753361c7632f (commit)
      from  966b73f5903810892388aecd379d844e1d830169 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c73f92cde601f229547ed4795a4d4d351b43a02
commit 9c73f92cde601f229547ed4795a4d4d351b43a02
Merge: 966b73f 6a3f01d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 25 16:33:57 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 25 16:33:57 2015 -0500

    Merge topic 'error_in_read_script' into next
    
    6a3f01dc Revert topic 'error_in_read_script'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a3f01dcaa5420dad4871a2715dd753361c7632f
commit 6a3f01dcaa5420dad4871a2715dd753361c7632f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 25 16:33:40 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 25 16:33:40 2015 -0500

    Revert topic 'error_in_read_script'
    
    It will be restored with an alternative approach.

diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index bb31bc7..790e488 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -183,7 +183,6 @@ bool cmCTestCoverageHandler::StartCoverageLogFile(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open log file: "
       << covLogFilename << std::endl);
-    this->SetScriptErrorOccurred(true);
     return false;
     }
   std::string local_start_time = this->CTest->CurrentTime();
@@ -349,7 +348,6 @@ int cmCTestCoverageHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot create LastCoverage.log file" << std::endl);
-    this->SetScriptErrorOccurred(true);
     }
 
   ofs << "Performing coverage: " << elapsed_time_start << std::endl;
@@ -1007,7 +1005,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Could not find gcov." << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   std::string gcovExtraFlags
diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx
index c16ec2b..81eb0a8 100644
--- a/Source/CTest/cmCTestGenericHandler.cxx
+++ b/Source/CTest/cmCTestGenericHandler.cxx
@@ -23,7 +23,6 @@ cmCTestGenericHandler::cmCTestGenericHandler()
   this->SubmitIndex = 0;
   this->AppendXML = false;
   this->Quiet = false;
-  this->ScriptErrorOccurred = false;
 }
 
 //----------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h
index d83ad7b..8567dd7 100644
--- a/Source/CTest/cmCTestGenericHandler.h
+++ b/Source/CTest/cmCTestGenericHandler.h
@@ -90,12 +90,6 @@ public:
   void SetQuiet(bool b) { this->Quiet = b; }
   bool GetQuiet() { return this->Quiet; }
 
-  /**
-   * Get/Set whether or not a script-level error occurred.
-   */
-  bool GetScriptErrorOccurred() { return this->ScriptErrorOccurred; }
-  void SetScriptErrorOccurred(bool b) { this->ScriptErrorOccurred = b; }
-
 protected:
   bool StartResultingXML(cmCTest::Part part,
                          const char* name, cmGeneratedFileStream& xofs);
@@ -103,7 +97,6 @@ protected:
 
   bool AppendXML;
   bool Quiet;
-  bool ScriptErrorOccurred;
   cmSystemTools::OutputOption HandlerVerbose;
   cmCTest *CTest;
   t_StringToString Options;
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index 6c4fa63..3003e8a 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -141,19 +141,14 @@ bool cmCTestHandlerCommand
   cmSystemTools::ChangeDirectory(
     this->CTest->GetCTestConfiguration("BuildDirectory"));
   int res = handler->ProcessHandler();
-  cmSystemTools::ChangeDirectory(current_dir);
-
-  if (handler->GetScriptErrorOccurred())
-    {
-    cmSystemTools::SetErrorOccured();
-    }
-  else if ( this->Values[ct_RETURN_VALUE] && *this->Values[ct_RETURN_VALUE])
+  if ( this->Values[ct_RETURN_VALUE] && *this->Values[ct_RETURN_VALUE])
     {
     std::ostringstream str;
     str << res;
     this->Makefile->AddDefinition(
       this->Values[ct_RETURN_VALUE], str.str().c_str());
     }
+  cmSystemTools::ChangeDirectory(current_dir);
   return true;
 }
 
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index c7b2210..061f3fd 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -175,7 +175,6 @@ int cmCTestMemCheckHandler::PreProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Problem executing pre-memcheck command(s)." << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   return 1;
@@ -188,7 +187,6 @@ int cmCTestMemCheckHandler::PostProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Problem executing post-memcheck command(s)." << std::endl);
-    this->SetScriptErrorOccurred(true);
     return 0;
     }
   return 1;
@@ -648,7 +646,6 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
             "Cannot find memory checker suppression file: "
             << this->CTest->GetCTestConfiguration(
               "MemoryCheckSuppressionFile") << std::endl);
-          this->SetScriptErrorOccurred(true);
           return false;
           }
         std::string suppressions = "--suppressions="
@@ -674,7 +671,6 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
                      "Cannot find memory checker suppression file: "
                      << this->CTest->GetCTestConfiguration(
                        "MemoryCheckSuppressionFile").c_str() << std::endl);
-          this->SetScriptErrorOccurred(true);
           return false;
           }
         std::string filterFiles = "/FilterFiles="
@@ -746,7 +742,6 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Do not understand memory checker: " << this->MemoryTester
         << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
     }
 
@@ -1295,7 +1290,6 @@ void cmCTestMemCheckHandler::TestOutputFileNames(int test,
       std::string log = "Cannot find memory tester output file: "
         + ofile;
       cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       ofile = "";
       }
     else
@@ -1309,7 +1303,6 @@ void cmCTestMemCheckHandler::TestOutputFileNames(int test,
     std::string log = "Cannot find memory tester output file: "
       + ofile;
     cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
-    this->SetScriptErrorOccurred(true);
     ofile = "";
     }
   files.push_back(ofile);
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 36ef199..d585863 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -929,7 +929,7 @@ bool cmCTestSubmitHandler::SubmitUsingCP(
                << "\tNumber of files: " << files.size() << "\n"
                << "\tremoteprefix: " << remoteprefix << "\n"
                << "\tdestination: " << destination << std::endl);
-    return false;
+    return 0;
     }
 
   cmCTest::SetOfStrings::const_iterator file;
@@ -1097,14 +1097,12 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Upload file not specified\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if (!cmSystemTools::FileExists(file))
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Upload file not found: '" << file << "'\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestCurl curl(this->CTest);
@@ -1122,7 +1120,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Only http and https are supported for CDASH_UPLOAD\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   char md5sum[33];
@@ -1165,7 +1162,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Error in HttpRequest\n" << response);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -1177,7 +1173,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error parsing json string [" << response << "]\n"
                << reader.getFormattedErrorMessages() << "\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(json["status"].asInt() != 0)
@@ -1185,7 +1180,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Bad status returned from CDash: "
                << json["status"].asInt());
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(json["datafilesmd5"].isArray())
@@ -1204,7 +1198,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "bad datafilesmd5 value in response "
                << response << "\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -1219,7 +1212,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error uploading to CDash. "
                << file << " " << url << " " << fstr.str());
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   if(!reader.parse(response, json))
@@ -1227,7 +1219,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "error parsing json string [" << response << "]\n"
                << reader.getFormattedErrorMessages() << "\n");
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -1258,7 +1249,6 @@ int cmCTestSubmitHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot find BuildDirectory  key in the DartConfiguration.tcl"
       << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -1467,7 +1457,6 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via FTP"
         << std::endl);
       ofs << "   Problems when submitting via FTP" << std::endl;
-      this->SetScriptErrorOccurred(true);
       return -1;
       }
     if(!this->CDash)
@@ -1485,7 +1474,6 @@ int cmCTestSubmitHandler::ProcessHandler()
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "   Problems when triggering via HTTP" << std::endl);
         ofs << "   Problems when triggering via HTTP" << std::endl;
-        this->SetScriptErrorOccurred(true);
         return -1;
         }
       cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
@@ -1529,7 +1517,6 @@ int cmCTestSubmitHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "   Problems when submitting via HTTP" << std::endl);
       ofs << "   Problems when submitting via HTTP" << std::endl;
-      this->SetScriptErrorOccurred(true);
       return -1;
       }
     if(!this->CDash)
@@ -1545,7 +1532,6 @@ int cmCTestSubmitHandler::ProcessHandler()
         cmCTestLog(this->CTest, ERROR_MESSAGE,
                    "   Problems when triggering via HTTP" << std::endl);
         ofs << "   Problems when triggering via HTTP" << std::endl;
-        this->SetScriptErrorOccurred(true);
         return -1;
         }
       }
@@ -1581,7 +1567,6 @@ int cmCTestSubmitHandler::ProcessHandler()
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "   Problems when submitting via XML-RPC" << std::endl);
       ofs << "   Problems when submitting via XML-RPC" << std::endl;
-      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "   Submission successful"
@@ -1592,7 +1577,6 @@ int cmCTestSubmitHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "   Submission method \"xmlrpc\" not compiled into CTest!"
                << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
 #endif
     }
@@ -1621,7 +1605,6 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via SCP"
         << std::endl);
       ofs << "   Problems when submitting via SCP" << std::endl;
-      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmSystemTools::ChangeDirectory(oldWorkingDirectory);
@@ -1655,7 +1638,6 @@ int cmCTestSubmitHandler::ProcessHandler()
         "   Problems when submitting via CP"
         << std::endl);
       ofs << "   Problems when submitting via cp" << std::endl;
-      this->SetScriptErrorOccurred(true);
       return -1;
       }
     cmSystemTools::ChangeDirectory(oldWorkingDirectory);
@@ -1667,7 +1649,6 @@ int cmCTestSubmitHandler::ProcessHandler()
 
   cmCTestLog(this->CTest, ERROR_MESSAGE, "   Unknown submission method: \""
     << dropMethod << "\"" << std::endl);
-  this->SetScriptErrorOccurred(true);
   return -1;
 }
 
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx
index 57e9216..b18786a 100644
--- a/Source/CTest/cmCTestUpdateHandler.cxx
+++ b/Source/CTest/cmCTestUpdateHandler.cxx
@@ -204,7 +204,6 @@ int cmCTestUpdateHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot find SourceDirectory  key in the DartConfiguration.tcl"
       << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
 
@@ -254,7 +253,6 @@ int cmCTestUpdateHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open log file"
       << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   std::string start_time = this->CTest->CurrentTime();
@@ -320,14 +318,12 @@ int cmCTestUpdateHandler::ProcessHandler()
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "   There are modified or conflicting files in the repository"
       << std::endl);
-    this->SetScriptErrorOccurred(true);
     }
   if(!updated)
     {
     os << "Update command failed:\n" << vc->GetUpdateCommandLine();
     cmCTestLog(this->CTest, ERROR_MESSAGE, "   Update command failed: "
                << vc->GetUpdateCommandLine() << "\n");
-    this->SetScriptErrorOccurred(true);
     }
   os << "</UpdateReturnStatus>" << std::endl;
   os << "</Update>" << std::endl;
@@ -428,7 +424,6 @@ bool cmCTestUpdateHandler::SelectVCS()
         }
       e << " configuration key.";
       cmCTestLog(this->CTest, ERROR_MESSAGE, e.str() << std::endl);
-      this->SetScriptErrorOccurred(true);
       return false;
       }
     }
diff --git a/Source/CTest/cmCTestUploadHandler.cxx b/Source/CTest/cmCTestUploadHandler.cxx
index 965f88e..579190a 100644
--- a/Source/CTest/cmCTestUploadHandler.cxx
+++ b/Source/CTest/cmCTestUploadHandler.cxx
@@ -42,7 +42,6 @@ int cmCTestUploadHandler::ProcessHandler()
     {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
       "Cannot open Upload.xml file" << std::endl);
-    this->SetScriptErrorOccurred(true);
     return -1;
     }
   std::string buildname = cmCTest::SafeBuildIdField(
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index aec943e..e6d3960 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -3122,6 +3122,7 @@ void cmCTest::Log(int logType, const char* file, int line, const char* msg,
       cmCTestLogOutputFileLine(err);
       err << msg;
       err.flush();
+      cmSystemTools::SetErrorOccured();
       break;
     default:
       cmCTestLogOutputFileLine(out);
diff --git a/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt b/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt
deleted file mode 100644
index d8e63fa..0000000
--- a/Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-Error\(s\) when building project$
diff --git a/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt b/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
deleted file mode 100644
index 1d7c09c..0000000
--- a/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Run dashboard with model Experimental
-   Source directory: .*/Tests/RunCMake/ctest_build/BuildCompileError
-   Build directory: .*/Tests/RunCMake/ctest_build/BuildCompileError-build
-   Reading ctest configuration file: .*/Tests/RunCMake/ctest_build/BuildCompileError/CTestConfig.cmake
-   Site: test-site
-   Build name: test-build-name
-   Use Experimental tag: [0-9-]+
-Configure project
-   Each . represents 1024 bytes of output
-    . Size of output: [0-9]+K
-Build project
-   Each symbol represents 1024 bytes of output.
-   '!' represents an error and '\*' a warning.
-    [.*!]+ Size of output: [0-9]+K
-   [1-9][0-9]* Compiler errors
-   [0-9]+ Compiler warnings
diff --git a/Tests/RunCMake/ctest_build/CMakeLists.txt.in b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
index 97c4ec2..9ba08e9 100644
--- a/Tests/RunCMake/ctest_build/CMakeLists.txt.in
+++ b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
@@ -2,4 +2,3 @@ cmake_minimum_required(VERSION 3.1)
 project(CTestBuild at CASE_NAME@ NONE)
 include(CTest)
 add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
- at CMAKELISTS_EXTRA_CODE@
diff --git a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
index e2b23c4..5826fe4 100644
--- a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
@@ -8,10 +8,3 @@ function(run_ctest_build CASE_NAME)
 endfunction()
 
 run_ctest_build(BuildQuiet QUIET)
-
-set(CMAKELISTS_EXTRA_CODE "
-enable_language(CXX)
-add_executable(compile_error
- \"${RunCMake_SOURCE_DIR}/../../CTestTestFailure/badCode.cxx\")")
-run_ctest_build(BuildCompileError TARGET compile_error)
-set(CMAKELISTS_EXTRA_CODE "")
diff --git a/Tests/RunCMake/ctest_memcheck/DummyBC-result.txt b/Tests/RunCMake/ctest_memcheck/DummyBC-result.txt
new file mode 100644
index 0000000..b57e2de
--- /dev/null
+++ b/Tests/RunCMake/ctest_memcheck/DummyBC-result.txt
@@ -0,0 +1 @@
+(-1|255)
diff --git a/Tests/RunCMake/ctest_test/CMakeLists.txt.in b/Tests/RunCMake/ctest_test/CMakeLists.txt.in
index 6b3f485..cedf379 100644
--- a/Tests/RunCMake/ctest_test/CMakeLists.txt.in
+++ b/Tests/RunCMake/ctest_test/CMakeLists.txt.in
@@ -2,4 +2,3 @@ cmake_minimum_required(VERSION 3.1)
 project(CTestTest at CASE_NAME@ NONE)
 include(CTest)
 add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
- at CMAKELISTS_EXTRA_CODE@
diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
index bb0d5cf..d906290 100644
--- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
@@ -8,10 +8,3 @@ function(run_ctest_test CASE_NAME)
 endfunction()
 
 run_ctest_test(TestQuiet QUIET)
-
-set(CMAKELISTS_EXTRA_CODE "
-add_test(NAME CMakeVersionFail COMMAND \"${CMAKE_COMMAND}\" --version)
-set_tests_properties(CMakeVersionFail PROPERTIES WILL_FAIL TRUE)
-")
-run_ctest_test(TestFail INCLUDE Fail)
-set(CMAKELISTS_EXTRA_CODE "")
diff --git a/Tests/RunCMake/ctest_test/TestFail-stdout.txt b/Tests/RunCMake/ctest_test/TestFail-stdout.txt
deleted file mode 100644
index a8d0df6..0000000
--- a/Tests/RunCMake/ctest_test/TestFail-stdout.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Test project .*/Tests/RunCMake/ctest_test/TestFail-build
-    Start 2: CMakeVersionFail
-1/1 Test #2: CMakeVersionFail .................\*\*\*Failed    [0-9.]+ sec
-
-0% tests passed, 1 tests failed out of 1
-
-Total Test time \(real\) =   [0-9.]+ sec
-
-The following tests FAILED:
-.*2 - CMakeVersionFail \(Failed\)

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

Summary of changes:
 Source/CTest/cmCTestCoverageHandler.cxx            |    3 ---
 Source/CTest/cmCTestGenericHandler.cxx             |    1 -
 Source/CTest/cmCTestGenericHandler.h               |    7 -------
 Source/CTest/cmCTestHandlerCommand.cxx             |    9 ++-------
 Source/CTest/cmCTestMemCheckHandler.cxx            |    7 -------
 Source/CTest/cmCTestSubmitHandler.cxx              |   21 +-------------------
 Source/CTest/cmCTestUpdateHandler.cxx              |    5 -----
 Source/CTest/cmCTestUploadHandler.cxx              |    1 -
 Source/cmCTest.cxx                                 |    1 +
 .../ctest_build/BuildCompileError-stderr.txt       |    1 -
 .../ctest_build/BuildCompileError-stdout.txt       |   16 ---------------
 Tests/RunCMake/ctest_build/CMakeLists.txt.in       |    1 -
 Tests/RunCMake/ctest_build/RunCMakeTest.cmake      |    7 -------
 ...ressSanitizer-result.txt => DummyBC-result.txt} |    0
 Tests/RunCMake/ctest_test/CMakeLists.txt.in        |    1 -
 Tests/RunCMake/ctest_test/RunCMakeTest.cmake       |    7 -------
 Tests/RunCMake/ctest_test/TestFail-stdout.txt      |   10 ----------
 17 files changed, 4 insertions(+), 94 deletions(-)
 delete mode 100644 Tests/RunCMake/ctest_build/BuildCompileError-stderr.txt
 delete mode 100644 Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
 copy Tests/RunCMake/ctest_memcheck/{DummyAddressSanitizer-result.txt => DummyBC-result.txt} (100%)
 delete mode 100644 Tests/RunCMake/ctest_test/TestFail-stdout.txt


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Thu Feb 26 00:01:10 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Thu, 26 Feb 2015 00:01:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-317-g1c3799b
Message-ID: <20150226050110.B62E5AAF0F@public.kitware.com>

This is an automated email from 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  1c3799b151b6ff79472281cd35ece3e067bc526b (commit)
      from  5b0b36c3f8daa78b504e66615b1d3da937790c85 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c3799b151b6ff79472281cd35ece3e067bc526b
commit 1c3799b151b6ff79472281cd35ece3e067bc526b
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Thu Feb 26 00:01:08 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Feb 26 00:01:08 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index a929232..b64641a 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 2)
-set(CMake_VERSION_PATCH 20150225)
+set(CMake_VERSION_PATCH 20150226)
 #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 Feb 26 08:51:53 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Feb 2015 08:51:53 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-319-ge4419c9
Message-ID: <20150226135153.DA3B1AAF51@public.kitware.com>

This is an automated email from 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  e4419c9f88213432da4563a5107a0bf8c0130fda (commit)
       via  f7f4ca55bde68b174b7542fe417426a7cbf76fe3 (commit)
      from  1c3799b151b6ff79472281cd35ece3e067bc526b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4419c9f88213432da4563a5107a0bf8c0130fda
commit e4419c9f88213432da4563a5107a0bf8c0130fda
Merge: 1c3799b f7f4ca5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 26 08:51:52 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 26 08:51:52 2015 -0500

    Merge topic 'ExternalData-url-algo-map'
    
    f7f4ca55 ExternalData: Add support for custom algorithm-to-URL mapping


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

Summary of changes:
 Help/release/dev/ExternalData-url-algo-map.rst     |    8 ++++
 Modules/ExternalData.cmake                         |   41 +++++++++++++++++++-
 .../dded55e43cd6529ee35d24113dfc87a3               |    1 +
 .../SHA1/85158f0c1996837976e858c42a9a7634bfe91b93  |    1 +
 Tests/Module/ExternalData/CMakeLists.txt           |    4 ++
 Tests/Module/ExternalData/Data1Check.cmake         |    8 ++++
 Tests/Module/ExternalData/DataAlgoMapA.dat.md5     |    1 +
 Tests/Module/ExternalData/DataAlgoMapB.dat.sha1    |    1 +
 .../BadAlgoMap1-result.txt}                        |    0
 Tests/RunCMake/ExternalData/BadAlgoMap1-stderr.txt |    9 +++++
 .../{BadCustom2.cmake => BadAlgoMap1.cmake}        |    2 +-
 .../BadAlgoMap2-result.txt}                        |    0
 Tests/RunCMake/ExternalData/BadAlgoMap2-stderr.txt |    9 +++++
 .../{BadCustom2.cmake => BadAlgoMap2.cmake}        |    2 +-
 Tests/RunCMake/ExternalData/RunCMakeTest.cmake     |    2 +
 15 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 Help/release/dev/ExternalData-url-algo-map.rst
 create mode 100644 Tests/Module/ExternalData/Alt/MyAlgoMap1-md5/dded55e43cd6529ee35d24113dfc87a3
 create mode 100644 Tests/Module/ExternalData/Alt/SHA1/85158f0c1996837976e858c42a9a7634bfe91b93
 create mode 100644 Tests/Module/ExternalData/DataAlgoMapA.dat.md5
 create mode 100644 Tests/Module/ExternalData/DataAlgoMapB.dat.sha1
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => ExternalData/BadAlgoMap1-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ExternalData/BadAlgoMap1-stderr.txt
 copy Tests/RunCMake/ExternalData/{BadCustom2.cmake => BadAlgoMap1.cmake} (64%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => ExternalData/BadAlgoMap2-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ExternalData/BadAlgoMap2-stderr.txt
 copy Tests/RunCMake/ExternalData/{BadCustom2.cmake => BadAlgoMap2.cmake} (64%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 26 08:52:10 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Feb 2015 08:52:10 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-323-g4817d28
Message-ID: <20150226135211.038A3AAF69@public.kitware.com>

This is an automated email from 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  4817d2814a6d82e35590f9bfff2b088c95d45395 (commit)
       via  772eae446409fb853585e196009c87d3037fbc22 (commit)
       via  4300de3e2759810ddfd253352eb42cd7f3514c85 (commit)
       via  1de4a0fb09fded1401ecb1aeaecb1159ae46a3c6 (commit)
      from  e4419c9f88213432da4563a5107a0bf8c0130fda (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4817d2814a6d82e35590f9bfff2b088c95d45395
commit 4817d2814a6d82e35590f9bfff2b088c95d45395
Merge: e4419c9 772eae4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 26 08:52:09 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 26 08:52:09 2015 -0500

    Merge topic 'windows-rc-enable-later'
    
    772eae44 RC: Add platform-specific preprocessor definitions (#15404)
    4300de3e RC: Enable language after C, CXX, or Fortran is enabled (#15404)
    1de4a0fb RC: Drop unused CMAKE_COMPILE_RESOURCE variable setting


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

Summary of changes:
 Modules/Platform/CYGWIN-GNU.cmake   |    3 ++-
 Modules/Platform/Windows-GNU.cmake  |    4 ++--
 Modules/Platform/Windows-MSVC.cmake |   10 ++++++----
 Modules/Platform/Windows-df.cmake   |    2 --
 4 files changed, 10 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 26 08:52:38 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Feb 2015 08:52:38 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-751-ga4cba1f
Message-ID: <20150226135242.4D416AAF6C@public.kitware.com>

This is an automated email from 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  a4cba1faafe427a465ec9d78b7e6f770e11e6b54 (commit)
       via  4817d2814a6d82e35590f9bfff2b088c95d45395 (commit)
       via  e4419c9f88213432da4563a5107a0bf8c0130fda (commit)
       via  1c3799b151b6ff79472281cd35ece3e067bc526b (commit)
      from  9c73f92cde601f229547ed4795a4d4d351b43a02 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4cba1faafe427a465ec9d78b7e6f770e11e6b54
commit a4cba1faafe427a465ec9d78b7e6f770e11e6b54
Merge: 9c73f92 4817d28
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 26 08:52:28 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 26 08:52:28 2015 -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 zack.galbreath at kitware.com  Thu Feb 26 09:02:15 2015
From: zack.galbreath at kitware.com (Zack Galbreath)
Date: Thu, 26 Feb 2015 09:02:15 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-753-g3f52c32
Message-ID: <20150226140215.A1715AB147@public.kitware.com>

This is an automated email from 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  3f52c32ebb037d504c4ebc6797d318fe85747dde (commit)
       via  0817080fbb3aff8ff114047c63e7b51992829187 (commit)
      from  a4cba1faafe427a465ec9d78b7e6f770e11e6b54 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f52c32ebb037d504c4ebc6797d318fe85747dde
commit 3f52c32ebb037d504c4ebc6797d318fe85747dde
Merge: a4cba1f 0817080
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Thu Feb 26 09:02:14 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 26 09:02:14 2015 -0500

    Merge topic 'remove_error_read_script' into next
    
    0817080f Don't print "Error in read script"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0817080fbb3aff8ff114047c63e7b51992829187
commit 0817080fbb3aff8ff114047c63e7b51992829187
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Thu Feb 26 09:00:10 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Thu Feb 26 09:00:10 2015 -0500

    Don't print "Error in read script"
    
    This was distracting to our users searching through CTest's
    output for the word "error".  A more specific error message was
    displayed earlier in CTest's output, so printing this statement at
    the end of execution is not particularly helpful.

diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index 8184bb4..3792953 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -454,12 +454,8 @@ int cmCTestScriptHandler::ReadInScript(const std::string& total_script_arg)
   if (!this->Makefile->ReadListFile(0, script.c_str()) ||
     cmSystemTools::GetErrorOccuredFlag())
     {
-    cmCTestLog(this->CTest, ERROR_MESSAGE, "Error in read script: "
-               << script
-               << std::endl);
     // Reset the error flag so that it can run more than
-    // one script with an error when you
-    // use ctest_run_script
+    // one script with an error when you use ctest_run_script.
     cmSystemTools::ResetErrorOccuredFlag();
     return 2;
     }
diff --git a/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt
index 00f4779..8fa3f1b 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt
index 5c582ac..adc744b 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt
@@ -1,3 +1,2 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-build/Testing/Temporary/MemoryChecker.1.log
 .*Error parsing XML in stream at line 1: no element found
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt
index c099340..3551043 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt
index 6c42ec1..02d5626 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt
index 41120b5..653c136 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-build/Testing/Temporary/MemoryChecker.1.log
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt
index cb353ad..5f6c6c1 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
index 7ce798c..423b7f7 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt
index 97bb833..032b5b4 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-build/Testing/Temporary/MemoryChecker.1.log
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt
index 0c997ff..6f52318 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt
@@ -1,3 +1,2 @@
 Problem running command: .*memcheck_fail.*
 Problem executing post-memcheck command\(s\).
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt
index 1d1b1e7..973c014 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt
@@ -1,3 +1,2 @@
 Problem running command: .*memcheck_fail.*
 Problem executing pre-memcheck command\(s\).
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt
index 65beb81..42cd5e8 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory checker suppression file: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-build/does-not-exist
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt
index e2a836f..18d9f03 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-build/Testing/Temporary/MemoryChecker.1.log
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt b/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt
index 99df8b3..8868e0c 100644
--- a/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt
@@ -1,2 +1 @@
 Do not understand memory checker: .*/cmake.*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/Unknown/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
index ec0a869..adf334b 100644
--- a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
@@ -1,4 +1,3 @@
  *Error when uploading file: .*/Configure.xml
  *Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
  *Problems when submitting via HTTP
- *Error in read script: .*/Tests/RunCMake/ctest_submit/CDashSubmitQuiet/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt
index c3c084d..00a60ac 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt
@@ -1,4 +1,3 @@
 Missing arguments for submit via cp:
 .*
    Problems when submitting via CP
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-cp/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
index 4345918..64c3011 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
@@ -1,3 +1,2 @@
 Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
    Problems when submitting via FTP
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-ftp/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
index 9895181..73f0138 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
@@ -1,3 +1,2 @@
 Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
    Problems when submitting via HTTP
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-http/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
index a9c5d58..a1ba4f6 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
@@ -1,3 +1,2 @@
 Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*|Protocol "https" not supported or disabled in .*|.* was built with SSL disabled.*)
    Problems when submitting via HTTP
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-https/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt
index 0790297..ef67149 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt
@@ -1,2 +1 @@
    Problems when submitting via SCP
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-scp/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt
index 23ea92c..c0f718e 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt
@@ -1,2 +1 @@
    (Problems when submitting via XML-RPC|Submission method "xmlrpc" not compiled into CTest!)
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc/test.cmake

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

Summary of changes:
 Source/CTest/cmCTestScriptHandler.cxx                            |    6 +-----
 Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt   |    1 -
 Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt        |    1 -
 Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt      |    1 -
 Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt    |    1 -
 Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt    |    1 -
 Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt    |    1 -
 .../ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt    |    1 -
 .../ctest_memcheck/DummyValgrindCustomOptions-stderr.txt         |    1 -
 Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt   |    1 -
 Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt    |    1 -
 .../ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt        |    1 -
 Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt  |    1 -
 Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt                 |    1 -
 Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt          |    1 -
 Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt               |    1 -
 Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt              |    1 -
 Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt             |    1 -
 Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt            |    1 -
 Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt              |    1 -
 Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt           |    1 -
 21 files changed, 1 insertion(+), 25 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 26 09:02:43 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Feb 2015 09:02:43 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-756-g96c192e
Message-ID: <20150226140243.CA1AFAB14E@public.kitware.com>

This is an automated email from 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  96c192e36385a92ac6e614831fcfffd68c13976a (commit)
       via  266568654c23ee1b4dea487a684cdb6304eb33aa (commit)
       via  5e2b418f7b0083b01004910848eb4823ea014ec1 (commit)
      from  3f52c32ebb037d504c4ebc6797d318fe85747dde (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96c192e36385a92ac6e614831fcfffd68c13976a
commit 96c192e36385a92ac6e614831fcfffd68c13976a
Merge: 3f52c32 2665686
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 26 09:02:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 26 09:02:42 2015 -0500

    Merge topic 'update-kwsys' into next
    
    26656865 Merge branch 'upstream-kwsys' into update-kwsys
    5e2b418f KWSys 2015-02-25 (1b75ad3d)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=266568654c23ee1b4dea487a684cdb6304eb33aa
commit 266568654c23ee1b4dea487a684cdb6304eb33aa
Merge: 4817d28 5e2b418
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 26 08:54:42 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 26 08:54:42 2015 -0500

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e2b418f7b0083b01004910848eb4823ea014ec1
commit 5e2b418f7b0083b01004910848eb4823ea014ec1
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Wed Feb 25 09:31:23 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 26 08:54:37 2015 -0500

    KWSys 2015-02-25 (1b75ad3d)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ 1b75ad3d | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' d4e7f08e..1b75ad3d
    Domen Vrankar (3):
          2b042ff6 SystemTools: Optionally report error from GetRealPath
          7c9a970a Glob: Remove dead code
          1b75ad3d Glob: Remove addition of extra '/'
    
    Change-Id: I04ac5aa4748925bc953db0abff2d4418080882b5

diff --git a/Glob.cxx b/Glob.cxx
index 5a96aed..1476c25 100644
--- a/Glob.cxx
+++ b/Glob.cxx
@@ -223,7 +223,6 @@ void Glob::RecurseDirectory(kwsys_stl::string::size_type start,
     return;
     }
   unsigned long cc;
-  kwsys_stl::string fullname;
   kwsys_stl::string realname;
   kwsys_stl::string fname;
   for ( cc = 0; cc < d.GetNumberOfFiles(); cc ++ )
@@ -248,15 +247,6 @@ void Glob::RecurseDirectory(kwsys_stl::string::size_type start,
     fname = kwsys::SystemTools::LowerCase(fname);
 #endif
 
-    if ( start == 0 )
-      {
-      fullname = dir + fname;
-      }
-    else
-      {
-      fullname = dir + "/" + fname;
-      }
-
     bool isDir = kwsys::SystemTools::FileIsDirectory(realname);
     bool isSymLink = kwsys::SystemTools::FileIsSymlink(realname);
 
@@ -302,7 +292,6 @@ void Glob::ProcessDirectory(kwsys_stl::string::size_type start,
     return;
     }
   unsigned long cc;
-  kwsys_stl::string fullname;
   kwsys_stl::string realname;
   kwsys_stl::string fname;
   for ( cc = 0; cc < d.GetNumberOfFiles(); cc ++ )
@@ -327,19 +316,10 @@ void Glob::ProcessDirectory(kwsys_stl::string::size_type start,
     fname = kwsys::SystemTools::LowerCase(fname);
 #endif
 
-    if ( start == 0 )
-      {
-      fullname = dir + fname;
-      }
-    else
-      {
-      fullname = dir + "/" + fname;
-      }
-
     //kwsys_ios::cout << "Look at file: " << fname << kwsys_ios::endl;
     //kwsys_ios::cout << "Match: "
     // << this->Internals->TextExpressions[start].c_str() << kwsys_ios::endl;
-    //kwsys_ios::cout << "Full name: " << fullname << kwsys_ios::endl;
+    //kwsys_ios::cout << "Real name: " << realname << kwsys_ios::endl;
 
     if ( !last &&
       !kwsys::SystemTools::FileIsDirectory(realname) )
@@ -355,7 +335,7 @@ void Glob::ProcessDirectory(kwsys_stl::string::size_type start,
         }
       else
         {
-        this->ProcessDirectory(start+1, realname + "/");
+        this->ProcessDirectory(start+1, realname);
         }
       }
     }
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 2708211..bf6f458 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -250,17 +250,46 @@ inline int Chdir(const kwsys_stl::string& dir)
   return _wchdir(KWSYS_NAMESPACE::Encoding::ToWide(dir).c_str());
   #endif
 }
-inline void Realpath(const kwsys_stl::string& path, kwsys_stl::string & resolved_path)
+inline void Realpath(const kwsys_stl::string& path,
+                     kwsys_stl::string& resolved_path,
+                     kwsys_stl::string* errorMessage = 0)
 {
   kwsys_stl::wstring tmp = KWSYS_NAMESPACE::Encoding::ToWide(path);
   wchar_t *ptemp;
   wchar_t fullpath[MAX_PATH];
-  if( GetFullPathNameW(tmp.c_str(), sizeof(fullpath)/sizeof(fullpath[0]),
-                       fullpath, &ptemp) )
+  DWORD bufferLen = GetFullPathNameW(tmp.c_str(),
+      sizeof(fullpath) / sizeof(fullpath[0]),
+      fullpath, &ptemp);
+  if( bufferLen < sizeof(fullpath)/sizeof(fullpath[0]) )
     {
     resolved_path = KWSYS_NAMESPACE::Encoding::ToNarrow(fullpath);
     KWSYS_NAMESPACE::SystemTools::ConvertToUnixSlashes(resolved_path);
     }
+  else if(errorMessage)
+    {
+    if(bufferLen)
+      {
+      *errorMessage = "Destination path buffer size too small.";
+      }
+    else if(unsigned int errorId = GetLastError())
+      {
+      LPSTR message = NULL;
+      DWORD size = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER
+                                   | FORMAT_MESSAGE_FROM_SYSTEM
+                                   | FORMAT_MESSAGE_IGNORE_INSERTS,
+                                   NULL, errorId,
+                                   MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                                   (LPSTR)&message, 0, NULL);
+      *errorMessage = std::string(message, size);
+      LocalFree(message);
+      }
+    else
+      {
+      *errorMessage = "Unknown error.";
+      }
+
+    resolved_path = "";
+    }
   else
     {
     resolved_path = path;
@@ -287,15 +316,31 @@ inline int Chdir(const kwsys_stl::string& dir)
 {
   return chdir(dir.c_str());
 }
-inline void Realpath(const kwsys_stl::string& path, kwsys_stl::string & resolved_path)
+inline void Realpath(const kwsys_stl::string& path,
+                     kwsys_stl::string& resolved_path,
+                     kwsys_stl::string* errorMessage = 0)
 {
   char resolved_name[KWSYS_SYSTEMTOOLS_MAXPATH];
 
+  errno = 0;
   char *ret = realpath(path.c_str(), resolved_name);
   if(ret)
     {
     resolved_path = ret;
     }
+  else if(errorMessage)
+    {
+    if(errno)
+      {
+      *errorMessage = strerror(errno);
+      }
+    else
+      {
+      *errorMessage = "Unknown error.";
+      }
+
+    resolved_path = "";
+    }
   else
     {
     // if path resolution fails, return what was passed in
@@ -3046,10 +3091,11 @@ kwsys_stl::string SystemTools
   return "";
 }
 
-kwsys_stl::string SystemTools::GetRealPath(const kwsys_stl::string& path)
+kwsys_stl::string SystemTools::GetRealPath(const kwsys_stl::string& path,
+                                           kwsys_stl::string* errorMessage)
 {
   kwsys_stl::string ret;
-  Realpath(path, ret);
+  Realpath(path, ret, errorMessage);
   return ret;
 }
 
diff --git a/SystemTools.hxx.in b/SystemTools.hxx.in
index beb2a7e..93cde02 100644
--- a/SystemTools.hxx.in
+++ b/SystemTools.hxx.in
@@ -385,9 +385,12 @@ public:
   /** 
    * Get the real path for a given path, removing all symlinks.  In
    * the event of an error (non-existent path, permissions issue,
-   * etc.) the original path is returned.
+   * etc.) the original path is returned if errorMessage pointer is
+   * NULL.  Otherwise empty string is returned and errorMessage
+   * contains error description.
    */
-  static kwsys_stl::string GetRealPath(const kwsys_stl::string& path);
+  static kwsys_stl::string GetRealPath(const kwsys_stl::string& path,
+                                       kwsys_stl::string* errorMessage = 0);
 
   /**
    * Split a path name into its root component and the rest of the

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

Summary of changes:
 Source/kwsys/Glob.cxx           |   24 ++--------------
 Source/kwsys/SystemTools.cxx    |   58 +++++++++++++++++++++++++++++++++++----
 Source/kwsys/SystemTools.hxx.in |    7 +++--
 3 files changed, 59 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 26 10:25:12 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Feb 2015 10:25:12 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-759-ge101aa7
Message-ID: <20150226152513.6EA43AAD8A@public.kitware.com>

This is an automated email from 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  e101aa7d114e7e398b2bae3fd082857babc47a87 (commit)
       via  d1082448a8d0a75974920690dcbad8895169bfd6 (commit)
       via  ce935ebe50926bde199d86fbde4a78974a4043f9 (commit)
      from  96c192e36385a92ac6e614831fcfffd68c13976a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e101aa7d114e7e398b2bae3fd082857babc47a87
commit e101aa7d114e7e398b2bae3fd082857babc47a87
Merge: 96c192e d108244
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 26 10:25:10 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 26 10:25:10 2015 -0500

    Merge topic 'cmake-build-ninja-verbose' into next
    
    d1082448 Tests: Extend RunCMake.CommandLine to cover 'cmake --build' for 'ninja -v'
    ce935ebe cmake: Teach --build to honor CMAKE_VERBOSE_MAKEFILE for Ninja


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1082448a8d0a75974920690dcbad8895169bfd6
commit d1082448a8d0a75974920690dcbad8895169bfd6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 26 10:21:09 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 26 10:21:09 2015 -0500

    Tests: Extend RunCMake.CommandLine to cover 'cmake --build' for 'ninja -v'

diff --git a/Tests/RunCMake/CommandLine/Build-ninja-v-stdout.txt b/Tests/RunCMake/CommandLine/Build-ninja-v-stdout.txt
new file mode 100644
index 0000000..83c62ec
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/Build-ninja-v-stdout.txt
@@ -0,0 +1 @@
+-E echo CustomCommand
diff --git a/Tests/RunCMake/CommandLine/Build.cmake b/Tests/RunCMake/CommandLine/Build.cmake
new file mode 100644
index 0000000..20df108
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/Build.cmake
@@ -0,0 +1,5 @@
+add_custom_command(
+  OUTPUT output.txt
+  COMMAND ${CMAKE_COMMAND} -E echo CustomCommand > output.txt
+  )
+add_custom_target(CustomTarget ALL DEPENDS output.txt)
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index 2be6651..a9c49e7 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -18,6 +18,22 @@ run_cmake_command(build-no-generator
 run_cmake_command(build-bad-generator
   ${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR}/cache-bad-generator)
 
+if(RunCMake_GENERATOR STREQUAL "Ninja")
+  # Use a single build tree for a few tests without cleaning.
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/Build-build)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+  set(RunCMake_TEST_OPTIONS -DCMAKE_VERBOSE_MAKEFILE=1)
+  run_cmake(Build)
+  unset(RunCMake_TEST_OPTIONS)
+  run_cmake_command(Build-ninja-v ${CMAKE_COMMAND} --build .)
+
+  unset(RunCMake_TEST_BINARY_DIR)
+  unset(RunCMake_TEST_NO_CLEAN)
+endif()
+
 if(UNIX)
   run_cmake_command(E_create_symlink-missing-dir
     ${CMAKE_COMMAND} -E create_symlink T missing-dir/L

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce935ebe50926bde199d86fbde4a78974a4043f9
commit ce935ebe50926bde199d86fbde4a78974a4043f9
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Thu Feb 26 11:32:26 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 26 09:51:11 2015 -0500

    cmake: Teach --build to honor CMAKE_VERBOSE_MAKEFILE for Ninja
    
    The Ninja build system does not support a in-file verbositiy switch.
    Instead teach 'cmake --build' to extract the CMAKE_VERBOSE_MAKEFILE
    setting and pass it as an optional '-v' argument to Ninja.  This can
    serve as a reasonable fallback.
    
    Signed-off-by: Gregor Jasny <gjasny at googlemail.com>

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 006239a..ee255af 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -664,7 +664,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
         globalGenerator->GenerateBuildCommand(buildCommand, cmakeMakeProgram,
             installProjectName, installDirectory,
             globalGenerator->GetPreinstallTargetName(),
-            buildConfig, false);
+            buildConfig, false, false);
         std::string buildCommandStr =
           cmSystemTools::PrintSingleCommand(buildCommand);
         cmCPackLogger(cmCPackLog::LOG_DEBUG,
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx
index 4cdce71..0827037 100644
--- a/Source/CTest/cmCTestBuildAndTestHandler.cxx
+++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx
@@ -310,7 +310,7 @@ int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring)
       output, this->BuildMakeProgram,
       config,
       !this->BuildNoClean,
-      false, remainingTime);
+      false, false, remainingTime);
     out << output;
     // if the build failed then return
     if (retVal)
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 6147009..36395aa 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1677,14 +1677,14 @@ int cmGlobalGenerator::TryCompile(const std::string& srcdir,
     mf->GetSafeDefinition("CMAKE_TRY_COMPILE_CONFIGURATION");
   return this->Build(srcdir,bindir,projectName,
                      newTarget,
-                     output,"",config,false,fast,
+                     output,"",config,false,fast,false,
                      this->TryCompileTimeout);
 }
 
 void cmGlobalGenerator::GenerateBuildCommand(
   std::vector<std::string>& makeCommand, const std::string&,
   const std::string&, const std::string&, const std::string&,
-  const std::string&, bool,
+  const std::string&, bool, bool,
   std::vector<std::string> const&)
 {
   makeCommand.push_back(
@@ -1697,7 +1697,7 @@ int cmGlobalGenerator::Build(
   std::string& output,
   const std::string& makeCommandCSTR,
   const std::string& config,
-  bool clean, bool fast,
+  bool clean, bool fast, bool verbose,
   double timeout,
   cmSystemTools::OutputOption outputflag,
   std::vector<std::string> const& nativeOptions)
@@ -1722,7 +1722,7 @@ int cmGlobalGenerator::Build(
     {
     std::vector<std::string> cleanCommand;
     this->GenerateBuildCommand(cleanCommand, makeCommandCSTR, projectName,
-                               bindir, "clean", config, fast);
+                               bindir, "clean", config, fast, verbose);
     output += "\nRun Clean Command:";
     output += cmSystemTools::PrintSingleCommand(cleanCommand);
     output += "\n";
@@ -1745,7 +1745,8 @@ int cmGlobalGenerator::Build(
   // now build
   std::vector<std::string> makeCommand;
   this->GenerateBuildCommand(makeCommand, makeCommandCSTR, projectName,
-                             bindir, target, config, fast, nativeOptions);
+                             bindir, target, config, fast, verbose,
+                             nativeOptions);
   std::string makeCommandStr = cmSystemTools::PrintSingleCommand(makeCommand);
   output += "\nRun Build Command:";
   output += makeCommandStr;
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 08f061a..5b9ddee 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -134,7 +134,7 @@ public:
             const std::string& projectName, const std::string& targetName,
             std::string& output,
             const std::string& makeProgram, const std::string& config,
-            bool clean, bool fast,
+            bool clean, bool fast, bool verbose,
             double timeout,
             cmSystemTools::OutputOption outputflag=cmSystemTools::OUTPUT_NONE,
             std::vector<std::string> const& nativeOptions =
@@ -144,7 +144,8 @@ public:
     std::vector<std::string>& makeCommand,
     const std::string& makeProgram,
     const std::string& projectName, const std::string& projectDir,
-    const std::string& targetName, const std::string& config, bool fast,
+    const std::string& targetName, const std::string& config,
+    bool fast, bool verbose,
     std::vector<std::string> const& makeOptions = std::vector<std::string>()
     );
 
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 3c07be1..69b1a9d 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -574,12 +574,18 @@ void cmGlobalNinjaGenerator
                        const std::string& targetName,
                        const std::string& /*config*/,
                        bool /*fast*/,
+                       bool verbose,
                        std::vector<std::string> const& makeOptions)
 {
   makeCommand.push_back(
     this->SelectMakeProgram(makeProgram)
     );
 
+  if(verbose)
+    {
+    makeCommand.push_back("-v");
+    }
+
   makeCommand.insert(makeCommand.end(),
                      makeOptions.begin(), makeOptions.end());
   if(!targetName.empty())
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 3d443d8..c7bb782 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -196,7 +196,7 @@ public:
     const std::string& projectDir,
     const std::string& targetName,
     const std::string& config,
-    bool fast,
+    bool fast, bool verbose,
     std::vector<std::string> const& makeOptions = std::vector<std::string>()
     );
 
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index e0ccaa9..1d2dd34 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -554,7 +554,7 @@ void cmGlobalUnixMakefileGenerator3
                        const std::string& /*projectDir*/,
                        const std::string& targetName,
                        const std::string& /*config*/,
-                       bool fast,
+                       bool fast, bool /*verbose*/,
                        std::vector<std::string> const& makeOptions)
 {
   makeCommand.push_back(
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index c61c36e..50a901e 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -114,7 +114,7 @@ public:
     const std::string& projectDir,
     const std::string& targetName,
     const std::string& config,
-    bool fast,
+    bool fast, bool verbose,
     std::vector<std::string> const& makeOptions = std::vector<std::string>()
     );
 
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 531a714..7df2073 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -459,7 +459,7 @@ void cmGlobalVisualStudio10Generator::GenerateBuildCommand(
   const std::string& projectDir,
   const std::string& targetName,
   const std::string& config,
-  bool fast,
+  bool fast, bool verbose,
   std::vector<std::string> const& makeOptions)
 {
   // Select the caller- or user-preferred make program, else MSBuild.
@@ -507,7 +507,7 @@ void cmGlobalVisualStudio10Generator::GenerateBuildCommand(
     // Use devenv to build solutions containing Intel Fortran projects.
     cmGlobalVisualStudio7Generator::GenerateBuildCommand(
       makeCommand, makeProgram, projectName, projectDir,
-      targetName, config, fast, makeOptions);
+      targetName, config, fast, verbose, makeOptions);
     return;
     }
 
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 3b0a5cf..92202ba 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -41,7 +41,7 @@ public:
     const std::string& projectDir,
     const std::string& targetName,
     const std::string& config,
-    bool fast,
+    bool fast, bool verbose,
     std::vector<std::string> const& makeOptions = std::vector<std::string>()
     );
 
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 455a7a2..62a308e 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -120,7 +120,7 @@ cmGlobalVisualStudio6Generator::GenerateBuildCommand(
   const std::string& /*projectDir*/,
   const std::string& targetName,
   const std::string& config,
-  bool /*fast*/,
+  bool /*fast*/, bool /*verbose*/,
   std::vector<std::string> const& makeOptions
   )
 {
diff --git a/Source/cmGlobalVisualStudio6Generator.h b/Source/cmGlobalVisualStudio6Generator.h
index 58efb25..a59a0b2 100644
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@@ -59,7 +59,7 @@ public:
     const std::string& projectDir,
     const std::string& targetName,
     const std::string& config,
-    bool fast,
+    bool fast, bool verbose,
     std::vector<std::string> const& makeOptions = std::vector<std::string>()
     );
 
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 401e475..0e0e63a 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -191,7 +191,7 @@ void cmGlobalVisualStudio7Generator::GenerateBuildCommand(
   const std::string& /*projectDir*/,
   const std::string& targetName,
   const std::string& config,
-  bool /*fast*/,
+  bool /*fast*/, bool /*verbose*/,
   std::vector<std::string> const& makeOptions)
 {
   // Select the caller- or user-preferred make program, else devenv.
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index b591653..d641c02 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -69,7 +69,7 @@ public:
     const std::string& projectDir,
     const std::string& targetName,
     const std::string& config,
-    bool fast,
+    bool fast, bool verbose,
     std::vector<std::string> const& makeOptions = std::vector<std::string>()
     );
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index aea134e..e89161d 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -310,7 +310,7 @@ cmGlobalXCodeGenerator::GenerateBuildCommand(
   const std::string& /*projectDir*/,
   const std::string& targetName,
   const std::string& config,
-  bool /*fast*/,
+  bool /*fast*/, bool /*verbose*/,
   std::vector<std::string> const& makeOptions)
 {
   // now build the test
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index f513e28..b272f6a 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -60,7 +60,7 @@ public:
     const std::string& projectDir,
     const std::string& targetName,
     const std::string& config,
-    bool fast,
+    bool fast, bool verbose,
     std::vector<std::string> const& makeOptions = std::vector<std::string>()
     );
 
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 47be481..80e90a8 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2789,11 +2789,16 @@ int cmake::Build(const std::string& dir,
     return 1;
     }
   projName = it.GetValue();
+  bool verbose = false;
+  if(it.Find("CMAKE_VERBOSE_MAKEFILE"))
+    {
+    verbose = it.GetValueAsBool();
+    }
   return gen->Build("", dir,
                     projName, target,
                     output,
                     "",
-                    config, clean, false, 0,
+                    config, clean, false, verbose, 0,
                     cmSystemTools::OUTPUT_PASSTHROUGH,
                     nativeOptions);
 }

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

Summary of changes:
 Source/CPack/cmCPackGenerator.cxx                   |    2 +-
 Source/CTest/cmCTestBuildAndTestHandler.cxx         |    2 +-
 Source/cmGlobalGenerator.cxx                        |   11 ++++++-----
 Source/cmGlobalGenerator.h                          |    5 +++--
 Source/cmGlobalNinjaGenerator.cxx                   |    6 ++++++
 Source/cmGlobalNinjaGenerator.h                     |    2 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx           |    2 +-
 Source/cmGlobalUnixMakefileGenerator3.h             |    2 +-
 Source/cmGlobalVisualStudio10Generator.cxx          |    4 ++--
 Source/cmGlobalVisualStudio10Generator.h            |    2 +-
 Source/cmGlobalVisualStudio6Generator.cxx           |    2 +-
 Source/cmGlobalVisualStudio6Generator.h             |    2 +-
 Source/cmGlobalVisualStudio7Generator.cxx           |    2 +-
 Source/cmGlobalVisualStudio7Generator.h             |    2 +-
 Source/cmGlobalXCodeGenerator.cxx                   |    2 +-
 Source/cmGlobalXCodeGenerator.h                     |    2 +-
 Source/cmake.cxx                                    |    7 ++++++-
 Tests/RunCMake/CommandLine/Build-ninja-v-stdout.txt |    1 +
 Tests/RunCMake/CommandLine/Build.cmake              |    5 +++++
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake       |   16 ++++++++++++++++
 20 files changed, 57 insertions(+), 22 deletions(-)
 create mode 100644 Tests/RunCMake/CommandLine/Build-ninja-v-stdout.txt
 create mode 100644 Tests/RunCMake/CommandLine/Build.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 26 15:02:21 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Feb 2015 15:02:21 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-761-gef05bdf
Message-ID: <20150226200221.580A2AA2A8@public.kitware.com>

This is an automated email from 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  ef05bdfa0c161137c9028e69f821b05aa6cb4581 (commit)
       via  689f86ec9aeba325e7f5846fffe760e4d57d7656 (commit)
      from  e101aa7d114e7e398b2bae3fd082857babc47a87 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef05bdfa0c161137c9028e69f821b05aa6cb4581
commit ef05bdfa0c161137c9028e69f821b05aa6cb4581
Merge: e101aa7 689f86e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 26 15:02:20 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 26 15:02:20 2015 -0500

    Merge topic 'install-manifest-optimize' into next
    
    689f86ec install: Write the entire installation manifest at once


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=689f86ec9aeba325e7f5846fffe760e4d57d7656
commit 689f86ec9aeba325e7f5846fffe760e4d57d7656
Author:     Robert Goulet <Robert.Goulet at autodesk.com>
AuthorDate: Thu Feb 26 19:18:04 2015 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 26 14:57:07 2015 -0500

    install: Write the entire installation manifest at once
    
    Avoid a separate open/close for each file installed.  Use a single
    file(WRITE) instead of a loop with file(APPEND).

diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 579e715..d994659 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -1907,7 +1907,10 @@ protected:
   std::string Manifest;
   void ManifestAppend(std::string const& file)
     {
-    this->Manifest += ";";
+    if (!this->Manifest.empty())
+      {
+      this->Manifest += ";";
+      }
     this->Manifest += file.substr(this->DestDirLength);
     }
 
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 7ca7684..d9dcad4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -535,17 +535,12 @@ void cmLocalGenerator::GenerateInstallRules()
       "${CMAKE_INSTALL_COMPONENT}.txt\")\n"
       "else()\n"
       "  set(CMAKE_INSTALL_MANIFEST \"install_manifest.txt\")\n"
-      "endif()\n\n";
-    fout
-      << "file(WRITE \""
-      << homedir << "/${CMAKE_INSTALL_MANIFEST}\" "
-      << "\"\")" << std::endl;
-    fout
-      << "foreach(file ${CMAKE_INSTALL_MANIFEST_FILES})" << std::endl
-      << "  file(APPEND \""
-      << homedir << "/${CMAKE_INSTALL_MANIFEST}\" "
-      << "\"${file}\\n\")" << std::endl
-      << "endforeach()" << std::endl;
+      "endif()\n"
+      "\n"
+      "string(REPLACE \";\" \"\\n\" CMAKE_INSTALL_MANIFEST_CONTENT\n"
+      "       \"${CMAKE_INSTALL_MANIFEST_FILES}\")\n"
+      "file(WRITE \"" << homedir << "/${CMAKE_INSTALL_MANIFEST}\"\n"
+      "     \"${CMAKE_INSTALL_MANIFEST_CONTENT}\")\n";
     }
 }
 

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

Summary of changes:
 Source/cmFileCommand.cxx    |    5 ++++-
 Source/cmLocalGenerator.cxx |   17 ++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 26 15:04:27 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Feb 2015 15:04:27 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-763-gee27398
Message-ID: <20150226200427.9F9FEAAFA8@public.kitware.com>

This is an automated email from 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  ee27398822ff58d00ee45899128354b27ddf56af (commit)
       via  c48141744e7b14940dc55ec98da631c4d2356dd7 (commit)
      from  ef05bdfa0c161137c9028e69f821b05aa6cb4581 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee27398822ff58d00ee45899128354b27ddf56af
commit ee27398822ff58d00ee45899128354b27ddf56af
Merge: ef05bdf c481417
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 26 15:04:26 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 26 15:04:26 2015 -0500

    Merge topic 'install-manifest-optimize' into next
    
    c4814174 install: Write the entire installation manifest at once


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c48141744e7b14940dc55ec98da631c4d2356dd7
commit c48141744e7b14940dc55ec98da631c4d2356dd7
Author:     Robert Goulet <robert.goulet at autodesk.com>
AuthorDate: Thu Feb 26 19:18:04 2015 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 26 15:04:07 2015 -0500

    install: Write the entire installation manifest at once
    
    Avoid a separate open/close for each file installed.  Use a single
    file(WRITE) instead of a loop with file(APPEND).

diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 579e715..d994659 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -1907,7 +1907,10 @@ protected:
   std::string Manifest;
   void ManifestAppend(std::string const& file)
     {
-    this->Manifest += ";";
+    if (!this->Manifest.empty())
+      {
+      this->Manifest += ";";
+      }
     this->Manifest += file.substr(this->DestDirLength);
     }
 
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 7ca7684..d9dcad4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -535,17 +535,12 @@ void cmLocalGenerator::GenerateInstallRules()
       "${CMAKE_INSTALL_COMPONENT}.txt\")\n"
       "else()\n"
       "  set(CMAKE_INSTALL_MANIFEST \"install_manifest.txt\")\n"
-      "endif()\n\n";
-    fout
-      << "file(WRITE \""
-      << homedir << "/${CMAKE_INSTALL_MANIFEST}\" "
-      << "\"\")" << std::endl;
-    fout
-      << "foreach(file ${CMAKE_INSTALL_MANIFEST_FILES})" << std::endl
-      << "  file(APPEND \""
-      << homedir << "/${CMAKE_INSTALL_MANIFEST}\" "
-      << "\"${file}\\n\")" << std::endl
-      << "endforeach()" << std::endl;
+      "endif()\n"
+      "\n"
+      "string(REPLACE \";\" \"\\n\" CMAKE_INSTALL_MANIFEST_CONTENT\n"
+      "       \"${CMAKE_INSTALL_MANIFEST_FILES}\")\n"
+      "file(WRITE \"" << homedir << "/${CMAKE_INSTALL_MANIFEST}\"\n"
+      "     \"${CMAKE_INSTALL_MANIFEST_CONTENT}\")\n";
     }
 }
 

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Feb 26 15:16:53 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 26 Feb 2015 15:16:53 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-766-gd476ca2
Message-ID: <20150226201653.A9334AADAE@public.kitware.com>

This is an automated email from 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  d476ca2703ac95d271d0f5834714a34e5e5dc243 (commit)
       via  4efef3f775e78bdcb4591dc37aa974bc28e8fd84 (commit)
       via  e3363bfbec592393780f9d769bd32334bcfd5953 (commit)
      from  ee27398822ff58d00ee45899128354b27ddf56af (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d476ca2703ac95d271d0f5834714a34e5e5dc243
commit d476ca2703ac95d271d0f5834714a34e5e5dc243
Merge: ee27398 4efef3f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 26 15:16:52 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 26 15:16:52 2015 -0500

    Merge topic 'macro-function-docs' into next
    
    4efef3f7 Help: Clarify that ARGV# beyond ARGC will have an undefined behavior (#15380)
    e3363bfb Help: Refine the .rst formatting of macro and function documentation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4efef3f775e78bdcb4591dc37aa974bc28e8fd84
commit 4efef3f775e78bdcb4591dc37aa974bc28e8fd84
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Fri Feb 6 16:53:44 2015 +0100
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Thu Feb 26 17:42:30 2015 +0100

    Help: Clarify that ARGV# beyond ARGC will have an undefined behavior (#15380)

diff --git a/Help/command/function.rst b/Help/command/function.rst
index 5bbffbf..7ffdfee 100644
--- a/Help/command/function.rst
+++ b/Help/command/function.rst
@@ -24,6 +24,10 @@ This facilitates creating functions with optional arguments.
 Additionally ``ARGV`` holds the list of all arguments given to the
 function and ``ARGN`` holds the list of arguments past the last expected
 argument.
+Referencing to ``ARGV#`` arguments beyond ``ARGC`` have undefined
+behavior. Checking that ``ARGC`` is greater than ``#`` is the only way
+to ensure that ``ARGV#`` was passed to the function as an extra
+argument.
 
 A function opens a new scope: see :command:`set(var PARENT_SCOPE)` for
 details.
diff --git a/Help/command/macro.rst b/Help/command/macro.rst
index 33249c9..6bee69c 100644
--- a/Help/command/macro.rst
+++ b/Help/command/macro.rst
@@ -24,6 +24,10 @@ This facilitates creating macros with optional arguments.
 Additionally ``${ARGV}`` holds the list of all arguments given to the
 macro and ``${ARGN}`` holds the list of arguments past the last expected
 argument.
+Referencing to ``${ARGV#}`` arguments beyond ``${ARGC}`` have undefined
+behavior. Checking that ``${ARGC}`` is greater than ``#`` is the only
+way to ensure that ``${ARGV#}`` was passed to the function as an extra
+argument.
 
 See the :command:`cmake_policy()` command documentation for the behavior
 of policies inside macros.
@@ -37,10 +41,15 @@ replacements much like the C preprocessor would do with a macro.
 Therefore you will NOT be able to use commands like::
 
  if(ARGV1) # ARGV1 is not a variable
+ if(DEFINED ARGV2) # ARGV2 is not a variable
+ if(ARGC GREATER 2) # ARGC is not a variable
  foreach(loop_var IN LISTS ARGN) # ARGN is not a variable
 
-In the first case you can use ``if(${ARGV1})``, in the second case, you can
-use ``foreach(loop_var ${ARGN})`` but this will skip empty arguments.
+In the first case, you can use ``if(${ARGV1})``.
+In the second and third case, the proper way to check if an optional
+variable was passed to the macro is to use ``if(${ARGC} GREATER 2)``.
+In the last case, you can use ``foreach(loop_var ${ARGN})`` but this
+will skip empty arguments.
 If you need to include them, you can use::
 
  set(list_var "${ARGN}")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3363bfbec592393780f9d769bd32334bcfd5953
commit e3363bfbec592393780f9d769bd32334bcfd5953
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Thu Feb 26 17:16:42 2015 +0100
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Thu Feb 26 17:19:52 2015 +0100

    Help: Refine the .rst formatting of macro and function documentation

diff --git a/Help/command/function.rst b/Help/command/function.rst
index b18e03c..5bbffbf 100644
--- a/Help/command/function.rst
+++ b/Help/command/function.rst
@@ -1,9 +1,7 @@
 function
 --------
 
-Start recording a function for later invocation as a command.
-
-::
+Start recording a function for later invocation as a command::
 
   function(<name> [arg1 [arg2 [arg3 ...]]])
     COMMAND1(ARGS ...)
@@ -11,21 +9,24 @@ Start recording a function for later invocation as a command.
     ...
   endfunction(<name>)
 
-Define a function named <name> that takes arguments named arg1 arg2
-arg3 (...).  Commands listed after function, but before the matching
-endfunction, are not invoked until the function is invoked.  When it
-is invoked, the commands recorded in the function are first modified
-by replacing formal parameters (${arg1}) with the arguments passed,
-and then invoked as normal commands.  In addition to referencing the
-formal parameters you can reference the variable ARGC which will be
-set to the number of arguments passed into the function as well as
-ARGV0 ARGV1 ARGV2 ...  which will have the actual values of the
-arguments passed in.  This facilitates creating functions with
-optional arguments.  Additionally ARGV holds the list of all arguments
-given to the function and ARGN holds the list of arguments past the
-last expected argument.
+Define a function named ``<name>`` that takes arguments named ``arg1``,
+``arg2``, ``arg3``, (...).
+Commands listed after function, but before the matching
+:command:`endfunction()`, are not invoked until the function is invoked.
+When it is invoked, the commands recorded in the function are first
+modified by replacing formal parameters (``${arg1}``) with the arguments
+passed, and then invoked as normal commands.
+In addition to referencing the formal parameters you can reference the
+``ARGC`` variable which will be set to the number of arguments passed
+into the function as well as ``ARGV0``, ``ARGV1``, ``ARGV2``, ...  which
+will have the actual values of the arguments passed in.
+This facilitates creating functions with optional arguments.
+Additionally ``ARGV`` holds the list of all arguments given to the
+function and ``ARGN`` holds the list of arguments past the last expected
+argument.
 
-A function opens a new scope: see set(var PARENT_SCOPE) for details.
+A function opens a new scope: see :command:`set(var PARENT_SCOPE)` for
+details.
 
-See the cmake_policy() command documentation for the behavior of
-policies inside functions.
+See the :command:`cmake_policy()` command documentation for the behavior
+of policies inside functions.
diff --git a/Help/command/macro.rst b/Help/command/macro.rst
index 258dc50..33249c9 100644
--- a/Help/command/macro.rst
+++ b/Help/command/macro.rst
@@ -1,9 +1,7 @@
 macro
 -----
 
-Start recording a macro for later invocation as a command.
-
-::
+Start recording a macro for later invocation as a command::
 
   macro(<name> [arg1 [arg2 [arg3 ...]]])
     COMMAND1(ARGS ...)
@@ -11,22 +9,24 @@ Start recording a macro for later invocation as a command.
     ...
   endmacro(<name>)
 
-Define a macro named <name> that takes arguments named arg1 arg2 arg3
-(...).  Commands listed after macro, but before the matching endmacro,
-are not invoked until the macro is invoked.  When it is invoked, the
-commands recorded in the macro are first modified by replacing formal
-parameters (``${arg1}``) with the arguments passed, and then invoked as
-normal commands.  In addition to referencing the formal parameters you
-can reference the values ``${ARGC}`` which will be set to the number of
-arguments passed into the function as well as ``${ARGV0}`` ``${ARGV1}``
-``${ARGV2}`` ...  which will have the actual values of the arguments
-passed in.  This facilitates creating macros with optional arguments.
+Define a macro named ``<name>`` that takes arguments named ``arg1``,
+``arg2``, ``arg3``, (...).
+Commands listed after macro, but before the matching
+:command:`endmacro()`, are not invoked until the macro is invoked.
+When it is invoked, the commands recorded in the macro are first
+modified by replacing formal parameters (``${arg1}``) with the arguments
+passed, and then invoked as normal commands.
+In addition to referencing the formal parameters you can reference the
+values ``${ARGC}`` which will be set to the number of arguments passed
+into the function as well as ``${ARGV0}``, ``${ARGV1}``, ``${ARGV2}``,
+...  which will have the actual values of the arguments passed in.
+This facilitates creating macros with optional arguments.
 Additionally ``${ARGV}`` holds the list of all arguments given to the
 macro and ``${ARGN}`` holds the list of arguments past the last expected
 argument.
 
-See the cmake_policy() command documentation for the behavior of
-policies inside macros.
+See the :command:`cmake_policy()` command documentation for the behavior
+of policies inside macros.
 
 Macro Argument Caveats
 ^^^^^^^^^^^^^^^^^^^^^^

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

Summary of changes:
 Help/command/function.rst |   43 ++++++++++++++++++++++++-------------------
 Help/command/macro.rst    |   43 ++++++++++++++++++++++++++-----------------
 2 files changed, 50 insertions(+), 36 deletions(-)


hooks/post-receive
-- 
CMake

From domen.vrankar at gmail.com  Thu Feb 26 18:40:26 2015
From: domen.vrankar at gmail.com (Domen Vrankar)
Date: Thu, 26 Feb 2015 18:40:26 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-769-g0770323
Message-ID: <20150226234028.3CB632276@public.kitware.com>

This is an automated email from 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  07703234998b0d9bc1adf0c3db79711ccf51f0a7 (commit)
       via  b1cc97b31c125579f6aa84b513226966339ff787 (commit)
       via  3a481dc2defc6a00f135ddfbd105b26d4bc60227 (commit)
      from  d476ca2703ac95d271d0f5834714a34e5e5dc243 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07703234998b0d9bc1adf0c3db79711ccf51f0a7
commit 07703234998b0d9bc1adf0c3db79711ccf51f0a7
Merge: d476ca2 b1cc97b
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Thu Feb 26 18:40:25 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 26 18:40:25 2015 -0500

    Merge topic 'fixup_rpm_relocation_paths_regression' into next
    
    b1cc97b3 fixup! CPack/RPM: multiple relocation paths
    3a481dc2 fixup! CPack/RPM: multiple relocation paths


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1cc97b31c125579f6aa84b513226966339ff787
commit b1cc97b31c125579f6aa84b513226966339ff787
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Feb 27 00:36:25 2015 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Fri Feb 27 00:36:25 2015 +0100

    fixup! CPack/RPM: multiple relocation paths
    
    The rest of the parent directory regression
    patch that adds current next branch RPM test
    paths and removes older package content test
    that is now obsoleted by the new tests from
    this patch.

diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index 9b9ca0a..c7ec709 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -192,7 +192,11 @@ if(CPackGen MATCHES "RPM")
         set(spec_regex "*Unspecified*")
         set(check_content_list "^/usr/foo/bar
 /usr/foo/bar/bin
-/usr/foo/bar/bin/mylibapp2$")
+/usr/foo/bar/bin/@in at _@path@@with
+/usr/foo/bar/bin/@in at _@path@@with/@and
+/usr/foo/bar/bin/@in at _@path@@with/@and/@
+/usr/foo/bar/bin/@in at _@path@@with/@and/@/@in_path@
+/usr/foo/bar/bin/@in at _@path@@with/@and/@/@in_path@/mylibapp2$")
       else()
         message(FATAL_ERROR "error: unexpected rpm package '${check_file}'")
       endif()
@@ -244,29 +248,5 @@ if(CPackGen MATCHES "RPM")
         message(FATAL_ERROR "error: '${check_file}' rpm package content does not match expected value - regex '${check_content_list}'; RPM output: '${check_package_content}'; generated spec file: '${spec_file_content}'")
       endif()
     endforeach()
-
-    # test package content
-    foreach(check_file ${expected_file})
-      string(REGEX MATCH ".*Unspecified.*" check_file_Unspecified_match ${check_file})
-
-      if(check_file_Unspecified_match)
-        execute_process(COMMAND ${RPM_EXECUTABLE} -pql ${check_file}
-            OUTPUT_VARIABLE check_file_content
-            ERROR_QUIET
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-        string(REGEX MATCH ".*bin/@in at _@path@@with/@and/@/@in_path@/mylibapp2$" check_at_in_path ${check_file_content})
-
-        if(NOT check_at_in_path)
-          file(GLOB_RECURSE spec_file "${CPackComponentsForAll_BINARY_DIR}/*Unspecified*.spec")
-
-          if(spec_file)
-            file(READ ${spec_file} spec_file_content)
-          endif()
-
-          message(FATAL_ERROR "error: '${check_file}' rpm package path with @ characters is missing or invalid. RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
-        endif()
-      endif()
-    endforeach()
   endif()
 endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a481dc2defc6a00f135ddfbd105b26d4bc60227
commit 3a481dc2defc6a00f135ddfbd105b26d4bc60227
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Feb 27 00:33:48 2015 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Fri Feb 27 00:33:48 2015 +0100

    fixup! CPack/RPM: multiple relocation paths
    
    Patch for CMake 3.2.0-rc2
    A regression was introduced with multiple
    relocation paths patch. Before the patch
    directories that were parents of relocation
    path were omitted from rpm. This patch fixes
    the regression and adds stricter regression
    tests that cover this case.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index cb987f8..fce8236 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -482,6 +482,7 @@ function(cpack_rpm_prepare_relocation_paths)
     endif()
   endforeach()
 
+  set(RPM_USED_PACKAGE_PREFIXES "${RPM_USED_PACKAGE_PREFIXES}" PARENT_SCOPE)
   set(TMP_RPM_PREFIXES "${TMP_RPM_PREFIXES}" PARENT_SCOPE)
 endfunction()
 
@@ -964,24 +965,31 @@ set(CPACK_RPM_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}")
 # CPACK_RPM_PACKAGE_PREFIX. This is achieved by building a "filter list"
 # which is passed to the find command that generates the content-list
 if(CPACK_RPM_PACKAGE_RELOCATABLE)
-  # get a list of the elements in CPACK_RPM_PACKAGE_PREFIX and remove
-  # the final element (so the install-prefix dir itself is not omitted
+  # get a list of the elements in CPACK_RPM_PACKAGE_PREFIXES that are
+  # destinct parent paths of other relocation paths and remove the
+  # final element (so the install-prefix dir itself is not omitted
   # from the RPM's content-list)
-  foreach(CPACK_RPM_PACKAGE_PREFIX ${RPM_PACKAGE_PREFIXES})
-    string(REPLACE "/" ";" _CPACK_RPM_PACKAGE_PREFIX_ELEMS ".${CPACK_RPM_PACKAGE_PREFIX}")
-    list(REMOVE_AT _CPACK_RPM_PACKAGE_PREFIX_ELEMS -1)
-    unset(_TMP_LIST)
-    # Now generate all of the parent dirs of CPACK_RPM_PACKAGE_PREFIX
-    foreach(_ELEM ${_CPACK_RPM_PACKAGE_PREFIX_ELEMS})
-      list(APPEND _TMP_LIST "${_ELEM}")
-      string(REPLACE ";" "/" _OMIT_DIR "${_TMP_LIST}")
-      list(FIND _RPM_DIRS_TO_OMIT "${_OMIT_DIR}" _DUPLICATE_FOUND)
-      if(_DUPLICATE_FOUND EQUAL -1)
-        set(_OMIT_DIR "-o -path ${_OMIT_DIR}")
-        separate_arguments(_OMIT_DIR)
-        list(APPEND _RPM_DIRS_TO_OMIT ${_OMIT_DIR})
-      endif()
-    endforeach()
+  list(SORT RPM_USED_PACKAGE_PREFIXES)
+  set(_DISTINCT_PATH "NOT_SET")
+  foreach(_RPM_RELOCATION_PREFIX ${RPM_USED_PACKAGE_PREFIXES})
+    if(NOT "${_RPM_RELOCATION_PREFIX}" MATCHES "${_DISTINCT_PATH}/.*")
+      set(_DISTINCT_PATH "${_RPM_RELOCATION_PREFIX}")
+
+      string(REPLACE "/" ";" _CPACK_RPM_PACKAGE_PREFIX_ELEMS ".${_RPM_RELOCATION_PREFIX}")
+      list(REMOVE_AT _CPACK_RPM_PACKAGE_PREFIX_ELEMS -1)
+      unset(_TMP_LIST)
+      # Now generate all of the parent dirs of the relocation path
+      foreach(_PREFIX_PATH_ELEM ${_CPACK_RPM_PACKAGE_PREFIX_ELEMS})
+        list(APPEND _TMP_LIST "${_PREFIX_PATH_ELEM}")
+        string(REPLACE ";" "/" _OMIT_DIR "${_TMP_LIST}")
+        list(FIND _RPM_DIRS_TO_OMIT "${_OMIT_DIR}" _DUPLICATE_FOUND)
+        if(_DUPLICATE_FOUND EQUAL -1)
+          set(_OMIT_DIR "-o -path ${_OMIT_DIR}")
+          separate_arguments(_OMIT_DIR)
+          list(APPEND _RPM_DIRS_TO_OMIT ${_OMIT_DIR})
+        endif()
+      endforeach()
+    endif()
   endforeach()
 endif()
 
diff --git a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
index 4119b8d..e4780d3 100644
--- a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
+++ b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
@@ -6,9 +6,14 @@ if(CPACK_GENERATOR MATCHES "ZIP")
 endif()
 
 if(CPACK_GENERATOR MATCHES "RPM")
-  set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
-
   set(CPACK_RPM_COMPONENT_INSTALL "ON")
+
+  # test that /usr and /usr/foo get omitted in relocatable
+  # rpms as shortest relocation path is treated as base of
+  # package (/usr/foo/bar is relocatable and must exist)
+  set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/foo/bar")
+
+  # test requires
   set(CPACK_RPM_applications_PACKAGE_REQUIRES "mylib-libraries")
 
   # test a "noarch" rpm
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index f06605a..9b9ca0a 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -145,7 +145,7 @@ if(CPackGen MATCHES "RPM")
     # CMAKE_SIZEOF_VOID_P is not set here but lib is prefix of lib64 so
     # relocation path test won't fail on OSes with lib64 library location
     include(GNUInstallDirs)
-    set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
+    set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/foo/bar")
 
     foreach(check_file ${expected_file})
       string(REGEX MATCH ".*libraries.*" check_file_libraries_match ${check_file})
@@ -158,34 +158,48 @@ if(CPackGen MATCHES "RPM")
           ERROR_QUIET
           OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+      execute_process(COMMAND ${RPM_EXECUTABLE} -pql ${check_file}
+          OUTPUT_VARIABLE check_package_content
+          ERROR_QUIET
+          OUTPUT_STRIP_TRAILING_WHITESPACE)
+
       if(check_file_libraries_match)
         set(check_file_match_expected_summary ".*${CPACK_RPM_libraries_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*${CPACK_RPM_libraries_PACKAGE_DESCRIPTION}.*")
         set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
         set(check_file_match_expected_architecture "Architecture: ${CPACK_RPM_applications_PACKAGE_ARCHITECTURE}")
         set(spec_regex "*libraries*")
+        set(check_content_list "^/usr/foo/bar\n/usr/foo/bar/lib.*\n/usr/foo/bar/lib.*/libmylib.a$")
       elseif(check_file_headers_match)
         set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*${CPACK_COMPONENT_HEADERS_DESCRIPTION}.*")
         set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
         set(check_file_match_expected_architecture "Architecture: ${CPACK_RPM_libraries_PACKAGE_ARCHITECTURE}")
         set(spec_regex "*headers*")
+        set(check_content_list "^/usr/foo/bar\n/usr/foo/bar/include\n/usr/foo/bar/include/mylib.h$")
       elseif(check_file_applications_match)
         set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*${CPACK_COMPONENT_APPLICATIONS_DESCRIPTION}.*")
         set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
         set(check_file_match_expected_architecture "Architecture: ${CPACK_RPM_headers_PACKAGE_ARCHITECTURE}")
         set(spec_regex "*applications*")
+        set(check_content_list "^/usr/foo/bar\n/usr/foo/bar/bin\n/usr/foo/bar/bin/mylibapp$")
       elseif(check_file_Unspecified_match)
         set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*DESCRIPTION.*")
         set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
         set(check_file_match_expected_architecture "Architecture: ${CPACK_RPM_Unspecified_PACKAGE_ARCHITECTURE}")
         set(spec_regex "*Unspecified*")
+        set(check_content_list "^/usr/foo/bar
+/usr/foo/bar/bin
+/usr/foo/bar/bin/mylibapp2$")
       else()
         message(FATAL_ERROR "error: unexpected rpm package '${check_file}'")
       endif()
 
+      #######################
+      # test package info
+      #######################
       string(REGEX MATCH ${check_file_match_expected_summary} check_file_match_summary ${check_file_content})
 
       if(NOT check_file_match_summary)
@@ -209,10 +223,26 @@ if(CPackGen MATCHES "RPM")
 
         message(FATAL_ERROR "error: '${check_file}' rpm package relocation path does not match expected value - regex '${check_file_match_expected_relocation_path}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
       endif()
+
       string(REGEX MATCH ${check_file_match_expected_architecture} check_file_match_architecture ${check_file_content})
       if (NOT check_file_match_architecture)
           message(FATAL_ERROR "error: '${check_file}' Architecture does not match expected value - '${check_file_match_expected_architecture}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
       endif()
+
+      #######################
+      # test package content
+      #######################
+      string(REGEX MATCH "${check_content_list}" expected_content_list "${check_package_content}")
+
+      if(NOT expected_content_list)
+        file(GLOB_RECURSE spec_file "${CPackComponentsForAll_BINARY_DIR}/${spec_regex}.spec")
+
+        if(spec_file)
+          file(READ ${spec_file} spec_file_content)
+        endif()
+
+        message(FATAL_ERROR "error: '${check_file}' rpm package content does not match expected value - regex '${check_content_list}'; RPM output: '${check_package_content}'; generated spec file: '${spec_file_content}'")
+      endif()
     endforeach()
 
     # test package content

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

Summary of changes:
 Modules/CPackRPM.cmake                             |   42 +++++++++-------
 .../MyLibCPackConfig-IgnoreGroup.cmake.in          |    9 +++-
 .../RunCPackVerifyResult.cmake                     |   50 ++++++++++++--------
 3 files changed, 62 insertions(+), 39 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Fri Feb 27 00:01:12 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Fri, 27 Feb 2015 00:01:12 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-324-g4bef659
Message-ID: <20150227050112.5B933AAA57@public.kitware.com>

This is an automated email from 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  4bef659da525441464ed110d362b46a6eac50a82 (commit)
      from  4817d2814a6d82e35590f9bfff2b088c95d45395 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4bef659da525441464ed110d362b46a6eac50a82
commit 4bef659da525441464ed110d362b46a6eac50a82
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Fri Feb 27 00:01:09 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Feb 27 00:01:09 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index b64641a..8c01479 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 2)
-set(CMake_VERSION_PATCH 20150226)
+set(CMake_VERSION_PATCH 20150227)
 #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 Feb 27 08:50:21 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Feb 2015 08:50:21 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-773-g0c5c6ac
Message-ID: <20150227135021.F0DBFAA08E@public.kitware.com>

This is an automated email from 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  0c5c6acd4b370fed01ba977ac9dee77fd0f9eba3 (commit)
       via  3db740cb31afd32548bdeec5f1c35c6cfb3c0693 (commit)
       via  3cf86d9e7bb082b05c507c744b0a43981ba199c3 (commit)
       via  1cbb15625304b01e8a99a956fa42e4b7011fea48 (commit)
      from  07703234998b0d9bc1adf0c3db79711ccf51f0a7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c5c6acd4b370fed01ba977ac9dee77fd0f9eba3
commit 0c5c6acd4b370fed01ba977ac9dee77fd0f9eba3
Merge: 0770323 3db740c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 27 08:50:20 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 27 08:50:20 2015 -0500

    Merge topic 'cpack_rpm_mulit_prefix_fixup-for-master' into next
    
    3db740cb CPackRPM: Consolidate CPackComponentsForAll test case coverage
    3cf86d9e Merge branch 'cpack_rpm_mulit_prefix_fixup' into cpack_rpm_mulit_prefix_fixup-for-master
    1cbb1562 CPackRPM: Fix handling of relocation prefix parent directories


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3db740cb31afd32548bdeec5f1c35c6cfb3c0693
commit 3db740cb31afd32548bdeec5f1c35c6cfb3c0693
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Feb 27 00:36:25 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 27 08:45:57 2015 -0500

    CPackRPM: Consolidate CPackComponentsForAll test case coverage
    
    Use test infrastructure added by commit 1cbb1562 (Fix handling of
    relocation prefix parent directories, 2015-02-26) to cover the same use
    cases from tests added by commit 5857ca5e (CPackRPM: Drop explicit
    handling of '@' symbols that breaks them, 2015-01-07) and drop the
    latter.

diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index 9b9ca0a..c7ec709 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -192,7 +192,11 @@ if(CPackGen MATCHES "RPM")
         set(spec_regex "*Unspecified*")
         set(check_content_list "^/usr/foo/bar
 /usr/foo/bar/bin
-/usr/foo/bar/bin/mylibapp2$")
+/usr/foo/bar/bin/@in at _@path@@with
+/usr/foo/bar/bin/@in at _@path@@with/@and
+/usr/foo/bar/bin/@in at _@path@@with/@and/@
+/usr/foo/bar/bin/@in at _@path@@with/@and/@/@in_path@
+/usr/foo/bar/bin/@in at _@path@@with/@and/@/@in_path@/mylibapp2$")
       else()
         message(FATAL_ERROR "error: unexpected rpm package '${check_file}'")
       endif()
@@ -244,29 +248,5 @@ if(CPackGen MATCHES "RPM")
         message(FATAL_ERROR "error: '${check_file}' rpm package content does not match expected value - regex '${check_content_list}'; RPM output: '${check_package_content}'; generated spec file: '${spec_file_content}'")
       endif()
     endforeach()
-
-    # test package content
-    foreach(check_file ${expected_file})
-      string(REGEX MATCH ".*Unspecified.*" check_file_Unspecified_match ${check_file})
-
-      if(check_file_Unspecified_match)
-        execute_process(COMMAND ${RPM_EXECUTABLE} -pql ${check_file}
-            OUTPUT_VARIABLE check_file_content
-            ERROR_QUIET
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-        string(REGEX MATCH ".*bin/@in at _@path@@with/@and/@/@in_path@/mylibapp2$" check_at_in_path ${check_file_content})
-
-        if(NOT check_at_in_path)
-          file(GLOB_RECURSE spec_file "${CPackComponentsForAll_BINARY_DIR}/*Unspecified*.spec")
-
-          if(spec_file)
-            file(READ ${spec_file} spec_file_content)
-          endif()
-
-          message(FATAL_ERROR "error: '${check_file}' rpm package path with @ characters is missing or invalid. RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
-        endif()
-      endif()
-    endforeach()
   endif()
 endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cf86d9e7bb082b05c507c744b0a43981ba199c3
commit 3cf86d9e7bb082b05c507c744b0a43981ba199c3
Merge: 4817d28 1cbb156
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Feb 27 08:42:29 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 27 08:42:29 2015 -0500

    Merge branch 'cpack_rpm_mulit_prefix_fixup' into cpack_rpm_mulit_prefix_fixup-for-master
    
    Resolve conflict in Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
    by combining the changes from both sides.

diff --cc Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
index 4119b8d,e20f11a..e4780d3
--- a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
+++ b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
@@@ -6,17 -6,16 +6,22 @@@ if(CPACK_GENERATOR MATCHES "ZIP"
  endif()
  
  if(CPACK_GENERATOR MATCHES "RPM")
-   set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
- 
    set(CPACK_RPM_COMPONENT_INSTALL "ON")
+ 
+   # test that /usr and /usr/foo get omitted in relocatable
+   # rpms as shortest relocation path is treated as base of
+   # package (/usr/foo/bar is relocatable and must exist)
+   set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/foo/bar")
+ 
+   # test requires
    set(CPACK_RPM_applications_PACKAGE_REQUIRES "mylib-libraries")
  
 +  # test a "noarch" rpm
 +  set(CPACK_RPM_headers_PACKAGE_ARCHITECTURE "noarch")
 +
 +  # test cross-built rpm
 +  set(CPACK_RPM_applications_PACKAGE_ARCHITECTURE "armv7hf")
 +
    # test package summary override
    set(CPACK_RPM_PACKAGE_SUMMARY "default summary")
    set(CPACK_RPM_libraries_PACKAGE_SUMMARY "libraries summary")
diff --cc Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index f06605a,69af374..9b9ca0a
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@@ -162,26 -166,28 +167,32 @@@ if(CPackGen MATCHES "RPM"
          set(check_file_match_expected_summary ".*${CPACK_RPM_libraries_PACKAGE_SUMMARY}.*")
          set(check_file_match_expected_description ".*${CPACK_RPM_libraries_PACKAGE_DESCRIPTION}.*")
          set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
 +        set(check_file_match_expected_architecture "Architecture: ${CPACK_RPM_applications_PACKAGE_ARCHITECTURE}")
          set(spec_regex "*libraries*")
+         set(check_content_list "^/usr/foo/bar\n/usr/foo/bar/lib.*\n/usr/foo/bar/lib.*/libmylib.a$")
        elseif(check_file_headers_match)
          set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
          set(check_file_match_expected_description ".*${CPACK_COMPONENT_HEADERS_DESCRIPTION}.*")
          set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
 +        set(check_file_match_expected_architecture "Architecture: ${CPACK_RPM_libraries_PACKAGE_ARCHITECTURE}")
          set(spec_regex "*headers*")
+         set(check_content_list "^/usr/foo/bar\n/usr/foo/bar/include\n/usr/foo/bar/include/mylib.h$")
        elseif(check_file_applications_match)
          set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
          set(check_file_match_expected_description ".*${CPACK_COMPONENT_APPLICATIONS_DESCRIPTION}.*")
          set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
 +        set(check_file_match_expected_architecture "Architecture: ${CPACK_RPM_headers_PACKAGE_ARCHITECTURE}")
          set(spec_regex "*applications*")
+         set(check_content_list "^/usr/foo/bar\n/usr/foo/bar/bin\n/usr/foo/bar/bin/mylibapp$")
        elseif(check_file_Unspecified_match)
          set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
          set(check_file_match_expected_description ".*DESCRIPTION.*")
          set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
 +        set(check_file_match_expected_architecture "Architecture: ${CPACK_RPM_Unspecified_PACKAGE_ARCHITECTURE}")
          set(spec_regex "*Unspecified*")
+         set(check_content_list "^/usr/foo/bar
+ /usr/foo/bar/bin
+ /usr/foo/bar/bin/mylibapp2$")
        else()
          message(FATAL_ERROR "error: unexpected rpm package '${check_file}'")
        endif()
@@@ -209,34 -218,22 +223,50 @@@
  
          message(FATAL_ERROR "error: '${check_file}' rpm package relocation path does not match expected value - regex '${check_file_match_expected_relocation_path}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
        endif()
+ 
 +      string(REGEX MATCH ${check_file_match_expected_architecture} check_file_match_architecture ${check_file_content})
 +      if (NOT check_file_match_architecture)
 +          message(FATAL_ERROR "error: '${check_file}' Architecture does not match expected value - '${check_file_match_expected_architecture}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
++      endif()
++
+       #######################
+       # test package content
+       #######################
+       string(REGEX MATCH "${check_content_list}" expected_content_list "${check_package_content}")
+ 
+       if(NOT expected_content_list)
+         file(GLOB_RECURSE spec_file "${CPackComponentsForAll_BINARY_DIR}/${spec_regex}.spec")
+ 
+         if(spec_file)
+           file(READ ${spec_file} spec_file_content)
+         endif()
+ 
+         message(FATAL_ERROR "error: '${check_file}' rpm package content does not match expected value - regex '${check_content_list}'; RPM output: '${check_package_content}'; generated spec file: '${spec_file_content}'")
        endif()
      endforeach()
 -  elseif(${CPackComponentWay} STREQUAL "IgnoreGroup")
 +
 +    # test package content
 +    foreach(check_file ${expected_file})
 +      string(REGEX MATCH ".*Unspecified.*" check_file_Unspecified_match ${check_file})
 +
 +      if(check_file_Unspecified_match)
 +        execute_process(COMMAND ${RPM_EXECUTABLE} -pql ${check_file}
 +            OUTPUT_VARIABLE check_file_content
 +            ERROR_QUIET
 +            OUTPUT_STRIP_TRAILING_WHITESPACE)
 +
 +        string(REGEX MATCH ".*bin/@in at _@path@@with/@and/@/@in_path@/mylibapp2$" check_at_in_path ${check_file_content})
 +
 +        if(NOT check_at_in_path)
 +          file(GLOB_RECURSE spec_file "${CPackComponentsForAll_BINARY_DIR}/*Unspecified*.spec")
 +
 +          if(spec_file)
 +            file(READ ${spec_file} spec_file_content)
 +          endif()
 +
 +          message(FATAL_ERROR "error: '${check_file}' rpm package path with @ characters is missing or invalid. RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
 +        endif()
 +      endif()
 +    endforeach()
    endif()
  endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1cbb15625304b01e8a99a956fa42e4b7011fea48
commit 1cbb15625304b01e8a99a956fa42e4b7011fea48
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Feb 27 00:33:48 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 27 08:37:24 2015 -0500

    CPackRPM: Fix handling of relocation prefix parent directories
    
    In commit 3ec02547 (CPackRPM: Allow multiple path relocation prefixes
    for one package, 2015-01-21) a regression was introduced that causes
    parent directories of relocation paths to be incorrectly included in
    the rpm.  Fix this and make the test case more strict to cover it.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 7516393..e3f74d8 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -481,6 +481,7 @@ function(cpack_rpm_prepare_relocation_paths)
     endif()
   endforeach()
 
+  set(RPM_USED_PACKAGE_PREFIXES "${RPM_USED_PACKAGE_PREFIXES}" PARENT_SCOPE)
   set(TMP_RPM_PREFIXES "${TMP_RPM_PREFIXES}" PARENT_SCOPE)
 endfunction()
 
@@ -945,24 +946,31 @@ set(CPACK_RPM_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}")
 # CPACK_RPM_PACKAGE_PREFIX. This is achieved by building a "filter list"
 # which is passed to the find command that generates the content-list
 if(CPACK_RPM_PACKAGE_RELOCATABLE)
-  # get a list of the elements in CPACK_RPM_PACKAGE_PREFIX and remove
-  # the final element (so the install-prefix dir itself is not omitted
+  # get a list of the elements in CPACK_RPM_PACKAGE_PREFIXES that are
+  # destinct parent paths of other relocation paths and remove the
+  # final element (so the install-prefix dir itself is not omitted
   # from the RPM's content-list)
-  foreach(CPACK_RPM_PACKAGE_PREFIX ${RPM_PACKAGE_PREFIXES})
-    string(REPLACE "/" ";" _CPACK_RPM_PACKAGE_PREFIX_ELEMS ".${CPACK_RPM_PACKAGE_PREFIX}")
-    list(REMOVE_AT _CPACK_RPM_PACKAGE_PREFIX_ELEMS -1)
-    unset(_TMP_LIST)
-    # Now generate all of the parent dirs of CPACK_RPM_PACKAGE_PREFIX
-    foreach(_ELEM ${_CPACK_RPM_PACKAGE_PREFIX_ELEMS})
-      list(APPEND _TMP_LIST "${_ELEM}")
-      string(REPLACE ";" "/" _OMIT_DIR "${_TMP_LIST}")
-      list(FIND _RPM_DIRS_TO_OMIT "${_OMIT_DIR}" _DUPLICATE_FOUND)
-      if(_DUPLICATE_FOUND EQUAL -1)
-        set(_OMIT_DIR "-o -path ${_OMIT_DIR}")
-        separate_arguments(_OMIT_DIR)
-        list(APPEND _RPM_DIRS_TO_OMIT ${_OMIT_DIR})
-      endif()
-    endforeach()
+  list(SORT RPM_USED_PACKAGE_PREFIXES)
+  set(_DISTINCT_PATH "NOT_SET")
+  foreach(_RPM_RELOCATION_PREFIX ${RPM_USED_PACKAGE_PREFIXES})
+    if(NOT "${_RPM_RELOCATION_PREFIX}" MATCHES "${_DISTINCT_PATH}/.*")
+      set(_DISTINCT_PATH "${_RPM_RELOCATION_PREFIX}")
+
+      string(REPLACE "/" ";" _CPACK_RPM_PACKAGE_PREFIX_ELEMS ".${_RPM_RELOCATION_PREFIX}")
+      list(REMOVE_AT _CPACK_RPM_PACKAGE_PREFIX_ELEMS -1)
+      unset(_TMP_LIST)
+      # Now generate all of the parent dirs of the relocation path
+      foreach(_PREFIX_PATH_ELEM ${_CPACK_RPM_PACKAGE_PREFIX_ELEMS})
+        list(APPEND _TMP_LIST "${_PREFIX_PATH_ELEM}")
+        string(REPLACE ";" "/" _OMIT_DIR "${_TMP_LIST}")
+        list(FIND _RPM_DIRS_TO_OMIT "${_OMIT_DIR}" _DUPLICATE_FOUND)
+        if(_DUPLICATE_FOUND EQUAL -1)
+          set(_OMIT_DIR "-o -path ${_OMIT_DIR}")
+          separate_arguments(_OMIT_DIR)
+          list(APPEND _RPM_DIRS_TO_OMIT ${_OMIT_DIR})
+        endif()
+      endforeach()
+    endif()
   endforeach()
 endif()
 
diff --git a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
index de0ee46..e20f11a 100644
--- a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
+++ b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
@@ -6,9 +6,14 @@ if(CPACK_GENERATOR MATCHES "ZIP")
 endif()
 
 if(CPACK_GENERATOR MATCHES "RPM")
-  set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
-
   set(CPACK_RPM_COMPONENT_INSTALL "ON")
+
+  # test that /usr and /usr/foo get omitted in relocatable
+  # rpms as shortest relocation path is treated as base of
+  # package (/usr/foo/bar is relocatable and must exist)
+  set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/foo/bar")
+
+  # test requires
   set(CPACK_RPM_applications_PACKAGE_REQUIRES "mylib-libraries")
 
   # test package summary override
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index 68d846f..69af374 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -144,7 +144,7 @@ if(CPackGen MATCHES "RPM")
     # CMAKE_SIZEOF_VOID_P is not set here but lib is prefix of lib64 so
     # relocation path test won't fail on OSes with lib64 library location
     include(GNUInstallDirs)
-    set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
+    set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/foo/bar")
 
     foreach(check_file ${expected_file})
       string(REGEX MATCH ".*libraries.*" check_file_libraries_match ${check_file})
@@ -157,30 +157,44 @@ if(CPackGen MATCHES "RPM")
           ERROR_QUIET
           OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+      execute_process(COMMAND ${RPM_EXECUTABLE} -pql ${check_file}
+          OUTPUT_VARIABLE check_package_content
+          ERROR_QUIET
+          OUTPUT_STRIP_TRAILING_WHITESPACE)
+
       if(check_file_libraries_match)
         set(check_file_match_expected_summary ".*${CPACK_RPM_libraries_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*${CPACK_RPM_libraries_PACKAGE_DESCRIPTION}.*")
         set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
         set(spec_regex "*libraries*")
+        set(check_content_list "^/usr/foo/bar\n/usr/foo/bar/lib.*\n/usr/foo/bar/lib.*/libmylib.a$")
       elseif(check_file_headers_match)
         set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*${CPACK_COMPONENT_HEADERS_DESCRIPTION}.*")
         set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
         set(spec_regex "*headers*")
+        set(check_content_list "^/usr/foo/bar\n/usr/foo/bar/include\n/usr/foo/bar/include/mylib.h$")
       elseif(check_file_applications_match)
         set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*${CPACK_COMPONENT_APPLICATIONS_DESCRIPTION}.*")
         set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
         set(spec_regex "*applications*")
+        set(check_content_list "^/usr/foo/bar\n/usr/foo/bar/bin\n/usr/foo/bar/bin/mylibapp$")
       elseif(check_file_Unspecified_match)
         set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*DESCRIPTION.*")
         set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
         set(spec_regex "*Unspecified*")
+        set(check_content_list "^/usr/foo/bar
+/usr/foo/bar/bin
+/usr/foo/bar/bin/mylibapp2$")
       else()
         message(FATAL_ERROR "error: unexpected rpm package '${check_file}'")
       endif()
 
+      #######################
+      # test package info
+      #######################
       string(REGEX MATCH ${check_file_match_expected_summary} check_file_match_summary ${check_file_content})
 
       if(NOT check_file_match_summary)
@@ -204,6 +218,21 @@ if(CPackGen MATCHES "RPM")
 
         message(FATAL_ERROR "error: '${check_file}' rpm package relocation path does not match expected value - regex '${check_file_match_expected_relocation_path}'; RPM output: '${check_file_content}'; generated spec file: '${spec_file_content}'")
       endif()
+
+      #######################
+      # test package content
+      #######################
+      string(REGEX MATCH "${check_content_list}" expected_content_list "${check_package_content}")
+
+      if(NOT expected_content_list)
+        file(GLOB_RECURSE spec_file "${CPackComponentsForAll_BINARY_DIR}/${spec_regex}.spec")
+
+        if(spec_file)
+          file(READ ${spec_file} spec_file_content)
+        endif()
+
+        message(FATAL_ERROR "error: '${check_file}' rpm package content does not match expected value - regex '${check_content_list}'; RPM output: '${check_package_content}'; generated spec file: '${spec_file_content}'")
+      endif()
     endforeach()
   elseif(${CPackComponentWay} STREQUAL "IgnoreGroup")
   endif()

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

Summary of changes:


hooks/post-receive
-- 
CMake

From nilsgladitz at gmail.com  Fri Feb 27 10:32:54 2015
From: nilsgladitz at gmail.com (Nils Gladitz)
Date: Fri, 27 Feb 2015 10:32:54 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-776-gc902929
Message-ID: <20150227153254.22EFDAB0C5@public.kitware.com>

This is an automated email from 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  c902929e98100e5895b7d06b2c9d06e9dcce4423 (commit)
       via  6a661f06030b85b4484733375bbb0aa23eca7446 (commit)
       via  4bef659da525441464ed110d362b46a6eac50a82 (commit)
      from  0c5c6acd4b370fed01ba977ac9dee77fd0f9eba3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c902929e98100e5895b7d06b2c9d06e9dcce4423
commit c902929e98100e5895b7d06b2c9d06e9dcce4423
Merge: 0c5c6ac 6a661f0
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Feb 27 10:32:53 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 27 10:32:53 2015 -0500

    Merge topic 'fix-ctest-update-locale' into next
    
    6a661f06 CTest: To enforce the C locale use LC_ALL instead of LC_MESSAGES.
    4bef659d CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a661f06030b85b4484733375bbb0aa23eca7446
commit 6a661f06030b85b4484733375bbb0aa23eca7446
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Feb 27 16:32:03 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Feb 27 16:32:03 2015 +0100

    CTest: To enforce the C locale use LC_ALL instead of LC_MESSAGES.
    
    If LC_ALL is set it takes precedence over LC_MESSAGES.

diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx
index b18786a..b9da8a0 100644
--- a/Source/CTest/cmCTestUpdateHandler.cxx
+++ b/Source/CTest/cmCTestUpdateHandler.cxx
@@ -72,37 +72,37 @@ public:
   cmCTestUpdateHandlerLocale();
   ~cmCTestUpdateHandlerLocale();
 private:
-  std::string saveLCMessages;
+  std::string saveLCAll;
 };
 
 cmCTestUpdateHandlerLocale::cmCTestUpdateHandlerLocale()
 {
-  const char* lcmess = cmSystemTools::GetEnv("LC_MESSAGES");
-  if(lcmess)
+  const char* lcall = cmSystemTools::GetEnv("LC_ALL");
+  if(lcall)
     {
-    saveLCMessages = lcmess;
+    saveLCAll = lcall;
     }
-  // if LC_MESSAGES is not set to C, then
+  // if LC_ALL is not set to C, then
   // set it, so that svn/cvs info will be in english ascii
-  if(! (lcmess && strcmp(lcmess, "C") == 0))
+  if(! (lcall && strcmp(lcall, "C") == 0))
     {
-    cmSystemTools::PutEnv("LC_MESSAGES=C");
+    cmSystemTools::PutEnv("LC_ALL=C");
     }
 }
 
 cmCTestUpdateHandlerLocale::~cmCTestUpdateHandlerLocale()
 {
-  // restore the value of LC_MESSAGES after running the version control
+  // restore the value of LC_ALL after running the version control
   // commands
-  if(!saveLCMessages.empty())
+  if(!saveLCAll.empty())
     {
-    std::string put = "LC_MESSAGES=";
-    put += saveLCMessages;
+    std::string put = "LC_ALL=";
+    put += saveLCAll;
     cmSystemTools::PutEnv(put);
     }
   else
     {
-    cmSystemTools::UnsetEnv("LC_MESSAGES");
+    cmSystemTools::UnsetEnv("LC_ALL");
     }
 }
 

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

Summary of changes:
 Source/CMakeVersion.cmake             |    2 +-
 Source/CTest/cmCTestUpdateHandler.cxx |   24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 27 10:32:57 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Feb 2015 10:32:57 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-778-ge707019
Message-ID: <20150227153257.D69CEAB0CB@public.kitware.com>

This is an automated email from 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  e7070195443970ef07bb22280dce099c382a4956 (commit)
       via  6bf130979e68201aac99c0d2009b50b26a389993 (commit)
      from  c902929e98100e5895b7d06b2c9d06e9dcce4423 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7070195443970ef07bb22280dce099c382a4956
commit e7070195443970ef07bb22280dce099c382a4956
Merge: c902929 6bf1309
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 27 10:32:56 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 27 10:32:56 2015 -0500

    Merge topic 'remove_error_read_script' into next
    
    6bf13097 CTest: Drop "Error in read script" message at end of testing


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6bf130979e68201aac99c0d2009b50b26a389993
commit 6bf130979e68201aac99c0d2009b50b26a389993
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Thu Feb 26 09:00:10 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 27 10:31:02 2015 -0500

    CTest: Drop "Error in read script" message at end of testing
    
    A more-specific error message is always displayed earlier in the
    output if any real error occurred.  This final summary message
    is distracting to readers searching through the output for the
    word "error".  Simply drop it.

diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index 8184bb4..3792953 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -454,12 +454,8 @@ int cmCTestScriptHandler::ReadInScript(const std::string& total_script_arg)
   if (!this->Makefile->ReadListFile(0, script.c_str()) ||
     cmSystemTools::GetErrorOccuredFlag())
     {
-    cmCTestLog(this->CTest, ERROR_MESSAGE, "Error in read script: "
-               << script
-               << std::endl);
     // Reset the error flag so that it can run more than
-    // one script with an error when you
-    // use ctest_run_script
+    // one script with an error when you use ctest_run_script.
     cmSystemTools::ResetErrorOccuredFlag();
     return 2;
     }
diff --git a/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt
index 00f4779..8fa3f1b 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt
index 5c582ac..adc744b 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt
@@ -1,3 +1,2 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-build/Testing/Temporary/MemoryChecker.1.log
 .*Error parsing XML in stream at line 1: no element found
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt
index c099340..3551043 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt
index 6c42ec1..02d5626 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt
index 41120b5..653c136 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-build/Testing/Temporary/MemoryChecker.1.log
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt
index cb353ad..5f6c6c1 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
index 7ce798c..423b7f7 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt
index 97bb833..032b5b4 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-build/Testing/Temporary/MemoryChecker.1.log
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt
index 0c997ff..6f52318 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt
@@ -1,3 +1,2 @@
 Problem running command: .*memcheck_fail.*
 Problem executing post-memcheck command\(s\).
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt
index 1d1b1e7..973c014 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt
@@ -1,3 +1,2 @@
 Problem running command: .*memcheck_fail.*
 Problem executing pre-memcheck command\(s\).
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt
index 65beb81..42cd5e8 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory checker suppression file: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-build/does-not-exist
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt
index e2a836f..18d9f03 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt
@@ -1,2 +1 @@
 Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-build/Testing/Temporary/MemoryChecker.1.log
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt b/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt
index 99df8b3..8868e0c 100644
--- a/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt
@@ -1,2 +1 @@
 Do not understand memory checker: .*/cmake.*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/Unknown/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
index ec0a869..adf334b 100644
--- a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
@@ -1,4 +1,3 @@
  *Error when uploading file: .*/Configure.xml
  *Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
  *Problems when submitting via HTTP
- *Error in read script: .*/Tests/RunCMake/ctest_submit/CDashSubmitQuiet/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt
index c3c084d..00a60ac 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt
@@ -1,4 +1,3 @@
 Missing arguments for submit via cp:
 .*
    Problems when submitting via CP
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-cp/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
index 4345918..64c3011 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
@@ -1,3 +1,2 @@
 Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
    Problems when submitting via FTP
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-ftp/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
index 9895181..73f0138 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
@@ -1,3 +1,2 @@
 Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
    Problems when submitting via HTTP
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-http/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
index a9c5d58..a1ba4f6 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
@@ -1,3 +1,2 @@
 Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*|Protocol "https" not supported or disabled in .*|.* was built with SSL disabled.*)
    Problems when submitting via HTTP
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-https/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt
index 0790297..ef67149 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt
@@ -1,2 +1 @@
    Problems when submitting via SCP
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-scp/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt
index 23ea92c..c0f718e 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt
@@ -1,2 +1 @@
    (Problems when submitting via XML-RPC|Submission method "xmlrpc" not compiled into CTest!)
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc/test.cmake

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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 27 10:34:32 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Feb 2015 10:34:32 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-327-gee81de5
Message-ID: <20150227153432.4D423AB0E8@public.kitware.com>

This is an automated email from 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  ee81de5ec35d1219f89097938b7aa63b40ed4b7a (commit)
       via  266568654c23ee1b4dea487a684cdb6304eb33aa (commit)
       via  5e2b418f7b0083b01004910848eb4823ea014ec1 (commit)
      from  4bef659da525441464ed110d362b46a6eac50a82 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee81de5ec35d1219f89097938b7aa63b40ed4b7a
commit ee81de5ec35d1219f89097938b7aa63b40ed4b7a
Merge: 4bef659 2665686
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 27 10:34:31 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 27 10:34:31 2015 -0500

    Merge topic 'update-kwsys'
    
    26656865 Merge branch 'upstream-kwsys' into update-kwsys
    5e2b418f KWSys 2015-02-25 (1b75ad3d)


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

Summary of changes:
 Source/kwsys/Glob.cxx           |   24 ++--------------
 Source/kwsys/SystemTools.cxx    |   58 +++++++++++++++++++++++++++++++++++----
 Source/kwsys/SystemTools.hxx.in |    7 +++--
 3 files changed, 59 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 27 10:34:34 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Feb 2015 10:34:34 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-331-g83a9cf6
Message-ID: <20150227153434.3487BAB0ED@public.kitware.com>

This is an automated email from 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  83a9cf6d2893f7284da522b052cd53c4affb8f76 (commit)
       via  3db740cb31afd32548bdeec5f1c35c6cfb3c0693 (commit)
       via  3cf86d9e7bb082b05c507c744b0a43981ba199c3 (commit)
       via  1cbb15625304b01e8a99a956fa42e4b7011fea48 (commit)
      from  ee81de5ec35d1219f89097938b7aa63b40ed4b7a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83a9cf6d2893f7284da522b052cd53c4affb8f76
commit 83a9cf6d2893f7284da522b052cd53c4affb8f76
Merge: ee81de5 3db740c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 27 10:34:33 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 27 10:34:33 2015 -0500

    Merge topic 'cpack_rpm_mulit_prefix_fixup-for-master'
    
    3db740cb CPackRPM: Consolidate CPackComponentsForAll test case coverage
    3cf86d9e Merge branch 'cpack_rpm_mulit_prefix_fixup' into cpack_rpm_mulit_prefix_fixup-for-master
    1cbb1562 CPackRPM: Fix handling of relocation prefix parent directories


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

Summary of changes:
 Modules/CPackRPM.cmake                             |   42 +++++++++-------
 .../MyLibCPackConfig-IgnoreGroup.cmake.in          |    9 +++-
 .../RunCPackVerifyResult.cmake                     |   50 ++++++++++++--------
 3 files changed, 62 insertions(+), 39 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 27 10:34:36 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Feb 2015 10:34:36 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-333-g38f1f4e
Message-ID: <20150227153436.40591AB0EC@public.kitware.com>

This is an automated email from 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  38f1f4e7f30bc9544805da7925d500045722bff1 (commit)
       via  c48141744e7b14940dc55ec98da631c4d2356dd7 (commit)
      from  83a9cf6d2893f7284da522b052cd53c4affb8f76 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38f1f4e7f30bc9544805da7925d500045722bff1
commit 38f1f4e7f30bc9544805da7925d500045722bff1
Merge: 83a9cf6 c481417
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 27 10:34:35 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 27 10:34:35 2015 -0500

    Merge topic 'install-manifest-optimize'
    
    c4814174 install: Write the entire installation manifest at once


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

Summary of changes:
 Source/cmFileCommand.cxx    |    5 ++++-
 Source/cmLocalGenerator.cxx |   17 ++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 27 10:34:38 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Feb 2015 10:34:38 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-336-g0bf6c7f
Message-ID: <20150227153438.2AB40AB0FC@public.kitware.com>

This is an automated email from 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  0bf6c7fa7bdc40af27a7e81b7e424c6eff02e24a (commit)
       via  d1082448a8d0a75974920690dcbad8895169bfd6 (commit)
       via  ce935ebe50926bde199d86fbde4a78974a4043f9 (commit)
      from  38f1f4e7f30bc9544805da7925d500045722bff1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bf6c7fa7bdc40af27a7e81b7e424c6eff02e24a
commit 0bf6c7fa7bdc40af27a7e81b7e424c6eff02e24a
Merge: 38f1f4e d108244
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 27 10:34:36 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 27 10:34:36 2015 -0500

    Merge topic 'cmake-build-ninja-verbose'
    
    d1082448 Tests: Extend RunCMake.CommandLine to cover 'cmake --build' for 'ninja -v'
    ce935ebe cmake: Teach --build to honor CMAKE_VERBOSE_MAKEFILE for Ninja


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

Summary of changes:
 Source/CPack/cmCPackGenerator.cxx                   |    2 +-
 Source/CTest/cmCTestBuildAndTestHandler.cxx         |    2 +-
 Source/cmGlobalGenerator.cxx                        |   11 ++++++-----
 Source/cmGlobalGenerator.h                          |    5 +++--
 Source/cmGlobalNinjaGenerator.cxx                   |    6 ++++++
 Source/cmGlobalNinjaGenerator.h                     |    2 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx           |    2 +-
 Source/cmGlobalUnixMakefileGenerator3.h             |    2 +-
 Source/cmGlobalVisualStudio10Generator.cxx          |    4 ++--
 Source/cmGlobalVisualStudio10Generator.h            |    2 +-
 Source/cmGlobalVisualStudio6Generator.cxx           |    2 +-
 Source/cmGlobalVisualStudio6Generator.h             |    2 +-
 Source/cmGlobalVisualStudio7Generator.cxx           |    2 +-
 Source/cmGlobalVisualStudio7Generator.h             |    2 +-
 Source/cmGlobalXCodeGenerator.cxx                   |    2 +-
 Source/cmGlobalXCodeGenerator.h                     |    2 +-
 Source/cmake.cxx                                    |    7 ++++++-
 Tests/RunCMake/CommandLine/Build-ninja-v-stdout.txt |    1 +
 Tests/RunCMake/CommandLine/Build.cmake              |    5 +++++
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake       |   16 ++++++++++++++++
 20 files changed, 57 insertions(+), 22 deletions(-)
 create mode 100644 Tests/RunCMake/CommandLine/Build-ninja-v-stdout.txt
 create mode 100644 Tests/RunCMake/CommandLine/Build.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 27 10:34:39 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Feb 2015 10:34:39 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-338-g29b5ca1
Message-ID: <20150227153440.01639AB0EC@public.kitware.com>

This is an automated email from 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  29b5ca108e040deea551580baf4d3146c76677f4 (commit)
       via  6bf130979e68201aac99c0d2009b50b26a389993 (commit)
      from  0bf6c7fa7bdc40af27a7e81b7e424c6eff02e24a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29b5ca108e040deea551580baf4d3146c76677f4
commit 29b5ca108e040deea551580baf4d3146c76677f4
Merge: 0bf6c7f 6bf1309
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 27 10:34:38 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 27 10:34:38 2015 -0500

    Merge topic 'remove_error_read_script'
    
    6bf13097 CTest: Drop "Error in read script" message at end of testing


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

Summary of changes:
 Source/CTest/cmCTestScriptHandler.cxx                            |    6 +-----
 Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt   |    1 -
 Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt        |    1 -
 Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt      |    1 -
 Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt    |    1 -
 Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt    |    1 -
 Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt    |    1 -
 .../ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt    |    1 -
 .../ctest_memcheck/DummyValgrindCustomOptions-stderr.txt         |    1 -
 Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt   |    1 -
 Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt    |    1 -
 .../ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt        |    1 -
 Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt  |    1 -
 Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt                 |    1 -
 Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt          |    1 -
 Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt               |    1 -
 Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt              |    1 -
 Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt             |    1 -
 Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt            |    1 -
 Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt              |    1 -
 Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt           |    1 -
 21 files changed, 1 insertion(+), 25 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 27 10:34:41 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Feb 2015 10:34:41 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-341-gd853cb2
Message-ID: <20150227153441.BB8FAAB0F8@public.kitware.com>

This is an automated email from 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  d853cb238c8ad6633f4f76f8bafe98993d5a5daf (commit)
       via  4efef3f775e78bdcb4591dc37aa974bc28e8fd84 (commit)
       via  e3363bfbec592393780f9d769bd32334bcfd5953 (commit)
      from  29b5ca108e040deea551580baf4d3146c76677f4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d853cb238c8ad6633f4f76f8bafe98993d5a5daf
commit d853cb238c8ad6633f4f76f8bafe98993d5a5daf
Merge: 29b5ca1 4efef3f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 27 10:34:40 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 27 10:34:40 2015 -0500

    Merge topic 'macro-function-docs'
    
    4efef3f7 Help: Clarify that ARGV# beyond ARGC will have an undefined behavior (#15380)
    e3363bfb Help: Refine the .rst formatting of macro and function documentation


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

Summary of changes:
 Help/command/function.rst |   43 ++++++++++++++++++++++++-------------------
 Help/command/macro.rst    |   43 ++++++++++++++++++++++++++-----------------
 2 files changed, 50 insertions(+), 36 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 27 10:34:58 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Feb 2015 10:34:58 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-785-ga8d9abf
Message-ID: <20150227153458.31BE6AB0EF@public.kitware.com>

This is an automated email from 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  a8d9abfec3ca940bbe167dd17d54584d4c1380df (commit)
       via  d853cb238c8ad6633f4f76f8bafe98993d5a5daf (commit)
       via  29b5ca108e040deea551580baf4d3146c76677f4 (commit)
       via  0bf6c7fa7bdc40af27a7e81b7e424c6eff02e24a (commit)
       via  38f1f4e7f30bc9544805da7925d500045722bff1 (commit)
       via  83a9cf6d2893f7284da522b052cd53c4affb8f76 (commit)
       via  ee81de5ec35d1219f89097938b7aa63b40ed4b7a (commit)
      from  e7070195443970ef07bb22280dce099c382a4956 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8d9abfec3ca940bbe167dd17d54584d4c1380df
commit a8d9abfec3ca940bbe167dd17d54584d4c1380df
Merge: e707019 d853cb2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 27 10:34:48 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 27 10:34:48 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 27 10:40:06 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Feb 2015 10:40:06 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-344-ged8055f
Message-ID: <20150227154006.6A5312206@public.kitware.com>

This is an automated email from 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  ed8055f41805ca300a227e685779449d92697e27 (commit)
       via  4932f59b4cd903169f691f708949ea2afb595492 (commit)
       via  693a944736aca153504d26fb621933219b715210 (commit)
      from  d853cb238c8ad6633f4f76f8bafe98993d5a5daf (commit)

Those revisions listed 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 Feb 27 10:40:06 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Feb 2015 10:40:06 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-789-g4cebb90
Message-ID: <20150227154006.846B6226E@public.kitware.com>

This is an automated email from 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  4cebb90e6d8a4d123b854b488f9ba1e6e419d891 (commit)
       via  ed8055f41805ca300a227e685779449d92697e27 (commit)
       via  4932f59b4cd903169f691f708949ea2afb595492 (commit)
       via  693a944736aca153504d26fb621933219b715210 (commit)
      from  a8d9abfec3ca940bbe167dd17d54584d4c1380df (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cebb90e6d8a4d123b854b488f9ba1e6e419d891
commit 4cebb90e6d8a4d123b854b488f9ba1e6e419d891
Merge: a8d9abf ed8055f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 27 10:39:54 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 27 10:39:54 2015 -0500

    Merge branch 'master' into next


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

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 27 10:40:06 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Feb 2015 10:40:06 -0500 (EST)
Subject: [Cmake-commits] CMake branch, release,
	updated. v3.2.0-rc2-6-g4932f59
Message-ID: <20150227154006.9CCBD226F@public.kitware.com>

This is an automated email from 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  4932f59b4cd903169f691f708949ea2afb595492 (commit)
       via  1cbb15625304b01e8a99a956fa42e4b7011fea48 (commit)
       via  693a944736aca153504d26fb621933219b715210 (commit)
       via  c48141744e7b14940dc55ec98da631c4d2356dd7 (commit)
      from  cd935b03bfee380f6d2a3999dbc9bf6f929485bc (commit)

Those revisions listed 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/CPackRPM.cmake                             |   42 ++++++++++++--------
 Source/cmFileCommand.cxx                           |    5 ++-
 Source/cmLocalGenerator.cxx                        |   17 +++-----
 .../MyLibCPackConfig-IgnoreGroup.cmake.in          |    9 ++++-
 .../RunCPackVerifyResult.cmake                     |   31 ++++++++++++++-
 5 files changed, 72 insertions(+), 32 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 27 11:15:12 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Feb 2015 11:15:12 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-791-g149f438
Message-ID: <20150227161512.B1BDAA843A@public.kitware.com>

This is an automated email from 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  149f438315bfbefd040c5381916a5c428594e701 (commit)
       via  a7631fc4e026f2e330b10eae73f473f240c3d0c1 (commit)
      from  4cebb90e6d8a4d123b854b488f9ba1e6e419d891 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=149f438315bfbefd040c5381916a5c428594e701
commit 149f438315bfbefd040c5381916a5c428594e701
Merge: 4cebb90 a7631fc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 27 11:15:11 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 27 11:15:11 2015 -0500

    Merge topic 'modules-check-ARGC' into next
    
    a7631fc4 Modules: Check for ARGC before using ARGV#


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7631fc4e026f2e330b10eae73f473f240c3d0c1
commit a7631fc4e026f2e330b10eae73f473f240c3d0c1
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Thu Feb 26 17:26:12 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 27 10:59:23 2015 -0500

    Modules: Check for ARGC before using ARGV#
    
    ARGV# could be defined from a parent scope.

diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index ce90f30..b7975d3 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -457,7 +457,11 @@ endfunction()
 
 
 function(set_bundle_key_values keys_var context item exepath dirs copyflag)
-  set(rpaths "${ARGV6}")
+  if(ARGC GREATER 6)
+    set(rpaths "${ARGV6}")
+  else()
+    set(rpaths "")
+  endif()
   get_filename_component(item_name "${item}" NAME)
 
   get_item_key("${item}" key)
diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake
index b1a2370..de475e4 100644
--- a/Modules/DeployQt4.cmake
+++ b/Modules/DeployQt4.cmake
@@ -126,7 +126,10 @@ function(write_qt4_conf qt_conf_dir qt_conf_contents)
 endfunction()
 
 function(resolve_qt4_paths paths_var)
-        set(executable_path ${ARGV1})
+        unset(executable_path)
+        if(ARGC GREATER 1)
+                set(executable_path ${ARGV1})
+        endif()
 
         set(paths_resolved)
         foreach(path ${${paths_var}})
@@ -144,11 +147,26 @@ function(resolve_qt4_paths paths_var)
 endfunction()
 
 function(fixup_qt4_executable executable)
-        set(qtplugins ${ARGV1})
-        set(libs ${ARGV2})
-        set(dirs ${ARGV3})
-        set(plugins_dir ${ARGV4})
-        set(request_qt_conf ${ARGV5})
+        unset(qtplugins)
+        if(ARGC GREATER 1)
+                set(qtplugins ${ARGV1})
+        endif()
+        unset(libs)
+        if(ARGC GREATER 2)
+                set(libs ${ARGV2})
+        endif()
+        unset(dirs)
+        if(ARGC GREATER 3)
+                set(dirs ${ARGV3})
+        endif()
+        unset(plugins_dir)
+        if(ARGC GREATER 4)
+                set(plugins_dir ${ARGV4})
+        endif()
+        unset(request_qt_conf)
+        if(ARGC GREATER 5)
+                set(request_qt_conf ${ARGV5})
+        endif()
 
         message(STATUS "fixup_qt4_executable")
         message(STATUS "  executable='${executable}'")
@@ -169,7 +187,7 @@ function(fixup_qt4_executable executable)
                 set(qt_conf_dir "${executable}/Contents/Resources")
                 set(executable_path "${executable}")
                 set(write_qt_conf TRUE)
-                if(NOT plugins_dir)
+                if(NOT DEFINED plugins_dir)
                         set(plugins_dir "${DeployQt4_apple_plugins_dir}")
                 endif()
         else()
@@ -204,9 +222,19 @@ function(fixup_qt4_executable executable)
 endfunction()
 
 function(install_qt4_plugin_path plugin executable copy installed_plugin_path_var)
-        set(plugins_dir ${ARGV4})
-        set(component ${ARGV5})
-        set(configurations ${ARGV6})
+        unset(plugins_dir)
+        if(ARGC GREATER 4)
+                set(plugins_dir ${ARGV4})
+        endif()
+        unset(component)
+        if(ARGC GREATER 5)
+                set(component ${ARGV5})
+        endif()
+        unset(configurations)
+        if(ARGC GREATER 6)
+                set(configurations ${ARGV6})
+        endif()
+
         if(EXISTS "${plugin}")
                 if(APPLE)
                         if(NOT plugins_dir)
@@ -253,8 +281,15 @@ function(install_qt4_plugin_path plugin executable copy installed_plugin_path_va
 endfunction()
 
 function(install_qt4_plugin plugin executable copy installed_plugin_path_var)
-        set(plugins_dir ${ARGV4})
-        set(component ${ARGV5})
+        unset(plugins_dir)
+        if(ARGC GREATER 4)
+                set(plugins_dir ${ARGV4})
+        endif()
+        unset(component)
+        if(ARGC GREATER 5)
+                set(component ${ARGV5})
+        endif()
+
         if(EXISTS "${plugin}")
                 install_qt4_plugin_path("${plugin}" "${executable}" "${copy}" "${installed_plugin_path_var}" "${plugins_dir}" "${component}")
         else()
@@ -287,12 +322,31 @@ function(install_qt4_plugin plugin executable copy installed_plugin_path_var)
 endfunction()
 
 function(install_qt4_executable executable)
-        set(qtplugins ${ARGV1})
-        set(libs ${ARGV2})
-        set(dirs ${ARGV3})
-        set(plugins_dir ${ARGV4})
-        set(request_qt_conf ${ARGV5})
-        set(component ${ARGV6})
+        unset(qtplugins)
+        if(ARGC GREATER 1)
+                set(qtplugins ${ARGV1})
+        endif()
+        unset(libs)
+        if(ARGC GREATER 2)
+                set(libs ${ARGV2})
+        endif()
+        unset(dirs)
+        if(ARGC GREATER 3)
+                set(dirs ${ARGV3})
+        endif()
+        unset(plugins_dir)
+        if(ARGC GREATER 4)
+                set(plugins_dir ${ARGV4})
+        endif()
+        unset(request_qt_conf)
+        if(ARGC GREATER 5)
+                set(request_qt_conf ${ARGV5})
+        endif()
+        unset(component)
+        if(ARGC GREATER 6)
+                set(component ${ARGV6})
+        endif()
+
         if(QT_LIBRARY_DIR)
                 list(APPEND dirs "${QT_LIBRARY_DIR}")
         endif()
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 74e8ae2..1f9f4d3 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1360,7 +1360,7 @@ endfunction()
 
 function(ExternalProject_Add_StepTargets name)
   set(steps ${ARGN})
-  if("${ARGV1}" STREQUAL "NO_DEPENDS")
+  if(ARGC GREATER 1 AND "${ARGV1}" STREQUAL "NO_DEPENDS")
     set(no_deps 1)
     list(REMOVE_AT steps 0)
   endif()
diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index ce5a4ed..dc31086 100644
--- a/Modules/FeatureSummary.cmake
+++ b/Modules/FeatureSummary.cmake
@@ -562,8 +562,14 @@ endfunction()
 # The stuff below is only kept for compatibility
 
 function(SET_PACKAGE_INFO _name _desc)
-  set(_url "${ARGV2}")
-  set(_purpose "${ARGV3}")
+  unset(_url)
+  unset(_purpose)
+  if(ARGC GREATER 2)
+    set(_url "${ARGV2}")
+  endif()
+  if(ARGC GREATER 3)
+    set(_purpose "${ARGV3}")
+  endif()
   set_property(GLOBAL PROPERTY _CMAKE_${_name}_DESCRIPTION "${_desc}" )
   if(NOT _url STREQUAL "")
     set_property(GLOBAL PROPERTY _CMAKE_${_name}_URL "${_url}" )
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index bf58ede..64ccde5 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -143,7 +143,7 @@ endmacro()
 #  - _pkgconfig_add_extra_path(_extra_paths ENV VAR)
 function(_pkgconfig_add_extra_path _extra_paths_var _var)
   set(_is_env 0)
-  if(_var STREQUAL "ENV")
+  if(ARGC GREATER 2 AND _var STREQUAL "ENV")
     set(_var ${ARGV2})
     set(_is_env 1)
   endif()
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 0c6256c..aab29ea 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -395,7 +395,7 @@ function(add_compiler_export_flags)
 
   # Either return the extra flags needed in the supplied argument, or to the
   # CMAKE_CXX_FLAGS if no argument is supplied.
-  if(ARGV0)
+  if(ARGC GREATER 0)
     set(${ARGV0} "${EXTRA_FLAGS}" PARENT_SCOPE)
   else()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_FLAGS}" PARENT_SCOPE)
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 9fb85fe..23d486e 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -330,7 +330,11 @@ endfunction()
 function(gp_resolve_item context item exepath dirs resolved_item_var)
   set(resolved 0)
   set(resolved_item "${item}")
-  set(rpaths "${ARGV5}")
+  if(ARGC GREATER 5)
+    set(rpaths "${ARGV5}")
+  else()
+    set(rpaths "")
+  endif()
 
   # Is it already resolved?
   #
@@ -481,7 +485,11 @@ endfunction()
 
 
 function(gp_resolved_file_type original_file file exepath dirs type_var)
-  set(rpaths "${ARGV5}")
+  if(ARGC GREATER 5)
+    set(rpaths "${ARGV5}")
+  else()
+    set(rpaths "")
+  endif()
   #message(STATUS "**")
 
   if(NOT IS_ABSOLUTE "${original_file}")
@@ -623,7 +631,11 @@ endfunction()
 function(get_prerequisites target prerequisites_var exclude_system recurse exepath dirs)
   set(verbose 0)
   set(eol_char "E")
-  set(rpaths "${ARGV6}")
+  if(ARGC GREATER 6)
+    set(rpaths "${ARGV6}")
+  else()
+    set(rpaths "")
+  endif()
 
   if(NOT IS_ABSOLUTE "${target}")
     message("warning: target '${target}' is not absolute...")
@@ -881,22 +893,22 @@ endfunction()
 
 
 function(list_prerequisites target)
-  if("${ARGV1}" STREQUAL "")
-    set(all 1)
-  else()
+  if(ARGC GREATER 1 AND NOT "${ARGV1}" STREQUAL "")
     set(all "${ARGV1}")
+  else()
+    set(all 1)
   endif()
 
-  if("${ARGV2}" STREQUAL "")
-    set(exclude_system 0)
-  else()
+  if(ARGC GREATER 2 AND NOT "${ARGV2}" STREQUAL "")
     set(exclude_system "${ARGV2}")
+  else()
+    set(exclude_system 0)
   endif()
 
-  if("${ARGV3}" STREQUAL "")
-    set(verbose 0)
-  else()
+  if(ARGC GREATER 3 AND NOT "${ARGV3}" STREQUAL "")
     set(verbose "${ARGV3}")
+  else()
+    set(verbose 0)
   endif()
 
   set(count 0)
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 6516b0a..3b0a6cc 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -158,7 +158,7 @@ macro (QT4_GENERATE_MOC infile outfile )
      set(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
    endif()
 
-   if ("x${ARGV2}" STREQUAL "xTARGET")
+   if (${ARGC} GREATER 3 AND "x${ARGV2}" STREQUAL "xTARGET")
       set(moc_target ${ARGV3})
    endif()
    QT4_CREATE_MOC_COMMAND(${abs_infile} ${_outfile} "${moc_flags}" "" "${moc_target}")
@@ -329,7 +329,10 @@ endmacro()
 macro(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optionalBasename _optionalClassName)
   get_filename_component(_infile ${_xml_file} ABSOLUTE)
 
-  set(_optionalBasename "${ARGV4}")
+  unset(_optionalBasename)
+  if(${ARGC} GREATER 4)
+    set(_optionalBasename "${ARGV4}")
+  endif()
   if (_optionalBasename)
     set(_basename ${_optionalBasename} )
   else ()
@@ -337,7 +340,10 @@ macro(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optional
     string(TOLOWER ${_basename} _basename)
   endif ()
 
-  set(_optionalClassName "${ARGV5}")
+  unset(_optionalClassName)
+  if(${ARGC} GREATER 5)
+    set(_optionalClassName "${ARGV5}")
+  endif()
   set(_header "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h")
   set(_impl   "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp")
   set(_moc    "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc")

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

Summary of changes:
 Modules/BundleUtilities.cmake      |    6 ++-
 Modules/DeployQt4.cmake            |   90 ++++++++++++++++++++++++++++--------
 Modules/ExternalProject.cmake      |    2 +-
 Modules/FeatureSummary.cmake       |   10 +++-
 Modules/FindPkgConfig.cmake        |    2 +-
 Modules/GenerateExportHeader.cmake |    2 +-
 Modules/GetPrerequisites.cmake     |   36 ++++++++++-----
 Modules/Qt4Macros.cmake            |   12 +++--
 8 files changed, 121 insertions(+), 39 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Feb 27 16:50:34 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 27 Feb 2015 16:50:34 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-793-ga388f68
Message-ID: <20150227215034.1EBDCAAF15@public.kitware.com>

This is an automated email from 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  a388f6819fca8ebc130dbe9f5c6f157a08885fdd (commit)
       via  c2c3e9f3733bf0eeec63252574e76d292a86b65e (commit)
      from  149f438315bfbefd040c5381916a5c428594e701 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a388f6819fca8ebc130dbe9f5c6f157a08885fdd
commit a388f6819fca8ebc130dbe9f5c6f157a08885fdd
Merge: 149f438 c2c3e9f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 27 16:50:32 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 27 16:50:32 2015 -0500

    Merge topic 'fix-crash-on-bad-LANG_STANDARD' into next
    
    c2c3e9f3 Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2c3e9f3733bf0eeec63252574e76d292a86b65e
commit c2c3e9f3733bf0eeec63252574e76d292a86b65e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 27 16:48:39 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 27 16:50:00 2015 -0500

    Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426)

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 7ca7684..b64383f 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2270,7 +2270,14 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
 
   std::vector<std::string>::const_iterator stdIt =
                                 std::find(stds.begin(), stds.end(), standard);
-  assert(stdIt != stds.end());
+  if (stdIt == stds.end())
+    {
+    std::string e =
+      lang + "_STANDARD is set to invalid value '" + standard + "'";
+    this->GetGlobalGenerator()->GetCMakeInstance()
+      ->IssueMessage(cmake::FATAL_ERROR, e, target->GetBacktrace());
+    return;
+    }
 
   std::vector<std::string>::const_iterator defaultStdIt =
     std::find(stds.begin(), stds.end(), defaultStd);
diff --git a/Tests/RunCMake/CompileFeatures/NotAStandard-result.txt b/Tests/RunCMake/CompileFeatures/NotAStandard-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/NotAStandard-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CompileFeatures/NotAStandard-stderr.txt b/Tests/RunCMake/CompileFeatures/NotAStandard-stderr.txt
new file mode 100644
index 0000000..deab12f
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/NotAStandard-stderr.txt
@@ -0,0 +1,4 @@
+CMake Error at NotAStandard.cmake:[0-9]+ \(add_library\):
+  CXX_STANDARD is set to invalid value 'bad'
+Call Stack \(most recent call first\):
+  CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CompileFeatures/NotAStandard.cmake b/Tests/RunCMake/CompileFeatures/NotAStandard.cmake
new file mode 100644
index 0000000..11529d8
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/NotAStandard.cmake
@@ -0,0 +1,2 @@
+set(CMAKE_CXX_STANDARD bad)
+add_library(somelib STATIC empty.cpp)
diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
index 833a315..63cb4fa 100644
--- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
@@ -8,6 +8,8 @@ run_cmake(NotAFeature_OriginDebugGenex)
 run_cmake(NotAFeature_OriginDebugTransitive)
 run_cmake(NotAFeature_OriginDebugCommand)
 
+run_cmake(NotAStandard)
+
 run_cmake(generate_feature_list)
 file(READ
   "${RunCMake_BINARY_DIR}/generate_feature_list-build/c_features.txt"

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

Summary of changes:
 Source/cmLocalGenerator.cxx                                   |    9 ++++++++-
 .../NotAStandard-result.txt}                                  |    0
 Tests/RunCMake/CompileFeatures/NotAStandard-stderr.txt        |    4 ++++
 Tests/RunCMake/CompileFeatures/NotAStandard.cmake             |    2 ++
 Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake             |    2 ++
 5 files changed, 16 insertions(+), 1 deletion(-)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CompileFeatures/NotAStandard-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CompileFeatures/NotAStandard-stderr.txt
 create mode 100644 Tests/RunCMake/CompileFeatures/NotAStandard.cmake


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sat Feb 28 00:01:11 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Sat, 28 Feb 2015 00:01:11 -0500 (EST)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.2.0-rc2-345-gae09fce
Message-ID: <20150228050111.D1D7BAAEF1@public.kitware.com>

This is an automated email from 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  ae09fce8319112f8a401a843d4297e7c157a112a (commit)
      from  ed8055f41805ca300a227e685779449d92697e27 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae09fce8319112f8a401a843d4297e7c157a112a
commit ae09fce8319112f8a401a843d4297e7c157a112a
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sat Feb 28 00:01:09 2015 -0500
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sat Feb 28 00:01:09 2015 -0500

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 8c01479..e7ce8dd 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 2)
-set(CMake_VERSION_PATCH 20150227)
+set(CMake_VERSION_PATCH 20150228)
 #set(CMake_VERSION_RC 1)

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

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


hooks/post-receive
-- 
CMake

From nilsgladitz at gmail.com  Sat Feb 28 08:23:38 2015
From: nilsgladitz at gmail.com (Nils Gladitz)
Date: Sat, 28 Feb 2015 08:23:38 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-796-g1ef4199
Message-ID: <20150228132338.E75A7AAA7B@public.kitware.com>

This is an automated email from 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  1ef4199563c059e06d1911011b61a185f5a769ef (commit)
       via  cfb22354b8bff1f7eddc117616a80774d456f467 (commit)
       via  ae09fce8319112f8a401a843d4297e7c157a112a (commit)
      from  a388f6819fca8ebc130dbe9f5c6f157a08885fdd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ef4199563c059e06d1911011b61a185f5a769ef
commit 1ef4199563c059e06d1911011b61a185f5a769ef
Merge: a388f68 cfb2235
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Feb 28 08:23:38 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 28 08:23:38 2015 -0500

    Merge topic 'locale-agnostic-findhg' into next
    
    cfb22354 FindHg: Run hg with C locale when querying its version.
    ae09fce8 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfb22354b8bff1f7eddc117616a80774d456f467
commit cfb22354b8bff1f7eddc117616a80774d456f467
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Feb 28 14:22:41 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Sat Feb 28 14:22:41 2015 +0100

    FindHg: Run hg with C locale when querying its version.
    
    LANGUAGE should be ignored when LC_ALL=C.
    It seems this isn't the case with hg so set both.

diff --git a/Modules/FindHg.cmake b/Modules/FindHg.cmake
index 34d763e..bdbb79b 100644
--- a/Modules/FindHg.cmake
+++ b/Modules/FindHg.cmake
@@ -63,11 +63,21 @@ find_program(HG_EXECUTABLE
 mark_as_advanced(HG_EXECUTABLE)
 
 if(HG_EXECUTABLE)
+  set(_saved_lc_all "$ENV{LC_ALL}")
+  set(ENV{LC_ALL} "C")
+
+  set(_saved_language "$ENV{LANGUAGE}")
+  set(ENV{LANGUAGE})
+
   execute_process(COMMAND ${HG_EXECUTABLE} --version
                   OUTPUT_VARIABLE hg_version
                   ERROR_QUIET
                   RESULT_VARIABLE hg_result
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  set(ENV{LC_ALL} ${_saved_lc_all})
+  set(ENV{LANGUAGE} ${_saved_language})
+
   if(hg_result MATCHES "is not a valid Win32 application")
     set_property(CACHE HG_EXECUTABLE PROPERTY VALUE "HG_EXECUTABLE-NOTFOUND")
   endif()

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

Summary of changes:
 Modules/FindHg.cmake      |   10 ++++++++++
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Sat Feb 28 12:14:29 2015
From: brad.king at kitware.com (Brad King)
Date: Sat, 28 Feb 2015 12:14:29 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-798-g284b149
Message-ID: <20150228171430.04A44A5A92@public.kitware.com>

This is an automated email from 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  284b149f166f4a51e25a6ef32e234e9d88a4d005 (commit)
       via  4fb64da89dabb20fa5e1c7a7268c908d7f23481f (commit)
      from  1ef4199563c059e06d1911011b61a185f5a769ef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=284b149f166f4a51e25a6ef32e234e9d88a4d005
commit 284b149f166f4a51e25a6ef32e234e9d88a4d005
Merge: 1ef4199 4fb64da
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Feb 28 12:14:29 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 28 12:14:29 2015 -0500

    Merge topic 'fix-crash-on-bad-LANG_STANDARD' into next
    
    4fb64da8 fixup! Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4fb64da89dabb20fa5e1c7a7268c908d7f23481f
commit 4fb64da89dabb20fa5e1c7a7268c908d7f23481f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Feb 28 12:10:57 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Feb 28 12:11:09 2015 -0500

    fixup! Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426)
    
    Run the test only if the compiler understands language standards.

diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
index 63cb4fa..c1b2227 100644
--- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
@@ -8,8 +8,6 @@ run_cmake(NotAFeature_OriginDebugGenex)
 run_cmake(NotAFeature_OriginDebugTransitive)
 run_cmake(NotAFeature_OriginDebugCommand)
 
-run_cmake(NotAStandard)
-
 run_cmake(generate_feature_list)
 file(READ
   "${RunCMake_BINARY_DIR}/generate_feature_list-build/c_features.txt"
@@ -45,6 +43,8 @@ else()
 endif()
 
 if(CXX_STANDARD_DEFAULT)
+  run_cmake(NotAStandard)
+
   foreach(standard 98 11)
     file(READ
       "${RunCMake_BINARY_DIR}/generate_feature_list-build/cxx${standard}_flag.txt"

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

Summary of changes:
 Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Sat Feb 28 12:15:24 2015
From: brad.king at kitware.com (Brad King)
Date: Sat, 28 Feb 2015 12:15:24 -0500 (EST)
Subject: [Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-800-g7f827ec
Message-ID: <20150228171524.E219CA80A9@public.kitware.com>

This is an automated email from 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  7f827ece69940026a557f7906ac6436d24962f57 (commit)
       via  00d66557d49989f9813ba9f04beaa0a984699cf0 (commit)
      from  284b149f166f4a51e25a6ef32e234e9d88a4d005 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f827ece69940026a557f7906ac6436d24962f57
commit 7f827ece69940026a557f7906ac6436d24962f57
Merge: 284b149 00d6655
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Feb 28 12:15:24 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 28 12:15:24 2015 -0500

    Merge topic 'fix-crash-on-bad-LANG_STANDARD' into next
    
    00d66557 Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00d66557d49989f9813ba9f04beaa0a984699cf0
commit 00d66557d49989f9813ba9f04beaa0a984699cf0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 27 16:48:39 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Feb 28 12:14:42 2015 -0500

    Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426)

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 7ca7684..b64383f 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2270,7 +2270,14 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
 
   std::vector<std::string>::const_iterator stdIt =
                                 std::find(stds.begin(), stds.end(), standard);
-  assert(stdIt != stds.end());
+  if (stdIt == stds.end())
+    {
+    std::string e =
+      lang + "_STANDARD is set to invalid value '" + standard + "'";
+    this->GetGlobalGenerator()->GetCMakeInstance()
+      ->IssueMessage(cmake::FATAL_ERROR, e, target->GetBacktrace());
+    return;
+    }
 
   std::vector<std::string>::const_iterator defaultStdIt =
     std::find(stds.begin(), stds.end(), defaultStd);
diff --git a/Tests/RunCMake/CompileFeatures/NotAStandard-result.txt b/Tests/RunCMake/CompileFeatures/NotAStandard-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/NotAStandard-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CompileFeatures/NotAStandard-stderr.txt b/Tests/RunCMake/CompileFeatures/NotAStandard-stderr.txt
new file mode 100644
index 0000000..deab12f
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/NotAStandard-stderr.txt
@@ -0,0 +1,4 @@
+CMake Error at NotAStandard.cmake:[0-9]+ \(add_library\):
+  CXX_STANDARD is set to invalid value 'bad'
+Call Stack \(most recent call first\):
+  CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CompileFeatures/NotAStandard.cmake b/Tests/RunCMake/CompileFeatures/NotAStandard.cmake
new file mode 100644
index 0000000..11529d8
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/NotAStandard.cmake
@@ -0,0 +1,2 @@
+set(CMAKE_CXX_STANDARD bad)
+add_library(somelib STATIC empty.cpp)
diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
index 833a315..c1b2227 100644
--- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
@@ -43,6 +43,8 @@ else()
 endif()
 
 if(CXX_STANDARD_DEFAULT)
+  run_cmake(NotAStandard)
+
   foreach(standard 98 11)
     file(READ
       "${RunCMake_BINARY_DIR}/generate_feature_list-build/cxx${standard}_flag.txt"

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

Summary of changes:


hooks/post-receive
-- 
CMake