zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

axom@0.6.1 %oneapi: patch examples (#31991)

Browse Source 
* axom@0.6.1 %oneapi: patch examples

* uncomment axom%oneapi ci build now that it is fixed
This commit is contained in:
eugeneswalker
2022-08-08 12:39:32 -07:00
committed by GitHub
parent 522fda0a48
commit 9215d59599
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
var/spack/repos/builtin/packages/axom/examples-oneapi.patch Normal file
View File

@@ -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)

3
var/spack/repos/builtin/packages/axom/package.py
View File

@@ -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"