diff --git a/setup.py b/setup.py index e484f7ecb..48abf2926 100644 --- a/setup.py +++ b/setup.py @@ -10,8 +10,8 @@ # if SCIPOPTDIR is not set, we assume that SCIP is installed globally if not scipoptdir: if platform.system() == "Darwin": - includedir = "/usr/local/include/" - libdir = "/usr/local/lib/" + includedir = "/usr/local/include" + libdir = "/usr/local/lib" else: includedir = "." libdir = "." @@ -58,6 +58,7 @@ # set runtime libraries if platform.system() in ["Linux", "Darwin"]: + extra_compile_args.append("-I/opt/homebrew/include") extra_link_args.append(f"-Wl,-rpath,{libdir}") # enable debug mode if requested diff --git a/src/pyscipopt/scip.pxi b/src/pyscipopt/scip.pxi index 67e019387..eba75495d 100644 --- a/src/pyscipopt/scip.pxi +++ b/src/pyscipopt/scip.pxi @@ -2361,7 +2361,7 @@ cdef class Model: """ if self.getMajorVersion() < MAJOR: raise Exception("linked SCIP is not compatible to this version of PySCIPOpt - use at least version", MAJOR) - if self.getMinorVersion() < MINOR: + if self.getMajorVersion() == MAJOR and self.getMinorVersion() < MINOR: warnings.warn( "linked SCIP {}.{} is not recommended for this version of PySCIPOpt - use version {}.{}.{}".format( self.getMajorVersion(), self.getMinorVersion(), MAJOR, MINOR, PATCH))