From 4fc6224af2f81e1f08019288b467041b16df5e39 Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Fri, 8 Jul 2005 18:26:01 +0000 Subject: [PATCH] * allow mpicc to build applications that use internal headers by adding the right -I flags if we want devel headers This commit was SVN r6393. --- ompi/tools/wrappers/Makefile.am | 4 ++++ ompi/tools/wrappers/wrap.cc | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ompi/tools/wrappers/Makefile.am b/ompi/tools/wrappers/Makefile.am index ffcacbeeb8..3b66ee35a6 100644 --- a/ompi/tools/wrappers/Makefile.am +++ b/ompi/tools/wrappers/Makefile.am @@ -26,6 +26,10 @@ AM_CPPFLAGS = \ -DOMPI_LIBDIR="\"$(libdir)\"" \ -DOMPI_FC_MODULE_FLAG="\"$(OMPI_FC_MODULE_FLAG)\"" +if WANT_INSTALL_HEADERS +AM_CPPFLAGS += -DOMPI_WANT_DEVEL_HEADERS=1 +endif + EXTRA_DIST = wrap.cc wrap_engine.cc $(pkgdata_DATA) pkgdata_DATA = help-wrapper.txt diff --git a/ompi/tools/wrappers/wrap.cc b/ompi/tools/wrappers/wrap.cc index 3396802256..a768f9de51 100644 --- a/ompi/tools/wrappers/wrap.cc +++ b/ompi/tools/wrappers/wrap.cc @@ -214,7 +214,13 @@ ompi_wrap_build_xppflags(const ompi_sv_t & env_list, xppflags.push_back("-I" + incdir); } -#if OMPI_WANT_CXX_BINDINGS +#if OMPI_WANT_DEVEL_HEADERS + xppflags.push_back("-I" + incdir + "/openmpi"); + xppflags.push_back("-I" + incdir + "/openmpi/opal"); + xppflags.push_back("-I" + incdir + "/openmpi/orte"); +#endif + +#if OMPI_WANT_CXX_BINDINGS || OMPI_WANT_DEVEL_HEADERS xppflags.push_back("-I" + incdir + "/openmpi/ompi"); #endif