From dbed0a93f23ac0e4f0187f73869d00cfc74e5871 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 10 Feb 2023 02:49:54 +0800 Subject: [PATCH] [vcpkg baseline] [superlu] Use the correct option to avoid lib conflicts. (#29519) * [vcpkg baseline] * update version * Pay attention to the format * vdb * ref * version --- ports/superlu/portfile.cmake | 15 ++++++++------- ports/superlu/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/superlu.json | 5 +++++ 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ports/superlu/portfile.cmake b/ports/superlu/portfile.cmake index e1c25cf344..a12ecf107b 100644 --- a/ports/superlu/portfile.cmake +++ b/ports/superlu/portfile.cmake @@ -5,25 +5,26 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiaoyeli/superlu - REF v${VERSION} + REF "v${VERSION}" SHA512 1461b52bc18a8b0345beb70fdd46e07df497a13be840bcc061158ea1d0e61c8745806d1ad21cb2723db80f5ed762c3741f9c0ded2b2013df46da0e8bb6b77b83 HEAD_REF master PATCHES - remove-make.inc.patch + remove-make.inc.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DXSDK_ENABLE_Fortran=OFF - -Denable_tests=OFF - -Denable_blaslib=OFF + -DXSDK_ENABLE_Fortran=OFF + -Denable_tests=OFF + -Denable_internal_blaslib=OFF + -Denable_doc=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt") diff --git a/ports/superlu/vcpkg.json b/ports/superlu/vcpkg.json index 561f75beb8..0fab3f8db5 100644 --- a/ports/superlu/vcpkg.json +++ b/ports/superlu/vcpkg.json @@ -1,6 +1,7 @@ { "name": "superlu", "version": "5.3.0", + "port-version": 1, "description": "Supernodal sparse direct solver.", "homepage": "https://github.com/xiaoyeli/superlu", "license": "BSD-3-Clause-LBNL", diff --git a/versions/baseline.json b/versions/baseline.json index 863ad77b07..3a37ed9083 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7518,7 +7518,7 @@ }, "superlu": { "baseline": "5.3.0", - "port-version": 0 + "port-version": 1 }, "symengine": { "baseline": "0.9.0", diff --git a/versions/s-/superlu.json b/versions/s-/superlu.json index 112654891a..5e425fa781 100644 --- a/versions/s-/superlu.json +++ b/versions/s-/superlu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bcc27a8221ab0323b537025944ebc20ae56c36ac", + "version": "5.3.0", + "port-version": 1 + }, { "git-tree": "70b5d8ecd8bdca0344fc176833037b95b116219e", "version": "5.3.0",