[Cmake-commits] CMake branch, master, updated. v3.11.0-534-g886d813

[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  886d813b479329023117a5b2022f717c7f6aa64a (commit)
       via  bbf64794ace7c8a8093d8a42d9d01375e1ab50d6 (commit)
      from  8c2d87dc01c0e2ed7749b5d104f4e4de7b9e5339 (commit)

Those revisions listed 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=886d813b479329023117a5b2022f717c7f6aa64a
commit 886d813b479329023117a5b2022f717c7f6aa64a
Merge: 8c2d87d bbf6479
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 17 11:53:08 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 17 07:53:16 2018 -0400

    Merge topic 'bootstrap_system_libuv_option'
    
    bbf64794ac bootstrap: Add option to enable/disable usage of system libuv
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1971


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bbf64794ace7c8a8093d8a42d9d01375e1ab50d6
commit bbf64794ace7c8a8093d8a42d9d01375e1ab50d6
Author:     Kirill Erofeev <erofeev.info at gmail.com>
AuthorDate: Tue Apr 17 01:56:14 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 17 07:44:01 2018 -0400

    bootstrap: Add option to enable/disable usage of system libuv

diff --git a/bootstrap b/bootstrap
index 0bee6c5..07552a1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -569,6 +569,8 @@ Configuration:
   --no-system-libarchive  use cmake-provided libarchive library (default)
   --system-librhash       use system-installed librhash library
   --no-system-librhash    use cmake-provided librhash library (default)
+  --system-libuv          use system-installed libuv library
+  --no-system-libuv       use cmake-provided libuv library (default)
 
   --qt-gui                build the Qt-based GUI (requires Qt >= 4.2)
   --no-qt-gui             do not build the Qt-based GUI (default)
@@ -803,10 +805,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-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma)
+  --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-libuv)
     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-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma)
+  --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-libuv)
     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" ;;

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

Summary of changes:
 bootstrap |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake