Skip to content
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

Jump to bottom

onetbb: add 2021.12.0 #23523

Closed
wants to merge 1 commit into from
Closed

onetbb: add 2021.12.0 #23523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions recipes/onetbb/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"2021.12.0":
url: "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.12.0.tar.gz"
sha256: "c7bb7aa69c254d91b8f0041a71c5bcc3936acb64408a1719aec0b2b7639dd84f"
"2021.10.0":
url: "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.10.0.tar.gz"
sha256: "487023a955e5a3cc6d3a0d5f89179f9b6c0ae7222613a7185b0227ba0c83700b"
Expand Down Expand Up @@ -41,6 +44,6 @@
- patch_description: "Use pkg_search_module with IMPORTED_TARGET"
patch_type: "portability"
patch_source:
- "https://github.com/oneapi-src/oneTBB/pull/448.diff"
- "https://github.com/oneapi-src/oneTBB/commit/df3096075a00942acbdd3ce9347f5298cc153fd6.diff"
patch_file: "patches/pkg-search-module-use-imported-target.diff"
7 changes: 4 additions & 3 deletions recipes/onetbb/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from conan.tools.build import cross_building
from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
from conan.tools.env import VirtualBuildEnv
from conan.tools.files import apply_conandata_patches, export_conandata_patches, copy, get, load, rmdir
from conan.tools.files import apply_conandata_patches, export_conandata_patches, copy, get, load, rmdir, rm
from conan.tools.gnu import PkgConfigDeps
from conan.tools.scm import Version
import os
Expand Down Expand Up @@ -52,7 +52,7 @@ def _tbbbind_hwloc_version(self):

@property
def _tbbbind_supported(self):
return self.settings.os != "Macos"
return self.settings.os != "Macos" or Version(self.version) >= "2021.11.0"

@property
def _tbbbind_build(self):
Expand Down Expand Up @@ -120,7 +120,7 @@ def generate(self):
toolchain.variables["TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH"] = not self._tbbbind_build
if self._tbbbind_explicit_hwloc:
hwloc_package_folder = self.dependencies["hwloc"].package_folder
hwloc_lib_name = "hwloc.lib" if self.settings.os == "Windows" else "libhwloc.so"
hwloc_lib_name = "hwloc.lib" if self.settings.os == "Windows" else "libhwloc.dylib" if self.settings.os == "Macos" else "libhwloc.so"
toolchain.variables[f"CMAKE_HWLOC_{self._tbbbind_hwloc_version}_LIBRARY_PATH"] = \
os.path.join(hwloc_package_folder, "lib", hwloc_lib_name).replace("\\", "/")
toolchain.variables[f"CMAKE_HWLOC_{self._tbbbind_hwloc_version}_INCLUDE_PATH"] = \
Expand All @@ -147,6 +147,7 @@ def package(self):
rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
rmdir(self, os.path.join(self.package_folder, "share"))
rm(self, "*.pdb", os.path.join(self.package_folder, "bin"))

def package_info(self):
self.cpp_info.set_property("cmake_file_name", "TBB")
Expand Down
2 changes: 2 additions & 0 deletions recipes/onetbb/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"2021.12.0":
folder: all
"2021.10.0":
folder: all
"2021.9.0":
Expand Down
Loading