diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-17 11:52:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-04-17 11:52:19 (GMT) |
| commit | d1d43a6dbf41b3f9841e96c01c7894b050db0cf2 (patch) | |
| tree | 77be738b341a452b98fe99cd9a74baa33953d6d7 | |
| parent | 054c849112150452538a1ef7db5b423c5816bca0 (diff) | |
| parent | bbf64794ace7c8a8093d8a42d9d01375e1ab50d6 (diff) | |
| download | CMake-d1d43a6dbf41b3f9841e96c01c7894b050db0cf2.zip CMake-d1d43a6dbf41b3f9841e96c01c7894b050db0cf2.tar.gz CMake-d1d43a6dbf41b3f9841e96c01c7894b050db0cf2.tar.bz2 | |
Merge branch 'bootstrap_system_libuv_option' into release-3.11
Merge-request: !1971
| -rwxr-xr-x | bootstrap | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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" ;; |