File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff 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
@@ -110,7 +109,6 @@ if (MFC_SILO)
110109 "-DCMAKE_FIND_PACKAGE_REDIRECTS_DIR=${CMAKE_FIND_PACKAGE_REDIRECTS_DIR} "
111110 "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} "
112111 "-DCMAKE_C_FLAGS=${_silo_c_flags} "
113- "$<$<STREQUAL :${CMAKE_Fortran_COMPILER_ID} ,Cray >:-DCMAKE_MODULE_PATH =${CMAKE_SOURCE_DIR} /../cmake /cce >"
114112 )
115113 endif ()
116114endif ()
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments