diff options
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -200,6 +200,8 @@ cmake_kwsys_config_replace_string () s/@KWSYS_IOS_USE_STRSTREAM_H@/${KWSYS_IOS_USE_STRSTREAM_H}/g; s/@KWSYS_IOS_USE_STRSTREA_H@/${KWSYS_IOS_USE_STRSTREA_H}/g; s/@KWSYS_STL_HAVE_STD@/${KWSYS_STL_HAVE_STD}/g; + s/@KWSYS_STL_STRING_HAVE_ISTREAM@/${KWSYS_STL_STRING_HAVE_ISTREAM}/g; + s/@KWSYS_STL_STRING_HAVE_OSTREAM@/${KWSYS_STL_STRING_HAVE_OSTREAM}/g; s/@KWSYS_STAT_HAS_ST_MTIM@/${KWSYS_STAT_HAS_ST_MTIM}/g;}" >> "${OUTFILE}.tmp" if [ -f "${OUTFILE}.tmp" ]; then if diff "${OUTFILE}" "${OUTFILE}.tmp" > /dev/null 2> /dev/null ; then @@ -708,6 +710,10 @@ KWSYS_IOS_USE_ANSI=0 KWSYS_STL_HAVE_STD=0 KWSYS_STAT_HAS_ST_MTIM=0 +# Hardcode these kwsys features. They work on all known UNIX compilers anyway. +KWSYS_STL_STRING_HAVE_ISTREAM=1 +KWSYS_STL_STRING_HAVE_OSTREAM=1 + if cmake_try_run "${cmake_cxx_compiler}" \ "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAVE_STD" \ "${cmake_source_dir}/Source/kwsys/kwsysPlatformCxxTests.cxx" >> cmake_bootstrap.log 2>&1; then @@ -868,7 +874,10 @@ for a in ${KWSYS_IOS_FILES}; do "${cmake_bootstrap_dir}/cmsys/ios/${a}" KWSYS_NAMESPACE cmsys done -cmake_replace_string "${cmake_source_dir}/Source/kwsys/kwsys_stl.h.in" \ +cmake_replace_string "${cmake_source_dir}/Source/kwsys/kwsys_stl.hxx.in" \ + "${cmake_bootstrap_dir}/cmsys/stl/stl.hxx.in" KWSYS_STL_HEADER_EXTRA "" + +cmake_replace_string "${cmake_bootstrap_dir}/cmsys/stl/stl.hxx.in" \ "${cmake_bootstrap_dir}/cmsys/stl/stl.h.in" KWSYS_NAMESPACE cmsys for a in string vector map; do |