Skip to content

Commit

Permalink
(#24055) [scippp] add version 1.2.0
Browse files Browse the repository at this point in the history
* Add SCIP++ 1.2.0

* Fix version string

* Move version mapping to conandata to be trimmed per version

* typo

---------

Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>
  • Loading branch information
hedtke and RubenRBS committed Jun 4, 2024
1 parent 2cd819a commit 856b03d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
7 changes: 7 additions & 0 deletions recipes/scippp/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
sources:
"1.2.0":
url: "https://github.com/scipopt/SCIPpp/archive/refs/tags/1.2.0.tar.gz"
sha256: "8fa4b819734b9841eda1ec1c9266fb07144be490c3f24be46271c538ab18da61"
"1.1.0":
url: "https://github.com/scipopt/SCIPpp/archive/refs/tags/1.1.0.tar.gz"
sha256: "808b58e8ddd873ec403c021f9255004120e58d7ec6fb4b7d99ff6f21950ff8fb"
"1.0.2":
url: "https://github.com/scipopt/SCIPpp/archive/refs/tags/1.0.2.tar.gz"
sha256: "d51dfd0f1ca1b57619f7c82e32d5390d99d5cdaee98ae1ace99ec05a394dcee3"
scip_mapping:
"1.2.0": "9.0.1"
"1.1.0": "8.0.4"
"1.0.2": "8.0.4"
2 changes: 1 addition & 1 deletion recipes/scippp/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def configure(self):

def requirements(self):
# see https://github.com/scipopt/SCIPpp/blob/1.0.0/conanfile.py#L25
self.requires("scip/8.0.4", transitive_headers=True)
self.requires(f"scip/{self.conan_data['scip_mapping'][self.version]}", transitive_headers=True)

def generate(self):
tc = CMakeToolchain(self)
Expand Down
2 changes: 2 additions & 0 deletions recipes/scippp/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.2.0":
folder: all
"1.1.0":
folder: all
"1.0.2":
Expand Down

0 comments on commit 856b03d

Please sign in to comment.