From b2682208222bbd5dd941bdb042d8968411418bc7 Mon Sep 17 00:00:00 2001 From: Chris Zhang Date: Thu, 27 Mar 2025 22:21:48 -0700 Subject: [PATCH 1/4] test --- src/pre_process/include/1dHardcodedIC.fpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pre_process/include/1dHardcodedIC.fpp b/src/pre_process/include/1dHardcodedIC.fpp index 01e9a4d565..23ca70896e 100644 --- a/src/pre_process/include/1dHardcodedIC.fpp +++ b/src/pre_process/include/1dHardcodedIC.fpp @@ -1,5 +1,6 @@ #:def Hardcoded1DVariables() ! Place any declaration of intermediate variables here + ! Test #:enddef From f6004b32dd854f52b64bb99b9ff748a1237b187b Mon Sep 17 00:00:00 2001 From: Chris Zhang Date: Wed, 2 Apr 2025 19:28:02 -0700 Subject: [PATCH 2/4] fix FFTW --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5835bd24e..33c9a30e35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,8 @@ cmake_minimum_required(VERSION 3.20) +# Set minimum policy version to 3.5 to fix FFTW compilation with CMake 4.0+ +set(CMAKE_POLICY_VERSION_MINIMUM "3.5" CACHE STRING "Minimum CMake policy version") # We include C as a language because - for some reason - # FIND_LIBRARY_USE_LIB64_PATHS is otherwise ignored. From 35e4c525281237c61347ca4423b0f352255f1264 Mon Sep 17 00:00:00 2001 From: Chris Zhang Date: Wed, 2 Apr 2025 19:34:30 -0700 Subject: [PATCH 3/4] fix FFTW 2 --- toolchain/dependencies/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain/dependencies/CMakeLists.txt b/toolchain/dependencies/CMakeLists.txt index 116e288711..610be1f858 100644 --- a/toolchain/dependencies/CMakeLists.txt +++ b/toolchain/dependencies/CMakeLists.txt @@ -36,6 +36,7 @@ if (MFC_FFTW) URL "http://www.fftw.org/fftw-3.3.10.tar.gz" CMAKE_ARGS -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" ) else() From 05d0abc783509bcea070bba936a3c6d1dddc0969 Mon Sep 17 00:00:00 2001 From: Chris Zhang Date: Wed, 2 Apr 2025 20:13:39 -0700 Subject: [PATCH 4/4] clean --- src/pre_process/include/1dHardcodedIC.fpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pre_process/include/1dHardcodedIC.fpp b/src/pre_process/include/1dHardcodedIC.fpp index 23ca70896e..01e9a4d565 100644 --- a/src/pre_process/include/1dHardcodedIC.fpp +++ b/src/pre_process/include/1dHardcodedIC.fpp @@ -1,6 +1,5 @@ #:def Hardcoded1DVariables() ! Place any declaration of intermediate variables here - ! Test #:enddef