From f5a3e2da6012eae2950cb670be6e40d2c561ee31 Mon Sep 17 00:00:00 2001 From: dargun Date: Thu, 8 Dec 2022 15:26:54 +0100 Subject: [PATCH 1/3] update msgpack to v4.1.3 --- cmake/configs/default.cmake | 2 +- cmake/projects/msgpack/hunter.cmake | 18 ++++++++++++++++++ docs/packages/pkg/msgpack.rst | 4 ++-- examples/msgpack/CMakeLists.txt | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 056988bb9f..df18bab73c 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -397,7 +397,7 @@ hunter_default_version(mng VERSION 2.0.3-p2) hunter_default_version(mojoshader VERSION 0.0.1) hunter_default_version(mongoose VERSION 6.10) hunter_default_version(mpark_variant VERSION 1.0.0) -hunter_default_version(msgpack VERSION 1.4.1-p2) +hunter_default_version(msgpack VERSION 4.1.3) hunter_default_version(mshadow VERSION 1.1-1d79ecf-p0) hunter_default_version(mtplz VERSION 0.1-p3) hunter_default_version(mxnet VERSION 1.5.0.rc1-b64e00a-p0) diff --git a/cmake/projects/msgpack/hunter.cmake b/cmake/projects/msgpack/hunter.cmake index 7493b10ab8..c90a8febf0 100644 --- a/cmake/projects/msgpack/hunter.cmake +++ b/cmake/projects/msgpack/hunter.cmake @@ -2,6 +2,7 @@ include(hunter_add_version) include(hunter_cacheable) +include(hunter_cmake_args) include(hunter_download) include(hunter_pick_scheme) @@ -27,6 +28,23 @@ hunter_add_version( eafdcb4c0a29d7416248740bd8132316a4b03910 ) +hunter_add_version( + PACKAGE_NAME + msgpack + VERSION + "4.1.3" + URL + "https://github.com/msgpack/msgpack-c/archive/refs/tags/cpp-4.1.3.tar.gz" + SHA1 + e53ea01821cdf8e7d0d9d56d9c2496bda59636e1 + ) + + hunter_pick_scheme(DEFAULT url_sha1_cmake) + +hunter_cmake_args(msgpack CMAKE_ARGS + MSGPACK_USE_BOOST=OFF + MSGPACK_BUILD_DOCS=OFF) + hunter_cacheable(msgpack) hunter_download(PACKAGE_NAME msgpack) diff --git a/docs/packages/pkg/msgpack.rst b/docs/packages/pkg/msgpack.rst index 49546bc8cf..546850ea59 100644 --- a/docs/packages/pkg/msgpack.rst +++ b/docs/packages/pkg/msgpack.rst @@ -3,6 +3,7 @@ msgpack .. index:: unsorted ; msgpack + .. _pkg.msgpack: @@ -13,7 +14,6 @@ msgpack :target: https://github.com/cpp-pm/hunter/releases/tag/v0.14.19 :alt: Hunter v0.14.19 -- `Hunterized `__ - `Example `__ - Added by `Antal Tátrai `__ (`pr-406 `__) @@ -23,4 +23,4 @@ msgpack hunter_add_package(msgpack) find_package(msgpack CONFIG REQUIRED) - target_link_libraries(... msgpack::msgpack) + target_link_libraries(... msgpackc-cxx) diff --git a/examples/msgpack/CMakeLists.txt b/examples/msgpack/CMakeLists.txt index 080f3f5950..17b8c84928 100644 --- a/examples/msgpack/CMakeLists.txt +++ b/examples/msgpack/CMakeLists.txt @@ -11,4 +11,4 @@ set (CMAKE_CXX_STANDARD 11) find_package(msgpack CONFIG REQUIRED) add_executable(container container.cpp) -target_link_libraries(container msgpack::msgpack) +target_link_libraries(container msgpackc-cxx) From 455d6cd2549cfb6f72447819ea0d8fc7523d9026 Mon Sep 17 00:00:00 2001 From: dargun Date: Mon, 12 Dec 2022 12:02:45 +0100 Subject: [PATCH 2/3] update docu and example after review --- docs/packages/pkg/msgpack.rst | 3 ++- examples/msgpack/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/packages/pkg/msgpack.rst b/docs/packages/pkg/msgpack.rst index 546850ea59..b01f39510b 100644 --- a/docs/packages/pkg/msgpack.rst +++ b/docs/packages/pkg/msgpack.rst @@ -18,9 +18,10 @@ msgpack - Added by `Antal Tátrai `__ (`pr-406 `__) - Available since |hunter| +- Target library name is now changed from "msgpack::msgpack" to "msgpackc-cxx" .. code-block:: cmake hunter_add_package(msgpack) find_package(msgpack CONFIG REQUIRED) - target_link_libraries(... msgpackc-cxx) + target_link_libraries(... PRIVATE msgpackc-cxx) diff --git a/examples/msgpack/CMakeLists.txt b/examples/msgpack/CMakeLists.txt index 17b8c84928..95b8dd4413 100644 --- a/examples/msgpack/CMakeLists.txt +++ b/examples/msgpack/CMakeLists.txt @@ -11,4 +11,4 @@ set (CMAKE_CXX_STANDARD 11) find_package(msgpack CONFIG REQUIRED) add_executable(container container.cpp) -target_link_libraries(container msgpackc-cxx) +target_link_libraries(container PRIVATE msgpackc-cxx) From 3a283fefd72ecdb4ca425d90f54a0d4e52078a44 Mon Sep 17 00:00:00 2001 From: NeroBurner Date: Tue, 3 Sep 2024 17:15:25 +0200 Subject: [PATCH 3/3] Update docs/packages/pkg/msgpack.rst --- docs/packages/pkg/msgpack.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/packages/pkg/msgpack.rst b/docs/packages/pkg/msgpack.rst index b01f39510b..5b0b3e8a22 100644 --- a/docs/packages/pkg/msgpack.rst +++ b/docs/packages/pkg/msgpack.rst @@ -18,7 +18,7 @@ msgpack - Added by `Antal Tátrai `__ (`pr-406 `__) - Available since |hunter| -- Target library name is now changed from "msgpack::msgpack" to "msgpackc-cxx" +- Target library name from "msgpack::msgpack" to "msgpackc-cxx" with `v4.1.3` .. code-block:: cmake