From d75084b753521c11c69b264973c729f84cc9999c Mon Sep 17 00:00:00 2001
From: Tom Deakin <tom.deakin@bristol.ac.uk>
Date: Thu, 12 May 2016 12:35:47 +0100
Subject: [PATCH] Fix Kokkos CMake so it works..

---
 CMakeLists.txt | 2 +-
 KokkosMakefile | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b46398..515b594 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,7 +107,7 @@ endif ()
 #-------------------------------------------------------------------------------
 if (KOKKOS_PATH)
   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()
     message("Skipping Kokkos (requires Linux)")
   endif()
diff --git a/KokkosMakefile b/KokkosMakefile
index 6e71e67..83e00b9 100644
--- a/KokkosMakefile
+++ b/KokkosMakefile
@@ -4,7 +4,8 @@ default: gpu-stream-kokkos
 include $(KOKKOS_PATH)/Makefile.kokkos
 
 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)
-        $(NVCC_WRAPPER) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) -c $< -DKOKKOS
+	$(NVCC_WRAPPER) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) -c $< -DKOKKOS
+