From d5792bb752e475abca0184a9a6769fefb242eca6 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 15 Jul 2024 10:30:03 -0700 Subject: [PATCH] [vcpkg baseline][arrayfire] Disable parallel configure (#39917) Co-authored-by: Lily Wang --- ports/arrayfire/portfile.cmake | 18 ++++++++++-------- ports/arrayfire/vcpkg.json | 2 +- versions/a-/arrayfire.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ports/arrayfire/portfile.cmake b/ports/arrayfire/portfile.cmake index b2522e6f61..20e92f5d6f 100644 --- a/ports/arrayfire/portfile.cmake +++ b/ports/arrayfire/portfile.cmake @@ -80,13 +80,10 @@ vcpkg_check_features( # Build and install vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_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 ) @@ -94,12 +91,17 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup() +if(VCPKG_TARGET_IS_OSX) + vcpkg_cmake_config_fixup(CONFIG_PATH share/ArrayFire/cmake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/examples" - "${CURRENT_PACKAGES_DIR}/examples" - "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/examples" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/examples" + "${CURRENT_PACKAGES_DIR}/LICENSES" "${CURRENT_PACKAGES_DIR}/debug/LICENSES") # Copyright and license diff --git a/ports/arrayfire/vcpkg.json b/ports/arrayfire/vcpkg.json index b816ea8861..668cf97e62 100644 --- a/ports/arrayfire/vcpkg.json +++ b/ports/arrayfire/vcpkg.json @@ -1,7 +1,7 @@ { "name": "arrayfire", "version-semver": "3.8.0", - "port-version": 5, + "port-version": 6, "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 034ec71f52..5d0fa9fe40 100644 --- a/versions/a-/arrayfire.json +++ b/versions/a-/arrayfire.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45bae5e28a1c092e6024e21dcc4bab12c4e03440", + "version-semver": "3.8.0", + "port-version": 6 + }, { "git-tree": "4e9b4b24be953b97638224c3563759c7d8a86602", "version-semver": "3.8.0", diff --git a/versions/baseline.json b/versions/baseline.json index d9f6c422c4..5b3eee59ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -238,7 +238,7 @@ }, "arrayfire": { "baseline": "3.8.0", - "port-version": 5 + "port-version": 6 }, "arrow": { "baseline": "16.1.0",