diff options
| author | Tom Rondeau | 2013-02-06 11:18:32 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2013-02-06 11:18:32 -0500 |
| commit | 528ace3f5c4f07e52ffd77ba19211e6b1f1c4c34 (patch) | |
| tree | ab75e239c88677d00a6eb1209bb1954b0ec128cf /cmake/Modules | |
| parent | ac631948603583392189722d0e9b8654a2324670 (diff) | |
| parent | 648214ef4a77b5eb22f4e9715a7469ddc02583c1 (diff) | |
| download | gnuradio-528ace3f5c4f07e52ffd77ba19211e6b1f1c4c34.tar.gz gnuradio-528ace3f5c4f07e52ffd77ba19211e6b1f1c4c34.tar.bz2 gnuradio-528ace3f5c4f07e52ffd77ba19211e6b1f1c4c34.zip | |
Merge remote-tracking branch 'ncorgan/cmake_boost_fix'
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/GrBoost.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake index ef9a624c4..dfd17fc24 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) |