From 648214ef4a77b5eb22f4e9715a7469ddc02583c1 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Fri, 1 Feb 2013 12:36:15 -0800 Subject: cmake: Allows Unix systems with /usr/lib64 to use Boost installations in non-standard locations --- cmake/Modules/GrBoost.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmake/Modules') 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) -- cgit