diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-01-22 14:37:19 -0500 |
|---|---|---|
| committer | Florian Walch <florian@fwalch.com> | 2016-01-22 23:03:14 +0100 |
| commit | feb70192a85d04343ecc383ea9a42aa8cd15e98d (patch) | |
| tree | 99b5d68e162162e90efe71028e225c89a560bd60 | |
| parent | bcbcf235f61bd75f965f35897784ea618fe7acb8 (diff) | |
| download | rneovim-feb70192a85d04343ecc383ea9a42aa8cd15e98d.tar.gz rneovim-feb70192a85d04343ecc383ea9a42aa8cd15e98d.tar.bz2 rneovim-feb70192a85d04343ecc383ea9a42aa8cd15e98d.zip | |
cmake: Search for both libmsgpackc and libmsgpack #4075
libmsgpack was the old C++ library provided by msgpack-c. The C library
is libmsgpackc.
The C++ support became header-only, but there was a bug
(msgpack/msgpack-c#395) wherein using msgpack-c's CMake build system
would only install libmsgpack instead of libmsgpackc.
Searching for both libraries, but preferring libmsgpackc, allows for
building against older msgpack-c releases and prepares for the upcoming
msgpack-c release which fixes the aforementioned issues.
Signed-off-by: James McCoy <jamessan@jamessan.com>
| -rw-r--r-- | cmake/FindMsgpack.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmake/FindMsgpack.cmake b/cmake/FindMsgpack.cmake index 7d88137915..fbd107e45a 100644 --- a/cmake/FindMsgpack.cmake +++ b/cmake/FindMsgpack.cmake @@ -7,7 +7,7 @@ if(NOT MSGPACK_USE_BUNDLED) find_package(PkgConfig) if (PKG_CONFIG_FOUND) - pkg_check_modules(PC_MSGPACK QUIET msgpack) + pkg_search_module(PC_MSGPACK QUIET msgpackc msgpack) endif() else() set(PC_MSGPACK_INCLUDEDIR) @@ -23,13 +23,14 @@ find_path(MSGPACK_INCLUDE_DIR msgpack.h HINTS ${PC_MSGPACK_INCLUDEDIR} ${PC_MSGPACK_INCLUDE_DIRS} ${LIMIT_SEARCH}) -# If we're asked to use static linkage, add libmsgpack.a as a preferred library name. +# If we're asked to use static linkage, add libmsgpack{,c}.a as a preferred library name. if(MSGPACK_USE_STATIC) list(APPEND MSGPACK_NAMES + "${CMAKE_STATIC_LIBRARY_PREFIX}msgpackc${CMAKE_STATIC_LIBRARY_SUFFIX}" "${CMAKE_STATIC_LIBRARY_PREFIX}msgpack${CMAKE_STATIC_LIBRARY_SUFFIX}") endif() -list(APPEND MSGPACK_NAMES msgpack) +list(APPEND MSGPACK_NAMES msgpackc msgpack) find_library(MSGPACK_LIBRARY NAMES ${MSGPACK_NAMES} HINTS ${PC_MSGPACK_LIBDIR} ${PC_MSGPACK_LIBRARY_DIRS} |