mirror of https://github.com/microsoft/vcpkg.git
[lapack-reference] Fix missing link libraries in pc file. (#47762)
This commit is contained in:
parent
2db2d74253
commit
f20b0fb345
|
|
@ -0,0 +1,41 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 58e59be8fb..572478de83 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -520,6 +520,25 @@ endif()
|
||||
configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
|
||||
${LAPACK_BINARY_DIR}/${LAPACKLIB}-config.cmake @ONLY)
|
||||
|
||||
+set(FORTRAN_IMPLICIT_LIBS "")
|
||||
+set(FORTRAN_IMPLICIT_LINK_DIRS "")
|
||||
+if(NOT BUILD_SHARED_LIBS)
|
||||
+ set(FORTRAN_IMPLICIT_LIBS ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
|
||||
+ set(FORTRAN_IMPLICIT_LINK_DIRS ${CMAKE_Fortran_IMPLICIT_LINK_DIRECTORIES})
|
||||
+ list(REVERSE FORTRAN_IMPLICIT_LIBS)
|
||||
+ list(REMOVE_DUPLICATES FORTRAN_IMPLICIT_LIBS)
|
||||
+ list(REVERSE FORTRAN_IMPLICIT_LIBS)
|
||||
+ list(REMOVE_ITEM FORTRAN_IMPLICIT_LIBS ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES})
|
||||
+ list(REMOVE_ITEM FORTRAN_IMPLICIT_LINK_DIRS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES} ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES})
|
||||
+ list(JOIN FORTRAN_IMPLICIT_LIBS " -l" FORTRAN_IMPLICIT_LIBS)
|
||||
+ list(JOIN FORTRAN_IMPLICIT_LINK_DIRS " -L" FORTRAN_IMPLICIT_LINK_DIRS)
|
||||
+ if(FORTRAN_IMPLICIT_LIBS)
|
||||
+ set(FORTRAN_IMPLICIT_LIBS "-l${FORTRAN_IMPLICIT_LIBS}")
|
||||
+ endif()
|
||||
+ if(FORTRAN_IMPLICIT_LINK_DIRS)
|
||||
+ set(FORTRAN_IMPLICIT_LINK_DIRS "-L${FORTRAN_IMPLICIT_LINK_DIRS}")
|
||||
+ endif()
|
||||
+endif()
|
||||
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc @ONLY)
|
||||
install(FILES
|
||||
diff --git a/lapack.pc.in b/lapack.pc.in
|
||||
index 316c871011..4d7f3f7b56 100644
|
||||
--- a/lapack.pc.in
|
||||
+++ b/lapack.pc.in
|
||||
@@ -5,5 +5,5 @@ Name: LAPACK
|
||||
Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
|
||||
Version: @LAPACK_VERSION@
|
||||
URL: http://www.netlib.org/lapack/
|
||||
-Libs: -L${libdir} -llapack
|
||||
+Libs: -L${libdir} -llapack @FORTRAN_IMPLICIT_LINK_DIRS@ @FORTRAN_IMPLICIT_LIBS@
|
||||
Requires.private: blas
|
||||
|
|
@ -23,6 +23,7 @@ vcpkg_from_github(
|
|||
PATCHES
|
||||
cmake-config.patch
|
||||
fix_prefix.patch
|
||||
implicit-link.patch
|
||||
)
|
||||
|
||||
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"name": "lapack-reference",
|
||||
"version": "3.12.1",
|
||||
"port-version": 1,
|
||||
"description": "LAPACK - Linear Algebra PACKage",
|
||||
"homepage": "https://netlib.org/lapack/",
|
||||
"license": "BSD-3-Clause-Open-MPI",
|
||||
|
|
|
|||
|
|
@ -2139,7 +2139,8 @@ itk[cuda]:x64-linux = feature-fails
|
|||
ixwebsocket[core,mbedtls,openssl,sectransp,ssl] = options # you can only choose one ssl backend or none
|
||||
kissfft[openmp](osx) = feature-fails # No openmp on osx
|
||||
ktx[tools](uwp) = feature-fails # build error. See https://github.com/microsoft/vcpkg/issues/33687
|
||||
lapack-reference[core,cblas,noblas] = options # Cannot built feature 'cblas' together with feature 'noblas'. cblas requires blas.
|
||||
lapack-reference[blas-select,cblas,noblas] = options # Cannot built feature 'cblas' together with feature 'noblas'. cblas requires blas.
|
||||
lapack-reference(android)=fail # no fortran compiler
|
||||
libalkimia[tools](linux) = feature-fails # link errors. See https://github.com/microsoft/vcpkg/issues/32361
|
||||
libcanberra[core] = combination-fails # configure: error: *** No backend enabled. ***
|
||||
libcanberra[core](osx) = combination-fails # see https://github.com/microsoft/vcpkg/issues/31032
|
||||
|
|
|
|||
|
|
@ -4458,7 +4458,7 @@
|
|||
},
|
||||
"lapack-reference": {
|
||||
"baseline": "3.12.1",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"lastools": {
|
||||
"baseline": "2.0.3",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "2cb3ab92f81e3a04378f80e0efb1c1fac10a6164",
|
||||
"version": "3.12.1",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "213d4eb32b530eda6f90aeab2e9e92e4940e852f",
|
||||
"version": "3.12.1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue