[Cmake-commits] CMake branch, next, updated. v3.4.1-1784-ge8e36aa

Brad King brad.king at kitware.com
Fri Dec 18 09:18:33 EST 2015


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  e8e36aac89d44f7d6bfeecf795b9c662f1e5f3b0 (commit)
       via  ce359e539d5591535cb11a7dc59cc19b0b716a3d (commit)
      from  46b3d791b50efad69db00959244b2f8f738776f5 (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=e8e36aac89d44f7d6bfeecf795b9c662f1e5f3b0
commit e8e36aac89d44f7d6bfeecf795b9c662f1e5f3b0
Merge: 46b3d79 ce359e5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 18 09:18:32 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 18 09:18:32 2015 -0500

    Merge topic 'import-kwiml' into next
    
    ce359e53 fixup! Port CMake from cmIML to KWIML


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce359e539d5591535cb11a7dc59cc19b0b716a3d
commit ce359e539d5591535cb11a7dc59cc19b0b716a3d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 18 09:17:57 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 18 09:17:57 2015 -0500

    fixup! Port CMake from cmIML to KWIML

diff --git a/bootstrap b/bootstrap
index 8b7a611..860b5e4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -450,18 +450,6 @@ cmake_error()
   exit ${res}
 }
 
-cmake_generate_file ()
-{
-  OUTFILE="$1"
-  CONTENT="$2"
-  echo "$CONTENT" > "$OUTFILE.tmp"
-  if "${_diff}" "$OUTFILE.tmp" "$OUTFILE" > /dev/null 2> /dev/null ; then
-    rm -f "$OUTFILE.tmp"
-  else
-    mv -f "$OUTFILE.tmp" "$OUTFILE"
-  fi
-}
-
 # Replace KWSYS_NAMESPACE with cmsys
 cmake_replace_string ()
 {

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

Summary of changes:
 bootstrap |   12 ------------
 1 file changed, 12 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list