Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
arbor
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Analyze
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
arbor-sim
arbor
Commits
938d9da2
Unverified
Commit
938d9da2
authored
3 years ago
by
Thorsten Hater
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Revert to use FindCuda in CMake (#1860)
parent
2df40248
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+9
-6
9 additions, 6 deletions
CMakeLists.txt
with
9 additions
and
6 deletions
CMakeLists.txt
+
9
−
6
View file @
938d9da2
...
...
@@ -120,13 +120,16 @@ if(ARB_GPU STREQUAL "cuda")
set
(
CMAKE_CUDA_HOST_COMPILER
${
CMAKE_CXX_COMPILER
}
)
enable_language
(
CUDA
)
find_package
(
CUDAToolkit
)
if
(
NOT DEFINED CMAKE_CUDA_ARCHITECTURES
)
if
(
CUDAToolkit_VERSION_MAJOR GREATER 10
)
set
(
CMAKE_CUDA_ARCHITECTURES 60 70 80
)
else
()
set
(
CMAKE_CUDA_ARCHITECTURES 60 70
)
endif
()
if
(
CUDAToolkit_VERSION_MAJOR GREATER 10
)
set
(
CMAKE_CUDA_ARCHITECTURES 60 70 80
)
else
()
set
(
CMAKE_CUDA_ARCHITECTURES 60 70
)
endif
()
# We _still_ need this otherwise CUDA symbols will not be exported
# from libarbor.a leading to linker errors when link external clients.
# Unit tests are NOT external enough. Re-review this somewhere in the
# future.
find_package
(
CUDA
${
CUDAToolkit_VERSION_MAJOR
}
REQUIRED
)
elseif
(
ARB_GPU STREQUAL
"cuda-clang"
)
include
(
FindCUDAToolkit
)
set
(
ARB_WITH_CUDA_CLANG TRUE
)
...
...
This diff is collapsed.
Click to expand it.
Preview
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!
Save comment
Cancel
Please
register
or
sign in
to comment