diff --git a/recipes/scip/all/conandata.yml b/recipes/scip/all/conandata.yml index 12a96faa61f7b..4627733fa996f 100644 --- a/recipes/scip/all/conandata.yml +++ b/recipes/scip/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "10.0.0": + url: "https://github.com/scipopt/scip/releases/download/v10.0.0/scip-10.0.0.tgz" + sha256: "b91d2ed32c422a13c502c37cf296eb9550e55d6bd311e61bfa6dfb9811b03d87" "9.2.4": url: "https://github.com/scipopt/scip/archive/refs/tags/v924.tar.gz" sha256: "780cc185e006ac09163d66d5fed2dbeabd1fdbe660232e7e46e9e51c77c3ab5d" @@ -26,24 +29,35 @@ patches: patch_description: "Change hard-coded paths to conan includes" patch_type: "conan" version_mappings: + "10.0.0": + soplex: "8.0.0" + default_sym: "snauty" + default_tpi: "tny" "9.2.4": soplex: "7.1.6" default_sym: "snauty" + default_tpi: False "9.2.3": soplex: "7.1.5" default_sym: "snauty" + default_tpi: False "9.2.0": soplex: "7.1.2" default_sym: "snauty" + default_tpi: False "9.0.1": soplex: "7.0.1" default_sym: "bliss" + default_tpi: False "8.1.0": soplex: "6.0.4" default_sym: "bliss" + default_tpi: False "8.0.4": soplex: "6.0.4" default_sym: "bliss" + default_tpi: False "8.0.3": soplex: "6.0.3" default_sym: "bliss" + default_tpi: False diff --git a/recipes/scip/all/conanfile.py b/recipes/scip/all/conanfile.py index 0c642f80cc866..80213b3a9fd61 100644 --- a/recipes/scip/all/conanfile.py +++ b/recipes/scip/all/conanfile.py @@ -25,13 +25,12 @@ class SCIPConan(ConanFile): "fPIC": [True, False], "with_gmp": [True, False], "with_tpi": [False, "omp", "tny"], - "with_sym": [False, "bliss", "snauty"], + "with_sym": [False, "bliss", "dejavu" ,"snauty"], } default_options = { "shared": False, "fPIC": True, - "with_gmp": True, - "with_tpi": False + "with_gmp": True } @property @@ -71,6 +70,8 @@ def validate(self): if Version(self.version) >= "9.0.1" and is_msvc(self) and self.settings.build_type == "Debug": # lpi_spx2.cpp : error C1128: number of sections exceeded object file format limit: compile with /bigobj raise ConanInvalidConfiguration(f"{self.ref} can not be build in Debug with MSVC.") + if Version(self.version) < "10.0.0" and self.options.with_sym == "dejavu": + raise ConanInvalidConfiguration(f"Value 'dejavu' for option 'with_sym' is supported only for version >= 10.") def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) @@ -92,6 +93,8 @@ def config_options(self): del self.options.fPIC if self.options.with_sym == None: self.options.with_sym = self.conan_data["version_mappings"][self.version]["default_sym"] + if self.options.with_tpi == None: + self.options.with_tpi = self.conan_data["version_mappings"][self.version]["default_tpi"] def configure(self): self.options["soplex"].with_gmp = self.options.with_gmp @@ -114,6 +117,9 @@ def generate(self): tc.variables["TPI"] = self.options.with_tpi or "none" tc.variables["LPS"] = "spx" tc.variables["SYM"] = self.options.with_sym or "none" + if Version(self.version) >= "10.0.0": + tc.variables["EXACTSOLVE"] = False + tc.variables["MPFR"] = False tc.variables["SOPLEX_INCLUDE_DIRS"] = self._to_cmake(self.dependencies["soplex"].cpp_info.includedirs) if self.options.shared: # CMakeLists accesses different variables for SoPlex depending on the SHARED option diff --git a/recipes/scip/config.yml b/recipes/scip/config.yml index 4e92532479579..2b6f193f3de5c 100644 --- a/recipes/scip/config.yml +++ b/recipes/scip/config.yml @@ -1,4 +1,6 @@ versions: + "10.0.0": + folder: all "9.2.4": folder: all "9.2.3":