diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-03-07 09:39:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-07 09:39:08 +0100 |
| commit | 1637bcce7ba52c4c5c451308f8a3adfedde18a2a (patch) | |
| tree | 32f10d189a6c7493f6e23466451788ff91100e64 | |
| parent | 706bcab75eaad2c370d61bf828531054439d3a3e (diff) | |
| download | rneovim-1637bcce7ba52c4c5c451308f8a3adfedde18a2a.tar.gz rneovim-1637bcce7ba52c4c5c451308f8a3adfedde18a2a.tar.bz2 rneovim-1637bcce7ba52c4c5c451308f8a3adfedde18a2a.zip | |
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.
| -rw-r--r-- | runtime/doc/news.txt | 2 | ||||
| -rwxr-xr-x | src/nvim/CMakeLists.txt | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt index 2db1e75bf7..254ffc51b8 100644 --- a/runtime/doc/news.txt +++ b/runtime/doc/news.txt @@ -45,7 +45,7 @@ The following changes may require adaptations in user config or plugins. - `printheader` - `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| is closed. diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index f3344c10de..b02c740471 100755 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -32,14 +32,11 @@ target_link_libraries(main_lib INTERFACE treesitter unibilium) -option(ENABLE_LIBINTL "enable libintl" ON) -if(ENABLE_LIBINTL) - # Libintl (not Intl) selects our FindLibintl.cmake script. #8464 - find_package(Libintl REQUIRED) - target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LIBINTL_INCLUDE_DIR}) - if (LIBINTL_LIBRARY) - target_link_libraries(main_lib INTERFACE ${LIBINTL_LIBRARY}) - endif() +# Libintl (not Intl) selects our FindLibintl.cmake script. #8464 +find_package(Libintl REQUIRED) +target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LIBINTL_INCLUDE_DIR}) +if (LIBINTL_LIBRARY) + target_link_libraries(main_lib INTERFACE ${LIBINTL_LIBRARY}) endif() # The unit test lib requires LuaJIT; it will be skipped if LuaJIT is missing. |