diff options
| author | Michael Dickens <michael.dickens@ettus.com> | 2018-01-22 14:38:50 -0500 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-01-22 16:07:18 -0800 |
| commit | 13336e79e1c4639b71ebcc1157769ccbcd74418d (patch) | |
| tree | a966818916654ecc87e7cd9dd8390bac8870c1f4 | |
| parent | f83f6fb46406572ac137ccbf1881561e20606d52 (diff) | |
| download | uhd-13336e79e1c4639b71ebcc1157769ccbcd74418d.tar.gz uhd-13336e79e1c4639b71ebcc1157769ccbcd74418d.tar.bz2 uhd-13336e79e1c4639b71ebcc1157769ccbcd74418d.zip | |
cmake: fix test library path ordering to be internal then external
Always include local-to-build library paths first, then external ones.
If a prior version of UHD is installed in the same directly as Boost
(as is typical on *nix* OSs such as macOS and Linux), then it will be
picked up before the internal-to-build version and some tests will
fail.
Reviewed-by: Martin Braun <martin.braun@ettus.com>
| -rw-r--r-- | host/cmake/Modules/UHDUnitTest.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/cmake/Modules/UHDUnitTest.cmake b/host/cmake/Modules/UHDUnitTest.cmake index 01cebc9f3..678399d02 100644 --- a/host/cmake/Modules/UHDUnitTest.cmake +++ b/host/cmake/Modules/UHDUnitTest.cmake @@ -18,15 +18,15 @@ function(UHD_ADD_TEST test_name) #directory itself. if(WIN32) set(UHD_TEST_LIBRARY_DIRS - "${Boost_LIBRARY_DIRS}" "${CMAKE_BINARY_DIR}/lib/${CMAKE_BUILD_TYPE}" "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}" + "${Boost_LIBRARY_DIRS}" ) else() set(UHD_TEST_LIBRARY_DIRS - "${Boost_LIBRARY_DIRS}" "${CMAKE_BINARY_DIR}/lib" "${CMAKE_CURRENT_BINARY_DIR}" + "${Boost_LIBRARY_DIRS}" ) endif(WIN32) |