From 13336e79e1c4639b71ebcc1157769ccbcd74418d Mon Sep 17 00:00:00 2001
From: Michael Dickens <michael.dickens@ettus.com>
Date: Mon, 22 Jan 2018 14:38:50 -0500
Subject: 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>
---
host/cmake/Modules/UHDUnitTest.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'host/cmake')
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)
--
cgit v1.2.3