Skip to content

Commit

Permalink
CI: another try
Browse files Browse the repository at this point in the history
  • Loading branch information
lschneiderbauer committed May 18, 2024
1 parent 74ea7b7 commit 6652dd3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ jobs:

- name: Install fftw3 on macOS
if: runner.os == 'macOS'
run: brew install libomp fftw
run: brew install fftw

- name: Install fftw3 on Windows
if: runner.os == 'Windows'
run: pacman -Syu mingw-w64-x86_64-fftw --noconfirm
run: pacman -Syu mingw-w64-x86_64-fftw mingw-w64-x86_64-openmp --noconfirm

- uses: r-lib/actions/setup-r-dependencies@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ AC_SEARCH_LIBS(

# Check for omp.h header
AC_CHECK_HEADER([omp.h], [
AC_DEFINE([HAVE_OMP_H], [1], [Define if you have the fftw3.h header file])
AC_DEFINE([HAVE_OMP_H], [1], [Define if you have the omp.h header file])
], [
AC_DEFINE([HAVE_OMP_H], [0], [Define if you have the fftw3.h header file])
AC_DEFINE([HAVE_OMP_H], [0], [Define if you have the omp.h header file])
])

have_fftw_omp=no
Expand Down
4 changes: 2 additions & 2 deletions src/Makevars.win
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CXX_STD = CXX17
PKG_CPPFLAGS = -I.
PKG_CPPFLAGS = -I. -I$(LIB_FFTW)/include
PKG_CXXFLAGS = -I. $(SHLIB_OPENMP_CXXFLAGS)
PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) -lfftw3f -lfftw3f_omp
PKG_LIBS = -L$(LIB_FFTW)/lib $(SHLIB_OPENMP_CXXFLAGS) -lfftw3f -lfftw3f_omp

0 comments on commit 6652dd3

Please sign in to comment.