diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-04-30 10:46:01 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-04-30 10:46:01 -0400 |
| commit | b427dcdda286603a06ed29b45f1090894e92074a (patch) | |
| tree | 734a0759fe9f1561a86f074396ec90d6f8011562 /config | |
| parent | 45b617afada9304cb265aad02645b22d76dfc2d5 (diff) | |
| parent | 8130eb1191aece52d8b2790302abf1bd09aaf90f (diff) | |
| download | rneovim-b427dcdda286603a06ed29b45f1090894e92074a.tar.gz rneovim-b427dcdda286603a06ed29b45f1090894e92074a.tar.bz2 rneovim-b427dcdda286603a06ed29b45f1090894e92074a.zip | |
Merge pull request #2465 from fwalch/fix-jemalloc
Force je_ prefix for jemalloc functions, small CMake fixes.
Diffstat (limited to 'config')
| -rw-r--r-- | config/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | config/config.h.in | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index ed1f422070..cdf31a8966 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -46,6 +46,10 @@ if(Iconv_FOUND) set(HAVE_ICONV 1) endif() +if(JEMALLOC_FOUND) + set(HAVE_JEMALLOC 1) +endif() + check_function_exists(lstat HAVE_LSTAT) if(NOT HAVE_LSTAT) # os_unix.c uses lstat.c diff --git a/config/config.h.in b/config/config.h.in index 9b2abfa19d..0419451e26 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -66,6 +66,9 @@ #define FEAT_BROWSE #define FEAT_CSCOPE #define FEAT_MOUSE -#cmakedefine USE_JEMALLOC + +#ifndef UNIT_TESTING +#cmakedefine HAVE_JEMALLOC +#endif #endif // AUTO_CONFIG_H |