cpp14 checks

ropensci · Oct 12, 2023 · 25b1e5f · 25b1e5f
1 parent 8504a3c
commit 25b1e5f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
@@ -1,3 +1,3 @@
 Version: 0.1.0
-Date: 2023-10-12 00:32:23 UTC
-SHA: 65cf27efc6b936f9a599c679fd833a142c6d6a4d
+Date: 2023-10-12 03:47:48 UTC
+SHA: 8504a3cc7b87142ebabef93939a8812883e14725
diff --git a/src/AAA_check_cpp_version.cpp b/src/AAA_check_cpp_version.cpp
@@ -0,0 +1,5 @@
+#ifndef WIN_R_BUILD
+#if __cplusplus < 201402L
+#error Error: aorsf requires a C++14 compiler, e.g., gcc >= 5 or Clang >= 3.4. You probably have to update your C++ compiler.
+#endif
+#endif
diff --git a/src/Makevars b/src/Makevars
@@ -1,3 +1,2 @@
-CXX_STD = CXX14
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,3 +1,3 @@
-CXX_STD = CXX14
+PKG_CPPFLAGS = -DWIN_R_BUILD
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)