From 175e252325e298405510e7963d766f7651e758d8 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Mon, 16 Jan 2012 15:32:25 +0100
Subject: [PATCH] Pass srcdir for the parset
---
src/Makefile.am | 2 ++
src/one-body-sample.cc | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 12609d34..cbe656bb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,8 @@ run-one-body-sample-gdb: one-body-sample
one_body_sample_SOURCES = \
one-body-sample.cc
+one_body_sample_CPPFLAGS = \
+ $(AM_CPPFLAGS) -Dsrcdir=\"$(srcdir)\"
test_gradient_method_SOURCES = \
test-gradient-method.cc
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 8002b890..b3720edf 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -2,6 +2,10 @@
#include "config.h"
#endif
+#ifndef srcdir
+#error srcdir unset
+#endif
+
#ifdef HAVE_IPOPT
#undef HAVE_IPOPT
#endif
@@ -175,7 +179,7 @@ void assemble_nonlinearity(
int main(int argc, char *argv[]) {
try {
Dune::ParameterTree parset;
- Dune::ParameterTreeParser::readINITree("../../src/one-body-sample.parset",
+ Dune::ParameterTreeParser::readINITree(srcdir "/one-body-sample.parset",
parset); // FIXME
Dune::ParameterTreeParser::readOptions(argc, argv, parset);
--
GitLab