Skip to content

Commit 7081882

Browse files
authored
fix: bump Silo to 4.12.1-pre1, drop patch, fix FFTW CMake 4.x compat (#1442)
1 parent 3538585 commit 7081882

3 files changed

Lines changed: 3 additions & 29 deletions

File tree

src/simulation/m_body_forces.fpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#:include 'macros.fpp'
66

7-
!> @brief Computes gravitational and user-defined body force source terms for the momentum equations
7+
!> @brief Computes gravitational and body force source terms for the momentum equations
88
module m_body_forces
99

1010
use m_derived_types

toolchain/dependencies/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ if (MFC_FFTW)
3838
CMAKE_ARGS -DBUILD_TESTS=OFF
3939
-DBUILD_SHARED_LIBS=OFF
4040
"-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}"
41+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
4142
)
4243
else()
4344
message(WARNING "The Fortran compiler vendor is Cray so FFTW3 will not be built. We will use cray-fftw instead.")
@@ -95,11 +96,9 @@ if (MFC_SILO)
9596

9697
ExternalProject_Add(silo
9798
GIT_REPOSITORY "https://github.com/LLNL/Silo"
98-
GIT_TAG 4.12.0
99+
GIT_TAG 4.12.1-pre1
99100
GIT_SHALLOW ON
100101
GIT_PROGRESS ON
101-
PATCH_COMMAND "${GIT_EXECUTABLE}" stash
102-
&& "${GIT_EXECUTABLE}" apply "${CMAKE_SOURCE_DIR}/Silo.patch"
103102
CMAKE_ARGS -DSILO_ENABLE_SHARED=OFF
104103
-DSILO_ENABLE_SILOCK=OFF
105104
-DSILO_ENABLE_BROWSER=OFF

toolchain/dependencies/Silo.patch

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)