@@ -318,25 +318,31 @@ CMAKE_C_SOURCES="\
318
318
319
319
if ${cmake_system_mingw} ; then
320
320
KWSYS_C_SOURCES=" \
321
+ EncodingC \
321
322
ProcessWin32 \
322
323
String \
323
324
System"
324
325
else
325
326
KWSYS_C_SOURCES=" \
327
+ EncodingC \
326
328
ProcessUNIX \
327
329
String \
328
330
System"
329
331
fi
330
332
331
333
KWSYS_CXX_SOURCES=" \
332
334
Directory \
335
+ EncodingCXX \
333
336
Glob \
334
337
RegularExpression \
335
338
SystemTools"
336
339
337
340
KWSYS_FILES=" \
338
341
auto_ptr.hxx \
339
342
Directory.hxx \
343
+ Encoding.h \
344
+ Encoding.hxx \
345
+ FStream.hxx \
340
346
Glob.hxx \
341
347
Process.h \
342
348
RegularExpression.hxx \
@@ -479,6 +485,7 @@ cmake_kwsys_config_replace_string ()
479
485
s/@KWSYS_STL_HAS_ALLOCATOR_REBIND@/${KWSYS_STL_HAS_ALLOCATOR_REBIND} /g;
480
486
s/@KWSYS_STL_HAS_ALLOCATOR_MAX_SIZE_ARGUMENT@/${KWSYS_STL_HAS_ALLOCATOR_MAX_SIZE_ARGUMENT} /g;
481
487
s/@KWSYS_STL_HAS_ALLOCATOR_OBJECTS@/${KWSYS_STL_HAS_ALLOCATOR_OBJECTS} /g;
488
+ s/@KWSYS_STL_HAS_WSTRING@/${KWSYS_STL_HAS_WSTRING} /g;
482
489
s/@KWSYS_CXX_HAS_CSTDDEF@/${KWSYS_CXX_HAS_CSTDDEF} /g;
483
490
s/@KWSYS_CXX_HAS_NULL_TEMPLATE_ARGS@/${KWSYS_CXX_HAS_NULL_TEMPLATE_ARGS} /g;
484
491
s/@KWSYS_CXX_HAS_MEMBER_TEMPLATES@/${KWSYS_CXX_HAS_MEMBER_TEMPLATES} /g;
@@ -1123,6 +1130,7 @@ KWSYS_STL_HAS_ALLOCATOR_NONTEMPLATE=0
1123
1130
KWSYS_STL_HAS_ALLOCATOR_REBIND=0
1124
1131
KWSYS_STL_HAS_ALLOCATOR_MAX_SIZE_ARGUMENT=0
1125
1132
KWSYS_STL_HAS_ALLOCATOR_OBJECTS=0
1133
+ KWSYS_STL_HAS_WSTRING=0
1126
1134
KWSYS_CXX_HAS_SETENV=0
1127
1135
KWSYS_CXX_HAS_UNSETENV=0
1128
1136
KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H=0
@@ -1309,6 +1317,15 @@ else
1309
1317
echo " ${cmake_cxx_compiler} does not have stl containers supporting allocator objects"
1310
1318
fi
1311
1319
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
+
1312
1329
if cmake_try_run " ${cmake_cxx_compiler} " \
1313
1330
" ${cmake_cxx_flags} -DTEST_KWSYS_CXX_HAS_CSTDDEF" \
1314
1331
" ${cmake_source_dir} /Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1 ; then
@@ -1516,6 +1533,9 @@ if [ "x${cmake_cxx_flags}" != "x" ]; then
1516
1533
fi
1517
1534
1518
1535
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
1519
1539
cmake_cxx_flags_SystemTools="
1520
1540
-DKWSYS_CXX_HAS_SETENV=${KWSYS_CXX_HAS_SETENV}
1521
1541
-DKWSYS_CXX_HAS_UNSETENV=${KWSYS_CXX_HAS_UNSETENV}
0 commit comments