File tree Expand file tree Collapse file tree 2 files changed +30
-3
lines changed Expand file tree Collapse file tree 2 files changed +30
-3
lines changed Original file line number Diff line number Diff line change @@ -59,14 +59,16 @@ endif()
5959
6060# SILO
6161if (MFC_SILO)
62+ find_package (Git REQUIRED)
63+
6264 # If we are using the CCE, HDF5 is not built, and we wish to find
6365 # the system's cray-hdf5. Otherwise, we point SILO to find HDF5 in
6466 # our common install directory using SILO_HDF5_DIR.
6567 ExternalProject_Add(silo
66- GIT_REPOSITORY "https://github.com/henryleberre/Silo"
67- GIT_TAG af955eb5dd009caf00c41ca51611b37c052b042c
68- GIT_SHALLOW ON
68+ GIT_REPOSITORY "https://github.com/LLNL/Silo"
69+ GIT_TAG 438477c80d32a3e1757d4584b993f382cace1535
6970 GIT_PROGRESS ON
71+ PATCH_COMMAND "${GIT_EXECUTABLE} " stash && "${GIT_EXECUTABLE} " apply "${CMAKE_SOURCE_DIR} /Silo.patch"
7072 CMAKE_ARGS -DSILO_ENABLE_SHARED=OFF
7173 -DSILO_ENABLE_SILOCK=OFF
7274 -DSILO_ENABLE_BROWSER=OFF
Original file line number Diff line number Diff line change 1+ From 7405f0dc998ac104b4b5c0536bbf9b0644d85a11 Mon Sep 17 00:00:00 2001
2+ From: Henry LE BERRE <
[email protected] >
3+ Date: Mon, 1 Apr 2024 17:06:21 -0400
4+ Subject: [PATCH] CMake MFC Fixes
5+
6+ ---
7+ CMakeLists.txt | 4 ++--
8+ 1 file changed, 2 insertions(+), 2 deletions(-)
9+
10+ diff --git a/CMakeLists.txt b/CMakeLists.txt
11+ index 111eb42..9e460f7 100644
12+ --- a/CMakeLists.txt
13+ +++ b/CMakeLists.txt
14+ @@ -68,7 +68,7 @@ project(Silo VERSION ${SILO_VERSION} LANGUAGES CXX C)
15+ ###-----------------------------------------------------------------------------
16+ # location for Silo CMake includes
17+ ###-----------------------------------------------------------------------------
18+ - set(CMAKE_MODULE_PATH ${Silo_SOURCE_DIR}/CMake)
19+ + list(APPEND CMAKE_MODULE_PATH "${Silo_SOURCE_DIR}/CMake")
20+
21+ ###-----------------------------------------------------------------------------
22+ # If not already set, use a default build type of Release
23+ - -
24+ 2.45.1
25+
You can’t perform that action at this time.
0 commit comments