diff options
| author | Samuel O'Brien <sam.obrien@ni.com> | 2020-08-03 12:10:53 -0500 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2020-10-07 15:29:19 -0500 |
| commit | f54a22c60a0cbe990c9d3892f4c565d64226196b (patch) | |
| tree | 6d12ddf64859fa51140e14264899de6c9f94b9b5 /mpm/python | |
| parent | bfff8b79b950f2f1cebfd2db662a4205df5da65a (diff) | |
| download | uhd-f54a22c60a0cbe990c9d3892f4c565d64226196b.tar.gz uhd-f54a22c60a0cbe990c9d3892f4c565d64226196b.tar.bz2 uhd-f54a22c60a0cbe990c9d3892f4c565d64226196b.zip | |
sim: Embed MPM into libpyuhd
When ENABLE_SIM and ENABLE_PYTHON_API are set, this commit embeds MPM
(Built with -DMPM_DEVICE=sim) into the pyuhd package.
Signed-off-by: Samuel O'Brien <sam.obrien@ni.com>
Diffstat (limited to 'mpm/python')
| -rwxr-xr-x | mpm/python/setup.py.in | 1 | ||||
| -rwxr-xr-x | mpm/python/tests/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mpm/python/setup.py.in b/mpm/python/setup.py.in index e131f02f1..226cf0270 100755 --- a/mpm/python/setup.py.in +++ b/mpm/python/setup.py.in @@ -36,6 +36,7 @@ setup(name='usrp_mpm', 'usrp_mpm.cores', 'usrp_mpm.sys_utils', 'usrp_mpm.xports', + 'usrp_mpm.simulator', ], install_requires=[ 'mprpc', diff --git a/mpm/python/tests/CMakeLists.txt b/mpm/python/tests/CMakeLists.txt index 26dcad40a..36bff9d3a 100755 --- a/mpm/python/tests/CMakeLists.txt +++ b/mpm/python/tests/CMakeLists.txt @@ -10,5 +10,7 @@ add_test( NAME mpm_unit_tests - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/run_unit_tests.py ${MPM_DEVICE} + COMMAND ${CMAKE_COMMAND} -E env + PYTHONPATH=${CMAKE_BINARY_DIR}/python + ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/run_unit_tests.py ${MPM_DEVICE} ) |