diff --git a/CMakeLists.txt b/CMakeLists.txt index c588ae47ab..f08799038c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,10 +99,6 @@ find_program(FYPP_EXE fypp REQUIRED) link_libraries("${CMAKE_DL_LIBS}") set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON) list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/toolchain/cmake/regular") -if (CMAKE_Fortran_COMPILER_ID STREQUAL "Cray") - list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/toolchain/cmake/cce") -endif() - # Compiler Flags: Here, we specify our own compiler flags for both release and # debug builds. These include optimization and debug flags, as well as some that diff --git a/toolchain/cmake/cce/FindHDF5.cmake b/toolchain/cmake/cce/FindHDF5.cmake deleted file mode 100644 index bb251f875f..0000000000 --- a/toolchain/cmake/cce/FindHDF5.cmake +++ /dev/null @@ -1,39 +0,0 @@ -# Attempt to find HDF5 -# URL: https://www.hdfgroup.org/solutions/hdf5/ -# DOCS: https://cmake.org/cmake/help/latest/command/find_library.html -# https://cmake.org/cmake/help/latest/module/FindPackageHandleStandardArgs.html - -include(FindPackageHandleStandardArgs) - - -find_path(HDF5_INCLUDE_DIR - NAMES hdf5.h - PATH_SUFFIXES hdf5 -) - -find_library(HDF5_LIBRARY - NAMES libhdf5 hdf5 - PATH_SUFFIXES hdf5 - NAMES_PER_DIR -) - - -FIND_PACKAGE_HANDLE_STANDARD_ARGS( - HDF5 - REQUIRED_VARS - HDF5_LIBRARY - HDF5_INCLUDE_DIR -) - - -if (HDF5_FOUND AND NOT TARGET HDF5::HDF5) - set(HDF5_LIBRARIES "${HDF5_LIBRARY}") - set(HDF5_INCLUDE_DIRS "${HDF5_INCLUDE_DIR}") - - add_library(HDF5::HDF5 UNKNOWN IMPORTED) - - set_target_properties(HDF5::HDF5 PROPERTIES - IMPORTED_LOCATION "${HDF5_LIBRARIES}" - INTERFACE_INCLUDE_DIRECTORIES "${HDF5_INCLUDE_DIRS}" - ) -endif() diff --git a/toolchain/dependencies/CMakeLists.txt b/toolchain/dependencies/CMakeLists.txt index aae2a3cad5..51403524e1 100644 --- a/toolchain/dependencies/CMakeLists.txt +++ b/toolchain/dependencies/CMakeLists.txt @@ -82,7 +82,7 @@ if (MFC_SILO) ExternalProject_Add(silo GIT_REPOSITORY "https://github.com/LLNL/Silo" - GIT_TAG 9af504ef4fb79153e1fbf3bdb75421b6b65f6dc4 + GIT_TAG main GIT_PROGRESS ON PATCH_COMMAND "${GIT_EXECUTABLE}" stash && "${GIT_EXECUTABLE}" apply "${CMAKE_SOURCE_DIR}/Silo.patch"