mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-04 01:34:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: disable libintl on mac release

Browse Source 
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.
This commit is contained in:
dundargoc
2023-12-26 22:46:10 +01:00
committed by GitHub
parent 0da50da6e2
commit 0f22ea400c
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/scripts/build_universal_macos.sh vendored
View File

@@ -12,6 +12,7 @@ cmake -B build -G Ninja \
-D CMAKE_BUILD_TYPE=${NVIM_BUILD_TYPE} \ -D CMAKE_BUILD_TYPE=${NVIM_BUILD_TYPE} \
-D CMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} \ -D CMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} \
-D CMAKE_OSX_ARCHITECTURES=arm64\;x86_64 \ -D CMAKE_OSX_ARCHITECTURES=arm64\;x86_64 \
-D ENABLE_LIBINTL=OFF \
-D CMAKE_FIND_FRAMEWORK=NEVER -D CMAKE_FIND_FRAMEWORK=NEVER
cmake --build build cmake --build build
# Make sure we build everything for M1 as well # Make sure we build everything for M1 as well

1
CMakeLists.txt
View File

@@ -113,6 +113,7 @@ if (MINGW)
else() else()
option(ENABLE_LTO "enable link time optimization" ON) option(ENABLE_LTO "enable link time optimization" ON)
endif() endif()
option(ENABLE_LIBINTL "enable libintl" ON)
message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}") message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")

7
src/nvim/CMakeLists.txt
View File

@@ -25,7 +25,6 @@ target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LUV_INCLUDE_DIR})
target_link_libraries(main_lib INTERFACE ${LUV_LIBRARY}) target_link_libraries(main_lib INTERFACE ${LUV_LIBRARY})
find_package(Iconv REQUIRED) 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(Libuv 1.28.0 REQUIRED)
find_package(Libvterm 0.3.3 REQUIRED) find_package(Libvterm 0.3.3 REQUIRED)
find_package(Lpeg REQUIRED) find_package(Lpeg REQUIRED)
@@ -35,7 +34,6 @@ find_package(Unibilium 2.0 REQUIRED)
target_link_libraries(main_lib INTERFACE target_link_libraries(main_lib INTERFACE
iconv iconv
libintl
libvterm libvterm
lpeg lpeg
msgpack msgpack
@@ -43,6 +41,11 @@ target_link_libraries(main_lib INTERFACE
unibilium) unibilium)
target_link_libraries(nlua0 PUBLIC lpeg) 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) target_compile_definitions(main_lib INTERFACE HAVE_UNIBILIUM)
# 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.