From c2ee27c53552286c0b2ef30556e8c76fff86063a Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 31 Aug 2009 13:25:40 -0400 Subject: [PATCH] Test KWSYS_IOS_HAVE_BINARY during bootstrap We need to do this KWSys configuration test in the CMake bootstrap script to create a proper cmsys/Configure.hxx file. This fixes the bootstrap script which was broken by the addition of the test to KWSys. --- bootstrap | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/bootstrap b/bootstrap index 0c21c770f..cf485b5bb 100755 --- a/bootstrap +++ b/bootstrap @@ -379,6 +379,7 @@ cmake_kwsys_config_replace_string () s/@KWSYS_IOS_USE_SSTREAM@/${KWSYS_IOS_USE_SSTREAM}/g; 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_IOS_HAVE_BINARY@/${KWSYS_IOS_HAVE_BINARY}/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; @@ -952,6 +953,7 @@ KWSYS_IOS_USE_STRSTREA_H=0 KWSYS_IOS_HAVE_STD=0 KWSYS_IOS_USE_SSTREAM=0 KWSYS_IOS_USE_ANSI=0 +KWSYS_IOS_HAVE_BINARY=0 KWSYS_STL_HAVE_STD=0 KWSYS_STAT_HAS_ST_MTIM=0 KWSYS_STL_STRING_HAVE_NEQ_CHAR=0 @@ -1171,6 +1173,15 @@ else echo "${cmake_cxx_compiler} does not have struct stat with st_mtim member" fi +if cmake_try_run "${cmake_cxx_compiler}" \ + "${cmake_cxx_flags} -DTEST_KWSYS_IOS_HAVE_BINARY -DKWSYS_IOS_USE_ANSI=${KWSYS_IOS_USE_ANSI} -DKWSYS_IOS_HAVE_STD=${KWSYS_IOS_HAVE_STD}" \ + "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then + KWSYS_IOS_HAVE_BINARY=1 + echo "${cmake_cxx_compiler} has ios::binary openmode" +else + echo "${cmake_cxx_compiler} does not have ios::binary openmode" +fi + # Just to be safe, let us store compiler and flags to the header file cmake_bootstrap_version='$Revision$'