update

MFlowCode · Sep 11, 2024 · 36cbcf0 · 36cbcf0
1 parent 440cecb
commit 36cbcf0
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 39 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -89,7 +89,10 @@ 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")
+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

diff --git a/toolchain/cmake/FindcuTENSOR.cmake b/toolchain/cmake/FindcuTENSOR.cmake
diff --git a/toolchain/cmake/FindHDF5.cmake → toolchain/cmake/cce/FindHDF5.cmake b/toolchain/cmake/FindHDF5.cmake → toolchain/cmake/cce/FindHDF5.cmake
diff --git a/toolchain/cmake/FindFFTW.cmake → toolchain/cmake/regular/FindFFTW.cmake b/toolchain/cmake/FindFFTW.cmake → toolchain/cmake/regular/FindFFTW.cmake
diff --git a/toolchain/cmake/FindSILO.cmake → toolchain/cmake/regular/FindSILO.cmake b/toolchain/cmake/FindSILO.cmake → toolchain/cmake/regular/FindSILO.cmake
diff --git a/toolchain/dependencies/CMakeLists.txt b/toolchain/dependencies/CMakeLists.txt
@@ -5,7 +5,10 @@ cmake_minimum_required(VERSION 3.12)
 
 project(MFC-Dependencies LANGUAGES C CXX Fortran)
 
-list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
+list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/regular")
+if (CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")
+    list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/cce")
+endif()
 
 set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)