Propagate acc link flags via target_link_options

awnawab · awnawab · commit 431a0ed64c5a · 2024-10-01T10:04:19.000Z
diff --git a/src/ecwam/CMakeLists.txt b/src/ecwam/CMakeLists.txt
@@ -454,7 +454,8 @@ ecwam_target_fortran_module_directory(
     INSTALL_DIRECTORY module/${ecwam}
 )
 
-if( HAVE_ACC )
+if( HAVE_ACC AND CMAKE_Fortran_COMPILER_ID MATCHES "PGI|NVHPC")
+   target_link_options( ${ecwam} INTERFACE SHELL:${OpenACC_Fortran_FLAGS} )
    target_compile_options( ${ecwam} PRIVATE "-gpu=maxregcount:128" )
 endif()
 
diff --git a/src/programs/CMakeLists.txt b/src/programs/CMakeLists.txt
@@ -17,7 +17,7 @@ foreach( program
     ecbuild_add_executable(
         TARGET          ${PROJECT_NAME}-${program}
         SOURCES         ${program}.F90
-        LIBS            ${PROJECT_NAME} ${OpenMP_Fortran_LIBRARIES} $<${HAVE_ACC}:OpenACC::OpenACC_Fortran>
+        LIBS            ${PROJECT_NAME} ${OpenMP_Fortran_LIBRARIES}
         LINKER_LANGUAGE Fortran
     )
     ecwam_target_compile_definitions_FILENAME(${PROJECT_NAME}-${program})

Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,8 @@ ecwam_target_fortran_module_directory(`
`454`	`454`	`INSTALL_DIRECTORY module/${ecwam}`
`455`	`455`	`)`
`456`	`456`
`457`		`-if( HAVE_ACC )`
	`457`	`+if( HAVE_ACC AND CMAKE_Fortran_COMPILER_ID MATCHES "PGI\|NVHPC")`
	`458`	`+ target_link_options( ${ecwam} INTERFACE SHELL:${OpenACC_Fortran_FLAGS} )`
`458`	`459`	`target_compile_options( ${ecwam} PRIVATE "-gpu=maxregcount:128" )`
`459`	`460`	`endif()`
`460`	`461`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ foreach( program`
`17`	`17`	`ecbuild_add_executable(`
`18`	`18`	`TARGET ${PROJECT_NAME}-${program}`
`19`	`19`	`SOURCES ${program}.F90`
`20`		`- LIBS ${PROJECT_NAME} ${OpenMP_Fortran_LIBRARIES} $<${HAVE_ACC}:OpenACC::OpenACC_Fortran>`
	`20`	`+ LIBS ${PROJECT_NAME} ${OpenMP_Fortran_LIBRARIES}`
`21`	`21`	`LINKER_LANGUAGE Fortran`
`22`	`22`	`)`
`23`	`23`	`ecwam_target_compile_definitions_FILENAME(${PROJECT_NAME}-${program})`