summaryrefslogtreecommitdiff
path: root/app-editors/neovim/files/neovim-0.8-msgpack-6.0.0-fix.patch
blob: ce5f7bb86dc4780530bb493230d689f34444fdc1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
# https://github.com/neovim/neovim/commit/46c4cbced567f5f05f2c95b91cd90084ea8b5528
# Closes: https://bugs.gentoo.org/903629
# Contributed by Olivier Huber <oli.huber@gmail.com>
--- a/cmake/FindMsgpack.cmake
+++ b/cmake/FindMsgpack.cmake
@@ -26,18 +26,8 @@
   set(MSGPACK_VERSION_STRING)
 endif()

-if(MSVC)
-  # The import library for the msgpack DLL has a different name
-  list(APPEND MSGPACK_NAMES msgpackc_import)
-else()
-  list(APPEND MSGPACK_NAMES msgpackc msgpack)
-endif()
-
-find_library(MSGPACK_LIBRARY NAMES ${MSGPACK_NAMES}
-  # Check each directory for all names to avoid using headers/libraries from
-  # different places.
-  NAMES_PER_DIR
-  HINTS ${PC_MSGPACK_LIBDIR} ${PC_MSGPACK_LIBRARY_DIRS})
+find_library(MSGPACK_LIBRARY NAMES msgpackc msgpack msgpackc_import msgpack-c
+  NAMES_PER_DIR)

 mark_as_advanced(MSGPACK_INCLUDE_DIR MSGPACK_LIBRARY)