Skip to content

[clapack] Fix FindLAPACK.cmake script #22303

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

Closed
ahojnnes wants to merge 4 commits into from
Closed

[clapack] Fix FindLAPACK.cmake script #22303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8d0371
Fix FindLAPACK.cmake for clapack
ahojnnes Jan 3, 2022
174ca89
Fix
ahojnnes Jan 3, 2022
e16a051
Fix
ahojnnes Jan 3, 2022
5459de3
Fix
ahojnnes Jan 3, 2022
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
10 changes: 9 additions & 1 deletion ports/clapack/FindLAPACK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
find_dependency(Threads)

if(UNIX)
find_library(ADDITIONAL_LAPACK_LIBRARY m)
set(ADDITIONAL_LAPACK_LIBRARY "m")
set(PTHREAD_LINK_NAME "-pthread")
endif()

Expand Down Expand Up @@ -166,6 +166,14 @@ set(F2C_LIBRARY_DEBUG "${F2C_LIBRARY_DEBUG}" CACHE STRING "" FORCE)

find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARY LAPACK_INCLUDE_DIR)
mark_as_advanced(LAPACK_INCLUDE_DIR LAPACK_LIBRARY)
set(CLAPACK_FOUND "${LAPACK_FOUND}" CACHE STRING "" FORCE)

set(oF2C_LIBRARY_RELEASE "${oF2C_LIBRARY_RELEASE}" CACHE STRING "" FORCE)
set(oF2C_LIBRARY_DEBUG "${oF2C_LIBRARY_DEBUG}" CACHE STRING "" FORCE)
set(oLAPACK_LIBRARY_RELEASE "${oLAPACK_LIBRARY_RELEASE}" CACHE STRING "" FORCE)
set(oLAPACK_LIBRARY_DEBUG "${oLAPACK_LIBRARY_DEBUG}" CACHE STRING "" FORCE)
set(LAPACK_BLAS_LIBRARY_RELEASE "${LAPACK_BLAS_LIBRARY_RELEASE}" CACHE STRING "" FORCE)
set(LAPACK_BLAS_LIBRARY_DEBUG "${LAPACK_BLAS_LIBRARY_DEBUG}" CACHE STRING "" FORCE)

#TARGETS
if(CLAPACK_FOUND AND NOT TARGET clapack::clapack)
Expand Down
2 changes: 1 addition & 1 deletion ports/clapack/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "clapack",
"version-string": "3.2.1",
"port-version": 19,
"port-version": 20,
"description": "CLAPACK (f2c'ed version of LAPACK)",
"homepage": "https://www.netlib.org/clapack",
"dependencies": [
Expand Down
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 @@ -1374,7 +1374,7 @@
},
"clapack": {
"baseline": "3.2.1",
"port-version": 19
"port-version": 20
},
"clara": {
"baseline": "1.1.5",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/clapack.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "487ee4248a8d0cebf67b1a466fd17404d3d74156",
"version-string": "3.2.1",
"port-version": 20
},
{
"git-tree": "bedf61cf9cf765a2c823e1f2427a16af6d8a711e",
"version-string": "3.2.1",
Expand Down