Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add lib dir to Libdl.DL_LOAD_PATH #64

Closed
wants to merge 7 commits into from
Closed

add lib dir to Libdl.DL_LOAD_PATH #64

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
11945fc
add lib dir to Libdl.DL_LOAD_PATH
Sep 6, 2018
f4a63f3
Update .travis.yml
Sep 6, 2018
b075c83
Add Libdl, required by julia v0.6
Sep 6, 2018
c5e5bc7
delete Libdl from REQUIRE
Sep 6, 2018
a679c93
importall is deprecated
Sep 6, 2018
b694467
Update REQUIRE
Sep 6, 2018
2263fc5
Update MathOptInterface version
Sep 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ os:
julia:
- 0.6
- 0.7
- 1.0.0
notifications:
email: false
script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- julia -e 'Pkg.clone(pwd()); Pkg.build("Cbc"); Pkg.test("Cbc"; coverage=true)'
#script:
# - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
# - julia -e 'Pkg.clone(pwd()); Pkg.build("Cbc"); Pkg.test("Cbc"; coverage=true)'
#after_success:
#- julia -e 'cd(Pkg.dir("Cbc")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
3 changes: 3 additions & 0 deletions deps/build.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using BinDeps
using Libdl
import Compat.Sys

@BinDeps.setup
Expand Down Expand Up @@ -49,6 +50,8 @@ end
prefix=joinpath(BinDeps.depsdir(libclp),"usr")
patchdir=BinDeps.depsdir(libclp)
srcdir = joinpath(BinDeps.depsdir(libclp),"src",cbcname)
libdir = joinpath(prefix,"lib")
push!(Libdl.DL_LOAD_PATH,libdir)

provides(SimpleBuild,
(@build_steps begin
Expand Down
2 changes: 1 addition & 1 deletion src/CbcSolverInterface.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module CbcMathProgSolverInterface

using Cbc.CbcCInterface

importall MathProgBase.SolverInterface
using MathProgBase.SolverInterface

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using only replaces parts of what importall was doing, but see #65.


export CbcMathProgModel,
Expand Down