Library dirs too

Author: eriknw

.github/workflows/test.yml

@@ -31,11 +31,6 @@ jobs:
         activate-environment: suitesparse-graphblas
     - name: Build
       run: |
-        conda info
-        conda config --show-sources
-        conda config --show
-        conda list
-        conda env list
         python setup.py build_ext --inplace
         python setup.py develop
     - name: Test
@@ -47,3 +42,12 @@ jobs:
       run: |
         black *py suitesparse_graphblas --check --diff
         flake8 *py suitesparse_graphblas
+    - name: Create headers check
+        # These shouldn't change, so make copies to compare to
+        cp suitesparse_graphblas/suitesparse_graphblas.h .
+        cp suitesparse_graphblas/suitesparse_graphblas_no_complex.h .
+        cp suitesparse_graphblas/source.h .
+        python suitesparse_graphblas/create_headers.py
+        diff suitesparse_graphblas/suitesparse_graphblas.h suitesparse_graphblas.h
+        diff suitesparse_graphblas/suitesparse_graphblas_no_complex.h suitesparse_graphblas_no_complex.h
+        diff suitesparse_graphblas/source.h source.h

setup.py

@@ -13,6 +13,7 @@
 import sys
 import versioneer
 
+is_win = sys.platform.startswith("win")
 define_macros = [("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")]
 
 if use_cython:
@@ -50,7 +51,7 @@
     long_description = f.read()
 
 package_data = {"suitesparse_graphblas": ["*.pyx", "*.pxd", "*.c", "*.h"]}
-if sys.platform == "win32":
+if is_win:
     package_data["suitesparse_graphblas"].append("*.dll")
 
 setup(

suitesparse_graphblas/build.py

@@ -11,14 +11,17 @@
     source = f.read()
 
 include_dirs = [os.path.join(sys.prefix, "include")]
-if sys.platform == "win32":
+library_dirs = [os.path.join(sys.prefix, "lib")]
+if is_win:
     include_dirs.append(os.path.join(sys.prefix, "Library", "include"))
+    library_dirs.append(os.path.join(sys.prefix, "Library", "lib"))
 
 ffibuilder.set_source(
     "suitesparse_graphblas._graphblas",
     source,
     libraries=["graphblas"],
     include_dirs=include_dirs,
+    library_dirs=library_dirs,
 )
 
 header = "suitesparse_graphblas.h"