[Cmake-commits] CMake branch, next, updated. v2.8.3-1377-g4fe8e67

[Brad King]

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  4fe8e674b752b4397d191296e0bc1947fe72ad5f (commit)
       via  3cba29d2203760b2b8e64c34309e764dd2e2c4f2 (commit)
      from  f128d510a87bc70adc24c18a3861a93c185ab07a (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=4fe8e674b752b4397d191296e0bc1947fe72ad5f
commit 4fe8e674b752b4397d191296e0bc1947fe72ad5f
Merge: f128d51 3cba29d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 17 09:03:57 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 17 09:03:57 2011 -0500

    Merge topic 'bootstrap-enable-ccache-issue-11707' into next
    
    3cba29d bootstrap: Add --enable-ccache option (#11707)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cba29d2203760b2b8e64c34309e764dd2e2c4f2
commit 3cba29d2203760b2b8e64c34309e764dd2e2c4f2
Author:     Nicolas Despres <nicolas.despres at gmail.com>
AuthorDate: Mon Jan 17 08:57:38 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 17 08:57:38 2011 -0500

    bootstrap: Add --enable-ccache option (#11707)
    
    This option tells bootstrap to hand CMake
    
      CC="ccache $CC"
      CXX="ccache $CXX"
    
    so that the CMake build tree after bootstrapping uses ccache.

diff --git a/bootstrap b/bootstrap
index b7d1583..b95e36a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -299,6 +299,7 @@ Configuration:
   --verbose               display more information
   --parallel=n            bootstrap cmake in parallel, where n is
                           number of nodes [1]
+  --enable-ccache         Enable ccache when building cmake
   --init=FILE             load FILE as script to populate cache
   --system-libs           use all system-installed third-party libraries
                           (for use only by package maintainers)
@@ -523,6 +524,7 @@ cmake_try_make ()
 # Parse arguments
 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
@@ -578,6 +580,9 @@ for a in "$@"; do
   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
 done
 
 # If verbose, display some information about bootstrap
@@ -1513,6 +1518,10 @@ cd "${cmake_binary_dir}"
 # build with same compiler and make
 CC="${cmake_c_compiler}"
 CXX="${cmake_cxx_compiler}"
+if [ -n "${cmake_ccache_enabled}" ]; then
+  CC="ccache ${CC}"
+  CXX="ccache ${CXX}"
+fi
 MAKE="${cmake_make_processor}"
 export CC
 export CXX

-----------------------------------------------------------------------

Summary of changes:
 bootstrap |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake