From feb0995cdd8239d49583804a1912b30b048a182a Mon Sep 17 00:00:00 2001
From: "Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)"
 <spamtrap@nedprod.com>
Date: Fri, 26 Aug 2016 21:01:55 +0100
Subject: Fix failure to correctly pickup sibling boost-lite. Add cmake for
 AFIO programs which are now compiling. Added in the new memory map
 shared_fs_mutex to benchmark-locking.

---
 CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c1113c8..cd2b3076 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,10 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 # If necessary bring in the Boost lite cmake tooling
 list(FIND CMAKE_MODULE_PATH "boost-lite" boost_lite_idx)
 if(${boost_lite_idx} EQUAL -1)
-  if(EXISTS "${CMAKE_SOURCE_DIR}/../boost-lite/cmake")
+  if(EXISTS "${CMAKE_SOURCE_DIR}/../.use_boostish_siblings")
     set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../boost-lite/cmake")
+  elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../.use_boostish_siblings")
+    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../boost-lite/cmake")
   elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include/boost/afio/boost-lite/cmake")
     set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/include/boost/afio/boost-lite/cmake")
   else()
-- 
cgit v1.2.3