Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg baseline][lapack-reference] Fix copy openblas's pkgconfig file #19628

Merged
merged 7 commits into from
Aug 28, 2021
Merged

[vcpkg baseline][lapack-reference] Fix copy openblas's pkgconfig file #19628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2d69da3
[lapack-reference] Fix copy openblas's pkgconfig file
Aug 18, 2021
237fad2
version
Aug 18, 2021
d3895ad
Use vcpkg-cmake and vcpkg-cmake-config instead
Aug 18, 2021
20c81e9
version stuff
Aug 18, 2021
fa284ba
Restore the changes about vcpkg-cmake-configure / vcpkg-cmake-install
Aug 18, 2021
6c72bb2
update version keyword
Aug 18, 2021
8fbd9eb
version
Aug 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions ports/lapack-reference/CONTROL
View file
Open in desktop

This file was deleted.

20 changes: 11 additions & 9 deletions ports/lapack-reference/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,19 @@ if(VCPKG_USE_INTERNAL_Fortran)
else()
set(USE_OPTIMIZED_BLAS ON)
endif()

vcpkg_configure_cmake(
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
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}")
Expand All @@ -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)
Expand Down
44 changes: 44 additions & 0 deletions ports/lapack-reference/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
]
}
}
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3010,7 +3010,7 @@
},
"lapack-reference": {
"baseline": "3.8.0",
"port-version": 5
"port-version": 6
},
"lastools": {
"baseline": "2020-05-09",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/lapack-reference.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "10799c7ec42f8369179ba7a8e927235596cb8bb7",
"version-semver": "3.8.0",
"port-version": 6
},
{
"git-tree": "1887fc1fcb0c96df1ea24fffc9b045330426e3b6",
"version-string": "3.8.0",
Expand Down