Skip to content

Commit

Permalink
(#19582) gtsam: add v4.2, remove v4.2.0a9 pre-release, bump deps
Browse files Browse the repository at this point in the history
* gtsam: add v4.2, remove v4.2.0a9 pre-release, bump deps

* gtsam: update config.yml
  • Loading branch information
valgur authored Oct 16, 2023
1 parent d2f965e commit 71b404d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 24 deletions.
12 changes: 4 additions & 8 deletions recipes/gtsam/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
sources:
"4.2.0a9":
url: "https://github.com/borglab/gtsam/archive/refs/tags/4.2a9.tar.gz"
sha256: "a9790e5132bfb2705a5985a1505c3cf9cdf95b711be8352ffa9a9299b279f2f8"
"4.2":
url: "https://github.com/borglab/gtsam/archive/refs/tags/4.2.tar.gz"
sha256: "9ff8846d0a83a245c284cb5760ec2d74535ef9b5885183ccfefd7ff122eba60e"
"4.1.1":
url: "https://github.com/borglab/gtsam/archive/4.1.1.tar.gz"
sha256: "c7b5e6cdad52b141c272778f47baf628975457be3e26ed96a7bc2ae685a00af0"
"4.0.3":
url: "https://github.com/borglab/gtsam/archive/4.0.3.tar.gz"
sha256: "eaa561749edf7a2d402981828253e28aed6c717dae35738301c5ab23e2595f25"
patches:
"4.2.0a9":
"4.2":
- patch_file: "patches/4.1.1-0001-cmake-boost.patch"
patch_description: "Use boost targets"
patch_type: "conan"
Expand All @@ -19,10 +19,6 @@ patches:
- patch_file: "patches/4.2.0-0002-eigen3-version.patch"
patch_description: "Get Eigen3 version info from Conan"
patch_type: "conan"
- patch_file: "patches/4.2.0a9-0001-fix-invalid-include.patch"
patch_description: "Fix an invalid include for pre-C++17 compatibility"
patch_type: "portability"
patch_source: "https://github.com/borglab/gtsam/pull/1545"
"4.1.1":
- patch_file: "patches/4.1.1-0001-cmake-boost.patch"
patch_description: "Use boost targets"
Expand Down
6 changes: 3 additions & 3 deletions recipes/gtsam/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,12 @@ def layout(self):
cmake_layout(self, src_folder="src")

def requirements(self):
self.requires("boost/1.82.0", transitive_headers=True)
self.requires("boost/1.83.0", transitive_headers=True)
self.requires("eigen/3.4.0", transitive_headers=True)
if self.options.with_TBB:
self.requires("onetbb/2021.9.0", transitive_headers=True)
self.requires("onetbb/2021.10.0", transitive_headers=True)
if self.options.default_allocator == "tcmalloc":
self.requires("gperftools/2.10.0")
self.requires("gperftools/2.11.0")
# TODO: add use_vendored_metis=False option
# if self.options.support_nested_dissection and not self.options.use_vendored_metis:
# # Used in a public header here:
Expand Down
12 changes: 0 additions & 12 deletions recipes/gtsam/all/patches/4.2.0a9-0001-fix-invalid-include.patch

This file was deleted.

2 changes: 1 addition & 1 deletion recipes/gtsam/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
versions:
"4.2.0a9":
"4.2":
folder: all
"4.1.1":
folder: all
Expand Down

0 comments on commit 71b404d

Please sign in to comment.