/[debian-med]/trunk/packages/vxl/trunk/debian/patches/ocl_comp.patch
ViewVC logotype

Contents of /trunk/packages/vxl/trunk/debian/patches/ocl_comp.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 13721 - (show annotations) (download)
Tue May 28 09:38:14 2013 UTC (16 months, 3 weeks ago) by malat
File size: 2492 byte(s)
remove testing
1 Description: Fix underlinking when opencl option is ON
2 Author: Mathieu Malaterre <malat@debian.org>
3 Forwarded: no
4
5 Index: vxl-1.17.0/contrib/brl/bseg/boxm2_multi/CMakeLists.txt
6 ===================================================================
7 --- vxl-1.17.0.orig/contrib/brl/bseg/boxm2_multi/CMakeLists.txt 2013-05-28 10:00:46.000000000 +0200
8 +++ vxl-1.17.0/contrib/brl/bseg/boxm2_multi/CMakeLists.txt 2013-05-28 10:00:46.000000000 +0200
9 @@ -20,6 +20,7 @@
10
11 ADD_LIBRARY(boxm2_multi ${boxm2_multi_sources})
12 TARGET_LINK_LIBRARIES(boxm2_multi boxm2)
13 +TARGET_LINK_LIBRARIES(boxm2_multi boxm2_ocl)
14
15 #multi gpu implementations
16 SUBDIRS(algo)
17 Index: vxl-1.17.0/contrib/brl/bseg/boxm2_multi/algo/CMakeLists.txt
18 ===================================================================
19 --- vxl-1.17.0.orig/contrib/brl/bseg/boxm2_multi/algo/CMakeLists.txt 2013-05-28 10:00:46.000000000 +0200
20 +++ vxl-1.17.0/contrib/brl/bseg/boxm2_multi/algo/CMakeLists.txt 2013-05-28 10:00:46.000000000 +0200
21 @@ -15,6 +15,7 @@
22
23 ADD_LIBRARY(boxm2_multi_algo ${boxm2_multi_algo_sources})
24 TARGET_LINK_LIBRARIES(boxm2_multi_algo boxm2_multi)# boxm2_ocl boxm2_ocl_pro boct brdb bsta vbl_io vpgl_algo vpgl vgl_xio vgl vnl_algo vnl vbl vil vul vsl vcl)
25 +TARGET_LINK_LIBRARIES(boxm2_multi_algo boxm2_ocl_algo )
26
27 IF( BUILD_TESTING )
28 SUBDIRS(tests)
29 Index: vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/CMakeLists.txt
30 ===================================================================
31 --- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/ocl/pro/CMakeLists.txt 2013-05-28 10:00:46.000000000 +0200
32 +++ vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/CMakeLists.txt 2013-05-28 10:00:46.000000000 +0200
33 @@ -28,6 +28,7 @@
34
35 ADD_LIBRARY(boxm2_ocl_pro ${boxm2_ocl_pro_sources})
36 TARGET_LINK_LIBRARIES(boxm2_ocl_pro boxm2_ocl_algo boct brdb vbl_io expatpp vpgl vgl vgl_xio vil vul vbl vsl vcl bvpl_kernels)
37 +TARGET_LINK_LIBRARIES(boxm2_ocl_pro bsta_algo)
38
39 #tests
40 IF( BUILD_TESTING )
41 Index: vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/tests/CMakeLists.txt
42 ===================================================================
43 --- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/ocl/pro/tests/CMakeLists.txt 2013-05-28 10:00:46.000000000 +0200
44 +++ vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/tests/CMakeLists.txt 2013-05-28 10:00:46.000000000 +0200
45 @@ -11,3 +11,4 @@
46
47 ADD_EXECUTABLE( boxm2_ocl_pro_test_include test_include.cxx )
48 TARGET_LINK_LIBRARIES( boxm2_ocl_pro_test_include boxm2_ocl )
49 +TARGET_LINK_LIBRARIES( boxm2_ocl_pro_test_include bsta_algo)

  ViewVC Help
Powered by ViewVC 1.1.5