diff --git a/ports/coolprop/fix-dependency.patch b/ports/coolprop/fix-dependency.patch index 7eed56f45c..ccae2cd46b 100644 --- a/ports/coolprop/fix-dependency.patch +++ b/ports/coolprop/fix-dependency.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 414f380..619dfeb 100644 +index 7bbf8d6..617ac93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -247,13 +247,10 @@ list(REMOVE_ITEM APP_SOURCES +@@ -247,13 +247,11 @@ list(REMOVE_ITEM APP_SOURCES list(REMOVE_ITEM APP_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/CoolPropLib.cpp") set(APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}") @@ -14,9 +14,10 @@ index 414f380..619dfeb 100644 -list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/fmtlib" -)# should be deprecated +find_package(Eigen3 CONFIG REQUIRED) -+find_package(msgpack CONFIG REQUIRED) ++find_package(msgpack-cxx CONFIG REQUIRED) +find_package(fmt CONFIG REQUIRED) -+link_libraries(Eigen3::Eigen fmt::fmt msgpackc-cxx) ++link_libraries(Eigen3::Eigen fmt::fmt) ++include_directories(msgpackc-cxx) list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include") list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src") diff --git a/ports/coolprop/vcpkg.json b/ports/coolprop/vcpkg.json index 9690938cc4..f514ce886f 100644 --- a/ports/coolprop/vcpkg.json +++ b/ports/coolprop/vcpkg.json @@ -1,6 +1,7 @@ { "name": "coolprop", "version-semver": "6.4.3", + "port-version": 1, "description": "Thermophysical properties for the masses", "homepage": "https://github.com/CoolProp/CoolProp", "license": "MIT", diff --git a/ports/msgpack/portfile.cmake b/ports/msgpack/portfile.cmake index 2bdc170e15..164ccd4bec 100644 --- a/ports/msgpack/portfile.cmake +++ b/ports/msgpack/portfile.cmake @@ -5,9 +5,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO msgpack/msgpack-c - REF cpp-4.1.3 - SHA512 1252a2d61b119e9a8db6cc3667d2ae3234784d6607e2d08b836ab2f561455aa8c14ac134de0e8bb47f85a9fa86a9b325babd0a5a437daa0f270143d07738adcf - HEAD_REF master + REF cpp-6.0.0 + SHA512 6f2ec74562f30d12ba81659737c412317848eb27fbc607a2f4f8da4b75534fbfba7d280a5af6fdae3581a6a2582e6cf06d7fbfacc3bdee1174456817dd9f7e30 + HEAD_REF cpp_master ) vcpkg_cmake_configure( @@ -20,7 +20,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(PACKAGE_NAME msgpackc-cxx CONFIG_PATH lib/cmake/msgpackc-cxx) +vcpkg_cmake_config_fixup(PACKAGE_NAME msgpack-cxx CONFIG_PATH lib/cmake/msgpack-cxx) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") diff --git a/ports/msgpack/vcpkg.json b/ports/msgpack/vcpkg.json index e3119a9fbd..2d9903b70b 100644 --- a/ports/msgpack/vcpkg.json +++ b/ports/msgpack/vcpkg.json @@ -1,11 +1,14 @@ { "name": "msgpack", - "version": "4.1.3", + "version": "6.0.0", "description": "MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller.", "homepage": "https://github.com/msgpack/msgpack-c", "license": "BSL-1.0", "dependencies": [ - "boost", + "boost-fusion", + "boost-numeric-conversion", + "boost-optional", + "boost-variant", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index a5e6d10cbd..82c3c2d475 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1702,7 +1702,7 @@ }, "coolprop": { "baseline": "6.4.3", - "port-version": 0 + "port-version": 1 }, "coroutine": { "baseline": "1.5.0", @@ -5305,7 +5305,7 @@ "port-version": 0 }, "msgpack": { - "baseline": "4.1.3", + "baseline": "6.0.0", "port-version": 0 }, "msgpack-c": { diff --git a/versions/c-/coolprop.json b/versions/c-/coolprop.json index d264b48969..c868fc16e8 100644 --- a/versions/c-/coolprop.json +++ b/versions/c-/coolprop.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0bdc5514d6d96d6767c50a09840b164fbf86d93", + "version-semver": "6.4.3", + "port-version": 1 + }, { "git-tree": "ecf4aa81e29286ea194307b2379ef1fd0e3e311f", "version-semver": "6.4.3", diff --git a/versions/m-/msgpack.json b/versions/m-/msgpack.json index 7bfbfc1187..eeb891a68f 100644 --- a/versions/m-/msgpack.json +++ b/versions/m-/msgpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc124bda56c5eca176379c3e17f9c2f2d63bbdd9", + "version": "6.0.0", + "port-version": 0 + }, { "git-tree": "006d17cf08d5bb92fdb2f4bf33ba97d18cbcc090", "version": "4.1.3",