瀏覽代碼

hwloc.h is used in the public headers of StarPU, so we need to include hwloc's
headers

Cédric Augonnet 14 年之前
父節點
當前提交
fa37c0e2da
共有 1 個文件被更改,包括 4 次插入1 次删除
  1. 4 1
      mpi/Makefile.am

+ 4 - 1
mpi/Makefile.am

@@ -43,6 +43,8 @@ if STARPU_USE_CUDA
 # TODO define NVCCFLAGS
 NVCC ?= nvcc
 
+NVCCFLAGS += -I$(top_srcdir)/include/ -I$(top_builddir)/include $(HWLOC_CFLAGS)
+
 .cu.cubin:
 	$(MKDIR_P) `dirname $@`
 	$(NVCC) -cubin $< -o $@ --compiler-options -fno-strict-aliasing  $(NVCCFLAGS)
@@ -51,7 +53,8 @@ NVCC ?= nvcc
 	$(NVCC) $< -c -o $@ --compiler-options -fno-strict-aliasing  $(NVCCFLAGS) -I$(top_srcdir)/include/  -I$(top_builddir)/include/
 endif
 
-LIBS = $(top_builddir)/src/libstarpu.la @LIBS@
+AM_CFLAGS = $(HWLOC_CFLAGS)
+LIBS = $(top_builddir)/src/libstarpu.la  $(HWLOC_LIBS) @LIBS@
 AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/mpi/ -I$(top_srcdir)/src/  -I$(top_srcdir)/examples/ -I$(top_builddir)/src -I$(top_builddir)/include
 
 lib_LTLIBRARIES = libstarpumpi.la