From 29603a37bdfc297b9672488d92069cea48b417b7 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sun, 1 Nov 2015 17:17:24 -0600 Subject: [PATCH] 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. --- bundled/boost-1.56.0/libs/iostreams/src/CMakeLists.txt | 7 +++++-- bundled/boost-1.56.0/libs/serialization/src/CMakeLists.txt | 7 +++++-- bundled/boost-1.56.0/libs/system/src/CMakeLists.txt | 5 ++++- bundled/boost-1.56.0/libs/thread/src/CMakeLists.txt | 7 +++++-- 4 files changed, 19 insertions(+), 7 deletions(-) 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 1c804a402a..cd8a192403 100644 --- 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 cc832f172e..d61dc987e9 100644 --- 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 9d8338f8e5..0b66721759 100644 --- 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 51d5150939..7c8bae0abf 100644 --- 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 -- 2.39.5