[caf] Update to 0.18.5 (#22046)

* [caf] Update to 0.18.5

* Remove setting of BUILD_SHARED_LIBS already handled by vcpkg_cmake_configure.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

ports/caf/fix_dependency.patch

@@ -0,0 +1,11 @@
+diff --git a/cmake/CAFConfig.cmake.in b/cmake/CAFConfig.cmake.in
+index 1a2348c..6c0d0b2 100644
+--- a/cmake/CAFConfig.cmake.in
++++ b/cmake/CAFConfig.cmake.in
+@@ -5,5 +5,6 @@ include(CMakeFindDependencyMacro)
+ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+ set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+ find_dependency(Threads)
++find_dependency(OpenSSL REQUIRED)
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/CAFTargets.cmake")

ports/caf/openssl-version-override.patch

@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2d908e8..d270297 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -495,6 +495,9 @@ if(NOT CAF_NO_OPENSSL)
-       message(STATUS
-               "Disable OpenSSL. Required >= 1.0.1 due to TLSv1.2 support.")
-       set(CAF_NO_OPENSSL yes)
-+    elseif(CAF_OPENSSL_VERSION_OVERRIDE)
-+        include_directories(BEFORE ${OPENSSL_INCLUDE_DIR})
-+        add_optional_caf_lib(openssl)
-     else()
-       if(NOT CMAKE_CROSSCOMPILING)
-         # Check if openssl headers and library versions match

ports/caf/portfile.cmake

@@ -1,45 +1,36 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO actor-framework/actor-framework
-    REF f7d4fc7ac679e18ba385f64434f8015c3cea9cb5 # 0.17.6
-    SHA512 8b4719c26dfad68eed6f2528263702e42f9865bb7a9f2d40909dc6c3fc20bb7259fe44a5f89390ba714c7f9359db2d171ff44685641962c24a70f4e2aa3f3f65
+    REF c2be26e7f9e3e84ef14730590fc4e7b25fb9d29a # 0.18.5
+    SHA512 e8d1e9417ea71c4f92f51f4f7dbb7bcc9d0468623d2202be9b4ed4411406a3b6f6fc903309b74bb130e7cf1c7a0ec349d8bc2ac8f216a28216d1c808c1bde039
     HEAD_REF master
     PATCHES
-        openssl-version-override.patch
+        fix_dependency.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
-        -DCAF_BUILD_STATIC=ON
-        -DCAF_BUILD_STATIC_ONLY=ON
-        -DCAF_NO_TOOLS=ON
-        -DCAF_NO_EXAMPLES=ON
-        -DCAF_NO_BENCHMARKS=ON
-        -DCAF_NO_UNIT_TESTS=ON
-        -DCAF_NO_PROTOBUF_EXAMPLES=ON
-        -DCAF_NO_QT_EXAMPLES=ON
-        -DCAF_NO_OPENCL=ON
-        -DCAF_NO_OPENSSL=OFF
-        -DCAF_NO_CURL_EXAMPLES=ON
-        -DCAF_OPENSSL_VERSION_OVERRIDE=ON
+        -DCAF_ENABLE_CURL_EXAMPLES=OFF
+        -DCAF_ENABLE_PROTOBUF_EXAMPLES=OFF
+        -DCAF_ENABLE_QT6_EXAMPLES=OFF
+        -DCAF_ENABLE_RUNTIME_CHECKS=OFF
+        -DCAF_ENABLE_ACTOR_PROFILER=OFF
+        -DCAF_ENABLE_EXAMPLES=OFF
+        -DCAF_ENABLE_TESTING=OFF
+        -DCAF_ENABLE_TOOLS=OFF
+        -DCAF_ENABLE_IO_MODULE=ON
+        -DCAF_ENABLE_EXCEPTIONS=ON
         -DCAF_ENABLE_UTILITY_TARGETS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-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)
-    
-file(COPY ${SOURCE_PATH}/cmake/FindCAF.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+vcpkg_cmake_config_fixup(PACKAGE_NAME CAF CONFIG_PATH lib/cmake/CAF)
 
 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)

ports/caf/usage

@@ -1,5 +0,0 @@
-The package caf provides CMake targets:
-
-    find_package(CAF REQUIRED COMPONENTS core io)
-    target_include_directories(main PRIVATE ${CAF_INCLUDE_DIRS})
-    target_link_libraries(main PRIVATE ${CAF_LIBRARIES})

ports/caf/vcpkg-cmake-wrapper.cmake

@@ -1,6 +0,0 @@
-set(CAF_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-
-_find_package(${ARGS})
-
-set(CMAKE_MODULE_PATH ${CAF_PREV_MODULE_PATH})

ports/caf/vcpkg.json

@@ -1,10 +1,17 @@
 {
   "name": "caf",
-  "version-string": "0.17.6",
-  "port-version": 2,
-  "description": "an open source C++11 actor model implementation featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.",
+  "version": "0.18.5",
+  "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",
   "dependencies": [
-    "openssl"
+    "openssl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }

versions/baseline.json

@@ -1205,8 +1205,8 @@
       "port-version": 1
     },
     "caf": {
-      "baseline": "0.17.6",
-      "port-version": 2
+      "baseline": "0.18.5",
+      "port-version": 0
     },
     "caffe2": {
       "baseline": "0.8.1",

versions/c-/caf.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6f4b297fc5ad4bd021fa9d72787b27e69a558237",
+      "version": "0.18.5",
+      "port-version": 0
+    },
     {
       "git-tree": "d520e997ef25f386431e32cb6bec32ba12a78339",
       "version-string": "0.17.6",