diff options
| author | Michael Dickens <michael.dickens@ettus.com> | 2019-02-19 10:31:35 -0500 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2019-02-19 15:36:06 -0800 |
| commit | 10cf104ffc1d0ce3562904bcaf2a641518acb180 (patch) | |
| tree | 4e9d245456851193da4535602f414993217ba16d /host | |
| parent | 871a7c32ffc552cc8aa777cb82f599d18087b3b3 (diff) | |
| download | uhd-10cf104ffc1d0ce3562904bcaf2a641518acb180.tar.gz uhd-10cf104ffc1d0ce3562904bcaf2a641518acb180.tar.bz2 uhd-10cf104ffc1d0ce3562904bcaf2a641518acb180.zip | |
cmake: remove Boost from dyn libs for tests on Apple
Remove "${prefix}/lib" from the DYLD path for APPLE only. Apple's DYLD
uses the paths embedded in the binary file (library or executable) as a
secondary means for finding referenced libraries. Explicitly including
"${prefix}/lib" can result in libraries being found and used by System
frameworks that are not compatible with them. Moving to just using build
paths fixes this issue.
Diffstat (limited to 'host')
| -rw-r--r-- | host/cmake/Modules/UHDUnitTest.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/host/cmake/Modules/UHDUnitTest.cmake b/host/cmake/Modules/UHDUnitTest.cmake index 7937db4d3..0807fe3b5 100644 --- a/host/cmake/Modules/UHDUnitTest.cmake +++ b/host/cmake/Modules/UHDUnitTest.cmake @@ -27,8 +27,10 @@ function(UHD_ADD_TEST test_name) set(UHD_TEST_LIBRARY_DIRS "${CMAKE_BINARY_DIR}/lib" "${CMAKE_CURRENT_BINARY_DIR}" - "${Boost_LIBRARY_DIRS}" ) + if(NOT APPLE) + list(APPEND UHD_TEST_LIBRARY_DIRS "${Boost_LIBRARY_DIRS}") + endif(NOT APPLE) endif(WIN32) file(TO_NATIVE_PATH "${UHD_TEST_LIBRARY_DIRS}" libpath) |