Bugfixes: Make compilation of bundled libraries work again

git-svn-id: https://svn.dealii.org/trunk@32374 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/bundled/boost-1.49.0/libs/iostreams/src/CMakeLists.txt b/deal.II/bundled/boost-1.49.0/libs/iostreams/src/CMakeLists.txt
index ef8f84838ce349ad5cf61a70e00073d49fbe9514..0e7daafd8fcda9ce143f8882be1227518a2e2223 100644 (file)
--- a/deal.II/bundled/boost-1.49.0/libs/iostreams/src/CMakeLists.txt
+++ b/deal.II/bundled/boost-1.49.0/libs/iostreams/src/CMakeLists.txt
@@ -14,6 +14,8 @@
 ##
 ## ---------------------------------------------------------------------
 
+INCLUDE_DIRECTORIES(${BOOST_BUNDLED_INCLUDE_DIRS})
+
 SET(src_boost_iostreams
     file_descriptor.cpp
     gzip.cpp

diff --git a/deal.II/bundled/boost-1.49.0/libs/serialization/src/CMakeLists.txt b/deal.II/bundled/boost-1.49.0/libs/serialization/src/CMakeLists.txt
index b06ba8bd6e6daced561fbb15a0dd6c8336b09b80..4f35a0e7de566880f57ee394961e24c2c77932c8 100644 (file)
--- a/deal.II/bundled/boost-1.49.0/libs/serialization/src/CMakeLists.txt
+++ b/deal.II/bundled/boost-1.49.0/libs/serialization/src/CMakeLists.txt
@@ -14,6 +14,8 @@
 ##
 ## ---------------------------------------------------------------------
 
+INCLUDE_DIRECTORIES(${BOOST_BUNDLED_INCLUDE_DIRS})
+
 SET(src_boost_serialization
   basic_archive.cpp
   basic_iarchive.cpp

diff --git a/deal.II/bundled/boost-1.49.0/libs/thread/src/CMakeLists.txt b/deal.II/bundled/boost-1.49.0/libs/thread/src/CMakeLists.txt
index 2e3eb8839f5ce1cdf1fda7a7c4029575656e49c7..c1229bb8a94016af5e57fcd842cee084cdb28da0 100644 (file)
--- a/deal.II/bundled/boost-1.49.0/libs/thread/src/CMakeLists.txt
+++ b/deal.II/bundled/boost-1.49.0/libs/thread/src/CMakeLists.txt
@@ -14,6 +14,8 @@
 ##
 ## ---------------------------------------------------------------------
 
+INCLUDE_DIRECTORIES(${BOOST_BUNDLED_INCLUDE_DIRS})
+
 IF(DEAL_II_USE_MT_POSIX)
   SET(src_boost_thread
     pthread/once.cpp

diff --git a/deal.II/bundled/tbb41_20130401oss/src/CMakeLists.txt b/deal.II/bundled/tbb41_20130401oss/src/CMakeLists.txt
index 8e764b44f3273570b39e806ac86e3c3553b0c8f1..fa9b0faa97824fc875578dfebb60a49a9f50dcce 100644 (file)
--- a/deal.II/bundled/tbb41_20130401oss/src/CMakeLists.txt
+++ b/deal.II/bundled/tbb41_20130401oss/src/CMakeLists.txt
@@ -23,6 +23,7 @@ STRIP_FLAG(DEAL_II_CXX_FLAGS "-pedantic")
 
 SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 INCLUDE_DIRECTORIES(
+  ${THREADS_BUNDLED_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/rml/include
   )
 

diff --git a/deal.II/bundled/umfpack/AMD/Source/CMakeLists.txt b/deal.II/bundled/umfpack/AMD/Source/CMakeLists.txt
index 5f3231de0111d484fc4f624af747f3c89e2e9f06..df569bf230775f268b14d23a441233cb3b9de9b4 100644 (file)
--- a/deal.II/bundled/umfpack/AMD/Source/CMakeLists.txt
+++ b/deal.II/bundled/umfpack/AMD/Source/CMakeLists.txt
@@ -14,6 +14,8 @@
 ##
 ## ---------------------------------------------------------------------
 
+INCLUDE_DIRECTORIES(${UMFPACK_BUNDLED_INCLUDE_DIRS})
+
 SET(src_amd
   amd_1.cc
   amd_2.cc

diff --git a/deal.II/bundled/umfpack/UMFPACK/Source/CMakeLists.txt b/deal.II/bundled/umfpack/UMFPACK/Source/CMakeLists.txt
index 16f03377d4e0528f39164982f67210e2bb2043d1..5029fc65f708d9473b33d535770e3ff8cbeb7866 100644 (file)
--- a/deal.II/bundled/umfpack/UMFPACK/Source/CMakeLists.txt
+++ b/deal.II/bundled/umfpack/UMFPACK/Source/CMakeLists.txt
@@ -19,8 +19,11 @@
 # (... where everything is explained contrary to this... mess)
 #
 
+INCLUDE_DIRECTORIES(${UMFPACK_BUNDLED_INCLUDE_DIRS})
+
 #
 # *Shush!*
+# (Remove locally in this subdirectory)
 #
 STRIP_FLAG(DEAL_II_CXX_FLAGS "-pedantic")
 STRIP_FLAG(DEAL_II_CXX_FLAGS "-Wall")

diff --git a/deal.II/cmake/macros/macro_configure_feature.cmake b/deal.II/cmake/macros/macro_configure_feature.cmake
index 615ff71d3c93347ac724c4b7d6f5c5fa06f94ab6..219ab2f40586488d2832a9a5bab6203ff71cb5c6 100644 (file)
--- a/deal.II/cmake/macros/macro_configure_feature.cmake
+++ b/deal.II/cmake/macros/macro_configure_feature.cmake
@@ -209,6 +209,7 @@ MACRO(CONFIGURE_FEATURE _feature)
         IF(FEATURE_${_feature}_HAVE_BUNDLED)
           RUN_COMMAND("FEATURE_${_feature}_CONFIGURE_BUNDLED()")
           MESSAGE(STATUS "DEAL_II_WITH_${_feature} successfully set up with bundled packages.")
+          LIST(APPEND DEAL_II_FEATURES ${_feature})
           SET(FEATURE_${_feature}_BUNDLED_CONFIGURED TRUE)
           SET_CACHED_OPTION(${_feature} ON)
         ELSE()