Skip to content

Commit

Permalink
Work around ageing FFTPack (#1206)
Browse files Browse the repository at this point in the history
Fixes #1203, #1170
  • Loading branch information
tammojan committed Jun 30, 2022
1 parent 2835798 commit 7e152c9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
project(casacore)

cmake_minimum_required (VERSION 2.8.10)
cmake_minimum_required (VERSION 3.3.0)
include(CheckCXXCompilerFlag)
include(CheckCCompilerFlag)
include(CheckFunctionExists)
Expand Down
1 change: 1 addition & 0 deletions docker/ubuntu2204_gcc.docker
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ RUN cmake .. \
-DBUILD_PYTHON3=ON \
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} \
-DDATA_DIR=/usr/local/share/casacore/data \
-DBUILD_FFTPACK_DEPRECATED=ON \
&& make -j`nproc`
USER root
RUN make install
Expand Down
8 changes: 8 additions & 0 deletions scimath_f/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ if (BUILD_FFTPACK_DEPRECATED)
dfftpak.f
fftpak.f
)

# FFTPACK is getting so old that it needs deprecated behaviour of the compiler.
# This is why BUILD_FFTPACK_DEPRECATED is also deprecated in casacore.
include(CheckFortranCompilerFlag)
check_fortran_compiler_flag(--allow-argument-mismatch FORTRAN_HAS_ALLOW_ARGUMENT_MISMATCH)
if (FORTRAN_HAS_ALLOW_ARGUMENT_MISMATCH)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} --allow-argument-mismatch")
endif()
endif ()

add_library (casa_scimath_f ${buildfiles})
Expand Down

0 comments on commit 7e152c9

Please sign in to comment.