Skip to content

Commit

Permalink
Update Xpress.jl
Browse files Browse the repository at this point in the history
  • Loading branch information
odow authored Mar 5, 2024
1 parent 10944a2 commit 926a8d9
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/Xpress.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

module Xpress

import LazyArtifacts
import Libdl

# Load in `deps.jl`, complaining if it does not exist
Expand All @@ -17,22 +18,19 @@ const depsjl_path = joinpath(@__DIR__, "..", "deps", "deps.jl")
(Sys.iswindows() ? "" : "lib") * "xprs.$(Libdl.dlext)",
)
elseif get(ENV, "CI", "") == "true" && Sys.isapple() # Use the artifact instead.
import LazyArtifacts
const xpressdlpath = joinpath(
LazyArtifacts.artifact"xpresspy",
"lib/python3.10/site-packages/xpress/lib",
)
const libxprs = joinpath(xpressdlpath, "libxprs.dylib")
elseif get(ENV, "CI", "") == "true" && ENVSys.islinux() # Use the artifact instead.
import LazyArtifacts
elseif get(ENV, "CI", "") == "true" && Sys.islinux() # Use the artifact instead.
const xpressdlpath = joinpath(
LazyArtifacts.artifact"xpresspy",
"lib/python3.10/site-packages/xpress/lib",
)
# Annoyingly, Xpress has the version after extension
const libxprs = joinpath(xpressdlpath, "libxprs.so.42")
elseif get(ENV, "CI", "") == "true" && Sys.iswindows() # Use the artifact instead.
import LazyArtifacts
const xpressdlpath = joinpath(
LazyArtifacts.artifact"xpresspy",
joinpath("Lib", "site-packages", "xpress", "lib"),
Expand Down

0 comments on commit 926a8d9

Please sign in to comment.