This commit is contained in:
Jia Yue Hua 2023-10-04 12:08:27 +08:00 коммит произвёл GitHub
Родитель 0a997f005e
Коммит 1981815413
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
5 изменённых файлов: 55 добавлений и 11 удалений

Просмотреть файл

@ -1,8 +1,47 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed753b9..5dc80c2 100644
--- a/CMakeLists.txt
+++ a/CMakeLists.txt
@@ -115,3 +115,4 @@
+target_compile_features(caf_internal INTERFACE cxx_std_17)
# TODO: simply set CXX_STANDARD when switching to CMake ≥ 3.9.6
-if(NOT CMAKE_CROSSCOMPILING)
+if(0)
try_compile(caf_has_cxx_17
+++ b/CMakeLists.txt
@@ -131,7 +131,7 @@ endif()
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\"); }")
@@ -177,7 +177,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_OBJECTS:${obj_lib_target}>)
- 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)
add_executable(${tst_bin_target}
${CAF_ADD_COMPONENT_LEGACY_TEST_SOURCES}
$<TARGET_OBJECTS:${obj_lib_target}>)
- target_link_libraries(${tst_bin_target} PRIVATE libcaf_test
- ${CAF_ADD_COMPONENT_DEPENDENCIES})
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()
add_subdirectory(libcaf_core)
-add_subdirectory(libcaf_test)
if(CAF_ENABLE_NET_MODULE)
add_subdirectory(libcaf_net)

Просмотреть файл

@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO actor-framework/actor-framework
REF bac5b8b24a62ff2a818de1b08f6f31f897e42222 # 0.19.1
SHA512 c61f3cce4d4707f19db8c1b1a8b2c4655335a7a29c77a0c9692775c9fcdc90d6dce75d3122804c31cf66c47f37d3a3674ad18df67d1204c7f52eb4740ff766af
REF "${VERSION}"
SHA512 97766b5b0a4db96b03be77c1ffd2198cc5536c09e2a06bb6fcff023ee78692f2c23ad213dc9698d6abfe950c61c4a2565bbfdfe871652cef816829e83d16ceab
HEAD_REF master
PATCHES
fix_dependency.patch

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "caf",
"version": "0.19.1",
"version": "0.19.3",
"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",

Просмотреть файл

@ -1385,7 +1385,7 @@
"port-version": 0
},
"caf": {
"baseline": "0.19.1",
"baseline": "0.19.3",
"port-version": 0
},
"caffe2": {

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2b744b08352077e2bf620c383d9924f4a008cbca",
"version": "0.19.3",
"port-version": 0
},
{
"git-tree": "0561defb72007b054cede4fed6ef5950f8c2e2bc",
"version": "0.19.1",