diff --git a/ports/fftw3/fix-openmp.patch b/ports/fftw3/fix-openmp.patch index 27b874803b8e57..cfb152bc5639c7 100644 --- a/ports/fftw3/fix-openmp.patch +++ b/ports/fftw3/fix-openmp.patch @@ -1,8 +1,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ce438a3..43c74be 100644 +index 18f8460..065838c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -356,7 +356,7 @@ if (OPENMP_FOUND) +@@ -351,12 +351,12 @@ if (Threads_FOUND) + endif () + + if (OPENMP_FOUND) +- add_library (${fftw3_lib}_omp ${fftw_omp_SOURCE}) ++ add_library (${fftw3_lib}_omp ${SOURCEFILES} ${fftw_omp_SOURCE}) + target_include_directories (${fftw3_lib}_omp INTERFACE $) target_link_libraries (${fftw3_lib}_omp ${fftw3_lib}) target_link_libraries (${fftw3_lib}_omp ${CMAKE_THREAD_LIBS_INIT}) list (APPEND subtargets ${fftw3_lib}_omp) diff --git a/ports/fftw3/install-subtargets.patch b/ports/fftw3/install-subtargets.patch index c313d3fef7c667..8c739e37ac5fff 100644 --- a/ports/fftw3/install-subtargets.patch +++ b/ports/fftw3/install-subtargets.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index d1e4dff..ea5d579 100644 +index 065838c..1e4c2b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -361,12 +361,8 @@ endif () diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index fca5eb8b9fe35e..4b32b75047adb1 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -66,4 +66,22 @@ file(WRITE "${SOURCE_PATH}/include/fftw3.h" "${_contents}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if("openmp" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/FFTW3Config.cmake" +"# defined since 2.8.3" +[[# defined since 2.8.3 +include(CMakeFindDependencyMacro) +find_dependency(OpenMP)]]) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}f/FFTW3fConfig.cmake" +"# defined since 2.8.3" +[[# defined since 2.8.3 +include(CMakeFindDependencyMacro) +find_dependency(OpenMP)]]) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}l/FFTW3lConfig.cmake" +"# defined since 2.8.3" +[[# defined since 2.8.3 +include(CMakeFindDependencyMacro) +find_dependency(OpenMP)]]) +endif() + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json index 587f1e85f93380..deb93c90a6d0f0 100644 --- a/ports/fftw3/vcpkg.json +++ b/ports/fftw3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fftw3", "version": "3.3.10", - "port-version": 8, + "port-version": 9, "description": "FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).", "homepage": "https://www.fftw.org/", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index bcc458ac6fdb52..9dd8cbcb31db58 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2610,7 +2610,7 @@ }, "fftw3": { "baseline": "3.3.10", - "port-version": 8 + "port-version": 9 }, "fftwpp": { "baseline": "2019-12-19", diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json index fc997d8e3fdbf5..232e383f96f705 100644 --- a/versions/f-/fftw3.json +++ b/versions/f-/fftw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa91b2e346c356e2e420e8ce98d4dd5bde652b2c", + "version": "3.3.10", + "port-version": 9 + }, { "git-tree": "824a4cda47df1a63c0b13f2a603e7d0fb0dac900", "version": "3.3.10",