[SuiteSparse_GPU] Update products to only contain GPU libraries

JuliaPackaging · Dec 14, 2023 · d775faa · d775faa
1 parent 64c2c84
commit d775faa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/S/SuiteSparse/SuiteSparse_GPU@7/build_tarballs.jl b/S/SuiteSparse/SuiteSparse_GPU@7/build_tarballs.jl
@@ -99,10 +99,6 @@ install_license LICENSE.txt
 platforms = CUDA.supported_platforms()
 filter!(p -> arch(p) == "x86_64", platforms)
 
-# Add products
-push!(products, LibraryProduct("libgpuqrengine", :libgpuqrengine))
-push!(products, LibraryProduct("libsuitesparse_gpuruntime", :libsuitesparse_gpuruntime))
-
 # Add dependency on SuiteSparse_jll
 push!(dependencies, Dependency("SuiteSparse_jll"))
 
@@ -113,7 +109,7 @@ for platform in platforms
     cuda_deps = CUDA.required_dependencies(platform)
 
     build_tarballs(ARGS, name, version, sources, script, [platform],
-                   products, [dependencies; cuda_deps]; lazy_artifacts=true,
+                   gpu_products, [dependencies; cuda_deps]; lazy_artifacts=true,
                    julia_compat="1.10",preferred_gcc_version=v"9",
                    augment_platform_block=CUDA.augment,
                    skip_audit=true, dont_dlopen=true)

diff --git a/S/SuiteSparse/common.jl b/S/SuiteSparse/common.jl
@@ -48,6 +48,15 @@ products = [
     LibraryProduct("libspqr",                :libspqr),
 ]
 
+# Products for the GPU builds of SuiteSparse
+gpu_products = [
+    LibraryProduct("libsuitesparseconfig",      :libsuitesparseconfig),
+    LibraryProduct("libcholmod",                :libcholmod),
+    LibraryProduct("libspqr",                   :libspqr),
+    LibraryProduct("libgpuqrengine",            :libgpuqrengine),
+    LibraryProduct("libsuitesparse_gpuruntime", :libsuitesparse_gpuruntime),
+]
+
 # Dependencies that must be installed before this package can be built
 dependencies = [
     Dependency("libblastrampoline_jll"; compat="5.8.0"),