Merge pull request #2465 from fwalch/fix-jemalloc

Force je_ prefix for jemalloc functions, small CMake fixes.

7 files changed, 47 insertions, 53 deletions

diff --git a/cmake/FindJeMalloc.cmake b/cmake/FindJeMalloc.cmake
index fd20a456fb..f36cbc6f7a 100644
--- a/cmake/FindJeMalloc.cmake
+++ b/cmake/FindJeMalloc.cmake
@@ -4,7 +4,6 @@
 #  JEMALLOC_INCLUDE_DIRS - The jemalloc include directories
 #  JEMALLOC_LIBRARIES - The libraries needed to use jemalloc
 
-find_package(PkgConfig)
 if(NOT JEMALLOC_USE_BUNDLED)
   find_package(PkgConfig)
   if (PKG_CONFIG_FOUND)
diff --git a/cmake/FindLibTermkey.cmake b/cmake/FindLibTermkey.cmake
index e5ec132f85..144deceaae 100644
--- a/cmake/FindLibTermkey.cmake
+++ b/cmake/FindLibTermkey.cmake
@@ -4,7 +4,6 @@
 #  LIBTERMKEY_INCLUDE_DIRS - The libtermkey include directories
 #  LIBTERMKEY_LIBRARIES - The libraries needed to use libtermkey
 
-find_package(PkgConfig)
 if(NOT LIBTERMKEY_USE_BUNDLED)
   find_package(PkgConfig)
   if (PKG_CONFIG_FOUND)
diff --git a/cmake/FindLibUnibilium.cmake b/cmake/FindLibUnibilium.cmake
deleted file mode 100644
index 6aafd07c90..0000000000
--- a/cmake/FindLibUnibilium.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-# - Try to find libunibilium
-# Once done this will define
-#  LIBUNIBILIUM_FOUND - System has libunibilium
-#  LIBUNIBILIUM_INCLUDE_DIRS - The libunibilium include directories
-#  LIBUNIBILIUM_LIBRARIES - The libraries needed to use libunibilium
-
-find_package(PkgConfig)
-if(NOT LIBUNIBILIUM_USE_BUNDLED)
-  find_package(PkgConfig)
-  if (PKG_CONFIG_FOUND)
-    pkg_check_modules(PC_LIBUNIBILIUM QUIET unibilium)
-  endif()
-else()
-  set(PC_LIBUNIBILIUM_INCLUDEDIR)
-  set(PC_LIBUNIBILIUM_INCLUDE_DIRS)
-  set(PC_LIBUNIBILIUM_LIBDIR)
-  set(PC_LIBUNIBILIUM_LIBRARY_DIRS)
-  set(LIMIT_SEARCH NO_DEFAULT_PATH)
-endif()
-
-set(LIBUNIBILIUM_DEFINITIONS ${PC_LIBUNIBILIUM_CFLAGS_OTHER})
-
-find_path(LIBUNIBILIUM_INCLUDE_DIR unibilium.h
-          PATHS ${PC_LIBUNIBILIUM_INCLUDEDIR} ${PC_LIBUNIBILIUM_INCLUDE_DIRS}
-          ${LIMIT_SEARCH})
-
-# If we're asked to use static linkage, add libuv.a as a preferred library name.
-if(LIBUNIBILIUM_USE_STATIC)
-  list(APPEND LIBUNIBILIUM_NAMES
-    "${CMAKE_STATIC_LIBRARY_PREFIX}unibilium${CMAKE_STATIC_LIBRARY_SUFFIX}")
-endif()
-
-list(APPEND LIBUNIBILIUM_NAMES unibilium)
-
-find_library(LIBUNIBILIUM_LIBRARY NAMES ${LIBUNIBILIUM_NAMES}
-  HINTS ${PC_LIBUNIBILIUM_LIBDIR} ${PC_LIBUNIBILIUM_LIBRARY_DIRS}
-  ${LIMIT_SEARCH})
-
-set(LIBUNIBILIUM_LIBRARIES ${LIBUNIBILIUM_LIBRARY})
-set(LIBUNIBILIUM_INCLUDE_DIRS ${LIBUNIBILIUM_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LIBUNIBILIUM_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(LibUnibilium DEFAULT_MSG
-  LIBUNIBILIUM_LIBRARY LIBUNIBILIUM_INCLUDE_DIR)
-
-mark_as_advanced(LIBUNIBILIUM_INCLUDE_DIR LIBUNIBILIUM_LIBRARY)
diff --git a/cmake/FindLibVterm.cmake b/cmake/FindLibVterm.cmake
index 21a0928496..0d773d8896 100644
--- a/cmake/FindLibVterm.cmake
+++ b/cmake/FindLibVterm.cmake
@@ -4,7 +4,6 @@
 #  LIBVTERM_INCLUDE_DIRS - The libvterm include directories
 #  LIBVTERM_LIBRARIES - The libraries needed to use libvterm
 
-find_package(PkgConfig)
 if(NOT LIBVTERM_USE_BUNDLED)
   find_package(PkgConfig)
   if (PKG_CONFIG_FOUND)
diff --git a/cmake/FindLuaJit.cmake b/cmake/FindLuaJit.cmake
index e5fdc764f1..9b24051bd7 100644
--- a/cmake/FindLuaJit.cmake
+++ b/cmake/FindLuaJit.cmake
@@ -4,7 +4,6 @@
 #  LUAJIT_INCLUDE_DIRS - The luajit include directories
 #  LUAJIT_LIBRARIES - The libraries needed to use luajit
 
-find_package(PkgConfig)
 if(NOT LUAJIT_USE_BUNDLED)
   find_package(PkgConfig)
   if (PKG_CONFIG_FOUND)
diff --git a/cmake/FindMsgpack.cmake b/cmake/FindMsgpack.cmake
index 6b3c8bb977..7d88137915 100644
--- a/cmake/FindMsgpack.cmake
+++ b/cmake/FindMsgpack.cmake
@@ -4,7 +4,6 @@
 #  MSGPACK_INCLUDE_DIRS - The msgpack include directories
 #  MSGPACK_LIBRARIES - The libraries needed to use msgpack
 
-find_package(PkgConfig)
 if(NOT MSGPACK_USE_BUNDLED)
   find_package(PkgConfig)
   if (PKG_CONFIG_FOUND)
diff --git a/cmake/FindUnibilium.cmake b/cmake/FindUnibilium.cmake
new file mode 100644
index 0000000000..e1e0de9b7e
--- /dev/null
+++ b/cmake/FindUnibilium.cmake
@@ -0,0 +1,47 @@
+# - Try to find unibilium
+# Once done this will define
+#  UNIBILIUM_FOUND - System has unibilium
+#  UNIBILIUM_INCLUDE_DIRS - The unibilium include directories
+#  UNIBILIUM_LIBRARIES - The libraries needed to use unibilium
+
+if(NOT UNIBILIUM_USE_BUNDLED)
+  find_package(PkgConfig)
+  if (PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_UNIBILIUM QUIET unibilium)
+  endif()
+else()
+  set(PC_UNIBILIUM_INCLUDEDIR)
+  set(PC_UNIBILIUM_INCLUDE_DIRS)
+  set(PC_UNIBILIUM_LIBDIR)
+  set(PC_UNIBILIUM_LIBRARY_DIRS)
+  set(LIMIT_SEARCH NO_DEFAULT_PATH)
+endif()
+
+set(UNIBILIUM_DEFINITIONS ${PC_UNIBILIUM_CFLAGS_OTHER})
+
+find_path(UNIBILIUM_INCLUDE_DIR unibilium.h
+          PATHS ${PC_UNIBILIUM_INCLUDEDIR} ${PC_UNIBILIUM_INCLUDE_DIRS}
+          ${LIMIT_SEARCH})
+
+# If we're asked to use static linkage, add libunibilium.a as a preferred library name.
+if(UNIBILIUM_USE_STATIC)
+  list(APPEND UNIBILIUM_NAMES
+    "${CMAKE_STATIC_LIBRARY_PREFIX}unibilium${CMAKE_STATIC_LIBRARY_SUFFIX}")
+endif()
+
+list(APPEND UNIBILIUM_NAMES unibilium)
+
+find_library(UNIBILIUM_LIBRARY NAMES ${UNIBILIUM_NAMES}
+  HINTS ${PC_UNIBILIUM_LIBDIR} ${PC_UNIBILIUM_LIBRARY_DIRS}
+  ${LIMIT_SEARCH})
+
+set(UNIBILIUM_LIBRARIES ${UNIBILIUM_LIBRARY})
+set(UNIBILIUM_INCLUDE_DIRS ${UNIBILIUM_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set UNIBILIUM_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(unibilium DEFAULT_MSG
+  UNIBILIUM_LIBRARY UNIBILIUM_INCLUDE_DIR)
+
+mark_as_advanced(UNIBILIUM_INCLUDE_DIR UNIBILIUM_LIBRARY)