Merge branch 'master' into amigaOpt
This commit is contained in:
commit
e5fe291c33
|
@ -98,7 +98,7 @@ set(WITH_LOCALE_DEFAULT ON)
|
||||||
try_compile(HAVE_SETLOCALE ${CMAKE_BINARY_DIR}/check SOURCES ${CMAKE_SOURCE_DIR}/src/check/check_setlocale.c)
|
try_compile(HAVE_SETLOCALE ${CMAKE_BINARY_DIR}/check SOURCES ${CMAKE_SOURCE_DIR}/src/check/check_setlocale.c)
|
||||||
include(FindIntl)
|
include(FindIntl)
|
||||||
|
|
||||||
if (HAVE_SETLOCALE AND Intl_FOUND AND NOT APPLE)
|
if (HAVE_SETLOCALE AND Intl_FOUND AND NOT APPLE AND NOT WIN32)
|
||||||
set(USE_MOMO_DEFAULT OFF)
|
set(USE_MOMO_DEFAULT OFF)
|
||||||
else()
|
else()
|
||||||
set(USE_MOMO_DEFAULT ON)
|
set(USE_MOMO_DEFAULT ON)
|
||||||
|
|
Loading…
Reference in a new issue