diff options
| author | bucurb <bobuc@microsoft.com> | 2021-07-16 20:03:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-16 12:03:54 -0700 |
| commit | 0f059596124b7afce437e5dad4588fb3ff06719e (patch) | |
| tree | 4249f4e415513eecc06dda3c9e966d6ee4a275da /ports/clapack | |
| parent | 0bf44b144bb767f48685ac84e5bfd76f05db958f (diff) | |
| download | vcpkg-0f059596124b7afce437e5dad4588fb3ff06719e.tar.gz vcpkg-0f059596124b7afce437e5dad4588fb3ff06719e.zip | |
[Faiss] Fix dependencies (#18780)
* fixed targets
* bumped port version
* updated sha
* lapack-reference should always write into lapack
* lapack-reference sha
* Fixed clapack target
* versions
* sha
* ensure cmake finds the cuda compiler
* sha
Diffstat (limited to 'ports/clapack')
| -rw-r--r-- | ports/clapack/FindLAPACK.cmake | 24 | ||||
| -rw-r--r-- | ports/clapack/vcpkg.json | 2 |
2 files changed, 16 insertions, 10 deletions
diff --git a/ports/clapack/FindLAPACK.cmake b/ports/clapack/FindLAPACK.cmake index eff9bae70..aa546e672 100644 --- a/ports/clapack/FindLAPACK.cmake +++ b/ports/clapack/FindLAPACK.cmake @@ -200,10 +200,11 @@ if(CLAPACK_FOUND AND NOT TARGET clapack::clapack) endif() endif() -if(CLAPACK_FOUND AND NOT TARGET lapack) +# Ensure consistency with both CMake's vanilla as well as lapack-reference's FindLAPACK.cmake module and register the LAPACK::LAPACK target +if(CLAPACK_FOUND AND NOT TARGET LAPACK::LAPACK) if(EXISTS "${LAPACK_LIBRARY_RELEASE_DLL}") - add_library(lapack SHARED IMPORTED) - set_target_properties(lapack PROPERTIES + add_library(LAPACK::LAPACK SHARED IMPORTED) + set_target_properties(LAPACK::LAPACK PROPERTIES IMPORTED_LOCATION_RELEASE "${LAPACK_LIBRARY_RELEASE_DLL}" IMPORTED_IMPLIB_RELEASE "${oLAPACK_LIBRARY_RELEASE}" INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}" @@ -211,23 +212,28 @@ if(CLAPACK_FOUND AND NOT TARGET lapack) IMPORTED_CONFIGURATIONS Release IMPORTED_LINK_INTERFACE_LANGUAGES "C") if(EXISTS "${LAPACK_LIBRARY_DEBUG_DLL}") - set_property(TARGET lapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) - set_target_properties(lapack PROPERTIES + set_property(TARGET LAPACK::LAPACK APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) + set_target_properties(LAPACK::LAPACK PROPERTIES IMPORTED_LOCATION_DEBUG "${LAPACK_LIBRARY_DEBUG_DLL}" IMPORTED_IMPLIB_DEBUG "${oLAPACK_LIBRARY_DEBUG}") endif() else() - add_library(lapack UNKNOWN IMPORTED) - set_target_properties(lapack PROPERTIES + add_library(LAPACK::LAPACK UNKNOWN IMPORTED) + set_target_properties(LAPACK::LAPACK PROPERTIES IMPORTED_LOCATION_RELEASE "${oLAPACK_LIBRARY_RELEASE}" INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}" IMPORTED_CONFIGURATIONS Release INTERFACE_LINK_LIBRARIES "$<$<NOT:$<CONFIG:DEBUG>>:${oF2C_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${oF2C_LIBRARY_DEBUG}>;$<$<NOT:$<CONFIG:DEBUG>>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${LAPACK_BLAS_LIBRARY_DEBUG}>;$<LINK_ONLY:${ADDITIONAL_LAPACK_LIBRARY}>;$<LINK_ONLY:${PTHREAD_LINK_NAME}>" IMPORTED_LINK_INTERFACE_LANGUAGES "C") if(EXISTS "${LAPACK_LIBRARY_DEBUG}") - set_property(TARGET lapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) - set_target_properties(lapack PROPERTIES + set_property(TARGET LAPACK::LAPACK APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) + set_target_properties(LAPACK::LAPACK PROPERTIES IMPORTED_LOCATION_DEBUG "${oLAPACK_LIBRARY_DEBUG}") endif() endif() endif() + +# Preserve backwards compatibility and also register the 'lapack' target +if(CLAPACK_FOUND AND NOT TARGET lapack) + add_library(lapack ALIAS LAPACK::LAPACK) +endif() diff --git a/ports/clapack/vcpkg.json b/ports/clapack/vcpkg.json index 18f01ec83..f0fd61e8f 100644 --- a/ports/clapack/vcpkg.json +++ b/ports/clapack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clapack", "version-string": "3.2.1", - "port-version": 18, + "port-version": 19, "description": "CLAPACK (f2c'ed version of LAPACK)", "homepage": "https://www.netlib.org/clapack", "dependencies": [ |