Skip to content

Commit 2ba2c43

Browse files
committed
bootstrap: Add KWSys Encoding and FStream
Run the KWSYS_STL_HAS_WSTRING platform test and configure the result. Configure the Encoding and FStream header files and build the sources. On Windows, build EncodingC.c with KWSYS_ENCODING_DEFAULT_CODEPAGE=CP_ACP.
1 parent f668112 commit 2ba2c43

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

bootstrap

+20
Original file line numberDiff line numberDiff line change
@@ -318,25 +318,31 @@ CMAKE_C_SOURCES="\
318318

319319
if ${cmake_system_mingw}; then
320320
KWSYS_C_SOURCES="\
321+
EncodingC \
321322
ProcessWin32 \
322323
String \
323324
System"
324325
else
325326
KWSYS_C_SOURCES="\
327+
EncodingC \
326328
ProcessUNIX \
327329
String \
328330
System"
329331
fi
330332

331333
KWSYS_CXX_SOURCES="\
332334
Directory \
335+
EncodingCXX \
333336
Glob \
334337
RegularExpression \
335338
SystemTools"
336339

337340
KWSYS_FILES="\
338341
auto_ptr.hxx \
339342
Directory.hxx \
343+
Encoding.h \
344+
Encoding.hxx \
345+
FStream.hxx \
340346
Glob.hxx \
341347
Process.h \
342348
RegularExpression.hxx \
@@ -479,6 +485,7 @@ cmake_kwsys_config_replace_string ()
479485
s/@KWSYS_STL_HAS_ALLOCATOR_REBIND@/${KWSYS_STL_HAS_ALLOCATOR_REBIND}/g;
480486
s/@KWSYS_STL_HAS_ALLOCATOR_MAX_SIZE_ARGUMENT@/${KWSYS_STL_HAS_ALLOCATOR_MAX_SIZE_ARGUMENT}/g;
481487
s/@KWSYS_STL_HAS_ALLOCATOR_OBJECTS@/${KWSYS_STL_HAS_ALLOCATOR_OBJECTS}/g;
488+
s/@KWSYS_STL_HAS_WSTRING@/${KWSYS_STL_HAS_WSTRING}/g;
482489
s/@KWSYS_CXX_HAS_CSTDDEF@/${KWSYS_CXX_HAS_CSTDDEF}/g;
483490
s/@KWSYS_CXX_HAS_NULL_TEMPLATE_ARGS@/${KWSYS_CXX_HAS_NULL_TEMPLATE_ARGS}/g;
484491
s/@KWSYS_CXX_HAS_MEMBER_TEMPLATES@/${KWSYS_CXX_HAS_MEMBER_TEMPLATES}/g;
@@ -1123,6 +1130,7 @@ KWSYS_STL_HAS_ALLOCATOR_NONTEMPLATE=0
11231130
KWSYS_STL_HAS_ALLOCATOR_REBIND=0
11241131
KWSYS_STL_HAS_ALLOCATOR_MAX_SIZE_ARGUMENT=0
11251132
KWSYS_STL_HAS_ALLOCATOR_OBJECTS=0
1133+
KWSYS_STL_HAS_WSTRING=0
11261134
KWSYS_CXX_HAS_SETENV=0
11271135
KWSYS_CXX_HAS_UNSETENV=0
11281136
KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H=0
@@ -1309,6 +1317,15 @@ else
13091317
echo "${cmake_cxx_compiler} does not have stl containers supporting allocator objects"
13101318
fi
13111319

1320+
if cmake_try_run "${cmake_cxx_compiler}" \
1321+
"${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_WSTRING -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \
1322+
"${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then
1323+
KWSYS_STL_HAS_WSTRING=1
1324+
echo "${cmake_cxx_compiler} has stl wstring"
1325+
else
1326+
echo "${cmake_cxx_compiler} does not have stl wstring"
1327+
fi
1328+
13121329
if cmake_try_run "${cmake_cxx_compiler}" \
13131330
"${cmake_cxx_flags} -DTEST_KWSYS_CXX_HAS_CSTDDEF" \
13141331
"${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then
@@ -1516,6 +1533,9 @@ if [ "x${cmake_cxx_flags}" != "x" ]; then
15161533
fi
15171534

15181535
cmake_c_flags_String="-DKWSYS_STRING_C"
1536+
if ${cmake_system_mingw}; then
1537+
cmake_c_flags_EncodingC="-DKWSYS_ENCODING_DEFAULT_CODEPAGE=CP_ACP"
1538+
fi
15191539
cmake_cxx_flags_SystemTools="
15201540
-DKWSYS_CXX_HAS_SETENV=${KWSYS_CXX_HAS_SETENV}
15211541
-DKWSYS_CXX_HAS_UNSETENV=${KWSYS_CXX_HAS_UNSETENV}

0 commit comments

Comments
 (0)