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

Try to fix macOS build using cmake after xlocale changes

Browse Source 
Commit bc13119494 removed the inclusion of
xlocale.h because it is not (and never was) needed under Linux with
glibc, but it is still needed under macOS, so this (silently) disabled
wxXLocale support under Mac when using configure and broke the build
when using cmake.

Fix both problems by using xlocale.h only if it's available, both in
configure and in cmake.
This commit is contained in:
Vadim Zeitlin
2018-01-21 16:49:26 +01:00
parent 678d1142b4
commit e723bb2ee4
6 changed files with 126 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/cmake/setup.cmake
View File

@@ -649,6 +649,7 @@ if(wxUSE_FSWATCHER)
endif()
if(wxUSE_XLOCALE)
check_include_file(xlocale.h HAVE_XLOCALE_H)
set(CMAKE_EXTRA_INCLUDE_FILES xlocale.h locale.h)
check_type_size(locale_t LOCALE_T)
set(CMAKE_EXTRA_INCLUDE_FILES)