diff --git a/example/MakefileProject/Makefile b/example/MakefileProject/Makefile index 1e121a9ff50a53a473165d1a82b18fda6baf3e58..6738a321e8d3c6668ff994ce8aa218db9c50d638 100644 --- a/example/MakefileProject/Makefile +++ b/example/MakefileProject/Makefile @@ -27,6 +27,7 @@ LIBALL_INCLUDE := -I$(ALL_DIR)/include/modules -I$(ALL_DIR)/include LIBALL_LIB := $(ALL_DIR)/lib/libALL_fortran.a $(ALL_DIR)/lib/libALL.a LIBALL_LIB += $(ALL_DIR)/lib/libvoro.a LIBALL_CONFIG_FILE := $(ALL_DIR)/lib/cmake/ALL/ALLConfig.cmake +LIBALL_DEFINES += -DALL_VTK_OUTPUT -DALL_VORONOI_ACTIVE LIBALL_CONFIGURE := -DCM_ALL_FORTRAN=ON -DCM_ALL_VORONOI=ON -DCM_ALL_VTK_OUTPUT=ON -DCMAKE_BUILD_TYPE=Release @@ -34,6 +35,9 @@ LIBALL_CONFIGURE := -DCM_ALL_FORTRAN=ON -DCM_ALL_VORONOI=ON -DCM_ALL_VTK_OUTPUT= # explicitly state it. FFLAGS += -lstdc++ +FLAGS += -DTEST_VTK_OUTPUT -DTEST_VORONOI +FLAGS += $(LIBALL_DEFINES) + # The linking order of VTK can be gleaned from the CMake invocation of any # executable of the library. Just compile the library using `VERBOSE=1` and the # command lines are output as well. @@ -57,21 +61,19 @@ clean-ext-liball: rm -rf $(ALL_BUILD) $(ALL_DIR) # Our projects executables: -ALL_Staggered: ALL_Staggered.cpp liball - $(MCXX) $(CXXFLAGS) $(INCLUDES) $< $(LIBS) -o $@ +ALL_Staggered: ALL_Staggered.cpp $(LIBALL_CONFIG_FILE) + $(MCXX) $(FLAGS) $(CXXFLAGS) $(INCLUDES) $< $(LIBS) -o $@ -ALL_Staggered_f: ALL_Staggered_f.F90 liball - $(MFC) $(FFLAGS) $(INCLUDES) $< $(LIBS) -o $@ +ALL_Staggered_f: ALL_Staggered_f.F90 $(LIBALL_CONFIG_FILE) + $(MFC) $(FLAGS) $(FFLAGS) $(INCLUDES) $< $(LIBS) -o $@ ALL_test.cpp: ALL_test_src.cpp $(shell cat $< | sed -e 's/ALL_VTK_OUTPUT/TEST_VTK_OUTPUT/' -e 's/ALL_VORONOI_ACTIVE/TEST_VORONOI/' > $@) -ALL_test: ALL_test.cpp liball - $(MCXX) $(CXXFLAGS) $(INCLUDES) $< $(LIBS) -o $@ +ALL_test: ALL_test.cpp $(LIBALL_CONFIG_FILE) + $(MCXX) $(FLAGS) $(CXXFLAGS) $(INCLUDES) $< $(LIBS) -o $@ # The library part follows: -liball: $(LIBALL_CONFIG_FILE) - $(LIBALL_CONFIG_FILE): rm -rf $(ALL_BUILD) mkdir -p $(ALL_BUILD)