Fix HIP source

cmake/CeleritasAddTest.cmake

@@ -317,7 +317,6 @@ function(celeritas_add_test SOURCE_FILE)
     add_executable(${_TARGET} "${SOURCE_FILE}" ${PARSE_SOURCES})
 
     # Note: for static linking the library order is relevant.
-
     celeritas_target_link_libraries(${_TARGET}
       ${CELERITASTEST_LINK_LIBRARIES}
       ${PARSE_LINK_LIBRARIES}
@@ -365,6 +364,17 @@ function(celeritas_add_test SOURCE_FILE)
       list(APPEND _LABELS gpu)
     endif()
   endif()
+  if(PARSE_SOURCES AND CELERITAS_USE_HIP)
+    celeritas_sources_contains_cuda(_cuda_sources ${PARSE_SOURCES})
+    if(_cuda_sources)
+      # When building Celeritas libraries, we put HIP/CUDA files in shared .cu
+      # suffixed files. Override the language if using HIP.
+      set_source_files_properties(
+        ${_cuda_sources}
+        PROPERTIES LANGUAGE HIP
+      )
+    endif()
+  endif()
   if(PARSE_TIMEOUT)
     list(APPEND _COMMON_PROPS TIMEOUT ${PARSE_TIMEOUT})
   endif()

test/CMakeLists.txt

@@ -30,17 +30,6 @@ celeritas_target_include_directories(testcel_harness
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
 
-#-----------------------------------------------------------------------------#
-# HIP SUPPORT
-#-----------------------------------------------------------------------------#
-
-if(CELERITAS_USE_HIP)
-  file(GLOB_RECURSE _cufiles "${CMAKE_CURRENT_SOURCE_DIR}/*.cu")
-  set_source_files_properties(${_cufiles}
-    PROPERTIES LANGUAGE HIP
-  )
-endif()
-
 #-----------------------------------------------------------------------------#
 # TEST OPTIONS
 #-----------------------------------------------------------------------------#