diff options
| author | eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> | 2022-08-08 12:39:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-08 19:39:32 +0000 |
| commit | 9215d59599ebb38b6d86a8d3f4406ffdc2397d18 (patch) | |
| tree | 1f221c4bdca74fc98e65085690df72ff49179868 /var | |
| parent | 522fda0a48ce3c5fe9679d84be2b7e4a1e295ff8 (diff) | |
| download | spack-9215d59599ebb38b6d86a8d3f4406ffdc2397d18.tar.gz spack-9215d59599ebb38b6d86a8d3f4406ffdc2397d18.tar.bz2 spack-9215d59599ebb38b6d86a8d3f4406ffdc2397d18.tar.xz spack-9215d59599ebb38b6d86a8d3f4406ffdc2397d18.zip | |
axom@0.6.1 %oneapi: patch examples (#31991)
* axom@0.6.1 %oneapi: patch examples
* uncomment axom%oneapi ci build now that it is fixed
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/axom/examples-oneapi.patch | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/axom/package.py | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/axom/examples-oneapi.patch b/var/spack/repos/builtin/packages/axom/examples-oneapi.patch new file mode 100644 index 0000000000..6990ececcf --- /dev/null +++ b/var/spack/repos/builtin/packages/axom/examples-oneapi.patch @@ -0,0 +1,12 @@ +diff -ruN spack-src/src/axom/quest/examples/CMakeLists.txt spack-src-patched/src/axom/quest/examples/CMakeLists.txt +--- spack-src/src/axom/quest/examples/CMakeLists.txt 2022-08-08 08:51:26.746637415 -0700 ++++ spack-src-patched/src/axom/quest/examples/CMakeLists.txt 2022-08-08 08:52:26.238959054 -0700 +@@ -103,7 +103,7 @@ + # When CUDA is enabled, BLT will determine the correct linker, so don't override it here + if (NOT ENABLE_CUDA) + # When using the Intel compiler we need to link with the Fortran compiler to get openmp to work correctly. +- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") ++ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "IntelLLVM") + set_target_properties( quest_signed_distance_interface_F_ex + PROPERTIES LINKER_LANGUAGE Fortran) + diff --git a/var/spack/repos/builtin/packages/axom/package.py b/var/spack/repos/builtin/packages/axom/package.py index a916ade88c..a63118e2c7 100644 --- a/var/spack/repos/builtin/packages/axom/package.py +++ b/var/spack/repos/builtin/packages/axom/package.py @@ -54,6 +54,9 @@ class Axom(CachedCMakePackage, CudaPackage): def submodules(self): return True + # https://github.com/spack/spack/issues/31829 + patch("examples-oneapi.patch", when="@0.6.1 +examples %oneapi") + patch("scr_examples_gtest.patch", when="@0.6.0:0.6.1") root_cmakelists_dir = "src" |