summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2013-02-01 12:35:34 -0800
committerNicholas Corgan <nick.corgan@ettus.com>2013-02-01 12:38:37 -0800
commit9675fd204c1357b8f163639df74ca87fbe01416c (patch)
tree6e9c6d3d1bb807ba79e1cb7420e7c49b830045d9
parent22103c8fa5eb0fc7117d8de7b874491876894dfa (diff)
downloaduhd-9675fd204c1357b8f163639df74ca87fbe01416c.tar.gz
uhd-9675fd204c1357b8f163639df74ca87fbe01416c.tar.bz2
uhd-9675fd204c1357b8f163639df74ca87fbe01416c.zip
cmake: Allows Unix systems with /usr/lib64 to use Boost installations in non-standard locations
-rw-r--r--host/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index ba532eed2..2195ff742 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -123,9 +123,9 @@ SET(BOOST_REQUIRED_COMPONENTS
unit_test_framework
)
-IF(UNIX AND EXISTS "/usr/lib64")
+IF(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64")
LIST(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix
-ENDIF(UNIX AND EXISTS "/usr/lib64")
+ENDIF(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64")
IF(MSVC)
SET(BOOST_ALL_DYN_LINK "${BOOST_ALL_DYN_LINK}" CACHE BOOL "boost enable dynamic linking")