diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2013-02-01 12:38:46 -0800 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2013-02-01 12:38:46 -0800 |
| commit | a728458c32aa58da2dbf8ff401350b5322309dd4 (patch) | |
| tree | bc88f49530aef68bad92aa5cb05374b8c911d973 /host | |
| parent | f3a16983dcdb27c3356192939e75c70a6a369560 (diff) | |
| parent | 9675fd204c1357b8f163639df74ca87fbe01416c (diff) | |
| download | uhd-a728458c32aa58da2dbf8ff401350b5322309dd4.tar.gz uhd-a728458c32aa58da2dbf8ff401350b5322309dd4.tar.bz2 uhd-a728458c32aa58da2dbf8ff401350b5322309dd4.zip | |
Merge branch 'maint34' into maint
Diffstat (limited to 'host')
| -rw-r--r-- | host/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 33c3014e0..6d4cf051f 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") |