From b6e8c0975e8552931d5bc903d6d0d224f039e9b3 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sun, 2 Feb 2014 11:39:36 +0000 Subject: [PATCH] Bugfixes: Make compilation of bundled libraries work again git-svn-id: https://svn.dealii.org/trunk@32374 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/bundled/boost-1.49.0/libs/iostreams/src/CMakeLists.txt | 2 ++ .../bundled/boost-1.49.0/libs/serialization/src/CMakeLists.txt | 2 ++ deal.II/bundled/boost-1.49.0/libs/thread/src/CMakeLists.txt | 2 ++ deal.II/bundled/tbb41_20130401oss/src/CMakeLists.txt | 1 + deal.II/bundled/umfpack/AMD/Source/CMakeLists.txt | 2 ++ deal.II/bundled/umfpack/UMFPACK/Source/CMakeLists.txt | 3 +++ deal.II/cmake/macros/macro_configure_feature.cmake | 1 + 7 files changed, 13 insertions(+) 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 ef8f84838c..0e7daafd8f 100644 --- 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 b06ba8bd6e..4f35a0e7de 100644 --- 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 2e3eb8839f..c1229bb8a9 100644 --- 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 8e764b44f3..fa9b0faa97 100644 --- 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 5f3231de01..df569bf230 100644 --- 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 16f03377d4..5029fc65f7 100644 --- 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 615ff71d3c..219ab2f405 100644 --- 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() -- 2.39.5