diff --git a/CMakeLists.txt b/CMakeLists.txt index 1896352f99a6124cb944e9fb4ea5abeaafe7da98..4f46916a3b9377e70f209ab9bbabe3b45ac787e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -192,6 +192,7 @@ if(MSVC) "WEBRTC_WIN;" "WEBRTC_AUDIO_PROCESSING_ONLY_BUILD;" "WEBRTC_NS_FLOAT;" + "MSGPACK_NO_BOOST;" ) endif() diff --git a/contrib/src/msgpack/SHA512SUMS b/contrib/src/msgpack/SHA512SUMS index 5fb42518a2807dddc1c33919d013ad40752eaece..e4175ad5d613514e42005097ff9d1226e92aad79 100644 --- a/contrib/src/msgpack/SHA512SUMS +++ b/contrib/src/msgpack/SHA512SUMS @@ -1 +1 @@ -698fcdd5b427373997d0c89ff2cd09c44cf3b165defd381ff3cd9e14ecb83841064754a42aab99441a3b17aa26e3daec8f83e40d6d482c4b443b21b313278d14 msgpack-c-cpp-3.2.0.tar.gz \ No newline at end of file +33ed87b23d776cadcc230666e6435088e402c5813e7e4dce5ce79c8c3aceba5a36db8f395278042c6ac44c474b33018ff1635889d8b20bc41c5f6f1d1c963cae msgpack-c-cpp-3.3.0.tar.gz \ No newline at end of file diff --git a/contrib/src/msgpack/package.json b/contrib/src/msgpack/package.json index 1fc463d787d401de06e3f04c2d54a0245843376b..0bf984ef526975830f5bd60ebd1ee65baab0818e 100644 --- a/contrib/src/msgpack/package.json +++ b/contrib/src/msgpack/package.json @@ -1,11 +1,11 @@ { "name": "msgpack-c", - "version": "cpp-3.2.0", + "version": "cpp-4.1.1", "url": "https://github.com/msgpack/msgpack-c/archive/__VERSION__.tar.gz", "use_cmake" : true, "defines": [ - "MSGPACK_CXX11=ON", - "MSGPACK_BUILD_EXAMPLES=OFF", - "MSGPACK_ENABLE_SHARED=OFF" + "MSGPACK_USE_BOOST=OFF", + "MSGPACK_CXX17=ON", + "MSGPACK_BUILD_EXAMPLES=OFF" ] } \ No newline at end of file diff --git a/contrib/src/msgpack/rules.mak b/contrib/src/msgpack/rules.mak index 2896e3a2d269d0618f1ac79a6c46e4ee3fe0fbd6..b1708b7cbe076972a4b1b0922fc324b268724eab 100644 --- a/contrib/src/msgpack/rules.mak +++ b/contrib/src/msgpack/rules.mak @@ -1,5 +1,5 @@ # MSGPACK -MSGPACK_VERSION := cpp-3.2.0 +MSGPACK_VERSION := cpp-3.3.0 MSGPACK_URL := https://github.com/msgpack/msgpack-c/archive/$(MSGPACK_VERSION).tar.gz PKGS += msgpack @@ -8,6 +8,7 @@ PKGS_FOUND += msgpack endif MSGPACK_CMAKECONF := -DMSGPACK_CXX17=ON \ + -DMSGPACK_CXX_ONLY=ON \ -DMSGPACK_BUILD_EXAMPLES=OFF \ -DMSGPACK_ENABLE_SHARED=OFF \ -DCMAKE_INSTALL_LIBDIR=lib