[Cmake-commits] [cmake-commits] king committed bootstrap 1.123 1.124
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Aug 31 13:25:42 EDT 2009
Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv15741
Modified Files:
bootstrap
Log Message:
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.
Index: bootstrap
===================================================================
RCS file: /cvsroot/CMake/CMake/bootstrap,v
retrieving revision 1.123
retrieving revision 1.124
diff -C 2 -d -r1.123 -r1.124
*** bootstrap 11 Aug 2009 13:54:56 -0000 1.123
--- bootstrap 31 Aug 2009 17:25:40 -0000 1.124
***************
*** 380,383 ****
--- 380,384 ----
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;
***************
*** 953,956 ****
--- 954,958 ----
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
***************
*** 1172,1175 ****
--- 1174,1186 ----
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
More information about the Cmake-commits
mailing list