diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3e10db72c..66dc54d59 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -44,7 +44,8 @@ jobs: # https://github.com/actions/runner-images/issues/10004 CXXFLAGS: "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" run: | - cmake -S fftw-3.3.10 -B build_fftw ` + cmake -S fftw-3.3.10 ` + -B build_fftw ` -DBUILD_SHARED_LIBS=OFF ` -DBUILD_TESTS=OFF ` -DCMAKE_BUILD_TYPE=RelWithDebInfo ` @@ -52,6 +53,16 @@ jobs: if(!$?) { Exit $LASTEXITCODE } cmake --build build_fftw --config RelWithDebInfo --target install --parallel 4 if(!$?) { Exit $LASTEXITCODE } + cmake -S fftw-3.3.10 ` + -B build_fftwf ` + -DBUILD_SHARED_LIBS=OFF ` + -DBUILD_TESTS=OFF ` + -DCMAKE_BUILD_TYPE=RelWithDebInfo ` + -DDISABLE_FORTRAN=ON ` + -DENABLE_FLOAT=ON + if(!$?) { Exit $LASTEXITCODE } + cmake --build build_fftwf --config RelWithDebInfo --target install --parallel 4 + if(!$?) { Exit $LASTEXITCODE } cmake -S hdf5-hdf5-1_12_2 -B build_hdf5 ` -DCMAKE_BUILD_TYPE=RelWithDebInfo ` @@ -83,6 +94,7 @@ jobs: CXXFLAGS: "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" # FFTW3 install prefix path FFTW3_DIR: "C:/Program Files (x86)/fftw/" + FFTW3f_DIR: "C:/Program Files (x86)/fftw/" run: | $env:HDF5_DIR = "C:/Program Files/HDF_Group/HDF5/1.12.2/cmake/" cmake -S . -B build ` @@ -159,6 +171,17 @@ jobs: if errorlevel 1 exit 1 cmake --build build_fftw --config Release --target install --parallel 4 if errorlevel 1 exit 1 + cmake -S fftw-3.3.10 ^ + -B build_fftwf ^ + -G "Ninja" ^ + -DBUILD_TESTS=OFF ^ + -DBUILD_SHARED_LIBS=OFF ^ + -DCMAKE_BUILD_TYPE=Release ^ + -DDISABLE_FORTRAN=ON ^ + -DENABLE_FLOAT=ON + if errorlevel 1 exit 1 + cmake --build build_fftwf --config Release --target install --parallel 4 + if errorlevel 1 exit 1 cmake -S hdf5-hdf5-1_12_2 -B build_hdf5 ^ -G "Ninja" ^ @@ -191,6 +214,7 @@ jobs: env: # FFTW3 install prefix path FFTW3_DIR: "C:/Program Files (x86)/fftw/" + FFTW3f_DIR: "C:/Program Files (x86)/fftw/" run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\vc\Auxiliary\build\vcvarsall.bat" x64