[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7585-g164249a
Brad King
brad.king at kitware.com
Mon Feb 10 15:30:19 EST 2014
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 164249af5aa9d2eb97b3b1d728e648a84d91ad54 (commit)
via 08f9ba6f510dfa91d3ed2e7a59727e1c4408377f (commit)
from b687e9c08c9125295645713b9201dab8f917f658 (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=164249af5aa9d2eb97b3b1d728e648a84d91ad54
commit 164249af5aa9d2eb97b3b1d728e648a84d91ad54
Merge: b687e9c 08f9ba6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 10 15:30:18 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 10 15:30:18 2014 -0500
Merge topic 'cmake-devel-version-macro' into next
08f9ba6f bootstrap: Configure cmIML headers
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08f9ba6f510dfa91d3ed2e7a59727e1c4408377f
commit 08f9ba6f510dfa91d3ed2e7a59727e1c4408377f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 10 15:28:47 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 10 15:28:47 2014 -0500
bootstrap: Configure cmIML headers
diff --git a/bootstrap b/bootstrap
index c0a3e3b..d654cb9 100755
--- a/bootstrap
+++ b/bootstrap
@@ -357,6 +357,11 @@ KWSYS_IOS_FILES="
iostream \
sstream"
+KWIML_FILES='
+ ABI.h
+ INT.h
+'
+
# Display CMake bootstrap usage
cmake_usage()
{
@@ -705,6 +710,11 @@ for a in stl ios; do
fi
done
+[ -d "cmIML" ] || mkdir "cmIML"
+if [ ! -d "cmIML" ]; then
+ cmake_error 12 "Cannot create directory ${cmake_bootstrap_dir}/cmIML"
+fi
+
# Delete all the bootstrap files
rm -f "${cmake_bootstrap_dir}/cmake_bootstrap.log"
rm -f "${cmake_bootstrap_dir}/cmConfigure.h${_tmp}"
@@ -1500,6 +1510,11 @@ for a in string vector set map algorithm; do
"${cmake_bootstrap_dir}/cmsys/stl/${a}" KWSYS_STL_HEADER ${a}
done
+for a in ${KWIML_FILES}; do
+ cmake_replace_string "${cmake_source_dir}/Utilities/KWIML/${a}.in" \
+ "${cmake_bootstrap_dir}/cmIML/${a}" KWIML cmIML
+done
+
# Generate Makefile
dep="cmConfigure.h cmsys/*.hxx cmsys/*.h `cmake_escape \"${cmake_source_dir}\"`/Source/*.h"
objs=""
-----------------------------------------------------------------------
Summary of changes:
bootstrap | 15 +++++++++++++++
1 file changed, 15 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list