Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fftw3] fix bigobj compiler option #25972

Merged
merged 2 commits into from
Jul 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/fftw3/bigobj.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64db20b6a..ce438a379 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -315,7 +315,7 @@ endif ()
add_library (${fftw3_lib} ${SOURCEFILES})
target_include_directories (${fftw3_lib} INTERFACE $<INSTALL_INTERFACE:include>)
if (MSVC AND NOT (CMAKE_C_COMPILER_ID STREQUAL "Intel"))
- target_compile_definitions (${fftw3_lib} PRIVATE /bigobj)
+ target_compile_options (${fftw3_lib} PRIVATE "/bigobj")
endif ()
if (HAVE_SSE)
target_compile_options (${fftw3_lib} PRIVATE ${SSE_FLAG})
1 change: 1 addition & 0 deletions ports/fftw3/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ vcpkg_extract_source_archive_ex(
patch_targets.patch
fftw3_arch_fix.patch
aligned_malloc.patch
bigobj.patch
)

vcpkg_check_features(
Expand Down
2 changes: 1 addition & 1 deletion ports/fftw3/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fftw3",
"version": "3.3.10",
"port-version": 3,
"port-version": 4,
"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/",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2254,7 +2254,7 @@
},
"fftw3": {
"baseline": "3.3.10",
"port-version": 3
"port-version": 4
},
"fftwpp": {
"baseline": "2019-12-19",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/fftw3.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1ab09732ff55a9c0ff0fadd66623f38773338649",
"version": "3.3.10",
"port-version": 4
},
{
"git-tree": "2bd307eb2dafcd4938d16fc484fbbb731228f4c3",
"version": "3.3.10",
Expand Down