diff --git a/ports/caf/fix_cxx17.patch b/ports/caf/fix_cxx17.patch index ba7d2e3ab7b026..0d0949e7124f74 100644 --- a/ports/caf/fix_cxx17.patch +++ b/ports/caf/fix_cxx17.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ed753b9..5dc80c2 100644 +index f088f6a..a8bcf80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -131,7 +131,7 @@ endif() +@@ -134,7 +134,7 @@ endif() if(NOT DEFINED CAF_USE_STD_FORMAT) set(CAF_USE_STD_FORMAT OFF CACHE BOOL "Enable std::format support" FORCE) @@ -11,37 +11,30 @@ index ed753b9..5dc80c2 100644 set(snippet "#include #include int main() { std::cout << std::format(\"{}\", \"ok\"); }") -@@ -177,7 +177,6 @@ endif() +@@ -180,8 +180,6 @@ endif() # -- create the libcaf_test target ahead of time for caf_core ------------------ -add_library(libcaf_test) - +- # -- add uninstall target if it does not exist yet ----------------------------- -@@ -289,8 +288,6 @@ function(caf_add_component name) - string(REPLACE "/" "-" test_name "${test_path}/${test_name}-test") - add_executable("${test_name}" ${source_file} - $) -- target_link_libraries(${test_name} PRIVATE libcaf_test -- ${CAF_ADD_COMPONENT_DEPENDENCIES}) - target_include_directories(${test_name} PRIVATE - "${CMAKE_CURRENT_SOURCE_DIR}" - "${CMAKE_CURRENT_BINARY_DIR}") -@@ -314,8 +311,6 @@ function(caf_add_component name) + if(NOT TARGET uninstall) +@@ -326,8 +324,6 @@ function(caf_add_component name) + list(APPEND targets ${tst_bin_target}) add_executable(${tst_bin_target} - ${CAF_ADD_COMPONENT_LEGACY_TEST_SOURCES} - $) + ${CAF_ADD_COMPONENT_LEGACY_TEST_SOURCES}) - target_link_libraries(${tst_bin_target} PRIVATE libcaf_test -- ${CAF_ADD_COMPONENT_DEPENDENCIES}) +- ${CAF_ADD_COMPONENT_DEPENDENCIES} ${lib_target}) target_include_directories(${tst_bin_target} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/tests/legacy") if(CAF_ADD_COMPONENT_LEGACY_TEST_SUITES) -@@ -373,7 +368,6 @@ endfunction() +@@ -383,8 +379,6 @@ endfunction() add_subdirectory(libcaf_core) -add_subdirectory(libcaf_test) - +- if(CAF_ENABLE_NET_MODULE) add_subdirectory(libcaf_net) + endif() diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake index 4732ed6680e232..924710a055d4a9 100644 --- a/ports/caf/portfile.cmake +++ b/ports/caf/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO actor-framework/actor-framework REF "${VERSION}" - SHA512 97766b5b0a4db96b03be77c1ffd2198cc5536c09e2a06bb6fcff023ee78692f2c23ad213dc9698d6abfe950c61c4a2565bbfdfe871652cef816829e83d16ceab + SHA512 8a7aacbd9bf18318d9ca1f5fb30c101220c1eef2c4bfe82c53760024022473109038872c0deb5a60d732a91da8d863c556a27018e6b667bfcfbf536df3cebcaf HEAD_REF master PATCHES fix_dependency.patch @@ -34,4 +34,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/caf/vcpkg.json b/ports/caf/vcpkg.json index ee9c04d1e9ddab..ee036e1a1bfe5b 100644 --- a/ports/caf/vcpkg.json +++ b/ports/caf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "caf", - "version": "0.19.3", + "version": "0.19.6", "description": "an open source implementation of the actor model for C++ featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.", "homepage": "https://github.com/actor-framework/actor-framework", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index f0752c8a265a09..5ee4d842f6f3ec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1453,7 +1453,7 @@ "port-version": 0 }, "caf": { - "baseline": "0.19.3", + "baseline": "0.19.6", "port-version": 0 }, "caffe2": { diff --git a/versions/c-/caf.json b/versions/c-/caf.json index d1f9512900e899..0be3cefa49ec80 100644 --- a/versions/c-/caf.json +++ b/versions/c-/caf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e71a51cfec683161a30d2dcca04fe5fc7f063ea7", + "version": "0.19.6", + "port-version": 0 + }, { "git-tree": "2b744b08352077e2bf620c383d9924f4a008cbca", "version": "0.19.3",