aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2020-01-11 07:46:23 +0800
committerdan-shaw <51385773+dan-shaw@users.noreply.github.com>2020-01-10 15:46:23 -0800
commit0fb8168c7c5f83784a62c8051bd6429a9e8c454e (patch)
tree85eeff61d73f8f4cff4ecbb9444f38be3d5c5502
parent7844dedfcb56de2e7ba230ef33fa389851e3f767 (diff)
downloadvcpkg-0fb8168c7c5f83784a62c8051bd6429a9e8c454e.tar.gz
vcpkg-0fb8168c7c5f83784a62c8051bd6429a9e8c454e.zip
[caf] Update to 0.17.2 (#8888)
* [caf]Upgrade to 0.17.2 * update baseline
-rw-r--r--ports/caf/CONTROL2
-rw-r--r--ports/caf/fix-arm.patch19
-rw-r--r--ports/caf/portfile.cmake23
-rw-r--r--scripts/ci.baseline.txt1
4 files changed, 40 insertions, 5 deletions
diff --git a/ports/caf/CONTROL b/ports/caf/CONTROL
index f4a438357..256737e11 100644
--- a/ports/caf/CONTROL
+++ b/ports/caf/CONTROL
@@ -1,4 +1,4 @@
Source: caf
-Version: 0.16.3
+Version: 0.17.2
Build-Depends: openssl
Description: an open source C++11 actor model implementation featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.
diff --git a/ports/caf/fix-arm.patch b/ports/caf/fix-arm.patch
new file mode 100644
index 000000000..1c14287cc
--- /dev/null
+++ b/ports/caf/fix-arm.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index da58790..d79a1ae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -99,11 +99,13 @@ endfunction(pretty_yes)
+
+ add_executable(caf-generate-enum-strings cmake/caf-generate-enum-strings.cpp)
+
++install(TARGETS caf-generate-enum-strings DESTINATION tools)
++
+ function(enum_to_string relative_input_file relative_output_file)
+ set(input "${CMAKE_CURRENT_SOURCE_DIR}/${relative_input_file}")
+ set(output "${CMAKE_CURRENT_BINARY_DIR}/${relative_output_file}")
+ add_custom_command(OUTPUT "${output}"
+- COMMAND caf-generate-enum-strings "${input}" "${output}"
++ COMMAND ${CAF_TOOL_PATH}caf-generate-enum-strings "${input}" "${output}"
+ DEPENDS caf-generate-enum-strings "${input}")
+ endfunction()
+
diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake
index 2e34e888e..de6840664 100644
--- a/ports/caf/portfile.cmake
+++ b/ports/caf/portfile.cmake
@@ -1,15 +1,29 @@
-include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+set(CAF_TOOL_PATH )
+if (VCPKG_TARGET_IS_WINDOWS AND (TRIPLET_SYSTEM_ARCH STREQUAL arm OR TRIPLET_SYSTEM_ARCH STREQUAL arm64))
+ if (EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/caf-generate-enum-strings.exe)
+ set(CAF_TOOL_PATH ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/)
+ elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows-static/tools/caf-generate-enum-strings.exe)
+ set(CAF_TOOL_PATH ${CURRENT_INSTALLED_DIR}/../x86-windows-static/tools/)
+ elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x64-windows/tools/caf-generate-enum-strings.exe AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
+ set(CAF_TOOL_PATH ${CURRENT_INSTALLED_DIR}/../x64-windows/tools/)
+ elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x64-windows-static/tools/caf-generate-enum-strings.exe AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
+ set(CAF_TOOL_PATH ${CURRENT_INSTALLED_DIR}/../x64-windows-static/tools/)
+ else()
+ message(FATAL_ERROR "Since caf needs to run the built-in executable, please install caf:x86-windows or caf:x64-windows first.")
+ endif()
+endif()
+
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO actor-framework/actor-framework
- REF 0.16.3
- SHA512 f7e567264ea1686a431eacbf2a62f49c0f4467df073ec983ae622d9417c28124eb456eb40d6a70dbe062ad58333944924f04f7e3fee5a7b76917890d98bedce1
+ REF 4da751ab7a79bcdc6e9dd2157b9b5c5c6814e26d # 0.17.2
+ SHA512 4bd739c553fcbd6aa3b61372b42ad2ab40099c18959892553b9bc232b95740ba563d967d73e0695f0ce3d31409ae704eb578b6590431039f18291c896f535a36
HEAD_REF master
PATCHES
openssl-version-override.patch
+ fix-arm.patch
)
vcpkg_configure_cmake(
@@ -29,6 +43,7 @@ vcpkg_configure_cmake(
-DCAF_NO_OPENSSL=OFF
-DCAF_NO_CURL_EXAMPLES=ON
-DCAF_OPENSSL_VERSION_OVERRIDE=ON
+ -DCAF_TOOL_PATH=${CAF_TOOL_PATH}
)
vcpkg_install_cmake()
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 0118f405d..b53aafb16 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -180,6 +180,7 @@ bullet3:arm-uwp=fail
bullet3:x64-uwp=fail
butteraugli:x64-linux=ignore
caf:arm-uwp=fail
+caf:arm64-windows=fail
caf:x64-uwp=fail
caf:x64-linux=ignore
caffe2:x86-windows=fail