Skip to content

Commit

Permalink
Avoid using cache in spack install...
Browse files Browse the repository at this point in the history
  • Loading branch information
Rutherford, Cameron committed Jun 20, 2024
1 parent c1b16d2 commit 9640c62
Show file tree
Hide file tree
Showing 96 changed files with 1,316 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/spack_cpu_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ jobs:
run: spack -e . concretize

- name: Install
run: spack -e . install --keep-stage --no-check-signature
run: spack -e . install --keep-stage --no-check-signature --no-cache

- name: Test Installation
run: cd $(spack -e . location --build-dir resolve@develop) && ctest -VV
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From ef513fe3d1d864d865d7143699834228988a7cd7 Mon Sep 17 00:00:00 2001
From: Brad King <[email protected]>
Date: Fri, 5 Mar 2021 08:08:16 -0500
Subject: [PATCH] Cray: Enable explicit Fortran preprocessing for Ninja
generator

Cray 11.0 adds support for preprocessing with output written to a
specified file (instead of always next to the source). Use it to
enable Cray Fortran with the Ninja generator.

Patch-by: James Elliott
Fixes: #20731
---
Modules/Compiler/Cray-Fortran.cmake | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/Modules/Compiler/Cray-Fortran.cmake b/Modules/Compiler/Cray-Fortran.cmake
index 696ae76074..0d5e1c7679 100644
--- a/Modules/Compiler/Cray-Fortran.cmake
+++ b/Modules/Compiler/Cray-Fortran.cmake
@@ -19,3 +19,7 @@ else()
set(CMAKE_Fortran_COMPILE_OPTIONS_PREPROCESS_ON "-eZ")
set(CMAKE_Fortran_COMPILE_OPTIONS_PREPROCESS_OFF "-dZ")
endif()
+
+if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 11.0)
+ set(CMAKE_Fortran_PREPROCESS_SOURCE "<CMAKE_Fortran_COMPILER> -o <PREPROCESSED_SOURCE> <DEFINES> <INCLUDES> <FLAGS> -eP <SOURCE>")
+endif()
--
GitLab

Loading

0 comments on commit 9640c62

Please sign in to comment.