From 1577bc15d941403b240815eb2ed3a5b09a3dd3a7 Mon Sep 17 00:00:00 2001 From: Pietro Incardona <incardon@mpi-cbg.de> Date: Wed, 28 Oct 2015 12:49:31 +0100 Subject: [PATCH] Fixing pdata compilation --- openfpm_data | 2 +- openfpm_devices | 2 +- openfpm_io | 2 +- openfpm_numerics | 2 +- openfpm_vcluster | 2 +- src/Makefile.am | 2 +- vtk/Makefile.am | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/openfpm_data b/openfpm_data index ec562d96..fa6e1d93 160000 --- a/openfpm_data +++ b/openfpm_data @@ -1 +1 @@ -Subproject commit ec562d96b376389ebc4024112671c05e265d23d0 +Subproject commit fa6e1d93eee2226ca3547c5980601a71e0b14ae3 diff --git a/openfpm_devices b/openfpm_devices index 55db8122..18cad2e7 160000 --- a/openfpm_devices +++ b/openfpm_devices @@ -1 +1 @@ -Subproject commit 55db81226f047b3dfea1e3b276b67ee8374651b0 +Subproject commit 18cad2e78602aa5f55f04926c327a7864d67b756 diff --git a/openfpm_io b/openfpm_io index df344803..b7238aac 160000 --- a/openfpm_io +++ b/openfpm_io @@ -1 +1 @@ -Subproject commit df3448039f9197b2df3d0415b218142b08e223fa +Subproject commit b7238aac71a82a304a7d455a8a62fc1149168fb5 diff --git a/openfpm_numerics b/openfpm_numerics index b4d8373a..70629390 160000 --- a/openfpm_numerics +++ b/openfpm_numerics @@ -1 +1 @@ -Subproject commit b4d8373acf148fcfb868fc3edff3eb2aed78c881 +Subproject commit 706293905a3cd052ff6be0ce5d46263016b6d0e3 diff --git a/openfpm_vcluster b/openfpm_vcluster index 3e846786..b57540c8 160000 --- a/openfpm_vcluster +++ b/openfpm_vcluster @@ -1 +1 @@ -Subproject commit 3e846786367e20cf01e7658af9c1ec4c277c6ce3 +Subproject commit b57540c803a8b7c269013f4a3c59b3f148d71edc diff --git a/src/Makefile.am b/src/Makefile.am index f36310c8..c5ebc7b8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ LINKLIBS = $(METIS_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_IOSTREAMS_LIB) $(CUDA_LIBS) noinst_PROGRAMS = pdata -pdata_SOURCES = main.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_data/src/Memleak_check.cpp +pdata_SOURCES = main.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_devices/src/Memleak_check.cpp pdata_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) $(METIS_INCLUDE) $(BOOST_CPPFLAGS) -Wno-unused-function pdata_CFLAGS = $(CUDA_CFLAGS) pdata_LDADD = $(LINKLIBS) -lmetis diff --git a/vtk/Makefile.am b/vtk/Makefile.am index cc819623..edf8462b 100644 --- a/vtk/Makefile.am +++ b/vtk/Makefile.am @@ -2,17 +2,17 @@ LINKLIBS = $(METIS_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_IOSTREAMS_LIB) $(CUDA_LIBS) noinst_PROGRAMS = cart_dec metis_dec dom_box -cart_dec_SOURCES = CartDecomposition_gen_vtk.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_data/src/Memleak_check.cpp +cart_dec_SOURCES = CartDecomposition_gen_vtk.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_devices/src/Memleak_check.cpp cart_dec_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) $(METIS_INCLUDE) $(BOOST_CPPFLAGS) -I../src -Wno-unused-function cart_dec_CFLAGS = $(CUDA_CFLAGS) cart_dec_LDADD = $(LINKLIBS) -lmetis -metis_dec_SOURCES = Metis_gen_vtk.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_data/src/Memleak_check.cpp +metis_dec_SOURCES = Metis_gen_vtk.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_devices/src/Memleak_check.cpp metis_dec_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) $(METIS_INCLUDE) $(BOOST_CPPFLAGS) -I../src -Wno-unused-function metis_dec_CFLAGS = $(CUDA_CFLAGS) metis_dec_LDADD = $(LINKLIBS) -lmetis -dom_box_SOURCES = domain_gen_vtk.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_data/src/Memleak_check.cpp +dom_box_SOURCES = domain_gen_vtk.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_devices/src/Memleak_check.cpp dom_box_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) $(METIS_INCLUDE) $(BOOST_CPPFLAGS) -I../src -Wno-unused-function dom_box_CFLAGS = $(CUDA_CFLAGS) dom_box_LDADD = $(LINKLIBS) -- GitLab