[caf] update to 1.0.1 (#40977)

This commit is contained in:
Cheney Wang 2024-09-19 03:25:01 +08:00 committed by GitHub
parent dd3adcf020
commit b23a9bd611
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 15 additions and 32 deletions

View File

@ -1,40 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index f088f6a..a8bcf80 100644 index 0622702..f44e0f5 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -134,7 +134,7 @@ endif() @@ -158,7 +158,6 @@ install(TARGETS caf_internal EXPORT CAFTargets)
if(NOT DEFINED CAF_USE_STD_FORMAT)
set(CAF_USE_STD_FORMAT OFF CACHE BOOL "Enable std::format support" FORCE)
- if(NOT CMAKE_CROSSCOMPILING)
+ if(0)
set(snippet "#include <format>
#include <iostream>
int main() { std::cout << std::format(\"{}\", \"ok\"); }")
@@ -180,8 +180,6 @@ endif()
# -- create the libcaf_test target ahead of time for caf_core ------------------ # -- create the libcaf_test target ahead of time for caf_core ------------------
-add_library(libcaf_test) -add_library(libcaf_test)
-
# -- add uninstall target if it does not exist yet ----------------------------- # -- add uninstall target if it does not exist yet -----------------------------
if(NOT TARGET uninstall) @@ -351,7 +350,6 @@ endfunction()
@@ -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})
- target_link_libraries(${tst_bin_target} PRIVATE libcaf_test
- ${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)
@@ -383,8 +379,6 @@ endfunction()
add_subdirectory(libcaf_core) add_subdirectory(libcaf_core)
-add_subdirectory(libcaf_test) -add_subdirectory(libcaf_test)
-
if(CAF_ENABLE_NET_MODULE) if(CAF_ENABLE_NET_MODULE)
add_subdirectory(libcaf_net) add_subdirectory(libcaf_net)
endif()

View File

@ -2,8 +2,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO actor-framework/actor-framework REPO actor-framework/actor-framework
REF "${VERSION}" REF "${VERSION}"
SHA512 8a7aacbd9bf18318d9ca1f5fb30c101220c1eef2c4bfe82c53760024022473109038872c0deb5a60d732a91da8d863c556a27018e6b667bfcfbf536df3cebcaf SHA512 0849a0b17a2c011142dd56ff88b01d764dc57b40de5d8467bcf1aa2ddd7540415228dc05f8652b9534e18fb8c2e28465bf881fe1e1bf5c7f9919cfb3edd573d3
HEAD_REF master HEAD_REF main
PATCHES PATCHES
fix_dependency.patch fix_dependency.patch
fix_cxx17.patch fix_cxx17.patch
@ -12,7 +12,6 @@ vcpkg_from_github(
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
-DCAF_ENABLE_CURL_EXAMPLES=OFF -DCAF_ENABLE_CURL_EXAMPLES=OFF
-DCAF_ENABLE_PROTOBUF_EXAMPLES=OFF -DCAF_ENABLE_PROTOBUF_EXAMPLES=OFF
-DCAF_ENABLE_QT6_EXAMPLES=OFF -DCAF_ENABLE_QT6_EXAMPLES=OFF
@ -20,10 +19,8 @@ vcpkg_cmake_configure(
-DCAF_ENABLE_ACTOR_PROFILER=OFF -DCAF_ENABLE_ACTOR_PROFILER=OFF
-DCAF_ENABLE_EXAMPLES=OFF -DCAF_ENABLE_EXAMPLES=OFF
-DCAF_ENABLE_TESTING=OFF -DCAF_ENABLE_TESTING=OFF
-DCAF_ENABLE_TOOLS=OFF
-DCAF_ENABLE_IO_MODULE=ON -DCAF_ENABLE_IO_MODULE=ON
-DCAF_ENABLE_EXCEPTIONS=ON -DCAF_ENABLE_EXCEPTIONS=ON
-DCAF_ENABLE_UTILITY_TARGETS=OFF
) )
vcpkg_cmake_install() vcpkg_cmake_install()
@ -33,5 +30,6 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME CAF CONFIG_PATH lib/cmake/CAF)
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caf/internal")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

View File

@ -1,6 +1,6 @@
{ {
"name": "caf", "name": "caf",
"version": "0.19.6", "version": "1.0.1",
"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.", "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", "homepage": "https://github.com/actor-framework/actor-framework",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",

View File

@ -1469,7 +1469,7 @@
"port-version": 0 "port-version": 0
}, },
"caf": { "caf": {
"baseline": "0.19.6", "baseline": "1.0.1",
"port-version": 0 "port-version": 0
}, },
"caffe2": { "caffe2": {

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "2cb6b24903b98d8335f18f4964ce6823550b836b",
"version": "1.0.1",
"port-version": 0
},
{ {
"git-tree": "e71a51cfec683161a30d2dcca04fe5fc7f063ea7", "git-tree": "e71a51cfec683161a30d2dcca04fe5fc7f063ea7",
"version": "0.19.6", "version": "0.19.6",