summaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-02-11 14:16:09 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-02-11 14:16:09 (GMT)
commit418a155be7e44117297c072b6aa0f21f4407c052 (patch)
tree13971e018916a6b4f55edc688431eec080ef055e /bootstrap
parentc29eb751cdaff74b3113f6199881f76b427a8391 (diff)
parent9bcc1b21f05a8f522c5154e163942c6d133bb379 (diff)
downloadCMake-418a155be7e44117297c072b6aa0f21f4407c052.zip
CMake-418a155be7e44117297c072b6aa0f21f4407c052.tar.gz
CMake-418a155be7e44117297c072b6aa0f21f4407c052.tar.bz2
Merge topic 'cmake-devel-version-macro'
9bcc1b21 Export: Fix internal CMake version test logic d2059d25 cmVersion: Fix CMake_VERSION_ENCODE for date in patch level 28805109 cmStandardIncludes: Include cmIML/INT.h for portable integer types
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap15
1 files changed, 15 insertions, 0 deletions
diff --git a/bootstrap b/bootstrap
index 5c754a7..9154afb 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=""