diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | runtime/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/nvim/po/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 | ||||
| -rw-r--r-- | src/nvim/vim.h | 2 |
5 files changed, 8 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c6ed0f0cdf..527a085d3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,7 +153,11 @@ if(${INIT_FLAGS_NAME}) set(CMAKE_REQUIRED_FLAGS "${${INIT_FLAGS_NAME}}") endif() +# Include <string.h> because some toolchains define _FORTIFY_SOURCE=2 in +# internal header files, which should in turn be #included by <string.h>. check_c_source_compiles(" +#include <string.h> + #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 1 #error \"_FORTIFY_SOURCE > 1\" #endif diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 4a90c11734..cad8da6ffb 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -35,7 +35,7 @@ add_custom_command(OUTPUT ${GENERATED_HELP_TAGS} COMMAND "${PROJECT_BINARY_DIR}/bin/nvim" -u NONE -i NONE - -es + -e --headless -c "helptags ++t ." -c quit diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt index 6687918df4..d1e08db65e 100644 --- a/src/nvim/po/CMakeLists.txt +++ b/src/nvim/po/CMakeLists.txt @@ -72,7 +72,7 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG) install_helper( FILES ${moFile} - DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/${name}/LC_MESSAGES + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/runtime/lang/${name}/LC_MESSAGES RENAME nvim.mo) list(APPEND LANGUAGE_MO_FILES ${moFile}) diff --git a/src/nvim/version.c b/src/nvim/version.c index 269f9872d0..ba7f1e0262 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -553,7 +553,7 @@ static int included_patches[] = { // 738 NA // 737, 736, - // 735, + // 735 NA // 734, // 733, 732, diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 5f9785a9a9..762d349470 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -30,7 +30,7 @@ Error: configure did not run properly.Check auto/config.log. /* Can't use "PACKAGE" here, conflicts with a Perl include file. */ #ifndef VIMPACKAGE -# define VIMPACKAGE "vim" +# define VIMPACKAGE "nvim" #endif #include "nvim/os/os_defs.h" /* bring lots of system header files */ |