mirror of
https://github.com/neovim/neovim.git
synced 2024-12-23 12:45:17 -07:00
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.
This commit is contained in:
parent
0da50da6e2
commit
0f22ea400c
1
.github/scripts/build_universal_macos.sh
vendored
1
.github/scripts/build_universal_macos.sh
vendored
@ -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
|
||||
|
@ -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}")
|
||||
|
||||
|
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user