From c6f793cc22c01d82664dfc55366352fcebcf61ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hofrichter?= Date: Mon, 6 Oct 2025 16:07:51 +0200 Subject: [PATCH] cmake: add boost library path when running python based unittest The boost library path was already added when running unittests (UHD_ADD_TEST) but not when running python based unittests (UHD_ADD_PYTEST). The boost library path is required when compiling against custom boost version (tested with boost 1.89.0), because some boost libraries have implicit dependencies on other boost libraries which are not found otherwise. --- host/cmake/Modules/UHDUnitTest.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/host/cmake/Modules/UHDUnitTest.cmake b/host/cmake/Modules/UHDUnitTest.cmake index 1d23f50ec..94ffff987 100644 --- a/host/cmake/Modules/UHDUnitTest.cmake +++ b/host/cmake/Modules/UHDUnitTest.cmake @@ -132,18 +132,18 @@ function(UHD_ADD_PYTEST test_name) if(APPLE) set_tests_properties(${test_name} PROPERTIES ENVIRONMENT - "DYLD_LIBRARY_PATH=${UHD_BINARY_DIR}/lib/;PYTHONPATH=${UHD_BINARY_DIR}/python:${UHD_SOURCE_DIR}/tests/common:${UHD_BINARY_DIR}/utils/") + "DYLD_LIBRARY_PATH=${UHD_BINARY_DIR}/lib/:${Boost_LIBRARY_DIRS};PYTHONPATH=${UHD_BINARY_DIR}/python:${UHD_SOURCE_DIR}/tests/common:${UHD_BINARY_DIR}/utils/") elseif(MSVC) string(REPLACE ";" "\\;" WIN_PATH "$ENV{PATH}") # MSVC is a multi-config generator in CMake, so we must specify the config value set_tests_properties(${test_name} PROPERTIES ENVIRONMENT - "PATH=${WIN_PATH}\\;${UHD_BINARY_DIR}\\lib\\$;PYTHONPATH=${UHD_BINARY_DIR}\\python\\$\\;${UHD_SOURCE_DIR}\\tests\\common\\;${UHD_BINARY_DIR}\\utils" + "PATH=${WIN_PATH}\\;${UHD_BINARY_DIR}\\lib\\$\\;${Boost_LIBRARY_DIRS};PYTHONPATH=${UHD_BINARY_DIR}\\python\\$\\;${UHD_SOURCE_DIR}\\tests\\common\\;${UHD_BINARY_DIR}\\utils" ) else() set_tests_properties(${test_name} PROPERTIES ENVIRONMENT - "LD_LIBRARY_PATH=${UHD_BINARY_DIR}/lib/;PYTHONPATH=${UHD_BINARY_DIR}/python:${UHD_SOURCE_DIR}/tests/common:${UHD_BINARY_DIR}/utils/" + "LD_LIBRARY_PATH=${UHD_BINARY_DIR}/lib/:${Boost_LIBRARY_DIRS};PYTHONPATH=${UHD_BINARY_DIR}/python:${UHD_SOURCE_DIR}/tests/common:${UHD_BINARY_DIR}/utils/" ) endif() endfunction(UHD_ADD_PYTEST)