Commit c4cc31f9 authored by fabianw's avatar fabianw

tests: fix Makefiles for object files in ./src

parent 49c8cef2
*~
*.o
*.swp
*.swo
*.bak
......
......@@ -30,7 +30,7 @@ struct Block
{
typedef TReal ElementType;
typedef TReal element_type;
typedef TReal Real;
typedef TReal RealType;
static constexpr size_t sizeX = BLOCK_SIZE;
static constexpr size_t sizeY = BLOCK_SIZE;
static constexpr size_t sizeZ = BLOCK_SIZE;
......
......@@ -17,6 +17,8 @@ CFLAGS+= -Wwrite-strings -Wmissing-declarations -Wredundant-decls
CFLAGS+= -Wshadow -Woverloaded-virtual -Wuninitialized
CFLAGS+= -Wpedantic -Wno-unused-parameter # does not make much sense with function overloading
OBJ = ../../src/ArgumentParser.o
LIBS =
ifneq (${HDF5_ROOT},)
......@@ -37,11 +39,14 @@ ifeq ("$(hdf5precision)","double")
endif
ifeq ("$(nonuniform)","yes")
CFLAGS += -DCUBISM_TEST__NONUNIFORM
CFLAGS += -DCUBISM_TEST_NONUNIFORM
endif
all: testDumpsMPI.cpp
$(CC) $(CFLAGS) -o testDumpsMPI testDumpsMPI.cpp $(LIBS) -lhdf5
all: testDumpsMPI.cpp $(OBJ)
$(CC) $(CFLAGS) -o testDumpsMPI testDumpsMPI.cpp $(OBJ) $(LIBS) -lhdf5
%.o: %.cpp
$(CC) $(CFLAGS) -c -o $@ $<
clean:
rm -f testDumpsMPI *.o *.h5 *.xmf *.bin *.zbin
......@@ -11,6 +11,7 @@
#include "Cubism/Grid.h"
#include "Cubism/GridMPI.h"
#include "Cubism/MeshMap.h"
#include "Cubism/MeshKernels.h"
#define CUBISM_USE_HDF
#include "Cubism/HDF5Dumper.h"
......
......@@ -16,6 +16,7 @@ CFLAGS+= -Wwrite-strings -Wmissing-declarations -Wredundant-decls
CFLAGS+= -Wshadow -Woverloaded-virtual -Wuninitialized
CFLAGS+= -Wpedantic -Wno-unused-parameter # does not make much sense with function overloading
OBJ = ../../src/ArgumentParser.o
.PHONY: all clean
......@@ -29,8 +30,11 @@ ifeq ("$(nonuniform)","yes")
CFLAGS += -DCUBISM_TEST_NONUNIFORM
endif
all: testSynchronizerMPI.cpp
$(CC) $(CFLAGS) -o testSynchronizerMPI testSynchronizerMPI.cpp
all: testSynchronizerMPI.cpp $(OBJ)
$(CC) $(CFLAGS) -o testSynchronizerMPI testSynchronizerMPI.cpp $(OBJ)
%.o: %.cpp
$(CC) $(CFLAGS) -c -o $@ $<
clean:
rm -f testSynchronizerMPI *.o
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment