cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: add more STL checks and enable them in setup.h

Browse Source 
Closes https://github.com/wxWidgets/wxWidgets/pull/1862
This commit is contained in:
Maarten Bent 2020-05-21 21:53:39 +02:00 committed by Vadim Zeitlin
parent 39d586421b
commit 442b82a6c5
1 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
build/cmake/setup.cmake
View File

@ -156,26 +156,58 @@ if(wxUSE_STL AND NOT wxHAS_CXX11)
if(NOT wxTEST_STL) if(NOT wxTEST_STL)
message(FATAL_ERROR "Can't use wxUSE_STL as basic STL functionality is missing") message(FATAL_ERROR "Can't use wxUSE_STL as basic STL functionality is missing")
endif() endif()
wx_check_cxx_source_compiles("
std::string foo, bar;
foo.compare(bar);
foo.compare(1, 1, bar);
foo.compare(1, 1, bar, 1, 1);
foo.compare(\"\");
foo.compare(1, 1, \"\");
foo.compare(1, 1, \"\", 2);"
HAVE_STD_STRING_COMPARE
string
)
wx_check_cxx_source_compiles(
"std::wstring s;"
HAVE_STD_WSTRING
string
)
endif() endif()
wx_check_cxx_source_compiles("
std::string foo, bar;
foo.compare(bar);
foo.compare(1, 1, bar);
foo.compare(1, 1, bar, 1, 1);
foo.compare(\"\");
foo.compare(1, 1, \"\");
foo.compare(1, 1, \"\", 2);"
HAVE_STD_STRING_COMPARE
string
)
wx_check_cxx_source_compiles(
"std::wstring s;"
HAVE_STD_WSTRING
string
)
wx_check_cxx_source_compiles("
std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;"
HAVE_HASH_MAP
hash_map hash_set
)
set(HAVE_STD_HASH_MAP ${HAVE_HASH_MAP})
wx_check_cxx_source_compiles("
__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
__gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;"
HAVE_EXT_HASH_MAP
ext/hash_map ext/hash_set
)
set(HAVE_GNU_CXX_HASH_MAP ${HAVE_EXT_HASH_MAP})
wx_check_cxx_source_compiles("
std::unordered_map<double*, char*> test1;
std::unordered_set<char*> test2;"
HAVE_STD_UNORDERED_MAP
unordered_map unordered_set
)
set(HAVE_STD_UNORDERED_SET ${HAVE_STD_UNORDERED_MAP})
wx_check_cxx_source_compiles("
std::tr1::unordered_map<double*, char*> test1;
std::tr1::unordered_set<char*> test2;"
HAVE_TR1_UNORDERED_MAP
tr1/unordered_map tr1/unordered_set
)
set(HAVE_TR1_UNORDERED_SET ${HAVE_TR1_UNORDERED_MAP})
# Check for availability of GCC's atomic operations builtins. # Check for availability of GCC's atomic operations builtins.
wx_check_c_source_compiles(" wx_check_c_source_compiles("
unsigned int value=0; unsigned int value=0;
@ -544,8 +576,6 @@ check_struct_has_member("struct passwd" pw_gecos pwd.h HAVE_PW_GECOS)
# Check for functions # Check for functions
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# TODO: wcslen
# Check various string symbols # Check various string symbols
foreach(func foreach(func
ftime ftime
@ -554,6 +584,7 @@ foreach(func
wcsdup wcsnlen wcscasecmp wcsncasecmp wcsdup wcsnlen wcscasecmp wcsncasecmp
wcsrctombs wcsrctombs
wcstoull wcstoull
wcslen
) )
string(TOUPPER ${func} func_upper) string(TOUPPER ${func} func_upper)
check_symbol_exists(${func} wchar.h HAVE_${func_upper}) check_symbol_exists(${func} wchar.h HAVE_${func_upper})