summaryrefslogtreecommitdiff
path: root/cmake/Modules
diff options
context:
space:
mode:
authorNicholas Corgan2013-02-01 12:36:15 -0800
committerNicholas Corgan2013-02-01 12:36:15 -0800
commit648214ef4a77b5eb22f4e9715a7469ddc02583c1 (patch)
tree3ca4db2849f9d919648ff29f6c7016e43f4f82cd /cmake/Modules
parent75e3954c0cfcd42898a323a178afabef5ba12e29 (diff)
downloadgnuradio-648214ef4a77b5eb22f4e9715a7469ddc02583c1.tar.gz
gnuradio-648214ef4a77b5eb22f4e9715a7469ddc02583c1.tar.bz2
gnuradio-648214ef4a77b5eb22f4e9715a7469ddc02583c1.zip
cmake: Allows Unix systems with /usr/lib64 to use Boost installations in non-standard locations
Diffstat (limited to 'cmake/Modules')
-rw-r--r--cmake/Modules/GrBoost.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake
index 23bea41ad..2b4e4bac2 100644
--- a/cmake/Modules/GrBoost.cmake
+++ b/cmake/Modules/GrBoost.cmake
@@ -34,9 +34,9 @@ set(BOOST_REQUIRED_COMPONENTS
thread
)
-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)
if (NOT DEFINED BOOST_ALL_DYN_LINK)