Skip to content

Commit 01e2354

Browse files
Fix master compatibility (#988)
* Remove redundant delimiter * Add homebrew include * Allow master version --------- Co-authored-by: João Dionísio <57299939+Joao-Dionisio@users.noreply.github.com>
1 parent 5f65812 commit 01e2354

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
# if SCIPOPTDIR is not set, we assume that SCIP is installed globally
1111
if not scipoptdir:
1212
if platform.system() == "Darwin":
13-
includedir = "/usr/local/include/"
14-
libdir = "/usr/local/lib/"
13+
includedir = "/usr/local/include"
14+
libdir = "/usr/local/lib"
1515
else:
1616
includedir = "."
1717
libdir = "."
@@ -58,6 +58,7 @@
5858

5959
# set runtime libraries
6060
if platform.system() in ["Linux", "Darwin"]:
61+
extra_compile_args.append("-I/opt/homebrew/include")
6162
extra_link_args.append(f"-Wl,-rpath,{libdir}")
6263

6364
# enable debug mode if requested

src/pyscipopt/scip.pxi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2361,7 +2361,7 @@ cdef class Model:
23612361
"""
23622362
if self.getMajorVersion() < MAJOR:
23632363
raise Exception("linked SCIP is not compatible to this version of PySCIPOpt - use at least version", MAJOR)
2364-
if self.getMinorVersion() < MINOR:
2364+
if self.getMajorVersion() == MAJOR and self.getMinorVersion() < MINOR:
23652365
warnings.warn(
23662366
"linked SCIP {}.{} is not recommended for this version of PySCIPOpt - use version {}.{}.{}".format(
23672367
self.getMajorVersion(), self.getMinorVersion(), MAJOR, MINOR, PATCH))

0 commit comments

Comments
 (0)