From 446fc057ba31d308b50281fa3089c9d605ff88e6 Mon Sep 17 00:00:00 2001 From: Pietro Incardona Date: Wed, 20 May 2015 17:54:37 +0200 Subject: [PATCH] Fixing jenkins script --- build_vcluster.sh | 3 +-- src/Makefile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build_vcluster.sh b/build_vcluster.sh index 6a79ad9..b88d13a 100644 --- a/build_vcluster.sh +++ b/build_vcluster.sh @@ -54,8 +54,7 @@ exit(0)\n" echo $script | sed -r 's/\\n/\n/g' > compile_script -# bsub "cd \"$1/OpenFPM_vcluster\"\n -# sh ./compile_script" + bsub -K -n 1 -J compile sh ./compile_script # bsub -K -n 2 mpirun -np 2 ./src/vcluster # if [ "$?" = "0" ]; then exit 1 ; fi diff --git a/src/Makefile b/src/Makefile index 5699996..20446de 100644 --- a/src/Makefile +++ b/src/Makefile @@ -285,7 +285,7 @@ top_builddir = .. top_srcdir = .. LINKLIBS = $(DEFAULT_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) vcluster_SOURCES = main.cpp VCluster.cpp -vcluster_CXXFLAGS = $(INCLUDES_PATH) +vcluster_CXXFLAGS = $(INCLUDES_PATH) $(BOOST_CPPFLAGS) vcluster_CFLAGS = $(CUDA_CFLAGS) vcluster_LDADD = $(LINKLIBS) all: all-am -- GitLab