diff options
| author | James McCoy <jamessan@jamessan.com> | 2020-08-08 08:57:35 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2020-08-08 08:57:35 -0400 |
| commit | 840c12c10741d8f70e1787534fb6ea6d2b70edee (patch) | |
| tree | f89ad27acbbf0b36db7ac08eeae0b8362da1fabb /config | |
| parent | e813ec79c201c85c5af3b10c051ae92ab5cb8606 (diff) | |
| parent | f26df8bb66158baacb79c79822babaf137607cd6 (diff) | |
| download | rneovim-840c12c10741d8f70e1787534fb6ea6d2b70edee.tar.gz rneovim-840c12c10741d8f70e1787534fb6ea6d2b70edee.tar.bz2 rneovim-840c12c10741d8f70e1787534fb6ea6d2b70edee.zip | |
Merge remote-tracking branch 'upstream/master' into libcallnr
Diffstat (limited to 'config')
| -rw-r--r-- | config/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | config/pathdef.c.in | 1 | ||||
| -rw-r--r-- | config/versiondef.h.in | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index 0ca41d5dfd..6c9e06d59d 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -12,7 +12,7 @@ check_type_size("size_t" SIZEOF_SIZE_T) check_type_size("long long" SIZEOF_LONG_LONG) check_type_size("void *" SIZEOF_VOID_PTR) -if (CMAKE_HOST_SYSTEM_VERSION MATCHES ".*-Microsoft") +if (CMAKE_HOST_SYSTEM_VERSION MATCHES ".*-(Microsoft|microsoft-standard)") # Windows Subsystem for Linux set(HAVE_WSL 1) endif() diff --git a/config/pathdef.c.in b/config/pathdef.c.in index 41950f5ac5..6a8a2b205a 100644 --- a/config/pathdef.c.in +++ b/config/pathdef.c.in @@ -3,5 +3,6 @@ #include "${PROJECT_SOURCE_DIR}/src/nvim/vim.h" char *default_vim_dir = "${CMAKE_INSTALL_FULL_DATAROOTDIR}/nvim"; char *default_vimruntime_dir = ""; +char *default_lib_dir = "${CMAKE_INSTALL_FULL_LIBDIR}/nvim"; char_u *compiled_user = (char_u *)"${USERNAME}"; char_u *compiled_sys = (char_u *)"${HOSTNAME}"; diff --git a/config/versiondef.h.in b/config/versiondef.h.in index b9565735b3..22cad87249 100644 --- a/config/versiondef.h.in +++ b/config/versiondef.h.in @@ -5,7 +5,11 @@ #define NVIM_VERSION_MINOR @NVIM_VERSION_MINOR@ #define NVIM_VERSION_PATCH @NVIM_VERSION_PATCH@ #define NVIM_VERSION_PRERELEASE "@NVIM_VERSION_PRERELEASE@" + #cmakedefine NVIM_VERSION_MEDIUM "@NVIM_VERSION_MEDIUM@" +#ifndef NVIM_VERSION_MEDIUM +# include "auto/versiondef_git.h" +#endif #define NVIM_API_LEVEL @NVIM_API_LEVEL@ #define NVIM_API_LEVEL_COMPAT @NVIM_API_LEVEL_COMPAT@ |