Granular.jl

Julia package for granular dynamics simulation
git clone git://src.adamsgaard.dk/Granular.jl
Log | Files | Refs | README | LICENSE

commit 24c69b8beed23fe0a2fbbc13a1b60d7686dd1011
parent 16941e6bdbc0bf4e555617da7db0b2a3efa820a8
Author: Anders Damsgaard <andersd@riseup.net>
Date:   Tue,  7 Nov 2017 13:06:54 -0500

update BinDeps script with Linux and Windows instructions

Diffstat:
MREQUIRE | 6++++--
Mdeps/build.jl | 18++++++++++++++++--
2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/REQUIRE b/REQUIRE @@ -2,5 +2,7 @@ julia 0.6 WriteVTK NetCDF Documenter -@osx Homebrew -BinDeps +BinDeps 0.2.12- +Compat 0.9.1 +@osx Homebrew 0.0.4- +@windows WinRPM diff --git a/deps/build.jl b/deps/build.jl @@ -1,13 +1,27 @@ #!/usr/bin/env julia using BinDeps +using Compat @BinDeps.setup -imagemagick = library_dependency("imagemagick") +imagemagick = library_dependency("imagemagick", aliases = ["ImageMagick"]) -if is_apple() +if is_linux() + provides(AptGet, "imagemagick", imagemagick, os = :Linux) + provides(Yum, "ImageMagick", imagemagick, os = :Linux) + provides(Pacman, "imagemagick", imagemagick, os = :Linux) + +elseif is_apple() + if Pkg.installed("Homebrew") === nothing + error("Homebrew julia package not installed, " * + "please run Pkg.add(\"Homebrew\")") + end using Homebrew provides(Homebrew.HB, "imagemagick", imagemagick, os = :Darwin) + +elseif is_windows() + using WinRPM + provides(WinRPM.RPM, "imagemagick", imagemagick, os = :Windows) end @BinDeps.install Dict(:imagemagick => :imagemagick)