cmStandardIncludes: Include cmIML/INT.h for portable integer types

Also teach the bootstrap script to configure the needed headers.

2 files changed, 18 insertions, 0 deletions

diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index ebfa8f9..b4ae657 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -40,6 +40,9 @@
 #pragma warning ( disable : 1572 ) /* floating-point equality test */
 #endif
 
+// Provide fixed-size integer types.
+#include <cmIML/INT.h>
+
 #include <stdarg.h> // Work-around for SGI MIPSpro 7.4.2m header bug
 
 // This is a hack to prevent warnings about these functions being
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=""