updates from dev2

.github/workflows/codeql-analysis.yaml

@@ -26,7 +26,7 @@ jobs:
         language: ['c-cpp']
         # Learn more...
         # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
-        group: [other]
+#       group: [other]
 #       GraphBLAS and LAGraph disabled (the runners run out of memory or
 #       disk space)
 #       group: [other, graph]

.github/workflows/root-cmakelists.yaml

@@ -467,7 +467,6 @@ jobs:
                 -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
                 -DCMAKE_Fortran_COMPILER_LAUNCHER="ccache" \
                 -DSUITESPARSE_USE_FORTRAN=OFF \
-                -DBLA_VENDOR="All" \
                 -DPython_EXECUTABLE="C:/msys64/ucrt64/bin/python.exe" \
                 -DSUITESPARSE_DEMOS=OFF \
                 -DBUILD_TESTING=OFF \

GraphBLAS/GraphBLAS/CMakeLists.txt

@@ -211,10 +211,10 @@ if ( NOT WIN32 )
     target_link_libraries ( graphblas_matlab PUBLIC dl )
 endif ( )
 
-include ( SuiteSparseAtomic )
-if ( LIBATOMIC_REQUIRED )
-    target_link_libraries ( graphblas_matlab PUBLIC atomic )
-endif ( )
+# include ( SuiteSparseAtomic )
+# if ( LIBATOMIC_REQUIRED )
+#     target_link_libraries ( graphblas_matlab PUBLIC atomic )
+# endif ( )
 
 #-------------------------------------------------------------------------------
 # add library dependencies

ParU/CMakeLists.txt

@@ -111,7 +111,7 @@ if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
 
     find_package ( UMFPACK 6.3.3
         PATHS ${CMAKE_SOURCE_DIR}/../UMFPACK/build NO_DEFAULT_PATH )
-    if ( NOT CAMD_FOUND )
+    if ( NOT UMFPACK_FOUND )
         find_package ( UMFPACK 6.3.3 REQUIRED )
     endif ( )
 endif ( )

README.md

@@ -713,9 +713,9 @@ particular BLAS library use either:
     cd Package ; cmake -DBLA_VENDOR=OpenBLAS .. make
 
 To use the default (hunt for a BLAS), do not set `BLA_VENDOR`, or set it to
-`ANY`.  In this case, if `SUITESPARSE_USE_64BIT_BLAS` is ON, preference is
-given to a 64-bit BLAS, but a 32-bit BLAS library will be used if no 64-bit
-library is found.  However, if both `SUITESPARSE_USE_64BIT_BLAS` and
+an empty string.  In this case, if `SUITESPARSE_USE_64BIT_BLAS` is ON,
+preference is given to a 64-bit BLAS, but a 32-bit BLAS library will be used if
+no 64-bit library is found.  However, if both `SUITESPARSE_USE_64BIT_BLAS` and
 `SUITESPARSE_USE_STRICT` are ON, then only a 64-bit BLAS is considered.
 
 When selecting a particular BLAS library, the `SUITESPARSE_USE_64BIT_BLAS`

SuiteSparse_config/Config/README.md.in

@@ -713,9 +713,9 @@ particular BLAS library use either:
     cd Package ; cmake -DBLA_VENDOR=OpenBLAS .. make
 
 To use the default (hunt for a BLAS), do not set `BLA_VENDOR`, or set it to
-`ANY`.  In this case, if `SUITESPARSE_USE_64BIT_BLAS` is ON, preference is
-given to a 64-bit BLAS, but a 32-bit BLAS library will be used if no 64-bit
-library is found.  However, if both `SUITESPARSE_USE_64BIT_BLAS` and
+an empty string.  In this case, if `SUITESPARSE_USE_64BIT_BLAS` is ON,
+preference is given to a 64-bit BLAS, but a 32-bit BLAS library will be used if
+no 64-bit library is found.  However, if both `SUITESPARSE_USE_64BIT_BLAS` and
 `SUITESPARSE_USE_STRICT` are ON, then only a 64-bit BLAS is considered.
 
 When selecting a particular BLAS library, the `SUITESPARSE_USE_64BIT_BLAS`

SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake

@@ -21,8 +21,6 @@ cmake_minimum_required ( VERSION 3.22 )
 if ( DEFINED ENV{BLA_VENDOR} )
     set ( BLA_VENDOR $ENV{BLA_VENDOR} )
 endif ( )
-set ( BLA_VENDOR "ANY" CACHE STRING
-    "if ANY (default): searches for any BLAS. Otherwise: search for a specific BLAS" )
 
 # To allow the use of a BLAS with 64-bit integers, set this to ON
 option ( SUITESPARSE_USE_64BIT_BLAS
@@ -50,7 +48,7 @@ endif ( )
 # To request specific BLAS, use either (for example):
 #
 #   CMAKE_OPTIONS="-DBLA_VENDOR=Apple" make
-#   cd build && cmake -DBLA_VENDOR=Apple .. ; make
+#   cd build && cmake -DBLA_VENDOR=Apple .. ; cmake --build .
 #
 # Use SUITESPARSE_USE_64BIT_BLAS to select 64-bit or 32-bit BLAS.  If
 # BLA_VENDOR is also defined, this setting is strictly enforced.  If set to
@@ -63,7 +61,7 @@ endif ( )
 #
 # The default for SUITESPARSE_USE_64BIT_BLAS is OFF.
 
-if ( NOT (BLA_VENDOR STREQUAL "ANY" ) )
+if ( NOT ( "${BLA_VENDOR} " STREQUAL " " ) )
     # only look for the BLAS from a single vendor
     if ( ( BLA_VENDOR MATCHES "64ilp" ) OR
          ( BLA_VENDOR MATCHES "ilp64" ) )