Ensure that the libevent headers are installed for external libevent when --with-devel-headers is given. Correct the path for opal_config.h in the external hwloc header
Этот коммит содержится в:
родитель
45336d0bea
Коммит
be3197fe27
7
opal/mca/event/external/Makefile.am
поставляемый
7
opal/mca/event/external/Makefile.am
поставляемый
@ -1,6 +1,7 @@
|
|||||||
#
|
#
|
||||||
# Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
|
# Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
|
||||||
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
|
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
|
||||||
|
# Copyright (c) 2016 Intel, Inc. All rights reserved.
|
||||||
# $COPYRIGHT$
|
# $COPYRIGHT$
|
||||||
#
|
#
|
||||||
# Additional copyrights may follow
|
# Additional copyrights may follow
|
||||||
@ -16,3 +17,9 @@ libmca_event_external_la_SOURCES = \
|
|||||||
event_external_component.c \
|
event_external_component.c \
|
||||||
event_external_module.c
|
event_external_module.c
|
||||||
libmca_event_external_la_CPPFLAGS = $(opal_event_external_CPPFLAGS)
|
libmca_event_external_la_CPPFLAGS = $(opal_event_external_CPPFLAGS)
|
||||||
|
|
||||||
|
#Conditionally install the header files
|
||||||
|
if WANT_INSTALL_HEADERS
|
||||||
|
opaldir = $(opalincludedir)/$(subdir)
|
||||||
|
nobase_opal_HEADERS = external.h
|
||||||
|
endif
|
||||||
|
3
opal/mca/hwloc/external/external.h
поставляемый
3
opal/mca/hwloc/external/external.h
поставляемый
@ -3,6 +3,7 @@
|
|||||||
* Copyright (c) 2016 Research Organization for Information Science
|
* Copyright (c) 2016 Research Organization for Information Science
|
||||||
* and Technology (RIST). All rights reserved.
|
* and Technology (RIST). All rights reserved.
|
||||||
*
|
*
|
||||||
|
* Copyright (c) 2016 Intel, Inc. All rights reserved.
|
||||||
* $COPYRIGHT$
|
* $COPYRIGHT$
|
||||||
*
|
*
|
||||||
* Additional copyrights may follow
|
* Additional copyrights may follow
|
||||||
@ -19,7 +20,7 @@
|
|||||||
|
|
||||||
BEGIN_C_DECLS
|
BEGIN_C_DECLS
|
||||||
|
|
||||||
#include <opal/include/opal_config.h>
|
#include <opal_config.h>
|
||||||
#include MCA_hwloc_external_header
|
#include MCA_hwloc_external_header
|
||||||
|
|
||||||
/* If the including file requested it, also include the hwloc verbs
|
/* If the including file requested it, also include the hwloc verbs
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user