[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-186-ge9b966c

[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  e9b966cea5838d928a1b67af26e693d77e3f259e (commit)
       via  20e8dcf162b9963c9ff195525bc433df2bc2de2a (commit)
       via  845b98f45b09b399f914d9df3c6a6008d7558b1b (commit)
      from  5ac03f5aa179b96f3f849d584caba3e4fb7a0c13 (commit)

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

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9b966cea5838d928a1b67af26e693d77e3f259e
commit e9b966cea5838d928a1b67af26e693d77e3f259e
Merge: 5ac03f5 20e8dcf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 7 09:08:23 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 7 09:08:23 2016 -0400

    Merge topic 'check-libuv-minimum-version' into next
    
    20e8dcf1 Set minimum version for LibUV to 1.0.0
    845b98f4 Use find_package for JsonCpp and LibUV instead of include


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20e8dcf162b9963c9ff195525bc433df2bc2de2a
commit 20e8dcf162b9963c9ff195525bc433df2bc2de2a
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Wed Oct 5 10:20:28 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 7 09:07:32 2016 -0400

    Set minimum version for LibUV to 1.0.0
    
    Older versions of libuv did not have the uv_loop_close API.  It first
    showed up in unstable releases ~ v0.11.20 but was not available in
    a stable release until v1.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bafca23..b4a577c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -491,7 +491,7 @@ int main(void) { return 0; }
   if(CMAKE_USE_LIBUV)
     if(CMAKE_USE_SYSTEM_LIBUV)
       if(NOT CMAKE_VERSION VERSION_LESS 3.0)
-        find_package(LibUV)
+        find_package(LibUV 1.0.0)
       else()
         message(FATAL_ERROR "CMAKE_USE_SYSTEM_LIBUV requires CMake >= 3.0")
       endif()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=845b98f45b09b399f914d9df3c6a6008d7558b1b
commit 845b98f45b09b399f914d9df3c6a6008d7558b1b
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Wed Oct 5 10:19:55 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 7 09:07:32 2016 -0400

    Use find_package for JsonCpp and LibUV instead of include

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 309e224..bafca23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,10 @@ if(POLICY CMP0053)
 endif()
 project(CMake)
 
+# Make sure we can find internal find_package modules only used for
+# building CMake and not for shipping externally
+list(INSERT CMAKE_MODULE_PATH 0 ${CMake_SOURCE_DIR}/Source/Modules)
+
 if(CMAKE_BOOTSTRAP)
   # Running from bootstrap script.  Set local variable and remove from cache.
   set(CMAKE_BOOTSTRAP 1)
@@ -441,7 +445,7 @@ macro (CMAKE_BUILD_UTILITIES)
   # Build jsoncpp library.
   if(CMAKE_USE_SYSTEM_JSONCPP)
     if(NOT CMAKE_VERSION VERSION_LESS 3.0)
-      include(${CMake_SOURCE_DIR}/Source/Modules/FindJsonCpp.cmake)
+      find_package(JsonCpp)
     else()
       message(FATAL_ERROR "CMAKE_USE_SYSTEM_JSONCPP requires CMake >= 3.0")
     endif()
@@ -487,7 +491,7 @@ int main(void) { return 0; }
   if(CMAKE_USE_LIBUV)
     if(CMAKE_USE_SYSTEM_LIBUV)
       if(NOT CMAKE_VERSION VERSION_LESS 3.0)
-        include(${CMake_SOURCE_DIR}/Source/Modules/FindLibUV.cmake)
+        find_package(LibUV)
       else()
         message(FATAL_ERROR "CMAKE_USE_SYSTEM_LIBUV requires CMake >= 3.0")
       endif()

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

Summary of changes:


hooks/post-receive
-- 
CMake