From 6ff1bfa0595b2af4e2a39b41d5be95ee2c4777aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 14 Sep 2022 20:25:19 +0000 Subject: [PATCH] [arrayfire] Fix usage (#26782) * [arrayfire] Fix usage * version * Add double quotes * version --- ports/arrayfire/portfile.cmake | 7 ++++++- ports/arrayfire/vcpkg.json | 2 +- versions/a-/arrayfire.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ports/arrayfire/portfile.cmake b/ports/arrayfire/portfile.cmake index ee6fab1d8c..85c4e587a4 100644 --- a/ports/arrayfire/portfile.cmake +++ b/ports/arrayfire/portfile.cmake @@ -45,7 +45,6 @@ set(AF_DEFAULT_VCPKG_CMAKE_FLAGS -DAF_CPU_THREAD_PATH=${CPU_THREADS_PATH} # for building the arrayfire cpu threads lib -DAF_FORGE_PATH=${FORGE_PATH} # forge headers for building the graphics lib -DAF_BUILD_FORGE=OFF - -DAF_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/${PORT} # for CMake configs/targets ) # bin/dll directory for Windows non-static builds for the unified backend dll @@ -74,6 +73,10 @@ vcpkg_cmake_configure( OPTIONS ${AF_DEFAULT_VCPKG_CMAKE_FLAGS} ${AF_BACKEND_FEATURE_OPTIONS} + OPTIONS_DEBUG + -DAF_INSTALL_CMAKE_DIR="${CURRENT_PACKAGES_DIR}/debug/share/${PORT}" # for CMake configs/targets + OPTIONS_RELEASE + -DAF_INSTALL_CMAKE_DIR="${CURRENT_PACKAGES_DIR}/share/${PORT}" # for CMake configs/targets MAYBE_UNUSED_VARIABLES AF_CPU_THREAD_PATH ) @@ -81,6 +84,8 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/examples") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/arrayfire/vcpkg.json b/ports/arrayfire/vcpkg.json index 886bd8ffae..5e1470f3f3 100644 --- a/ports/arrayfire/vcpkg.json +++ b/ports/arrayfire/vcpkg.json @@ -1,7 +1,7 @@ { "name": "arrayfire", "version-semver": "3.8.0", - "port-version": 1, + "port-version": 2, "description": "ArrayFire is a general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.", "homepage": "https://github.com/arrayfire/arrayfire", "license": "BSD-3-Clause", diff --git a/versions/a-/arrayfire.json b/versions/a-/arrayfire.json index e1b20d7239..c494abce8c 100644 --- a/versions/a-/arrayfire.json +++ b/versions/a-/arrayfire.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ce1cae30cfcfd85b9858f5f46a59136cce97e59", + "version-semver": "3.8.0", + "port-version": 2 + }, { "git-tree": "137eb0d15f469e75ad3255cf1de871d83b3dff49", "version-semver": "3.8.0", diff --git a/versions/baseline.json b/versions/baseline.json index d6b97cd6b9..6893fdba8d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -182,7 +182,7 @@ }, "arrayfire": { "baseline": "3.8.0", - "port-version": 1 + "port-version": 2 }, "arrow": { "baseline": "9.0.0",