[Genabel-commits] r1949 - pkg/MixABEL/src

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

Author: lckarssen
Date: 2015-04-27 17:34:16 +0200 (Mon, 27 Apr 2015)
New Revision: 1949

Modified:
   pkg/MixABEL/src/Makevars.win
   pkg/MixABEL/src/Makevars_distrib
Log:
Use portable OpenMP flags in the Makevars files of MixABEL.
This follows the suggestions in the "Writing R Extensions" manual (see http://cran.r-project.org/doc/manuals/r-devel/R-exts.html#OpenMP-support) and fixes an R CMD check error.


Modified: pkg/MixABEL/src/Makevars.win
===================================================================
--- pkg/MixABEL/src/Makevars.win	2015-04-27 15:22:08 UTC (rev 1948)
+++ pkg/MixABEL/src/Makevars.win	2015-04-27 15:34:16 UTC (rev 1949)
@@ -2,8 +2,6 @@
 # CPPFLAGS=-I$(R_HOME)/include -IF:/MinGW/usr/local/include
 # PKG_CPPFLAGS=-IF:/MinGW/usr/local/include
 
-# lines below supplied by Brian Ripley and Uwe Ligges, updated by Yurii with openmp
-
 PKG_CPPFLAGS=-I$(LIB_GSL)/include
-PKG_LIBS=-L$(LIB_GSL)/lib -lgsl -fopenmp
-PKG_CXXFLAGS=-fopenmp
\ No newline at end of file
+PKG_LIBS=-L$(LIB_GSL)/lib -lgsl $(SHLIB_OPENMP_CXXFLAGS)
+PKG_CXXFLAGS=$(SHLIB_OPENMP_CXXFLAGS)

Modified: pkg/MixABEL/src/Makevars_distrib
===================================================================
--- pkg/MixABEL/src/Makevars_distrib	2015-04-27 15:22:08 UTC (rev 1948)
+++ pkg/MixABEL/src/Makevars_distrib	2015-04-27 15:34:16 UTC (rev 1949)
@@ -1,2 +1,2 @@
-PKG_LIBS=-lgsl -lgslcblas -fopenmp
-PKG_CXXFLAGS=-fopenmp
+PKG_LIBS=-lgsl -lgslcblas $(SHLIB_OPENMP_CXXFLAGS)
+PKG_CXXFLAGS=$(SHLIB_OPENMP_CXXFLAGS)