From 2033f3f0c6012fe1445935374ba67a67e2092c7c Mon Sep 17 00:00:00 2001 From: Tom Deakin Date: Thu, 12 May 2016 16:37:06 +0100 Subject: [PATCH] Break RAJA build but fix all the others.. --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b2d28d..acaa2a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,6 +99,7 @@ endif () #------------------------------------------------------------------------------- # RAJA #------------------------------------------------------------------------------- + if (RAJA_PATH) find_package(OpenMP) find_package(CUDA 7.5) @@ -107,8 +108,9 @@ if (RAJA_PATH) list(APPEND CUDA_NVCC_FLAGS -Xcompiler ${OpenMP_CXX_FLAGS}) list(APPEND CUDA_NVCC_FLAGS -DUSE_RAJA) cuda_include_directories(${RAJA_PATH}/include) - set_source_files_properties(main.cpp RAJAStream.cpp PROPERTIES CUDA_SOURCE_PROPERTY_FORMAT OBJ) + set_source_files_properties(RAJAStream.cpp PROPERTIES CUDA_SOURCE_PROPERTY_FORMAT OBJ) cuda_add_executable(gpu-stream-raja main.cpp RAJAStream.cpp) + target_compile_definitions(gpu-stream-raja PUBLIC USE_RAJA) target_link_libraries(gpu-stream-raja "-L${RAJA_PATH}/lib -lRAJA") else() message("Skipping RAJA... (use -DRAJA_PATH=/path/to/raja to opt in)")