From 9675fd204c1357b8f163639df74ca87fbe01416c Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Fri, 1 Feb 2013 12:35:34 -0800 Subject: cmake: Allows Unix systems with /usr/lib64 to use Boost installations in non-standard locations --- host/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index ba532eed2..2195ff742 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") -- cgit v1.2.3