From 6652dd32d1d00e8e92f576ba2db8aa0523f38e9a Mon Sep 17 00:00:00 2001
From: Lukas Schneiderbauer <lukas.schneiderbauer@gmail.com>
Date: Sat, 18 May 2024 20:04:53 +0200
Subject: [PATCH] CI: another try

---
 .github/workflows/R-CMD-check.yaml | 4 ++--
 configure.ac                       | 4 ++--
 src/Makevars.win                   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
index c3d6718..0313769 100644
--- a/.github/workflows/R-CMD-check.yaml
+++ b/.github/workflows/R-CMD-check.yaml
@@ -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:
diff --git a/configure.ac b/configure.ac
index ba317a3..07c6403 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/src/Makevars.win b/src/Makevars.win
index 15c12dd..b95d6cf 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -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