]>
Commit | Line | Data |
---|---|---|
1e59de90 TL |
1 | diff --git a/Modules/Core/GPUCommon/CMakeLists.txt b/Modules/Core/GPUCommon/CMakeLists.txt |
2 | index da2d66b63..6fb476680 100644 | |
3 | --- a/Modules/Core/GPUCommon/CMakeLists.txt | |
4 | +++ b/Modules/Core/GPUCommon/CMakeLists.txt | |
5 | @@ -24,9 +24,13 @@ if(ITK_USE_GPU AND APPLE AND NOT ITK_COMPILER_HAS_BLOCKS) | |
6 | endif() | |
7 | ||
8 | if(ITK_USE_GPU) | |
9 | + message(STATUS "OPENCL_LIBRARIES:${OPENCL_LIBRARIES}") | |
10 | + if(TARGET OpenCL::OpenCL) | |
11 | + message(STATUS "OPENCL_LIBRARIES:${OpenCL_LIBRARIES}") | |
12 | + endif() | |
13 | set(ITKGPUCommon_LIBRARIES ITKGPUCommon) | |
14 | - set(ITKGPUCommon_SYSTEM_INCLUDE_DIRS ${OPENCL_INCLUDE_DIRS}) | |
15 | - set(ITKGPUCommon_SYSTEM_LIBRARY_DIRS ${OPENCL_LIBRARIES}) | |
16 | + set(ITKGPUCommon_SYSTEM_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS}) | |
17 | + set(ITKGPUCommon_SYSTEM_LIBRARY_DIRS ${OpenCL_LIBRARIES}) | |
18 | endif() | |
19 | ||
20 | if(NOT ITK_SOURCE_DIR) | |
21 | diff --git a/Modules/Core/GPUCommon/src/CMakeLists.txt b/Modules/Core/GPUCommon/src/CMakeLists.txt | |
22 | index 0b39f2a9a..160f7a752 100644 | |
23 | --- a/Modules/Core/GPUCommon/src/CMakeLists.txt | |
24 | +++ b/Modules/Core/GPUCommon/src/CMakeLists.txt | |
25 | @@ -14,5 +14,5 @@ if (ITK_USE_GPU) | |
26 | write_gpu_kernels("${ITKGPUCommon_Kernels}" ITKGPUCommon_SRCS) | |
27 | ||
28 | itk_module_add_library(ITKGPUCommon ${ITKGPUCommon_SRCS}) | |
29 | - target_link_libraries(ITKGPUCommon LINK_PUBLIC ${OPENCL_LIBRARIES}) | |
30 | + target_link_libraries(ITKGPUCommon LINK_PUBLIC ${OpenCL_LIBRARIES}) | |
31 | endif() | |
32 | diff --git a/Modules/Core/GPUFiniteDifference/CMakeLists.txt b/Modules/Core/GPUFiniteDifference/CMakeLists.txt | |
33 | index c1bfde450..a642d9230 100644 | |
34 | --- a/Modules/Core/GPUFiniteDifference/CMakeLists.txt | |
35 | +++ b/Modules/Core/GPUFiniteDifference/CMakeLists.txt | |
36 | @@ -9,8 +9,8 @@ if(NOT ITK_SOURCE_DIR) | |
37 | endif() | |
38 | ||
39 | if (ITK_USE_GPU) | |
40 | - set(ITKGPUFiniteDifference_SYSTEM_INCLUDE_DIRS ${OPENCL_INCLUDE_DIRS}) | |
41 | - set(ITKGPUFiniteDifference_SYSTEM_LIBRARY_DIRS ${OPENCL_LIBRARIES}) | |
42 | + set(ITKGPUFiniteDifference_SYSTEM_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS}) | |
43 | + set(ITKGPUFiniteDifference_SYSTEM_LIBRARY_DIRS ${OpenCL_LIBRARIES}) | |
44 | set(ITKGPUFiniteDifference_LIBRARIES ITKGPUFiniteDifference) | |
45 | endif() | |
46 | ||
47 | diff --git a/Modules/Core/GPUFiniteDifference/src/CMakeLists.txt b/Modules/Core/GPUFiniteDifference/src/CMakeLists.txt | |
48 | index 8425cc025..8335c69a0 100644 | |
49 | --- a/Modules/Core/GPUFiniteDifference/src/CMakeLists.txt | |
50 | +++ b/Modules/Core/GPUFiniteDifference/src/CMakeLists.txt | |
51 | @@ -9,5 +9,5 @@ if (ITK_USE_GPU) | |
52 | write_gpu_kernels("${ITKGPUFiniteDifference_Kernels}" ITKGPUFiniteDifference_SRCS) | |
53 | ||
54 | itk_module_add_library(ITKGPUFiniteDifference ${ITKGPUFiniteDifference_SRCS}) | |
55 | - target_link_libraries(ITKGPUFiniteDifference LINK_PUBLIC ${OPENCL_LIBRARIES}) | |
56 | + target_link_libraries(ITKGPUFiniteDifference LINK_PUBLIC ${OpenCL_LIBRARIES}) | |
57 | endif() | |
58 | diff --git a/Modules/Filtering/GPUAnisotropicSmoothing/CMakeLists.txt b/Modules/Filtering/GPUAnisotropicSmoothing/CMakeLists.txt | |
59 | index f36fd887d..310d983fa 100644 | |
60 | --- a/Modules/Filtering/GPUAnisotropicSmoothing/CMakeLists.txt | |
61 | +++ b/Modules/Filtering/GPUAnisotropicSmoothing/CMakeLists.txt | |
62 | @@ -10,8 +10,8 @@ endif() | |
63 | ||
64 | if (ITK_USE_GPU) | |
65 | set(ITKGPUAnisotropicSmoothing_LIBRARIES ITKGPUAnisotropicSmoothing) | |
66 | - set(ITKGPUAnisotropicSmoothing_SYSTEM_INCLUDE_DIRS ${OPENCL_INCLUDE_DIRS}) | |
67 | - set(ITKGPUAnisotropicSmoothing_SYSTEM_LIBRARY_DIRS ${OPENCL_LIBRARIES}) | |
68 | + set(ITKGPUAnisotropicSmoothing_SYSTEM_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS}) | |
69 | + set(ITKGPUAnisotropicSmoothing_SYSTEM_LIBRARY_DIRS ${OpenCL_LIBRARIES}) | |
70 | endif() | |
71 | ||
72 | if(NOT ITK_SOURCE_DIR) | |
73 | diff --git a/Modules/Filtering/GPUImageFilterBase/CMakeLists.txt b/Modules/Filtering/GPUImageFilterBase/CMakeLists.txt | |
74 | index 078905521..67fd7b832 100644 | |
75 | --- a/Modules/Filtering/GPUImageFilterBase/CMakeLists.txt | |
76 | +++ b/Modules/Filtering/GPUImageFilterBase/CMakeLists.txt | |
77 | @@ -10,8 +10,8 @@ endif() | |
78 | ||
79 | if (ITK_USE_GPU) | |
80 | set(ITKGPUImageFilterBase_LIBRARIES ITKGPUImageFilterBase) | |
81 | - set(ITKGPUImageFilterBase_SYSTEM_INCLUDE_DIRS ${OPENCL_INCLUDE_DIRS}) | |
82 | - set(ITKGPUImageFilterBase_SYSTEM_LIBRARY_DIRS ${OPENCL_LIBRARIES}) | |
83 | + set(ITKGPUImageFilterBase_SYSTEM_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS}) | |
84 | + set(ITKGPUImageFilterBase_SYSTEM_LIBRARY_DIRS ${OpenCL_LIBRARIES}) | |
85 | endif() | |
86 | ||
87 | if(NOT ITK_SOURCE_DIR) | |
88 | diff --git a/Modules/Filtering/GPUImageFilterBase/src/CMakeLists.txt b/Modules/Filtering/GPUImageFilterBase/src/CMakeLists.txt | |
89 | index 251493f5e..6d33fa964 100644 | |
90 | --- a/Modules/Filtering/GPUImageFilterBase/src/CMakeLists.txt | |
91 | +++ b/Modules/Filtering/GPUImageFilterBase/src/CMakeLists.txt | |
92 | @@ -10,5 +10,5 @@ if (ITK_USE_GPU) | |
93 | write_gpu_kernels("${ITKGPUImageFilterBase_Kernels}" ITKGPUImageFilterBase_SRCS) | |
94 | ||
95 | itk_module_add_library(ITKGPUImageFilterBase ${ITKGPUImageFilterBase_SRCS}) | |
96 | - target_link_libraries(ITKGPUImageFilterBase LINK_PUBLIC ${OPENCL_LIBRARIES}) | |
97 | + target_link_libraries(ITKGPUImageFilterBase LINK_PUBLIC ${OpenCL_LIBRARIES}) | |
98 | endif() | |
99 | diff --git a/Modules/Filtering/GPUSmoothing/CMakeLists.txt b/Modules/Filtering/GPUSmoothing/CMakeLists.txt | |
100 | index 9bac40921..2ed493d40 100644 | |
101 | --- a/Modules/Filtering/GPUSmoothing/CMakeLists.txt | |
102 | +++ b/Modules/Filtering/GPUSmoothing/CMakeLists.txt | |
103 | @@ -10,8 +10,8 @@ endif() | |
104 | ||
105 | if (ITK_USE_GPU) | |
106 | set(ITKGPUSmoothing_LIBRARIES ITKGPUSmoothing) | |
107 | - set(ITKGPUSmoothing_SYSTEM_INCLUDE_DIRS ${OPENCL_INCLUDE_DIRS}) | |
108 | - set(ITKGPUSmoothing_SYSTEM_LIBRARY_DIRS ${OPENCL_LIBRARIES}) | |
109 | + set(ITKGPUSmoothing_SYSTEM_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS}) | |
110 | + set(ITKGPUSmoothing_SYSTEM_LIBRARY_DIRS ${OpenCL_LIBRARIES}) | |
111 | endif() | |
112 | ||
113 | if(NOT ITK_SOURCE_DIR) | |
114 | diff --git a/Modules/Filtering/GPUSmoothing/src/CMakeLists.txt b/Modules/Filtering/GPUSmoothing/src/CMakeLists.txt | |
115 | index d2120e842..2c6ca4a4a 100644 | |
116 | --- a/Modules/Filtering/GPUSmoothing/src/CMakeLists.txt | |
117 | +++ b/Modules/Filtering/GPUSmoothing/src/CMakeLists.txt | |
118 | @@ -9,5 +9,5 @@ if (ITK_USE_GPU) | |
119 | write_gpu_kernels("${ITKGPUSmoothing_Kernels}" ITKGPUSmoothing_SRCS) | |
120 | ||
121 | itk_module_add_library(ITKGPUSmoothing ${ITKGPUSmoothing_SRCS}) | |
122 | - target_link_libraries(ITKGPUSmoothing LINK_PUBLIC ${OPENCL_LIBRARIES}) | |
123 | + target_link_libraries(ITKGPUSmoothing LINK_PUBLIC ${OpenCL_LIBRARIES}) | |
124 | endif() | |
125 | diff --git a/Modules/Filtering/GPUThresholding/CMakeLists.txt b/Modules/Filtering/GPUThresholding/CMakeLists.txt | |
126 | index 4390785f5..61786b7a8 100644 | |
127 | --- a/Modules/Filtering/GPUThresholding/CMakeLists.txt | |
128 | +++ b/Modules/Filtering/GPUThresholding/CMakeLists.txt | |
129 | @@ -2,8 +2,8 @@ project(ITKGPUThresholding) | |
130 | ||
131 | if (ITK_USE_GPU) | |
132 | set(ITKGPUThresholding_LIBRARIES ITKGPUThresholding) | |
133 | - set(ITKGPUThresholding_SYSTEM_INCLUDE_DIRS ${OPENCL_INCLUDE_DIRS}) | |
134 | - set(ITKGPUThresholding_SYSTEM_LIBRARY_DIRS ${OPENCL_LIBRARIES}) | |
135 | + set(ITKGPUThresholding_SYSTEM_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS}) | |
136 | + set(ITKGPUThresholding_SYSTEM_LIBRARY_DIRS ${OpenCL_LIBRARIES}) | |
137 | endif() | |
138 | ||
139 | itk_module_impl() | |
140 | diff --git a/Modules/Filtering/GPUThresholding/src/CMakeLists.txt b/Modules/Filtering/GPUThresholding/src/CMakeLists.txt | |
141 | index 326c86859..c07c80414 100644 | |
142 | --- a/Modules/Filtering/GPUThresholding/src/CMakeLists.txt | |
143 | +++ b/Modules/Filtering/GPUThresholding/src/CMakeLists.txt | |
144 | @@ -9,5 +9,5 @@ if (ITK_USE_GPU) | |
145 | write_gpu_kernels("${ITKGPUThresholding_Kernels}" ITKGPUThresholding_SRCS) | |
146 | ||
147 | itk_module_add_library(ITKGPUThresholding ${ITKGPUThresholding_SRCS}) | |
148 | - target_link_libraries(ITKGPUThresholding LINK_PUBLIC ${OPENCL_LIBRARIES}) | |
149 | + target_link_libraries(ITKGPUThresholding LINK_PUBLIC ${OpenCL_LIBRARIES}) | |
150 | endif() | |
151 | diff --git a/Modules/Registration/GPUPDEDeformable/CMakeLists.txt b/Modules/Registration/GPUPDEDeformable/CMakeLists.txt | |
152 | index c8d70a423..097c974c5 100644 | |
153 | --- a/Modules/Registration/GPUPDEDeformable/CMakeLists.txt | |
154 | +++ b/Modules/Registration/GPUPDEDeformable/CMakeLists.txt | |
155 | @@ -2,8 +2,8 @@ project(ITKGPUPDEDeformableRegistration) | |
156 | ||
157 | if (ITK_USE_GPU) | |
158 | set(ITKGPUPDEDeformableRegistration_LIBRARIES ITKGPUPDEDeformableRegistration) | |
159 | - set(ITKGPUPDEDeformableRegistration_SYSTEM_INCLUDE_DIRS ${OPENCL_INCLUDE_DIRS}) | |
160 | - set(ITKGPUPDEDeformableRegistration_SYSTEM_LIBRARY_DIRS ${OPENCL_LIBRARIES}) | |
161 | + set(ITKGPUPDEDeformableRegistration_SYSTEM_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS}) | |
162 | + set(ITKGPUPDEDeformableRegistration_SYSTEM_LIBRARY_DIRS ${OpenCL_LIBRARIES}) | |
163 | endif() | |
164 | ||
165 | itk_module_impl() | |
166 | diff --git a/Modules/Registration/GPUPDEDeformable/src/CMakeLists.txt b/Modules/Registration/GPUPDEDeformable/src/CMakeLists.txt | |
167 | index 28b1d194c..1a049bdde 100644 | |
168 | --- a/Modules/Registration/GPUPDEDeformable/src/CMakeLists.txt | |
169 | +++ b/Modules/Registration/GPUPDEDeformable/src/CMakeLists.txt | |
170 | @@ -10,5 +10,5 @@ if (ITK_USE_GPU) | |
171 | write_gpu_kernels("${ITKGPUPDEDeformableRegistration_Kernels}" ITKGPUPDEDeformableRegistration_SRCS) | |
172 | ||
173 | itk_module_add_library(ITKGPUPDEDeformableRegistration ${ITKGPUPDEDeformableRegistration_SRCS}) | |
174 | - target_link_libraries(ITKGPUPDEDeformableRegistration LINK_PUBLIC ${OPENCL_LIBRARIES}) | |
175 | + target_link_libraries(ITKGPUPDEDeformableRegistration LINK_PUBLIC ${OpenCL_LIBRARIES}) | |
176 | endif() |