From ec55368108bb5c0f4efb973417720d4d7942ef18 Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver.hamlet@gmail.com>
Date: Tue, 29 Sep 2015 19:06:37 +0100
Subject: [PATCH] Support split dependency build trees.

For 32/64 bit builds. CMake won't detect a split build tree for Boost,
and yaml-cpp detection may select the wrong build tree (at least for
64-bit builds when a 32-bit tree also exists).
---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46e4dae7..93c67cac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -216,10 +216,13 @@ include_directories ("${CMAKE_SOURCE_DIR}/src"
                      ${GTEST_INCLUDE_DIRS}
                      "${PSEUDOSEM_ROOT}/include")
 
+# Look in build and build/<arch> folders to support single and multiarch builds.
 link_directories ("${LIBLOADORDER_ROOT}/build"
+                  "${LIBLOADORDER_ROOT}/build/${PROJECT_ARCH}"
                   "${LIBGIT2_ROOT}/build"
                   "${CEF_ROOT}/Release"
                   "${CEF_ROOT}/build/libcef_dll/Release")
+                  "${LIBGIT2_ROOT}/build/${PROJECT_ARCH}"
 
 
 ##############################