Move SYCL link flags to OMEGA_SYCL_EXE_LINKER_FLAGS

E3SM-Project · Dec 11, 2024 · be5c90c · be5c90c
1 parent a9c2fd8
commit be5c90c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/cime_config/machines/cmake_macros/oneapi-ifxgpu_aurora.cmake b/cime_config/machines/cmake_macros/oneapi-ifxgpu_aurora.cmake
@@ -4,5 +4,5 @@ if (compile_threaded)
   string(APPEND CMAKE_EXE_LINKER_FLAGS " -fiopenmp -fopenmp-targets=spir64")
 endif()
 string(APPEND SYCL_FLAGS " -\-intel -fsycl -fsycl-targets=spir64_gen -mlong-double-64 ")
-string(APPEND CMAKE_EXE_LINKER_FLAGS " -Xsycl-target-backend \"-device 12.60.7\" ")
+string(APPEND OMEGA_SYCL_EXE_LINKER_FLAGS " -Xsycl-target-backend \"-device 12.60.7\" ")
 string(APPEND CMAKE_CXX_FLAGS " -Xclang -fsycl-allow-virtual-functions")
diff --git a/cime_config/machines/cmake_macros/oneapi-ifxgpu_sunspot.cmake b/cime_config/machines/cmake_macros/oneapi-ifxgpu_sunspot.cmake
@@ -4,5 +4,5 @@ if (compile_threaded)
   string(APPEND CMAKE_EXE_LINKER_FLAGS " -fiopenmp -fopenmp-targets=spir64")
 endif()
 string(APPEND SYCL_FLAGS " -\-intel -fsycl -fsycl-targets=spir64_gen -mlong-double-64 ")
-string(APPEND CMAKE_EXE_LINKER_FLAGS " -Xsycl-target-backend \"-device 12.60.7\" ")
+string(APPEND OMEGA_SYCL_EXE_LINKER_FLAGS " -Xsycl-target-backend \"-device 12.60.7\" ")
 string(APPEND CMAKE_CXX_FLAGS " -Xclang -fsycl-allow-virtual-functions")
diff --git a/components/omega/OmegaBuild.cmake b/components/omega/OmegaBuild.cmake
@@ -435,9 +435,13 @@ macro(init_standalone_build)
   elseif("${OMEGA_ARCH}" STREQUAL "SYCL")
     set(CMAKE_CXX_COMPILER ${OMEGA_CXX_COMPILER})
 
+    # add flags from upstream-E3SM
     if(SYCL_FLAGS)
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SYCL_FLAGS}")
     endif()
+    if(OMEGA_SYCL_EXE_LINKER_FLAGS)
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OMEGA_SYCL_EXE_LINKER_FLAGS}")
+    endif()
 
   else()
     set(CMAKE_CXX_COMPILER ${OMEGA_CXX_COMPILER})