]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Cleanup
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 17:23:19 +0000 (17:23 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 17:23:19 +0000 (17:23 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26730 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/TODO_CMAKE
deal.II/cmake/configure/configure_1_tbb.cmake
deal.II/cmake/configure/configure_functionparser.cmake

index 73f36f7cca451825e033cbc6f35ea222311117f1..625e9a6fa9363b953ae67cbf3f8d2c4b1b42f1f2 100644 (file)
@@ -252,12 +252,6 @@ ADD_SUBDIRECTORY(scripts)
 ADD_SUBDIRECTORY(include)
 
 
-#
-# Build optional contrib targets:
-#
-#ADD_SUBDIRECTORY(contrib)
-
-
 #
 # Compile and install the library:
 #
index 5dc74bce05fe5369b26a9b9a45b191f09fd31cd5..fec9deb49e488e14d8df47e8c708d2c6973644f7 100644 (file)
@@ -28,15 +28,9 @@ Major:
 
 Minor:
 
-* Fix up WARNING/STATUS error messages
-
 * There is still a perl script for generating lapack_templates.h. Is this
   necessary.
 
-* The Find modules under contrib/cmake/modules export <...>_LIBRARY and
-  <...>_INCLUDE_DIR, wheras the convention is nowadays _LIBRARIES and
-  _INCLUDE_DIRS, fix this.
-
 * What to do with ./lib/meshes ? I have moved it to ./contrib/meshes for
   the time being...
 
@@ -48,3 +42,5 @@ Minor:
 
 * Reenable support for metis versions 4.x ?!
 
+* The contrib libraries are included too early. User CXX_FLAGS won't be
+  included in the contrib object targets...
index fce0ccc588eea238b462076012254553dea81029..acae8bdc5457635256a46b893a8620b1b0841c09 100644 (file)
@@ -126,9 +126,6 @@ SET(FEATURE_TBB_HAVE_CONTRIB TRUE)
 
 
 MACRO(FEATURE_TBB_CONFIGURE_CONTRIB var)
-  #
-  # Add tbb directly to the object files of deal.II
-  #
 
   #
   # Setup threading (before configuring our build...)
@@ -155,6 +152,9 @@ MACRO(FEATURE_TBB_CONFIGURE_CONTRIB var)
 
   INCLUDE_DIRECTORIES(${tbb_folder}/include)
 
+  #
+  # Add tbb directly to the object files of deal.II
+  #
   ADD_SUBDIRECTORY(${tbb_folder}/src)
 
 ENDMACRO()
index 2b781e2f6674a052420ced319a060e18aca3fba0..04f0af5dd8a92365e7fd829a630ecedcd0377647 100644 (file)
@@ -13,6 +13,7 @@ SET(FEATURE_FUNCTIONPARSER_HAVE_CONTRIB TRUE)
 
 
 MACRO(FEATURE_FUNCTIONPARSER_CONFIGURE_CONTRIB var)
+
   #
   # compile the necessary parts of functionparser out of ./contrib
   #

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.