Author: malat Date: 2013-05-28 08:02:17 +0000 (Tue, 28 May 2013) New Revision: 13720
Added: trunk/packages/vxl/trunk/debian/patches/ocl_comp.patch Modified: trunk/packages/vxl/trunk/debian/patches/series Log: Fix OCL compilation Added: trunk/packages/vxl/trunk/debian/patches/ocl_comp.patch =================================================================== --- trunk/packages/vxl/trunk/debian/patches/ocl_comp.patch (rev 0) +++ trunk/packages/vxl/trunk/debian/patches/ocl_comp.patch 2013-05-28 08:02:17 UTC (rev 13720) @@ -0,0 +1,41 @@ +Description: Fix underlinking when opencl option is ON +Author: Mathieu Malaterre <ma...@debian.org> +Forwarded: no + +--- vxl-1.17.0.orig/contrib/brl/bseg/boxm2_multi/CMakeLists.txt ++++ vxl-1.17.0/contrib/brl/bseg/boxm2_multi/CMakeLists.txt +@@ -20,6 +20,7 @@ SET(boxm2_multi_sources + + ADD_LIBRARY(boxm2_multi ${boxm2_multi_sources}) + TARGET_LINK_LIBRARIES(boxm2_multi boxm2) ++TARGET_LINK_LIBRARIES(boxm2_multi boxm2_ocl) + + #multi gpu implementations + SUBDIRS(algo) +--- vxl-1.17.0.orig/contrib/brl/bseg/boxm2_multi/algo/CMakeLists.txt ++++ vxl-1.17.0/contrib/brl/bseg/boxm2_multi/algo/CMakeLists.txt +@@ -15,6 +15,7 @@ SET(boxm2_multi_algo_sources + + ADD_LIBRARY(boxm2_multi_algo ${boxm2_multi_algo_sources}) + 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) ++TARGET_LINK_LIBRARIES(boxm2_multi_algo boxm2_ocl_algo ) + + IF( BUILD_TESTING ) + SUBDIRS(tests) +--- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/ocl/pro/CMakeLists.txt ++++ vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/CMakeLists.txt +@@ -28,6 +28,7 @@ AUX_SOURCE_DIRECTORY(processes boxm2_ocl + + ADD_LIBRARY(boxm2_ocl_pro ${boxm2_ocl_pro_sources}) + 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) ++TARGET_LINK_LIBRARIES(boxm2_ocl_pro bsta_algo) + + #tests + IF( BUILD_TESTING ) +--- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/ocl/pro/tests/CMakeLists.txt ++++ vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/tests/CMakeLists.txt +@@ -11,3 +11,4 @@ ADD_TEST( boxm2_ocl_pro_test_filter_kern + + ADD_EXECUTABLE( boxm2_ocl_pro_test_include test_include.cxx ) + TARGET_LINK_LIBRARIES( boxm2_ocl_pro_test_include boxm2_ocl ) ++TARGET_LINK_LIBRARIES( boxm2_ocl_pro_test_include bsta_algo) Modified: trunk/packages/vxl/trunk/debian/patches/series =================================================================== --- trunk/packages/vxl/trunk/debian/patches/series 2013-05-28 08:01:21 UTC (rev 13719) +++ trunk/packages/vxl/trunk/debian/patches/series 2013-05-28 08:02:17 UTC (rev 13720) @@ -11,3 +11,4 @@ ffmpeg_C99.patch sse2.patch opencl_unix.patch +ocl_comp.patch _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit