mirror of https://github.com/microsoft/vcpkg.git
[baseline][blas] Don't pick intel-mkl (#30421)
* [blas] Add wrapper to ignore intel-mkl * VCPKG_INSTALLED_DIR
This commit is contained in:
parent
2163b500a4
commit
982a49ec9c
|
|
@ -1,5 +1,15 @@
|
|||
SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
||||
|
||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/blas")
|
||||
|
||||
# Make sure BLAS can be found
|
||||
vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}"
|
||||
OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}")
|
||||
vcpkg_list(SET CMAKE_IGNORE_PATH)
|
||||
if(NOT DEFINED ENV{MKLROOT})
|
||||
list(APPEND CMAKE_IGNORE_PATH "${CURRENT_INSTALLED_DIR}/lib/intel64")
|
||||
endif()
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${CURRENT_PORT_DIR}"
|
||||
OPTIONS
|
||||
"-DCMAKE_PREFIX_PATH=${CURRENT_PACKAGES_DIR}"
|
||||
"-DCMAKE_IGNORE_PATH=${CMAKE_IGNORE_PATH}"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
if(NOT DEFINED ENV{MKLROOT})
|
||||
set(z_vcpkg_blas_ignore_path "${CMAKE_IGNORE_PATH}")
|
||||
list(APPEND CMAKE_IGNORE_PATH "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/intel64")
|
||||
endif()
|
||||
_find_package(${ARGS})
|
||||
if(NOT DEFINED ENV{MKLROOT})
|
||||
set(CMAKE_IGNORE_PATH "${z_vcpkg_blas_ignore_path}")
|
||||
unset(z_vcpkg_blas_ignore_path)
|
||||
endif()
|
||||
|
|
@ -1,17 +1,13 @@
|
|||
{
|
||||
"name": "blas",
|
||||
"version-string": "1",
|
||||
"port-version": 2,
|
||||
"version-date": "2023-03-25",
|
||||
"description": "Metapackage for packages which provide BLAS",
|
||||
"license": null,
|
||||
"dependencies": [
|
||||
"openblas",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "0fe7611c8bb3098083440074a6c59f35bfee4f99",
|
||||
"version-date": "2023-03-25",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "13cc4359c6888f16fdde35e618096b67a9177a6b",
|
||||
"version-string": "1",
|
||||
|
|
|
|||
|
|
@ -577,8 +577,8 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"blas": {
|
||||
"baseline": "1",
|
||||
"port-version": 2
|
||||
"baseline": "2023-03-25",
|
||||
"port-version": 0
|
||||
},
|
||||
"blaze": {
|
||||
"baseline": "3.8.1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue