[med-svn] r6545 - trunk/packages/vxl/trunk/debian/patches

Mathieu Malaterre malat-guest at alioth.debian.org
Wed Apr 13 14:33:14 UTC 2011


Author: malat-guest
Date: 2011-04-13 14:33:13 +0000 (Wed, 13 Apr 2011)
New Revision: 6545

Modified:
   trunk/packages/vxl/trunk/debian/patches/series
   trunk/packages/vxl/trunk/debian/patches/vxl.soname3.patch
Log:
Manually fix sed error

Modified: trunk/packages/vxl/trunk/debian/patches/series
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/series	2011-04-13 14:07:40 UTC (rev 6544)
+++ trunk/packages/vxl/trunk/debian/patches/series	2011-04-13 14:33:13 UTC (rev 6545)
@@ -1,5 +1,5 @@
 vxl.soname.patch
 vxl.soname2.patch
-all.patch
+vxl.soname3.patch
 video4linux.patch
 opencl_unix.patch

Modified: trunk/packages/vxl/trunk/debian/patches/vxl.soname3.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/vxl.soname3.patch	2011-04-13 14:07:40 UTC (rev 6544)
+++ trunk/packages/vxl/trunk/debian/patches/vxl.soname3.patch	2011-04-13 14:33:13 UTC (rev 6545)
@@ -6,7 +6,7 @@
  )
  
  ADD_LIBRARY(shapelib ${shapelib_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(shapelib PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib shapelib)
  
  
@@ -18,7 +18,7 @@
  )
  
  ADD_LIBRARY(bdgl ${bdgl_sources})
-+SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(bdgl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib bdgl)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bdgl ${bdgl_sources})
  
@@ -30,7 +30,7 @@
  AUX_SOURCE_DIRECTORY(Templates bdpg_sources)
  
  ADD_LIBRARY(bdpg ${bdpg_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(bdpg PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib bdpg)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bdpg ${bdpg_sources})
  
@@ -42,7 +42,7 @@
  
   AUX_SOURCE_DIRECTORY(Templates bgui_sources)
   ADD_LIBRARY(bgui ${bgui_sources})
-+ SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++ SET_TARGET_PROPERTIES(bgui PROPERTIES ${VNL_LIBRARY_PROPERTIES})
   INSTALL_TARGETS(/lib bgui)
   INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgui ${bgui_sources})
  
@@ -54,7 +54,7 @@
  )
  
  ADD_LIBRARY(bgui3d  ${bgui3d_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(bgui3d PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  SET(BGUI3D_FOUND "YES" CACHE INTERNAL "Was bgui3d successfully built?" )
  TARGET_LINK_LIBRARIES(bgui3d ${COIN3D_LIBRARY} vgui vpgl vnl_algo vnl vgl_algo vgl vul)
  
@@ -66,9 +66,9 @@
  AUX_SOURCE_DIRECTORY(Templates bil_algo_sources)
  
  ADD_LIBRARY( bil_algo ${bil_algo_sources} )
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(bil_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bil_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bil/algo ${bil_algo_sources})
  
  TARGET_LINK_LIBRARIES( bil_algo vil_algo vil vnl_algo vnl vgl_algo vgl vbl )
  
@@ -80,9 +80,9 @@
  AUX_SOURCE_DIRECTORY(Templates bil_sources)
  
  ADD_LIBRARY(bil  ${bil_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(bil PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bil)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bil ${bil_sources})
  
  TARGET_LINK_LIBRARIES(bil vil vil_io vsl)
  
@@ -94,9 +94,9 @@
  )
  
  ADD_LIBRARY( bmsh3d_algo  ${bmsh3d_algo_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(bmsh3d_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bmsh3d_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bmsh3d/algo ${bmsh3d_algo_sources})
  TARGET_LINK_LIBRARIES( bmsh3d_algo bmsh3d rply vgl vnl vul)
 Index: vxl-1.14.0/contrib/brl/bbas/bnl/algo/CMakeLists.txt
 ===================================================================
@@ -106,7 +106,7 @@
  )
  
  ADD_LIBRARY( bnl_algo ${bnl_algo_sources} )
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(bnl_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib bnl_algo)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bnl/algo ${bnl_algo_sources})
  TARGET_LINK_LIBRARIES( bnl_algo vnl )
@@ -118,7 +118,7 @@
     )
  
  ADD_LIBRARY(bnl ${bnl_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(bnl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib bnl)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bnl ${bnl_sources})
  
@@ -130,7 +130,7 @@
  AUX_SOURCE_DIRECTORY(Templates bsol_sources)
  
  ADD_LIBRARY(bsol ${bsol_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(bsol PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib bsol)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bsol ${bsol_sources})
  TARGET_LINK_LIBRARIES(bsol vsol vgl_algo vgl vnl vbl)
@@ -156,7 +156,7 @@
  
  AUX_SOURCE_DIRECTORY(Templates bsta_sources)
  ADD_LIBRARY(bsta  ${bsta_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(bsta PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib bsta)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/bsta ${bsta_sources})
  
@@ -182,7 +182,7 @@
  )
  
  ADD_LIBRARY(btol ${btol_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(btol PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib btol)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/btol ${btol_sources})
  
@@ -194,7 +194,7 @@
  AUX_SOURCE_DIRECTORY(Templates bugl_sources)
  
  ADD_LIBRARY(bugl ${bugl_sources})
-+SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(bugl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib bugl)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bugl ${bugl_sources})
  TARGET_LINK_LIBRARIES(bugl vnl vgl_algo vgl vbl)
@@ -206,7 +206,7 @@
  AUX_SOURCE_DIRECTORY(Templates bvgl_sources)
  
  ADD_LIBRARY(bvgl ${bvgl_sources})
-+SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(bvgl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib bvgl)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bvgl ${bvgl_sources})
  TARGET_LINK_LIBRARIES(bvgl vsol vgl_algo vgl vnl vil vbl)
@@ -218,9 +218,9 @@
  )
  
  ADD_LIBRARY(bvrml  ${bvrml_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(bvrml PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvrml)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bvrml ${bvrml_sources})
  
 -TARGET_LINK_LIBRARIES(bvrml vgl)
 \ No newline at end of file
@@ -233,9 +233,9 @@
  ENDIF(ECW_FOUND)
  
  ADD_LIBRARY(bwm_algo ${bwm_algo_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(bwm_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bwm_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bwm/algo ${bwm_algo})
  
  TARGET_LINK_LIBRARIES( bwm_algo sdet vtol vil vil_algo vgl vgl_algo vnl vnl_algo vsol vpgl vpgl_algo vpgl_file_formats bgui brip vdgl bsta vgui vul vcl shapelib )
 Index: vxl-1.14.0/contrib/brl/bbas/bxml/CMakeLists.txt
@@ -246,9 +246,9 @@
  AUX_SOURCE_DIRECTORY(Templates bxml_sources)
  
  ADD_LIBRARY(bxml ${bxml_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(bxml PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bxml)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bxml ${bxml_sources})
  
  TARGET_LINK_LIBRARIES( bxml expatpp vbl_io vul vbl )
  
@@ -260,9 +260,9 @@
  AUX_SOURCE_DIRECTORY(Templates imesh_algo_sources)
  
  ADD_LIBRARY( imesh_algo ${imesh_algo_sources} )
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(imesh_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib imesh_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/imesh/algo ${imesh_algo_sources})
  
  TARGET_LINK_LIBRARIES( imesh_algo imesh vpgl vgl_algo vgl vnl_algo vnl vil )
 Index: vxl-1.14.0/contrib/brl/bmvl/brct/CMakeLists.txt
@@ -273,7 +273,7 @@
  ENDIF (BUILD_UNMAINTAINED_LIBRARIES OR BUILD_FOR_VXL_DASHBOARD)
  
  ADD_LIBRARY(brct ${brct_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(brct PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib brct)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bmvl/brct ${brct_sources})
  
@@ -285,7 +285,7 @@
  AUX_SOURCE_DIRECTORY(Templates btom_sources)
  
  ADD_LIBRARY(btom ${btom_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(btom PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib btom)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/btom ${btom_sources})
  
@@ -297,7 +297,7 @@
  AUX_SOURCE_DIRECTORY(processes brip_pro_sources)
  
  ADD_LIBRARY(brip_pro ${brip_pro_sources})
-+SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(brip_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
 +INSTALL_TARGETS(/lib brip_pro)
 +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/core/brip_pro ${brip_pro_sources})
  TARGET_LINK_LIBRARIES(brip_pro bprb brdb brip vil_pro vil vsl)
@@ -309,9 +309,9 @@
  AUX_SOURCE_DIRECTORY(processes bvgl_pro_sources)
  
  ADD_LIBRARY(bvgl_pro ${bvgl_pro_sources})
-+SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(bvgl_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvgl_pro)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/core/bvgl_pro ${bvgl_pro_sources})
  
  TARGET_LINK_LIBRARIES(bvgl_pro bprb vil_pro bvgl vil vil_io)
  
@@ -323,10 +323,10 @@
  AUX_SOURCE_DIRECTORY(processes sdet_pro_sources)
  
  ADD_LIBRARY(sdet_pro ${sdet_pro_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(sdet_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES(sdet_pro bprb brdb sdet vil_pro vil vsl sdet)
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++INSTALL_TARGETS(/lib sdet_pro)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/code/sdet_pro ${sdet_pro_sources})
 Index: vxl-1.14.0/contrib/brl/bpro/core/vidl_pro/CMakeLists.txt
 ===================================================================
 --- vxl-1.14.0.orig/contrib/brl/bpro/core/vidl_pro/CMakeLists.txt	2009-12-26 16:50:13.000000000 +0100
@@ -335,10 +335,10 @@
  AUX_SOURCE_DIRECTORY(processes vidl_pro_sources)
  
  ADD_LIBRARY(vidl_pro ${vidl_pro_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vidl_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES(vidl_pro bprb brdb vidl vsl vul)
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++INSTALL_TARGETS(/lib vidl_pro)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/core/vidl_pro ${vidl_pro_sources})
 Index: vxl-1.14.0/contrib/brl/bpro/core/vil_pro/CMakeLists.txt
 ===================================================================
 --- vxl-1.14.0.orig/contrib/brl/bpro/core/vil_pro/CMakeLists.txt	2009-12-26 16:50:38.000000000 +0100
@@ -347,9 +347,9 @@
  AUX_SOURCE_DIRECTORY(processes vil_pro_sources)
  
  ADD_LIBRARY(vil_pro ${vil_pro_sources})
-+SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(vil_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib vil_pro)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/core/vil_pro ${vil_pro_sources})
  
  TARGET_LINK_LIBRARIES(vil_pro bprb bil_algo vil_algo vil_io vil vnl vul vsl)
  
@@ -361,9 +361,9 @@
  AUX_SOURCE_DIRECTORY(processes vpgl_pro_sources)
  
  ADD_LIBRARY(vpgl_pro ${vpgl_pro_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(vpgl_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib vpgl_pro)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/core/vpgl_pro ${vpgl_pro_sources})
  
  TARGET_LINK_LIBRARIES(vpgl_pro bprb vpgl_io vpgl vpgl_algo vnl vil bgeo vul)
  
@@ -375,9 +375,9 @@
  AUX_SOURCE_DIRECTORY(Templates bmdl_sources)
  
  ADD_LIBRARY(bmdl  ${bmdl_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(bmdl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bmdl)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bmdl ${bmdl_sources})
  
  TARGET_LINK_LIBRARIES(bmdl vil_algo imesh vgl_algo vgl vnl vil)
  
@@ -389,9 +389,9 @@
        AUX_SOURCE_DIRECTORY(processes bmdl_pro_sources)
  
        ADD_LIBRARY(bmdl_pro ${bmdl_pro_sources})
-+      SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+      INSTALL_TARGETS(/lib bgrl)
-+      INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++      SET_TARGET_PROPERTIES(bmdl_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++      INSTALL_TARGETS(/lib bmdl_pro)
++      INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bmdl/pro ${bmdl_pro_sources})
  
        TARGET_LINK_LIBRARIES(bmdl_pro bmdl bprb vil vil_io vpgl_file_formats vgl_io
                              bgeo vsol brip vpgl_pro vgl vul vpl imesh_algo minizip)
@@ -403,9 +403,9 @@
     )
  
  ADD_LIBRARY(boxm_algo ${boxm_algo_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(boxm_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib boxm_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/boxm/algo ${boxm_algo_sources})
  
  IF( BUILD_TESTING )
    SUBDIRS(tests)
@@ -417,9 +417,9 @@
    AUX_SOURCE_DIRECTORY(processes boxm_algo_pro_sources)
  
    ADD_LIBRARY(boxm_algo_pro ${boxm_algo_pro_sources} )
-+  SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+  INSTALL_TARGETS(/lib bgrl)
-+  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++  SET_TARGET_PROPERTIES(boxm_algo_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++  INSTALL_TARGETS(/lib boxm_algo_pro)
++  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/boxm/algo/pro ${boxm_algo_pro_sources})
  
    TARGET_LINK_LIBRARIES(boxm_algo_pro boxm_algo boxm_io bprb brdb bvxm_grid_pro)
  ENDIF(EXPAT_FOUND)
@@ -431,9 +431,9 @@
    )
    AUX_SOURCE_DIRECTORY(Templates boxm_opt_opencl_sources)
    ADD_LIBRARY(boxm_opt_opencl ${boxm_opt_opencl_sources} ${bomx_opt_opencl_source_files})
-+  SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+  INSTALL_TARGETS(/lib bgrl)
-+  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++  SET_TARGET_PROPERTIES(boxm_opt_opencl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++  INSTALL_TARGETS(/lib boxm_opt_opencl)
++  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/boxm/opt/open_cl ${boxm_opt_opencl_sources} ${bomx_opt_opencl_source_files})
  
    TARGET_LINK_LIBRARIES(boxm_opt_opencl boxm_opt boxm bprb bgeo vnl vgl vbl vbl_io ${OPENCL_LIBRARIES})
  
@@ -456,7 +456,7 @@
  AUX_SOURCE_DIRECTORY(Templates brip_sources)
  
  ADD_LIBRARY(brip ${brip_sources})
-+SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(brip PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib brip)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/brip ${brip_sources})
  
@@ -468,9 +468,9 @@
  AUX_SOURCE_DIRECTORY(Templates bvpl_octree_sources)
  
  ADD_LIBRARY(bvpl_octree ${bvpl_octree_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(bvpl_octree PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvpl_octree)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvpl/bvpl_octree ${bvpl_octree_sources})
  
  TARGET_LINK_LIBRARIES(bvpl_octree bvpl boxm_io vbl)
  
@@ -482,9 +482,9 @@
  AUX_SOURCE_DIRECTORY(processes bvpl_octree_pro_sources)
  
  ADD_LIBRARY(bvpl_octree_pro ${bvpl_octree_pro_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(bvpl_octree_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvpl_octree_pro)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvpl/bvpl_octree/pro ${bvpl_octree_pro_sources})
  
  TARGET_LINK_LIBRARIES(bvpl_octree_pro bvpl_octree bprb bvpl_io brdb)
  
@@ -496,9 +496,9 @@
  AUX_SOURCE_DIRECTORY(Templates bvpl_sources)
  
  ADD_LIBRARY(bvpl ${bvpl_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(bvpl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvpl)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvpl ${bvpl_sources})
  
  TARGET_LINK_LIBRARIES(bvpl bvxm_grid bdgl bxml bsvg bsta vgl_algo vil_algo vnl vgl vpl vul vbl)
  
@@ -510,9 +510,9 @@
  
  ADD_LIBRARY(bvpl_io ${bvpl_io_sources})
  TARGET_LINK_LIBRARIES(bvpl_io bvpl vsl vbl)
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(bvpl_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvpl_io)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvpl/io ${bvpl_io_sources})
  
  
 Index: vxl-1.14.0/contrib/brl/bseg/bvpl/pro/CMakeLists.txt
@@ -523,9 +523,9 @@
  AUX_SOURCE_DIRECTORY(processes/util bvpl_pro_sources)
  
  ADD_LIBRARY(bvpl_pro ${bvpl_pro_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(bvpl_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvpl_pro)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvpl/pro ${bvpl_pro_sources})
  
  TARGET_LINK_LIBRARIES(bvpl_pro bprb bvpl_io brdb bvpl_util bvpl_util_io vil_algo vnl vul)
  
@@ -537,9 +537,9 @@
  AUX_SOURCE_DIRECTORY(Templates bvpl_util_sources)
  
  ADD_LIBRARY(bvpl_util ${bvpl_util_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(bvpl_util PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvpl_util)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvpl/util ${bvpl_util_sources})
  
  TARGET_LINK_LIBRARIES(bvpl_util bvpl brdb vil_algo vgl vnl vbl)
  
@@ -552,9 +552,9 @@
  ADD_LIBRARY(bvpl_util_io ${bvpl_util_io_sources})
  TARGET_LINK_LIBRARIES(bvpl_util_io bvpl_util vsl vbl)
 -
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(bvpl_util_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvpl_util_io)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvpl/util/io ${bvpl_util_io_sources})
  
 Index: vxl-1.14.0/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
 ===================================================================
@@ -564,9 +564,9 @@
  AUX_SOURCE_DIRECTORY(Templates bvxm_algo_sources)
  
  ADD_LIBRARY( bvxm_algo ${bvxm_algo_sources})
-+SET_TARGET_PROPERTIES(bcal PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(bvxm_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvxm_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvxm/algo ${bgrl_sources})
  
  TARGET_LINK_LIBRARIES( bvxm_algo bsta bvxm_grid vnl vgl)
  
@@ -578,7 +578,7 @@
  AUX_SOURCE_DIRECTORY(Templates sdet_sources)
  
  ADD_LIBRARY(sdet ${sdet_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(sdet PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib sdet)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/sdet ${sdet_sources})
  
@@ -590,7 +590,7 @@
      )
  
   ADD_LIBRARY(segv ${segv_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(segv PROPERTIES ${VNL_LIBRARY_PROPERTIES})
   INSTALL_TARGETS(/lib segv)
   INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/segv ${segv_sources})
  
@@ -602,7 +602,7 @@
  ENDIF (BUILD_UNMAINTAINED_LIBRARIES OR BUILD_FOR_VXL_DASHBOARD)
  
  ADD_LIBRARY(strk ${strk_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(strk PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib strk)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/strk ${strk_sources})
  
@@ -614,7 +614,7 @@
  ENDIF (BUILD_UNMAINTAINED_LIBRARIES OR BUILD_FOR_VXL_DASHBOARD)
  
  ADD_LIBRARY(vpro ${vpro_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vpro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vpro)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/vpro ${vpro_sources})
  
@@ -626,7 +626,7 @@
   ELSE(HAS_CMU1394CAMERA)
    ADD_LIBRARY(vvid ${vvid_sources})
   ENDIF(HAS_CMU1394CAMERA)
-+ SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++ SET_TARGET_PROPERTIES(vvid PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  
   INSTALL_TARGETS(/lib vvid)
   INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/vvid ${vvid_sources})
@@ -638,7 +638,7 @@
  )
  
  ADD_LIBRARY(geml ${geml_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(geml PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib geml)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/geml ${geml_sources})
  TARGET_LINK_LIBRARIES(geml vil1 vnl)
@@ -650,7 +650,7 @@
  ENDIF(CMAKE_COMPILER_IS_GNUCXX)
  
  ADD_LIBRARY(gevd ${gevd_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(gevd PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib gevd)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gevd ${gevd_sources})
  TARGET_LINK_LIBRARIES(gevd vtol vsol vdgl vil1 vil vnl vgl vbl vul)
@@ -662,7 +662,7 @@
  ENDIF(BUILD_OXL)
  
  ADD_LIBRARY(gkll ${gkll_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(gkll PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib gkll)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gkll ${gkll_sources})
  
@@ -674,7 +674,7 @@
  AUX_SOURCE_DIRECTORY(Templates gmvl_sources)
  
  ADD_LIBRARY(gmvl ${gmvl_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(gmvl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib gmvl)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gmvl ${gmvl_sources})
  TARGET_LINK_LIBRARIES(gmvl vtol vil1 vnl vbl vcl)
@@ -686,7 +686,7 @@
  AUX_SOURCE_DIRECTORY(Templates gst_sources)
  
  ADD_LIBRARY(gst ${gst_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(gst PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib gst)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gst ${gst_sources})
  
@@ -698,7 +698,7 @@
  ENDIF(NETLIB_FOUND)
  
  ADD_LIBRARY(gtrl ${gtrl_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(gtrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib gtrl)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gtrl ${gtrl_sources})
  
@@ -710,9 +710,9 @@
  
  ADD_LIBRARY(vpgl_algo ${vpgl_algo_sources})
  TARGET_LINK_LIBRARIES( vpgl_algo vpgl vpgl_file_formats rrel vsol bgeo vgl_algo vnl_algo vnl vgl vil vul )
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(vpgl_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib vpgl_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/mrc/vpgl/algo ${vpgl_algo_sources})
  
  IF( BUILD_TESTING )
    SUBDIRS(tests)
@@ -724,7 +724,7 @@
  AUX_SOURCE_DIRECTORY(Templates bgeo_sources)
  
  ADD_LIBRARY(bgeo ${bgeo_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(bgeo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib bgeo)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/mrc/vpgl/bgeo ${bgeo_sources})
  
@@ -736,9 +736,9 @@
  AUX_SOURCE_DIRECTORY(Templates vpgl_sources)
  
  ADD_LIBRARY(vpgl ${vpgl_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(vpgl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib vpgl)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/mrc/vpgl ${vpgl_sources})
  TARGET_LINK_LIBRARIES( vpgl vnl vnl_algo vnl_io vgl vgl_algo vgl_io vsl bgeo vbl)
  
  IF( BUILD_TESTING )
@@ -750,9 +750,9 @@
  ENDIF(TIFF_FOUND)
  
  ADD_LIBRARY(vpgl_file_formats ${vpgl_file_formats_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(vpgl_file_formats PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib vpgl_file_formats)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/mrc/vpgl/file_formats ${vpgl_file_formats_sources})
  
  TARGET_LINK_LIBRARIES(vpgl_file_formats vpgl vil vnl)
 Index: vxl-1.14.0/contrib/gel/mrc/vpgl/io/CMakeLists.txt
@@ -763,9 +763,9 @@
  
  ADD_LIBRARY(vpgl_io ${vpgl_io_sources})
  TARGET_LINK_LIBRARIES(vpgl_io vsl vpgl vnl vnl_io)
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(vpgl_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib vpgl_io)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/mrc/vpgl/io ${vpgl_io_sources})
 Index: vxl-1.14.0/contrib/gel/mrc/vpgl/xio/CMakeLists.txt
 ===================================================================
 --- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/xio/CMakeLists.txt	2009-12-26 16:49:35.000000000 +0100
@@ -774,7 +774,7 @@
  AUX_SOURCE_DIRECTORY(Templates vpgl_xio_sources)
  
  ADD_LIBRARY(vpgl_xio ${vpgl_xio_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vpgl_xio PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES( vpgl_xio vpgl vgl_xio vgl vsl)
  
  INSTALL_TARGETS(/lib vpgl_xio)
@@ -786,7 +786,7 @@
  ENDIF(BUILD_OXL)
  
  ADD_LIBRARY(vgel ${vgel_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vgel PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vgel)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vgel ${vgel_sources})
  
@@ -798,7 +798,7 @@
  )
  
  ADD_LIBRARY(vgel_kl ${vgel_kl_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vgel_kl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vgel_kl)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vgel/kl ${vgel_kl_sources})
  
@@ -810,7 +810,7 @@
  AUX_SOURCE_DIRECTORY(Templates vifa_sources)
  
  ADD_LIBRARY(vifa ${vifa_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vifa PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vifa)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vifa ${vifa_sources})
  TARGET_LINK_LIBRARIES(vifa gevd vtol vsol vdgl vnl vgl vbl vul vil vcl)
@@ -822,7 +822,7 @@
  ENDIF(BUILD_OXL)
  
  ADD_LIBRARY(vmal ${vmal_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vmal PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vmal)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vmal ${vmal_sources})
  
@@ -834,7 +834,7 @@
  AUX_SOURCE_DIRECTORY(Templates vsol_sources)
  
  ADD_LIBRARY(vsol ${vsol_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vsol PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vsol)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vsol ${vsol_sources})
  TARGET_LINK_LIBRARIES(vsol vgl_algo vgl_io vgl vnl vbl_io vbl vsl vul vcl)
@@ -846,7 +846,7 @@
  ENDIF (HAS_VGUI)
  
  ADD_LIBRARY(vsrl ${vsrl_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vsrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vsrl)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vsrl ${vsrl_sources})
  
@@ -858,7 +858,7 @@
  )
  
  ADD_LIBRARY(ipts ${ipts_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(ipts PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib ipts)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/ipts ${ipts_sources})
  TARGET_LINK_LIBRARIES(ipts vimt_algo vimt vgl vil_algo vil)
@@ -870,7 +870,7 @@
  ENDIF(CMAKE_COMPILER_IS_GNUCXX)
  
  ADD_LIBRARY(mbl ${mbl_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(mbl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES(mbl vnl_io vnl_algo vgl_io vgl vbl_io vil_io vsl vnl vil vul vbl)
  
  INSTALL_TARGETS(/lib mbl)
@@ -882,9 +882,9 @@
  AUX_SOURCE_DIRECTORY(Templates mcal_sources)
  
  ADD_LIBRARY(mcal ${mcal_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(mcal PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib mcal)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mcal ${mcal_sources})
  TARGET_LINK_LIBRARIES(mcal mbl vnl vnl_algo vul)
  
  IF (BUILD_TESTING)
@@ -896,7 +896,7 @@
  AUX_SOURCE_DIRECTORY(Templates mil_algo_sources)
  
  ADD_LIBRARY(mil_algo ${mil_algo_sources})
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(mil_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib mil_algo)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mil/algo ${mil_algo_sources})
  TARGET_LINK_LIBRARIES(mil_algo mil mbl vnl vsl)
@@ -908,7 +908,7 @@
  AUX_SOURCE_DIRECTORY(Templates mil_sources)
  
  ADD_LIBRARY(mil ${mil_sources})
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(mil PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib mil)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mil ${mil_sources})
  TARGET_LINK_LIBRARIES(mil mbl vimt vnl vbl_io vgl vil1 vbl vsl)
@@ -920,7 +920,7 @@
  AUX_SOURCE_DIRECTORY(Templates mil3d_sources)
  
  ADD_LIBRARY(mil3d ${mil3d_sources})
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(mil3d PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib mil3d)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mil3d ${mil3d_sources})
  TARGET_LINK_LIBRARIES(mil3d mil vbl_io vnl_io vnl vgl vbl vsl)
@@ -932,7 +932,7 @@
  
  
  ADD_LIBRARY(mvl2 ${mvl2_sources})
-+SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(mvl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib mvl2)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mvl2 ${mvl2_sources})
  TARGET_LINK_LIBRARIES( mvl2 vil vul ${AVIFILE_LIBRARIES} )
@@ -944,7 +944,7 @@
  AUX_SOURCE_DIRECTORY(Templates pdf1d_sources)
  
  ADD_LIBRARY(pdf1d ${pdf1d_sources})
-+SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(pdf1d PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib pdf1d)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/pdf1d ${pdf1d_sources})
  TARGET_LINK_LIBRARIES( pdf1d mbl vbl vnl_io vnl vsl )
@@ -956,7 +956,7 @@
  AUX_SOURCE_DIRECTORY(Templates vil3d_algo_sources)
  
  ADD_LIBRARY(vil3d_algo ${vil3d_algo_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vil3d_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vil3d_algo)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vil3d/algo ${vil3d_algo_sources})
  TARGET_LINK_LIBRARIES( vil3d_algo vil3d vil_algo vil vnl vgl )
@@ -964,12 +964,11 @@
 ===================================================================
 --- vxl-1.14.0.orig/contrib/mul/vil3d/CMakeLists.txt	2009-11-11 11:39:25.000000000 +0100
 +++ vxl-1.14.0/contrib/mul/vil3d/CMakeLists.txt	2011-04-13 16:06:18.000000000 +0200
-@@ -48,6 +48,8 @@
+@@ -48,6 +48,7 @@
  AUX_SOURCE_DIRECTORY(Templates vil3d_sources)
  
  ADD_LIBRARY(vil3d ${vil3d_sources})
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vil3d PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES( vil3d vil vul vsl vcl vnl )
  
  INSTALL_TARGETS(/lib vil3d)
@@ -981,7 +980,7 @@
  )
  
  ADD_LIBRARY(vil3d_io ${vil3d_io_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vil3d_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vil3d_io)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vil3d/io ${vil3d_io_sources})
  TARGET_LINK_LIBRARIES( vil3d_io vil3d vil_io )
@@ -993,7 +992,7 @@
  )
  
  ADD_LIBRARY(vimt_algo ${vimt_algo_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vimt_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vimt_algo)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vimt/algo ${vimt_algo_sources})
  TARGET_LINK_LIBRARIES( vimt_algo vimt vil_algo vgl vcl )
@@ -1005,7 +1004,7 @@
  AUX_SOURCE_DIRECTORY(Templates vimt_sources)
  
  ADD_LIBRARY(vimt ${vimt_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vimt PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vimt)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vimt ${vimt_sources})
  TARGET_LINK_LIBRARIES(vimt mbl vil_algo vgl vnl vil )
@@ -1017,7 +1016,7 @@
  AUX_SOURCE_DIRECTORY(Templates vimt3d_sources)
  
  ADD_LIBRARY(vimt3d ${vimt3d_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vimt3d PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vimt3d)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vimt3d ${vimt3d_sources})
  TARGET_LINK_LIBRARIES(vimt3d vil3d_algo vil3d_io vil3d vimt mbl vgl vnl_io vnl vil vsl vul)
@@ -1029,7 +1028,7 @@
  )
  
  ADD_LIBRARY(ouel ${ouel_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(ouel PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib ouel)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oul/ouel ${ouel_sources})
  TARGET_LINK_LIBRARIES( ouel vnl_algo vnl )
@@ -1041,7 +1040,7 @@
  )
  
  ADD_LIBRARY(oufgl ${oufgl_sources})
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(oufgl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib oufgl)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oul/oufgl ${oufgl_sources})
  TARGET_LINK_LIBRARIES( oufgl vil vil1 rt)
@@ -1053,7 +1052,7 @@
  )
  
  ADD_LIBRARY(ouml ${ouml_sources})
-+SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(ouml PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib ouml)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oul/ouml ${ouml_sources})
  TARGET_LINK_LIBRARIES( ouml vgl vnl_algo vnl_io vnl vil1 vsl vpl )
@@ -1065,7 +1064,7 @@
  AUX_SOURCE_DIRECTORY(Templates osl_sources)
  
  ADD_LIBRARY(osl ${osl_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(osl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib osl)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oxl/osl ${osl_sources})
  TARGET_LINK_LIBRARIES(osl vnl_algo vnl vgl vil1 vbl)
@@ -1077,10 +1076,10 @@
  )
  
  ADD_LIBRARY(vrml ${vrml_sources})
-+SET_TARGET_PROPERTIES(mvl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vrml PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES(vrml vul)
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++INSTALL_TARGETS(/lib vrml)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oxl/vrml ${vrml_sources})
 +
 Index: vxl-1.14.0/contrib/prip/vmap/CMakeLists.txt
 ===================================================================
@@ -1090,7 +1089,7 @@
  )
  
  ADD_LIBRARY(vmap ${vmap_sources})
-+SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vmap PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vmap)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/prip/vmap ${vmap_sources})
  TARGET_LINK_LIBRARIES(vmap vcl)
@@ -1102,7 +1101,7 @@
  AUX_SOURCE_DIRECTORY( Templates rgrl_sources )
  
  ADD_LIBRARY( rgrl ${rgrl_sources} )
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(rgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib rgrl)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/rpl/rgrl ${rgrl_sources})
  TARGET_LINK_LIBRARIES( rgrl rrel rsdl vil3d vil vnl_algo vnl vbl vul)
@@ -1114,7 +1113,7 @@
    )
  
  ADD_LIBRARY(rgtl ${rgtl_sources})
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(rgtl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES(rgtl vnl_algo vnl vcl)
  
  INSTALL_TARGETS(/lib rgtl)
@@ -1126,7 +1125,7 @@
  AUX_SOURCE_DIRECTORY(Templates rrel_sources)
  
  ADD_LIBRARY(rrel ${rrel_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(rrel PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib rrel)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/rpl/rrel ${rrel_sources})
  TARGET_LINK_LIBRARIES(rrel vnl_algo vnl vgl)
@@ -1138,7 +1137,7 @@
    )
  
  ADD_LIBRARY(rtvl ${rtvl_sources})
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(rtvl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES(rtvl rgtl vnl_algo vnl)
  
  INSTALL_TARGETS(/lib rtvl)
@@ -1150,7 +1149,7 @@
  ENDIF(CMAKE_COMPILER_IS_GNUCXX)
  
  ADD_LIBRARY(vepl ${vepl_sources})
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vepl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vepl)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/tbl/vepl ${vepl_sources})
  TARGET_LINK_LIBRARIES(vepl vipl vil1 ${CMAKE_THREAD_LIBS})
@@ -1174,7 +1173,7 @@
  )
  
  ADD_LIBRARY( testlib ${testlib_sources} )
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(testlib PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES( testlib vcl )
  INSTALL_TARGETS( /lib testlib)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/testlib ${testlib_sources})
@@ -1186,7 +1185,7 @@
  AUX_SOURCE_DIRECTORY(Templates vbl_sources)
  
  ADD_LIBRARY(vbl ${vbl_sources})
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vbl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES( vbl vcl )
  
  INSTALL_TARGETS(/lib vbl)
@@ -1198,7 +1197,7 @@
  AUX_SOURCE_DIRECTORY(Templates vbl_io_sources)
  
  ADD_LIBRARY(vbl_io ${vbl_io_sources})
-+SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vbl_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES( vbl_io vbl vsl )
  
  INSTALL_TARGETS(/lib vbl_io)
@@ -1234,7 +1233,7 @@
  AUX_SOURCE_DIRECTORY(Templates vgl_io_sources)
  
  ADD_LIBRARY(vgl_io ${vgl_io_sources})
-+SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vgl_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES( vgl_io vgl vsl )
  
  INSTALL_TARGETS(/lib vgl_io)
@@ -1246,7 +1245,7 @@
  AUX_SOURCE_DIRECTORY(Templates vgl_xio_sources)
  
  ADD_LIBRARY(vgl_xio ${vgl_xio_sources})
-+SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vgl_xio PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES( vgl_xio vgl vsl )
  
  INSTALL_TARGETS(/lib vgl_xio)
@@ -1258,7 +1257,7 @@
  )
  
  ADD_LIBRARY(vgui ${vgui_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vgui PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vgui)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vgui ${vgui_sources})
  SET( VGUI_FOUND "YES" CACHE INTERNAL "Was vgui successfully built?" )
@@ -1270,7 +1269,7 @@
    )
  
    ADD_LIBRARY(vgui_wx ${vgui_wx_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vgui_wx PROPERTIES ${VNL_LIBRARY_PROPERTIES})
    TARGET_LINK_LIBRARIES(vgui_wx vgui ${wxWidgets_LIBRARIES})
  
  ENDIF(wxWidgets_FOUND)
@@ -1282,7 +1281,7 @@
  AUX_SOURCE_DIRECTORY(Templates vidl_sources)
  
  ADD_LIBRARY(vidl ${vidl_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vidl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vidl)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vidl ${vidl_sources})
  
@@ -1294,7 +1293,7 @@
  )
  
  ADD_LIBRARY(vidl_gui ${vidl_gui_sources})
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vidl_gui PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vidl_gui)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vidl/gui ${vidl_gui_sources})
  TARGET_LINK_LIBRARIES( vidl_gui vidl vgui vil )
@@ -1306,7 +1305,7 @@
  
  
  ADD_LIBRARY(vidl1 ${vidl1_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vidl1 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vidl1)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vidl1 ${vidl1_sources})
  
@@ -1318,7 +1317,7 @@
  ENDIF( WIN32 )
  
  ADD_LIBRARY(vidl_vil1 ${vidl_vil1_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vidl_vil1 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vidl_vil1)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vidl_vil1 ${vidl_vil1_sources})
  TARGET_LINK_LIBRARIES( vidl_vil1 vbl vul vil1 vcl )
@@ -1330,7 +1329,7 @@
  AUX_SOURCE_DIRECTORY(Templates vil_algo_sources)
  
  ADD_LIBRARY(vil_algo ${vil_algo_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vil_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  
  TARGET_LINK_LIBRARIES( vil_algo vil vnl_algo vnl vcl )
  
@@ -1354,7 +1353,7 @@
  ENDIF(CMAKE_COMPILER_IS_GNUCXX)
  
  ADD_LIBRARY(vil_io ${vil_io_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vil_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES( vil_io vil vsl )
  
  INSTALL_TARGETS(/lib vil_io)
@@ -1366,7 +1365,7 @@
  ENDIF(CMAKE_COMPILER_IS_GNUCXX)
  
  ADD_LIBRARY(vil1 ${vil1_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vil1 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS(/lib vil1)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil1 ${vil1_sources})
  
@@ -1378,7 +1377,7 @@
  AUX_SOURCE_DIRECTORY(Templates vil1_io_sources)
  
  ADD_LIBRARY(vil1_io ${vil1_io_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vil1_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES( vil1_io vil1 vsl )
  INSTALL_TARGETS(/lib vil1_io)
  INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil1/io ${vil1_io_sources})
@@ -1390,7 +1389,7 @@
    AUX_SOURCE_DIRECTORY(Templates vnl_algo_sources)
  
    ADD_LIBRARY( vnl_algo ${vnl_algo_sources})
-+  SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++  SET_TARGET_PROPERTIES(vnl_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
    TARGET_LINK_LIBRARIES( vnl_algo ${NETLIB_LIBRARIES} vnl )
  
    INSTALL_TARGETS(/lib vnl_algo)
@@ -1402,7 +1401,7 @@
  ENDIF(CMAKE_COMPILER_IS_GNUCXX)
  
  ADD_LIBRARY(vnl ${vnl_sources})
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vnl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES( vnl vcl )
  
  INSTALL_TARGETS(/lib vnl)
@@ -1414,7 +1413,7 @@
  ENDIF(CMAKE_COMPILER_IS_GNUCXX)
  
  ADD_LIBRARY(vnl_io ${vnl_io_sources} )
-+SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vnl_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES( vnl_io vnl vsl )
  
  INSTALL_TARGETS(/lib vnl_io)
@@ -1426,7 +1425,7 @@
  AUX_SOURCE_DIRECTORY(Templates vnl_xio_sources)
  
  ADD_LIBRARY(vnl_xio ${vnl_xio_sources} )
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vnl_xio PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES( vnl_xio vnl vsl )
  
  INSTALL_TARGETS(/lib vnl_xio)
@@ -1438,7 +1437,7 @@
  AUX_SOURCE_DIRECTORY(Templates vpdl_sources)
  
  ADD_LIBRARY(vpdl ${vpdl_sources})
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vpdl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES( vpdl vnl_algo vnl )
  
  INSTALL_TARGETS(/lib vpdl)
@@ -1450,7 +1449,7 @@
  )
  
  ADD_LIBRARY(vpl ${vpl_sources})
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vpl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES( vpl vcl )
  
  INSTALL_TARGETS(/lib vpl)
@@ -1462,7 +1461,7 @@
  AUX_SOURCE_DIRECTORY(Templates vsl_sources)
  
  ADD_LIBRARY(vsl ${vsl_sources})
-+SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vsl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES( vsl vcl )
  
  INSTALL_TARGETS(/lib vsl)
@@ -1474,7 +1473,7 @@
  )
  
  ADD_LIBRARY(vul_io ${vul_io_sources})
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vul_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  TARGET_LINK_LIBRARIES(vul_io vul vsl)
  
  INSTALL_TARGETS(/lib vul_io)
@@ -1486,7 +1485,7 @@
    TARGET_LINK_LIBRARIES( dcmtk ${ZLIB_LIBRARIES} )
  ENDIF( DCMTK_HAVE_ZLIB )
  
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(dcmtk PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS( /lib dcmtk )
  
  ENDIF( VXL_BUILD_DCMTK )
@@ -1498,7 +1497,7 @@
     )
  
  ADD_LIBRARY( netlib ${netlib_sources} )
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(netlib PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  INSTALL_TARGETS( /lib netlib )
  INSTALL_FILES( /include/vxl/v3p/netlib .h triangle )
  
@@ -1510,9 +1509,9 @@
    )
   
  ADD_LIBRARY(rply ${rply_sources})
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib bgrl)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(rply PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib rply)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/rply ${rply_sources})
 Index: vxl-1.14.0/vcl/CMakeLists.txt
 ===================================================================
 --- vxl-1.14.0.orig/vcl/CMakeLists.txt	2008-08-30 00:48:12.000000000 +0200
@@ -1521,7 +1520,7 @@
  #AUX_SOURCE_DIRECTORY(Templates vcl_sources)
  
  ADD_LIBRARY(vcl ${vcl_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(vcl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
  
  # CMake can automatically figure out the compiler characteristics on
  # Windows too.  No need to do manual config.




More information about the debian-med-commit mailing list