Skip to content

Commit

Permalink
Minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
gcalderone committed Jan 2, 2018
1 parent 6e5a342 commit ecb5d18
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ os:
- osx
julia:
- 0.6
- nightly
notifications:
email: false
git:
Expand Down
14 changes: 12 additions & 2 deletions deps/build.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using BinDeps
using Compat.Sys: iswindows, isapple, isunix

@BinDeps.setup

Expand All @@ -11,9 +12,18 @@ provides(Sources, URI("https://www.physics.wisc.edu/~craigm/idl/down/cmpfit-1.3a
builddir = joinpath(BinDeps.depsdir(libmpfit), "src", "cmpfit-1.3a", "build")
libdir = BinDeps.libdir(libmpfit)

libfilename = ""
if isapple()
libfilename = "libmpfit.dylib"
elseif isunix()
libfilename = "libmpfit.so"
elseif iswindows()
libfilename = "libmpfit.dll"
end

provides(SimpleBuild,
(@build_steps begin
FileRule(joinpath(libdir,"libmpfit.so"),
FileRule(joinpath(libdir, libfilename),
@build_steps begin
GetSources(libmpfit)
CreateDirectory(builddir)
Expand All @@ -24,7 +34,7 @@ provides(SimpleBuild,
`cp ../../../cmake.mpfit ../CMakeLists.txt`
`cmake ../`
`make`
`cp libmpfit.so $libdir`
`cp $libfilename $libdir`
end
end
)
Expand Down

0 comments on commit ecb5d18

Please sign in to comment.