[Cmake-commits] CMake branch, master, updated. v3.6.1-650-g11e0cea

2016-08-17 Thread Kitware Robot 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
   via  11e0ceaeab905075d93e279b87470b99c6401929 (commit)
  from  67a7dcef45fef6172514d6df1bea3ca94a04735a (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11e0ceaeab905075d93e279b87470b99c6401929
commit 11e0ceaeab905075d93e279b87470b99c6401929
Author: Kitware Robot 
AuthorDate: Thu Aug 18 00:01:04 2016 -0400
Commit: Kitware Robot 
CommitDate: Thu Aug 18 00:01:04 2016 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index ac1ae03..ca31b76 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 6)
-set(CMake_VERSION_PATCH 20160817)
+set(CMake_VERSION_PATCH 20160818)
 #set(CMake_VERSION_RC 1)

---

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


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

[Cmake-commits] CMake branch, next, updated. v3.6.1-1302-g1cca31b

2016-08-17 Thread Daniel Pfeifer 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  1cca31b2f5b2ac7ba21711fbe612b37d1ecc6b6c (commit)
   via  ccb9a992dc78d04112075f4667792c89239b74d1 (commit)
  from  951bc07441bdf29dde92ff7e0a58ec5b21a847f5 (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1cca31b2f5b2ac7ba21711fbe612b37d1ecc6b6c
commit 1cca31b2f5b2ac7ba21711fbe612b37d1ecc6b6c
Merge: 951bc07 ccb9a99
Author: Daniel Pfeifer 
AuthorDate: Wed Aug 17 18:32:07 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 17 18:32:07 2016 -0400

Merge topic 'include-what-you-use' into next

ccb9a992 fixup! fix a batch of include-what-you-use violations


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccb9a992dc78d04112075f4667792c89239b74d1
commit ccb9a992dc78d04112075f4667792c89239b74d1
Author: Daniel Pfeifer 
AuthorDate: Thu Aug 18 00:31:49 2016 +0200
Commit: Daniel Pfeifer 
CommitDate: Thu Aug 18 00:31:49 2016 +0200

fixup! fix a batch of include-what-you-use violations

diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index fa5a08e..0504f70 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -18,9 +18,9 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
-#include 
 
 #ifndef __LA_SSIZE_T
 #define __LA_SSIZE_T la_ssize_t
diff --git a/Source/cmArchiveWrite.h b/Source/cmArchiveWrite.h
index c859453..120453b 100644
--- a/Source/cmArchiveWrite.h
+++ b/Source/cmArchiveWrite.h
@@ -14,8 +14,8 @@
 
 #include  // IWYU pragma: keep
 
-#include 
 #include 
+#include 
 #include 
 
 #if !defined(CMAKE_BUILD_WITH_CMAKE)
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 386c39a..5b76162 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -16,12 +16,12 @@
 #include "cmVersion.h"
 #include "cmake.h"
 
+#include 
 #include 
 #include 
+#include 
 #include 
 #include 
-#include 
-#include 
 
 cmCacheManager::cmCacheManager()
 {
diff --git a/Source/cmCommonTargetGenerator.cxx 
b/Source/cmCommonTargetGenerator.cxx
index f65e2fb..6167e2c 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -11,8 +11,8 @@
 */
 #include "cmCommonTargetGenerator.h"
 
-#include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 644f4a9..98405cf 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -22,12 +22,12 @@
 #include "cmTarget.h"
 #include "cmake.h"
 
-#include 
-#include 
-#include 
 #include 
+#include 
 #include 
 #include 
+#include 
+#include 
 #include 
 
 /*
diff --git a/Source/cmComputeLinkInformation.cxx 
b/Source/cmComputeLinkInformation.cxx
index 96c36f1..82877f3 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -25,10 +25,10 @@
 #include "cmTarget.h"
 #include "cmake.h"
 
-#include 
-#include 
 #include 
+#include 
 #include 
+#include 
 #include 
 
 //#define CM_COMPUTE_LINK_INFO_DEBUG
diff --git a/Source/cmComputeTargetDepends.cxx 
b/Source/cmComputeTargetDepends.cxx
index 8b89e33..dd07300 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -26,8 +26,8 @@
 #include "cmake.h"
 
 #include 
-#include 
 #include 
+#include 
 #include 
 
 class cmListFileBacktrace;

---

Summary of changes:
 Source/cmArchiveWrite.cxx   |2 +-
 Source/cmArchiveWrite.h |2 +-
 Source/cmCacheManager.cxx   |4 ++--
 Source/cmCommonTargetGenerator.cxx  |2 +-
 Source/cmComputeLinkDepends.cxx |6 +++---
 Source/cmComputeLinkInformation.cxx |4 ++--
 Source/cmComputeTargetDepends.cxx   |2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v3.6.1-1300-g951bc07

2016-08-17 Thread Daniel Pfeifer 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  951bc07441bdf29dde92ff7e0a58ec5b21a847f5 (commit)
   via  250091ffa36ef6df3f4fb9429aefaef95bf70661 (commit)
   via  373b2e483d983136415190dcc838e636077e5991 (commit)
  from  2e928b19d912dcb7db0c6b10a89a35c5b5e2462d (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=951bc07441bdf29dde92ff7e0a58ec5b21a847f5
commit 951bc07441bdf29dde92ff7e0a58ec5b21a847f5
Merge: 2e928b1 250091f
Author: Daniel Pfeifer 
AuthorDate: Wed Aug 17 18:24:49 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 17 18:24:49 2016 -0400

Merge topic 'include-what-you-use' into next

250091ff fix a batch of include-what-you-use violations
373b2e48 cmArchiveWrite: replace mode_t with int


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=250091ffa36ef6df3f4fb9429aefaef95bf70661
commit 250091ffa36ef6df3f4fb9429aefaef95bf70661
Author: Daniel Pfeifer 
AuthorDate: Thu Aug 18 00:24:24 2016 +0200
Commit: Daniel Pfeifer 
CommitDate: Thu Aug 18 00:24:24 2016 +0200

fix a batch of include-what-you-use violations

diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index 56da2ac..fa5a08e 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -16,7 +16,11 @@
 #include "cm_get_date.h"
 #include 
 #include 
+#include 
 #include 
+#include 
+#include 
+#include 
 
 #ifndef __LA_SSIZE_T
 #define __LA_SSIZE_T la_ssize_t
diff --git a/Source/cmArchiveWrite.h b/Source/cmArchiveWrite.h
index b15c15a..c859453 100644
--- a/Source/cmArchiveWrite.h
+++ b/Source/cmArchiveWrite.h
@@ -12,7 +12,11 @@
 #ifndef cmArchiveWrite_h
 #define cmArchiveWrite_h
 
-#include "cmStandardIncludes.h"
+#include  // IWYU pragma: keep
+
+#include 
+#include 
+#include 
 
 #if !defined(CMAKE_BUILD_WITH_CMAKE)
 #error "cmArchiveWrite not allowed during bootstrap build!"
diff --git a/Source/cmCLocaleEnvironmentScope.cxx 
b/Source/cmCLocaleEnvironmentScope.cxx
index e4c74ec..e38f531 100644
--- a/Source/cmCLocaleEnvironmentScope.cxx
+++ b/Source/cmCLocaleEnvironmentScope.cxx
@@ -15,6 +15,7 @@
 #include "cmSystemTools.h"
 
 #include 
+#include 
 
 cmCLocaleEnvironmentScope::cmCLocaleEnvironmentScope()
 {
diff --git a/Source/cmCLocaleEnvironmentScope.h 
b/Source/cmCLocaleEnvironmentScope.h
index b011741..572beaf 100644
--- a/Source/cmCLocaleEnvironmentScope.h
+++ b/Source/cmCLocaleEnvironmentScope.h
@@ -13,7 +13,10 @@
 #ifndef cmCLocaleEnvironmentScope_h
 #define cmCLocaleEnvironmentScope_h
 
-#include "cmStandardIncludes.h"
+#include  // IWYU pragma: keep
+
+#include 
+#include 
 
 class cmCLocaleEnvironmentScope
 {
diff --git a/Source/cmCPackPropertiesGenerator.cxx 
b/Source/cmCPackPropertiesGenerator.cxx
index af01c7d..ae6b0a1 100644
--- a/Source/cmCPackPropertiesGenerator.cxx
+++ b/Source/cmCPackPropertiesGenerator.cxx
@@ -1,8 +1,13 @@
 #include "cmCPackPropertiesGenerator.h"
 
-#include "cmLocalGenerator.h"
+#include "cmGeneratorExpression.h"
+#include "cmInstalledFile.h"
 #include "cmOutputConverter.h"
 
+#include 
+#include 
+#include 
+
 cmCPackPropertiesGenerator::cmCPackPropertiesGenerator(
   cmLocalGenerator* lg, cmInstalledFile const& installedFile,
   std::vector const& configurations)
diff --git a/Source/cmCPackPropertiesGenerator.h 
b/Source/cmCPackPropertiesGenerator.h
index 4d092f6..77018b0 100644
--- a/Source/cmCPackPropertiesGenerator.h
+++ b/Source/cmCPackPropertiesGenerator.h
@@ -12,9 +12,15 @@
 #ifndef cmCPackPropertiesGenerator_h
 #define cmCPackPropertiesGenerator_h
 
-#include "cmInstalledFile.h"
+#include  // IWYU pragma: keep
+
 #include "cmScriptGenerator.h"
 
+#include 
+#include 
+#include 
+
+class cmInstalledFile;
 class cmLocalGenerator;
 
 /** \class cmCPackPropertiesGenerator
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index bdd7303..386c39a 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -16,10 +16,12 @@
 #include "cmVersion.h"
 #include "cmake.h"
 
-#include 
 #include 
 #include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 cmCacheManager::cmCacheManager()
 {
diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h
index 14e0f0a..3e32cf0 100644
--- a/Source/cmCacheManager.h
+++ b/Source/cmCacheManager.h
@@ -12,13 +12,19 @@
 #ifndef cmCacheManager_h
 #define cmCacheManager_h
 
-#include "cmStandardIncludes.h"
+#include  // IWYU pragma: keep
 
 #include "cmPropertyMap.h"
 #include "cmState.h"
 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
 class cmake;
-class cmMarkAsAdvancedCommand;
 
 /** \class cmCacheManager
  * \brief Control clas

[Cmake-commits] CMake branch, next, updated. v3.6.1-1297-g2e928b1

2016-08-17 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  2e928b19d912dcb7db0c6b10a89a35c5b5e2462d (commit)
   via  03d5ae0b37adc3fd12fa2bdb6b96252182f48d2a (commit)
   via  08f570b7fb76c1895663ae8665d2494c988069b4 (commit)
  from  15df44b216c93a123bcb005b33795e20e49f11f8 (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e928b19d912dcb7db0c6b10a89a35c5b5e2462d
commit 2e928b19d912dcb7db0c6b10a89a35c5b5e2462d
Merge: 15df44b 03d5ae0
Author: Brad King 
AuthorDate: Wed Aug 17 13:39:46 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 17 13:39:46 2016 -0400

Merge topic 'msvc-suppress-rc-logo' into next

03d5ae0b Merge branch 'minor-cleanups' into msvc-suppress-rc-logo
08f570b7 MSVC: Suppress rc.exe logo/banner when CMAKE_VERBOSE_MAKEFILE is 
false


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03d5ae0b37adc3fd12fa2bdb6b96252182f48d2a
commit 03d5ae0b37adc3fd12fa2bdb6b96252182f48d2a
Merge: 08f570b 27591a5
Author: Brad King 
AuthorDate: Wed Aug 17 13:30:35 2016 -0400
Commit: Brad King 
CommitDate: Wed Aug 17 13:30:35 2016 -0400

Merge branch 'minor-cleanups' into msvc-suppress-rc-logo


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08f570b7fb76c1895663ae8665d2494c988069b4
commit 08f570b7fb76c1895663ae8665d2494c988069b4
Author: Taylor Braun-Jones 
AuthorDate: Tue Aug 16 12:36:49 2016 -0400
Commit: Taylor Braun-Jones 
CommitDate: Wed Aug 17 11:49:12 2016 -0400

MSVC: Suppress rc.exe logo/banner when CMAKE_VERBOSE_MAKEFILE is false

This matches the current behavior for cl.exe.

Closes: #16246

diff --git a/Modules/CMakeRCInformation.cmake b/Modules/CMakeRCInformation.cmake
index 60276e2..8e320da 100644
--- a/Modules/CMakeRCInformation.cmake
+++ b/Modules/CMakeRCInformation.cmake
@@ -44,7 +44,7 @@ set(CMAKE_INCLUDE_FLAG_RC "-I")
 # compile a Resource file into an object file
 if(NOT CMAKE_RC_COMPILE_OBJECT)
   set(CMAKE_RC_COMPILE_OBJECT
-"/fo ")
+" ${CMAKE_CL_NOLOGO}
/fo ")
 endif()
 
 mark_as_advanced(

---

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


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

[Cmake-commits] CMake branch, next, updated. v3.6.1-1294-g15df44b

2016-08-17 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  15df44b216c93a123bcb005b33795e20e49f11f8 (commit)
   via  27591a541c3ee7c0a941295f25610631bf18ca74 (commit)
   via  481c9003fa41e75731bc463cdfa4310e91d5ea4c (commit)
  from  253e20a8ccdf6fd9287faf8cde8af74ecd13c471 (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15df44b216c93a123bcb005b33795e20e49f11f8
commit 15df44b216c93a123bcb005b33795e20e49f11f8
Merge: 253e20a 27591a5
Author: Brad King 
AuthorDate: Wed Aug 17 11:10:20 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 17 11:10:20 2016 -0400

Merge topic 'minor-cleanups' into next

27591a54 Define WIN32_LEAN_AND_MEAN for CMake sources on Windows
481c9003 libarchive: Fix include order in xxhash.c


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27591a541c3ee7c0a941295f25610631bf18ca74
commit 27591a541c3ee7c0a941295f25610631bf18ca74
Author: Brad King 
AuthorDate: Wed Aug 17 10:43:26 2016 -0400
Commit: Brad King 
CommitDate: Wed Aug 17 10:48:28 2016 -0400

Define WIN32_LEAN_AND_MEAN for CMake sources on Windows

This reduces APIs included by `windows.h`.  We can include the headers
for those APIs as needed.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index b68675d..e63bf5a 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -45,9 +45,12 @@ endif()
 
 set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR})
 
-# ensure Unicode friendly APIs are used on Windows
 if(WIN32)
+  # ensure Unicode friendly APIs are used on Windows
   add_definitions(-DUNICODE -D_UNICODE)
+
+  # minimize windows.h content
+  add_definitions(-DWIN32_LEAN_AND_MEAN)
 endif()
 
 # configure the .dox.in file

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=481c9003fa41e75731bc463cdfa4310e91d5ea4c
commit 481c9003fa41e75731bc463cdfa4310e91d5ea4c
Author: Brad King 
AuthorDate: Wed Aug 17 10:41:13 2016 -0400
Commit: Brad King 
CommitDate: Wed Aug 17 10:48:28 2016 -0400

libarchive: Fix include order in xxhash.c

We need to include `archive_platform.h` before any system headers in
order to ensure that `_WIN32_WINNT` is defined early enough.

diff --git a/Utilities/cmlibarchive/libarchive/xxhash.c 
b/Utilities/cmlibarchive/libarchive/xxhash.c
index d7f8e96..262fecb 100644
--- a/Utilities/cmlibarchive/libarchive/xxhash.c
+++ b/Utilities/cmlibarchive/libarchive/xxhash.c
@@ -29,12 +29,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
SUCH DAMAGE.
 You can contact the author at :
 - xxHash source repository : http://code.google.com/p/xxhash/
 */
-#include 
-#include 
 
 #include "archive_platform.h"
 #include "archive_xxhash.h"
 
+#include 
+#include 
+
 #ifdef HAVE_LIBLZ4
 
 /***

---

Summary of changes:
 Source/CMakeLists.txt  |5 -
 Utilities/cmlibarchive/libarchive/xxhash.c |5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v3.6.1-1291-g253e20a

2016-08-17 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  253e20a8ccdf6fd9287faf8cde8af74ecd13c471 (commit)
   via  67a7dcef45fef6172514d6df1bea3ca94a04735a (commit)
   via  29593b79a236f9bd6653ed0ab87ae4f38f00 (commit)
   via  c700d11d259af9c00680321804669fadbe378a22 (commit)
   via  5d1690725bdbd5840e1188e9025121ac2f9878ed (commit)
   via  76ff725ae7a38b4044cc3d5dc6f8e76cbd6c20aa (commit)
   via  65120d180b6e7658e296fd2c4c85a23f337c06dc (commit)
  from  c541113797bcb0da4a9fbfdde8e7eb72d609a005 (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=253e20a8ccdf6fd9287faf8cde8af74ecd13c471
commit 253e20a8ccdf6fd9287faf8cde8af74ecd13c471
Merge: c541113 67a7dce
Author: Brad King 
AuthorDate: Wed Aug 17 10:47:33 2016 -0400
Commit: Brad King 
CommitDate: Wed Aug 17 10:47:33 2016 -0400

Merge branch 'master' into next


---

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


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

[Cmake-commits] CMake branch, master, updated. v3.6.1-645-gc700d11

2016-08-17 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
   via  c700d11d259af9c00680321804669fadbe378a22 (commit)
   via  7ded655f7ba82ea72a82d0555449f2df5ef38594 (commit)
  from  5d1690725bdbd5840e1188e9025121ac2f9878ed (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c700d11d259af9c00680321804669fadbe378a22
commit c700d11d259af9c00680321804669fadbe378a22
Merge: 5d16907 7ded655
Author: Brad King 
AuthorDate: Wed Aug 17 10:46:29 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 17 10:46:29 2016 -0400

Merge topic 'FindCUDA-target-include-dirs'

7ded655f FindCUDA: Take NVCC include directories from target properties


---

Summary of changes:
 Modules/FindCUDA.cmake  |   32 +++-
 Modules/FindCUDA/run_nvcc.cmake |   17 -
 2 files changed, 27 insertions(+), 22 deletions(-)


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

[Cmake-commits] CMake branch, master, updated. v3.6.1-649-g67a7dce

2016-08-17 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
   via  67a7dcef45fef6172514d6df1bea3ca94a04735a (commit)
   via  e7b842e18955d13f6d9c021bab4a8935bf282744 (commit)
  from  29593b79a236f9bd6653ed0ab87ae4f38f00 (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67a7dcef45fef6172514d6df1bea3ca94a04735a
commit 67a7dcef45fef6172514d6df1bea3ca94a04735a
Merge: 29593b7 e7b842e
Author: Brad King 
AuthorDate: Wed Aug 17 10:46:35 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 17 10:46:35 2016 -0400

Merge topic 'readability-named-parameter'

e7b842e1 Make sure unnused parameters are /*named*/


---

Summary of changes:
 Source/CPack/cmCPackArchiveGenerator.cxx   |2 +-
 Source/CPack/cpack.cxx |2 +-
 Source/CTest/cmCTestBZR.cxx|6 +-
 Source/CTest/cmCTestBuildAndTestHandler.cxx|5 +-
 Source/CTest/cmCTestCurl.cxx   |4 +-
 .../CTest/cmCTestEmptyBinaryDirectoryCommand.cxx   |2 +-
 Source/CTest/cmCTestHG.cxx |2 +-
 Source/CTest/cmCTestHandlerCommand.cxx |2 +-
 Source/CTest/cmCTestMemCheckHandler.cxx|2 +-
 Source/CTest/cmCTestReadCustomFilesCommand.cxx |2 +-
 Source/CTest/cmCTestRunScriptCommand.cxx   |2 +-
 Source/CTest/cmCTestSVN.cxx|2 +-
 Source/CTest/cmCTestScriptHandler.cxx  |   11 +-
 Source/CTest/cmCTestSleepCommand.cxx   |2 +-
 Source/CTest/cmCTestStartCommand.cxx   |2 +-
 Source/CTest/cmCTestSubmitHandler.cxx  |   10 +-
 Source/CTest/cmCTestTestHandler.cxx|   23 +--
 Source/CTest/cmCTestVC.cxx |2 +-
 Source/CTest/cmParseJacocoCoverage.cxx |2 +-
 Source/CursesDialog/ccmake.cxx |6 +-
 Source/CursesDialog/cmCursesBoolWidget.cxx |3 +-
 Source/CursesDialog/cmCursesDummyWidget.cxx|3 +-
 Source/CursesDialog/cmCursesLabelWidget.cxx|3 +-
 Source/CursesDialog/cmCursesLongMessageForm.cxx|3 +-
 Source/CursesDialog/cmCursesMainForm.cxx   |4 +-
 Source/CursesDialog/cmCursesOptionsWidget.cxx  |3 +-
 Source/CursesDialog/cmCursesStringWidget.cxx   |8 +-
 Source/cmArchiveWrite.cxx  |3 +-
 Source/cmDepends.cxx   |9 +-
 Source/cmDependsFortran.cxx|5 +-
 Source/cmDependsJava.cxx   |   10 +-
 Source/cmDynamicLoader.cxx |6 +-
 Source/cmELF.cxx   |8 +-
 Source/cmExportFileGenerator.cxx   |2 +-
 Source/cmExportInstallFileGenerator.cxx|2 +-
 Source/cmExternalMakefileProjectGenerator.cxx  |3 +-
 Source/cmExtraEclipseCDT4Generator.cxx |3 +-
 Source/cmExtraSublimeTextGenerator.cxx |3 +-
 Source/cmFortranParserImpl.cxx |2 +-
 Source/cmGeneratorExpressionDAGChecker.cxx |2 +-
 Source/cmGeneratorExpressionNode.cxx   |  177 +++-
 Source/cmGeneratorTarget.cxx   |   19 ++-
 Source/cmGlobalGenerator.cxx   |   21 ++-
 Source/cmLocalGenerator.cxx|9 +-
 Source/cmPolicies.cxx  |3 +-
 Source/cmScriptGenerator.cxx   |6 +-
 Source/cmSystemTools.cxx   |3 +-
 Source/cmXMLParser.cxx |2 +-
 Source/cmake.cxx   |5 +-
 Source/cmakemain.cxx   |4 +-
 Tests/CMakeLib/testGeneratedFileStream.cxx |2 +-
 Tests/CMakeLib/testSystemTools.cxx |2 +-
 Tests/CMakeLib/testUTF8.cxx|2 +-
 Tests/CMakeLib/testXMLParser.cxx   |2 +-
 Tests/CMakeLib/testXMLSafe.cxx |2 +-
 55 files changed, 245 insertions(+), 190 deletions(-)


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

[Cmake-commits] CMake branch, master, updated. v3.6.1-647-g29593b7

2016-08-17 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
   via  29593b79a236f9bd6653ed0ab87ae4f38f00 (commit)
   via  a2af850ba6dbee7797484ec5f6696525123023fc (commit)
  from  c700d11d259af9c00680321804669fadbe378a22 (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29593b79a236f9bd6653ed0ab87ae4f38f00
commit 29593b79a236f9bd6653ed0ab87ae4f38f00
Merge: c700d11 a2af850
Author: Brad King 
AuthorDate: Wed Aug 17 10:46:32 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 17 10:46:32 2016 -0400

Merge topic 'include-what-you-use'

a2af850b fix a batch of include-what-you-use violations


---

Summary of changes:
 Source/CursesDialog/cmCursesCacheEntryComposite.h |2 ++
 Source/cmCacheManager.h   |1 +
 Source/cmGhsMultiTargetGenerator.h|4 ++--
 Source/cmState.cxx|9 +
 Source/cmState.h  |   14 ++
 Source/cmSystemTools.h|5 -
 Source/cmTarget.cxx   |   12 
 Source/cmTarget.h |   21 -
 Source/cmTest.cxx |6 +++---
 Source/cmTest.h   |7 +--
 Source/cmTestGenerator.cxx|8 
 Source/cmTestGenerator.h  |8 +++-
 Source/cmUuid.cxx |4 ++--
 Source/cmUuid.h   |5 -
 Source/cmVariableWatch.cxx|2 ++
 Source/cmVariableWatch.h  |6 +-
 Source/cmVersion.cxx  |2 +-
 Source/cmVersion.h|2 +-
 Source/cmXMLParser.cxx|6 --
 Source/cmXMLParser.h  |4 +++-
 Source/cmXMLSafe.cxx  |2 --
 Source/cmXMLSafe.h|2 +-
 Source/cmXMLWriter.cxx|2 --
 Source/cmXMLWriter.h  |2 +-
 Source/cmcldeps.cxx   |1 +
 Tests/CMakeLib/run_compile_commands.cxx   |8 
 Tests/CMakeLib/testSystemTools.cxx|3 +++
 27 files changed, 107 insertions(+), 41 deletions(-)


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

[Cmake-commits] CMake branch, master, updated. v3.6.1-643-g5d16907

2016-08-17 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
   via  5d1690725bdbd5840e1188e9025121ac2f9878ed (commit)
   via  49ad7f9af84dd46e5527e6fefaa47d8bde748bca (commit)
   via  1d408dc10f492d060b8b9546c3ed3521d7051fd8 (commit)
  from  76ff725ae7a38b4044cc3d5dc6f8e76cbd6c20aa (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d1690725bdbd5840e1188e9025121ac2f9878ed
commit 5d1690725bdbd5840e1188e9025121ac2f9878ed
Merge: 76ff725 49ad7f9
Author: Brad King 
AuthorDate: Wed Aug 17 10:46:26 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 17 10:46:26 2016 -0400

Merge topic 'cmake-capabilities'

49ad7f9a cmake: Add `cmake -E capabilities` mode
1d408dc1 cmake: Constify cmake::GetRegisteredGenerators


---

Summary of changes:
 Help/manual/cmake.1.rst|   37 +
 Help/release/dev/cmake-capabilities.rst|6 ++
 Source/cmake.cxx   |   81 +++-
 Source/cmake.h |4 +-
 Source/cmcmd.cxx   |   12 +++
 .../E_capabilities-arg-result.txt} |0
 .../CommandLine/E_capabilities-arg-stderr.txt  |1 +
 .../RunCMake/CommandLine/E_capabilities-stdout.txt |1 +
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake  |2 +
 9 files changed, 142 insertions(+), 2 deletions(-)
 create mode 100644 Help/release/dev/cmake-capabilities.rst
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => 
CommandLine/E_capabilities-arg-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/E_capabilities-arg-stderr.txt
 create mode 100644 Tests/RunCMake/CommandLine/E_capabilities-stdout.txt


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

[Cmake-commits] CMake branch, master, updated. v3.6.1-640-g76ff725

2016-08-17 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
   via  76ff725ae7a38b4044cc3d5dc6f8e76cbd6c20aa (commit)
   via  ea51b71a4f76597ada400d8bdea75cc9548530a3 (commit)
   via  c18dc6fbe5b68312be52353aa0a493106584ffe7 (commit)
  from  65120d180b6e7658e296fd2c4c85a23f337c06dc (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76ff725ae7a38b4044cc3d5dc6f8e76cbd6c20aa
commit 76ff725ae7a38b4044cc3d5dc6f8e76cbd6c20aa
Merge: 65120d1 ea51b71
Author: Brad King 
AuthorDate: Wed Aug 17 10:46:23 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 17 10:46:23 2016 -0400

Merge topic 'cmake-developer-reference'

ea51b71a QtIFW: Developer Reference installation
c18dc6fb Added CMake_BUILD_DEVELOPER_REFERENCE option


---

Summary of changes:
 CMakeCPack.cmake   |   16 +-
 CMakeCPackOptions.cmake.in |   23 ++
 CMakeLists.txt |5 +
 Source/CMakeLists.txt  |9 +
 Source/QtDialog/CMakeSetup64.png   |  Bin 0 -> 7213 bytes
 ...tGUI.qs => CMake.DeveloperReference.HTML.qs.in} |6 +-
 Source/dir.dox |7 +
 Source/dir.dox.in  |7 +
 Utilities/Doxygen/CMakeLists.txt   |   92 +++-
 Utilities/Doxygen/DeveloperReference/mainpage.dox  |8 +
 Utilities/Doxygen/authors.txt  |   17 --
 Utilities/Doxygen/doc_makeall.sh.in|  248 
 Utilities/Doxygen/doxyfile.in  |   35 +--
 13 files changed, 177 insertions(+), 296 deletions(-)
 create mode 100644 Source/QtDialog/CMakeSetup64.png
 copy Source/QtIFW/{CMake.Dialogs.QtGUI.qs => 
CMake.DeveloperReference.HTML.qs.in} (76%)
 create mode 100644 Source/dir.dox
 create mode 100644 Source/dir.dox.in
 create mode 100644 Utilities/Doxygen/DeveloperReference/mainpage.dox
 delete mode 100644 Utilities/Doxygen/authors.txt
 delete mode 100755 Utilities/Doxygen/doc_makeall.sh.in


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

[Cmake-commits] CMake branch, next, updated. v3.6.1-1284-gc541113

2016-08-17 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  c541113797bcb0da4a9fbfdde8e7eb72d609a005 (commit)
   via  6138f98f924c11df5ca309861930f564a0fd5fea (commit)
  from  644cdf712be93436cbd3401d72852f5d4bdb0e2a (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c541113797bcb0da4a9fbfdde8e7eb72d609a005
commit c541113797bcb0da4a9fbfdde8e7eb72d609a005
Merge: 644cdf7 6138f98
Author: Brad King 
AuthorDate: Wed Aug 17 09:40:43 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 17 09:40:43 2016 -0400

Merge topic 'process-output-encoding' into next

6138f98f Revert "Windows: Encode child process output to internally-used 
encoding"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6138f98f924c11df5ca309861930f564a0fd5fea
commit 6138f98f924c11df5ca309861930f564a0fd5fea
Author: Brad King 
AuthorDate: Wed Aug 17 09:40:20 2016 -0400
Commit: Brad King 
CommitDate: Wed Aug 17 09:40:20 2016 -0400

Revert "Windows: Encode child process output to internally-used encoding"

This reverts commit 12924660b9881d24b60ff13da840d7312fa0486f.
It causes the CTest.UpdateGIT test to fail and so will need to
be revised.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 580c3eb..cdc8fb1 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -317,8 +317,6 @@ set(SRCS
   cmOrderDirectories.h
   cmPolicies.h
   cmPolicies.cxx
-  cmProcessOutput.cxx
-  cmProcessOutput.hxx
   cmProcessTools.cxx
   cmProcessTools.h
   cmProperty.cxx
@@ -377,9 +375,6 @@ set(SRCS
   cm_utf8.c
   )
 
-SET_PROPERTY(SOURCE cmProcessOutput.cxx APPEND PROPERTY COMPILE_DEFINITIONS
-  KWSYS_ENCODING_DEFAULT_CODEPAGE=${KWSYS_ENCODING_DEFAULT_CODEPAGE})
-
 set(COMMAND_INCLUDES "#include \"cmTargetPropCommandBase.cxx\"\n")
 list(APPEND SRCS cmTargetPropCommandBase.cxx)
 set_property(SOURCE cmTargetPropCommandBase.cxx PROPERTY HEADER_FILE_ONLY ON)
diff --git a/Source/cmExecProgramCommand.cxx b/Source/cmExecProgramCommand.cxx
index 4391a19..58bbc31 100644
--- a/Source/cmExecProgramCommand.cxx
+++ b/Source/cmExecProgramCommand.cxx
@@ -11,7 +11,6 @@
 */
 #include "cmExecProgramCommand.h"
 
-#include "cmProcessOutput.hxx"
 #include "cmSystemTools.h"
 
 #include 
@@ -220,7 +219,6 @@ bool cmExecProgramCommand::RunCommand(const char* command, 
std::string& output,
   int length;
   char* data;
   int p;
-  cmProcessOutput processOutput;
   while ((p = cmsysProcess_WaitForData(cp, &data, &length, CM_NULLPTR), p)) {
 if (p == cmsysProcess_Pipe_STDOUT || p == cmsysProcess_Pipe_STDERR) {
   if (verbose) {
@@ -232,7 +230,6 @@ bool cmExecProgramCommand::RunCommand(const char* command, 
std::string& output,
 
   // All output has been read.  Wait for the process to exit.
   cmsysProcess_WaitForExit(cp, CM_NULLPTR);
-  processOutput.DecodeText(output, output);
 
   // Check the result of running the process.
   std::string msg;
diff --git a/Source/cmExecuteProcessCommand.cxx 
b/Source/cmExecuteProcessCommand.cxx
index 1ffb163..d97b25f 100644
--- a/Source/cmExecuteProcessCommand.cxx
+++ b/Source/cmExecuteProcessCommand.cxx
@@ -11,7 +11,6 @@
 */
 #include "cmExecuteProcessCommand.h"
 
-#include "cmProcessOutput.hxx"
 #include "cmSystemTools.h"
 
 #include 
@@ -229,21 +228,17 @@ bool 
cmExecuteProcessCommand::InitialPass(std::vector const& args,
   int length;
   char* data;
   int p;
-  cmProcessOutput processOutput;
-  std::string strdata;
   while ((p = cmsysProcess_WaitForData(cp, &data, &length, CM_NULLPTR), p)) {
 // Put the output in the right place.
 if (p == cmsysProcess_Pipe_STDOUT && !output_quiet) {
   if (output_variable.empty()) {
-processOutput.DecodeText(data, length, strdata, 1);
-cmSystemTools::Stdout(strdata.c_str(), strdata.size());
+cmSystemTools::Stdout(data, length);
   } else {
 cmExecuteProcessCommandAppend(tempOutput, data, length);
   }
 } else if (p == cmsysProcess_Pipe_STDERR && !error_quiet) {
   if (error_variable.empty()) {
-processOutput.DecodeText(data, length, strdata, 2);
-cmSystemTools::Stderr(strdata.c_str(), strdata.size());
+cmSystemTools::Stderr(data, length);
   } else {
 cmExecuteProcessCommandAppend(tempError, data, length);
   }
@@ -252,8 +247,6 @@ bool 
cmExecuteProcessCommand::InitialPass(std::vector const& args,
 
   // All output has been read.  Wait for the process to exit.
   cmsysProcess_WaitForExit(

[Cmake-commits] CMake branch, next, updated. v3.6.1-1282-g644cdf7

2016-08-17 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  644cdf712be93436cbd3401d72852f5d4bdb0e2a (commit)
   via  12924660b9881d24b60ff13da840d7312fa0486f (commit)
  from  2b7105307a5d47cf29bf03d1d1bcc21b16b476bd (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=644cdf712be93436cbd3401d72852f5d4bdb0e2a
commit 644cdf712be93436cbd3401d72852f5d4bdb0e2a
Merge: 2b71053 1292466
Author: Brad King 
AuthorDate: Wed Aug 17 09:32:46 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 17 09:32:46 2016 -0400

Merge topic 'process-output-encoding' into next

12924660 Windows: Encode child process output to internally-used encoding


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12924660b9881d24b60ff13da840d7312fa0486f
commit 12924660b9881d24b60ff13da840d7312fa0486f
Author: Dāvis Mosāns 
AuthorDate: Mon Aug 15 23:34:21 2016 +0300
Commit: Brad King 
CommitDate: Wed Aug 17 09:32:23 2016 -0400

Windows: Encode child process output to internally-used encoding

Typically Windows applications (eg. MSVC compiler) use current console's
codepage for output to pipes so we need to encode that to our
internally-used encoding (`KWSYS_ENCODING_DEFAULT_CODEPAGE`).

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index cdc8fb1..580c3eb 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -317,6 +317,8 @@ set(SRCS
   cmOrderDirectories.h
   cmPolicies.h
   cmPolicies.cxx
+  cmProcessOutput.cxx
+  cmProcessOutput.hxx
   cmProcessTools.cxx
   cmProcessTools.h
   cmProperty.cxx
@@ -375,6 +377,9 @@ set(SRCS
   cm_utf8.c
   )
 
+SET_PROPERTY(SOURCE cmProcessOutput.cxx APPEND PROPERTY COMPILE_DEFINITIONS
+  KWSYS_ENCODING_DEFAULT_CODEPAGE=${KWSYS_ENCODING_DEFAULT_CODEPAGE})
+
 set(COMMAND_INCLUDES "#include \"cmTargetPropCommandBase.cxx\"\n")
 list(APPEND SRCS cmTargetPropCommandBase.cxx)
 set_property(SOURCE cmTargetPropCommandBase.cxx PROPERTY HEADER_FILE_ONLY ON)
diff --git a/Source/cmExecProgramCommand.cxx b/Source/cmExecProgramCommand.cxx
index 58bbc31..4391a19 100644
--- a/Source/cmExecProgramCommand.cxx
+++ b/Source/cmExecProgramCommand.cxx
@@ -11,6 +11,7 @@
 */
 #include "cmExecProgramCommand.h"
 
+#include "cmProcessOutput.hxx"
 #include "cmSystemTools.h"
 
 #include 
@@ -219,6 +220,7 @@ bool cmExecProgramCommand::RunCommand(const char* command, 
std::string& output,
   int length;
   char* data;
   int p;
+  cmProcessOutput processOutput;
   while ((p = cmsysProcess_WaitForData(cp, &data, &length, CM_NULLPTR), p)) {
 if (p == cmsysProcess_Pipe_STDOUT || p == cmsysProcess_Pipe_STDERR) {
   if (verbose) {
@@ -230,6 +232,7 @@ bool cmExecProgramCommand::RunCommand(const char* command, 
std::string& output,
 
   // All output has been read.  Wait for the process to exit.
   cmsysProcess_WaitForExit(cp, CM_NULLPTR);
+  processOutput.DecodeText(output, output);
 
   // Check the result of running the process.
   std::string msg;
diff --git a/Source/cmExecuteProcessCommand.cxx 
b/Source/cmExecuteProcessCommand.cxx
index d97b25f..1ffb163 100644
--- a/Source/cmExecuteProcessCommand.cxx
+++ b/Source/cmExecuteProcessCommand.cxx
@@ -11,6 +11,7 @@
 */
 #include "cmExecuteProcessCommand.h"
 
+#include "cmProcessOutput.hxx"
 #include "cmSystemTools.h"
 
 #include 
@@ -228,17 +229,21 @@ bool 
cmExecuteProcessCommand::InitialPass(std::vector const& args,
   int length;
   char* data;
   int p;
+  cmProcessOutput processOutput;
+  std::string strdata;
   while ((p = cmsysProcess_WaitForData(cp, &data, &length, CM_NULLPTR), p)) {
 // Put the output in the right place.
 if (p == cmsysProcess_Pipe_STDOUT && !output_quiet) {
   if (output_variable.empty()) {
-cmSystemTools::Stdout(data, length);
+processOutput.DecodeText(data, length, strdata, 1);
+cmSystemTools::Stdout(strdata.c_str(), strdata.size());
   } else {
 cmExecuteProcessCommandAppend(tempOutput, data, length);
   }
 } else if (p == cmsysProcess_Pipe_STDERR && !error_quiet) {
   if (error_variable.empty()) {
-cmSystemTools::Stderr(data, length);
+processOutput.DecodeText(data, length, strdata, 2);
+cmSystemTools::Stderr(strdata.c_str(), strdata.size());
   } else {
 cmExecuteProcessCommandAppend(tempError, data, length);
   }
@@ -247,6 +252,8 @@ bool 
cmExecuteProcessCommand::InitialPass(std::vector const& args,
 
   // All output has been read.  Wait for the p

[Cmake-commits] CMake branch, next, updated. v3.6.1-1280-g2b71053

2016-08-17 Thread Brad King 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  2b7105307a5d47cf29bf03d1d1bcc21b16b476bd (commit)
   via  10792e106aac2e5e3675c96b943818541620aa7c (commit)
  from  662661b2b462946f8ba6c82af22f014a18619756 (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b7105307a5d47cf29bf03d1d1bcc21b16b476bd
commit 2b7105307a5d47cf29bf03d1d1bcc21b16b476bd
Merge: 662661b 10792e1
Author: Brad King 
AuthorDate: Wed Aug 17 09:02:52 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Aug 17 09:02:52 2016 -0400

Merge topic 'process-output-encoding' into next

10792e10 fixup! Windows: Encode child process output to internally-used 
encoding


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10792e106aac2e5e3675c96b943818541620aa7c
commit 10792e106aac2e5e3675c96b943818541620aa7c
Author: Brad King 
AuthorDate: Wed Aug 17 08:57:15 2016 -0400
Commit: Brad King 
CommitDate: Wed Aug 17 08:57:15 2016 -0400

fixup! Windows: Encode child process output to internally-used encoding

diff --git a/Source/cmProcessOutput.hxx b/Source/cmProcessOutput.hxx
index c896720..daffad1 100644
--- a/Source/cmProcessOutput.hxx
+++ b/Source/cmProcessOutput.hxx
@@ -31,10 +31,10 @@ public:
   size_t id = 0);
 
 private:
+#if defined(_WIN32)
   unsigned int codepage;
   unsigned int bufferSize;
   std::vector rawparts;
-#if defined(_WIN32)
   bool DoDecodeText(std::string raw, std::string& decoded, wchar_t* lastChar);
 #endif
 };

---

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


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