65 lines
3.4 KiB
Diff
65 lines
3.4 KiB
Diff
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
|
|
index d103b5f..66cf20e 100644
|
|
--- a/runtime/CMakeLists.txt
|
|
+++ b/runtime/CMakeLists.txt
|
|
@@ -33,7 +33,7 @@ foreach(PACKAGE ${PACKAGES})
|
|
add_custom_command(OUTPUT "${GENERATED_PACKAGE_DIR}/${PACKNAME}/doc/tags"
|
|
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
|
${PACKAGE} ${GENERATED_PACKAGE_DIR}/${PACKNAME}
|
|
- COMMAND $<TARGET_FILE:nvim_bin>
|
|
+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:nvim_bin>
|
|
-u NONE -i NONE -e --headless -c "helptags doc" -c quit
|
|
DEPENDS
|
|
nvim_bin
|
|
@@ -65,7 +65,7 @@ add_custom_command(OUTPUT ${GENERATED_HELP_TAGS}
|
|
COMMAND ${CMAKE_COMMAND} -E remove_directory doc
|
|
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
|
${PROJECT_SOURCE_DIR}/runtime/doc doc
|
|
- COMMAND $<TARGET_FILE:nvim_bin>
|
|
+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:nvim_bin>
|
|
-u NONE -i NONE -e --headless -c "helptags ++t doc" -c quit
|
|
DEPENDS
|
|
nvim_bin
|
|
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
|
|
index 2a60eef..961ffbd 100644
|
|
--- a/src/nvim/CMakeLists.txt
|
|
+++ b/src/nvim/CMakeLists.txt
|
|
@@ -515,7 +515,7 @@ add_custom_command(
|
|
"${NVIM_VERSION_DEF_H}"
|
|
DEPENDS "${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef-$<CONFIG>.h")
|
|
|
|
-set(LUA_GEN ${LUA_GEN_PRG} ${GENERATOR_PRELOAD} ${PROJECT_SOURCE_DIR} $<TARGET_FILE:nlua0> ${PROJECT_BINARY_DIR})
|
|
+set(LUA_GEN ${CMAKE_CROSSCOMPILING_EMULATOR} ${LUA_GEN_PRG} ${GENERATOR_PRELOAD} ${PROJECT_SOURCE_DIR} $<TARGET_FILE:nlua0> ${PROJECT_BINARY_DIR})
|
|
set(LUA_GEN_DEPS ${GENERATOR_PRELOAD} $<TARGET_FILE:nlua0>)
|
|
|
|
# Like LUA_GEN but includes also vim.fn, vim.api, vim.uv, etc
|
|
@@ -614,7 +614,7 @@ add_custom_command(
|
|
OUTPUT ${VIM_MODULE_FILE}
|
|
COMMAND ${CMAKE_COMMAND} -E env
|
|
"LUAC_PRG=${LUAC_PRG}"
|
|
- ${LUA_PRG} ${CHAR_BLOB_GENERATOR} -c ${VIM_MODULE_FILE}
|
|
+ ${CMAKE_CROSSCOMPILING_EMULATOR} ${LUA_PRG} ${CHAR_BLOB_GENERATOR} -c ${VIM_MODULE_FILE}
|
|
# NB: vim._init_packages and vim.inspect must be be first and second ones
|
|
# respectively, otherwise --luamod-dev won't work properly.
|
|
${LUA_INIT_PACKAGES_MODULE_SOURCE} "vim._init_packages"
|
|
diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt
|
|
index f0436a2..81a9433 100644
|
|
--- a/src/nvim/po/CMakeLists.txt
|
|
+++ b/src/nvim/po/CMakeLists.txt
|
|
@@ -55,14 +55,14 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
|
|
list(SORT NVIM_RELATIVE_SOURCES)
|
|
add_custom_command(
|
|
OUTPUT ${NVIM_POT}
|
|
- COMMAND $<TARGET_FILE:nvim_bin> -u NONE -i NONE -n --headless --cmd "set cpo+=+"
|
|
+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:nvim_bin> -u NONE -i NONE -n --headless --cmd "set cpo+=+"
|
|
-c "silent source ${CMAKE_CURRENT_SOURCE_DIR}/tojavascript.vim"
|
|
${NVIM_POT} ${PROJECT_SOURCE_DIR}/runtime/optwin.vim
|
|
COMMAND ${XGETTEXT_PRG} -o ${NVIM_POT} --default-domain=nvim
|
|
--add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2
|
|
-D ${CMAKE_CURRENT_SOURCE_DIR} -D ${CMAKE_CURRENT_BINARY_DIR}
|
|
${NVIM_RELATIVE_SOURCES} optwin.js
|
|
- COMMAND $<TARGET_FILE:nvim_bin> -u NONE -i NONE -n --headless --cmd "set cpo+=+"
|
|
+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:nvim_bin> -u NONE -i NONE -n --headless --cmd "set cpo+=+"
|
|
-c "silent source ${CMAKE_CURRENT_SOURCE_DIR}/fixfilenames.vim"
|
|
${NVIM_POT} ${PROJECT_SOURCE_DIR}/runtime/optwin.vim
|
|
VERBATIM
|