patch-android.diff 1.1 KB

123456789101112131415161718192021222324252627282930313233
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index 33bc40f41..a5d0c5b6d 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -111,6 +111,7 @@ include(XercesICU)
  6. include(XercesMutexMgrSelection)
  7. include(XercesNetAccessorSelection)
  8. include(XercesMsgLoaderSelection)
  9. +include(XercesWChar)
  10. include(XercesTranscoderSelection)
  11. include(XercesFileMgrSelection)
  12. include(XercesXMLCh)
  13. @@ -126,7 +127,6 @@ include(XercesStdLibs)
  14. include(XercesStdNamespace)
  15. include(XercesSSE2)
  16. include(XercesPathMax)
  17. -include(XercesWChar)
  18. include(XercesIconvConst)
  19. include(XercesLFS)
  20. diff --git a/cmake/XercesTranscoderSelection.cmake b/cmake/XercesTranscoderSelection.cmake
  21. index 4ff5b1621..862cc4908 100644
  22. --- a/cmake/XercesTranscoderSelection.cmake
  23. +++ b/cmake/XercesTranscoderSelection.cmake
  24. @@ -82,7 +82,7 @@ check_function_exists(wcstombs HAVE_WCSTOMBS)
  25. check_function_exists(mbstowcs HAVE_MBSTOWCS)
  26. set(iconv_available 0)
  27. -if(HAVE_WCHAR_H AND HAVE_MBLEN AND HAVE_WCSTOMBS AND HAVE_MBSTOWCS)
  28. +if(HAVE_WCHAR_H AND (HAVE_MBRLEN OR HAVE_MBLEN) AND HAVE_WCSTOMBS AND HAVE_MBSTOWCS)
  29. set(iconv_available 1)
  30. list(APPEND transcoders iconv)
  31. endif()