Skip to content

Commit a62a118

Browse files
committed
vtd: Use vendored vtd package
- This also involves rewriting the `vtd` script which is used to launch and terminate VTD. This script is now rewritten in Python and it creates a VTD sandbox first. This will probably be moved to the VTD Conan package itself in due time.
1 parent 6f7d94d commit a62a118

File tree

9 files changed

+390
-91
lines changed

9 files changed

+390
-91
lines changed

Makefile.setup

+12-5
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,16 @@ install-ubuntu-deps::
6767
python3-setuptools \
6868
python3-pip \
6969
time \
70-
tmux
70+
tmux \
71+
;
7172

7273
ifndef WITHOUT_DEV_DEPS
7374
install-ubuntu-deps::
7475
command -v ${APT} >/dev/null 2>&1
7576
${APT} install ${APT_ARGS} \
7677
clang-format \
77-
python3-venv
78+
python3-venv \
79+
;
7880
endif
7981

8082
# Archlinux -------------------------------------------------------------------
@@ -96,14 +98,16 @@ install-archlinux-deps::
9698
patchelf \
9799
python-pip \
98100
time \
99-
tmux
101+
tmux \
102+
;
100103

101104
ifndef WITHOUT_DEV_DEPS
102105
install-archlinux-deps::
103106
command -v ${PACMAN} >/dev/null 2>&1
104107
${PACMAN} -S ${PACMAN_ARGS} \
105108
clang \
106-
python-virtualenv
109+
python-virtualenv \
110+
;
107111
endif
108112

109113
# Python ----------------------------------------------------------------------
@@ -113,7 +117,10 @@ endif
113117

114118
install-python-deps::
115119
command -v ${PIP} >/dev/null 2>&1
116-
${PIP} install ${PIP_INSTALL_ARGS} conan
120+
${PIP} install ${PIP_INSTALL_ARGS} \
121+
conan \
122+
libtmux \
123+
;
117124

118125
ifndef WITHOUT_DEV_DEPS
119126
install-python-deps::

plugins/vtd/CMakeLists.txt

+1-16
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,6 @@ project(cloe_plugin_vtd LANGUAGES CXX)
55
include(${CMAKE_CURRENT_BINARY_DIR}/conanbuildinfo.cmake)
66
conan_basic_setup(TARGETS)
77

8-
# VTD Interface Library ----------------------------------------------
9-
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
10-
find_package(VTD)
11-
add_library(vtd-rdb-interface STATIC
12-
${VTD_RDBHANDLER_SOURCES}
13-
)
14-
target_include_directories(vtd-rdb-interface
15-
PUBLIC
16-
${VTD_INCLUDE_DIRS}
17-
${VTD_RDBHANDLER_INCLUDE_DIRS}
18-
)
19-
set_target_properties(vtd-rdb-interface PROPERTIES
20-
POSITION_INDEPENDENT_CODE ON
21-
)
22-
238
# Cloe Plugin --------------------------------------------------------
249
include(CloePluginSetup)
2510

@@ -38,7 +23,7 @@ add_library(vtd-object-lib STATIC
3823
)
3924
target_link_libraries(vtd-object-lib
4025
PUBLIC
41-
vtd-rdb-interface
26+
CONAN_PKG::vtd-api
4227
CONAN_PKG::cloe-runtime
4328
CONAN_PKG::cloe-models
4429
CONAN_PKG::boost

0 commit comments

Comments
 (0)