diff options
| author | Brad King <brad.king@kitware.com> | 2023-06-09 13:58:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-06-09 13:59:17 (GMT) |
| commit | bebb2abb4b8e622df08e69dd6ff31117bd5209e8 (patch) | |
| tree | cddd13b83ea8fd5ba34c4188f487c2053005dc9e | |
| parent | 5741965586d77838d12c089b59bdd9f9d063fa1d (diff) | |
| parent | e4a9227360495e797770c5819b62ce0b87f59d11 (diff) | |
| download | CMake-bebb2abb4b8e622df08e69dd6ff31117bd5209e8.zip CMake-bebb2abb4b8e622df08e69dd6ff31117bd5209e8.tar.gz CMake-bebb2abb4b8e622df08e69dd6ff31117bd5209e8.tar.bz2 | |
Merge topic 'bootstrap-system-cppdap' into release-3.27
e4a9227360 bootstrap: Add --(no-)system-cppdap configuration switch
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8550
| -rwxr-xr-x | bootstrap | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -667,6 +667,8 @@ Configuration: (for use only by package maintainers) --no-system-libs use all cmake-provided third-party libraries (default) + --system-cppdap use system-installed cppdap library + --no-system-cppdap use cmake-provided cppdap library (default) --system-curl use system-installed curl library --no-system-curl use cmake-provided curl library (default) --system-expat use system-installed expat library @@ -954,10 +956,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-nghttp2|--system-zstd|--system-libuv) + --system-bzip2|--system-cppdap|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-nghttp2|--system-zstd|--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-nghttp2|--no-system-zstd|--no-system-libuv) + --no-system-bzip2|--no-system-cppdap|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-nghttp2|--no-system-zstd|--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" ;; --bootstrap-system-libuv) bootstrap_system_libuv="1" ;; |