From e1b8287e66a30f741a4286d7a482fb5c61b4dbf2 Mon Sep 17 00:00:00 2001 From: Paul Molodowitch Date: Tue, 11 Apr 2023 18:07:29 -0700 Subject: [PATCH] make tbb respect the tbbmalloc and tbbproxy conan options also, now that these options can actually do something, they should be included in the package_id Signed-off-by: Paul Molodowitch --- packages/conan/recipes/tbb/conanfile.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/conan/recipes/tbb/conanfile.py b/packages/conan/recipes/tbb/conanfile.py index c875d633..ea6c0003 100644 --- a/packages/conan/recipes/tbb/conanfile.py +++ b/packages/conan/recipes/tbb/conanfile.py @@ -22,8 +22,8 @@ class TBBConan(ConanFile): default_options = { "shared": True, "fPIC": True, - "tbbmalloc": False, - "tbbproxy": False, + "tbbmalloc": True, + "tbbproxy": True, } @property @@ -50,13 +50,9 @@ def configure(self): not self.options.shared or not self.options.tbbmalloc ): raise ConanInvalidConfiguration( - "tbbproxy needs tbbmaloc and shared options" + "tbbproxy needs tbbmalloc and shared options" ) - def package_id(self): - del self.info.options.tbbmalloc - del self.info.options.tbbmalloc_proxy - def build_requirements(self): if tools.os_info.is_windows: if "CONAN_MAKE_PROGRAM" not in os.environ and not tools.which("make"): @@ -200,7 +196,11 @@ def add_flag(name, value): add_flag("CFLAGS", "-mrtm") add_flag("CXXFLAGS", "-mrtm") - targets = ["tbb", "tbbmalloc", "tbbproxy"] + targets = ["tbb"] + if self.options.tbbmalloc: + targets.append("tbbmalloc") + if self.options.tbbproxy: + targets.append("tbbproxy") context = tools.no_op() if self.settings.compiler == "intel": context = tools.intel_compilervars(self)