From f00f9bbeb9be1715f7366b6e1eadac2cce0a44c3 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 22 Aug 2020 11:57:44 +0100 Subject: [PATCH] Revert "CMake 3.17 compatibility" This reverts commit 49366d0455a78f8be7b1c16569c04d53e6e264a1. --- CMake/Modules/FindFFTW3.cmake | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CMake/Modules/FindFFTW3.cmake b/CMake/Modules/FindFFTW3.cmake index 3bcfd88c3..10349cb69 100644 --- a/CMake/Modules/FindFFTW3.cmake +++ b/CMake/Modules/FindFFTW3.cmake @@ -34,12 +34,6 @@ # # $Id: FindFFTW3.cmake 15918 2010-06-25 11:12:42Z loose $ -# Compatibily with old style MinGW packages with no .dll.a files -# needed since CMake v3.17 because of fix for #20019 -if (MINGW) - set (CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib") -endif () - # Use double precision by default. if (FFTW3_FIND_COMPONENTS MATCHES "^$") set (_components double) @@ -81,7 +75,7 @@ set (_check_list) foreach (_lib ${_libraries}) string (TOUPPER ${_lib} _LIB) find_library (${_LIB}_LIBRARY NAMES ${_lib} ${_lib}-3 - PATH_SUFFIXES lib) + HINTS ${FFTW3_ROOT_DIR} PATH_SUFFIXES lib) mark_as_advanced (${_LIB}_LIBRARY) list (APPEND FFTW3_LIBRARIES ${${_LIB}_LIBRARY}) list (APPEND _check_list ${_LIB}_LIBRARY)