From: maier Date: Tue, 25 Sep 2012 17:23:19 +0000 (+0000) Subject: Cleanup X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=469951d86d221c3864623a1942fb0de8037b5beb;p=dealii-svn.git Cleanup git-svn-id: https://svn.dealii.org/branches/branch_cmake@26730 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 73f36f7cca..625e9a6fa9 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -252,12 +252,6 @@ ADD_SUBDIRECTORY(scripts) ADD_SUBDIRECTORY(include) -# -# Build optional contrib targets: -# -#ADD_SUBDIRECTORY(contrib) - - # # Compile and install the library: # diff --git a/deal.II/TODO_CMAKE b/deal.II/TODO_CMAKE index 5dc74bce05..fec9deb49e 100644 --- a/deal.II/TODO_CMAKE +++ b/deal.II/TODO_CMAKE @@ -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... diff --git a/deal.II/cmake/configure/configure_1_tbb.cmake b/deal.II/cmake/configure/configure_1_tbb.cmake index fce0ccc588..acae8bdc54 100644 --- a/deal.II/cmake/configure/configure_1_tbb.cmake +++ b/deal.II/cmake/configure/configure_1_tbb.cmake @@ -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() diff --git a/deal.II/cmake/configure/configure_functionparser.cmake b/deal.II/cmake/configure/configure_functionparser.cmake index 2b781e2f66..04f0af5dd8 100644 --- a/deal.II/cmake/configure/configure_functionparser.cmake +++ b/deal.II/cmake/configure/configure_functionparser.cmake @@ -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 #