Skip to content

Commit

Permalink
Test
Browse files Browse the repository at this point in the history
  • Loading branch information
blegat committed Oct 10, 2017
1 parent be487b0 commit 37a2ac7
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions deps/build.jl
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,8 @@ function glpkvalidate(name, handle)
ver = VersionNumber(ver_str)
glpkminver <= ver <= glpkmaxver
end
depends = []
@static if is_windows()
# If it is called libgmp, it will detect julia/bin/libgmp.dll but libglpk doesn't seem be be satisfied
# with it, we need to install libgmp10.
gmpdep = library_dependency("libgmp10", aliases = ["libgmp-10", "libgmp10"])
push!(depends, gmpdep)
end
@show depends
glpkdep = library_dependency("libglpk", aliases = ["libglpk-40"], # it is called libglpk-40 on the glpk-devel WinRPM package
depends = depends, validate = glpkvalidate)
validate = glpkvalidate)

# Build from sources (used by Linux, BSD)
julia_usrdir = normpath("$JULIA_HOME/../") # This is a stopgap, we need a better builtin solution to get the included libraries
Expand All @@ -48,7 +40,6 @@ end
# Windows
@static if is_windows()
using WinRPM
provides(WinRPM.RPM, "libgmp10", [gmpdep], os = :Windows)
provides(WinRPM.RPM, "glpk-devel", [glpkdep], os = :Windows)
end

Expand Down

0 comments on commit 37a2ac7

Please sign in to comment.