cory-master/BabelStream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Break RAJA build but fix all the others..

Browse Source
This commit is contained in:
Tom Deakin 2016-05-12 16:37:06 +01:00
parent 2001ab5fb1
commit 2033f3f0c6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -99,6 +99,7 @@ endif ()
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# RAJA # RAJA
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
if (RAJA_PATH) if (RAJA_PATH)
find_package(OpenMP) find_package(OpenMP)
find_package(CUDA 7.5) 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 -Xcompiler ${OpenMP_CXX_FLAGS})
list(APPEND CUDA_NVCC_FLAGS -DUSE_RAJA) list(APPEND CUDA_NVCC_FLAGS -DUSE_RAJA)
cuda_include_directories(${RAJA_PATH}/include) 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) 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") target_link_libraries(gpu-stream-raja "-L${RAJA_PATH}/lib -lRAJA")
else() else()
message("Skipping RAJA... (use -DRAJA_PATH=/path/to/raja to opt in)") message("Skipping RAJA... (use -DRAJA_PATH=/path/to/raja to opt in)")