[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-158-gf90c7ba

[Chuck Atkins]

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

The branch, next has been updated
       via  f90c7ba54f1a9a61e930292207d3387df40b2dad (commit)
       via  495f92446a6e663be39a742721bb18e7fb1d9c14 (commit)
       via  d1c1db6360cacdcce9fc48c51fb7809f2711e62b (commit)
      from  c8a45332313cac5acc6661f8bcf4993d1fb81b49 (commit)

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

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f90c7ba54f1a9a61e930292207d3387df40b2dad
commit f90c7ba54f1a9a61e930292207d3387df40b2dad
Merge: c8a4533 495f924
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Thu Oct 6 15:45:56 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 6 15:45:56 2016 -0400

    Merge topic 'check-libuv-minimum-version' into next
    
    495f9244 Set minimum version for LibUV to 1.0.0
    d1c1db63 Use find_package for JsonCpp and LibUV instead of include


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=495f92446a6e663be39a742721bb18e7fb1d9c14
commit 495f92446a6e663be39a742721bb18e7fb1d9c14
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Wed Oct 5 10:20:28 2016 -0400
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Wed Oct 5 10:20:28 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=d1c1db6360cacdcce9fc48c51fb7809f2711e62b
commit d1c1db6360cacdcce9fc48c51fb7809f2711e62b
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Wed Oct 5 10:19:55 2016 -0400
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Wed Oct 5 10:19:55 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:
 CMakeLists.txt |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake