update finding libscip (path to config.h) (#1106)

The path to config.h in SCIP 10 is given by
lib/shared/include/scip/config.h now.
Before this was avoided by using NO_CONFIG_HEADER.

Author: pfetsch

setup.py

@@ -22,10 +22,10 @@
     else:
         # fall back to global installation
         if platform.system() == "Darwin":
-            includedir = "/usr/local/include"
+            includedirs = ["/usr/local/include"]
             libdir = "/usr/local/lib"
         else:
-            includedir = "."
+            includedirs = ["."]
             libdir = "."
         libname = "libscip" if platform.system() == "Windows" else "scip"
         print("Assuming that SCIP is installed globally, because SCIPOPTDIR is undefined.\n")
@@ -34,39 +34,36 @@
 
     # check whether SCIP is installed in the given directory
     if os.path.exists(os.path.join(scipoptdir, "include")):
-        includedir = os.path.abspath(os.path.join(scipoptdir, "include"))
+        includedirs = [os.path.abspath(os.path.join(scipoptdir, "include"))]
     else:
-        print(f"SCIPOPTDIR={scipoptdir} does not contain an include directory; searching for include files in src or ../src directory.")
+        print("SCIPOPTDIR=%s does not contain an include directory; searching for include files in src or ../src directory.\n" % scipoptdir)
 
         if os.path.exists(os.path.join(scipoptdir, "src")):
             # SCIP seems to be installed in-place; check whether it was built using make or cmake
             if os.path.exists(os.path.join(scipoptdir, "src", "scip")):
                 # assume that SCIPOPTDIR pointed to the main source directory (make)
-                includedir = os.path.abspath(os.path.join(scipoptdir, "src"))
+                includedirs = [os.path.abspath(os.path.join(scipoptdir, "src")), os.path.abspath(os.path.join(scipoptdir, "lib/shared/include"))]
             else:
                 # assume that SCIPOPTDIR pointed to a cmake build directory; try one level up (this is just a heuristic)
                 if os.path.exists(os.path.join(scipoptdir, "..", "src", "scip")):
-                    includedir = os.path.abspath(os.path.join(scipoptdir, "..", "src"))
+                    includedirs = [os.path.abspath(os.path.join(scipoptdir, "..", "src"))]
                 else:
-                    sys.exit(f"Could neither find src/scip nor ../src/scip directory in SCIPOPTDIR={scipoptdir}. Consider installing SCIP in a separate directory.")
+                    sys.exit("Could neither find src/scip nor ../src/scip directory in SCIPOPTDIR=%s. Consider installing SCIP in a separate directory." % scipoptdir)
         else:                    
-            sys.exit(f"Could not find a src directory in SCIPOPTDIR={scipoptdir}; maybe it points to a wrong directory.")
+            sys.exit("Could not find a src directory in SCIPOPTDIR=%s; maybe it points to a wrong directory." % scipoptdir)
 
     # determine library
     if os.path.exists(os.path.join(scipoptdir, "lib", "shared", "libscip.so")):
         # SCIP seems to be created with make
         libdir = os.path.abspath(os.path.join(scipoptdir, "lib", "shared"))
         libname = "scip"
-        extra_compile_args.append("-DNO_CONFIG_HEADER")
-        # the following is a temporary hack to make it compile with SCIP/make:
-        extra_compile_args.append("-DTPI_NONE")  # if other TPIs are used, please modify
     else:
         # assume that SCIP is installed on the system
         libdir = os.path.abspath(os.path.join(scipoptdir, "lib"))
         libname = "libscip" if platform.system() == "Windows" else "scip"
 
-    print(f"Using include path {includedir}.")
-    print(f"Using SCIP library {libname} at {libdir}.\n")
+    print("Using include path %s." % includedirs)
+    print("Using SCIP library %s at %s.\n" % (libname, libdir))
 
 # set runtime libraries
 if platform.system() in ["Linux", "Darwin"]:
@@ -96,16 +93,15 @@
 
 ext = ".pyx" if use_cython else ".c"
 
-
 on_github_actions = os.getenv('GITHUB_ACTIONS') == 'true'
 release_mode = os.getenv('RELEASE') == 'true'
 compile_with_line_tracing = on_github_actions and not release_mode    
 
 extensions = [
     Extension(
         "pyscipopt.scip",
-        [os.path.join(packagedir, f"scip{ext}")],
-        include_dirs=[includedir],
+        [os.path.join(packagedir, "scip%s" % ext)],
+        include_dirs=includedirs,
         library_dirs=[libdir],
         libraries=[libname],
         extra_compile_args=extra_compile_args,