[Cmake-commits] CMake branch, next, updated. v3.6.1-1487-gc3bcd01

[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  c3bcd014a7452256dcbf738d753944a8d7ed3d78 (commit)
       via  87ff791424b715b1edd31c45b834fddf92a38646 (commit)
       via  fd22d5bb476eac37896bfc43cdd4bfa4bdd4fae5 (commit)
      from  795c4172d8c78c66cf56e1728543967d0f81226c (commit)

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

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3bcd014a7452256dcbf738d753944a8d7ed3d78
commit c3bcd014a7452256dcbf738d753944a8d7ed3d78
Merge: 795c417 87ff791
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 26 09:21:11 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 26 09:21:11 2016 -0400

    Merge topic 'import-libuv' into next
    
    87ff7914 fixup! libuv: Disable warnings to avoid changing 3rd party code
    fd22d5bb libuv: Fix unused variable warning in uv_loop_close


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87ff791424b715b1edd31c45b834fddf92a38646
commit 87ff791424b715b1edd31c45b834fddf92a38646
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 26 09:19:38 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 26 09:19:38 2016 -0400

    fixup! libuv: Disable warnings to avoid changing 3rd party code

diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt
index 599f3f7..e25ac82 100644
--- a/Utilities/cmlibuv/CMakeLists.txt
+++ b/Utilities/cmlibuv/CMakeLists.txt
@@ -1,11 +1,11 @@
 project(libuv C)
 
 # Disable warnings to avoid changing 3rd party code.
-if(CMAKE_CXX_COMPILER_ID MATCHES
+if(CMAKE_C_COMPILER_ID MATCHES
     "^(GNU|Clang|AppleClang|XL|VisualAge|SunPro|MIPSpro|HP|Intel)$")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "PathScale")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -woffall")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
+elseif(CMAKE_C_COMPILER_ID STREQUAL "PathScale")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall")
 endif()
 
 find_package(Threads)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd22d5bb476eac37896bfc43cdd4bfa4bdd4fae5
commit fd22d5bb476eac37896bfc43cdd4bfa4bdd4fae5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 26 09:16:45 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 26 09:16:45 2016 -0400

    libuv: Fix unused variable warning in uv_loop_close

diff --git a/Utilities/cmlibuv/src/uv-common.c b/Utilities/cmlibuv/src/uv-common.c
index 434a502..46d9546 100644
--- a/Utilities/cmlibuv/src/uv-common.c
+++ b/Utilities/cmlibuv/src/uv-common.c
@@ -613,7 +613,9 @@ uv_loop_t* uv_loop_new(void) {
 int uv_loop_close(uv_loop_t* loop) {
   QUEUE* q;
   uv_handle_t* h;
+#ifndef NDEBUG
   void* saved_data;
+#endif
 
   if (!QUEUE_EMPTY(&(loop)->active_reqs))
     return UV_EBUSY;

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

Summary of changes:
 Utilities/cmlibuv/CMakeLists.txt  |    8 ++++----
 Utilities/cmlibuv/src/uv-common.c |    2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake