CMake: Bugfix: Also use DEAL_II_INCLUDE_DIRS for bundled boost

This fixes a compilation issue with a zlib library not in a default
location in combination with bundled boost. Many thanks to Lukas Korous for
pointing this out.

diff --git a/bundled/boost-1.56.0/libs/iostreams/src/CMakeLists.txt b/bundled/boost-1.56.0/libs/iostreams/src/CMakeLists.txt
index 1c804a402acdbcd89689389fa8f78d0aea64265f..cd8a192403184601b4a1b73698afa20a143652ec 100644 (file)
--- a/bundled/boost-1.56.0/libs/iostreams/src/CMakeLists.txt
+++ b/bundled/boost-1.56.0/libs/iostreams/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 ## ---------------------------------------------------------------------
 ## $Id$
 ##
-## Copyright (C) 2013 - 2014 by the deal.II authors
+## Copyright (C) 2013 - 2015 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##
@@ -14,7 +14,10 @@
 ##
 ## ---------------------------------------------------------------------
 
-INCLUDE_DIRECTORIES(${BOOST_BUNDLED_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(
+  ${BOOST_BUNDLED_INCLUDE_DIRS}
+  ${DEAL_II_INCLUDE_DIRS}
+  )
 
 SET(src_boost_iostreams
     file_descriptor.cpp

diff --git a/bundled/boost-1.56.0/libs/serialization/src/CMakeLists.txt b/bundled/boost-1.56.0/libs/serialization/src/CMakeLists.txt
index cc832f172ec1bf1370f125c8a996ac4da7f3feb2..d61dc987e9fba9fc6686f3f8eb6e1e7258100f5a 100644 (file)
--- a/bundled/boost-1.56.0/libs/serialization/src/CMakeLists.txt
+++ b/bundled/boost-1.56.0/libs/serialization/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 ## ---------------------------------------------------------------------
 ## $Id$
 ##
-## Copyright (C) 2012 - 2014 by the deal.II authors
+## Copyright (C) 2012 - 2015 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##
@@ -14,7 +14,10 @@
 ##
 ## ---------------------------------------------------------------------
 
-INCLUDE_DIRECTORIES(${BOOST_BUNDLED_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(
+  ${BOOST_BUNDLED_INCLUDE_DIRS}
+  ${DEAL_II_INCLUDE_DIRS}
+  )
 
 SET(src_boost_serialization
   basic_archive.cpp

diff --git a/bundled/boost-1.56.0/libs/system/src/CMakeLists.txt b/bundled/boost-1.56.0/libs/system/src/CMakeLists.txt
index 9d8338f8e5cfc8e3b884816263bbbf227ad22472..0b667217594daf3f863ba679cbddd20e985c3d0e 100644 (file)
--- a/bundled/boost-1.56.0/libs/system/src/CMakeLists.txt
+++ b/bundled/boost-1.56.0/libs/system/src/CMakeLists.txt
@@ -14,7 +14,10 @@
 ##
 ## ---------------------------------------------------------------------
 
-INCLUDE_DIRECTORIES(${BOOST_BUNDLED_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(
+  ${BOOST_BUNDLED_INCLUDE_DIRS}
+  ${DEAL_II_INCLUDE_DIRS}
+  )
 
 SET(src_boost_system
   error_code.cpp

diff --git a/bundled/boost-1.56.0/libs/thread/src/CMakeLists.txt b/bundled/boost-1.56.0/libs/thread/src/CMakeLists.txt
index 51d5150939c84a594725469f81be1e0b7a135fbb..7c8bae0abf00d86b5eb58fce5ee8d16f1bf4e4f8 100644 (file)
--- a/bundled/boost-1.56.0/libs/thread/src/CMakeLists.txt
+++ b/bundled/boost-1.56.0/libs/thread/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 ## ---------------------------------------------------------------------
 ## $Id$
 ##
-## Copyright (C) 2012 - 2014 by the deal.II authors
+## Copyright (C) 2012 - 2015 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##
@@ -14,7 +14,10 @@
 ##
 ## ---------------------------------------------------------------------
 
-INCLUDE_DIRECTORIES(${BOOST_BUNDLED_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(
+  ${BOOST_BUNDLED_INCLUDE_DIRS}
+  ${DEAL_II_INCLUDE_DIRS}
+  )
 
 IF(DEAL_II_USE_MT_POSIX)
   SET(src_boost_thread