merge

src/CMakeLists.txt

@@ -202,13 +202,19 @@ ENDIF()
 IF ( USE_CUDA )
     SET( SOURCES ${SOURCES} RayTraceImageCuda.cu )
 ENDIF()
-HIP_ADD_LIBRARY( RayTrace SHARED ${SOURCES} ${CUBINS} )
+IF (USE_HIP )
+    HIP_ADD_LIBRARY( RayTrace SHARED ${SOURCES} ${CUBINS} )
+ELSE()
+ADD_LIBRARY( RayTrace SHARED ${SOURCES} ${CUBINS} )
+ENDIF()
+SET( LINK_TARGETS RayTrace )
 IF ( USE_HIP )
     SET( HIP_SEPERABLE_COMPILATION ON )
     SET_SOURCE_FILES_PROPERTIES( RayTraceImageHIP.cu PROPERTIES HIP_SOURCE_PROPERTY_FORMAT 1 )
     HIP_ADD_LIBRARY( RayTraceHIP RayTraceImageHIP.cu SHARED HIPCC_OPTIONS ${HIP_HIPCC_OPTIONS} HCC_OPTIONS ${HIP_HCC_OPTIONS} NVCC_OPTIONS ${HIP_NVCC_OPTIONS} ${HIP_NVCC_FLAGS} )
     #TARGET_LINK_LIBRARIES( RayTraceHIP /opt/rocm-3.3.0/lib/libhip_hcc.so )
     TARGET_LINK_LIBRARIES( RayTrace RayTraceHIP )
+    SET( LINK_TARGETS RayTrace RayTraceHIP )
     ADD_DEPENDENCIES( RayTraceHIP copy-include )
 ENDIF()
 
@@ -216,8 +222,10 @@ ENDIF()
 # Add the applications
 IF ( USE_HIP )
     HIP_ADD_EXECUTABLE( CreateImage CreateImage.cpp )
+ELSE()
+    ADD_EXECUTABLE( CreateImage CreateImage.cpp )
 ENDIF()
-TARGET_LINK_LIBRARIES( CreateImage RayTrace RayTraceHIP  ${KOKKOS_LIB} ${TIMER_LIBS} ${LDFLAGS} ${LDLIBS} ${CUDA_LIBRARIES} )
+TARGET_LINK_LIBRARIES( CreateImage ${LINK_TARGETS}  ${KOKKOS_LIB} ${TIMER_LIBS} ${LDFLAGS} ${LDLIBS} ${CUDA_LIBRARIES} )
 INSTALL( TARGETS CreateImage DESTINATION ${RAYTRACE_INSTALL_DIR}/bin )