From 0f2c7307c2db55a42064ce80cda3481a6469f1e8 Mon Sep 17 00:00:00 2001
From: Wolfgang Thaller <wolfgang.thaller@gmx.net>
Date: Thu, 13 Apr 2017 01:17:58 +0200
Subject: [PATCH] ad boost include directory in CMakeLists, and, as a hack
 force use of /usr/local/include

# Conflicts:
#	build-toolchain.sh
---
 PEFTools/CMakeLists.txt      | 1 +
 ResourceFiles/CMakeLists.txt | 4 ++--
 Rez/CMakeLists.txt           | 2 ++
 Rez/Test/CMakeLists.txt      | 1 +
 build-toolchain.sh           | 5 ++++-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/PEFTools/CMakeLists.txt b/PEFTools/CMakeLists.txt
index 475dbbf6e9..243d7a7073 100644
--- a/PEFTools/CMakeLists.txt
+++ b/PEFTools/CMakeLists.txt
@@ -6,5 +6,6 @@ add_executable(MakePEF MakePEF.cc rs6000.h PEF.h)
 
 add_executable(MakeImport MakeImport.cc PEF.h)
 target_link_libraries(MakeImport ResourceFiles ${Boost_LIBRARIES})
+target_include_directories(MakeImport PRIVATE ${Boost_INCLUDE_DIR})
 
 install(TARGETS MakePEF MakeImport RUNTIME DESTINATION bin)
diff --git a/ResourceFiles/CMakeLists.txt b/ResourceFiles/CMakeLists.txt
index 27eb239a8c..94e0693080 100644
--- a/ResourceFiles/CMakeLists.txt
+++ b/ResourceFiles/CMakeLists.txt
@@ -29,5 +29,5 @@ add_library(ResourceFiles
 
 target_link_libraries(ResourceFiles ${Boost_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib/libhfs.a)
 target_include_directories(ResourceFiles PUBLIC .
-										 PRIVATE ${CMAKE_INSTALL_PREFIX}/include)
-
+										 PRIVATE ${CMAKE_INSTALL_PREFIX}/include
+										 		${Boost_INCLUDE_DIR})
diff --git a/Rez/CMakeLists.txt b/Rez/CMakeLists.txt
index 5cda44895f..6b33ee2de8 100644
--- a/Rez/CMakeLists.txt
+++ b/Rez/CMakeLists.txt
@@ -71,11 +71,13 @@ add_library(RezLib
 		Diagnostic.h Diagnostic.cc
 	)
 target_link_libraries(RezLib ResourceFiles ${Boost_LIBRARIES})
+target_include_directories(RezLib PRIVATE ${Boost_INCLUDE_DIR})
 
 add_executable(Rez
 		Rez.cc
 	)
 target_link_libraries(Rez RezLib ResourceFiles ${Boost_LIBRARIES})
+target_include_directories(Rez PRIVATE ${Boost_INCLUDE_DIR})
 
 install(TARGETS Rez RUNTIME DESTINATION bin)
 
diff --git a/Rez/Test/CMakeLists.txt b/Rez/Test/CMakeLists.txt
index b323384653..487e8c3d61 100644
--- a/Rez/Test/CMakeLists.txt
+++ b/Rez/Test/CMakeLists.txt
@@ -2,3 +2,4 @@ set(CMAKE_CXX_FLAGS "--std=c++11 -Wall -Wno-multichar")
 find_package(Boost COMPONENTS unit_test_framework)
 add_executable(RezUnitTests UnitTests.cc)
 target_link_libraries(RezUnitTests RezLib ${Boost_LIBRARIES})
+target_include_directories(RezUnitTests PRIVATE ${Boost_INCLUDE_DIR})
diff --git a/build-toolchain.sh b/build-toolchain.sh
index 54c398e51b..adca21b845 100644
--- a/build-toolchain.sh
+++ b/build-toolchain.sh
@@ -64,10 +64,13 @@ if [ $CMAKEONLY != true ]; then
 rm -rf toolchain
 mkdir -p toolchain
 
+export CPPFLAGS="-I/usr/local/include"
+export LDFLAGS="-L/usr/local/lib"
 
 if [ $BUILD_68K != false ]; then
 	
 export "CFLAGS=-Wno-error"
+
 # Build binutils for 68K
 mkdir -p binutils-build
 cd binutils-build
@@ -140,7 +143,7 @@ rm -rf hfsutils
 cp -r $SRC/hfsutils .
 cd hfsutils
 ./configure --prefix=$PREFIX --enable-devlibs
-make 
+make
 make install
 cd ..