build!: make libintl a required dependency

Libintl being an optional dependency is not by design, but a workaround
as it didn't use work on all platforms. That should be fixed by now.
This commit is contained in:
dundargoc 2023-03-07 09:39:08 +01:00 committed by GitHub
parent 706bcab75e
commit 1637bcce7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions

View File

@ -45,7 +45,7 @@ The following changes may require adaptations in user config or plugins.
- `printheader` - `printheader`
- `printmbcharset` - `printmbcharset`
• libiconv is now a required build dependency. • libiconv and intl are now required build dependencies.
• Unsaved changes are now preserved rather than discarded when |channel-stdio| • Unsaved changes are now preserved rather than discarded when |channel-stdio|
is closed. is closed.

View File

@ -32,14 +32,11 @@ target_link_libraries(main_lib INTERFACE
treesitter treesitter
unibilium) unibilium)
option(ENABLE_LIBINTL "enable libintl" ON) # Libintl (not Intl) selects our FindLibintl.cmake script. #8464
if(ENABLE_LIBINTL) find_package(Libintl REQUIRED)
# Libintl (not Intl) selects our FindLibintl.cmake script. #8464 target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LIBINTL_INCLUDE_DIR})
find_package(Libintl REQUIRED) if (LIBINTL_LIBRARY)
target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LIBINTL_INCLUDE_DIR}) target_link_libraries(main_lib INTERFACE ${LIBINTL_LIBRARY})
if (LIBINTL_LIBRARY)
target_link_libraries(main_lib INTERFACE ${LIBINTL_LIBRARY})
endif()
endif() endif()
# The unit test lib requires LuaJIT; it will be skipped if LuaJIT is missing. # The unit test lib requires LuaJIT; it will be skipped if LuaJIT is missing.