Fix Kokkos CMake so it works..

This commit is contained in:
Tom Deakin 2016-05-12 12:35:47 +01:00
parent 2381f059ed
commit d75084b753
2 changed files with 4 additions and 3 deletions

View File

@ -107,7 +107,7 @@ endif ()
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
if (KOKKOS_PATH) if (KOKKOS_PATH)
if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
add_custom_target(gpu-stream-kokkos COMMAND make -f KokkosMakefile) add_custom_target(gpu-stream-kokkos COMMAND make -f KokkosMakefile KOKKOS_PATH=${KOKKOS_PATH})
else() else()
message("Skipping Kokkos (requires Linux)") message("Skipping Kokkos (requires Linux)")
endif() endif()

View File

@ -4,7 +4,8 @@ default: gpu-stream-kokkos
include $(KOKKOS_PATH)/Makefile.kokkos include $(KOKKOS_PATH)/Makefile.kokkos
gpu-stream-kokkos: main.o KOKKOSStream.o gpu-stream-kokkos: main.o KOKKOSStream.o
$(CXX) $(KOKKOS_LDFLAGS) $^ $(KOKKOS_LIBS) -o $@ -DKOKKOS $(CXX) $(KOKKOS_LDFLAGS) $^ $(KOKKOS_LIBS) -o $@ -DKOKKOS
%.o:%.cpp $(KOKKOS_CPP_DEPENDS) %.o:%.cpp $(KOKKOS_CPP_DEPENDS)
$(NVCC_WRAPPER) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) -c $< -DKOKKOS $(NVCC_WRAPPER) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) -c $< -DKOKKOS