Fix for Makevars

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: largeVis
 Type: Package
 Title: High-Quality Visualizations of Large, High-Dimensional Datasets
-Version: 0.2.1
+Version: 0.2.2
 Author: Amos B. Elberg
 Maintainer: Amos Elberg <amos.elberg@gmail.com>
 Description: Implements the largeVis algorithm (see Tang, et al. (2016)  <DOI:10.1145/2872427.2883041>) for visualizing very large high-dimensional datasets. Also very fast search for approximate nearest neighbors; outlier detection; and optimized implementations of the HDBSCAN*, DBSCAN and OPTICS clustering algorithms; plotting functions for visualizing the above.
@@ -26,4 +26,4 @@ BugReports: https://github.com/elbamos/largeVis/issues
 NeedsCompilation: yes
 BuildVignettes: TRUE
 VignetteBuilder: knitr
-SystemRequirements: C++11
+SystemRequirements: C++11, GNU make

NEWS.md

@@ -1,4 +1,7 @@
-### largeVis 0.2.0.1
+### largeVis 0.2.2dev
+*	Modified Makevars should now automatically handle OpenMP correctly on OS X with R 3.4.
+
+### largeVis 0.2.1
 * Fix for a bug in which the edgeMatrix needed to be transposed in some circumstances.
 * Accepted a PR related to a bug where `largeVis` would fail if saveNeighbors was set to FALSE.
 * Fixed a documentation error.

src/Makevars

@@ -1,4 +1,12 @@
-PKG_CFLAGS = $(SHLIB_OPENMP_CFLAGS)
-PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(SHLIB_OPENMP_CFLAGS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
-PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -DARMA_64BIT_WORD -DNDEBUG
-CXX_STD=CXX11
+CXX_STD=CXX11
+
+CXX1X=$(shell ${R_HOME}/bin/R CMD config CXX11)
+
+ifeq ($(shell $(CXX1X) -fopenmp -E -xc++ - 2>&1 >/dev/null && echo 'true'), true)
+  PKG_CFLAGS=$(SHLIB_OPENMP_CFLAGS)
+  PKG_LIBS=$(SHLIB_OPENMP_CXXFLAGS) $(SHLIB_OPENMP_CFLAGS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
+  PKG_CXXFLAGS=$(SHLIB_OPENMP_CXXFLAGS) -DARMA_64BIT_WORD -DNDEBUG
+else
+  PKG_LIBS=$(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
+  PKG_CXXFLAGS=-DARMA_64BIT_WORD -DNDEBUG
+endif