diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-17 11:53:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-04-17 11:53:16 (GMT) |
| commit | 886d813b479329023117a5b2022f717c7f6aa64a (patch) | |
| tree | e87fb08c55528c9ab2be00ee91fe4cf804500588 /bootstrap | |
| parent | 8c2d87dc01c0e2ed7749b5d104f4e4de7b9e5339 (diff) | |
| parent | bbf64794ace7c8a8093d8a42d9d01375e1ab50d6 (diff) | |
| download | CMake-886d813b479329023117a5b2022f717c7f6aa64a.zip CMake-886d813b479329023117a5b2022f717c7f6aa64a.tar.gz CMake-886d813b479329023117a5b2022f717c7f6aa64a.tar.bz2 | |
Merge topic 'bootstrap_system_libuv_option'
bbf64794ac bootstrap: Add option to enable/disable usage of system libuv
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1971
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -571,6 +571,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) @@ -805,10 +807,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" ;; |