2015-03-16 11:26:41 +01:00
|
|
|
--- cmake-3.2.1/bootstrap 2015-03-10 15:38:46.000000000 +0100
|
|
|
|
+++ cmake-3.2.1/bootstrap.old 2015-03-15 11:57:31.067275055 +0100
|
|
|
|
@@ -639,10 +639,10 @@
|
2015-02-16 12:01:37 +01:00
|
|
|
--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" ;;
|
2015-03-16 11:26:41 +01:00
|
|
|
- --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-zlib)
|
2015-02-16 12:01:37 +01:00
|
|
|
+ --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" ;;
|
2015-03-16 11:26:41 +01:00
|
|
|
- --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-zlib)
|
2015-02-16 12:01:37 +01:00
|
|
|
+ --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" ;;
|