16 lines
1.2 KiB
Diff
16 lines
1.2 KiB
Diff
|
--- cmake-3.2.0-rc1/bootstrap.old 2015-02-13 15:25:48.000000000 +0100
|
||
|
|
+++ cmake-3.2.0-rc1/bootstrap 2015-02-14 03:52:26.509047998 +0100
|
||
|
|
@@ -637,10 +637,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-form|--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-form|--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" ;;
|