From: maier Date: Mon, 1 Oct 2012 13:16:46 +0000 (+0000) Subject: Remove DEAL_II_PATH from config.h X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cccd2dd56420f62126add71b6bd07e6fc158021;p=dealii-svn.git Remove DEAL_II_PATH from config.h The benefit to be able to change the install prefix WITHOUT recompiling the whole library far outweights supports for two obsolete features git-svn-id: https://svn.dealii.org/branches/branch_cmake@26905 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/TODO.CMAKE b/deal.II/TODO.CMAKE index 564a9d2285..822f3446d3 100644 --- a/deal.II/TODO.CMAKE +++ b/deal.II/TODO.CMAKE @@ -40,6 +40,11 @@ Major: Minor: +* Fixup the TODOs in + source/lac/sparse_dircect.cc + source/base/path_find.cc + source/base/function_parser.cc + * Get rid of DEAL_II_PATH in config.h and in the sources. * HAVE_JN_ ? diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index 314dd44a66..59c907f57c 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -38,9 +38,6 @@ /* Define to the home page for this package. */ #define DEAL_II_PACKAGE_URL "@DEAL_II_PACKAGE_URL@" -/* Path to the deal.II directory */ -#define DEAL_II_PATH "@DEAL_II_PATH@" - /* Major version number of deal.II */ #define DEAL_II_MAJOR "@DEAL_II_VERSION_MAJOR@" # legacy #define DEAL_II_VERSION_MAJOR "@DEAL_II_VERSION_MAJOR@" diff --git a/deal.II/source/base/path_search.cc b/deal.II/source/base/path_search.cc index c59d22984d..8879e38633 100644 --- a/deal.II/source/base/path_search.cc +++ b/deal.II/source/base/path_search.cc @@ -33,7 +33,9 @@ PathSearch::initialize_classes() v.push_back(empty); path_lists.insert(map_type(std::string("PARAMETER"), v)); - v.push_back(std::string(DEAL_II_PATH "/lib/meshes/")); + /* + * TODO: reenable some sensible default paths. Maier, 2012 + */ path_lists.insert(map_type(std::string("MESH"), v)); v.clear(); @@ -41,6 +43,10 @@ PathSearch::initialize_classes() v.push_back(std::string(".prm")); suffix_lists.insert(map_type(std::string("PARAMETER"), v)); + /* + * TODO: "Would require linking with the deal.II libraries"? This .cc + * file gets compiled into the library... maier, 2012 + */ // We cannot use the GridIn class // to query the formats, since this // would require linking with the diff --git a/deal.II/source/lac/sparse_direct.cc b/deal.II/source/lac/sparse_direct.cc index 243e0966a2..1806635961 100644 --- a/deal.II/source/lac/sparse_direct.cc +++ b/deal.II/source/lac/sparse_direct.cc @@ -519,7 +519,11 @@ SparseDirectMA27::initialize (const SparsityPattern &sp) // copy of the program, and // run the detached solver // slave instead - const char * const program_name = DEAL_II_PATH"/lib/bin/detached_ma27"; + /* + * TODO: Does this invocation work with just the name of the + * executable? Maier, 2012 + */ + const char * const program_name = "detached_ma27"; const char * const child_argv[] = { program_name, NULL }; execv(program_name, const_cast(child_argv));