summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-20 08:28:03 -0500
committerBrad King <brad.king@kitware.com>2015-02-20 08:28:03 -0500
commita41d621d30f73d4a17e4fd2d3ff30f87f1ed4ccc (patch)
treee54a7b8e7b95b5e4570853c8783faf43f957ba3b /bootstrap
parenta5768442636c7fe909e8afc205fd19ac13b9fbc2 (diff)
downloadcmake-a41d621d30f73d4a17e4fd2d3ff30f87f1ed4ccc.tar.gz
bootstrap: Add --(no-)system-jsoncpp options
Provide bootstrap-time control for using a system JsonCpp library.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap6
1 files changed, 4 insertions, 2 deletions
diff --git a/bootstrap b/bootstrap
index e7d0496d2c..5f12ee00f5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -398,6 +398,8 @@ Configuration:
--no-system-curl use cmake-provided curl library (default)
--system-expat use system-installed expat library
--no-system-expat use cmake-provided expat library (default)
+ --system-jsoncpp use system-installed jsoncpp library
+ --no-system-jsoncpp use cmake-provided jsoncpp library (default)
--system-zlib use system-installed zlib library
--no-system-zlib use cmake-provided zlib library (default)
--system-bzip2 use system-installed bzip2 library
@@ -637,10 +639,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-libarchive|--system-zlib)
+ --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-zlib)
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-libarchive|--no-system-zlib)
+ --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-zlib)
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" ;;