Make OpenACC link options cleaner

ecmwf · Sep 25, 2024 · cb0270c · cb0270c
1 parent 9af40a3
commit cb0270c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/cmake/features/ACC.cmake b/cmake/features/ACC.cmake
@@ -15,6 +15,10 @@ if( atlas_HAVE_ATLAS_FIELD AND HAVE_GPU )
   ecbuild_add_option( FEATURE ACC
                       DESCRIPTION  "OpenACC capable data structures"
                       CONDITION OpenACC_Fortran_FOUND )
+  if( HAVE_ACC )
+    set( ACC_LINK_OPTIONS ${OpenACC_Fortran_FLAGS} )
+  endif()
+
 else()
 
   set( HAVE_ACC 0 )

diff --git a/src/atlas/CMakeLists.txt b/src/atlas/CMakeLists.txt
@@ -1001,12 +1001,12 @@ ecbuild_add_library( TARGET atlas
 
 )
 
-if( HAVE_ACC )
+if( HAVE_ACC AND CMAKE_Fortran_COMPILER_ID MATCHES NVHPC )
   target_link_options( atlas INTERFACE
-      $<$<LINK_LANG_AND_ID:C,NVHPC>:SHELL:-acc=gpu>
-      $<$<LINK_LANG_AND_ID:CXX,NVHPC>:SHELL:-acc=gpu>
-      $<$<LINK_LANG_AND_ID:Fortran,NVHPC>:SHELL:-acc=gpu>
-      $<$<LINK_LANG_AND_ID:CUDA,NVIDIA>:SHELL:-acc=gpu> )
+      $<$<LINK_LANG_AND_ID:C,NVHPC>:SHELL:${ACC_LINK_OPTIONS}>
+      $<$<LINK_LANG_AND_ID:CXX,NVHPC>:SHELL:${ACC_LINK_OPTIONS}>
+      $<$<LINK_LANG_AND_ID:Fortran,NVHPC>:SHELL:${ACC_LINK_OPTIONS}>
+      $<$<LINK_LANG_AND_ID:CUDA,NVIDIA>:SHELL:${ACC_LINK_OPTIONS}> )
 endif()
 
 target_compile_features( atlas PUBLIC cxx_std_17 )
diff --git a/src/atlas_f/CMakeLists.txt b/src/atlas_f/CMakeLists.txt
@@ -277,14 +277,12 @@ ecbuild_add_library( TARGET atlas_f
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
 
-if( HAVE_ACC )
-  if( CMAKE_Fortran_COMPILER_ID MATCHES NVHPC )
-    target_link_options( atlas_f INTERFACE
-        $<$<LINK_LANG_AND_ID:C,NVHPC>:SHELL:-acc=gpu>
-        $<$<LINK_LANG_AND_ID:CXX,NVHPC>:SHELL:-acc=gpu>
-        $<$<LINK_LANG_AND_ID:Fortran,NVHPC>:SHELL:-acc=gpu>
-        $<$<LINK_LANG_AND_ID:CUDA,NVIDIA>:SHELL:-acc=gpu> )
-   endif()
+if( HAVE_ACC AND CMAKE_Fortran_COMPILER_ID MATCHES NVHPC )
+  target_link_options( atlas_f INTERFACE
+      $<$<LINK_LANG_AND_ID:C,NVHPC>:SHELL:${ACC_LINK_OPTIONS}>
+      $<$<LINK_LANG_AND_ID:CXX,NVHPC>:SHELL:${ACC_LINK_OPTIONS}>
+      $<$<LINK_LANG_AND_ID:Fortran,NVHPC>:SHELL:${ACC_LINK_OPTIONS}>
+      $<$<LINK_LANG_AND_ID:CUDA,NVIDIA>:SHELL:${ACC_LINK_OPTIONS}> )
 endif()
 
 fckit_target_preprocess_fypp( atlas_f