Skip to content

Commit

Permalink
use bin dir
Browse files Browse the repository at this point in the history
  • Loading branch information
bqpd committed Sep 4, 2019
1 parent fe405a4 commit df99331
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion gpkit/_mosek/expopt.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def c_array(py_array, c_type):


MOSEK_VERSION = settings["mosek_version"]
LIB = path.dirname(path.abspath(__file__)) + sep + "build" + sep + "expopt.so"
LIB = path.dirname(settings["mosek_bin_path"])
MSK = ModuleShortener("MSK", load_library(LIB))

MSK_RES_OK = 0
Expand Down
2 changes: 2 additions & 0 deletions gpkit/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,8 @@ def build(self):
+ " @executable_path/libmosek64.8.1.dylib "
+ pathjoin(self.bin_dir, "mskexpopt"))

settings["mosek_bin_path"] = pathjoin(solib_dir, "expopt.so")

if built_expopt_lib != 0:
return False

Expand Down

0 comments on commit df99331

Please sign in to comment.