kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Also teach the bootstrap script to configure the needed headers.
This commit is contained in:
Brad King 2014-02-10 15:31:40 -05:00
parent eaf703f160
commit 28805109bc
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmStandardIncludes.h
View File

@ -40,6 +40,9 @@
#pragma warning ( disable : 1572 ) /* floating-point equality test */ #pragma warning ( disable : 1572 ) /* floating-point equality test */
#endif #endif
// Provide fixed-size integer types.
#include <cmIML/INT.h>
#include <stdarg.h> // Work-around for SGI MIPSpro 7.4.2m header bug #include <stdarg.h> // Work-around for SGI MIPSpro 7.4.2m header bug
// This is a hack to prevent warnings about these functions being // This is a hack to prevent warnings about these functions being

15
bootstrap
View File

@ -357,6 +357,11 @@ KWSYS_IOS_FILES="
iostream \ iostream \
sstream" sstream"
KWIML_FILES='
ABI.h
INT.h
'
# Display CMake bootstrap usage # Display CMake bootstrap usage
cmake_usage() cmake_usage()
{ {
@ -705,6 +710,11 @@ for a in stl ios; do
fi fi
done 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 # Delete all the bootstrap files
rm -f "${cmake_bootstrap_dir}/cmake_bootstrap.log" rm -f "${cmake_bootstrap_dir}/cmake_bootstrap.log"
rm -f "${cmake_bootstrap_dir}/cmConfigure.h${_tmp}" 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} "${cmake_bootstrap_dir}/cmsys/stl/${a}" KWSYS_STL_HEADER ${a}
done 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 # Generate Makefile
dep="cmConfigure.h cmsys/*.hxx cmsys/*.h `cmake_escape \"${cmake_source_dir}\"`/Source/*.h" dep="cmConfigure.h cmsys/*.hxx cmsys/*.h `cmake_escape \"${cmake_source_dir}\"`/Source/*.h"
objs="" objs=""