Skip to content

Some v2 fixes to propgate header dependencies. #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szmyd merged 2 commits into from
Feb 3, 2024
Merged

Some v2 fixes to propgate header dependencies. #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
100eafb
Some v2 fixes to propgate header dependencies.
szmyd Feb 3, 2024
a3805a9
Bump version
szmyd Feb 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions 3rd_party/folly/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ def package_info(self):
"openssl::openssl",
"bzip2::bzip2",
"snappy::snappy",
"liburing::liburing",
"zlib::zlib",
"zstd::zstd",
"libsodium::libsodium",
Expand Down
31 changes: 16 additions & 15 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class SISLConan(ConanFile):
name = "sisl"
version = "11.1.2"
version = "11.1.3"

homepage = "https://github.com/eBay/sisl"
description = "Library for fast data structures, utilities"
Expand Down Expand Up @@ -49,7 +49,7 @@ def _min_cppstd(self):

def validate(self):
if self.settings.compiler.get_safe("cppstd"):
check_min_cppstd(self, self._min_cppstd)
check_min_cppstd(self, self._min_cppstd())

def configure(self):
if self.settings.compiler in ["gcc"]:
Expand All @@ -71,26 +71,27 @@ def build_requirements(self):
def requirements(self):
# Memory allocation
if self.options.malloc_impl == "tcmalloc":
self.requires("gperftools/2.15")
self.requires("gperftools/2.15", transitive_headers=True)
elif self.options.malloc_impl == "jemalloc":
self.requires("jemalloc/5.3.0")
self.requires("jemalloc/5.3.0", transitive_headers=True)

# Linux Specific Support
if self.settings.os in ["Linux"]:
self.requires("folly/nu2.2023.12.18.00")
self.requires("userspace-rcu/nu2.0.14.0")
self.requires("folly/nu2.2023.12.18.00", transitive_headers=True)
self.requires("userspace-rcu/nu2.0.14.0", transitive_headers=True)

# Generic packages (conan-center)
self.requires("boost/1.83.0")
self.requires("boost/1.83.0", transitive_headers=True)
self.requires("cxxopts/3.1.1", transitive_headers=True)
self.requires("flatbuffers/23.5.26", transitive_headers=True)
self.requires("grpc/1.54.3", transitive_headers=True)
self.requires("nlohmann_json/3.11.2", transitive_headers=True)
self.requires("prometheus-cpp/1.1.0", transitive_headers=True)
self.requires("spdlog/1.12.0", transitive_headers=True)
self.requires("zmarok-semver/1.1.0", transitive_headers=True)

if self.settings.os in ["Linux"]:
self.requires("breakpad/cci.20210521")
self.requires("cxxopts/3.1.1")
self.requires("flatbuffers/23.5.26")
self.requires("grpc/1.54.3")
self.requires("nlohmann_json/3.11.2")
self.requires("prometheus-cpp/1.1.0")
self.requires("spdlog/1.12.0")
self.requires("zmarok-semver/1.1.0")
self.requires("fmt/10.0.0", override=True)
self.requires("libcurl/8.4.0", override=True)
self.requires("xz_utils/5.4.5", override=True)
Expand Down Expand Up @@ -164,7 +165,7 @@ def package_info(self):
"folly::folly",
"flatbuffers::flatbuffers",
"spdlog::spdlog",
"grpc::grpc++",
"grpc::grpc",
"nlohmann_json::nlohmann_json",
"prometheus-cpp::prometheus-cpp",
"userspace-rcu::userspace-rcu",
Expand Down