Skip to content

Commit bab9d21

Browse files
committed
updating the Ubuntu build
1 parent e1a58de commit bab9d21

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

.github/workflows/cleanliness.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Setup Ubuntu
4242
run: |
4343
sudo apt update -y
44-
sudo apt install -y tar wget make cmake gcc g++ python3 python3-dev "openmpi-*" libopenmpi-dev
44+
sudo apt install -y tar wget make cmake gcc g++ python3 python3-dev "openmpi-*" libopenmpi-dev libfftw3-dev
4545
4646
- name: Check CMake Version
4747
run: cmake --version

toolchain/dependencies/CMakeLists.txt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,26 @@ option(MFC_HIPFORT "Build the HIPFORT dependency" OFF)
2525

2626

2727
# FFTW3
28-
if (MFC_FFTW)
29-
find_package(FFTW QUIET)
30-
if (FFTW_FOUND)
31-
message(STATUS "FFTW found.")
32-
add_custom_target(fftw)
33-
else()
34-
if (NOT CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")
35-
ExternalProject_Add(fftw
36-
URL "http://www.fftw.org/fftw-3.3.10.tar.gz"
37-
CMAKE_ARGS -DBUILD_TESTS=OFF
38-
-DBUILD_SHARED_LIBS=OFF
39-
"-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}"
40-
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
41-
)
42-
else()
43-
message(WARNING "The Fortran compiler vendor is Cray so FFTW3 will not be built. We will use cray-fftw instead.")
44-
add_custom_target(fftw)
45-
endif()
46-
endif()
47-
endif()
28+
#if (MFC_FFTW)
29+
# find_package(FFTW QUIET)
30+
# if (FFTW_FOUND)
31+
# message(STATUS "FFTW found.")
32+
# add_custom_target(fftw)
33+
# else()
34+
# if (NOT CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")
35+
# ExternalProject_Add(fftw
36+
# URL "http://www.fftw.org/fftw-3.3.10.tar.gz"
37+
# CMAKE_ARGS -DBUILD_TESTS=OFF
38+
# -DBUILD_SHARED_LIBS=OFF
39+
# "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}"
40+
# -DCMAKE_POLICY_VERSION_MINIMUM=3.5
41+
# )
42+
# else()
43+
# message(WARNING "The Fortran compiler vendor is Cray so FFTW3 will not be built. We will use cray-fftw instead.")
44+
# add_custom_target(fftw)
45+
# endif()
46+
# endif()
47+
#endif()
4848

4949

5050
# HDF5

0 commit comments

Comments
 (0)