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 26cfacf8f152ebc498269907b4783260003752ff (commit) via c19868b25699cde616529dffec5bb006fd68558d (commit) via f39e82c9d5b2d8fe46da8c5d422fb9db550d3626 (commit) via dbf05f75c3406a03fc912d3d90949972f2bcfd07 (commit) from f4ff8598071cf7a38480dbeac433d79b1b292637 (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 ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26cfacf8f152ebc498269907b4783260003752ff commit 26cfacf8f152ebc498269907b4783260003752ff Merge: f4ff859 c19868b Author: Brad King <brad.k...@kitware.com> AuthorDate: Mon Jan 9 14:49:50 2012 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Jan 9 14:49:50 2012 -0500 Merge topic 'bootstrap-options' into next c19868b bootstrap: Forward options after '--' to cmake f39e82c bootstrap: Re-implement command line option processing dbf05f7 bootstrap: Update copyright year in version report http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c19868b25699cde616529dffec5bb006fd68558d commit c19868b25699cde616529dffec5bb006fd68558d Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Dec 16 11:29:26 2011 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Fri Dec 16 11:33:24 2011 -0500 bootstrap: Forward options after '--' to cmake Provide an interface simpler than --init= to set cache values during bootstrap builds. For example: ./bootstrap --system-zlib -- -DZLIB_ROOT=/opt/zlib will configure CMake with a system zlib library and initialize ZLIB_ROOT in the cache for use by FindZLIB. diff --git a/bootstrap b/bootstrap index 0ad212b..f5eacbd 100755 --- a/bootstrap +++ b/bootstrap @@ -296,7 +296,7 @@ KWSYS_IOS_FILES=" cmake_usage() { echo ' -Usage: '"$0"' [options] +Usage: '"$0"' [<options>...] [-- <cmake-options>...] Options: [defaults in brackets after descriptions] Configuration: --help print this message @@ -552,6 +552,7 @@ while test $# != 0; do --version) cmake_version_display ; exit 2 ;; --verbose) cmake_verbose=TRUE ;; --enable-ccache) cmake_ccache_enabled=TRUE ;; + --) shift; break ;; *) die "Unknown option: $1" ;; esac shift @@ -1504,7 +1505,7 @@ cmake_options="-DCMAKE_BOOTSTRAP=1" if [ -n "${cmake_verbose}" ]; then cmake_options="${cmake_options} -DCMAKE_VERBOSE_MAKEFILE=1" fi -"${cmake_bootstrap_dir}/cmake" "${cmake_source_dir}" "-C${cmake_bootstrap_dir}/InitialCacheFlags.cmake" "-G${cmake_bootstrap_generator}" ${cmake_options} ${cmake_bootstrap_system_libs} +"${cmake_bootstrap_dir}/cmake" "${cmake_source_dir}" "-C${cmake_bootstrap_dir}/InitialCacheFlags.cmake" "-G${cmake_bootstrap_generator}" ${cmake_options} ${cmake_bootstrap_system_libs} "$@" RES=$? if [ "${RES}" -ne "0" ]; then cmake_error 11 "Problem while running initial CMake" http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f39e82c9d5b2d8fe46da8c5d422fb9db550d3626 commit f39e82c9d5b2d8fe46da8c5d422fb9db550d3626 Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Dec 16 10:56:47 2011 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Fri Dec 16 11:32:45 2011 -0500 bootstrap: Re-implement command line option processing Use POSIX shell features to shorten and simplify bootstrap command-line option processing. diff --git a/bootstrap b/bootstrap index 1431c3f..0ad212b 100755 --- a/bootstrap +++ b/bootstrap @@ -11,6 +11,10 @@ # See the License for more information. #============================================================================= +die() { + echo "$@" 1>&2 ; exit 1 +} + # Version number extraction function. cmake_version_component() { @@ -527,63 +531,30 @@ cmake_verbose= cmake_parallel_make= cmake_ccache_enabled= cmake_prefix_dir="${cmake_default_prefix}" -for a in "$@"; do - if echo $a | grep "^--prefix=" > /dev/null 2> /dev/null; then - cmake_prefix_dir=`echo $a | sed "s/^--prefix=//"` - cmake_prefix_dir=`cmake_fix_slashes "${cmake_prefix_dir}"` - fi - if echo $a | grep "^--parallel=" > /dev/null 2> /dev/null; then - cmake_parallel_make=`echo $a | sed "s/^--parallel=//" | grep "[0-9][0-9]*"` - fi - if echo $a | grep "^--datadir=" > /dev/null 2> /dev/null; then - cmake_data_dir=`echo $a | sed "s/^--datadir=//"` - fi - if echo $a | grep "^--docdir=" > /dev/null 2> /dev/null; then - cmake_doc_dir=`echo $a | sed "s/^--docdir=//"` - fi - if echo $a | grep "^--mandir=" > /dev/null 2> /dev/null; then - cmake_man_dir=`echo $a | sed "s/^--mandir=//"` - fi - if echo $a | grep "^--init=" > /dev/null 2> /dev/null; then - cmake_init_file=`echo $a | sed "s/^--init=//"` - fi - for lib in bzip2 curl expat libarchive zlib; do - if echo $a | grep "^--system-${lib}" > /dev/null 2> /dev/null; then - cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper ${lib}`=1" - break - elif echo $a | grep "^--no-system-${lib}" > /dev/null 2> /dev/null; then - cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper ${lib}`=0" - break - fi - done - if echo $a | grep "^--system-libs" > /dev/null 2> /dev/null; then - cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=1" - fi - if echo $a | grep "^--no-system-libs" > /dev/null 2> /dev/null; then - cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=0" - fi - if echo $a | grep "^--qt-gui" > /dev/null 2> /dev/null; then - cmake_bootstrap_qt_gui="1" - fi - if echo $a | grep "^--no-qt-gui" > /dev/null 2> /dev/null; then - cmake_bootstrap_qt_gui="0" - fi - if echo $a | grep "^--qt-qmake=" > /dev/null 2> /dev/null; then - cmake_bootstrap_qt_qmake=`echo $a | sed "s/^--qt-qmake=//"` - fi - if echo $a | grep "^--help" > /dev/null 2> /dev/null; then - cmake_usage - fi - if echo $a | grep "^--version" > /dev/null 2> /dev/null; then - cmake_version_display - exit 2 - fi - if echo $a | grep "^--verbose" > /dev/null 2> /dev/null; then - cmake_verbose=TRUE - fi - if echo $a | grep "^--enable-ccache" > /dev/null 2> /dev/null; then - cmake_ccache_enabled=TRUE - fi +while test $# != 0; do + case "$1" in + --prefix=*) cmake_prefix_dir=`cmake_fix_slashes "${1#*=}"` ;; + --parallel=*) cmake_parallel_make="${1#*=}" ;; + --datadir=*) cmake_data_dir="${1#*=}" ;; + --docdir=*) cmake_doc_dir="${1#*=}" ;; + --mandir=*) cmake_man_dir="${1#*=}" ;; + --init=*) cmake_init_file="${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) + cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper ${1#--system-}`=1" ;; + --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-libarchive|--no-system-zlib) + cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper ${1#--no-system-}`=0" ;; + --qt-gui) cmake_bootstrap_qt_gui="1" ;; + --no-qt-gui) cmake_bootstrap_qt_gui="0" ;; + --qt-qmake=*) cmake_bootstrap_qt_qmake="${1#*=}" ;; + --help) cmake_usage ;; + --version) cmake_version_display ; exit 2 ;; + --verbose) cmake_verbose=TRUE ;; + --enable-ccache) cmake_ccache_enabled=TRUE ;; + *) die "Unknown option: $1" ;; + esac + shift done # If verbose, display some information about bootstrap http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dbf05f75c3406a03fc912d3d90949972f2bcfd07 commit dbf05f75c3406a03fc912d3d90949972f2bcfd07 Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Dec 16 09:43:39 2011 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Fri Dec 16 09:43:39 2011 -0500 bootstrap: Update copyright year in version report diff --git a/bootstrap b/bootstrap index 3daac2a..1431c3f 100755 --- a/bootstrap +++ b/bootstrap @@ -1,7 +1,7 @@ #!/bin/sh #============================================================================= # CMake - Cross Platform Makefile Generator -# Copyright 2000-2009 Kitware, Inc., Insight Software Consortium +# Copyright 2000-2011 Kitware, Inc., Insight Software Consortium # # Distributed under the OSI-approved BSD License (the "License"); # see accompanying file Copyright.txt for details. @@ -337,7 +337,7 @@ Directory and file names: # Display CMake bootstrap usage cmake_version_display() { - echo "CMake ${cmake_version}, Copyright 2000-2009 Kitware, Inc." + echo "CMake ${cmake_version}, Copyright 2000-2011 Kitware, Inc." } # Display CMake bootstrap error, display the log file and exit ----------------------------------------------------------------------- Summary of changes: bootstrap | 94 +++++++++++++++++++++--------------------------------------- 1 files changed, 33 insertions(+), 61 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits