diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-02-07 02:33:15 -0500 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-02-07 02:33:15 -0500 |
| commit | 4a9b54a2b860c445401523a4c2fc3be5da8b3afc (patch) | |
| tree | 2247746be0113b538cfb7186043cde10389fcfa2 /cmake | |
| parent | 96bbf02e872c873074ce8e443a4683a403b3937f (diff) | |
| parent | 648214ef4a77b5eb22f4e9715a7469ddc02583c1 (diff) | |
Merge remote-tracking branch 'ncorgan/cmake_boost_fix' into maint
Diffstat (limited to 'cmake')
| -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 ef9a624c43..dfd17fc24c 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) |