diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 6753bb4..9cbfc77 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -51,7 +51,22 @@ jobs: - uses: r-lib/actions/check-r-package@v2 with: upload-snapshots: true - - name: Test package loading + - name: Debug information run: | - Rscript -e "install.packages('bdrc', repos = NULL, type = 'source')" + pwd + ls -l + R -e "print(.libPaths())" + - name: Check package structure + run: | + ls -R + - name: Build package + run: | + R CMD build . + - name: Check built package + run: | + ls -l *.tar.gz + - name: Install and load package + run: | + PKG_FILE=$(ls -1t *.tar.gz | head -n 1) + R CMD INSTALL ${PKG_FILE} Rscript -e "library(bdrc); print(ls('package:bdrc'))" diff --git a/src/Makevars b/src/Makevars index 17a554a..ce93e5a 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,5 +1,3 @@ CXX_STD = CXX11 -PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -I/usr/local/Cellar/gcc/14.2.0/include -PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) $(SHLIB_OPENMP_CXXFLAGS) -L/usr/local/Cellar/gcc/14.2.0/lib/gcc/current -lgfortran -lquadmath -lm - -FLIBS=-L/usr/local/Cellar/gcc/14.2.0/lib/gcc/current -lgfortran -lquadmath -lm +PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) +PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) $(SHLIB_OPENMP_CXXFLAGS) diff --git a/src/Makevars.win b/src/Makevars.win index d715e49..4a28f0c 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,3 +1,4 @@ CXX_STD = CXX11 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) +USE_CXX14 = yes