summaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2005-04-06 17:34:09 (GMT)
committerBrad King <brad.king@kitware.com>2005-04-06 17:34:09 (GMT)
commit6f95540ac771ae9f09c7aedb22ec1027ea3f15eb (patch)
treea28210b35227a249ff29274e64c1f5c01491598c /bootstrap
parent5e0a796acc4e4b23149f33906c11a19eca76d769 (diff)
downloadCMake-6f95540ac771ae9f09c7aedb22ec1027ea3f15eb.zip
CMake-6f95540ac771ae9f09c7aedb22ec1027ea3f15eb.tar.gz
CMake-6f95540ac771ae9f09c7aedb22ec1027ea3f15eb.tar.bz2
BUG: The bootstrap script should perform the KWSYS_STL_STRING_HAVE_NEQ_CHAR test for kwsys.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap11
1 files changed, 11 insertions, 0 deletions
diff --git a/bootstrap b/bootstrap
index 4449e52..7610a25 100755
--- a/bootstrap
+++ b/bootstrap
@@ -202,6 +202,7 @@ cmake_kwsys_config_replace_string ()
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_STL_STRING_HAVE_NEQ_CHAR@/${KWSYS_STL_STRING_HAVE_NEQ_CHAR}/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
@@ -709,6 +710,7 @@ KWSYS_IOS_USE_SSTREAM=0
KWSYS_IOS_USE_ANSI=0
KWSYS_STL_HAVE_STD=0
KWSYS_STAT_HAS_ST_MTIM=0
+KWSYS_STL_STRING_HAVE_NEQ_CHAR=0
# Hardcode these kwsys features. They work on all known UNIX compilers anyway.
KWSYS_STL_STRING_HAVE_ISTREAM=1
@@ -773,6 +775,15 @@ if [ "x$KWSYS_IOS_USE_SSTREAM" = "x0" ]; then
fi
if cmake_try_run "${cmake_cxx_compiler}" \
+ "${cmake_cxx_flags} -DTEST_KWSYS_STL_STRING_HAVE_NEQ_CHAR -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \
+ "${cmake_source_dir}/Source/kwsys/kwsysPlatformCxxTests.cxx" >> cmake_bootstrap.log 2>&1; then
+ KWSYS_STL_STRING_HAVE_NEQ_CHAR=1
+ echo "${cmake_cxx_compiler} has operator!=(string, char*)"
+else
+ echo "${cmake_cxx_compiler} does not have operator!=(string, char*)"
+fi
+
+if cmake_try_run "${cmake_cxx_compiler}" \
"${cmake_cxx_flags} -DTEST_KWSYS_STAT_HAS_ST_MTIM" \
"${cmake_source_dir}/Source/kwsys/kwsysPlatformCxxTests.cxx" >> cmake_bootstrap.log 2>&1; then
KWSYS_STAT_HAS_ST_MTIM=1