diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2021-03-26 12:55:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-26 12:55:34 -0700 |
| commit | b5bb1511f0a07be530e0bde3ae098eb3d8e83e68 (patch) | |
| tree | 62f7ed43202e512d28ac92fb2be768283f62dee9 /ports/caf | |
| parent | 6a63ecae92e3eb26ae596e5c4ddf527f045803a4 (diff) | |
| download | vcpkg-b5bb1511f0a07be530e0bde3ae098eb3d8e83e68.tar.gz vcpkg-b5bb1511f0a07be530e0bde3ae098eb3d8e83e68.zip | |
[many ports] Apply host dependencies (#16479)
* [vcpkg] Add VCPKG_HOST_TRIPLET. Improve vcpkg.schema.json
* [many ports] Apply host dependencies
* [yasm-tool] Revert yasm-tool changes to split into PR #16478
* [many ports] Add versions
* [vcpkg.cmake] Revert change applied in other PR
* [boost-modular-build-helper] Merge from master
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/caf')
| -rw-r--r-- | ports/caf/portfile.cmake | 21 | ||||
| -rw-r--r-- | ports/caf/vcpkg.json | 2 |
2 files changed, 4 insertions, 19 deletions
diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake index e278fde14..1c40312af 100644 --- a/ports/caf/portfile.cmake +++ b/ports/caf/portfile.cmake @@ -1,28 +1,13 @@ 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 f7d4fc7ac679e18ba385f64434f8015c3cea9cb5 # 0.17.6 SHA512 8b4719c26dfad68eed6f2528263702e42f9865bb7a9f2d40909dc6c3fc20bb7259fe44a5f89390ba714c7f9359db2d171ff44685641962c24a70f4e2aa3f3f65 HEAD_REF master - PATCHES - openssl-version-override.patch + PATCHES + openssl-version-override.patch ) vcpkg_configure_cmake( @@ -42,7 +27,7 @@ vcpkg_configure_cmake( -DCAF_NO_OPENSSL=OFF -DCAF_NO_CURL_EXAMPLES=ON -DCAF_OPENSSL_VERSION_OVERRIDE=ON - -DCAF_TOOL_PATH=${CAF_TOOL_PATH} + -DCAF_ENABLE_UTILITY_TARGETS=OFF ) vcpkg_install_cmake() diff --git a/ports/caf/vcpkg.json b/ports/caf/vcpkg.json index c0dad8bd0..fea50a3a5 100644 --- a/ports/caf/vcpkg.json +++ b/ports/caf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "caf", "version-string": "0.17.6", - "port-version": 1, + "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.", "homepage": "https://github.com/actor-framework/actor-framework", "dependencies": [ |