# HG changeset patch # User Shinji KONO # Date 1486856182 -32400 # Node ID b387b224790cb21c045b582cb8a95858e439586d # Parent 898fce27f334f154ceaa3b055984de5b08776fc7 merge diff -r 898fce27f334 -r b387b224790c src/test/CMakeLists.txt --- a/src/test/CMakeLists.txt Sat Feb 11 19:12:09 2017 +0900 +++ b/src/test/CMakeLists.txt Sun Feb 12 08:36:22 2017 +0900 @@ -28,7 +28,7 @@ COMMAND nvcc ${NVCCFLAG} -c multiply.cu -ptx ) -add_executable(twiceExample twice.cc multiply.ptx test.c) +add_executable(twiceExample twice.cc multiply.ptx ) add_custom_command(OUTPUT vectorAdd_kernel.ptx DEPENDS vectorAdd_kernel.cu diff -r 898fce27f334 -r b387b224790c src/test/twice.cc --- a/src/test/twice.cc Sat Feb 11 19:12:09 2017 +0900 +++ b/src/test/twice.cc Sun Feb 12 08:36:22 2017 +0900 @@ -151,4 +151,4 @@ return 0; } -// +