summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--host/CMakeLists.txt6
-rw-r--r--host/docs/build.rst1
2 files changed, 5 insertions, 2 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index c60372fb9..e26ec03d2 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -81,7 +81,11 @@ ENDIF(MSVC)
########################################################################
# Setup Boost
########################################################################
-SET(Boost_ADDITIONAL_VERSIONS "1.42.0" "1.42")
+IF(EXISTS "/usr/lib64")
+ LIST(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix
+ENDIF(EXISTS "/usr/lib64")
+
+SET(Boost_ADDITIONAL_VERSIONS "1.42.0" "1.42 1.43.0" "1.43")
FIND_PACKAGE(Boost 1.36 REQUIRED COMPONENTS
date_time
filesystem
diff --git a/host/docs/build.rst b/host/docs/build.rst
index 108d8dc8b..6f0afdb6e 100644
--- a/host/docs/build.rst
+++ b/host/docs/build.rst
@@ -100,7 +100,6 @@ Generate Makefiles with cmake
**Notes:**
* For a custom prefix, use: cmake -DCMAKE_INSTALL_PREFIX=<prefix> ../
-* On some Fedora 64-bit systems, cmake has trouble finding boost, use: cmake -DBOOST_LIBRARYDIR=/usr/lib64 ../
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Build and install