]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
add boost
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 10 Aug 2012 10:03:06 +0000 (10:03 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 10 Aug 2012 10:03:06 +0000 (10:03 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@25865 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/contrib/cmake/modules/prepare_boost.cmake [new file with mode: 0644]
deal.II/contrib/cmake/modules/prepare_threads.cmake
deal.II/include/deal.II/base/config.h.in
deal.II/include/deal.II/base/config.h.in.old

index c0cfc84210b9f8833f5e73678c42fdce6f000656..fedb57c2e27e30cb39a3c7487eadafdd1d7a388b 100644 (file)
@@ -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 (file)
index 0000000..3168e6d
--- /dev/null
@@ -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()
index da77eb0825a5a7aa9693c9155ed86f9a257f221c..8056e5bddd4761bbff117282d495ddca3706d514 100644 (file)
@@ -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)
index 5428b424c7d70bb7da2c617adb9b20799f2c7da0..ae536f78124d65c9ad7337df30934885f4c7d88b 100644 (file)
 
 
 
+/* 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
index b5744401c168b443329e989a0b3bee0a3cfe6fbb..bf931e9cd1bfac25d96e8a054a9b8c5bdfb2df37 100644 (file)
    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
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.