From 660053c52a51111b88d823325f0de82a99591b3c Mon Sep 17 00:00:00 2001
From: nemu <nemu@macos-10.12.6-vm.shared>
Date: Mon, 27 Aug 2018 15:46:48 +0200
Subject: [PATCH] make sure that BOOST is found even if installed in any
 non-standard path.

Conflicts:
	src/CMakeLists.txt
	src/classes/CMakeLists.txt
---
 src/CMakeLists.txt         | 5 +++++
 src/classes/CMakeLists.txt | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f01c0576..c7b2d703 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -49,6 +49,7 @@ add_executable(any2many git-revision.h any2many.cpp)
 target_compile_options(any2many BEFORE PRIVATE "-DHAVE_CONFIG_H")
 target_include_directories(any2many 
   BEFORE PRIVATE
+    $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
@@ -94,6 +95,7 @@ target_compile_options(musrfit BEFORE PRIVATE "-DHAVE_CONFIG_H")
 target_include_directories(musrfit 
   BEFORE PRIVATE 
     $<BUILD_INTERFACE:${DKS_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
@@ -105,6 +107,7 @@ add_executable(musrFT git-revision.h musrFT.cpp)
 target_compile_options(musrFT BEFORE PRIVATE "-DHAVE_CONFIG_H")
 target_include_directories(musrFT 
   BEFORE PRIVATE 
+    $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
@@ -128,6 +131,7 @@ add_executable(musrt0 git-revision.h musrt0.cpp)
 target_compile_options(musrt0 BEFORE PRIVATE "-DHAVE_CONFIG_H")
 target_include_directories(musrt0 
   BEFORE PRIVATE 
+    $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
@@ -139,6 +143,7 @@ add_executable(musrview git-revision.h musrview.cpp)
 target_compile_options(musrview BEFORE PRIVATE "-DHAVE_CONFIG_H")
 target_include_directories(musrview 
   BEFORE PRIVATE
+    $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
diff --git a/src/classes/CMakeLists.txt b/src/classes/CMakeLists.txt
index 994b887d..f7b6d400 100644
--- a/src/classes/CMakeLists.txt
+++ b/src/classes/CMakeLists.txt
@@ -11,13 +11,13 @@ root_generate_dictionary(
 )
 root_generate_dictionary(
   PMusrCanvasDict 
-  -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PMusrCanvas.h 
+  -I${Boost_INCLUDE_DIR} -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PMusrCanvas.h 
   LINKDEF ${MUSRFIT_INC}/PMusrCanvasLinkDef.h
   MODULE PMusrCanvas
 )
 root_generate_dictionary(
   PMusrT0Dict 
-  -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PMusrT0.h 
+  -I${Boost_INCLUDE_DIR} -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PMusrT0.h 
   LINKDEF ${MUSRFIT_INC}/PMusrT0LinkDef.h
   MODULE PMusrT0
 )
@@ -89,6 +89,7 @@ set_target_properties(PMusr
 target_include_directories(
   PMusr BEFORE PRIVATE
     $<BUILD_INTERFACE:${DKS_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
     $<BUILD_INTERFACE:${NEXUS_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${MUSRFIT_INC}>