Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
solverstack
ScalFMM
Commits
af80d97b
Commit
af80d97b
authored
Mar 03, 2015
by
Florent Pruvost
Browse files
Merge branch 'master' of
git+ssh://scm.gforge.inria.fr//gitroot/scalfmm/scalfmm
parents
113a7166
593f3dff
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
af80d97b
...
...
@@ -410,6 +410,8 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
if
(
CUDA_LIBRARIES
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
CUDA_LIBRARIES
}
"
)
endif
()
set
(
CUDA_NEEDED_INCLUDE_DIRS
${
CMAKE_BINARY_DIR
}
/Src
)
endif
()
# Find StarPU with a list of optional components
...
...
Src/CMakeLists.txt
View file @
af80d97b
...
...
@@ -32,7 +32,7 @@ if(ScalFMM_USE_CUDA)
ADD_CUSTOM_COMMAND
(
OUTPUT
${
_filehpp_output
}
DEPENDS
${
_file
}
COMMAND echo ARGS Compiling
${
_filewe
}
COMMAND nvcc ARGS -c
${
_file
}
-o
${
_filehpp_output
}
${
CUSTOM_CUDA_FLAGS
}
)
COMMAND nvcc ARGS
-I
${
CUDA_NEEDED_INCLUDE_DIRS
}
-c
${
_file
}
-o
${
_filehpp_output
}
${
CUSTOM_CUDA_FLAGS
}
)
LIST
(
APPEND SCALFMM_CUDA_SOURCES
${
_filehpp_output
}
)
ENDFOREACH
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment