From: maier Date: Fri, 10 Aug 2012 10:03:06 +0000 (+0000) Subject: add boost X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8609f19d2788981fd8ae4021401061f80a1afb33;p=dealii-svn.git add boost git-svn-id: https://svn.dealii.org/branches/branch_cmake@25865 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index c0cfc84210..fedb57c2e2 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -56,6 +56,8 @@ ADD_CUSTOM_TARGET(deal_ii_target_dependencies) # TODO: Version Mumbo Jumbo +INCLUDE(prepare_boost) + IF(DEAL_II_WITH_THREADS) INCLUDE(prepare_threads) ENDIF() @@ -66,6 +68,8 @@ ENDIF() # TODO: The rest... +message( "${deal_ii_external_libraries}" ) + # # Build the toolchain: # diff --git a/deal.II/contrib/cmake/modules/prepare_boost.cmake b/deal.II/contrib/cmake/modules/prepare_boost.cmake new file mode 100644 index 0000000000..3168e6de5c --- /dev/null +++ b/deal.II/contrib/cmake/modules/prepare_boost.cmake @@ -0,0 +1,16 @@ +IF(NOT DEAL_II_USE_CONTRIB) + FIND_PACKAGE (Boost COMPONENTS serialization thread REQUIRED) + + INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIR}) + + SET(deal_ii_external_libraries + ${deal_ii_external_libraries} + ${Boost_THREAD_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} + ) + SET(deal_ii_external_debug_libraries + ${deal_ii_external_debug_libraries} + ${Boost_THREAD_LIBRARY_DEBUG} ${Boost_SERIALIZATION_LIBRARY_DEBUG} + ) #TODO + + SET(DEAL_II_USE_EXTERNAL_BOOST TRUE) +ENDIF() diff --git a/deal.II/contrib/cmake/modules/prepare_threads.cmake b/deal.II/contrib/cmake/modules/prepare_threads.cmake index da77eb0825..8056e5bddd 100644 --- a/deal.II/contrib/cmake/modules/prepare_threads.cmake +++ b/deal.II/contrib/cmake/modules/prepare_threads.cmake @@ -26,7 +26,8 @@ SET(deal_ii_external_libraries ) SET(deal_ii_external_debug_libraries ${deal_ii_external_debug_libraries} - ${TBB_DEBUG_LIBRARY}) #TODO + ${TBB_DEBUG_LIBRARY} + ) #TODO SET(DEAL_II_USE_MT TRUE) SET(DEAL_II_USE_MT_POSIX TRUE) diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index 5428b424c7..ae536f7812 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -27,6 +27,13 @@ +/* Configured in prepare_boost.cmake: */ + +/* Defined if deal.II is configured with an external Boost library */ +#cmakedefine DEAL_II_USE_EXTERNAL_BOOST + + + /* Configured in prepare_threads.cmake: */ /* Flag indicating whether the library shall be compiled for multithreaded diff --git a/deal.II/include/deal.II/base/config.h.in.old b/deal.II/include/deal.II/base/config.h.in.old index b5744401c1..bf931e9cd1 100644 --- a/deal.II/include/deal.II/base/config.h.in.old +++ b/deal.II/include/deal.II/base/config.h.in.old @@ -204,9 +204,6 @@ provided by the compiler. */ #cmakedefine DEAL_II_USE_DIRECT_ERRNO_H -/* Defined if deal.II is configured with an external Boost library */ -#cmakedefine DEAL_II_USE_EXTERNAL_BOOST - /* Defined if a Metis installation was found and is going to be used */ #cmakedefine DEAL_II_USE_METIS