diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2023-01-10 10:09:52 -0700 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2023-01-10 10:13:15 -0700 |
| commit | 07b61611e9a26854900a8db50235c0b7880e025e (patch) | |
| tree | 57b197f9ffa72a4a176b60d7f701c3b139dd84ef | |
| parent | devel/msgpack-cxx: Update to 5.0.0 (diff) | |
multiple: Fix msgpack cmake package name
msgpack-c's cmake package name changed to `msgpackc'
msgpack-cxx's cmake package named to `msgpackc-cxx' because I guess
that's how msgpack's developers roll.
Fix the two instances I could find where a CMakeLists.txt was looking
for msgpack through its cmake package name. There are probably others.
| -rw-r--r-- | devel/opendht/files/patch-CMakeLists.txt | 11 | ||||
| -rw-r--r-- | science/mmtf-cpp/Makefile | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/devel/opendht/files/patch-CMakeLists.txt b/devel/opendht/files/patch-CMakeLists.txt index 3b7adfa72d00..f50759bf427d 100644 --- a/devel/opendht/files/patch-CMakeLists.txt +++ b/devel/opendht/files/patch-CMakeLists.txt @@ -1,5 +1,14 @@ ---- CMakeLists.txt.orig 2022-11-06 06:47:13 UTC +--- CMakeLists.txt.orig 2023-01-10 16:45:50 UTC +++ CMakeLists.txt +@@ -61,7 +61,7 @@ if (NOT MSVC) + pkg_search_module (Nettle REQUIRED nettle) + check_include_file_cxx(msgpack.hpp HAVE_MSGPACKCXX) + if (NOT HAVE_MSGPACKCXX) +- find_package (msgpack REQUIRED) ++ find_package (msgpackc-cxx REQUIRED) + endif() + if (OPENDHT_TOOLS) + find_package (Readline 6 REQUIRED) @@ -91,8 +91,8 @@ if (NOT MSVC) endif() if (OPENDHT_PROXY_OPENSSL) diff --git a/science/mmtf-cpp/Makefile b/science/mmtf-cpp/Makefile index 01db9e8db41f..fa17eaebe812 100644 --- a/science/mmtf-cpp/Makefile +++ b/science/mmtf-cpp/Makefile @@ -30,6 +30,8 @@ post-patch: # correct paths of test data to be accessible to the test executable s|\.\./submodules/mmtf_spec|${WRKSRC}/submodules/mmtf_spec|g; \ s|\.\./temporary_test_data|${WRKSRC}/temporary_test_data|g' \ ${WRKSRC}/tests/mmtf_tests.cpp + @${REINPLACE_CMD} -e '/find_package/s|msgpack|msgpackc-cxx|' \ + ${WRKSRC}/CMakeLists.txt do-install: cd ${WRKSRC} && ${COPYTREE_SHARE} include ${STAGEDIR}${PREFIX} |