This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a commit to branch change_default_charset in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 862770055dac78c3ae934a8cc3ede309969febe3 Author: Stephen Webb <[email protected]> AuthorDate: Sat Aug 12 10:23:11 2023 +1000 Make utf-8 the default character encoding --- src/main/include/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/include/CMakeLists.txt b/src/main/include/CMakeLists.txt index 675de038..b1b5bc6f 100644 --- a/src/main/include/CMakeLists.txt +++ b/src/main/include/CMakeLists.txt @@ -21,13 +21,13 @@ if(WIN32) ${CMAKE_CURRENT_BINARY_DIR}/log4cxx/version_info.h @ONLY ) - set(LOG4CXX_CHAR "utf-8" CACHE STRING "Interal character representation, choice of utf-8, wchar_t(default), unichar") + set(LOG4CXX_CHAR "utf-8" CACHE STRING "Internal character representation, choice of utf-8, wchar_t(default), unichar") set_property(CACHE LOG4CXX_CHAR PROPERTY STRINGS "utf-8" "wchar_t" "unichar") set(LOGCHAR_IS_UNICHAR 0) set(LOGCHAR_IS_WCHAR 1) set(LOGCHAR_IS_UTF8 0) else() - set(LOG4CXX_CHAR "utf-8" CACHE STRING "Interal character representation, choice of utf-8 (default), wchar_t, unichar") + set(LOG4CXX_CHAR "utf-8" CACHE STRING "Internal character representation, choice of utf-8 (default), wchar_t, unichar") set_property(CACHE LOG4CXX_CHAR PROPERTY STRINGS "utf-8" "wchar_t" "unichar") set(LOGCHAR_IS_UNICHAR 0) set(LOGCHAR_IS_WCHAR 0) @@ -81,8 +81,8 @@ else() endif() # Configure log4cxx_private.h -set(LOG4CXX_CHARSET "locale" CACHE STRING "LogString characters, choice of locale (default), utf-8, ISO-8859-1, US-ASCII, EBCDIC") -set_property(CACHE LOG4CXX_CHARSET PROPERTY STRINGS "locale" "utf-8" "ISO-8859-1" "US-ASCII" "EBCDIC") +set(LOG4CXX_CHARSET "utf-8" CACHE STRING "LogString characters, choice of utf-8 (default), ISO-8859-1, US-ASCII, EBCDIC, locale") +set_property(CACHE LOG4CXX_CHARSET PROPERTY STRINGS "utf-8" "ISO-8859-1" "US-ASCII" "EBCDIC" "locale") set(CHARSET_EBCDIC 0) set(CHARSET_USASCII 0) set(CHARSET_ISO88591 0)
