Finding GraphBLAS, try 4

GraphBLAS · Aug 13, 2024 · 1990a1a · 1990a1a
1 parent b672b44
commit 1990a1a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,9 +13,9 @@ jobs:
     strategy:
       matrix:
         config:
-         - {grb_version: 7.1.0, conda_grb_package_hash: h27087fc, conda_extension: tar.bz2}
-         - {grb_version: 7.3.0, conda_grb_package_hash: h27087fc, conda_extension: tar.bz2}
-         - {grb_version: 7.4.1, conda_grb_package_hash: hcb278e6, conda_extension: conda}
+#        - {grb_version: 7.1.0, conda_grb_package_hash: h27087fc, conda_extension: tar.bz2}
+#        - {grb_version: 7.3.0, conda_grb_package_hash: h27087fc, conda_extension: tar.bz2}
+#        - {grb_version: 7.4.1, conda_grb_package_hash: hcb278e6, conda_extension: conda}
          - {grb_version: 9.1.0, conda_grb_package_hash: hd29ac08, conda_extension: conda}
     steps:
     - name: Checkout
@@ -37,7 +37,8 @@ jobs:
         cd ..
     - name: Build project
       run: |
-        export GRAPHBLAS_INCLUDE_DIR=`pwd`/graphblas-binaries/include
+#       export GRAPHBLAS_INCLUDE_DIR=`pwd`/graphblas-binaries/include
+        export GRAPHBLAS_INCLUDE_DIR=`pwd`/graphblas-binaries/include/suitesparse
         export GRAPHBLAS_LIBRARY=`pwd`/graphblas-binaries/lib/libgraphblas.so
         cd build
         cmake .. -DCOVERAGE=1 -DGRAPHBLAS_INCLUDE_DIR=${GRAPHBLAS_INCLUDE_DIR} -DGRAPHBLAS_LIBRARY=${GRAPHBLAS_LIBRARY}
@@ -60,9 +61,9 @@ jobs:
     strategy:
       matrix:
         config:
-         - {grb_version: 7.1.0, conda_grb_package_hash: h7881ed4, conda_extension: tar.bz2}
-         - {grb_version: 7.3.0, conda_grb_package_hash: ha894c9a, conda_extension: tar.bz2}
-         - {grb_version: 7.4.1, conda_grb_package_hash: ha894c9a, conda_extension: conda}
+#        - {grb_version: 7.1.0, conda_grb_package_hash: h7881ed4, conda_extension: tar.bz2}
+#        - {grb_version: 7.3.0, conda_grb_package_hash: ha894c9a, conda_extension: tar.bz2}
+#        - {grb_version: 7.4.1, conda_grb_package_hash: ha894c9a, conda_extension: conda}
          - {grb_version: 9.1.0, conda_grb_package_hash: heb48c95, conda_extension: conda}
     steps:
     - name: Checkout

diff --git a/cmake_modules/FindGraphBLAS.cmake b/cmake_modules/FindGraphBLAS.cmake
@@ -218,9 +218,11 @@ find_path ( GRAPHBLAS_INCLUDE_DIR
   HINTS ${PROJECT_SOURCE_DIR}/..
   HINTS ${PROJECT_SOURCE_DIR}/../GraphBLAS
   HINTS ${PROJECT_SOURCE_DIR}/../SuiteSparse/GraphBLAS
-  PATH_SUFFIXES include Include include/suitesparse
+  PATH_SUFFIXES include Include include/suitesparse suitesparse
   NO_DEFAULT_PATH )
 
+message ( status "GraphBLAS Include dir: ${GRAPHBLAS_INCLUDE_DIR}" )
+
 # dynamic SuiteSparse:GraphBLAS library
 find_library ( GRAPHBLAS_LIBRARY
   NAMES graphblas