fec519a793
Per a prior commit, the presence of "hwloc.h" can cause ambiguity when using --with-hwloc=external (i.e., whether to include opal/mca/hwloc/hwloc.h or whether to include the system-installed hwloc.h). This commit: 1. Renames opal/mca/hwloc/hwloc.h to hwloc-internal.h. 2. Adds opal/mca/hwloc/autogen.options to tell autogen.pl to expect to find hwloc-internal.h (instead of hwloc.h) in opal/mca/hwloc. 3. s@opal/mca/hwloc/hwloc.h@opal/mca/hwloc/hwloc-internal.h@g in the rest of the code base. Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
14 строки
560 B
Plaintext
14 строки
560 B
Plaintext
# Copyright (c) 2017 Cisco Systems, Inc. All rights reserved
|
|
# $COPYRIGHT$
|
|
#
|
|
|
|
# Per https://github.com/open-mpi/ompi/issues/2616, we cannot have an
|
|
# "hwloc.h" in the framework directory (due to conflicts of finding
|
|
# the system hwloc.h file when using "--with-hwloc=external"). Hence,
|
|
# we need to deviate from the framework norm of having
|
|
# framework/framework.h (i.e., hwloc/hwloc.h). Instead, we'll have
|
|
# hwloc/hwloc-internal.h to make sure that this header file can never
|
|
# be mistaken for a system-level hwloc.h.
|
|
|
|
framework_header = hwloc-internal.h
|