blob: d7cb7bf2e012acdd198923e7bcfae3b33b2fb7d0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
From 138b9c71b41a3c8782c991053a28bfe074bffdd9 Mon Sep 17 00:00:00 2001
From: Takanori Nakane <nakane.t@gmail.com>
Date: Fri, 28 Oct 2022 19:51:29 +0900
Subject: [PATCH] Repaired the build failure reported in #826 (by
@prehensilecode and @acaprez)
---
src/apps/CMakeLists.txt | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt
index 9870b735..30985aa7 100644
--- a/src/apps/CMakeLists.txt
+++ b/src/apps/CMakeLists.txt
@@ -273,16 +273,16 @@ if (CUDA_FOUND)
- file(GLOB REL_JAZ_CUDA_SRC "${CMAKE_SOURCE_DIR}/src/jaz/cuda/*.cu" "${CMAKE_SOURCE_DIR}/src/jaz/cuda/kernels/*.cu" )
+ file(GLOB REL_JAZ_CUDA_SRC "${CMAKE_SOURCE_DIR}/src/jaz/cuda/*.cu")
cuda_add_library(relion_jaz_gpu_util ${REL_JAZ_CUDA_SRC})
- #list(APPEND EXTRA_LIBS "${CUDA_CUFFT_LIBRARIES}")
- #if(BUILD_SHARED_LIBS)
- # install (TARGETS relion_jaz_gpu_util LIBRARY DESTINATION lib)
- #else()
- # target_link_libraries(relion_jaz_gpu_util relion_lib)
- # target_link_libraries(relion_jaz_gpu_util ${CUDA_CUFFT_LIBRARIES})
- #endif()
+ list(APPEND EXTRA_LIBS "${CUDA_CUFFT_LIBRARIES}")
+ if(BUILD_SHARED_LIBS)
+ install (TARGETS relion_jaz_gpu_util LIBRARY DESTINATION lib)
+ else()
+ target_link_libraries(relion_jaz_gpu_util relion_lib)
+ target_link_libraries(relion_jaz_gpu_util ${CUDA_CUFFT_LIBRARIES})
+ endif()
target_link_libraries(relion_lib relion_jaz_gpu_util ${CUDA_CUFFT_LIBRARIES})
target_link_libraries(relion_lib relion_jaz_gpu_util ${CUDA_CUFFT_LIBRARIES} ${CUDA_curand_LIBRARY})
|
GitWeb
