[Genabel-commits] r1865 - in pkg/OmicABELnoMM: . src

[noreply at r-forge.r-project.org]

Author: lckarssen
Date: 2014-10-28 14:41:30 +0100 (Tue, 28 Oct 2014)
New Revision: 1865

Modified:
   pkg/OmicABELnoMM/Makefile.am
   pkg/OmicABELnoMM/src/Definitions.h
Log:
OmicABELnoMM's Makefile.am: Added missing CXXFLAGS statements required to make #ifdef USE_MPI possible. Also minor fix to src/Definitions.h (HAVE_MPI -> USE_MPI).


Modified: pkg/OmicABELnoMM/Makefile.am
===================================================================
--- pkg/OmicABELnoMM/Makefile.am	2014-10-28 13:00:11 UTC (rev 1864)
+++ pkg/OmicABELnoMM/Makefile.am	2014-10-28 13:41:30 UTC (rev 1865)
@@ -4,6 +4,10 @@
 oanomm_headers = $(oanomm_cpp:.cpp=.h) src/Definitions.h
 
 omicabelnomm_SOURCES = $(oanomm_headers) $(oanomm_cpp) src/main.cpp
+omicabelnomm_CXXFLAGS = $(AM_CXXFLAGS)
+if USE_MPI
+omicabelnomm_CXXFLAGS += -DUSE_MPI
+endif
 
 
 ## Stuff needed for the checks in the tests/ directory
@@ -15,6 +19,7 @@
  tests/test.cpp
 
 TESTS = $(check_PROGRAMS)
+
 cleanfiles_tests = examples/results/dosages__dis.txt	\
  examples/results/dosages_add__dis.txt			\
  examples/results/dosages_dom__dis.txt			\

Modified: pkg/OmicABELnoMM/src/Definitions.h
===================================================================
--- pkg/OmicABELnoMM/src/Definitions.h	2014-10-28 13:00:11 UTC (rev 1864)
+++ pkg/OmicABELnoMM/src/Definitions.h	2014-10-28 13:41:30 UTC (rev 1865)
@@ -26,9 +26,9 @@
 #include <utility>
 #include <iomanip>
 
-#ifdef HAVE_MPI
+#ifdef USE_MPI
 #include <mpi.h>
-pragma message("Compiled with MPI SUPPORT")
+#pragma message("Compiled with MPI SUPPORT")
 #endif