diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-12-26 22:46:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-26 22:46:10 +0100 |
| commit | 0f22ea400ce5319a1e74eda41505fd9cfb788e35 (patch) | |
| tree | 928880b32a89f82b36899f4140c1aa68a546d1a1 | |
| parent | 0da50da6e243df449c5fb64164aa44338f2a6d4b (diff) | |
| download | rneovim-0f22ea400ce5319a1e74eda41505fd9cfb788e35.tar.gz rneovim-0f22ea400ce5319a1e74eda41505fd9cfb788e35.tar.bz2 rneovim-0f22ea400ce5319a1e74eda41505fd9cfb788e35.zip | |
ci: disable libintl on mac release
The releases doesn't work on intel mac as libintl isn't available on the system
by default. This makes `:language` not work for the shipped macos releases,
though the reduction in build system complexity most likely outweighs that.
| -rwxr-xr-x | .github/scripts/build_universal_macos.sh | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/nvim/CMakeLists.txt | 7 |
3 files changed, 7 insertions, 2 deletions
diff --git a/.github/scripts/build_universal_macos.sh b/.github/scripts/build_universal_macos.sh index d07c395cd6..432a275d6d 100755 --- a/.github/scripts/build_universal_macos.sh +++ b/.github/scripts/build_universal_macos.sh @@ -12,6 +12,7 @@ cmake -B build -G Ninja \ -D CMAKE_BUILD_TYPE=${NVIM_BUILD_TYPE} \ -D CMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} \ -D CMAKE_OSX_ARCHITECTURES=arm64\;x86_64 \ + -D ENABLE_LIBINTL=OFF \ -D CMAKE_FIND_FRAMEWORK=NEVER cmake --build build # Make sure we build everything for M1 as well diff --git a/CMakeLists.txt b/CMakeLists.txt index 2672a275f5..0fefafba46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,6 +113,7 @@ if (MINGW) else() option(ENABLE_LTO "enable link time optimization" ON) endif() +option(ENABLE_LIBINTL "enable libintl" ON) message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}") diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index e03a53669b..908ed18eaf 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -25,7 +25,6 @@ target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LUV_INCLUDE_DIR}) target_link_libraries(main_lib INTERFACE ${LUV_LIBRARY}) find_package(Iconv REQUIRED) -find_package(Libintl REQUIRED) # Libintl (not Intl) selects our FindLibintl.cmake script. #8464 find_package(Libuv 1.28.0 REQUIRED) find_package(Libvterm 0.3.3 REQUIRED) find_package(Lpeg REQUIRED) @@ -35,7 +34,6 @@ find_package(Unibilium 2.0 REQUIRED) target_link_libraries(main_lib INTERFACE iconv - libintl libvterm lpeg msgpack @@ -43,6 +41,11 @@ target_link_libraries(main_lib INTERFACE unibilium) target_link_libraries(nlua0 PUBLIC lpeg) +if(ENABLE_LIBINTL) + find_package(Libintl REQUIRED) # Libintl (not Intl) selects our FindLibintl.cmake script. #8464 + target_link_libraries(main_lib INTERFACE libintl) +endif() + target_compile_definitions(main_lib INTERFACE HAVE_UNIBILIUM) # The unit test lib requires LuaJIT; it will be skipped if LuaJIT is missing. |