From 620cb9ad5d67b413c1c2d241680ac01e670881f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sat, 28 Aug 2021 08:02:02 +0800 Subject: [vcpkg baseline][lapack-reference] Fix copy openblas's pkgconfig file (#19628) * [lapack-reference] Fix copy openblas's pkgconfig file * version * Use vcpkg-cmake and vcpkg-cmake-config instead * version stuff * Restore the changes about vcpkg-cmake-configure / vcpkg-cmake-install * update version keyword * version --- ports/lapack-reference/CONTROL | 17 -------------- ports/lapack-reference/portfile.cmake | 20 +++++++++------- ports/lapack-reference/vcpkg.json | 44 +++++++++++++++++++++++++++++++++++ versions/baseline.json | 2 +- versions/l-/lapack-reference.json | 5 ++++ 5 files changed, 61 insertions(+), 27 deletions(-) delete mode 100644 ports/lapack-reference/CONTROL create mode 100644 ports/lapack-reference/vcpkg.json diff --git a/ports/lapack-reference/CONTROL b/ports/lapack-reference/CONTROL deleted file mode 100644 index 3e18ebd2b..000000000 --- a/ports/lapack-reference/CONTROL +++ /dev/null @@ -1,17 +0,0 @@ -Source: lapack-reference -Version: 3.8.0 -Port-Version: 5 -Description: LAPACK — Linear Algebra PACKage http://www.netlib.org/lapack/ -Default-Features: blas-select -Build-Depends: vcpkg-gfortran (windows) - -Feature: cblas -Description: Builds CBLAS - -Feature: noblas -Build-Depends: blas -Description: Use external optimized BLAS - -Feature: blas-select -Build-Depends: lapack-reference[core, noblas](!windows|!static) -Description: Use external optimized BLAS diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 70e6059ff..4fb353fdd 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -60,17 +60,19 @@ if(VCPKG_USE_INTERNAL_Fortran) else() set(USE_OPTIMIZED_BLAS ON) endif() + vcpkg_configure_cmake( - PREFER_NINJA - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - "-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}" - "-DCBLAS=${CBLAS}" - ${FORTRAN_CMAKE} - ) + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + "-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}" + "-DCBLAS=${CBLAS}" + ${FORTRAN_CMAKE} +) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/lapack-${lapack_ver}) #Should the target path be lapack and not lapack-reference? + +vcpkg_cmake_config_fixup(PACKAGE_NAME lapack-${lapack_ver} CONFIG_PATH lib/cmake/lapack-${lapack_ver}) #Should the target path be lapack and not lapack-reference? set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc") if(EXISTS "${pcfile}") @@ -84,7 +86,7 @@ if(EXISTS "${pcfile}") set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") file(WRITE "${pcfile}" "${_contents}") endif() -if(NOT USE_OPTIMIZED_BLAS) +if(NOT USE_OPTIMIZED_BLAS AND NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc") if(EXISTS "${pcfile}") file(READ "${pcfile}" _contents) diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json new file mode 100644 index 000000000..c3f20e032 --- /dev/null +++ b/ports/lapack-reference/vcpkg.json @@ -0,0 +1,44 @@ +{ + "name": "lapack-reference", + "version-semver": "3.8.0", + "port-version": 6, + "description": "LAPACK — Linear Algebra PACKage", + "homepage": "http://www.netlib.org/lapack/", + "dependencies": [ + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "vcpkg-gfortran", + "platform": "windows" + } + ], + "default-features": [ + "blas-select" + ], + "features": { + "blas-select": { + "description": "Use external optimized BLAS", + "dependencies": [ + { + "name": "lapack-reference", + "default-features": false, + "features": [ + "noblas" + ], + "platform": "!windows | !static" + } + ] + }, + "cblas": { + "description": "Builds CBLAS" + }, + "noblas": { + "description": "Use external optimized BLAS", + "dependencies": [ + "blas" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 69c5da02e..b201245f7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3018,7 +3018,7 @@ }, "lapack-reference": { "baseline": "3.8.0", - "port-version": 5 + "port-version": 6 }, "lastools": { "baseline": "2020-05-09", diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 96db87c74..99d6f8a7c 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10799c7ec42f8369179ba7a8e927235596cb8bb7", + "version-semver": "3.8.0", + "port-version": 6 + }, { "git-tree": "1887fc1fcb0c96df1ea24fffc9b045330426e3b6", "version-string": "3.8.0", -- cgit v1.2.3