sync again

GraphBLAS · Dec 5, 2023 · de51a91 · de51a91
1 parent 8d0a627
commit de51a91
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -57,6 +57,10 @@ library:
 local:
 	( cd build && cmake $(CMAKE_OPTIONS) -USUITESPARSE_PKGFILEDIR -DLOCAL_INSTALL=1 .. && cmake --build . --config Release -j${JOBS} )
 
+# install CMAKE_INSTALL_PREFIX
+global:
+	( cd build && cmake $(CMAKE_OPTIONS) -USUITESPARSE_PKGFILEDIR -DLOCAL_INSTALL=0 .. && cmake --build . --config Release -j${JOBS} )
+
 vanilla:
 	( cd build && cmake $(CMAKE_OPTIONS) -USUITESPARSE_PKGFILEDIR -DLAGRAPH_VANILLA=1 .. && cmake --build . --config Release -j${JOBS} )
 

diff --git a/cmake_modules/SuiteSparsePolicy.cmake b/cmake_modules/SuiteSparsePolicy.cmake
@@ -19,6 +19,7 @@
 #                       for their numerical factorizsation.  The flag is false
 #                       for GraphBLAS since CUDA for that package is in
 #                       progress and not ready for production use.
+#                       CUDA acceleration not supported on Windows with MSVC.
 #
 #   LOCAL_INSTALL:      if true, "cmake --install" will install
 #                       into SuiteSparse/lib and SuiteSparse/include.
@@ -265,7 +266,7 @@ endif ( )
 # find CUDA
 #-------------------------------------------------------------------------------
 
-if ( ENABLE_CUDA )
+if ( ENABLE_CUDA AND NOT MSVC )
 
     # try finding CUDA
     check_language ( CUDA )