]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Some minor changes so that the library compiles :)
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 7 Aug 2012 22:33:08 +0000 (22:33 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 7 Aug 2012 22:33:08 +0000 (22:33 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@25767 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/include/deal.II/numerics/point_value_history.h
deal.II/source/base/boost_serialization.cc

index 2aa76debe5528107744a6875839d7b322fcc06d7..99388eaa344cc9827005eb919a6ba3427b0f294e 100644 (file)
@@ -6,6 +6,7 @@ SET (CMAKE_CXX_FLAGS "-std=c++0x -D_REENTRANT -fPIC -O2 -march=native -Wall -Wfa
 
 INCLUDE_DIRECTORIES(
   "${CMAKE_SOURCE_DIR}/contrib/tbb/tbb30_104oss/include" #TODO
+  "${CMAKE_SOURCE_DIR}/contrib" #TODO
   "${CMAKE_SOURCE_DIR}/include/"
   )
 
index 1db7ab40411028a0a5d1a1bdef32874cf9f04e96..09ed874c078854780ddb32ca5a395204d7e9b12e 100644 (file)
@@ -26,8 +26,8 @@
 #include <deal.II/fe/fe_values.h>
 #include <deal.II/base/smartpointer.h>
 #include <deal.II/base/utilities.h>
-#include <numerics/data_postprocessor.h>
-#include <grid/grid_tools.h>
+#include <deal.II/numerics/data_postprocessor.h>
+#include <deal.II/grid/grid_tools.h>
 
 #include <vector>
 #include <iostream>
index 934cbbd512d9044642c5c9450b0bbf8a4db4d1b5..09d9d7e546b976c4d3e45294d9241ef4093149bb 100644 (file)
 
 #ifndef DEAL_II_USE_EXTERNAL_BOOST
 
-#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_archive.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_iarchive.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_iserializer.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_oarchive.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_oserializer.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_pointer_iserializer.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_pointer_oserializer.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_serializer_map.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_text_iprimitive.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_text_oprimitive.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/basic_xml_archive.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/binary_iarchive.cpp"
+// TODO
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/basic_archive.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/basic_iarchive.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/basic_iserializer.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/basic_oarchive.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/basic_oserializer.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/basic_pointer_iserializer.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/basic_pointer_oserializer.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/basic_serializer_map.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/basic_text_iprimitive.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/basic_text_oprimitive.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/basic_xml_archive.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/binary_iarchive.cpp"
 
-#include "../../contrib/boost-1.49.0/libs/serialization/src/binary_oarchive.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/extended_type_info.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/extended_type_info_typeid.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/extended_type_info_no_rtti.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/polymorphic_iarchive.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/polymorphic_oarchive.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/stl_port.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/text_iarchive.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/text_oarchive.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/void_cast.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/archive_exception.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/xml_grammar.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/xml_iarchive.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/xml_oarchive.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/xml_archive_exception.cpp"
-#include "../../contrib/boost-1.49.0/libs/serialization/src/shared_ptr_helper.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/binary_oarchive.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/extended_type_info.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/extended_type_info_typeid.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/extended_type_info_no_rtti.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/polymorphic_iarchive.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/polymorphic_oarchive.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/stl_port.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/text_iarchive.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/text_oarchive.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/void_cast.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/archive_exception.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/xml_grammar.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/xml_iarchive.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/xml_oarchive.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/xml_archive_exception.cpp"
+// #include "../../contrib/boost-1.49.0/libs/serialization/src/shared_ptr_helper.cpp"
 
 #endif /* DEAL_II_USE_EXTERNAL_BOOST */

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.