More adjusts actions and makefile

davidbolin · May 18, 2024 · 0062336 · 0062336
1 parent a2c0e12
commit 0062336
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/R-CMD-check-mac.yaml b/.github/workflows/R-CMD-check-mac.yaml
@@ -55,6 +55,7 @@ jobs:
           sudo ln -s $(brew --prefix gcc@14)/bin/gcc-14 /usr/local/bin/gcc
           sudo ln -s $(brew --prefix gcc@14)/bin/g++-14 /usr/local/bin/g++
           sudo ln -s $(brew --prefix eigen)/include/eigen3 /usr/local/include/eigen3
+          sudo ln -s $(brew --prefix)/lib /usr/local/brewlib
       - name: Install system dependencies on Linux (GL)
         if: runner.os == 'Linux'
         run: |

diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
@@ -24,6 +24,8 @@ jobs:
         if: runner.os == 'Linux'
         run: |
           sudo apt-get update -y && sudo apt-get install -y libglu1-mesa-dev libeigen3-dev
+          sudo ln -s /usr/bin/gcc /usr/local/bin/gcc
+          sudo ln -s /usr/bin/g++ /usr/local/bin/g++          
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:

diff --git a/index.md b/index.md
@@ -2,7 +2,7 @@
 
 [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version-last-release/rSPDE)](https://cran.r-project.org/package=rSPDE)
 [![CRAN_Downloads](https://cranlogs.r-pkg.org/badges/grand-total/rSPDE)](https://cranlogs.r-pkg.org/badges/grand-total/rSPDE)
-[![R-CMD-check](https://github.com/davidbolin/rSPDE/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/davidbolin/rSPDE/actions/workflows/R-CMD-check.yaml)
+[![R-CMD-check](https://github.com/davidbolin/rSPDE/actions/workflows/R-CMD-check.yaml/badge.svg?branch=devel-src)](https://github.com/davidbolin/rSPDE/actions/workflows/R-CMD-check.yaml)
 
 `rSPDE` is an R package used for computing rational approximations of fractional SPDEs. These rational approximations can be used for computatially efficient statistical inference.
 

diff --git a/src/Makefile b/src/Makefile
@@ -15,12 +15,13 @@ CXX = /usr/local/bin/g++
 
 EIGEN_MAC = /usr/local
 EIGEN_LINUX = /usr
+MAC_LIB = /usr/local/brewlib
 
 flags = -O2 -Wall -Wextra -fpic -g -fopenmp
 
 %.o: %.c
 	test -f ${R_LIBRARY_DIR}/INLA/include/cgeneric.h || test -f cgeneric.h || wget -O cgeneric.h https://raw.githubusercontent.com/hrue/r-inla/devel/inlaprog/src/cgeneric.h
-	$(CC) $(flags) -Iinclude -I$(toInclude)  -c $^ -o $@ 
+	$(CC) $(flags) -Iinclude -I$(toInclude)  -c $^ -o $@ -L$(MAC_LIB) 
 
 %.o: %.cpp
 	$(CXX) $(flags)  -I$(toInclude) -I$(EIGEN_MAC)/include/eigen3/ -I$(EIGEN_LINUX)/include/eigen3/ -c $^ -o $@