Skip to content

v2.x: hwloc: correctly handle --with-hwloc=external #2619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 22, 2016
Merged

v2.x: hwloc: correctly handle --with-hwloc=external #2619

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbfa78c
hwloc: correctly handle --with-hwloc=external
ggouaillardet Dec 21, 2016
938d056
hwloc external: minor fixes to 9649c44
jsquyres Dec 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions opal/mca/hwloc/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
#
# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#

# we do not want -I$(srcdir) in DEFAULT_INCLUDES
# otherwise there can be a conflict between system hwloc.h and opal/mca/hwloc/hwloc.h
# so just hack DEFAULT_INCLUDES with only what we need
DEFAULT_INCLUDES = -I$(top_builddir)/opal/include

# main library setup
noinst_LTLIBRARIES = libmca_hwloc.la
libmca_hwloc_la_SOURCES =
Expand Down
13 changes: 9 additions & 4 deletions opal/mca/hwloc/external/configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- shell-script -*-
#
# Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2014 Research Organization for Information Science
# Copyright (c) 2014-2016 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
#
# $COPYRIGHT$
Expand Down Expand Up @@ -61,12 +61,17 @@ AC_DEFUN([MCA_opal_hwloc_external_POST_CONFIG],[
# OPAL_HWLOC_WANT_VERBS_HELPER is set, that file will
# include the external hwloc/openfabrics-verbs.h file (via
# the MCA_hwloc_external_openfabrics_helper define).
AS_IF([test "$opal_hwloc_dir" != ""],
[opal_hwloc_include="$opal_hwloc_dir/include/hwloc.h"
opal_hwloc_openfabrics_include="$opal_hwloc_dir/include/hwloc/hwloc/openfabrics-verbs.h"],
[opal_hwloc_include="hwloc.h"
opal_hwloc_openfabrics_include="hwloc/openfabrics-verbs.h"])
AC_DEFINE_UNQUOTED(MCA_hwloc_external_header,
["$opal_hwloc_dir/include/hwloc.h"],
["$opal_hwloc_include"],
[Location of external hwloc header])
AC_DEFINE_UNQUOTED(MCA_hwloc_external_openfabrics_header,
["$opal_hwloc_dir/include/hwloc/openfabrics-verbs.h"],
[Location of external hwloc header])
["$opal_hwloc_openfabrics_include"],
[Location of external hwloc openfabrics header])
])
OPAL_VAR_SCOPE_POP
])dnl
Expand Down