Skip to content
Permalink
Browse files

Fix gettext detection and locale building (#9772)

broken since a368e7e
  • Loading branch information
juozaspo committed Apr 29, 2020
1 parent 00323e8 commit 3f275d799cdcd61928854bb98ca5eb74af22f31e
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/CMakeLists.txt
@@ -62,15 +62,15 @@ set(USE_GETTEXT FALSE)

if(ENABLE_GETTEXT)
find_package(GettextLib)
if(GETTEXT_FOUND)
if(GETTEXTLIB_FOUND)
if(WIN32)
message(STATUS "GetText library: ${GETTEXT_LIBRARY}")
message(STATUS "GetText DLL: ${GETTEXT_DLL}")
message(STATUS "GetText iconv DLL: ${GETTEXT_ICONV_DLL}")
endif()
set(USE_GETTEXT TRUE)
message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
endif(GETTEXT_FOUND)
endif(GETTEXTLIB_FOUND)
else()
mark_as_advanced(GETTEXT_ICONV_DLL GETTEXT_INCLUDE_DIR GETTEXT_LIBRARY GETTEXT_MSGFMT)
message(STATUS "GetText disabled.")
@@ -680,7 +680,7 @@ set(GETTEXT_BLACKLISTED_LOCALES

option(APPLY_LOCALE_BLACKLIST "Use a blacklist to avoid broken locales" TRUE)

if (GETTEXT_FOUND AND APPLY_LOCALE_BLACKLIST)
if (GETTEXTLIB_FOUND AND APPLY_LOCALE_BLACKLIST)
set(GETTEXT_USED_LOCALES "")
foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
if (NOT ";${GETTEXT_BLACKLISTED_LOCALES};" MATCHES ";${LOCALE};")

0 comments on commit 3f275d7

Please sign in to comment.
You can’t perform that action at this time.