From 5aa33fd0b34fdc16601d2ae68367dd578e255057 Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Sun, 15 Feb 2015 02:14:04 -0800 Subject: [PATCH] Windows binary support via WinRPM --- REQUIRE | 2 ++ deps/.gitignore | 1 + deps/build.jl | 7 ++++++- deps/deps.jl | 5 ----- 4 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 REQUIRE create mode 100644 deps/.gitignore delete mode 100644 deps/deps.jl diff --git a/REQUIRE b/REQUIRE new file mode 100644 index 0000000..3225153 --- /dev/null +++ b/REQUIRE @@ -0,0 +1,2 @@ +BinDeps +@windows WinRPM diff --git a/deps/.gitignore b/deps/.gitignore new file mode 100644 index 0000000..52d61f8 --- /dev/null +++ b/deps/.gitignore @@ -0,0 +1 @@ +deps.jl diff --git a/deps/build.jl b/deps/build.jl index 55f8c1d..70dd2cc 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -2,13 +2,18 @@ using BinDeps @BinDeps.setup -libdmumps_seq = library_dependency("libdmumps_seq") +libdmumps_seq = library_dependency("libdmumps_seq", aliases=["libdmumps"]) @linux_only begin provides(AptGet, "libmumps-seq-dev", libdmumps_seq) # provides(Yum, "MUMPS-4.10.0", libdmumps) end +@windows_only begin + using WinRPM + provides(WinRPM.RPM, "mumps", libdmumps_seq, os = :Windows) +end + ## @osx_only begin ## using Homebrew ## provides( Homebrew.HB, "mumps", dmumps, os = :Darwin ) diff --git a/deps/deps.jl b/deps/deps.jl deleted file mode 100644 index 155a09f..0000000 --- a/deps/deps.jl +++ /dev/null @@ -1,5 +0,0 @@ -macro checked_lib(libname, path) - (dlopen_e(path) == C_NULL) && error("Unable to load \n\n$libname ($path)\n\nPlease re-run Pkg.build(package), and restart Julia.") - quote const $(esc(libname)) = $path end - end -@checked_lib libdmumps "libdmumps_seq"