Skip to content

Commit f7423ee

Browse files
[caf] Update to 0.19.6 (#39288)
1 parent 101ae1f commit f7423ee

File tree

5 files changed

+21
-23
lines changed

5 files changed

+21
-23
lines changed

ports/caf/fix_cxx17.patch

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index ed753b9..5dc80c2 100644
2+
index f088f6a..a8bcf80 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -131,7 +131,7 @@ endif()
5+
@@ -134,7 +134,7 @@ endif()
66

77
if(NOT DEFINED CAF_USE_STD_FORMAT)
88
set(CAF_USE_STD_FORMAT OFF CACHE BOOL "Enable std::format support" FORCE)
@@ -11,37 +11,30 @@ index ed753b9..5dc80c2 100644
1111
set(snippet "#include <format>
1212
#include <iostream>
1313
int main() { std::cout << std::format(\"{}\", \"ok\"); }")
14-
@@ -177,7 +177,6 @@ endif()
14+
@@ -180,8 +180,6 @@ endif()
1515

1616
# -- create the libcaf_test target ahead of time for caf_core ------------------
1717

1818
-add_library(libcaf_test)
19-
19+
-
2020
# -- add uninstall target if it does not exist yet -----------------------------
2121

22-
@@ -289,8 +288,6 @@ function(caf_add_component name)
23-
string(REPLACE "/" "-" test_name "${test_path}/${test_name}-test")
24-
add_executable("${test_name}" ${source_file}
25-
$<TARGET_OBJECTS:${obj_lib_target}>)
26-
- target_link_libraries(${test_name} PRIVATE libcaf_test
27-
- ${CAF_ADD_COMPONENT_DEPENDENCIES})
28-
target_include_directories(${test_name} PRIVATE
29-
"${CMAKE_CURRENT_SOURCE_DIR}"
30-
"${CMAKE_CURRENT_BINARY_DIR}")
31-
@@ -314,8 +311,6 @@ function(caf_add_component name)
22+
if(NOT TARGET uninstall)
23+
@@ -326,8 +324,6 @@ function(caf_add_component name)
24+
list(APPEND targets ${tst_bin_target})
3225
add_executable(${tst_bin_target}
33-
${CAF_ADD_COMPONENT_LEGACY_TEST_SOURCES}
34-
$<TARGET_OBJECTS:${obj_lib_target}>)
26+
${CAF_ADD_COMPONENT_LEGACY_TEST_SOURCES})
3527
- target_link_libraries(${tst_bin_target} PRIVATE libcaf_test
36-
- ${CAF_ADD_COMPONENT_DEPENDENCIES})
28+
- ${CAF_ADD_COMPONENT_DEPENDENCIES} ${lib_target})
3729
target_include_directories(${tst_bin_target} PRIVATE
3830
"${CMAKE_CURRENT_SOURCE_DIR}/tests/legacy")
3931
if(CAF_ADD_COMPONENT_LEGACY_TEST_SUITES)
40-
@@ -373,7 +368,6 @@ endfunction()
32+
@@ -383,8 +379,6 @@ endfunction()
4133

4234
add_subdirectory(libcaf_core)
4335

4436
-add_subdirectory(libcaf_test)
45-
37+
-
4638
if(CAF_ENABLE_NET_MODULE)
4739
add_subdirectory(libcaf_net)
40+
endif()

ports/caf/portfile.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ vcpkg_from_github(
22
OUT_SOURCE_PATH SOURCE_PATH
33
REPO actor-framework/actor-framework
44
REF "${VERSION}"
5-
SHA512 97766b5b0a4db96b03be77c1ffd2198cc5536c09e2a06bb6fcff023ee78692f2c23ad213dc9698d6abfe950c61c4a2565bbfdfe871652cef816829e83d16ceab
5+
SHA512 8a7aacbd9bf18318d9ca1f5fb30c101220c1eef2c4bfe82c53760024022473109038872c0deb5a60d732a91da8d863c556a27018e6b667bfcfbf536df3cebcaf
66
HEAD_REF master
77
PATCHES
88
fix_dependency.patch
@@ -34,4 +34,4 @@ vcpkg_copy_pdbs()
3434

3535
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
3636

37-
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
37+
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

ports/caf/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "caf",
3-
"version": "0.19.3",
3+
"version": "0.19.6",
44
"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.",
55
"homepage": "https://github.com/actor-framework/actor-framework",
66
"license": "BSD-3-Clause",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1453,7 +1453,7 @@
14531453
"port-version": 0
14541454
},
14551455
"caf": {
1456-
"baseline": "0.19.3",
1456+
"baseline": "0.19.6",
14571457
"port-version": 0
14581458
},
14591459
"caffe2": {

versions/c-/caf.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "e71a51cfec683161a30d2dcca04fe5fc7f063ea7",
5+
"version": "0.19.6",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "2b744b08352077e2bf620c383d9924f4a008cbca",
510
"version": "0.19.3",

0 commit comments

Comments
 (0)