Skip to content

Commit 090ff6d

Browse files
committed
vtd: Migrate vtd-2022.3 package to Conan 2.0 compatibility
1 parent 0eceaaf commit 090ff6d

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

optional/vtd/vendor/vtd-2022.3/conanfile.py

+11-6
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@
99
from pathlib import Path
1010
from typing import List
1111

12-
from conans import CMake, ConanFile, tools
13-
from conans.errors import ConanInvalidConfiguration
12+
from conan import ConanFile
13+
from conan.tools import files
14+
from conans.error import ConanInvalidConfiguration
15+
16+
required_conan_version = ">=1.52.0"
1417

1518

1619
def patch_rpath(file: Path, rpath: List[str]):
@@ -109,7 +112,7 @@ def build(self):
109112

110113
def extract_archive(archive):
111114
print(f"Extracting: {archive}")
112-
tools.untargz(src / archive, dst)
115+
files.untargz(src / archive, dst)
113116

114117
extract_archive(self._archive_base)
115118
libdir.mkdir()
@@ -216,13 +219,15 @@ def package(self):
216219
def package_info(self):
217220
bindir = Path(self.package_folder) / "bin"
218221
self.output.info(f"Appending PATH environment variable: {bindir}")
219-
self.env_info.PATH.append(str(bindir))
220-
self.env_info.VTD_ROOT = self.package_folder
222+
self.runenv_info.append_path("PATH", str(bindir))
223+
self.runenv_info.define("VTD_ROOT", self.package_folder)
224+
self.buildenv_info.define("VTD_ROOT", self.package_folder)
225+
221226
if self.options.with_osi:
222227
osi_path = (
223228
Path(self.package_folder)
224229
/ "Data/Setups/Standard.OSI3/Bin/libopen_simulation_interface.so"
225230
)
226231
if not osi_path.exists():
227232
raise ConanInvalidConfiguration("VTD OSI library not found.")
228-
self.env_info.VTD_EXTERNAL_MODELS.append(f"{osi_path}")
233+
self.runenv_info.append("VTD_EXTERNAL_MODELS", f"{osi_path}")

0 commit comments

Comments
 (0)