This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 0a9d80385666d819587a5761d0a1f4a9f9e1edfa (commit)
via 7a37afa7e709bb1134ad7fb058195bc85f261b87 (commit)
from 021378efed47f005d8b20c3d56487d68982919fe (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a9d80385666d819587a5761d0a1f4a9f9e1edfa
commit 0a9d80385666d819587a5761d0a1f4a9f9e1edfa
Merge: 021378e 7a37afa
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 13 14:30:47 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jan 13 14:30:47 2016 -0500
Merge topic 'bootstap-system-liblzma' into next
7a37afa7 bootstrap: Add option to build with system liblzma (#15916)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a37afa7e709bb1134ad7fb058195bc85f261b87
commit 7a37afa7e709bb1134ad7fb058195bc85f261b87
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 13 14:27:02 2016 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jan 13 14:28:02 2016 -0500
bootstrap: Add option to build with system liblzma (#15916)
diff --git a/bootstrap b/bootstrap
index d1274c1..b3f06a1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -404,6 +404,8 @@ Configuration:
--no-system-zlib use cmake-provided zlib library (default)
--system-bzip2 use system-installed bzip2 library
--no-system-bzip2 use cmake-provided bzip2 library (default)
+ --system-liblzma use system-installed liblzma library
+ --no-system-liblzma use cmake-provided liblzma library (default)
--system-libarchive use system-installed libarchive library
--no-system-libarchive use cmake-provided libarchive library (default)
@@ -632,10 +634,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-zlib)
+
--system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-zlib|--system-liblzma)
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-zlib)
+
--no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-zlib|--no-system-liblzma)
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" ;;
-----------------------------------------------------------------------
Summary of changes:
bootstrap | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
