diff options
| author | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
|---|---|---|
| committer | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
| commit | c828f3634723996e6031fb2e3c3d1ac3f4de0cad (patch) | |
| tree | b3fe00a043d5b9351868a0d1f8aead41bb52d2be /ports/lapack-reference | |
| parent | 6635a2fa596ca457565eebc2a45664309cd24d77 (diff) | |
| parent | f3f329a048eaff759c1992c458f2e12351486bc7 (diff) | |
| download | vcpkg-update-geos-381.tar.gz vcpkg-update-geos-381.zip | |
Merge remote-tracking branch 'origin/master' into HEADupdate-geos-381
Diffstat (limited to 'ports/lapack-reference')
| -rw-r--r-- | ports/lapack-reference/CONTROL | 1 | ||||
| -rw-r--r-- | ports/lapack-reference/FindLAPACK.cmake | 2 | ||||
| -rw-r--r-- | ports/lapack-reference/portfile.cmake | 19 |
3 files changed, 20 insertions, 2 deletions
diff --git a/ports/lapack-reference/CONTROL b/ports/lapack-reference/CONTROL index 493e7f50e..0ac1c8d0e 100644 --- a/ports/lapack-reference/CONTROL +++ b/ports/lapack-reference/CONTROL @@ -1,5 +1,6 @@ Source: lapack-reference
Version: 3.8.0
+Port-Version: 1
Description: LAPACK — Linear Algebra PACKage http://www.netlib.org/lapack/
Default-Features: blas-select
Build-Depends: vcpkg-gfortran (windows)
diff --git a/ports/lapack-reference/FindLAPACK.cmake b/ports/lapack-reference/FindLAPACK.cmake index 1edaa0f83..b6df00319 100644 --- a/ports/lapack-reference/FindLAPACK.cmake +++ b/ports/lapack-reference/FindLAPACK.cmake @@ -482,7 +482,7 @@ if(BLAS_FOUND) LAPACK
cheev
""
- "lapack;-lm;-lgfortran"
+ "lapack;m;gfortran"
""
""
""
diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 1e3f8d6b6..6a3ad6982 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -24,6 +24,9 @@ endif() set(CBLAS OFF)
if("cblas" IN_LIST FEATURES)
set(CBLAS ON)
+ if("noblas" IN_LIST FEATURES)
+ message(FATAL_ERROR "Cannot built feature 'cblas' together with feature 'noblas'. cblas requires blas!")
+ endif()
endif()
set(USE_OPTIMIZED_BLAS OFF)
@@ -59,7 +62,7 @@ vcpkg_configure_cmake( OPTIONS
"-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}"
"-DCBLAS=${CBLAS}"
- "${FORTRAN_CMAKE}"
+ ${FORTRAN_CMAKE}
)
vcpkg_install_cmake()
@@ -91,6 +94,20 @@ if(NOT USE_OPTIMIZED_BLAS) file(WRITE "${pcfile}" "${_contents}")
endif()
endif()
+if("cblas" IN_LIST FEATURES)
+ set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/cblas.pc")
+ if(EXISTS "${pcfile}")
+ file(READ "${pcfile}" _contents)
+ set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}")
+ file(WRITE "${pcfile}" "${_contents}")
+ endif()
+ set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cblas.pc")
+ if(EXISTS "${pcfile}")
+ file(READ "${pcfile}" _contents)
+ set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}")
+ file(WRITE "${pcfile}" "${_contents}")
+ endif()
+endif()
vcpkg_fixup_pkgconfig()
vcpkg_copy_pdbs()
|