From: maier Date: Wed, 31 Oct 2012 15:26:37 +0000 (+0000) Subject: Cleanup X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f38da27805e4def783aeaab9329b6ece6550eb65;p=dealii-svn.git Cleanup git-svn-id: https://svn.dealii.org/branches/branch_cmake@27263 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/TODO.CMAKE b/deal.II/TODO.CMAKE index 64565bd6fc..b509b4df1e 100644 --- a/deal.II/TODO.CMAKE +++ b/deal.II/TODO.CMAKE @@ -1,5 +1,7 @@ Major: +* Cleanup stale workarounds + * Update the online documentation on - How to install deal.II @@ -20,8 +22,9 @@ Minor: * Port the testsuite to cmake -* The following features have to be written: +* The following features have to be written, or removed: * TECPLOT + * HSL * (Maybe) re-enable validate-xrefs diff --git a/deal.II/cmake/config/CMakeLists.txt b/deal.II/cmake/config/CMakeLists.txt index 7d7b11b838..40070a2e39 100644 --- a/deal.II/cmake/config/CMakeLists.txt +++ b/deal.II/cmake/config/CMakeLists.txt @@ -169,7 +169,6 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) COND_SET_TO_YES(BUILD_SHARED_LIBS MAKEFILE_enableshared) COND_SET_TO_YES(DEAL_II_WITH_PETSC MAKEFILE_PETSC) - COND_SET_TO_YES(DEAL_II_USE_PETSC_DEV MAKEFILE_PETSC_DEV) COND_SET_TO_YES(DEAL_II_WITH_TRILINOS MAKEFILE_TRILINOS) COND_SET_TO_YES(DEAL_II_WITH_BLAS MAKEFILE_BLAS) COND_SET_TO_YES(DEAL_II_WITH_LAPACK MAKEFILE_LAPACK) diff --git a/deal.II/cmake/scripts/report_features.cc b/deal.II/cmake/scripts/report_features.cc index c623e6ca16..a1f9fac40e 100644 --- a/deal.II/cmake/scripts/report_features.cc +++ b/deal.II/cmake/scripts/report_features.cc @@ -143,10 +143,10 @@ int main() std::cout << "dealii-feature: LibZ=yes" << std::endl; #endif -#ifdef DEAL_II_DISABLE_PARSER - std::cout << "dealii-feature: parser=no" << std::endl; -#else +#ifdef HAVE_FUNCTIONPARSER std::cout << "dealii-feature: parser=yes" << std::endl; +#else + std::cout << "dealii-feature: parser=no" << std::endl; #endif } diff --git a/deal.II/unused-definitions b/deal.II/unused-definitions deleted file mode 100644 index 18c78a5870..0000000000 --- a/deal.II/unused-definitions +++ /dev/null @@ -1,79 +0,0 @@ -AC_APPLE_UNIVERSAL_BUILD -DEAL_II_ABORT_NOTHROW_EXCEPTION -DEAL_II_ANON_NAMESPACE_BOGUS_WARNING -DEAL_II_ANON_NAMESPACE_BUG -DEAL_II_ANON_NAMESPACE_LINKAGE_BUG -DEAL_II_ARRAY_CONDITIONAL_DECAY_BUG -DEAL_II_BOOST_GRAPH_COMPILER_BUG -DEAL_II_BROKEN_SOCKETS -DEAL_II_COMPAT_MAPPING -DEAL_II_DEPRECATED -DEAL_II_DISABLE_PARSER -DEAL_II_HAVE_DARWIN_DYNACAST_BUG -DEAL_II_HAVE_TECPLOT -DEAL_II_IMPLEMENTED_PURE_FUNCTION_BUG -DEAL_II_LOCAL_TYPEDEF_COMP_WORKAROUND -DEAL_II_MAJOR -DEAL_II_MEMBER_OP_TEMPLATE_INST -DEAL_II_MEMBER_VAR_SPECIALIZATION_BUG -DEAL_II_MIN_BOOL_VECTOR_CAPACITY -DEAL_II_MINOR -DEAL_II_MIN_VECTOR_CAPACITY -DEAL_II_MULTIGRID_COMPATIBILITY -DEAL_II_PATH -DEAL_II_SFINAE_BUG -DEAL_II_TEMPLATE_SPEC_ACCESS_WORKAROUND -DEAL_II_TEMPL_SPEC_FRIEND_BUG -DEAL_II_USE_DIRECT_ERRNO_H -DEAL_II_USE_EXTERNAL_BOOST -DEAL_II_USE_PETSC_COMPLEX -DEAL_II_USE_PETSC_DEV -DEAL_II_WEAK_LINKAGE_BUG -HAVE_AMESOS_H -HAVE_AZTECOO_H -HAVE_AZTECOO_OPERATOR_H - -HAVE_DTRTRS_ -HAVE_EPETRA_CRSGRAPH_H -HAVE_EPETRA_CRSMATRIX_H -HAVE_EPETRA_IMPORT_H -HAVE_EPETRA_LINEARPROBLEM_H -HAVE_EPETRA_MAP_H -HAVE_EPETRA_MULTIVECTOR_H -HAVE_EPETRA_OPERATOR_H -HAVE_EPETRA_SERIALCOMM_H -HAVE_EPETRA_VECTOR_H -HAVE_GETHOSTNAME -HAVE_GETPID -HAVE_GLIBC_STACKTRACE -HAVE_HSL_MA27 -HAVE_HSL_MA47 -HAVE_IFPACK_H -HAVE_INTTYPES_H -HAVE_JN -HAVE_MEMORY_H -HAVE_ML_MULTILEVELPRECONDITIONER_H -HAVE_SACADO_HPP - -HAVE_STDINT_H -HAVE_STD_IOSFWD_HEADER -HAVE_STD_ITERATOR_CLASS -HAVE_STDLIB_H -HAVE_STD_NUMERIC_LIMITS -HAVE_STD_OSTREAM_HEADER -HAVE_STD_STRINGSTREAM -HAVE_STRING_H -HAVE_STRINGS_H -HAVE_SYS_STAT_H -HAVE_SYS_SYSCALL_H -HAVE_TEUCHOS_PARAMETERLIST_HPP -HAVE_TEUCHOS_RCP_HPP -HAVE_TEUCHOS_REFCOUNTPTR_HPP -NO_HAVE_GETRUSAGE -PACKAGE_BUGREPORT -PACKAGE_STRING -PACKAGE_TARNAME -PACKAGE_URL -PETSC_SKIP_UNDERSCORE_CHKERR -PTW32_STATIC_LIB -STDC_HEADERS