diff --git a/src/MAKE/OPTIONS/Makefile.fftw b/src/MAKE/OPTIONS/Makefile.fftw index 8a2ba62090..8675aa4bf1 100755 --- a/src/MAKE/OPTIONS/Makefile.fftw +++ b/src/MAKE/OPTIONS/Makefile.fftw @@ -50,9 +50,9 @@ MPI_LIB = # PATH = path for FFT library # LIB = name of FFT library -FFT_INC = -DFFT_FFTW -I/usr/local/include +FFT_INC = -DFFT_FFTW3 -I/usr/local/include FFT_PATH = -L/usr/local/lib -FFT_LIB = -lfftw +FFT_LIB = -lfftw3 # JPEG and/or PNG library # see discussion in Section 2.2 (step 7) of manual diff --git a/src/MAKE/OPTIONS/Makefile.kokkos_cuda b/src/MAKE/OPTIONS/Makefile.kokkos_cuda index 7e1d9a1c11..b371e6cb5d 100755 --- a/src/MAKE/OPTIONS/Makefile.kokkos_cuda +++ b/src/MAKE/OPTIONS/Makefile.kokkos_cuda @@ -52,9 +52,9 @@ MPI_LIB = -lmpich -lmpl -lpthread # PATH = path for FFT library # LIB = name of FFT library -FFT_INC = -DFFT_FFTW +FFT_INC = -DFFT_FFTW3 FFT_PATH = -FFT_LIB = -lfftw +FFT_LIB = -lfftw3 # JPEG and/or PNG library # see discussion in Section 2.2 (step 7) of manual diff --git a/src/MAKE/OPTIONS/Makefile.pgi b/src/MAKE/OPTIONS/Makefile.pgi index 9b30574647..e8aaba3785 100644 --- a/src/MAKE/OPTIONS/Makefile.pgi +++ b/src/MAKE/OPTIONS/Makefile.pgi @@ -51,9 +51,9 @@ MPI_LIB = -lmpich # PATH = path for FFT library # LIB = name of FFT library -FFT_INC = -DFFT_FFTW +FFT_INC = -DFFT_FFTW3 FFT_PATH = -FFT_LIB = -lfftw +FFT_LIB = -lfftw3 # JPEG and/or PNG library # see discussion in Section 2.2 (step 7) of manual diff --git a/src/Make.py b/src/Make.py index 724baaf2ef..f39e0bbaf7 100755 --- a/src/Make.py +++ b/src/Make.py @@ -1528,10 +1528,10 @@ class Fft: change FFT settings in makefile mode is required, all other args are optional removes all current FFT variable settings - mode = none or fftw or ... + mode = none or fftw or fftw3 of ... adds -DFFT_MODE setting lib = name of FFT library to link with (def is libname = mode) - adds -lliblibname setting + adds -lliblib setting, e.g. -llibfftw3 dir = home dir for include and library files (def = none) adds -Idir/include and -Ldir/lib settings if set, overrides idir and ldir args