diff options
| author | Sean Yen <seanyen@microsoft.com> | 2020-06-30 14:43:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-30 14:43:32 -0700 |
| commit | 7c9bf0a6cdcf89b781ae14f3415b18ee58fdd59e (patch) | |
| tree | ede71295992bc844aa3feae4b16f4c52495e2559 | |
| parent | 3f6342db6ded036422886da6ccf8191685dc2ccf (diff) | |
| download | vcpkg-7c9bf0a6cdcf89b781ae14f3415b18ee58fdd59e.tar.gz vcpkg-7c9bf0a6cdcf89b781ae14f3415b18ee58fdd59e.zip | |
[suitesparse] Fixing `SuiteSparse_INCLUDE_DIRS` is not usable from the port. (#11945)
* correct _SuiteSparse_PREFIX.
* Update portfile.cmake
| -rw-r--r-- | ports/suitesparse/CONTROL | 2 | ||||
| -rw-r--r-- | ports/suitesparse/suitesparse.patch | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/ports/suitesparse/CONTROL b/ports/suitesparse/CONTROL index 7d31c1d94..5481ea401 100644 --- a/ports/suitesparse/CONTROL +++ b/ports/suitesparse/CONTROL @@ -1,5 +1,5 @@ Source: suitesparse -Version: 5.4.0-5 +Version: 5.4.0-6 Build-Depends: clapack (!osx) Homepage: http://faculty.cse.tamu.edu/davis/SuiteSparse Description: algebra library diff --git a/ports/suitesparse/suitesparse.patch b/ports/suitesparse/suitesparse.patch index e26a5b8cb..2255565ac 100644 --- a/ports/suitesparse/suitesparse.patch +++ b/ports/suitesparse/suitesparse.patch @@ -117,12 +117,14 @@ index c6e2834..5ef08a6 100644 # Disable COMPLEX numbers: disable it by default, since it causes problems in some platforms. SET(HAVE_COMPLEX OFF CACHE BOOL "Enables building SuiteSparse with complex numbers (disabled by default to avoid problems in some platforms)") diff --git a/cmake/SuiteSparse-config-install.cmake.in b/cmake/SuiteSparse-config-install.cmake.in -index cb1f51f..49387b8 100644 +index cb1f51f..12f654c 100644 --- a/cmake/SuiteSparse-config-install.cmake.in +++ b/cmake/SuiteSparse-config-install.cmake.in -@@ -4,13 +4,10 @@ get_filename_component(_SuiteSparse_PREFIX "${_SuiteSparse_SELF_DIR}" PATH) - get_filename_component(_SuiteSparse_PREFIX "${_SuiteSparse_PREFIX}" PATH) +@@ -2,15 +2,11 @@ + get_filename_component(_SuiteSparse_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component(_SuiteSparse_PREFIX "${_SuiteSparse_SELF_DIR}" PATH) get_filename_component(_SuiteSparse_PREFIX "${_SuiteSparse_PREFIX}" PATH) +-get_filename_component(_SuiteSparse_PREFIX "${_SuiteSparse_PREFIX}" PATH) -find_package(LAPACK CONFIG) -if (NOT LAPACK_FOUND) # Load the LAPACK package with which we were built. @@ -136,7 +138,7 @@ index cb1f51f..49387b8 100644 # Report SuiteSparse header search locations. set(SuiteSparse_INCLUDE_DIRS ${_SuiteSparse_PREFIX}/include) -@@ -31,6 +28,11 @@ set(SuiteSparse_LIBRARIES +@@ -31,6 +27,10 @@ set(SuiteSparse_LIBRARIES SuiteSparse::spqr @SuiteSparse_EXPORTED_METIS_LIBS@ ) @@ -147,4 +149,3 @@ index cb1f51f..49387b8 100644 + +set(SUITESPARSE_FOUND TRUE) +set(SuiteSparse_FOUND TRUE) -+ |