diff options
Diffstat (limited to 'cmake.config')
| -rw-r--r-- | cmake.config/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | cmake.config/config.h.in | 3 | ||||
| -rw-r--r-- | cmake.config/iwyu/mapping.imp | 2 | ||||
| -rw-r--r-- | cmake.config/pathdef.c.in | 4 |
4 files changed, 4 insertions, 10 deletions
diff --git a/cmake.config/CMakeLists.txt b/cmake.config/CMakeLists.txt index 0ea2124401..6de86cbaf2 100644 --- a/cmake.config/CMakeLists.txt +++ b/cmake.config/CMakeLists.txt @@ -51,11 +51,6 @@ check_function_exists(getpwent HAVE_GETPWENT) check_function_exists(getpwnam HAVE_GETPWNAM) check_function_exists(getpwuid HAVE_GETPWUID) check_function_exists(readv HAVE_READV) - -if(Iconv_FOUND) - set(HAVE_ICONV 1) -endif() - check_function_exists(opendir HAVE_OPENDIR) check_function_exists(readlink HAVE_READLINK) check_function_exists(setpgid HAVE_SETPGID) diff --git a/cmake.config/config.h.in b/cmake.config/config.h.in index f946fa6124..4669e42c0f 100644 --- a/cmake.config/config.h.in +++ b/cmake.config/config.h.in @@ -1,8 +1,6 @@ #ifndef AUTO_CONFIG_H #define AUTO_CONFIG_H -#cmakedefine DEBUG - #cmakedefine SIZEOF_INT @SIZEOF_INT@ #cmakedefine SIZEOF_INTMAX_T @SIZEOF_INTMAX_T@ #cmakedefine SIZEOF_INT32_T @SIZEOF_INT32_T@ @@ -24,7 +22,6 @@ #cmakedefine HAVE_GETPWENT #cmakedefine HAVE_GETPWNAM #cmakedefine HAVE_GETPWUID -#cmakedefine HAVE_ICONV #cmakedefine HAVE_LANGINFO_H #cmakedefine HAVE_LOCALE_H #cmakedefine HAVE_NL_LANGINFO_CODESET diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index 592c60b756..4e55aa9875 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -178,6 +178,8 @@ { include: [ '"regexp_bt.h.generated.h"', private, '"nvim/regexp.h"', public ] }, { include: [ '"ui_events_call.h.generated.h"', private, '"nvim/ui.h"', public ] }, { include: [ '"ui_events_client.h.generated.h"', private, '"nvim/ui_client.h"', public ] }, + { include: [ '"ui_events_remote.generated.h"', private, '"nvim/api/ui.h"', public ] }, + { include: [ '"ui_events_remote.h.generated.h"', private, '"nvim/api/ui.h"', public ] }, # Def to normal headers: nvim/header_defs.h -> nvim/header.h # diff --git a/cmake.config/pathdef.c.in b/cmake.config/pathdef.c.in index 6a8a2b205a..5d6dfa6b9f 100644 --- a/cmake.config/pathdef.c.in +++ b/cmake.config/pathdef.c.in @@ -4,5 +4,5 @@ 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}"; +char *compiled_user = "${USERNAME}"; +char *compiled_sys = "${HOSTNAME}"; |